From bdwalton at users.sourceforge.net Mon Feb 1 01:11:17 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 01 Feb 2010 00:11:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8284] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 8284 http://gar.svn.sourceforge.net/gar/?rev=8284&view=rev Author: bdwalton Date: 2010-02-01 00:11:17 +0000 (Mon, 01 Feb 2010) Log Message: ----------- git: prune bad (old version) of default-pager configure arg Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-01-31 21:47:28 UTC (rev 8283) +++ csw/mgar/pkg/git/trunk/Makefile 2010-02-01 00:11:17 UTC (rev 8284) @@ -117,7 +117,6 @@ CONFIGURE_ARGS += --with-perl=$(bindir)/perl CONFIGURE_ARGS += --with-tcltk=$(bindir)/wish CONFIGURE_ARGS += --with-zlib=$(prefix) -CONFIGURE_ARGS += --with-default_pager=/opt/csw/bin/less CONFIGURE_ARGS += --with-iconv=$(prefix) CONFIGURE_ARGS += --with-openssl=$(prefix) CONFIGURE_ARGS += --with-expat=$(prefix) 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 Feb 1 01:12:43 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 01 Feb 2010 00:12:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8285] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 8285 http://gar.svn.sourceforge.net/gar/?rev=8285&view=rev Author: bdwalton Date: 2010-02-01 00:12:43 +0000 (Mon, 01 Feb 2010) Log Message: ----------- git: get ready for 1.7.0 Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-02-01 00:11:17 UTC (rev 8284) +++ csw/mgar/pkg/git/trunk/Makefile 2010-02-01 00:12:43 UTC (rev 8285) @@ -1,6 +1,6 @@ GARNAME = git -GARVERSION = 1.6.6 -# PATCHLEVEL = rc2 +GARVERSION = 1.7.0 +PATCHLEVEL = rc1 CATEGORIES = devel VENDOR_URL = http://git-scm.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 Mon Feb 1 01:13:32 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 01 Feb 2010 00:13:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8286] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 8286 http://gar.svn.sourceforge.net/gar/?rev=8286&view=rev Author: wahwah Date: 2010-02-01 00:13:32 +0000 (Mon, 01 Feb 2010) Log Message: ----------- cswclassutils: Added some preliminary testing code. Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/tests/ csw/mgar/pkg/cswclassutils/trunk/tests/migrateconf_test.py Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2010-02-01 00:12:43 UTC (rev 8285) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2010-02-01 00:13:32 UTC (rev 8286) @@ -36,7 +36,8 @@ readonly deprecated_file_ext # Create /etc/opt/csw/cswclassutils.DEBUG to enable debugging of this script -if [ -r ${PKG_INSTALL_ROOT}/etc/opt/csw/cswclassutils.DEBUG ]; then +debug_hint="${PKG_INSTALL_ROOT}/etc/opt/csw/cswclassutils.DEBUG" +if [ -r "${debug_hint}" -o -n "${CLASSUTILS_DEBUG:-}" ]; then DEBUG=1 else DEBUG=0 @@ -75,7 +76,7 @@ } sanitize() { - echo "$1" | sed -e 's/[^a-zA-Z0-9]/_/g' + echo "$1" | LC_ALL=C sed -e 's/[^a-zA-Z0-9]/_/g' } expand_modifiers() { @@ -220,7 +221,9 @@ # moved already. if [ -r "${srcpath}" ] then - give_a_chance_to_stop + if [ "${DEBUG}" -ne 1 ]; then + give_a_chance_to_stop + fi place_signpost_for "${srcpath}" debug "Moving '${srcpath}' to '${archpath}'" mv "${srcpath}" "${archpath}" Added: csw/mgar/pkg/cswclassutils/trunk/tests/migrateconf_test.py =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/tests/migrateconf_test.py (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/tests/migrateconf_test.py 2010-02-01 00:13:32 UTC (rev 8286) @@ -0,0 +1,105 @@ +#!/opt/csw/bin/python2.6 + +import os +import os.path +import shutil +import unittest +import tempfile +import subprocess +import copy +import sys + +I_SCRIPT_PATH = "../files/CSWcswclassutils.i.cswmigrateconf" +SHELL = "/bin/sh" + +CONFIG_1 = """MIGRATE_FILES="file0 dir0" +SOURCE_DIR___default__="%(srcdir)s" +DEST_DIR___default__="%(dstdir)s" +ARCH_DIR___default__="%(arcdir)s" +""" + +class CswmigrateconfUnitTest(unittest.TestCase): + """Tests cswmigrateconf.""" + + def setUp(self): + self.tmpdir = tempfile.mkdtemp(prefix="csw-classutils-test-") + self.script_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), I_SCRIPT_PATH) + print self.tmpdir + print self.script_path + self.mig_src_dir = os.path.join(self.tmpdir, "src_etc") + self.mig_dst_dir = os.path.join(self.tmpdir, "dst_etc") + self.mig_arc_dir = os.path.join(self.tmpdir, "migration-archive") + os.mkdir(self.mig_src_dir) + os.mkdir(self.mig_dst_dir) + # os.mkdir(self.mig_arc_dir) + config_content = CONFIG_1 % { + "srcdir": self.mig_src_dir, + "dstdir": self.mig_dst_dir, + "arcdir": self.mig_arc_dir, + } + self.migraconf_conf_src_path = os.path.join(self.tmpdir, "cswmigrateconf_src") + self.migraconf_conf_dst_path = os.path.join(self.tmpdir, "cswmigrateconf_dest") + self.stdin_data = """%s %s\n""" % (self.migraconf_conf_src_path, + self.migraconf_conf_dst_path) + f = open(self.migraconf_conf_src_path, "w") + f.write(config_content) + f.close() + f = open(os.path.join(self.mig_src_dir, "file0"), "w") + f.write("# Test config file.\n") + f.close() + os.mkdir(os.path.join(self.mig_src_dir, "dir0")) + f = open(os.path.join(self.mig_src_dir, "dir0", "file1"), "w") + f.write("# Second test config file.\n") + f.close() + + def tearDown(self): + shutil.rmtree(self.tmpdir) + + def test_2(self): + """Running the thing. + +After the migration: + +/tmp/csw-classutils-test-8ghrVo +|-- cswmigrateconf_dest +|-- cswmigrateconf_src +|-- dst_etc +| |-- dir0 +| | `-- file1 +| `-- file0 +|-- migration-archive +| |-- dir0 +| | `-- file1 +| `-- file0 +`-- src_etc + |-- dir0.README.migration + `-- file0.README.migration + +5 directories, 8 files + """ + # srcpath + # dstpath + # config content + subprocess.call(["tree", self.tmpdir]) + print "trying to run it." + classutils_env = copy.copy(os.environ) + classutils_env["CLASSUTILS_DEBUG"] = "1" + args = [SHELL, self.script_path] + migconf_proc = subprocess.Popen(args, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + cwd="/", + env=classutils_env) + print "feeding:", repr(self.stdin_data) + stdout, stderr = migconf_proc.communicate(self.stdin_data) + retcode = migconf_proc.wait() + print "stdout", repr(stdout) + print "stderr", repr(stderr) + print stdout + print os.listdir(self.tmpdir) + subprocess.call(["tree", self.tmpdir]) + self.assertFalse(retcode, "Running %s has failed" % args) + +if __name__ == '__main__': + unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Feb 1 10:54:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 01 Feb 2010 09:54:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8287] csw/mgar/gar/v2 Message-ID: Revision: 8287 http://gar.svn.sourceforge.net/gar/?rev=8287&view=rev Author: dmichelsen Date: 2010-02-01 09:54:24 +0000 (Mon, 01 Feb 2010) Log Message: ----------- mGAR v2: Move -lperl in category cpan to LD_OPTIONS Modified Paths: -------------- csw/mgar/gar/v2/categories/cpan/category.mk csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2010-02-01 00:13:32 UTC (rev 8286) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2010-02-01 09:54:24 UTC (rev 8287) @@ -62,8 +62,8 @@ INSTALL_ENV += PERL5LIB=$(PERL5LIB) # Configure a target using Makefile.PL -BIND_LIBPERL ?= LIBS=-lperl -PERL_CONFIGURE_ARGS ?= INSTALLDIRS=vendor $(BIND_LIBPERL) $(EXTRA_PERL_CONFIGURE_ARGS) +_CATEGORY_LD_OPTIONS ?= -L$(libdir) -lperl +PERL_CONFIGURE_ARGS ?= INSTALLDIRS=vendor $(EXTRA_PERL_CONFIGURE_ARGS) configure-%/Makefile.PL: @echo " ==> Running Makefile.PL in $*" ( cd $* ; \ Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-02-01 00:13:32 UTC (rev 8286) +++ csw/mgar/gar/v2/gar.conf.mk 2010-02-01 09:54:24 UTC (rev 8287) @@ -525,7 +525,7 @@ SOS11_LD_OPTIONS = $(EXTRA_SOS11_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) SOS12_LD_OPTIONS = $(EXTRA_SOS12_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) -LD_OPTIONS ?= $(strip $($(GARCOMPILER)_LD_OPTIONS) $(RUNPATH_LINKER_FLAGS) $(EXTRA_LD_OPTIONS)) +LD_OPTIONS ?= $(strip $($(GARCOMPILER)_LD_OPTIONS) $(RUNPATH_LINKER_FLAGS) $(EXTRA_LD_OPTIONS) $(_CATEGORY_LD_OPTIONS)) # 1. Make sure everything works fine for SOS12 # 2. Allow us to use programs we just built. This is a bit complicated, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Feb 1 11:18:11 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 01 Feb 2010 10:18:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8288] csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile Message-ID: Revision: 8288 http://gar.svn.sourceforge.net/gar/?rev=8288&view=rev Author: bensons Date: 2010-02-01 10:18:10 +0000 (Mon, 01 Feb 2010) Log Message: ----------- cpan Event-Lib: revoke last change Modified Paths: -------------- csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile Modified: csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile 2010-02-01 09:54:24 UTC (rev 8287) +++ csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile 2010-02-01 10:18:10 UTC (rev 8288) @@ -20,7 +20,7 @@ # Sun cc inline function patch PATCHFILES = inline.diff -CONFIGURE_ARGS += LIBS="-L$(libdir) -levent -lperl" +CONFIGURE_ARGS += LIBS="-L$(libdir) -levent" CONFIGURE_ARGS += INC="-I$(includedir)" # Skip tests as some of them are failing. Remove after the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Feb 1 12:31:37 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 01 Feb 2010 11:31:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8289] csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile Message-ID: Revision: 8289 http://gar.svn.sourceforge.net/gar/?rev=8289&view=rev Author: bensons Date: 2010-02-01 11:31:37 +0000 (Mon, 01 Feb 2010) Log Message: ----------- cpan Test-Exception: adjusted to perl 5.10.1 Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile Modified: csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile 2010-02-01 10:18:10 UTC (rev 8288) +++ csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile 2010-02-01 11:31:37 UTC (rev 8289) @@ -20,11 +20,3 @@ ARCHALL = 1 include gar/category.mk - -# needed because of perl 5.8 -pre-install-modulated: - gsed -i'' 's,^DESTDIR =,DESTDIR = $(DESTDIR),' $(WORKSRC)/Makefile - gsed -i'' 's,^\(MOD_INSTALL\) =,\1= PERL_INSTALL_ROOT=$(DESTDIR),'\ - $(WORKSRC)/Makefile - perl -pi -e 's/install\(\[ from_to/install_default\(\[ from_to/' \ - $(WORKSRC)/Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Feb 1 12:34:58 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 01 Feb 2010 11:34:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8290] csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/ Makefile Message-ID: Revision: 8290 http://gar.svn.sourceforge.net/gar/?rev=8290&view=rev Author: bensons Date: 2010-02-01 11:34:58 +0000 (Mon, 01 Feb 2010) Log Message: ----------- cpan Crypt-OpenSSL-Bignum: adjusted to current GAR layout Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile 2010-02-01 11:31:37 UTC (rev 8289) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile 2010-02-01 11:34:58 UTC (rev 8290) @@ -13,7 +13,8 @@ Crypt::OpenSSL::RSA. endef -DISTFILES += $(call admfiles,CSWpmcryptosslbignum,) +PACKAGES = CSWpmcryptosslbignum +CATALOGNAME = pm_cryptosslbignum REQUIRED_PKGS = CSWosslrt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Feb 1 12:41:31 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 01 Feb 2010 11:41:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[8291] csw/mgar/pkg/cpan/Params-Validate/trunk/ Message-ID: Revision: 8291 http://gar.svn.sourceforge.net/gar/?rev=8291&view=rev Author: bensons Date: 2010-02-01 11:41:31 +0000 (Mon, 01 Feb 2010) Log Message: ----------- cpan Params-Validate: remove Makefile Property Changed: ---------------- csw/mgar/pkg/cpan/Params-Validate/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Feb 1 15:23:23 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 01 Feb 2010 14:23:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8292] csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile Message-ID: Revision: 8292 http://gar.svn.sourceforge.net/gar/?rev=8292&view=rev Author: bensons Date: 2010-02-01 14:23:19 +0000 (Mon, 01 Feb 2010) Log Message: ----------- cpan XML-LibXML: cleaned up Makefile Modified Paths: -------------- csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile Modified: csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile 2010-02-01 11:41:31 UTC (rev 8291) +++ csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile 2010-02-01 14:23:19 UTC (rev 8292) @@ -14,7 +14,6 @@ PACKAGES = CSWpmxmllibxml CSWpmxmllibxmlcom CATALOGNAME_CSWpmxmllibxml = pm_xmllibxml SPKG_DESC_CSWpmxmllibxml = Binding for libxml2 -# PKGFILES_CSWpmxmllibxml = CATALOGNAME_CSWpmxmllibxmlcom = pm_xmllibxmlcom SPKG_DESC_CSWpmxmllibxmlcom = Constants and Character Encoding Routines PKGFILES_CSWpmxmllibxmlcom = this-is-just-an-empty-stub This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Feb 1 23:48:44 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 01 Feb 2010 22:48:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8293] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 8293 http://gar.svn.sourceforge.net/gar/?rev=8293&view=rev Author: wbonnet Date: 2010-02-01 22:48:31 +0000 (Mon, 01 Feb 2010) Log Message: ----------- Add support address to template email Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2010-02-01 14:23:19 UTC (rev 8292) +++ csw/mgar/gar/v2/gar.lib.mk 2010-02-01 22:48:31 UTC (rev 8293) @@ -196,6 +196,8 @@ # echo ""; \ # echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ # echo ""; \ +# echo "Questions, problem report or help should be sent to mailto:maintainers at lists.opencsw.org"; \ +# echo ""; \ # echo "--"; \ # echo "Kindest regards"; \ # echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ @@ -222,6 +224,8 @@ echo " $(UPSTREAM_MASTER_SITES)"; \ echo ""; \ echo "Please consider updating your package." ; \ + echo ""; \ + echo "Questions, problem report or help should be sent to mailto:maintainers at lists.opencsw.org"; \ echo ""; \ echo "--"; \ echo "Kindest regards"; \ 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 Feb 2 09:05:14 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Feb 2010 08:05:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8294] csw/mgar/pkg Message-ID: Revision: 8294 http://gar.svn.sourceforge.net/gar/?rev=8294&view=rev Author: wahwah Date: 2010-02-02 08:05:14 +0000 (Tue, 02 Feb 2010) Log Message: ----------- python-suds: Initial commit Modified Paths: -------------- csw/mgar/pkg/python-suds/trunk/Makefile csw/mgar/pkg/python-suds/trunk/checksums Added Paths: ----------- csw/mgar/pkg/python-suds/ Modified: csw/mgar/pkg/python-suds/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-02-01 22:48:31 UTC (rev 8293) +++ csw/mgar/pkg/python-suds/trunk/Makefile 2010-02-02 08:05:14 UTC (rev 8294) @@ -2,184 +2,17 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = python-suds +GARVERSION = 0.3.8 +CATEGORIES = python +DESCRIPTION = lightweight SOAP python client for consuming Web Services define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = https://fedorahosted.org/suds/ +MASTER_SITES = https://fedorahosted.org/releases/s/u/suds/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +PACKAGES = CSWpy-suds +CATALOGNAME_CSWpy-suds = py_suds +ARCHALL_CSWpy-suds = 1 +include gar/category.mk Modified: csw/mgar/pkg/python-suds/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-02-01 22:48:31 UTC (rev 8293) +++ csw/mgar/pkg/python-suds/trunk/checksums 2010-02-02 08:05:14 UTC (rev 8294) @@ -0,0 +1 @@ +74122f391f73e91dfee5b5435aa51a38 python-suds-0.3.8.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 Tue Feb 2 09:11:38 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Feb 2010 08:11:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8295] csw/mgar/pkg/tree/trunk Message-ID: Revision: 8295 http://gar.svn.sourceforge.net/gar/?rev=8295&view=rev Author: wahwah Date: 2010-02-02 08:11:38 +0000 (Tue, 02 Feb 2010) Log Message: ----------- tree: Version bump to 1.5.3, Makefile edits Modified Paths: -------------- csw/mgar/pkg/tree/trunk/Makefile csw/mgar/pkg/tree/trunk/checksums csw/mgar/pkg/tree/trunk/files/solaris.patch Modified: csw/mgar/pkg/tree/trunk/Makefile =================================================================== --- csw/mgar/pkg/tree/trunk/Makefile 2010-02-02 08:05:14 UTC (rev 8294) +++ csw/mgar/pkg/tree/trunk/Makefile 2010-02-02 08:11:38 UTC (rev 8295) @@ -3,7 +3,7 @@ # $Id$ GARNAME = tree -GARVERSION = 1.5.2.2 +GARVERSION = 1.5.3 CATEGORIES = utils DESCRIPTION = A recursive directory listing program define BLURB Modified: csw/mgar/pkg/tree/trunk/checksums =================================================================== --- csw/mgar/pkg/tree/trunk/checksums 2010-02-02 08:05:14 UTC (rev 8294) +++ csw/mgar/pkg/tree/trunk/checksums 2010-02-02 08:11:38 UTC (rev 8295) @@ -1,2 +1,2 @@ -e714975edbf63afd3037b3c75b0c5319 download/solaris.patch -a7731a898e2c0d7e422a57a84ffbb06c download/tree-1.5.2.2.tgz +2e286acfa044c3bf9b75f31a97fa7540 solaris.patch +c07ce9065667a23f27aca4de8ecccb10 tree-1.5.3.tgz Modified: csw/mgar/pkg/tree/trunk/files/solaris.patch =================================================================== --- csw/mgar/pkg/tree/trunk/files/solaris.patch 2010-02-02 08:05:14 UTC (rev 8294) +++ csw/mgar/pkg/tree/trunk/files/solaris.patch 2010-02-02 08:11:38 UTC (rev 8295) @@ -1,7 +1,5 @@ -diff --git a/Makefile b/Makefile -index 54260a7..e622acd 100644 ---- a/Makefile -+++ b/Makefile +--- tree-1.5.3/Makefile.orig 2010-02-02 09:04:08.804909345 +0100 ++++ tree-1.5.3/Makefile 2010-02-02 09:04:12.780237318 +0100 @@ -6,9 +6,9 @@ # warranties, including, without limitation, the implied warranties # of merchant-ability and fitness for a particular purpose. @@ -12,30 +10,25 @@ -CC=gcc +# CC=gcc - VERSION=1.5.2.2 + VERSION=1.5.3 TREE_DEST=tree -@@ -20,8 +20,9 @@ MANDIR=${prefix}/man/man1 +@@ -19,7 +19,7 @@ + # Uncomment options below for your particular OS: # Linux defaults: - #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --LDFLAGS=-s -+#CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -+#LDFLAGS=-s -+#INSTALL=$(INSTALL) +-CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++# CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + #CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + #LDFLAGS=-s - # Uncomment for FreeBSD: - #CFLAGS=-O2 -Wall -fomit-frame-pointer -@@ -29,11 +30,12 @@ LDFLAGS=-s - #XOBJS=strverscmp.o +@@ -30,10 +30,11 @@ # Uncomment for Solaris: --#CC=cc + #CC=cc -#CFLAGS=-xO0 -v -#LDFLAGS= -#XOBJS=strverscmp.o -#MANDIR=${prefix}/share/man/man1 -+CC=cc +CFLAGS=-xO0 -v +LDFLAGS= +XOBJS=strverscmp.o @@ -44,7 +37,7 @@ # Uncomment for Cygwin: #CFLAGS=-O2 -Wall -fomit-frame-pointer -DCYGWIN -@@ -83,12 +85,12 @@ clean: +@@ -83,12 +84,12 @@ rm -f *~ install: tree @@ -52,12 +45,13 @@ - install -d $(MANDIR) - if [ -e $(TREE_DEST) ]; then \ - install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ +- fi +- install man/$(MAN) $(MANDIR)/$(MAN) + $(INSTALL) -d $(DESTDIR)$(BINDIR) + $(INSTALL) -d $(DESTDIR)$(MANDIR) + if [ -r $(TREE_DEST) ]; then \ + $(INSTALL) -s $(TREE_DEST) $(DESTDIR)$(BINDIR)/$(TREE_DEST); \ - fi -- install man/$(MAN) $(MANDIR)/$(MAN) ++ fi + $(INSTALL) man/$(MAN) $(DESTDIR)$(MANDIR)/$(MAN) distclean: 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 Feb 2 10:34:44 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Feb 2010 09:34:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8296] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 8296 http://gar.svn.sourceforge.net/gar/?rev=8296&view=rev Author: wahwah Date: 2010-02-02 09:34:44 +0000 (Tue, 02 Feb 2010) Log Message: ----------- cswclassutils: cswmigrateconf, testing code refactoring for better reuse Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf csw/mgar/pkg/cswclassutils/trunk/tests/migrateconf_test.py Property Changed: ---------------- csw/mgar/pkg/cswclassutils/trunk/tests/migrateconf_test.py Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2010-02-02 08:11:38 UTC (rev 8295) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2010-02-02 09:34:44 UTC (rev 8296) @@ -42,11 +42,18 @@ else DEBUG=0 fi +readonly DEBUG +CLASSUTILS_SKIP_WARNING="${CLASSUTILS_SKIP_WARNING:-0}" +readonly CLASSUTILS_SKIP_WARNING + give_a_chance_to_stop() { if [ "${chance_to_stop_given}" -ne 0 ]; then return fi + if [ "${CLASSUTILS_SKIP_WARNING}" != "0" ]; then + return + fi echo "----8<---- migration configuration start ----8<----" cat "${confdst}" echo "----8<---- migration configuration end ----8<----" @@ -221,9 +228,7 @@ # moved already. if [ -r "${srcpath}" ] then - if [ "${DEBUG}" -ne 1 ]; then - give_a_chance_to_stop - fi + give_a_chance_to_stop place_signpost_for "${srcpath}" debug "Moving '${srcpath}' to '${archpath}'" mv "${srcpath}" "${archpath}" Modified: csw/mgar/pkg/cswclassutils/trunk/tests/migrateconf_test.py =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/tests/migrateconf_test.py 2010-02-02 08:11:38 UTC (rev 8295) +++ csw/mgar/pkg/cswclassutils/trunk/tests/migrateconf_test.py 2010-02-02 09:34:44 UTC (rev 8296) @@ -1,4 +1,5 @@ #!/opt/csw/bin/python2.6 +# $Id$ import os import os.path @@ -9,26 +10,31 @@ import copy import sys -I_SCRIPT_PATH = "../files/CSWcswclassutils.i.cswmigrateconf" SHELL = "/bin/sh" -CONFIG_1 = """MIGRATE_FILES="file0 dir0" +CONFIG_1 = """MIGRATE_FILES="%(migrate_files)s" SOURCE_DIR___default__="%(srcdir)s" DEST_DIR___default__="%(dstdir)s" ARCH_DIR___default__="%(arcdir)s" """ -class CswmigrateconfUnitTest(unittest.TestCase): - """Tests cswmigrateconf.""" +class CswmigrateconfSetupMixin(object): + """Sets up stuff for cswmigrateconf testing.""" + SRC_ETC = "src_etc" + DST_ETC = "dst_etc" + MIGRATION_ARCHIVE = "migration-archive" + I_SCRIPT_PATH = "../files/CSWcswclassutils.i.cswmigrateconf" + TMP_PREFIX = "csw-classutils-test-" + SCRIPT_DEBUG = True + def setUp(self): - self.tmpdir = tempfile.mkdtemp(prefix="csw-classutils-test-") - self.script_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), I_SCRIPT_PATH) - print self.tmpdir - print self.script_path - self.mig_src_dir = os.path.join(self.tmpdir, "src_etc") - self.mig_dst_dir = os.path.join(self.tmpdir, "dst_etc") - self.mig_arc_dir = os.path.join(self.tmpdir, "migration-archive") + self.tmpdir = tempfile.mkdtemp(prefix=self.TMP_PREFIX) + self.script_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), + self.I_SCRIPT_PATH) + self.mig_src_dir = os.path.join(self.tmpdir, self.SRC_ETC) + self.mig_dst_dir = os.path.join(self.tmpdir, self.DST_ETC) + self.mig_arc_dir = os.path.join(self.tmpdir, self.MIGRATION_ARCHIVE) os.mkdir(self.mig_src_dir) os.mkdir(self.mig_dst_dir) # os.mkdir(self.mig_arc_dir) @@ -36,6 +42,7 @@ "srcdir": self.mig_src_dir, "dstdir": self.mig_dst_dir, "arcdir": self.mig_arc_dir, + "migrate_files": self.MIGRATE_FILES, } self.migraconf_conf_src_path = os.path.join(self.tmpdir, "cswmigrateconf_src") self.migraconf_conf_dst_path = os.path.join(self.tmpdir, "cswmigrateconf_dest") @@ -44,46 +51,16 @@ f = open(self.migraconf_conf_src_path, "w") f.write(config_content) f.close() - f = open(os.path.join(self.mig_src_dir, "file0"), "w") - f.write("# Test config file.\n") - f.close() - os.mkdir(os.path.join(self.mig_src_dir, "dir0")) - f = open(os.path.join(self.mig_src_dir, "dir0", "file1"), "w") - f.write("# Second test config file.\n") - f.close() def tearDown(self): shutil.rmtree(self.tmpdir) - def test_2(self): - """Running the thing. - -After the migration: - -/tmp/csw-classutils-test-8ghrVo -|-- cswmigrateconf_dest -|-- cswmigrateconf_src -|-- dst_etc -| |-- dir0 -| | `-- file1 -| `-- file0 -|-- migration-archive -| |-- dir0 -| | `-- file1 -| `-- file0 -`-- src_etc - |-- dir0.README.migration - `-- file0.README.migration - -5 directories, 8 files - """ - # srcpath - # dstpath - # config content - subprocess.call(["tree", self.tmpdir]) - print "trying to run it." + def RunActionScript(self): + """Running the migration script.""" classutils_env = copy.copy(os.environ) - classutils_env["CLASSUTILS_DEBUG"] = "1" + if self.SCRIPT_DEBUG: + classutils_env["CLASSUTILS_DEBUG"] = "1" + classutils_env["CLASSUTILS_SKIP_WARNING"] = "1" args = [SHELL, self.script_path] migconf_proc = subprocess.Popen(args, stdin=subprocess.PIPE, @@ -91,15 +68,42 @@ stderr=subprocess.PIPE, cwd="/", env=classutils_env) - print "feeding:", repr(self.stdin_data) stdout, stderr = migconf_proc.communicate(self.stdin_data) retcode = migconf_proc.wait() - print "stdout", repr(stdout) - print "stderr", repr(stderr) print stdout - print os.listdir(self.tmpdir) - subprocess.call(["tree", self.tmpdir]) + if stderr: + print "stderr", stderr self.assertFalse(retcode, "Running %s has failed" % args) + def CreateMigrationFiles(self): + for d in self.DIRS: + os.mkdir(os.path.join(self.mig_src_dir, d)) + for file_name, file_content in self.FILES: + f = open(os.path.join(self.mig_src_dir, file_name), "w") + f.write(file_content) + f.close() + + +class CswmigrateconfUnitTest(CswmigrateconfSetupMixin, unittest.TestCase): + + MIGRATE_FILES = "file0 dir0" + SCRIPT_DEBUG = False + DIRS = ["dir0", "dir0/dir1"] + FILES = [ + # ("file name", "content\n") + ("file0", "# Test config file.\n"), + ("dir0/file1", "# Second test config file.\n"), + ("dir0/dir1/file2", "# Third test config file.\n"), + ] + + def test_1(self): + self.CreateMigrationFiles() + subprocess.call(["tree", self.tmpdir]) + self.RunActionScript() + subprocess.call(["tree", self.tmpdir]) + self.RunActionScript() + subprocess.call(["tree", self.tmpdir]) + # Tests go here + if __name__ == '__main__': unittest.main() Property changes on: csw/mgar/pkg/cswclassutils/trunk/tests/migrateconf_test.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Feb 2 11:02:15 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Feb 2010 10:02:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[8297] csw/mgar/pkg/cpan/Text-DoubleMetaphone/trunk/ Makefile Message-ID: Revision: 8297 http://gar.svn.sourceforge.net/gar/?rev=8297&view=rev Author: dmichelsen Date: 2010-02-02 10:02:15 +0000 (Tue, 02 Feb 2010) Log Message: ----------- cpan/Text-DoubleMetaphone: Add BLURB Modified Paths: -------------- csw/mgar/pkg/cpan/Text-DoubleMetaphone/trunk/Makefile Modified: csw/mgar/pkg/cpan/Text-DoubleMetaphone/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-DoubleMetaphone/trunk/Makefile 2010-02-02 09:34:44 UTC (rev 8296) +++ csw/mgar/pkg/cpan/Text-DoubleMetaphone/trunk/Makefile 2010-02-02 10:02:15 UTC (rev 8297) @@ -5,6 +5,10 @@ DESCRIPTION = Phonetic encoding of words define BLURB + This module implements a "sounds like" algorithm developed + by Lawrence Philips which he published in the June, 2000 issue + of C/C++ Users Journal. Double Metaphone is an improved + version of Philips' original Metaphone algorithm. endef PACKAGES = CSWpmtextdblmetaphon 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 Feb 2 11:20:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Feb 2010 10:20:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8298] csw/mgar/pkg/cpan/PerlIO-gzip/trunk/Makefile Message-ID: Revision: 8298 http://gar.svn.sourceforge.net/gar/?rev=8298&view=rev Author: dmichelsen Date: 2010-02-02 10:20:52 +0000 (Tue, 02 Feb 2010) Log Message: ----------- cpan/PerlIO-gzip: Add BLURB Modified Paths: -------------- csw/mgar/pkg/cpan/PerlIO-gzip/trunk/Makefile Modified: csw/mgar/pkg/cpan/PerlIO-gzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/PerlIO-gzip/trunk/Makefile 2010-02-02 10:02:15 UTC (rev 8297) +++ csw/mgar/pkg/cpan/PerlIO-gzip/trunk/Makefile 2010-02-02 10:20:52 UTC (rev 8298) @@ -5,6 +5,8 @@ DESCRIPTION = Perl extension to provide a PerlIO layer to gzip/gunzip define BLURB + A layer for the PerlIO system to transparently gzip/gunzip files. + **DON'T** trust it with your data. endef REQUIRED_PKGS = CSWzlib 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 Feb 2 11:25:49 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Feb 2010 10:25:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[8299] csw/mgar/pkg/cpan/PerlIO-eol/trunk Message-ID: Revision: 8299 http://gar.svn.sourceforge.net/gar/?rev=8299&view=rev Author: dmichelsen Date: 2010-02-02 10:25:49 +0000 (Tue, 02 Feb 2010) Log Message: ----------- cpan/PerlIO-eol: Update to 0.14 Modified Paths: -------------- csw/mgar/pkg/cpan/PerlIO-eol/trunk/Makefile csw/mgar/pkg/cpan/PerlIO-eol/trunk/checksums Modified: csw/mgar/pkg/cpan/PerlIO-eol/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/PerlIO-eol/trunk/Makefile 2010-02-02 10:20:52 UTC (rev 8298) +++ csw/mgar/pkg/cpan/PerlIO-eol/trunk/Makefile 2010-02-02 10:25:49 UTC (rev 8299) @@ -1,7 +1,7 @@ GARNAME = PerlIO-eol -GARVERSION = 0.13 +GARVERSION = 0.14 CATEGORIES = cpan -AUTHOR = AUTRIJUS +AUTHOR = AUDREYT DESCRIPTION = PerlIO layer for normalizing line endings define BLURB Modified: csw/mgar/pkg/cpan/PerlIO-eol/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/PerlIO-eol/trunk/checksums 2010-02-02 10:20:52 UTC (rev 8298) +++ csw/mgar/pkg/cpan/PerlIO-eol/trunk/checksums 2010-02-02 10:25:49 UTC (rev 8299) @@ -1 +1 @@ -7e11fb1cc3b2a65678714877ae361823 download/PerlIO-eol-0.13.tar.gz +55c5d3fafab00a511ff1c2722060235c PerlIO-eol-0.14.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 Tue Feb 2 12:08:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Feb 2010 11:08:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8300] csw/mgar/gar/v2 Message-ID: Revision: 8300 http://gar.svn.sourceforge.net/gar/?rev=8300&view=rev Author: wahwah Date: 2010-02-02 11:08:00 +0000 (Tue, 02 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, the presence of the license file Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/README csw/mgar/gar/v2/lib/python/opencsw.py Added Paths: ----------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/README =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/README 2010-02-02 10:25:49 UTC (rev 8299) +++ csw/mgar/gar/v2/bin/checkpkg.d/README 2010-02-02 11:08:00 UTC (rev 8300) @@ -6,6 +6,6 @@ To see the required flags, issue: -./checkpkg-dummy.py -h +./checkpkg-you-can-write-your-own.py -h Each test's file name must begin with "checkpkg-". Added: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py 2010-02-02 11:08:00 UTC (rev 8300) @@ -0,0 +1,51 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""Checks for the existence of the license file.""" + +import logging +import os.path +import sys + +CHECKPKG_MODULE_NAME = "license presence" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + +LICENSE_TMPL = "/opt/csw/share/doc/%s/license" + +def CheckLicenseFile(pkg): + """Checks for the presence of the license file.""" + errors = [] + pkgmap = pkg.GetPkgmap() + catalogname = pkg.GetCatalogname() + license_path = LICENSE_TMPL % catalogname + if license_path not in pkgmap.entries_by_path: + errors.append( + opencsw.PackageError( + "%s file not present in the %s package" + % (repr(license_path), pkg.pkgname))) + return errors + + +def main(): + options, args = checkpkg.GetOptions() + pkgnames = args + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.extractdir, + pkgnames, + options.debug) + # Registering functions defined above. + check_manager.RegisterIndividualCheck(CheckLicenseFile) + exit_code, report = check_manager.Run() + print report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-02 10:25:49 UTC (rev 8299) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-02 11:08:00 UTC (rev 8300) @@ -538,6 +538,15 @@ self.pkgname = os.path.split(directory)[1] self.pkginfo_dict = None + def GetCatalogname(self): + """Returns the catalog name of the package. + + A bit hacky. Looks for the first word of the NAME field in the package. + """ + pkginfo = self.GetParsedPkginfo() + words = re.split(WS_RE, pkginfo["NAME"]) + return words[0] + def GetParsedPkginfo(self): if not self.pkginfo_dict: pkginfo_fd = open(self.GetPkginfoFilename(), "r") 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 Feb 2 13:29:18 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Feb 2010 12:29:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8301] csw/mgar/pkg/cpan/Net-SSLeay/trunk Message-ID: Revision: 8301 http://gar.svn.sourceforge.net/gar/?rev=8301&view=rev Author: dmichelsen Date: 2010-02-02 12:29:18 +0000 (Tue, 02 Feb 2010) Log Message: ----------- cpan/Net-SSLeay: Update to mGAR v2 and 1.36 Modified Paths: -------------- csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile csw/mgar/pkg/cpan/Net-SSLeay/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Net-SSLeay/trunk/files/CSWpmnetssleay.depend csw/mgar/pkg/cpan/Net-SSLeay/trunk/files/CSWpmnetssleay.gspec csw/mgar/pkg/cpan/Net-SSLeay/trunk/files/nettest.diff Property Changed: ---------------- csw/mgar/pkg/cpan/Net-SSLeay/trunk/ Property changes on: csw/mgar/pkg/cpan/Net-SSLeay/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile 2010-02-02 11:08:00 UTC (rev 8300) +++ csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile 2010-02-02 12:29:18 UTC (rev 8301) @@ -1,9 +1,9 @@ GARNAME = Net-SSLeay -GARVERSION = 1.35 +GARVERSION = 1.36 CATEGORIES = cpan AUTHOR = FLORA -DESCRIPTION = extension for using OpenSSL +DESCRIPTION = Extension for using OpenSSL define BLURB This module offers some high level convinience functions for accessing web pages on SSL servers (for symmetry, same API is offered for accessing http @@ -13,10 +13,13 @@ endef MODDIST = $(DISTNAME).tar.gz -WORKSRC = $(WORKDIR)/$(DISTNAME) -DISTFILES += $(call admfiles,CSWpmnetssleay,depend) +PACKAGES = CSWpmnetssleay +CATALOGNAME = pm_netssleay +REQUIRED_PKGS = CSWosslrt +PREREQUISITE_PKGS = CSWossldevel + PERL_CONFIGURE_ARGS = $(prefix) INSTALLDIRS=vendor CONFIGURE_ENV = OPENSSL_PREFIX=$(prefix) AUTOMATED_TESTING=1 PERL_MM_USE_DEFAULT=1 Modified: csw/mgar/pkg/cpan/Net-SSLeay/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-SSLeay/trunk/checksums 2010-02-02 11:08:00 UTC (rev 8300) +++ csw/mgar/pkg/cpan/Net-SSLeay/trunk/checksums 2010-02-02 12:29:18 UTC (rev 8301) @@ -1,5 +1 @@ -945c4e9f5920aa3e827a08c9c5fd162a download/CSWpmnetssleay.gspec -37995caa7f4155066b00fb7503e853da download/CSWpmnetssleay.depend -289657df62375b2bde5a7afaa6715a47 download/CSWpmnetssleay.prototype -1e4ec37a4467eb66a62d3c090ac9029b download/Net-SSLeay-1.35.tar.gz -39e05ffe65862d58b507c8563ff2465e download/ossl-0.9.8a.diff +54061638720dd6a325395331c77f21d8 Net-SSLeay-1.36.tar.gz Deleted: csw/mgar/pkg/cpan/Net-SSLeay/trunk/files/CSWpmnetssleay.depend =================================================================== --- csw/mgar/pkg/cpan/Net-SSLeay/trunk/files/CSWpmnetssleay.depend 2010-02-02 11:08:00 UTC (rev 8300) +++ csw/mgar/pkg/cpan/Net-SSLeay/trunk/files/CSWpmnetssleay.depend 2010-02-02 12:29:18 UTC (rev 8301) @@ -1 +0,0 @@ -P CSWosslrt openssl_rt - Openssl runtime libraries Deleted: csw/mgar/pkg/cpan/Net-SSLeay/trunk/files/CSWpmnetssleay.gspec =================================================================== --- csw/mgar/pkg/cpan/Net-SSLeay/trunk/files/CSWpmnetssleay.gspec 2010-02-02 11:08:00 UTC (rev 8300) +++ csw/mgar/pkg/cpan/Net-SSLeay/trunk/files/CSWpmnetssleay.gspec 2010-02-02 12:29:18 UTC (rev 8301) @@ -1,7 +0,0 @@ -%var bitname pm_netssleay -%var pkgname CSWpmnetssleay -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -The distribution and use of this module are subject to the conditions -listed in LICENSE file at the root of OpenSSL-0.9.7b -distribution (i.e. free, but mandatory attribution and NO WARRANTY). Deleted: csw/mgar/pkg/cpan/Net-SSLeay/trunk/files/nettest.diff =================================================================== --- csw/mgar/pkg/cpan/Net-SSLeay/trunk/files/nettest.diff 2010-02-02 11:08:00 UTC (rev 8300) +++ csw/mgar/pkg/cpan/Net-SSLeay/trunk/files/nettest.diff 2010-02-02 12:29:18 UTC (rev 8301) @@ -1,12 +0,0 @@ -diff --speed-large-files --minimal -Nru Net_SSLeay.pm-1.30.orig/test.pl Net_SSLeay.pm-1.30/test.pl ---- Net_SSLeay.pm-1.30.orig/test.pl 2006-01-30 03:43:39.675305000 -0500 -+++ Net_SSLeay.pm-1.30/test.pl 2006-01-30 03:43:30.517264000 -0500 -@@ -163,6 +163,8 @@ - &Net::SSLeay::FILETYPE_PEM()); - print &test(13, $r); - -+exit 0; -+ - #app.iplanet.com - my @sites = qw( - www.cdw.com 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 Feb 2 14:03:53 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Feb 2010 13:03:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8302] csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py Message-ID: Revision: 8302 http://gar.svn.sourceforge.net/gar/?rev=8302&view=rev Author: wahwah Date: 2010-02-02 13:03:53 +0000 (Tue, 02 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, provide a link to the CopyRight page on GAR wiki Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py 2010-02-02 12:29:18 UTC (rev 8301) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py 2010-02-02 13:03:53 UTC (rev 8302) @@ -30,6 +30,9 @@ opencsw.PackageError( "%s file not present in the %s package" % (repr(license_path), pkg.pkgname))) + errors.append( + opencsw.PackageError( + "See also: http://sourceforge.net/apps/trac/gar/wiki/CopyRight")) return errors 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 Feb 2 14:04:26 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Feb 2010 13:04:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[8303] csw/mgar/pkg/tree/trunk/Makefile Message-ID: Revision: 8303 http://gar.svn.sourceforge.net/gar/?rev=8303&view=rev Author: wahwah Date: 2010-02-02 13:04:26 +0000 (Tue, 02 Feb 2010) Log Message: ----------- tree: Adding the license file. Modified Paths: -------------- csw/mgar/pkg/tree/trunk/Makefile Modified: csw/mgar/pkg/tree/trunk/Makefile =================================================================== --- csw/mgar/pkg/tree/trunk/Makefile 2010-02-02 13:03:53 UTC (rev 8302) +++ csw/mgar/pkg/tree/trunk/Makefile 2010-02-02 13:04:26 UTC (rev 8303) @@ -19,4 +19,5 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz CONFIGURE_SCRIPTS = SKIPTEST = 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 dmichelsen at users.sourceforge.net Tue Feb 2 14:05:20 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Feb 2010 13:05:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8304] csw/mgar/pkg/cpan/GD/trunk/files Message-ID: Revision: 8304 http://gar.svn.sourceforge.net/gar/?rev=8304&view=rev Author: dmichelsen Date: 2010-02-02 13:05:13 +0000 (Tue, 02 Feb 2010) Log Message: ----------- cpan/GD: Remove old stuff Removed Paths: ------------- csw/mgar/pkg/cpan/GD/trunk/files/CSWpmgd.depend csw/mgar/pkg/cpan/GD/trunk/files/CSWpmgd.gspec csw/mgar/pkg/cpan/GD/trunk/files/gdtest.diff Deleted: csw/mgar/pkg/cpan/GD/trunk/files/CSWpmgd.depend =================================================================== Deleted: csw/mgar/pkg/cpan/GD/trunk/files/CSWpmgd.gspec =================================================================== --- csw/mgar/pkg/cpan/GD/trunk/files/CSWpmgd.gspec 2010-02-02 13:04:26 UTC (rev 8303) +++ csw/mgar/pkg/cpan/GD/trunk/files/CSWpmgd.gspec 2010-02-02 13:05:13 UTC (rev 8304) @@ -1,11 +0,0 @@ -%var bitname pm_gd -%var pkgname CSWpmgd -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -COPYRIGHT INFO - -The GD.pm interface is copyright 1995-2004, Lincoln D. Stein. It is -covered by the Perl "Artistic License", which allows for free usage -and redistribution. See the Artistic License in the Perl source -package for details. - Deleted: csw/mgar/pkg/cpan/GD/trunk/files/gdtest.diff =================================================================== --- csw/mgar/pkg/cpan/GD/trunk/files/gdtest.diff 2010-02-02 13:04:26 UTC (rev 8303) +++ csw/mgar/pkg/cpan/GD/trunk/files/gdtest.diff 2010-02-02 13:05:13 UTC (rev 8304) @@ -1,22 +0,0 @@ ---- GD-2.11.orig/t/GD.t 2003-03-04 18:25:11.000000000 -0800 -+++ GD-2.11/t/GD.t 2004-02-06 14:03:57.281462000 -0800 -@@ -5,6 +5,7 @@ - use FindBin qw($Bin); - use constant FONT=>"$Bin/Generic.ttf"; - use constant SKIP_TEST_8 => 1; -+use constant SKIP_TEST_10 => 1; - - my $loaded; - BEGIN {$| = 1; $loaded = 0; print "1..10\n"; } -@@ -57,7 +58,10 @@ - print "not ok ",9,"\n"; - } - --if (GD::Image->newFromJpeg('frog.jpg')) { -+if (SKIP_TEST_10) { -+ print "ok 10 # Skip, image looks the same, but is smaller\n"; -+} -+elsif (GD::Image->newFromJpeg('frog.jpg')) { - compare(test10('frog.jpg'),10); - } elsif ($@ =~/not built with jpeg support/) { - print "ok ",10," # Skip, no JPEG support\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 Tue Feb 2 15:10:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Feb 2010 14:10:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8305] csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile Message-ID: Revision: 8305 http://gar.svn.sourceforge.net/gar/?rev=8305&view=rev Author: dmichelsen Date: 2010-02-02 14:10:54 +0000 (Tue, 02 Feb 2010) Log Message: ----------- cpan/BerkeleyDB: Bind against BDB 4.8 Modified Paths: -------------- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2010-02-02 13:05:13 UTC (rev 8304) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2010-02-02 14:10:54 UTC (rev 8305) @@ -14,8 +14,8 @@ PATCHFILES = CSWpmberkeleydb.config.in.diff NOISALIST = 1 -EXTRA_LIB = /opt/csw/bdb47/lib +EXTRA_LIB = /opt/csw/bdb48/lib -REQUIRED_PKGS = CSWbdb47 +REQUIRED_PKGS = CSWbdb48 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Tue Feb 2 15:13:36 2010 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Tue, 02 Feb 2010 14:13:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8306] csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/ Makefile Message-ID: Revision: 8306 http://gar.svn.sourceforge.net/gar/?rev=8306&view=rev Author: d_pocock Date: 2010-02-02 14:13:36 +0000 (Tue, 02 Feb 2010) Log Message: ----------- Update for testing r2258 Modified Paths: -------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile 2010-02-02 14:10:54 UTC (rev 8305) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile 2010-02-02 14:13:36 UTC (rev 8306) @@ -1,5 +1,5 @@ GARNAME = ganglia -GARVERSION = 3.1.5.2215 +GARVERSION = 3.1.5.2258 CATEGORIES = utils # How should we set this? @@ -101,7 +101,7 @@ ifeq ($(GARVERSION),3.1.4) TEST_SCRIPTS = endif -ifeq ($(GARVERSION),3.1.5.2215) +ifeq ($(GARVERSION),3.1.5.2258) TEST_SCRIPTS = endif ifeq ($(GARVERSION),3.1.6) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Tue Feb 2 15:32:50 2010 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Tue, 02 Feb 2010 14:32:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8307] csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/ checksums Message-ID: Revision: 8307 http://gar.svn.sourceforge.net/gar/?rev=8307&view=rev Author: d_pocock Date: 2010-02-02 14:32:49 +0000 (Tue, 02 Feb 2010) Log Message: ----------- Update for testing r2258 Modified Paths: -------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums 2010-02-02 14:13:36 UTC (rev 8306) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums 2010-02-02 14:32:49 UTC (rev 8307) @@ -2,5 +2,5 @@ c4c333a46db391464e372ad8ede4993c download/CSWgangliaweb.preremove 25d302948e25837bf17757d5e23e4955 download/cswgmetad c6bb96c949dbb989d06ebb36b6af885d download/cswgmond -9d6af1b71352c78f04cd2202f06a9db6 download/ganglia-3.1.5.2215.tar.gz +cd33957a91bcf0fd5207002674faef0f download/ganglia-3.1.5.2258.tar.gz 2ff504ecb546aca2cdd6ee09af9a417e download/httpd-ganglia.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Feb 2 15:45:20 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Feb 2010 14:45:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8308] csw/mgar/pkg/cpan/BerkeleyDB/trunk Message-ID: Revision: 8308 http://gar.svn.sourceforge.net/gar/?rev=8308&view=rev Author: dmichelsen Date: 2010-02-02 14:45:20 +0000 (Tue, 02 Feb 2010) Log Message: ----------- cpan/BerkeleyDB: Fixes for BDB 4.8 Modified Paths: -------------- csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums 2010-02-02 14:32:49 UTC (rev 8307) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums 2010-02-02 14:45:20 UTC (rev 8308) @@ -1,2 +1,2 @@ 5941c90783a55ca4280c2963bbe1ac83 BerkeleyDB-0.41.tar.gz -2061f2f285714a1b6a014c5254e69b92 CSWpmberkeleydb.config.in.diff +766a4131a285539b805d42253f7d739c CSWpmberkeleydb.config.in.diff Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff 2010-02-02 14:32:49 UTC (rev 8307) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff 2010-02-02 14:45:20 UTC (rev 8308) @@ -6,7 +6,7 @@ #INCLUDE = /usr/local/include #INCLUDE = ../.. -INCLUDE = /usr/local/BerkeleyDB/include -+INCLUDE = /opt/csw/bdb47/include ++INCLUDE = /opt/csw/bdb48/include # 2. Where is libdb? # @@ -15,7 +15,7 @@ #LIB = /usr/local/lib #LIB = ../.. -LIB = /usr/local/BerkeleyDB/lib -+LIB = /opt/csw/bdb47/lib ++LIB = /opt/csw/bdb48/lib # 3. Is the library called libdb? # @@ -24,6 +24,6 @@ # you have picked. -#DBNAME = -ldb-3.0 -+DBNAME = -ldb-4.7 ++DBNAME = -ldb-4.8 # end of file config.in 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 Feb 2 15:50:45 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Feb 2010 14:50:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8309] csw/mgar/pkg/cpan/BerkeleyDB/trunk Message-ID: Revision: 8309 http://gar.svn.sourceforge.net/gar/?rev=8309&view=rev Author: dmichelsen Date: 2010-02-02 14:50:45 +0000 (Tue, 02 Feb 2010) Log Message: ----------- cpan/BerkeleyDB: Revert back to BDB 4.7 unless Perl has been compiled against 4.7 also Modified Paths: -------------- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2010-02-02 14:45:20 UTC (rev 8308) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2010-02-02 14:50:45 UTC (rev 8309) @@ -14,8 +14,8 @@ PATCHFILES = CSWpmberkeleydb.config.in.diff NOISALIST = 1 -EXTRA_LIB = /opt/csw/bdb48/lib +EXTRA_LIB = /opt/csw/bdb47/lib -REQUIRED_PKGS = CSWbdb48 +REQUIRED_PKGS = CSWbdb47 include gar/category.mk Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums 2010-02-02 14:45:20 UTC (rev 8308) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums 2010-02-02 14:50:45 UTC (rev 8309) @@ -1,2 +1,2 @@ 5941c90783a55ca4280c2963bbe1ac83 BerkeleyDB-0.41.tar.gz -766a4131a285539b805d42253f7d739c CSWpmberkeleydb.config.in.diff +2061f2f285714a1b6a014c5254e69b92 CSWpmberkeleydb.config.in.diff Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff 2010-02-02 14:45:20 UTC (rev 8308) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff 2010-02-02 14:50:45 UTC (rev 8309) @@ -6,7 +6,7 @@ #INCLUDE = /usr/local/include #INCLUDE = ../.. -INCLUDE = /usr/local/BerkeleyDB/include -+INCLUDE = /opt/csw/bdb48/include ++INCLUDE = /opt/csw/bdb47/include # 2. Where is libdb? # @@ -15,7 +15,7 @@ #LIB = /usr/local/lib #LIB = ../.. -LIB = /usr/local/BerkeleyDB/lib -+LIB = /opt/csw/bdb48/lib ++LIB = /opt/csw/bdb47/lib # 3. Is the library called libdb? # @@ -24,6 +24,6 @@ # you have picked. -#DBNAME = -ldb-3.0 -+DBNAME = -ldb-4.8 ++DBNAME = -ldb-4.7 # end of file config.in 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 Feb 2 15:51:28 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 02 Feb 2010 14:51:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[8310] csw/mgar/pkg/cpan/Filesys-Df/trunk Message-ID: Revision: 8310 http://gar.svn.sourceforge.net/gar/?rev=8310&view=rev Author: bonivart Date: 2010-02-02 14:51:27 +0000 (Tue, 02 Feb 2010) Log Message: ----------- pm_filesysdf: fix license Modified Paths: -------------- csw/mgar/pkg/cpan/Filesys-Df/trunk/Makefile csw/mgar/pkg/cpan/Filesys-Df/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Filesys-Df/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Filesys-Df/trunk/files/CSWpmfilesysdf.gspec Modified: csw/mgar/pkg/cpan/Filesys-Df/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Filesys-Df/trunk/Makefile 2010-02-02 14:50:45 UTC (rev 8309) +++ csw/mgar/pkg/cpan/Filesys-Df/trunk/Makefile 2010-02-02 14:51:27 UTC (rev 8310) @@ -9,9 +9,11 @@ endef DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWpmfilesysdf,) +DISTFILES += COPYING -# We define upstream file regex so we can be notifed of new upstream software release +PACKAGES = CSWpmfilesysdf +CATALOGNAME = pm_filesysdf + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod Modified: csw/mgar/pkg/cpan/Filesys-Df/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Filesys-Df/trunk/checksums 2010-02-02 14:50:45 UTC (rev 8309) +++ csw/mgar/pkg/cpan/Filesys-Df/trunk/checksums 2010-02-02 14:51:27 UTC (rev 8310) @@ -1,3 +1,2 @@ -a8b0aa3e5151a8a6c8b3067625980934 download/Filesys-Df-0.92.tar.gz -dfb40d287ccaf9c7613150cbec27a255 download/CSWpmfilesysdf.gspec -a8b0aa3e5151a8a6c8b3067625980934 download/Filesys-Df-0.92.tar.gz +94a2a7760d765cb56baa079b3ef66819 COPYING +a8b0aa3e5151a8a6c8b3067625980934 Filesys-Df-0.92.tar.gz Added: csw/mgar/pkg/cpan/Filesys-Df/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Filesys-Df/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Filesys-Df/trunk/files/COPYING 2010-02-02 14:51:27 UTC (rev 8310) @@ -0,0 +1,2 @@ +Copyright (c) 2006 Ian Guthrie. All rights reserved. This program is free software; +you can redistribute it and/or modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Filesys-Df/trunk/files/CSWpmfilesysdf.gspec =================================================================== --- csw/mgar/pkg/cpan/Filesys-Df/trunk/files/CSWpmfilesysdf.gspec 2010-02-02 14:50:45 UTC (rev 8309) +++ csw/mgar/pkg/cpan/Filesys-Df/trunk/files/CSWpmfilesysdf.gspec 2010-02-02 14:51:27 UTC (rev 8310) @@ -1,7 +0,0 @@ -%var bitname pm_filesysdf -%var pkgname CSWpmfilesysdf -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright - -Copyright (c) 2006 Ian Guthrie. All rights reserved. This program is free software; -you can redistribute it and/or modify it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Feb 2 16:10:38 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 02 Feb 2010 15:10:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8311] csw/mgar/pkg/cpan/HTML-Parser/trunk Message-ID: Revision: 8311 http://gar.svn.sourceforge.net/gar/?rev=8311&view=rev Author: bonivart Date: 2010-02-02 15:10:38 +0000 (Tue, 02 Feb 2010) Log Message: ----------- pm_htmlparser: update to 3.64 Modified Paths: -------------- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile csw/mgar/pkg/cpan/HTML-Parser/trunk/checksums csw/mgar/pkg/cpan/HTML-Parser/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2010-02-02 14:51:27 UTC (rev 8310) +++ csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2010-02-02 15:10:38 UTC (rev 8311) @@ -1,5 +1,5 @@ GARNAME = HTML-Parser -GARVERSION = 3.63 +GARVERSION = 3.64 CATEGORIES = cpan AUTHOR = GAAS @@ -11,14 +11,13 @@ invoked. endef +DISTFILES += COPYING PACKAGES = CSWpmhtmlparser CATALOGNAME = pm_htmlparser REQUIRED_PKGS = CSWpmhtmltagset -LICENSE = README - CONFIGURE_ARGS = -n include gar/category.mk Modified: csw/mgar/pkg/cpan/HTML-Parser/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/HTML-Parser/trunk/checksums 2010-02-02 14:51:27 UTC (rev 8310) +++ csw/mgar/pkg/cpan/HTML-Parser/trunk/checksums 2010-02-02 15:10:38 UTC (rev 8311) @@ -1,2 +1,2 @@ -f130661b0b1fe17619c2b60b729ebd39 COPYING -64d1d54411ea71f89c3bab23bfd14abc HTML-Parser-3.63.tar.gz +1b7b2684344443752a102fc95cfb2449 COPYING +26ceb6357e855b9e7aad5a5fd66d493e HTML-Parser-3.64.tar.gz Modified: csw/mgar/pkg/cpan/HTML-Parser/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/HTML-Parser/trunk/files/COPYING 2010-02-02 14:51:27 UTC (rev 8310) +++ csw/mgar/pkg/cpan/HTML-Parser/trunk/files/COPYING 2010-02-02 15:10:38 UTC (rev 8311) @@ -1,4 +1,6 @@ -1995-2004 Gisle Aas. All rights reserved. +COPYRIGHT + +1995-2009 Gisle Aas. All rights reserved. 1999-2000 Michael A. Chase. All rights reserved. This library is free software; you can redistribute it and/or modify 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 Feb 2 16:27:21 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Feb 2010 15:27:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8312] csw/mgar/pkg/cpan/XML-Parser/trunk Message-ID: Revision: 8312 http://gar.svn.sourceforge.net/gar/?rev=8312&view=rev Author: dmichelsen Date: 2010-02-02 15:27:21 +0000 (Tue, 02 Feb 2010) Log Message: ----------- cpan/XML-Parser: Update to 2.36 Modified Paths: -------------- csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile csw/mgar/pkg/cpan/XML-Parser/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/XML-Parser/trunk/files/CSWpmxmlparser.gspec Modified: csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile 2010-02-02 15:10:38 UTC (rev 8311) +++ csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile 2010-02-02 15:27:21 UTC (rev 8312) @@ -15,16 +15,12 @@ options given at XML::Parser creation time. endef +PACKAGES = CSWpmxmlparser +CATALOGNAME = pm_xmlparser -DISTFILES = $(call admfiles,CSWpmxmlparser,) +REQUIRED_PKGS = CSWexpat -REQUIRED_PKGS += CSWexpat - -DEPENDS += lib/expat - CONFIGURE_ARGS = EXPATINCPATH=$(includedir) CONFIGURE_ARGS += EXPATLIBPATH=$(libdir) -EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod - include gar/category.mk Modified: csw/mgar/pkg/cpan/XML-Parser/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-Parser/trunk/checksums 2010-02-02 15:10:38 UTC (rev 8311) +++ csw/mgar/pkg/cpan/XML-Parser/trunk/checksums 2010-02-02 15:27:21 UTC (rev 8312) @@ -1,4 +1 @@ -630e7ecbce358dd2572e5ef529676417 download/CSWpmxmlparser.gspec -9c8bed940180401cb0bfcd7761ad5c1a download/CSWpmxmlparser.depend -4b19d28451507cdd65880c1fce48718e download/CSWpmxmlparser.prototype -1b868962b658bd87e1563ecd56498ded download/XML-Parser-2.36.tar.gz +1b868962b658bd87e1563ecd56498ded XML-Parser-2.36.tar.gz Deleted: csw/mgar/pkg/cpan/XML-Parser/trunk/files/CSWpmxmlparser.gspec =================================================================== --- csw/mgar/pkg/cpan/XML-Parser/trunk/files/CSWpmxmlparser.gspec 2010-02-02 15:10:38 UTC (rev 8311) +++ csw/mgar/pkg/cpan/XML-Parser/trunk/files/CSWpmxmlparser.gspec 2010-02-02 15:27:21 UTC (rev 8312) @@ -1,8 +0,0 @@ -%var bitname pm_xmlparser -%var pkgname CSWpmxmlparser -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1998-2000 Larry Wall and Clark Cooper. -All rights reserved. -This program is free software; you can redistribute it and/or modify it -under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Feb 2 16:34:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Feb 2010 15:34:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8313] csw/mgar/pkg/cpan/XML-XPath/trunk Message-ID: Revision: 8313 http://gar.svn.sourceforge.net/gar/?rev=8313&view=rev Author: dmichelsen Date: 2010-02-02 15:34:48 +0000 (Tue, 02 Feb 2010) Log Message: ----------- cpan/XML-XPath: Move to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/XML-XPath/trunk/Makefile csw/mgar/pkg/cpan/XML-XPath/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/XML-XPath/trunk/files/CSWpmxmlxpath.depend csw/mgar/pkg/cpan/XML-XPath/trunk/files/CSWpmxmlxpath.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/XML-XPath/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-XPath/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/XML-XPath/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-XPath/trunk/Makefile 2010-02-02 15:27:21 UTC (rev 8312) +++ csw/mgar/pkg/cpan/XML-XPath/trunk/Makefile 2010-02-02 15:34:48 UTC (rev 8313) @@ -3,7 +3,7 @@ CATEGORIES = cpan AUTHOR = MSERGEANT -DESCRIPTION = a set of modules for parsing and evaluating XPath statements +DESCRIPTION = A set of modules for parsing and evaluating XPath statements define BLURB This module aims to comply exactly to the XPath specification at http://www.w3.org/TR/xpath and yet allow extensions to be added in the form @@ -11,8 +11,11 @@ support functionality beyond XPath. endef -DISTFILES += CSWpmxmlxpath.gspec CSWpmxmlxpath.depend +PACKAGES = CSWpmxmlxpath +CATALOGNAME = pm_xmlxpath -DEPENDS += cpan/XML-Parser +REQUIRED_PKGS = CSWpmxmlparser +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/XML-XPath/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-XPath/trunk/checksums 2010-02-02 15:27:21 UTC (rev 8312) +++ csw/mgar/pkg/cpan/XML-XPath/trunk/checksums 2010-02-02 15:34:48 UTC (rev 8313) @@ -1,3 +1 @@ -407c22dc5db755cdbfec29e0d5b71841 download/CSWpmxmlxpath.gspec -216480fc0798fb3627ad2e288bbcd56a download/CSWpmxmlxpath.depend -b5919d9220d83982feb6e2321850c5d7 download/XML-XPath-1.13.tar.gz +b5919d9220d83982feb6e2321850c5d7 XML-XPath-1.13.tar.gz Deleted: csw/mgar/pkg/cpan/XML-XPath/trunk/files/CSWpmxmlxpath.depend =================================================================== --- csw/mgar/pkg/cpan/XML-XPath/trunk/files/CSWpmxmlxpath.depend 2010-02-02 15:27:21 UTC (rev 8312) +++ csw/mgar/pkg/cpan/XML-XPath/trunk/files/CSWpmxmlxpath.depend 2010-02-02 15:34:48 UTC (rev 8313) @@ -1 +0,0 @@ -P CSWpmxmlparser pm_xmlparser - a module for parsing XML documents Deleted: csw/mgar/pkg/cpan/XML-XPath/trunk/files/CSWpmxmlxpath.gspec =================================================================== --- csw/mgar/pkg/cpan/XML-XPath/trunk/files/CSWpmxmlxpath.gspec 2010-02-02 15:27:21 UTC (rev 8312) +++ csw/mgar/pkg/cpan/XML-XPath/trunk/files/CSWpmxmlxpath.gspec 2010-02-02 15:34:48 UTC (rev 8313) @@ -1,9 +0,0 @@ -%var bitname pm_xmlxpath -%var pkgname CSWpmxmlxpath -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -This module is copyright 2000 AxKit.com Ltd. This is free -software, and as such comes with NO WARRANTY. No dates are used in this -module. You may distribute this module under the terms of either the -Gnu GPL, or the Artistic License (the same terms as Perl itself). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Feb 2 16:52:18 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Feb 2010 15:52:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8314] csw/mgar/pkg/cpan Message-ID: Revision: 8314 http://gar.svn.sourceforge.net/gar/?rev=8314&view=rev Author: dmichelsen Date: 2010-02-02 15:52:18 +0000 (Tue, 02 Feb 2010) Log Message: ----------- cpan/XML-TokeParser: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/XML-TokeParser/ csw/mgar/pkg/cpan/XML-TokeParser/branches/ csw/mgar/pkg/cpan/XML-TokeParser/tags/ csw/mgar/pkg/cpan/XML-TokeParser/trunk/ csw/mgar/pkg/cpan/XML-TokeParser/trunk/Makefile csw/mgar/pkg/cpan/XML-TokeParser/trunk/checksums csw/mgar/pkg/cpan/XML-TokeParser/trunk/files/ Property changes on: csw/mgar/pkg/cpan/XML-TokeParser/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/XML-TokeParser/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-TokeParser/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/XML-TokeParser/trunk/Makefile 2010-02-02 15:52:18 UTC (rev 8314) @@ -0,0 +1,18 @@ +GARNAME = XML-TokeParser +GARVERSION = 0.05 +CATEGORIES = cpan +AUTHOR = PODMASTER + +DESCRIPTION = Perl XML::TokeParser module +define BLURB + Simplified interface to XML::Parser +endef + +PACKAGES = CSWpmxmltokeparser +CATALOGNAME = pm_xmltokeparser + +REQUIRED_PKGS = CSWpmxmlparser + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/XML-TokeParser/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-TokeParser/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/XML-TokeParser/trunk/checksums 2010-02-02 15:52:18 UTC (rev 8314) @@ -0,0 +1 @@ +a886ac451d99dca522df20d7cf7b28b4 XML-TokeParser-0.05.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 Feb 2 16:59:52 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 02 Feb 2010 15:59:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8315] csw/mgar/pkg/cpan/WWW-Curl/trunk Message-ID: Revision: 8315 http://gar.svn.sourceforge.net/gar/?rev=8315&view=rev Author: bonivart Date: 2010-02-02 15:59:51 +0000 (Tue, 02 Feb 2010) Log Message: ----------- pm_wwwcurl: update to 4.11 Modified Paths: -------------- csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile csw/mgar/pkg/cpan/WWW-Curl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/WWW-Curl/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/WWW-Curl/trunk/files/CSWpmwwwcurl.gspec Modified: csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile 2010-02-02 15:52:18 UTC (rev 8314) +++ csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile 2010-02-02 15:59:51 UTC (rev 8315) @@ -1,20 +1,22 @@ GARNAME = WWW-Curl -GARVERSION = 4.05 +GARVERSION = 4.11 CATEGORIES = cpan AUTHOR = SZBALINT DESCRIPTION = Perl extension interface for libcurl define BLURB - The perl module WWW::Curl provides an interface to the cURL library "libcurl". + The perl module WWW::Curl provides an interface to the cURL library libcurl. endef -DISTFILES += $(call admfiles,CSWpmwwwcurl,) +DISTFILES += COPYING +PACKAGES = CSWpmwwwcurl +CATALOGNAME = pm_wwwcurl + REQUIRED_PKGS = CSWcurlrt CSWlibidn CSWoldaprt CSWosslrt CSWzlib EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod -#CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS = TEST_SCRIPTS = Modified: csw/mgar/pkg/cpan/WWW-Curl/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/WWW-Curl/trunk/checksums 2010-02-02 15:52:18 UTC (rev 8314) +++ csw/mgar/pkg/cpan/WWW-Curl/trunk/checksums 2010-02-02 15:59:51 UTC (rev 8315) @@ -1,2 +1,2 @@ -bd5fcf77cda277c8d7b8d81f39e02308 download/CSWpmwwwcurl.gspec -a49d09edc7491d9d8abec3ef79799853 download/WWW-Curl-4.05.tar.gz +db18751ba774bf0b6adce949b343ea21 COPYING +0fa0d459454dd37ff70033abcc0c64ab WWW-Curl-4.11.tar.gz Added: csw/mgar/pkg/cpan/WWW-Curl/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/WWW-Curl/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/WWW-Curl/trunk/files/COPYING 2010-02-02 15:59:51 UTC (rev 8315) @@ -0,0 +1,5 @@ +Copyright (C) 2000-2005, 2008-2009 Daniel Stenberg, Cris Bailiff, Balint Szilakszi, et al. +You may opt to use, copy, modify, merge, publish, distribute and/or sell +copies of the Software, and permit persons to whom the Software is +furnished to do so, under the terms of the MPL or the MIT/X-derivate +licenses. You may pick one of these licenses. Deleted: csw/mgar/pkg/cpan/WWW-Curl/trunk/files/CSWpmwwwcurl.gspec =================================================================== --- csw/mgar/pkg/cpan/WWW-Curl/trunk/files/CSWpmwwwcurl.gspec 2010-02-02 15:52:18 UTC (rev 8314) +++ csw/mgar/pkg/cpan/WWW-Curl/trunk/files/CSWpmwwwcurl.gspec 2010-02-02 15:59:51 UTC (rev 8315) @@ -1,9 +0,0 @@ -%var bitname pm_wwwcurl -%var pkgname CSWpmwwwcurl -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -You may opt to use, copy, modify, merge, publish, distribute and/or sell -copies of the Software, and permit persons to whom the Software is furnished -to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may -pick one of these licenses. 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 Feb 2 17:04:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Feb 2010 16:04:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8316] csw/mgar/pkg/cpan Message-ID: Revision: 8316 http://gar.svn.sourceforge.net/gar/?rev=8316&view=rev Author: dmichelsen Date: 2010-02-02 16:04:46 +0000 (Tue, 02 Feb 2010) Log Message: ----------- cpan/XML-Records: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/XML-Records/ csw/mgar/pkg/cpan/XML-Records/branches/ csw/mgar/pkg/cpan/XML-Records/tags/ csw/mgar/pkg/cpan/XML-Records/trunk/ csw/mgar/pkg/cpan/XML-Records/trunk/Makefile csw/mgar/pkg/cpan/XML-Records/trunk/checksums csw/mgar/pkg/cpan/XML-Records/trunk/files/ Property changes on: csw/mgar/pkg/cpan/XML-Records/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/XML-Records/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-Records/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/XML-Records/trunk/Makefile 2010-02-02 16:04:46 UTC (rev 8316) @@ -0,0 +1,21 @@ +GARNAME = XML-Records +GARVERSION = 0.12 +CATEGORIES = cpan +AUTHOR = EBOHLMAN + +DESCRIPTION = Perl XML::Records module +define BLURB + XML::Records provides a single interface for processing XML data + on a stream-oriented, tree-oriented, or record-oriented basis. + A subclass of XML::TokeParser, it adds methods to read "records" + and tree fragments from XML documents. +endef + +PACKAGES = CSWpmxmlrecords +CATALOGNAME = pm_xmlrecords + +REQUIRED_PKGS = CSWpmxmltokeparser + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/XML-Records/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-Records/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/XML-Records/trunk/checksums 2010-02-02 16:04:46 UTC (rev 8316) @@ -0,0 +1 @@ +cd430f237efb36752912601ccb870ca9 XML-Records-0.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 Tue Feb 2 17:09:28 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Feb 2010 16:09:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[8317] csw/mgar/pkg/cpan/Tie-IxHash/trunk Message-ID: Revision: 8317 http://gar.svn.sourceforge.net/gar/?rev=8317&view=rev Author: dmichelsen Date: 2010-02-02 16:09:27 +0000 (Tue, 02 Feb 2010) Log Message: ----------- cpan/Tie-IxHash: Move to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/Tie-IxHash/trunk/Makefile csw/mgar/pkg/cpan/Tie-IxHash/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Tie-IxHash/trunk/files/CSWpmtieixhash.depend csw/mgar/pkg/cpan/Tie-IxHash/trunk/files/CSWpmtieixhash.gspec csw/mgar/pkg/cpan/Tie-IxHash/trunk/files/CSWpmtieixhash.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Tie-IxHash/trunk/ Property changes on: csw/mgar/pkg/cpan/Tie-IxHash/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Tie-IxHash/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Tie-IxHash/trunk/Makefile 2010-02-02 16:04:46 UTC (rev 8316) +++ csw/mgar/pkg/cpan/Tie-IxHash/trunk/Makefile 2010-02-02 16:09:27 UTC (rev 8317) @@ -3,7 +3,7 @@ CATEGORIES = cpan AUTHOR = GSAR -DESCRIPTION = ordered associative arrays for Perl +DESCRIPTION = Ordered associative arrays for Perl define BLURB This Perl module implements Perl hashes that preserve the order in which the hash elements were added. The order is not affected when values @@ -12,6 +12,9 @@ operations can also be performed on the IxHash. endef -DISTFILES = $(call admfiles,CSWpmtieixhash,depend prototype) +PACKAGES = CSWpmtieixhash +CATALOGNAME = pm_tieixhash +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Tie-IxHash/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Tie-IxHash/trunk/checksums 2010-02-02 16:04:46 UTC (rev 8316) +++ csw/mgar/pkg/cpan/Tie-IxHash/trunk/checksums 2010-02-02 16:09:27 UTC (rev 8317) @@ -1,4 +1 @@ -c300424dbaea0442cff4da32466a5392 download/CSWpmtieixhash.gspec -6e0d583c86d7f74b43769810714242aa download/CSWpmtieixhash.depend -24bf1ec11d424963c69e98323dc55420 download/CSWpmtieixhash.prototype -567ddc13081596b52cfe3d82218cb264 download/Tie-IxHash-1.21.tar.gz +567ddc13081596b52cfe3d82218cb264 Tie-IxHash-1.21.tar.gz Deleted: csw/mgar/pkg/cpan/Tie-IxHash/trunk/files/CSWpmtieixhash.depend =================================================================== Deleted: csw/mgar/pkg/cpan/Tie-IxHash/trunk/files/CSWpmtieixhash.gspec =================================================================== --- csw/mgar/pkg/cpan/Tie-IxHash/trunk/files/CSWpmtieixhash.gspec 2010-02-02 16:04:46 UTC (rev 8316) +++ csw/mgar/pkg/cpan/Tie-IxHash/trunk/files/CSWpmtieixhash.gspec 2010-02-02 16:09:27 UTC (rev 8317) @@ -1,8 +0,0 @@ -%var bitname pm_tieixhash -%var pkgname CSWpmtieixhash -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1995 Gurusamy Sarathy. All rights reserved. -This program is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Tie-IxHash/trunk/files/CSWpmtieixhash.prototype =================================================================== --- csw/mgar/pkg/cpan/Tie-IxHash/trunk/files/CSWpmtieixhash.prototype 2010-02-02 16:04:46 UTC (rev 8316) +++ csw/mgar/pkg/cpan/Tie-IxHash/trunk/files/CSWpmtieixhash.prototype 2010-02-02 16:09:27 UTC (rev 8317) @@ -1,15 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Tie 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Tie/IxHash 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Tie/IxHash/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Tie::IxHash.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Tie 0755 root bin -f none /opt/csw/share/perl/csw/Tie/IxHash.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Feb 2 17:15:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Feb 2010 16:15:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8318] csw/mgar/pkg/cpan Message-ID: Revision: 8318 http://gar.svn.sourceforge.net/gar/?rev=8318&view=rev Author: dmichelsen Date: 2010-02-02 16:15:45 +0000 (Tue, 02 Feb 2010) Log Message: ----------- cpan/RADIUS-UserFile: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/RADIUS-UserFile/ csw/mgar/pkg/cpan/RADIUS-UserFile/branches/ csw/mgar/pkg/cpan/RADIUS-UserFile/tags/ csw/mgar/pkg/cpan/RADIUS-UserFile/trunk/ csw/mgar/pkg/cpan/RADIUS-UserFile/trunk/Makefile csw/mgar/pkg/cpan/RADIUS-UserFile/trunk/checksums csw/mgar/pkg/cpan/RADIUS-UserFile/trunk/files/ Property changes on: csw/mgar/pkg/cpan/RADIUS-UserFile/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/RADIUS-UserFile/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/RADIUS-UserFile/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/RADIUS-UserFile/trunk/Makefile 2010-02-02 16:15:45 UTC (rev 8318) @@ -0,0 +1,19 @@ +GARNAME = RADIUS-UserFile +GARVERSION = 1.01 +CATEGORIES = cpan +AUTHOR = OEVANS + +DESCRIPTION = Perl RADIUS::UserFile module +define BLURB + A module to manipulate information in a RADIUS users file. +endef + +PACKAGES = CSWpmradiususerfile +CATALOGNAME = pm_radiususerfile + +REQUIRED_PKGS = CSWpmtieixhash +PREREQUISITE_PKGS = $(REQUIRED_PKGS) + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/RADIUS-UserFile/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/RADIUS-UserFile/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/RADIUS-UserFile/trunk/checksums 2010-02-02 16:15:45 UTC (rev 8318) @@ -0,0 +1 @@ +e3fd8852d4440aa950098a28f6b788fc RADIUS-UserFile-1.01.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 Feb 2 17:26:44 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Feb 2010 16:26:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8319] csw/mgar/pkg/cpan Message-ID: Revision: 8319 http://gar.svn.sourceforge.net/gar/?rev=8319&view=rev Author: dmichelsen Date: 2010-02-02 16:26:44 +0000 (Tue, 02 Feb 2010) Log Message: ----------- cpan/Net-ext: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-ext/ csw/mgar/pkg/cpan/Net-ext/branches/ csw/mgar/pkg/cpan/Net-ext/tags/ csw/mgar/pkg/cpan/Net-ext/trunk/ csw/mgar/pkg/cpan/Net-ext/trunk/Makefile csw/mgar/pkg/cpan/Net-ext/trunk/checksums csw/mgar/pkg/cpan/Net-ext/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Net-ext/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-ext/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-ext/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-ext/trunk/Makefile 2010-02-02 16:26:44 UTC (rev 8319) @@ -0,0 +1,15 @@ +GARNAME = Net-ext +GARVERSION = 1.011 +CATEGORIES = cpan +AUTHOR = SPIDB + +DESCRIPTION = Perl Net::Inet module +define BLURB + Modules Net::Gen, Net::Inet, Net::TCP, Net::UDP, Net::UNIX, + Net::TCP::Server, and Net::UNIX::Server. +endef + +PACKAGES = CSWpmnetinet +CATALOGNAME = pm_netinet + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-ext/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-ext/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-ext/trunk/checksums 2010-02-02 16:26:44 UTC (rev 8319) @@ -0,0 +1 @@ +8be68650bef6769212127d2118b44736 Net-ext-1.011.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 Feb 2 17:42:06 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 02 Feb 2010 16:42:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8320] csw/mgar/pkg/cpan Message-ID: Revision: 8320 http://gar.svn.sourceforge.net/gar/?rev=8320&view=rev Author: bonivart Date: 2010-02-02 16:42:06 +0000 (Tue, 02 Feb 2010) Log Message: ----------- pm_gssapi: move to gar Added Paths: ----------- csw/mgar/pkg/cpan/GSSAPI/ csw/mgar/pkg/cpan/GSSAPI/branches/ csw/mgar/pkg/cpan/GSSAPI/tags/ csw/mgar/pkg/cpan/GSSAPI/trunk/ csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile csw/mgar/pkg/cpan/GSSAPI/trunk/checksums csw/mgar/pkg/cpan/GSSAPI/trunk/files/ csw/mgar/pkg/cpan/GSSAPI/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/GSSAPI/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile 2010-02-02 16:42:06 UTC (rev 8320) @@ -0,0 +1,18 @@ +GARNAME = GSSAPI +GARVERSION = 0.26 +CATEGORIES = cpan +AUTHOR = AGROLMS + +DESCRIPTION = Perl extension providing access to the GSSAPIv2 library +define BLURB + Perl extension providing access to the GSSAPIv2 library. +endef + +DISTFILES += COPYING + +PACKAGES = CSWpmgssapi +CATALOGNAME = pm_gssapi + +REQUIRED_PKGS = CSWkrb5lib + +include gar/category.mk Added: csw/mgar/pkg/cpan/GSSAPI/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/GSSAPI/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/GSSAPI/trunk/checksums 2010-02-02 16:42:06 UTC (rev 8320) @@ -0,0 +1,2 @@ +b386bc039a9a3bed7d79042a9c127bb1 COPYING +c113a8952a9b97541fb7fb9de4502ad6 GSSAPI-0.26.tar.gz Added: csw/mgar/pkg/cpan/GSSAPI/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/GSSAPI/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/GSSAPI/trunk/files/COPYING 2010-02-02 16:42:06 UTC (rev 8320) @@ -0,0 +1,5 @@ +Copyright (C) 2006, 2007 by Achim Grolms perl at grolmsnet.de + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself, either Perl version 5.8.4 or, +at your option, any later version of Perl 5 you may have available. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Feb 2 20:04:50 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 02 Feb 2010 19:04:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8321] csw/mgar/pkg/cpan/Template-Toolkit/trunk Message-ID: Revision: 8321 http://gar.svn.sourceforge.net/gar/?rev=8321&view=rev Author: bensons Date: 2010-02-02 19:04:50 +0000 (Tue, 02 Feb 2010) Log Message: ----------- cpan Template-Toolkit: updated to 2.22, take over package Modified Paths: -------------- csw/mgar/pkg/cpan/Template-Toolkit/trunk/Makefile csw/mgar/pkg/cpan/Template-Toolkit/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Template-Toolkit/trunk/files/CSWpmtt2-common.depend csw/mgar/pkg/cpan/Template-Toolkit/trunk/files/CSWpmtt2-common.gspec csw/mgar/pkg/cpan/Template-Toolkit/trunk/files/CSWpmtt2-common.prototype csw/mgar/pkg/cpan/Template-Toolkit/trunk/files/CSWpmtt2.depend csw/mgar/pkg/cpan/Template-Toolkit/trunk/files/CSWpmtt2.gspec csw/mgar/pkg/cpan/Template-Toolkit/trunk/files/CSWpmtt2.prototype Modified: csw/mgar/pkg/cpan/Template-Toolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Template-Toolkit/trunk/Makefile 2010-02-02 16:42:06 UTC (rev 8320) +++ csw/mgar/pkg/cpan/Template-Toolkit/trunk/Makefile 2010-02-02 19:04:50 UTC (rev 8321) @@ -1,5 +1,5 @@ GARNAME = Template-Toolkit -GARVERSION = 2.15 +GARVERSION = 2.22 CATEGORIES = cpan AUTHOR = ABW @@ -14,14 +14,11 @@ the Template Toolkit. endef -DISTFILES += $(call admfiles,CSWpmtt2,depend prototype) -DISTFILES += $(call admfiles,CSWpmtt2-common,depend prototype) +PACKAGES = CSWpmtt2 +CATALOGNAME = pm_tt2 -#DEPENDS += cpan/DBI -#DEPENDS += cpan/GD cpan/GDTextUtil cpan/GDGraph cpan/GDGraph3d -#DEPENDS += cpan/XML-Parser cpan/XML-RSS cpan/XML-XPath -DEPENDS += cpan/AppConfig -DEPENDS += cpan/Pod-POM cpan/XML-DOM +PREREQUISITE_PKGS = CSWpmxmldom CSWpmappconfig CSWpmpodpom +REQUIRED_PKGS = CSWpmxmldom CSWpmappconfig CSWpmpodpom CONFIGURE_ARGS = TT_PREFIX=$(DESTDIR)$(datadir)/tt2 CONFIGURE_ARGS += TT_ACCEPT=y Modified: csw/mgar/pkg/cpan/Template-Toolkit/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Template-Toolkit/trunk/checksums 2010-02-02 16:42:06 UTC (rev 8320) +++ csw/mgar/pkg/cpan/Template-Toolkit/trunk/checksums 2010-02-02 19:04:50 UTC (rev 8321) @@ -1,7 +1 @@ -bbcf3d45d295260cd78e4a467c56eba9 download/CSWpmtt2.gspec -320f6b89db8b6a46b8728b93d391c8b8 download/CSWpmtt2.depend -310a8b61c7b5159829809f5dc91952fa download/CSWpmtt2.prototype -4d3ce1bcb0ccf11091c8f4b2b48a96fd download/CSWpmtt2-common.gspec -d792277a9e572c2e53b6803d190bc749 download/CSWpmtt2-common.depend -005c9fc368ed966ead21248d9f83aa8a download/CSWpmtt2-common.prototype -26adb4e6d3f2f89e2b54a43f73b70a29 download/Template-Toolkit-2.15.tar.gz +d98277f6420e5da6b93d99a8db2b3934 Template-Toolkit-2.22.tar.gz Deleted: csw/mgar/pkg/cpan/Template-Toolkit/trunk/files/CSWpmtt2-common.depend =================================================================== --- csw/mgar/pkg/cpan/Template-Toolkit/trunk/files/CSWpmtt2-common.depend 2010-02-02 16:42:06 UTC (rev 8320) +++ csw/mgar/pkg/cpan/Template-Toolkit/trunk/files/CSWpmtt2-common.depend 2010-02-02 19:04:50 UTC (rev 8321) @@ -1,10 +0,0 @@ -P CSWpmgd pm_gd - interface to Gd Graphics Library -P CSWpmgdgraph pm_gdgraph - Graph plotting module for use with GD -P CSWpmgdgraph3d pm_gdgraph3d - 3d extensions module for GD::Graph -P CSWpmgdtextut pm_gdtextut - Text utilities for use with GD -P CSWpmpodpom pm_podpom - POD Object Model -P CSWpmxmldom pm_xmldom - module for building DOM Level 1 compliant document structures -P CSWpmxmlparser pm_xmlparser - a module for parsing XML documents -P CSWpmxmlrss pm_xmlrss - creates and updates RSS files -P CSWpmxmlxpath pm_xmlxpath - a set of modules for parsing and evaluating XPath statements -P CSWpmappconfig pm_appconfig - Perl5 module for configuration files and command line arguments. Deleted: csw/mgar/pkg/cpan/Template-Toolkit/trunk/files/CSWpmtt2-common.gspec =================================================================== --- csw/mgar/pkg/cpan/Template-Toolkit/trunk/files/CSWpmtt2-common.gspec 2010-02-02 16:42:06 UTC (rev 8320) +++ csw/mgar/pkg/cpan/Template-Toolkit/trunk/files/CSWpmtt2-common.gspec 2010-02-02 19:04:50 UTC (rev 8321) @@ -1,11 +0,0 @@ -%var bitname pm_tt2common -%var pkgname CSWpmtt2-common -%var desc Template Toolkit 2 (common) -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (C) 1996-2004 Andy Wardley. All Rights Reserved -Copyright (C) 1998-2002 Canon Research Centre Europe Ltd. - -This is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Template-Toolkit/trunk/files/CSWpmtt2-common.prototype =================================================================== --- csw/mgar/pkg/cpan/Template-Toolkit/trunk/files/CSWpmtt2-common.prototype 2010-02-02 16:42:06 UTC (rev 8320) +++ csw/mgar/pkg/cpan/Template-Toolkit/trunk/files/CSWpmtt2-common.prototype 2010-02-02 19:04:50 UTC (rev 8321) @@ -1,1512 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/tpage 0555 root bin -f none /opt/csw/bin/ttree 0555 root bin -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/Template 0755 root bin -f none /opt/csw/lib/perl/csw/Template.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Base.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Config.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Constants.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Context.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Directive.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Document.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Exception.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/FAQ.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Filters.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Grammar.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Iterator.pm 0444 root bin -d none /opt/csw/lib/perl/csw/Template/Library 0755 root bin -f none /opt/csw/lib/perl/csw/Template/Library/HTML.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Library/PostScript.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Library/Splash.pod 0444 root bin -d none /opt/csw/lib/perl/csw/Template/Manual 0755 root bin -f none /opt/csw/lib/perl/csw/Template/Manual.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Manual/Config.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Manual/Credits.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Manual/Directives.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Manual/Filters.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Manual/Internals.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Manual/Intro.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Manual/Plugins.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Manual/Refs.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Manual/Syntax.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Manual/VMethods.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Manual/Variables.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Manual/Views.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Modules.pod 0444 root bin -d none /opt/csw/lib/perl/csw/Template/Namespace 0755 root bin -f none /opt/csw/lib/perl/csw/Template/Namespace/Constants.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Parser.pm 0444 root bin -d none /opt/csw/lib/perl/csw/Template/Plugin 0755 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/Autoformat.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/CGI.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/Datafile.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/Date.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/Directory.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/Dumper.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/File.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/Filter.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/Format.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/HTML.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/Image.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/Iterator.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/Math.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/Pod.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/Procedural.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/String.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/Table.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/URL.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/View.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugin/Wrap.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Plugins.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Provider.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Service.pm 0444 root bin -d none /opt/csw/lib/perl/csw/Template/Stash 0755 root bin -f none /opt/csw/lib/perl/csw/Template/Stash.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Stash/Context.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Stash/XS.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Test.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Toolkit.pod 0444 root bin -d none /opt/csw/lib/perl/csw/Template/Tools 0755 root bin -f none /opt/csw/lib/perl/csw/Template/Tools/tpage.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Tools/ttree.pod 0444 root bin -d none /opt/csw/lib/perl/csw/Template/Tutorial 0755 root bin -f none /opt/csw/lib/perl/csw/Template/Tutorial.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Tutorial/Datafile.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/Tutorial/Web.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Template/View.pm 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Template 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Template/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/tpage.1 0444 root bin -f none /opt/csw/share/man/man1/ttree.1 0444 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Template.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Base.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Config.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Constants.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Context.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Document.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Exception.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::FAQ.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Filters.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Iterator.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Library::HTML.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Library::PostScript.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Library::Splash.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Manual.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Manual::Config.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Manual::Credits.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Manual::Directives.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Manual::Filters.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Manual::Internals.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Manual::Intro.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Manual::Plugins.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Manual::Refs.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Manual::Syntax.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Manual::VMethods.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Manual::Variables.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Manual::Views.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Modules.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Namespace::Constants.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Parser.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::Autoformat.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::CGI.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::Datafile.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::Date.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::Directory.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::Dumper.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::File.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::Filter.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::Format.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::HTML.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::Image.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::Iterator.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::Math.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::Pod.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::Procedural.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::String.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::Table.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::URL.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::View.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugin::Wrap.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Plugins.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Provider.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Service.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Stash.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Stash::Context.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Stash::XS.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Test.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Toolkit.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Tools::tpage.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Tools::ttree.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Tutorial.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Tutorial::Datafile.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::Tutorial::Web.3perl 0444 root bin -f none /opt/csw/share/man/man3/Template::View.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/tt2 0755 root bin -d none /opt/csw/share/tt2/docs 0755 root bin -f none /opt/csw/share/tt2/docs/README 0644 root bin -d none /opt/csw/share/tt2/docs/html 0755 root bin -d none /opt/csw/share/tt2/docs/html/FAQ 0755 root bin -f none /opt/csw/share/tt2/docs/html/FAQ/FAQ.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/FAQ/index.html 0644 root bin -d none /opt/csw/share/tt2/docs/html/Library 0755 root bin -f none /opt/csw/share/tt2/docs/html/Library/HTML.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Library/PostScript.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Library/Splash.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Library/index.html 0644 root bin -d none /opt/csw/share/tt2/docs/html/Manual 0755 root bin -f none /opt/csw/share/tt2/docs/html/Manual/Config.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Manual/Credits.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Manual/Directives.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Manual/Filters.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Manual/Internals.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Manual/Intro.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Manual/Plugins.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Manual/Refs.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Manual/Syntax.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Manual/VMethods.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Manual/Variables.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Manual/Views.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Manual/index.html 0644 root bin -d none /opt/csw/share/tt2/docs/html/Modules 0755 root bin -d none /opt/csw/share/tt2/docs/html/Modules/Template 0755 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Base.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Config.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Constants.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Context.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Document.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Exception.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Filters.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Iterator.html 0644 root bin -d none /opt/csw/share/tt2/docs/html/Modules/Template/Namespace 0755 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Namespace/Constants.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Parser.html 0644 root bin -d none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin 0755 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/Autoformat.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/CGI.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/Datafile.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/Date.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/Directory.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/Dumper.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/File.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/Filter.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/Format.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/HTML.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/Image.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/Iterator.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/Math.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/Pod.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/Procedural.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/String.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/Table.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/URL.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/View.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/Wrap.html 0644 root bin -d none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/XML 0755 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugin/XML/Style.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Plugins.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Provider.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Service.html 0644 root bin -d none /opt/csw/share/tt2/docs/html/Modules/Template/Stash 0755 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Stash.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Stash/Context.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Stash/XS.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Test.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/Template/Toolkit.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Modules/index.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/README 0644 root bin -d none /opt/csw/share/tt2/docs/html/Release 0755 root bin -f none /opt/csw/share/tt2/docs/html/Release/Changes.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Release/HACKING.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Release/INSTALL.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Release/README.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Release/TODO.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Release/index.html 0644 root bin -d none /opt/csw/share/tt2/docs/html/Tools 0755 root bin -f none /opt/csw/share/tt2/docs/html/Tools/index.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Tools/tpage.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Tools/ttree.html 0644 root bin -d none /opt/csw/share/tt2/docs/html/Tutorial 0755 root bin -f none /opt/csw/share/tt2/docs/html/Tutorial/Datafile.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Tutorial/Web.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/Tutorial/index.html 0644 root bin -f none /opt/csw/share/tt2/docs/html/index.html 0644 root bin -d none /opt/csw/share/tt2/docs/lib 0755 root bin -f none /opt/csw/share/tt2/docs/lib/config 0644 root bin -d none /opt/csw/share/tt2/docs/lib/docset 0755 root bin -f none /opt/csw/share/tt2/docs/lib/docset/config 0644 root bin -f none /opt/csw/share/tt2/docs/lib/footer 0644 root bin -f none /opt/csw/share/tt2/docs/lib/header 0644 root bin -f none /opt/csw/share/tt2/docs/lib/link 0644 root bin -f none /opt/csw/share/tt2/docs/lib/ndx 0644 root bin -f none /opt/csw/share/tt2/docs/lib/ndxitem 0644 root bin -f none /opt/csw/share/tt2/docs/lib/section 0644 root bin -f none /opt/csw/share/tt2/docs/lib/subsection 0644 root bin -f none /opt/csw/share/tt2/docs/lib/toc 0644 root bin -f none /opt/csw/share/tt2/docs/lib/tocitem 0644 root bin -d none /opt/csw/share/tt2/docs/src 0755 root bin -d none /opt/csw/share/tt2/docs/src/FAQ 0755 root bin -f none /opt/csw/share/tt2/docs/src/FAQ/FAQ.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/FAQ/index.html 0644 root bin -d none /opt/csw/share/tt2/docs/src/Library 0755 root bin -f none /opt/csw/share/tt2/docs/src/Library/HTML.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Library/PostScript.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Library/Splash.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Library/index.html 0644 root bin -d none /opt/csw/share/tt2/docs/src/Manual 0755 root bin -f none /opt/csw/share/tt2/docs/src/Manual/Config.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Manual/Credits.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Manual/Directives.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Manual/Filters.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Manual/Internals.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Manual/Intro.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Manual/Plugins.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Manual/Refs.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Manual/Syntax.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Manual/VMethods.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Manual/Variables.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Manual/Views.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Manual/index.html 0644 root bin -d none /opt/csw/share/tt2/docs/src/Modules 0755 root bin -d none /opt/csw/share/tt2/docs/src/Modules/Template 0755 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Base.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Config.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Constants.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Context.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Document.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Exception.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Filters.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Iterator.html 0644 root bin -d none /opt/csw/share/tt2/docs/src/Modules/Template/Namespace 0755 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Namespace/Constants.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Parser.html 0644 root bin -d none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin 0755 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/Autoformat.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/CGI.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/Datafile.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/Date.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/Directory.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/Dumper.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/File.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/Filter.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/Format.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/HTML.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/Image.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/Iterator.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/Math.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/Pod.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/Procedural.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/String.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/Table.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/URL.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/View.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/Wrap.html 0644 root bin -d none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/XML 0755 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugin/XML/Style.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Plugins.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Provider.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Service.html 0644 root bin -d none /opt/csw/share/tt2/docs/src/Modules/Template/Stash 0755 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Stash.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Stash/Context.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Stash/XS.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Test.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/Template/Toolkit.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Modules/index.html 0644 root bin -d none /opt/csw/share/tt2/docs/src/Release 0755 root bin -f none /opt/csw/share/tt2/docs/src/Release/Changes.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Release/HACKING.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Release/INSTALL.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Release/README.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Release/TODO.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Release/index.html 0644 root bin -d none /opt/csw/share/tt2/docs/src/Tools 0755 root bin -f none /opt/csw/share/tt2/docs/src/Tools/index.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Tools/tpage.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Tools/ttree.html 0644 root bin -d none /opt/csw/share/tt2/docs/src/Tutorial 0755 root bin -f none /opt/csw/share/tt2/docs/src/Tutorial/Datafile.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Tutorial/Web.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/Tutorial/index.html 0644 root bin -f none /opt/csw/share/tt2/docs/src/index.html 0644 root bin -d none /opt/csw/share/tt2/docs/style 0755 root bin -d none /opt/csw/share/tt2/docs/style/plain 0755 root bin -f none /opt/csw/share/tt2/docs/style/plain/booktabs 0644 root bin -f none /opt/csw/share/tt2/docs/style/plain/footer 0644 root bin -f none /opt/csw/share/tt2/docs/style/plain/header 0644 root bin -f none /opt/csw/share/tt2/docs/style/plain/navigate 0644 root bin -f none /opt/csw/share/tt2/docs/style/plain/pagemenu 0644 root bin -f none /opt/csw/share/tt2/docs/style/plain/section 0644 root bin -d none /opt/csw/share/tt2/docs/style/splash 0755 root bin -f none /opt/csw/share/tt2/docs/style/splash/booktabs 0644 root bin -f none /opt/csw/share/tt2/docs/style/splash/footer 0644 root bin -f none /opt/csw/share/tt2/docs/style/splash/header 0644 root bin -f none /opt/csw/share/tt2/docs/style/splash/menu 0644 root bin -f none /opt/csw/share/tt2/docs/style/splash/navigate 0644 root bin -f none /opt/csw/share/tt2/docs/style/splash/pagemenu 0644 root bin -f none /opt/csw/share/tt2/docs/style/splash/section 0644 root bin -f none /opt/csw/share/tt2/docs/ttree.cfg 0644 root bin -d none /opt/csw/share/tt2/examples 0755 root bin -f none /opt/csw/share/tt2/examples/README 0644 root bin -d none /opt/csw/share/tt2/examples/html 0755 root bin -f none /opt/csw/share/tt2/examples/html/README 0644 root bin -d none /opt/csw/share/tt2/examples/html/html 0755 root bin -f none /opt/csw/share/tt2/examples/html/html/bars.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/html/headers.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/html/index.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/html/links.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/html/lists.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/html/menus.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/html/rgb.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/html/tables.html 0644 root bin -d none /opt/csw/share/tt2/examples/html/ps 0755 root bin -f none /opt/csw/share/tt2/examples/html/ps/index.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/ps/marks.html 0644 root bin -d none /opt/csw/share/tt2/examples/html/splash 0755 root bin -f none /opt/csw/share/tt2/examples/html/splash/bar.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/box.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/button.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/colours.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/config.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/dropbox.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/frame.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/hair.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/icon.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/index.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/menu.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/menubar.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/panel.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/pulldown.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/tab.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/tabbox.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/tabsbox.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/tabset.html 0644 root bin -f none /opt/csw/share/tt2/examples/html/splash/text.html 0644 root bin -d none /opt/csw/share/tt2/examples/lib 0755 root bin -f none /opt/csw/share/tt2/examples/lib/README 0644 root bin -f none /opt/csw/share/tt2/examples/lib/config 0644 root bin -d none /opt/csw/share/tt2/examples/lib/example 0755 root bin -f none /opt/csw/share/tt2/examples/lib/example/README 0644 root bin -f none /opt/csw/share/tt2/examples/lib/example/break 0644 root bin -f none /opt/csw/share/tt2/examples/lib/example/html 0644 root bin -f none /opt/csw/share/tt2/examples/lib/example/output 0644 root bin -f none /opt/csw/share/tt2/examples/lib/example/source 0644 root bin -f none /opt/csw/share/tt2/examples/lib/example/split2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/example/split2ps 0644 root bin -f none /opt/csw/share/tt2/examples/lib/example/split3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/example/split50 0644 root bin -f none /opt/csw/share/tt2/examples/lib/example/switch50 0644 root bin -f none /opt/csw/share/tt2/examples/lib/example/tbreak 0644 root bin -f none /opt/csw/share/tt2/examples/lib/example/vsplit2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/example/vsplit2s 0644 root bin -f none /opt/csw/share/tt2/examples/lib/example/vsplit3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/example/vsplit50 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/README 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/html 0755 root bin -d none /opt/csw/share/tt2/examples/lib/examples/html/bars 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/bars/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/bars/10 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/bars/11 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/bars/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/bars/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/bars/4 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/bars/5 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/bars/6 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/bars/7 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/bars/8 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/bars/9 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/html/headers 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/headers/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/headers/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/headers/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/headers/4 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/headers/5 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/headers/6 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/headers/7 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/html/links 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/links/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/links/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/links/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/links/4 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/links/5 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/links/6 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/links/7 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/html/lists 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/lists/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/lists/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/lists/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/lists/4 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/lists/5 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/lists/6 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/lists/7 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/lists/8 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/html/menus 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/menus/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/menus/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/menus/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/menus/4 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/menus/5 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/menus/6 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/html/rgb 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/rgb/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/rgb/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/rgb/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/rgb/4 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/html/tables 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/tables/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/tables/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/tables/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/tables/4 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/html/tables/5 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/ps 0755 root bin -d none /opt/csw/share/tt2/examples/lib/examples/ps/marks 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/ps/marks/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/ps/marks/10 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/ps/marks/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/ps/marks/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/ps/marks/4 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/ps/marks/5 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/ps/marks/6 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/ps/marks/7 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/ps/marks/8 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/ps/marks/9 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash 0755 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash/bar 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/bar/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/bar/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/bar/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/bar/4 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/bar/5 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/bar/6 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/bar/7 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/bar/8 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash/box 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/box/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/box/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/box/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/box/4 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/box/5 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/box/6 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash/button 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/button/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/button/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/button/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/button/4 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/button/5 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/button/6 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/button/7 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash/config 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/config/1 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash/dropbox 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/dropbox/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/dropbox/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/dropbox/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/dropbox/4 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/dropbox/5 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash/frame 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/frame/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/frame/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/frame/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/frame/4 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/frame/5 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash/hair 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/hair/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/hair/2 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash/icon 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/icon/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/icon/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/icon/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/icon/4 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/icon/5 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/icon/6 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/icon/7 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash/menu 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/menu/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/menu/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/menu/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/menu/4 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/menu/5 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash/menubar 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/menubar/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/menubar/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/menubar/3 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash/panel 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/panel/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/panel/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/panel/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/panel/6 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/panel/7 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash/pulldown 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/pulldown/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/pulldown/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/pulldown/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/pulldown/4 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/pulldown/5 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash/tab 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tab/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tab/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tab/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tab/4 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tab/5 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tab/6 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash/tabbox 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tabbox/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tabbox/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tabbox/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tabbox/4 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash/tabsbox 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tabsbox/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tabsbox/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tabsbox/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tabsbox/4 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash/tabset 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tabset/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tabset/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tabset/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/tabset/4 0644 root bin -d none /opt/csw/share/tt2/examples/lib/examples/splash/text 0755 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/text/1 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/text/2 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/text/3 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/text/4 0644 root bin -f none /opt/csw/share/tt2/examples/lib/examples/splash/text/5 0644 root bin -f none /opt/csw/share/tt2/examples/lib/menu 0644 root bin -f none /opt/csw/share/tt2/examples/lib/page 0644 root bin -f none /opt/csw/share/tt2/examples/lib/source 0644 root bin -d none /opt/csw/share/tt2/examples/lib/splash 0755 root bin -d none /opt/csw/share/tt2/examples/lib/splash/about 0755 root bin -f none /opt/csw/share/tt2/examples/lib/splash/about/bar 0644 root bin -f none /opt/csw/share/tt2/examples/lib/splash/about/box 0644 root bin -f none /opt/csw/share/tt2/examples/lib/splash/about/button 0644 root bin -f none /opt/csw/share/tt2/examples/lib/splash/about/dropbox 0644 root bin -f none /opt/csw/share/tt2/examples/lib/splash/about/frame 0644 root bin -f none /opt/csw/share/tt2/examples/lib/splash/about/hair 0644 root bin -f none /opt/csw/share/tt2/examples/lib/splash/about/icon 0644 root bin -f none /opt/csw/share/tt2/examples/lib/splash/about/menu 0644 root bin -f none /opt/csw/share/tt2/examples/lib/splash/about/menubar 0644 root bin -f none /opt/csw/share/tt2/examples/lib/splash/about/panel 0644 root bin -f none /opt/csw/share/tt2/examples/lib/splash/about/pulldown 0644 root bin -f none /opt/csw/share/tt2/examples/lib/splash/about/tab 0644 root bin -f none /opt/csw/share/tt2/examples/lib/splash/about/tabbox 0644 root bin -f none /opt/csw/share/tt2/examples/lib/splash/about/tabsbox 0644 root bin -f none /opt/csw/share/tt2/examples/lib/splash/about/tabset 0644 root bin -f none /opt/csw/share/tt2/examples/lib/splash/about/text 0644 root bin -d none /opt/csw/share/tt2/examples/src 0755 root bin -d none /opt/csw/share/tt2/examples/src/html 0755 root bin -f none /opt/csw/share/tt2/examples/src/html/bars.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/html/headers.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/html/index.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/html/links.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/html/lists.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/html/menus.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/html/rgb.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/html/tables.html 0644 root bin -d none /opt/csw/share/tt2/examples/src/ps 0755 root bin -f none /opt/csw/share/tt2/examples/src/ps/index.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/ps/marks.html 0644 root bin -d none /opt/csw/share/tt2/examples/src/splash 0755 root bin -f none /opt/csw/share/tt2/examples/src/splash/bar.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/box.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/button.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/colours.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/config.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/dropbox.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/frame.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/hair.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/icon.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/index.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/menu.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/menubar.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/panel.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/pulldown.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/tab.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/tabbox.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/tabsbox.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/tabset.html 0644 root bin -f none /opt/csw/share/tt2/examples/src/splash/text.html 0644 root bin -f none /opt/csw/share/tt2/examples/ttree.cfg 0644 root bin -d none /opt/csw/share/tt2/images 0755 root bin -d none /opt/csw/share/tt2/images/splash 0755 root bin -d none /opt/csw/share/tt2/images/splash/aqua 0755 root bin -f none /opt/csw/share/tt2/images/splash/aqua/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/aqua/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/black 0755 root bin -f none /opt/csw/share/tt2/images/splash/black/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/black/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/blood 0755 root bin -f none /opt/csw/share/tt2/images/splash/blood/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blood/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/blue 0755 root bin -f none /opt/csw/share/tt2/images/splash/blue/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/blue25 0755 root bin -f none /opt/csw/share/tt2/images/splash/blue25/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue25/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/blue50 0755 root bin -f none /opt/csw/share/tt2/images/splash/blue50/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue50/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/blue75 0755 root bin -f none /opt/csw/share/tt2/images/splash/blue75/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/blue75/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/bud 0755 root bin -f none /opt/csw/share/tt2/images/splash/bud/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/bud/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/green 0755 root bin -f none /opt/csw/share/tt2/images/splash/green/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/green25 0755 root bin -f none /opt/csw/share/tt2/images/splash/green25/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green25/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/green50 0755 root bin -f none /opt/csw/share/tt2/images/splash/green50/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green50/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/green75 0755 root bin -f none /opt/csw/share/tt2/images/splash/green75/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/green75/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/grey25 0755 root bin -f none /opt/csw/share/tt2/images/splash/grey25/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey25/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/grey50 0755 root bin -f none /opt/csw/share/tt2/images/splash/grey50/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey50/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/grey75 0755 root bin -f none /opt/csw/share/tt2/images/splash/grey75/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/grey75/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/leaf 0755 root bin -f none /opt/csw/share/tt2/images/splash/leaf/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/leaf/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/lilac 0755 root bin -f none /opt/csw/share/tt2/images/splash/lilac/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/lilac/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/marine 0755 root bin -f none /opt/csw/share/tt2/images/splash/marine/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/marine/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/mauve 0755 root bin -f none /opt/csw/share/tt2/images/splash/mauve/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mauve/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/mint 0755 root bin -f none /opt/csw/share/tt2/images/splash/mint/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/mint/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/navy 0755 root bin -f none /opt/csw/share/tt2/images/splash/navy/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/navy/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/orange 0755 root bin -f none /opt/csw/share/tt2/images/splash/orange/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/orange/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/purple 0755 root bin -f none /opt/csw/share/tt2/images/splash/purple/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/purple/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/red 0755 root bin -f none /opt/csw/share/tt2/images/splash/red/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/red25 0755 root bin -f none /opt/csw/share/tt2/images/splash/red25/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red25/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/red50 0755 root bin -f none /opt/csw/share/tt2/images/splash/red50/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red50/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/red75 0755 root bin -f none /opt/csw/share/tt2/images/splash/red75/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/red75/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/rose 0755 root bin -f none /opt/csw/share/tt2/images/splash/rose/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/tr.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/trhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/rose/up.gif 0644 root bin -d none /opt/csw/share/tt2/images/splash/scarlet 0755 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/bl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/blhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/box.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/br.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/brhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/diamond.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/dot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/down.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/horz.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/left.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/minus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/negbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/plus.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/posbox.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/right.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/ring.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/ringdot.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/single.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/square.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/tl.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/tlhair.gif 0644 root bin -f none /opt/csw/share/tt2/images/splash/scarlet/tr.gif 0644 root bin @@ 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 rthurner at users.sourceforge.net Tue Feb 2 22:05:11 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 02 Feb 2010 21:05:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8322] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 8322 http://gar.svn.sourceforge.net/gar/?rev=8322&view=rev Author: rthurner Date: 2010-02-02 21:05:11 +0000 (Tue, 02 Feb 2010) Log Message: ----------- mercurial - update to hg-1.4.3 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2010-02-02 19:04:50 UTC (rev 8321) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-02-02 21:05:11 UTC (rev 8322) @@ -1,5 +1,5 @@ GARNAME = mercurial -GARVERSION = 1.4.2 +GARVERSION = 1.4.3 CATEGORIES = devel DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2010-02-02 19:04:50 UTC (rev 8321) +++ csw/mgar/pkg/mercurial/trunk/checksums 2010-02-02 21:05:11 UTC (rev 8322) @@ -1 +1 @@ -cf23b0887f0437c8601d5b89ae4663a6 mercurial-1.4.2.tar.gz +b075a2a6a08c10405ef3483aecb1a991 mercurial-1.4.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Feb 3 09:34:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Feb 2010 08:34:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[8323] csw/mgar/pkg/cpan/MIME-Types/trunk Message-ID: Revision: 8323 http://gar.svn.sourceforge.net/gar/?rev=8323&view=rev Author: dmichelsen Date: 2010-02-03 08:34:27 +0000 (Wed, 03 Feb 2010) Log Message: ----------- cpan/MIME-Types: Update to 1.28 Modified Paths: -------------- csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile csw/mgar/pkg/cpan/MIME-Types/trunk/checksums Modified: csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile 2010-02-02 21:05:11 UTC (rev 8322) +++ csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile 2010-02-03 08:34:27 UTC (rev 8323) @@ -1,5 +1,5 @@ GARNAME = MIME-Types -GARVERSION = 1.27 +GARVERSION = 1.28 CATEGORIES = cpan AUTHOR = MARKOV Modified: csw/mgar/pkg/cpan/MIME-Types/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/MIME-Types/trunk/checksums 2010-02-02 21:05:11 UTC (rev 8322) +++ csw/mgar/pkg/cpan/MIME-Types/trunk/checksums 2010-02-03 08:34:27 UTC (rev 8323) @@ -1 +1 @@ -9407dfdd3a5adb7bf569ed2a184f1640 download/MIME-Types-1.27.tar.gz +5fe537d9d803c43a36c3c55623c2d6da MIME-Types-1.28.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 Feb 3 09:44:57 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Feb 2010 08:44:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8324] csw/mgar/pkg/cpan Message-ID: Revision: 8324 http://gar.svn.sourceforge.net/gar/?rev=8324&view=rev Author: dmichelsen Date: 2010-02-03 08:44:57 +0000 (Wed, 03 Feb 2010) Log Message: ----------- cpan/Test-Simple: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Test-Simple/ csw/mgar/pkg/cpan/Test-Simple/branches/ csw/mgar/pkg/cpan/Test-Simple/tags/ csw/mgar/pkg/cpan/Test-Simple/trunk/ csw/mgar/pkg/cpan/Test-Simple/trunk/Makefile csw/mgar/pkg/cpan/Test-Simple/trunk/checksums csw/mgar/pkg/cpan/Test-Simple/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Test-Simple/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Test-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Simple/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Test-Simple/trunk/Makefile 2010-02-03 08:44:57 UTC (rev 8324) @@ -0,0 +1,19 @@ +GARNAME = Test-Simple +GARVERSION = 0.94 +CATEGORIES = cpan +AUTHOR = MSCHWERN + +DESCRIPTION = Basic utilities for writing tests +define BLURB + This is an extremely simple, extremely basic module for writing + tests suitable for CPAN modules and other pursuits. If you wish + to do more complicated testing, use the Test::More module + (a drop-in replacement for this one). +endef + +PACKAGES = CSWpmtestsimple +CATALOGNAME = pm_testsimple + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Test-Simple/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-Simple/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Test-Simple/trunk/checksums 2010-02-03 08:44:57 UTC (rev 8324) @@ -0,0 +1 @@ +e4e09d8bf2cc73124152ba2c45c95b5b Test-Simple-0.94.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 Feb 3 10:07:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Feb 2010 09:07:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[8325] csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile Message-ID: Revision: 8325 http://gar.svn.sourceforge.net/gar/?rev=8325&view=rev Author: dmichelsen Date: 2010-02-03 09:07:27 +0000 (Wed, 03 Feb 2010) Log Message: ----------- cpan/MIME-Types: Add prerequisite Modified Paths: -------------- csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile Modified: csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile 2010-02-03 08:44:57 UTC (rev 8324) +++ csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile 2010-02-03 09:07:27 UTC (rev 8325) @@ -14,6 +14,8 @@ PACKAGES = CSWpmmimetypes CATALOGNAME = pm_mimetypes +PREREQUISITE_PKGS = CSWpmtestpod + ARCHALL = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Feb 3 10:09:13 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Feb 2010 09:09:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8326] csw/mgar/pkg/cpan/MIME-Lite/trunk Message-ID: Revision: 8326 http://gar.svn.sourceforge.net/gar/?rev=8326&view=rev Author: dmichelsen Date: 2010-02-03 09:09:13 +0000 (Wed, 03 Feb 2010) Log Message: ----------- cpan/MIME-Lite: Complete make-over to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/MIME-Lite/trunk/Makefile csw/mgar/pkg/cpan/MIME-Lite/trunk/checksums csw/mgar/pkg/cpan/MIME-Lite/trunk/files/config.diff Added Paths: ----------- csw/mgar/pkg/cpan/MIME-Lite/trunk/files/0001-Skip-prompting.patch Removed Paths: ------------- csw/mgar/pkg/cpan/MIME-Lite/trunk/files/CSWpmmimelite.depend csw/mgar/pkg/cpan/MIME-Lite/trunk/files/CSWpmmimelite.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/MIME-Lite/trunk/ Property changes on: csw/mgar/pkg/cpan/MIME-Lite/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/MIME-Lite/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-Lite/trunk/Makefile 2010-02-03 09:07:27 UTC (rev 8325) +++ csw/mgar/pkg/cpan/MIME-Lite/trunk/Makefile 2010-02-03 09:09:13 UTC (rev 8326) @@ -1,9 +1,9 @@ GARNAME = MIME-Lite -GARVERSION = 3.01_04 +GARVERSION = 3.027 CATEGORIES = cpan -AUTHOR = YVES +AUTHOR = RJBS -DESCRIPTION = low-calorie MIME generator +DESCRIPTION = Perl low-calorie MIME generator define BLURB MIME::Lite is intended as a simple, standalone module for generating (not parsing!) MIME messages... specifically, it allows you to output a simple, @@ -11,15 +11,15 @@ does not require that you have the Mail:: or MIME:: modules installed. endef -DISTFILES += CSWpmmimelite.gspec CSWpmmimelite.depend +PACKAGES = CSWpmmimelite +CATALOGNAME = pm_mimelite -# Always add the prerequisite modules -PATCHFILES = config.diff +REQUIRED_PKGS = CSWpmmimetypes CSWpmmailtools CSWpmemaildateformat +PREREQUISITE_PKGS = $(REQUIRED_PKGS) -DEPENDS += cpan/MIME-Types +# Do not prompt for stuff +PATCHFILES = 0001-Skip-prompting.patch -# Test seems to work, but wierd test harness makes it difficult -# to tell why the test fails. Disable for now. -TEST_SCRIPTS = +ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/MIME-Lite/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/MIME-Lite/trunk/checksums 2010-02-03 09:07:27 UTC (rev 8325) +++ csw/mgar/pkg/cpan/MIME-Lite/trunk/checksums 2010-02-03 09:09:13 UTC (rev 8326) @@ -1,4 +1,2 @@ -ec8e4c88c1b865c85d5b9f5475217aaa download/CSWpmmimelite.gspec -15fcda8ed992eae8ad3b2d92bce5a2e6 download/CSWpmmimelite.depend -efaecdde18b40ca57e1ef440a4b4c742 download/MIME-Lite-3.01_04.tar.gz -be573c9365b3e5b1b974c95a2116d99f download/config.diff +28916ea06f829171267766874ccefeec 0001-Skip-prompting.patch +e857febd66c45f2a5919b031fbe70aa7 MIME-Lite-3.027.tar.gz Added: csw/mgar/pkg/cpan/MIME-Lite/trunk/files/0001-Skip-prompting.patch =================================================================== --- csw/mgar/pkg/cpan/MIME-Lite/trunk/files/0001-Skip-prompting.patch (rev 0) +++ csw/mgar/pkg/cpan/MIME-Lite/trunk/files/0001-Skip-prompting.patch 2010-02-03 09:09:13 UTC (rev 8326) @@ -0,0 +1,34 @@ +From 86a30aff5287b758ebccdc5d6d96165b9ba83773 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 2 Feb 2010 17:52:02 +0100 +Subject: [PATCH] Skip prompting + +--- + Makefile.PL | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.PL b/Makefile.PL +index 2b0fa6e..cdfeac7 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -21,7 +21,7 @@ my %prereq = ( + 'File::Spec' => 0, + 'Email::Date::Format' => '1.000', # first release + ); +-if (prompt("Add prereqs?",'Yes')=~/y/i) { ++#if (prompt("Add prereqs?",'Yes')=~/y/i) { + %prereq=( %prereq, + 'Mail::Address' => 1.62, + 'MIME::Types' => 1.28, +@@ -29,7 +29,7 @@ if (prompt("Add prereqs?",'Yes')=~/y/i) { + 'MIME::Base64' => undef, + 'MIME::QuotedPrint' => undef, + ); +-} ++#} + + # Write the Makefile: + WriteMakefile( +-- +1.6.6 + Deleted: csw/mgar/pkg/cpan/MIME-Lite/trunk/files/CSWpmmimelite.depend =================================================================== --- csw/mgar/pkg/cpan/MIME-Lite/trunk/files/CSWpmmimelite.depend 2010-02-03 09:07:27 UTC (rev 8325) +++ csw/mgar/pkg/cpan/MIME-Lite/trunk/files/CSWpmmimelite.depend 2010-02-03 09:09:13 UTC (rev 8326) @@ -1 +0,0 @@ -P CSWpmmimetypes pm_mimetypes - definition of MIME types Deleted: csw/mgar/pkg/cpan/MIME-Lite/trunk/files/CSWpmmimelite.gspec =================================================================== --- csw/mgar/pkg/cpan/MIME-Lite/trunk/files/CSWpmmimelite.gspec 2010-02-03 09:07:27 UTC (rev 8325) +++ csw/mgar/pkg/cpan/MIME-Lite/trunk/files/CSWpmmimelite.gspec 2010-02-03 09:09:13 UTC (rev 8326) @@ -1,5 +0,0 @@ -%var bitname pm_mimelite -%var pkgname CSWpmmimelite -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/COPYING Modified: csw/mgar/pkg/cpan/MIME-Lite/trunk/files/config.diff =================================================================== --- csw/mgar/pkg/cpan/MIME-Lite/trunk/files/config.diff 2010-02-03 09:07:27 UTC (rev 8325) +++ csw/mgar/pkg/cpan/MIME-Lite/trunk/files/config.diff 2010-02-03 09:09:13 UTC (rev 8326) @@ -2,35 +2,35 @@ --- MIME-Lite-3.01_04.orig/Makefile.PL 2004-05-07 10:04:57.000000000 -0700 +++ MIME-Lite-3.01_04/Makefile.PL 2004-05-17 16:17:26.501373000 -0700 @@ -5,6 +5,8 @@ - # Makefile: - #------------------------------------------------------------ - -+=head1 COMMENTED -+ - print "MIME::Lite is designed to take advantage of a variety of external modules\n", - "if they are not present then MIME::Lite will attempt to do its best\n", - "but its strongly recommend that you install them.\n\n", + # Makefile: + #------------------------------------------------------------ + ++=head1 COMMENTED ++ + print "MIME::Lite is designed to take advantage of a variety of external modules\n", + "if they are not present then MIME::Lite will attempt to do its best\n", + "but its strongly recommend that you install them.\n\n", @@ -19,15 +21,22 @@ - "automatically installed if they arent already present\n"; - my %prereq; - if (prompt("Add prereqs?",'Yes')=~/y/i) { -- %prereq=( -+ -+=cut -+ -+ my %prereq=( - 'Mail::Address' => 1.62, - 'MIME::Types' => 1.13, - 'File::Basename' => undef, - 'MIME::Base64' => undef, - 'MIME::QuotedPrint' => undef, - ); -+ -+=head1 COMMENTED -+ - } - -+=cut - - - + "automatically installed if they arent already present\n"; + my %prereq; + if (prompt("Add prereqs?",'Yes')=~/y/i) { +- %prereq=( ++ ++=cut ++ ++ my %prereq=( + 'Mail::Address' => 1.62, + 'MIME::Types' => 1.13, + 'File::Basename' => undef, + 'MIME::Base64' => undef, + 'MIME::QuotedPrint' => undef, + ); ++ ++=head1 COMMENTED ++ + } + ++=cut + + + 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 Feb 3 10:48:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Feb 2010 09:48:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8327] csw/mgar/pkg/cpan/SOAP-Lite/trunk Message-ID: Revision: 8327 http://gar.svn.sourceforge.net/gar/?rev=8327&view=rev Author: dmichelsen Date: 2010-02-03 09:48:58 +0000 (Wed, 03 Feb 2010) Log Message: ----------- cpan/SOAP-Lite: Complete makeover to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile csw/mgar/pkg/cpan/SOAP-Lite/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/CSWpmsoaplite.depend csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/CSWpmsoaplite.gspec csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/CSWpmsoaplite.prototype csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/noprompt.diff Property Changed: ---------------- csw/mgar/pkg/cpan/SOAP-Lite/trunk/ Property changes on: csw/mgar/pkg/cpan/SOAP-Lite/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile 2010-02-03 09:09:13 UTC (rev 8326) +++ csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile 2010-02-03 09:48:58 UTC (rev 8327) @@ -1,25 +1,24 @@ GARNAME = SOAP-Lite -GARVERSION = 0.69 +GARVERSION = 0.710.10 CATEGORIES = cpan -AUTHOR = BYRNE +AUTHOR = MKUTTER -DESCRIPTION = client and server side SOAP implementation +DESCRIPTION = Client and server side SOAP implementation define BLURB SOAP::Lite is a collection of Perl modules which provides a simple and lightweight interface to the Simple Object Access Protocol (SOAP) both on client and server side. endef -DISTFILES += $(call admfiles,CSWpmsoaplite,depend prototype) +REQUIRED_PKGS = CSWpmiocompress CSWpmlibwww CSWpmmimelite CSWpmmimetools CSWpmuri CSWpmxmlparser +PREREQUISITE_PKGS = $(REQUIRED_PKGS) -DEPENDS += cpan/URI -DEPENDS += cpan/XML-Parser -DEPENDS += cpan/libwww-perl -DEPENDS += cpan/MIME-Lite -DEPENDS += cpan/MIME-tools -DEPENDS += cpan/Compress-Zlib +PACKAGES = CSWpmsoaplite +CATALOGNAME = pm_soaplite CONFIGURE_ARGS = --noprompt +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/SOAP-Lite/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/SOAP-Lite/trunk/checksums 2010-02-03 09:09:13 UTC (rev 8326) +++ csw/mgar/pkg/cpan/SOAP-Lite/trunk/checksums 2010-02-03 09:48:58 UTC (rev 8327) @@ -1,4 +1 @@ -6a115c2651c9b0c91b251fdd78ab2efa download/CSWpmsoaplite.gspec -57fea8ba27285c394e4a12b00e8dd190 download/CSWpmsoaplite.depend -298b21be16f52f580201ae99589dd821 download/CSWpmsoaplite.prototype -24e0c656a6a7047c91f7f3f3b5c36513 download/SOAP-Lite-0.69.tar.gz +45d6679daac03fe4eb604a5b5f416fd5 SOAP-Lite-0.710.10.tar.gz Deleted: csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/CSWpmsoaplite.depend =================================================================== --- csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/CSWpmsoaplite.depend 2010-02-03 09:09:13 UTC (rev 8326) +++ csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/CSWpmsoaplite.depend 2010-02-03 09:48:58 UTC (rev 8327) @@ -1,6 +0,0 @@ -P CSWpmcompresszlib pm_compresszlib - Interface to zlib compression library -P CSWpmlibwww pm_libwww - a general-purpose Web API for Perl, based on W3C libwww. -P CSWpmmimelite pm_mimelite - low-calorie MIME generator -P CSWpmmimetools pm_mimetools - modules for parsing and creating MIME entities -P CSWpmuri pm_uri - Uniform Resource Identifiers (absolute and relative) -P CSWpmxmlparser pm_xmlparser - a module for parsing XML documents Deleted: csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/CSWpmsoaplite.gspec =================================================================== --- csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/CSWpmsoaplite.gspec 2010-02-03 09:09:13 UTC (rev 8326) +++ csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/CSWpmsoaplite.gspec 2010-02-03 09:48:58 UTC (rev 8327) @@ -1,9 +0,0 @@ -%var bitname pm_soaplite -%var pkgname CSWpmsoaplite -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (C) 2000-2001 Paul Kulchenko. All rights reserved. - -This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/CSWpmsoaplite.prototype =================================================================== --- csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/CSWpmsoaplite.prototype 2010-02-03 09:09:13 UTC (rev 8326) +++ csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/CSWpmsoaplite.prototype 2010-02-03 09:48:58 UTC (rev 8327) @@ -1,114 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/SOAPsh.pl 0555 root bin -f none /opt/csw/bin/XMLRPCsh.pl 0555 root bin -f none /opt/csw/bin/stubmaker.pl 0555 root bin -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/SOAP 0755 root bin -d none /opt/csw/lib/perl/csw/auto/SOAP/Lite 0755 root bin -f none /opt/csw/lib/perl/csw/auto/SOAP/Lite/.packlist 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/SOAPsh.pl.1 0444 root bin -f none /opt/csw/share/man/man1/XMLRPCsh.pl.1 0444 root bin -f none /opt/csw/share/man/man1/stubmaker.pl.1 0444 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Apache::SOAP.3perl 0444 root bin -f none /opt/csw/share/man/man3/Apache::XMLRPC::Lite.3perl 0444 root bin -f none /opt/csw/share/man/man3/OldDocs::SOAP::Lite.3perl 0444 root bin -f none /opt/csw/share/man/man3/OldDocs::SOAP::Transport::FTP.3perl 0444 root bin -f none /opt/csw/share/man/man3/OldDocs::SOAP::Transport::HTTP.3perl 0444 root bin -f none /opt/csw/share/man/man3/OldDocs::SOAP::Transport::IO.3perl 0444 root bin -f none /opt/csw/share/man/man3/OldDocs::SOAP::Transport::JABBER.3perl 0444 root bin -f none /opt/csw/share/man/man3/OldDocs::SOAP::Transport::LOCAL.3perl 0444 root bin -f none /opt/csw/share/man/man3/OldDocs::SOAP::Transport::MAILTO.3perl 0444 root bin -f none /opt/csw/share/man/man3/OldDocs::SOAP::Transport::MQ.3perl 0444 root bin -f none /opt/csw/share/man/man3/OldDocs::SOAP::Transport::POP3.3perl 0444 root bin -f none /opt/csw/share/man/man3/OldDocs::SOAP::Transport::TCP.3perl 0444 root bin -f none /opt/csw/share/man/man3/SOAP::Client.3perl 0444 root bin -f none /opt/csw/share/man/man3/SOAP::Constants.3perl 0444 root bin -f none /opt/csw/share/man/man3/SOAP::Data.3perl 0444 root bin -f none /opt/csw/share/man/man3/SOAP::Deserializer.3perl 0444 root bin -f none /opt/csw/share/man/man3/SOAP::Fault.3perl 0444 root bin -f none /opt/csw/share/man/man3/SOAP::Header.3perl 0444 root bin -f none /opt/csw/share/man/man3/SOAP::Lite.3perl 0444 root bin -f none /opt/csw/share/man/man3/SOAP::Packager.3perl 0444 root bin -f none /opt/csw/share/man/man3/SOAP::SOM.3perl 0444 root bin -f none /opt/csw/share/man/man3/SOAP::Schema.3perl 0444 root bin -f none /opt/csw/share/man/man3/SOAP::Serializer.3perl 0444 root bin -f none /opt/csw/share/man/man3/SOAP::Server.3perl 0444 root bin -f none /opt/csw/share/man/man3/SOAP::Test.3perl 0444 root bin -f none /opt/csw/share/man/man3/SOAP::Trace.3perl 0444 root bin -f none /opt/csw/share/man/man3/SOAP::Transport.3perl 0444 root bin -f none /opt/csw/share/man/man3/SOAP::Transport::POP3.3perl 0444 root bin -f none /opt/csw/share/man/man3/SOAP::Utils.3perl 0444 root bin -f none /opt/csw/share/man/man3/UDDI::Lite.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::Parser::Lite.3perl 0444 root bin -f none /opt/csw/share/man/man3/XMLRPC::Lite.3perl 0444 root bin -f none /opt/csw/share/man/man3/XMLRPC::Test.3perl 0444 root bin -f none /opt/csw/share/man/man3/XMLRPC::Transport::HTTP.3perl 0444 root bin -f none /opt/csw/share/man/man3/XMLRPC::Transport::POP3.3perl 0444 root bin -f none /opt/csw/share/man/man3/XMLRPC::Transport::TCP.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Apache 0755 root bin -f none /opt/csw/share/perl/csw/Apache/SOAP.pm 0444 root bin -d none /opt/csw/share/perl/csw/Apache/XMLRPC 0755 root bin -f none /opt/csw/share/perl/csw/Apache/XMLRPC/Lite.pm 0444 root bin -d none /opt/csw/share/perl/csw/IO 0755 root bin -f none /opt/csw/share/perl/csw/IO/SessionData.pm 0444 root bin -f none /opt/csw/share/perl/csw/IO/SessionSet.pm 0444 root bin -d none /opt/csw/share/perl/csw/OldDocs 0755 root bin -d none /opt/csw/share/perl/csw/OldDocs/SOAP 0755 root bin -f none /opt/csw/share/perl/csw/OldDocs/SOAP/Lite.pm 0444 root bin -d none /opt/csw/share/perl/csw/OldDocs/SOAP/Transport 0755 root bin -f none /opt/csw/share/perl/csw/OldDocs/SOAP/Transport/FTP.pm 0444 root bin -f none /opt/csw/share/perl/csw/OldDocs/SOAP/Transport/HTTP.pm 0444 root bin -f none /opt/csw/share/perl/csw/OldDocs/SOAP/Transport/IO.pm 0444 root bin -f none /opt/csw/share/perl/csw/OldDocs/SOAP/Transport/JABBER.pm 0444 root bin -f none /opt/csw/share/perl/csw/OldDocs/SOAP/Transport/LOCAL.pm 0444 root bin -f none /opt/csw/share/perl/csw/OldDocs/SOAP/Transport/MAILTO.pm 0444 root bin -f none /opt/csw/share/perl/csw/OldDocs/SOAP/Transport/MQ.pm 0444 root bin -f none /opt/csw/share/perl/csw/OldDocs/SOAP/Transport/POP3.pm 0444 root bin -f none /opt/csw/share/perl/csw/OldDocs/SOAP/Transport/TCP.pm 0444 root bin -d none /opt/csw/share/perl/csw/SOAP 0755 root bin -f none /opt/csw/share/perl/csw/SOAP/Client.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Constants.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Data.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Deserializer.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Fault.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Header.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Lite.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Packager.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/SOM.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Schema.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Serializer.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Server.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Test.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Trace.pm 0444 root bin -d none /opt/csw/share/perl/csw/SOAP/Transport 0755 root bin -f none /opt/csw/share/perl/csw/SOAP/Transport.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Transport/FTP.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Transport/HTTP.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Transport/IO.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Transport/JABBER.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Transport/LOCAL.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Transport/MAILTO.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Transport/MQ.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Transport/POP3.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Transport/TCP.pm 0444 root bin -f none /opt/csw/share/perl/csw/SOAP/Utils.pm 0444 root bin -d none /opt/csw/share/perl/csw/UDDI 0755 root bin -f none /opt/csw/share/perl/csw/UDDI/Lite.pm 0444 root bin -d none /opt/csw/share/perl/csw/XML 0755 root bin -d none /opt/csw/share/perl/csw/XML/Parser 0755 root bin -f none /opt/csw/share/perl/csw/XML/Parser/Lite.pm 0444 root bin -d none /opt/csw/share/perl/csw/XMLRPC 0755 root bin -f none /opt/csw/share/perl/csw/XMLRPC/Lite.pm 0444 root bin -f none /opt/csw/share/perl/csw/XMLRPC/Test.pm 0444 root bin -d none /opt/csw/share/perl/csw/XMLRPC/Transport 0755 root bin -f none /opt/csw/share/perl/csw/XMLRPC/Transport/HTTP.pm 0444 root bin -f none /opt/csw/share/perl/csw/XMLRPC/Transport/POP3.pm 0444 root bin -f none /opt/csw/share/perl/csw/XMLRPC/Transport/TCP.pm 0444 root bin Deleted: csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/noprompt.diff =================================================================== --- csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/noprompt.diff 2010-02-03 09:09:13 UTC (rev 8326) +++ csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/noprompt.diff 2010-02-03 09:48:58 UTC (rev 8327) @@ -1,18 +0,0 @@ ---- SOAP-Lite-0.60.orig/Makefile.PL 2004-01-21 15:07:53.597992000 -0800 -+++ SOAP-Lite-0.60/Makefile.PL 2004-01-21 15:09:17.232278000 -0800 -@@ -67,6 +67,7 @@ - - $help and print($helptext), exit; - -+if ($prompt) { - ExtUtils::MakeMaker::prompt(< to see the detailed list."); - - We are about to install SOAP::Lite and for your convenience will provide -@@ -77,6 +78,7 @@ - Installed transports can be used for both SOAP::Lite and XMLRPC::Lite. - - EOI -+} - - # This hash will contain a list of all perl modules we would like to - # explicitly depend upon in our Makefile 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 Feb 3 12:34:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Feb 2010 11:34:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[8328] csw/mgar/pkg/chkconfig/trunk Message-ID: Revision: 8328 http://gar.svn.sourceforge.net/gar/?rev=8328&view=rev Author: dmichelsen Date: 2010-02-03 11:34:27 +0000 (Wed, 03 Feb 2010) Log Message: ----------- chkconfig: Add patches Modified Paths: -------------- csw/mgar/pkg/chkconfig/trunk/Makefile csw/mgar/pkg/chkconfig/trunk/checksums Added Paths: ----------- csw/mgar/pkg/chkconfig/trunk/files/0001-Add-missing-include-to-alloca.h.patch csw/mgar/pkg/chkconfig/trunk/files/0002-Don-t-use-named-struct-initializers.patch Modified: csw/mgar/pkg/chkconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/chkconfig/trunk/Makefile 2010-02-03 09:48:58 UTC (rev 8327) +++ csw/mgar/pkg/chkconfig/trunk/Makefile 2010-02-03 11:34:27 UTC (rev 8328) @@ -5,18 +5,29 @@ GARNAME = chkconfig GARVERSION = 1.3.30c CATEGORIES = utils -DESCRIPTION = + +DESCRIPTION = Alternatives system from Red Hat define BLURB Alternatives system from Red Hat endef -SPKG_SOURCEURL = http://www.sfr-fresh.com/unix/privat/chkconfig-1.3.30c.tar.gz/ + MASTER_SITES = http://www.sfr-fresh.com/unix/privat/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = alloca.patch -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES += 0001-Add-missing-include-to-alloca.h.patch +PATCHFILES += 0002-Don-t-use-named-struct-initializers.patch + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PACKAGES = CSWchkconfig CSWalternatives + SPKG_DESC_CSWalternatives = Alternatives engine from Red Hat chkconfig-$(GARVERSION) + PKGFILES_CSWalternatives = .*alternatives.* CATALOGNAME_CSWalternatives = alternatives + CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + include gar/category.mk Modified: csw/mgar/pkg/chkconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/chkconfig/trunk/checksums 2010-02-03 09:48:58 UTC (rev 8327) +++ csw/mgar/pkg/chkconfig/trunk/checksums 2010-02-03 11:34:27 UTC (rev 8328) @@ -1,2 +1,4 @@ +d56d4f7b5aef5af5235943c384734780 0001-Add-missing-include-to-alloca.h.patch +a1045173b8bc0a667883080f85a38597 0002-Don-t-use-named-struct-initializers.patch 02019af22d048085f3006de791a0c95e alloca.patch 592a1fe77f3844d7748adbab6357ee25 chkconfig-1.3.30c.tar.gz Added: csw/mgar/pkg/chkconfig/trunk/files/0001-Add-missing-include-to-alloca.h.patch =================================================================== --- csw/mgar/pkg/chkconfig/trunk/files/0001-Add-missing-include-to-alloca.h.patch (rev 0) +++ csw/mgar/pkg/chkconfig/trunk/files/0001-Add-missing-include-to-alloca.h.patch 2010-02-03 11:34:27 UTC (rev 8328) @@ -0,0 +1,24 @@ +From ade3200eeae37b7686bb25f58c45d4224d4cc238 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 3 Feb 2010 11:37:50 +0100 +Subject: [PATCH 1/2] Add missing include to alloca.h + +--- + chkconfig.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/chkconfig.c b/chkconfig.c +index 2f84c5d..f3ed967 100644 +--- a/chkconfig.c ++++ b/chkconfig.c +@@ -10,6 +10,7 @@ + * Tiny portions copyright 2001-2007, BSI. http://www.fastcoder.net/ + */ + #include "config.h" ++#include + #include + #include + #include +-- +1.6.6 + Added: csw/mgar/pkg/chkconfig/trunk/files/0002-Don-t-use-named-struct-initializers.patch =================================================================== --- csw/mgar/pkg/chkconfig/trunk/files/0002-Don-t-use-named-struct-initializers.patch (rev 0) +++ csw/mgar/pkg/chkconfig/trunk/files/0002-Don-t-use-named-struct-initializers.patch 2010-02-03 11:34:27 UTC (rev 8328) @@ -0,0 +1,74 @@ +From 71e72baa80d1aae18ca0026aadac032a40a773b3 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 3 Feb 2010 11:38:17 +0100 +Subject: [PATCH 2/2] Don't use named struct initializers + +--- + leveldb.c | 44 ++++++++++++++++++++++---------------------- + 1 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/leveldb.c b/leveldb.c +index f2883c0..a98fa3b 100644 +--- a/leveldb.c ++++ b/leveldb.c +@@ -150,17 +150,17 @@ int readXinetdServiceInfo(char *name, struct service * service, int honorHide) { + char * filename = alloca(strlen(name) + strlen(XINETDDIR) + 50); + int fd; + struct service serv = { +- name: NULL, +- levels: -1, +- kPriority: -1, +- sPriority: -1, +- desc: NULL, +- startDeps: NULL, +- stopDeps: NULL, +- provides: NULL, +- type: TYPE_XINETD, +- isLSB: 0, +- enabled: -1 ++ NULL, ++ -1, ++ -1, ++ -1, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ TYPE_XINETD, ++ 0, ++ -1 + }; + struct stat sb; + char * buf, *ptr; +@@ -247,17 +247,17 @@ int readServiceInfo(char * name, struct service * service, int honorHide) { + struct stat sb; + char * bufstart, * bufstop, * start, * end, * next, *tmpbufstart; + struct service serv = { +- name: NULL, +- levels: -1, +- kPriority: -1, +- sPriority: -1, +- desc: NULL, +- startDeps: NULL, +- stopDeps: NULL, +- provides: NULL, +- type: TYPE_INIT_D, +- isLSB: 0, +- enabled: 0 ++ NULL, ++ -1, ++ -1, ++ -1, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ TYPE_INIT_D, ++ 0, ++ 0 + }; + char overflow; + char levelbuf[20]; +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Feb 3 12:47:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Feb 2010 11:47:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8329] csw/mgar/pkg/chkconfig/trunk/Makefile Message-ID: Revision: 8329 http://gar.svn.sourceforge.net/gar/?rev=8329&view=rev Author: dmichelsen Date: 2010-02-03 11:47:33 +0000 (Wed, 03 Feb 2010) Log Message: ----------- chkconfig: Add requirements Modified Paths: -------------- csw/mgar/pkg/chkconfig/trunk/Makefile Modified: csw/mgar/pkg/chkconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/chkconfig/trunk/Makefile 2010-02-03 11:34:27 UTC (rev 8328) +++ csw/mgar/pkg/chkconfig/trunk/Makefile 2010-02-03 11:47:33 UTC (rev 8329) @@ -21,10 +21,12 @@ PACKAGES = CSWchkconfig CSWalternatives +SPKG_DESC_CSWchkconfig = Checkconfig engine from Red Hat chkconfig-$(GARVERSION) SPKG_DESC_CSWalternatives = Alternatives engine from Red Hat chkconfig-$(GARVERSION) +REQUIRED_PKGS = CSWggettextrt CSWlibpopt + PKGFILES_CSWalternatives = .*alternatives.* -CATALOGNAME_CSWalternatives = alternatives CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Feb 3 14:27:28 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Feb 2010 13:27:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[8330] csw/mgar/pkg/krb5/trunk/Makefile Message-ID: Revision: 8330 http://gar.svn.sourceforge.net/gar/?rev=8330&view=rev Author: dmichelsen Date: 2010-02-03 13:27:28 +0000 (Wed, 03 Feb 2010) Log Message: ----------- krb5: Fix flags Modified Paths: -------------- csw/mgar/pkg/krb5/trunk/Makefile Modified: csw/mgar/pkg/krb5/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5/trunk/Makefile 2010-02-03 11:47:33 UTC (rev 8329) +++ csw/mgar/pkg/krb5/trunk/Makefile 2010-02-03 13:27:28 UTC (rev 8330) @@ -97,9 +97,13 @@ include gar/category.mk # The flags must not contain additional spaces or the build freaks out -CFLAGS := $(strip $(CFLAGS) -L$(libdir)/$(MM_LIBDIR)) +CFLAGS := $(strip $(CFLAGS) -L$(libdir) -D__EXTENSIONS__) +CXXFLAGS := $(strip $(CXXFLAGS) -D__EXTENSIONS__) #LDFLAGS := $(strip $(LDFLAGS)) +EXTRA_LINKER_FLAGS := $(LD_OPTIONS) +LD_OPTIONS := + post-extract-modulated: @# TODO: Check signature @cd $(WORKDIR) && (gzip -c -d $(GARNAME)-$(GARVERSION).tar.gz | tar xf -) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Wed Feb 3 14:43:11 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Wed, 03 Feb 2010 13:43:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8331] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 8331 http://gar.svn.sourceforge.net/gar/?rev=8331&view=rev Author: aigoshin Date: 2010-02-03 13:43:10 +0000 (Wed, 03 Feb 2010) Log Message: ----------- nginx: package release 20100203 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2010-02-03 13:27:28 UTC (rev 8330) +++ csw/mgar/pkg/nginx/trunk/Makefile 2010-02-03 13:43:10 UTC (rev 8331) @@ -1,5 +1,5 @@ GARNAME = nginx -GARVERSION = 0.7.64 +GARVERSION = 0.7.65 CATEGORIES = server DESCRIPTION = HTTP server and mail proxy server Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2010-02-03 13:27:28 UTC (rev 8330) +++ csw/mgar/pkg/nginx/trunk/checksums 2010-02-03 13:43:10 UTC (rev 8331) @@ -1,2 +1,2 @@ 4e8863b34556eb28e3ee6849ffb1ed85 cswnginx -cfa97c0f784532820110b5eee57fef6d nginx-0.7.64.tar.gz +abc4f76af450eedeb063158bd963feaa nginx-0.7.65.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Wed Feb 3 16:35:16 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Wed, 03 Feb 2010 15:35:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8332] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 8332 http://gar.svn.sourceforge.net/gar/?rev=8332&view=rev Author: aigoshin Date: 2010-02-03 15:35:15 +0000 (Wed, 03 Feb 2010) Log Message: ----------- nginx: package release 20100203 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2010-02-03 13:43:10 UTC (rev 8331) +++ csw/mgar/pkg/nginx/trunk/Makefile 2010-02-03 15:35:15 UTC (rev 8332) @@ -62,7 +62,7 @@ TEST_SCRIPTS = INITSMF = $(sysconfdir)/init.d/cswnginx -PRESERVECONF = $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf +PRESERVECONF = $(sysconfdir)/nginx/fastcgi.conf $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf NGINXDOCS = CHANGES CHANGES.ru LICENSE README 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 Feb 3 17:51:41 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 03 Feb 2010 16:51:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[8333] csw/mgar/pkg/cpan Message-ID: Revision: 8333 http://gar.svn.sourceforge.net/gar/?rev=8333&view=rev Author: bonivart Date: 2010-02-03 16:51:41 +0000 (Wed, 03 Feb 2010) Log Message: ----------- pm_pango: initial commit, does not build Added Paths: ----------- csw/mgar/pkg/cpan/Pango/ csw/mgar/pkg/cpan/Pango/branches/ csw/mgar/pkg/cpan/Pango/tags/ csw/mgar/pkg/cpan/Pango/trunk/ csw/mgar/pkg/cpan/Pango/trunk/Makefile csw/mgar/pkg/cpan/Pango/trunk/checksums csw/mgar/pkg/cpan/Pango/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Pango/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Pango/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Pango/trunk/Makefile 2010-02-03 16:51:41 UTC (rev 8333) @@ -0,0 +1,14 @@ +GARNAME = Pango +GARVERSION = 1.221 +CATEGORIES = cpan +AUTHOR = TSCH + +DESCRIPTION = Layout and render international text +define BLURB + Layout and render international text +endef + +PACKAGES = CSWpmpango +CATALOGNAME = pm_pango + +include gar/category.mk Added: csw/mgar/pkg/cpan/Pango/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Pango/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Pango/trunk/checksums 2010-02-03 16:51:41 UTC (rev 8333) @@ -0,0 +1 @@ +8d257209aa11bd6c3a2beb235c2f103f Pango-1.221.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 Feb 3 17:53:31 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 03 Feb 2010 16:53:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[8334] csw/mgar/pkg/cpan/Gtk2/trunk Message-ID: Revision: 8334 http://gar.svn.sourceforge.net/gar/?rev=8334&view=rev Author: bonivart Date: 2010-02-03 16:53:31 +0000 (Wed, 03 Feb 2010) Log Message: ----------- pm_gtk2: does not build, needs pm_pango Modified Paths: -------------- csw/mgar/pkg/cpan/Gtk2/trunk/Makefile csw/mgar/pkg/cpan/Gtk2/trunk/checksums Modified: csw/mgar/pkg/cpan/Gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Gtk2/trunk/Makefile 2010-02-03 16:51:41 UTC (rev 8333) +++ csw/mgar/pkg/cpan/Gtk2/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) @@ -3,7 +3,7 @@ CATEGORIES = cpan AUTHOR = TSCH -DESCRIPTION = interface to the 2.x series of the Gimp Toolkit library +DESCRIPTION = Perl interface to the 2.x series of the Gimp Toolkit library define BLURB Perl bindings to the 2.x series of the Gtk+ widget set. This module allows you to write graphical user interfaces in a perlish and object-oriented way, @@ -11,15 +11,10 @@ close in spirit to original API. endef -PREREQUISITE_PKGS = CSWpmglib -PKGS_REQUIRED_CSWpmglib = CSWpmglib CSWgtk2 - +PACKAGES = CSWpmgtk2 CATALOGNAME = pm_gtk2 -PACKAGES = CSWpmgtk2 -ARCHALL_CSWpmgtk2 = 1 +PKGS_REQUIRED = CSWpmglib CSWgtk2 CSWpmcairo +#PKGS_REQUIRED += CSWpmpango -LICENSE = README - include gar/category.mk - Modified: csw/mgar/pkg/cpan/Gtk2/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Gtk2/trunk/checksums 2010-02-03 16:51:41 UTC (rev 8333) +++ csw/mgar/pkg/cpan/Gtk2/trunk/checksums 2010-02-03 16:53:31 UTC (rev 8334) @@ -1 +1 @@ -76e4f3ca3f9f80dc15a35ff9b88f736d download/Gtk2-1.220.tar.gz +ba412049d10978ed802b98976f6adaa9 Gtk2-1.221.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Feb 3 19:36:42 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 03 Feb 2010 18:36:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[8335] csw/mgar Message-ID: Revision: 8335 http://gar.svn.sourceforge.net/gar/?rev=8335&view=rev Author: wahwah Date: 2010-02-03 18:36:29 +0000 (Wed, 03 Feb 2010) Log Message: ----------- everything: Implementing variable names mapping as discussed in Munich and documented in the minutes: http://wiki.opencsw.org/wintercamp-2009-minutes Modified Paths: -------------- csw/mgar/gar/v1/gar.mk csw/mgar/gar/v1/gar.pkg.mk csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py csw/mgar/gar/v2-git/gar.mk csw/mgar/gar/v2-git/gar.pkg.mk csw/mgar/gar/v2-git/lib/python/checkpkg.py csw/mgar/gar/v2-git/lib/python/checkpkg_test.py csw/mgar/gar/v2-relocate/gar.mk csw/mgar/gar/v2-relocate/gar.pkg.mk csw/mgar/gar/v2-skayser/gar.mk csw/mgar/gar/v2-skayser/gar.pkg.mk csw/mgar/pkg/GeoIP/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/MailScanner/trunk/Makefile csw/mgar/pkg/Vispan/trunk/Makefile csw/mgar/pkg/ZSI/trunk/Makefile csw/mgar/pkg/aide/trunk/Makefile csw/mgar/pkg/alpine/trunk/Makefile csw/mgar/pkg/amavisd-new/trunk/Makefile csw/mgar/pkg/apache2/tags/apache-2.2.13-by-idogan/Makefile csw/mgar/pkg/apache2/trunk/Makefile csw/mgar/pkg/apcupsd/trunk/Makefile csw/mgar/pkg/asciidoc/trunk/Makefile csw/mgar/pkg/autoconf/tags/autoconf-2.64,REV=2009.07.29/Makefile csw/mgar/pkg/autoconf/trunk/Makefile csw/mgar/pkg/automake/trunk/Makefile csw/mgar/pkg/autoproject/trunk/Makefile csw/mgar/pkg/awstats/trunk/Makefile csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bashdb/trunk/Makefile csw/mgar/pkg/bazaar/trunk/Makefile csw/mgar/pkg/bdb/trunk/Makefile csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile csw/mgar/pkg/bdb3/trunk/Makefile csw/mgar/pkg/bdb4/trunk/Makefile csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile csw/mgar/pkg/bdb42/trunk/Makefile csw/mgar/pkg/bdb43/tags/bdb-consolidation-4.3.29,REV=2009.06.26/Makefile csw/mgar/pkg/bdb43/trunk/Makefile csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile csw/mgar/pkg/bdb44/trunk/Makefile csw/mgar/pkg/bdb45/trunk/Makefile csw/mgar/pkg/bdb46/trunk/Makefile csw/mgar/pkg/bdb47/trunk/Makefile csw/mgar/pkg/bdb48/trunk/Makefile csw/mgar/pkg/beautifulsoup/trunk/Makefile csw/mgar/pkg/bind/branches/stable/Makefile csw/mgar/pkg/bind/branches/stable-9.4.3p3/Makefile csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind2nsd/trunk/Makefile csw/mgar/pkg/binutils/trunk/Makefile csw/mgar/pkg/bison/trunk/Makefile csw/mgar/pkg/botnet/trunk/Makefile csw/mgar/pkg/buildbot/trunk/Makefile csw/mgar/pkg/cacti/trunk/Makefile csw/mgar/pkg/cadaver/trunk/Makefile csw/mgar/pkg/cairomm/trunk/Makefile csw/mgar/pkg/cdecl/trunk/Makefile csw/mgar/pkg/cfengine/trunk/Makefile csw/mgar/pkg/cgit/trunk/Makefile csw/mgar/pkg/chkconfig/trunk/Makefile csw/mgar/pkg/chmlib/trunk/Makefile csw/mgar/pkg/chromium/trunk/Makefile csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clearsilver/trunk/Makefile csw/mgar/pkg/clusterssh/trunk/Makefile csw/mgar/pkg/cmake/trunk/Makefile csw/mgar/pkg/colordiff/trunk/Makefile csw/mgar/pkg/colormake/trunk/Makefile csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/cpan/Algorithm-Annotate/trunk/Makefile csw/mgar/pkg/cpan/Algorithm-Depedency/trunk/Makefile csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile csw/mgar/pkg/cpan/Apache2-AuthzNIS/trunk/Makefile csw/mgar/pkg/cpan/App-CLI/trunk/Makefile csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile csw/mgar/pkg/cpan/Archive-Zip/trunk/Makefile csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile csw/mgar/pkg/cpan/Cairo/trunk/Makefile csw/mgar/pkg/cpan/Capitalization/trunk/Makefile csw/mgar/pkg/cpan/Chart/trunk/Makefile csw/mgar/pkg/cpan/Class-Container/trunk/Makefile csw/mgar/pkg/cpan/Class-ReturnValue/trunk/Makefile csw/mgar/pkg/cpan/Compress-Bzip2/trunk/Makefile csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile csw/mgar/pkg/cpan/DBI/trunk/Makefile csw/mgar/pkg/cpan/Data-Hierarchy/trunk/Makefile csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile csw/mgar/pkg/cpan/DateTime/trunk/Makefile csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile csw/mgar/pkg/cpan/Devel-Caller/trunk/Makefile csw/mgar/pkg/cpan/Devel-LexAlias/trunk/Makefile csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/Makefile csw/mgar/pkg/cpan/Font-Freetype/trunk/Makefile csw/mgar/pkg/cpan/GD/trunk/Makefile csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile csw/mgar/pkg/cpan/Gimp/trunk/Makefile csw/mgar/pkg/cpan/Glib/trunk/Makefile csw/mgar/pkg/cpan/HTML-Mason/trunk/Makefile csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile csw/mgar/pkg/cpan/IO-Compress-Base/trunk/Makefile csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/Makefile csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile csw/mgar/pkg/cpan/IO-Zlib/trunk/Makefile csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile csw/mgar/pkg/cpan/Lexical-Persistence/trunk/Makefile csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/Makefile csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile csw/mgar/pkg/cpan/Log-Message/trunk/Makefile csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile csw/mgar/pkg/cpan/MIME-Lite/trunk/Makefile csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile csw/mgar/pkg/cpan/Module-Build/trunk/Makefile csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile csw/mgar/pkg/cpan/Net-NIS/trunk/Makefile csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile csw/mgar/pkg/cpan/Net-SMTP-SSL/trunk/Makefile csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile csw/mgar/pkg/cpan/PDF-API2/trunk/Makefile csw/mgar/pkg/cpan/Params-Check/trunk/Makefile csw/mgar/pkg/cpan/Parse-RecDescent/trunk/Makefile csw/mgar/pkg/cpan/Path-Class/trunk/Makefile csw/mgar/pkg/cpan/PerlIO-gzip/trunk/Makefile csw/mgar/pkg/cpan/Pod-Coverage/trunk/Makefile csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile csw/mgar/pkg/cpan/RADIUS-UserFile/trunk/Makefile csw/mgar/pkg/cpan/RPC-XML/trunk/Makefile csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile csw/mgar/pkg/cpan/Search-Xapian/trunk/Makefile csw/mgar/pkg/cpan/Shout/trunk/Makefile csw/mgar/pkg/cpan/Spiffy/trunk/Makefile csw/mgar/pkg/cpan/Template-Toolkit/trunk/Makefile csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/Makefile csw/mgar/pkg/cpan/TermReadKey/trunk/Makefile csw/mgar/pkg/cpan/Test-ClassAPI/trunk/Makefile csw/mgar/pkg/cpan/Test-Distribution/trunk/Makefile csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile csw/mgar/pkg/cpan/Test-Script/trunk/Makefile csw/mgar/pkg/cpan/Text-GenderFromName/trunk/Makefile csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/Makefile csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/Makefile csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile csw/mgar/pkg/cpan/XML-Records/trunk/Makefile csw/mgar/pkg/cpan/XML-Simple/trunk/Makefile csw/mgar/pkg/cpan/XML-TokeParser/trunk/Makefile csw/mgar/pkg/cpan/XML-XPath/trunk/Makefile csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile csw/mgar/pkg/cpan/perlconsole/trunk/Makefile csw/mgar/pkg/cswpkgloghooks/trunk/Makefile csw/mgar/pkg/cswutils/trunk/Makefile csw/mgar/pkg/cups/branches/cups-1.3/Makefile csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile csw/mgar/pkg/cups/trunk/Makefile csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/cvs2svn/trunk/Makefile csw/mgar/pkg/cvsproxy/trunk/Makefile csw/mgar/pkg/cvsps/trunk/Makefile csw/mgar/pkg/cx-oracle/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/dante/trunk/Makefile csw/mgar/pkg/dbus/trunk/Makefile csw/mgar/pkg/dbus-glib/trunk/Makefile csw/mgar/pkg/dbus-python/trunk/Makefile csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/diffuse/trunk/Makefile csw/mgar/pkg/distcc/trunk/Makefile csw/mgar/pkg/django/trunk/Makefile csw/mgar/pkg/djvulibre/trunk/Makefile csw/mgar/pkg/dnstop/trunk/Makefile csw/mgar/pkg/dnswalk/trunk/Makefile csw/mgar/pkg/docbook-dtds/trunk/Makefile csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile csw/mgar/pkg/docbook-style-xsl/trunk/Makefile csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/doxygen/trunk/Makefile csw/mgar/pkg/drill/trunk/Makefile csw/mgar/pkg/drupal/trunk/Makefile csw/mgar/pkg/dsniff/trunk/Makefile csw/mgar/pkg/elinks/trunk/Makefile csw/mgar/pkg/esound/trunk/Makefile csw/mgar/pkg/etckeeper/trunk/Makefile csw/mgar/pkg/euler/trunk/Makefile csw/mgar/pkg/eventlog/trunk/Makefile csw/mgar/pkg/evolution-ds/trunk/Makefile csw/mgar/pkg/evolution-exchange/trunk/Makefile csw/mgar/pkg/evolution-mapi/trunk/Makefile csw/mgar/pkg/evolution-webcal/trunk/Makefile csw/mgar/pkg/exempi/trunk/Makefile csw/mgar/pkg/exiftool/trunk/Makefile csw/mgar/pkg/expat/trunk/Makefile csw/mgar/pkg/facter/trunk/Makefile csw/mgar/pkg/ffmpeg/trunk/Makefile csw/mgar/pkg/fftw/trunk/Makefile csw/mgar/pkg/file/trunk/Makefile csw/mgar/pkg/findutils/trunk/Makefile csw/mgar/pkg/firefox/branches/firefox2-maintenance/Makefile csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile csw/mgar/pkg/firefox/trunk/Makefile csw/mgar/pkg/flac/trunk/Makefile csw/mgar/pkg/flex_new/trunk/Makefile csw/mgar/pkg/fontconfig/trunk/Makefile csw/mgar/pkg/fontforge/trunk/Makefile csw/mgar/pkg/fprobe/trunk/Makefile csw/mgar/pkg/freehdl/trunk/Makefile csw/mgar/pkg/freetype/trunk/Makefile csw/mgar/pkg/gail/trunk/Makefile csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile csw/mgar/pkg/ganglia/trunk/Makefile csw/mgar/pkg/gar/trunk/Makefile csw/mgar/pkg/gardev/trunk/Makefile csw/mgar/pkg/gcc4/trunk/files/package_def.mk csw/mgar/pkg/gccgo/trunk/Makefile csw/mgar/pkg/gconf2/trunk/Makefile csw/mgar/pkg/gcpio/trunk/Makefile csw/mgar/pkg/gd/trunk/Makefile csw/mgar/pkg/gdata-python-client/trunk/Makefile csw/mgar/pkg/gdb/trunk/Makefile csw/mgar/pkg/gdome2/trunk/Makefile csw/mgar/pkg/genshi/trunk/Makefile csw/mgar/pkg/gettext/trunk/Makefile csw/mgar/pkg/ghc/trunk/Makefile csw/mgar/pkg/ghostscript/trunk/Makefile csw/mgar/pkg/giflib/trunk/Makefile csw/mgar/pkg/git/tags/1.6.2.1-2009.04.14/Makefile csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git-subtree/trunk/Makefile csw/mgar/pkg/gitosis/trunk/Makefile csw/mgar/pkg/glib/trunk/Makefile csw/mgar/pkg/glib2/trunk/Makefile csw/mgar/pkg/glibmm/trunk/Makefile csw/mgar/pkg/glpk/trunk/Makefile csw/mgar/pkg/gnome-terminal/trunk/Makefile csw/mgar/pkg/gnomedesktop/trunk/Makefile csw/mgar/pkg/gnulinks/trunk/Makefile csw/mgar/pkg/gnumeric/trunk/Makefile csw/mgar/pkg/gnupg/trunk/Makefile csw/mgar/pkg/gnupg2/trunk/Makefile csw/mgar/pkg/gnupg_minimal/trunk/Makefile csw/mgar/pkg/gnutls/trunk/Makefile csw/mgar/pkg/gobject-introspection/trunk/Makefile csw/mgar/pkg/goocanvas/trunk/Makefile csw/mgar/pkg/gpgme/trunk/Makefile csw/mgar/pkg/graphviz/trunk/Makefile csw/mgar/pkg/gsasl/trunk/Makefile csw/mgar/pkg/gtar/trunk/Makefile csw/mgar/pkg/gtk-doc/trunk/Makefile csw/mgar/pkg/gtk2/trunk/Makefile csw/mgar/pkg/gtksourceview/trunk/Makefile csw/mgar/pkg/gtkwave/trunk/Makefile csw/mgar/pkg/gts/trunk/Makefile csw/mgar/pkg/guile/trunk/Makefile csw/mgar/pkg/gvim/trunk/Makefile csw/mgar/pkg/gzip/trunk/Makefile csw/mgar/pkg/hachoir-parser/trunk/Makefile csw/mgar/pkg/hdf5/tags/hdf5-1.8.3,REV=2009.11.03/Makefile csw/mgar/pkg/hdf5/trunk/Makefile csw/mgar/pkg/help2man/tags/help2man-1.36.4,REV=2008.09.18/Makefile csw/mgar/pkg/help2man/trunk/Makefile csw/mgar/pkg/htmldoc/trunk/Makefile csw/mgar/pkg/httping/trunk/Makefile csw/mgar/pkg/hylafax/trunk/Makefile csw/mgar/pkg/icecast/trunk/Makefile csw/mgar/pkg/icinga/trunk/Makefile csw/mgar/pkg/iftop/trunk/Makefile csw/mgar/pkg/ilmbase/trunk/Makefile csw/mgar/pkg/imapproxy/trunk/Makefile csw/mgar/pkg/imapsync/trunk/Makefile csw/mgar/pkg/imlib2/trunk/Makefile csw/mgar/pkg/indent/trunk/Makefile csw/mgar/pkg/intltool/trunk/Makefile csw/mgar/pkg/ipython/trunk/Makefile csw/mgar/pkg/irssi/trunk/Makefile csw/mgar/pkg/java/ajcbeanutils/tags/commons_beanutils-1.8.0,REV=2009.02.24-testing-b1/Makefile csw/mgar/pkg/java/ajcbeanutils/tags/commons_beanutils-1.8.0,REV=2009.02.24-unstable-20090302/Makefile csw/mgar/pkg/java/ajcbeanutils/trunk/Makefile csw/mgar/pkg/java/ajcchain/tags/commons_chain-1.2,REV=2009.02.24-testing-b1/Makefile csw/mgar/pkg/java/ajcchain/tags/commons_chain-1.2,REV=2009.02.24-unstable-20090302/Makefile csw/mgar/pkg/java/ajcchain/trunk/Makefile csw/mgar/pkg/java/ajccli/tags/commons_cli-1.1,REV=2009.02.24-testing-b1/Makefile csw/mgar/pkg/java/ajccli/tags/commons_cli-1.1,REV=2009.02.24-unstable-20090302/Makefile csw/mgar/pkg/java/ajccli/trunk/Makefile csw/mgar/pkg/java/ajccollections/tags/commons_collect-3.2.1,REV=2009.02.24-testing-b1/Makefile csw/mgar/pkg/java/ajccollections/tags/commons_collect-3.2.1,REV=2009.02.24-unstable-20090302/Makefile csw/mgar/pkg/java/ajccollections/trunk/Makefile csw/mgar/pkg/java/ajcconfig/trunk/Makefile csw/mgar/pkg/java/ajcdigester/trunk/Makefile csw/mgar/pkg/java/ajcdiscovery/trunk/Makefile csw/mgar/pkg/java/ajcemail/trunk/Makefile csw/mgar/pkg/java/ajchttpcl/trunk/Makefile csw/mgar/pkg/java/ajcio/trunk/Makefile csw/mgar/pkg/java/ajclang/trunk/Makefile csw/mgar/pkg/java/ajclogging/trunk/Makefile csw/mgar/pkg/java/ajcmath/trunk/Makefile csw/mgar/pkg/java/ajcnet/trunk/Makefile csw/mgar/pkg/java/ajcpool/trunk/Makefile csw/mgar/pkg/java/ajcprimitives/trunk/Makefile csw/mgar/pkg/java/ajcupload/trunk/Makefile csw/mgar/pkg/java/ajcvalidator/trunk/Makefile csw/mgar/pkg/java/junit/tags/junit-4.5,REV=2009.03.08-testing-b1/Makefile csw/mgar/pkg/java/junit/trunk/Makefile csw/mgar/pkg/java/log4j/tags/log4j-1.2.15,REV=2009.03.09-testing-b1/Makefile csw/mgar/pkg/java/log4j/trunk/Makefile csw/mgar/pkg/jdk5/trunk/Makefile csw/mgar/pkg/jdk6/trunk/Makefile csw/mgar/pkg/jetty6/trunk/Makefile csw/mgar/pkg/jpeg/trunk/Makefile csw/mgar/pkg/jpeginfo/trunk/Makefile csw/mgar/pkg/json-glib/trunk/Makefile csw/mgar/pkg/keychain/trunk/Makefile csw/mgar/pkg/krb5/trunk/Makefile csw/mgar/pkg/lame/trunk/Makefile csw/mgar/pkg/lcms/trunk/Makefile csw/mgar/pkg/ldapvi/trunk/Makefile csw/mgar/pkg/ldns/trunk/Makefile csw/mgar/pkg/leafnode/trunk/Makefile csw/mgar/pkg/lensfun/trunk/Makefile csw/mgar/pkg/less/trunk/Makefile csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/liba52/trunk/Makefile csw/mgar/pkg/libao/trunk/Makefile csw/mgar/pkg/libassuan/trunk/Makefile csw/mgar/pkg/libast/trunk/Makefile csw/mgar/pkg/libatk/trunk/Makefile csw/mgar/pkg/libcairo/trunk/Makefile csw/mgar/pkg/libcddb/trunk/Makefile csw/mgar/pkg/libcdio/trunk/Makefile csw/mgar/pkg/libcroco/trunk/Makefile csw/mgar/pkg/libdatrie/trunk/Makefile csw/mgar/pkg/liberation-fonts/trunk/Makefile csw/mgar/pkg/libevent/tags/libevent-1.4.12,REV=2009.11.04/Makefile csw/mgar/pkg/libevent/trunk/Makefile csw/mgar/pkg/libexif/trunk/Makefile csw/mgar/pkg/libfaac/trunk/Makefile csw/mgar/pkg/libfaad2/trunk/Makefile csw/mgar/pkg/libffi/trunk/Makefile csw/mgar/pkg/libfishsound/trunk/Makefile csw/mgar/pkg/libfpx/trunk/Makefile csw/mgar/pkg/libgcrypt/trunk/Makefile csw/mgar/pkg/libgda/trunk/Makefile csw/mgar/pkg/libglade2/trunk/Makefile csw/mgar/pkg/libgmp/trunk/Makefile csw/mgar/pkg/libgnomecanvas/trunk/Makefile csw/mgar/pkg/libgnomedb/trunk/Makefile csw/mgar/pkg/libgoffice/trunk/Makefile csw/mgar/pkg/libgpg_error/trunk/Makefile csw/mgar/pkg/libgsf/trunk/Makefile csw/mgar/pkg/libgss/trunk/Makefile csw/mgar/pkg/libiconv/branches/sync-pkgname/Makefile csw/mgar/pkg/libiconv/trunk/Makefile csw/mgar/pkg/libid3tag/trunk/Makefile csw/mgar/pkg/libidl/trunk/Makefile csw/mgar/pkg/libidn/tags/libidn-1.15,REV=2009.06.10/Makefile csw/mgar/pkg/libidn/trunk/Makefile csw/mgar/pkg/libiptcdata/trunk/Makefile csw/mgar/pkg/libksba/trunk/Makefile csw/mgar/pkg/liblasi/tags/liblasi-1.1.0,REV=2009.05.28/Makefile csw/mgar/pkg/liblasi/trunk/Makefile csw/mgar/pkg/liblcms/trunk/Makefile csw/mgar/pkg/libmatroska/trunk/Makefile csw/mgar/pkg/libmcal/trunk/Makefile csw/mgar/pkg/libmpeg2/trunk/Makefile csw/mgar/pkg/libmpfr/trunk/Makefile csw/mgar/pkg/libnids/trunk/Makefile csw/mgar/pkg/liboggz/trunk/Makefile csw/mgar/pkg/liboil/trunk/Makefile csw/mgar/pkg/libpaper/trunk/Makefile csw/mgar/pkg/libpcap/trunk/Makefile csw/mgar/pkg/libpopt/tags/popt-1.15,REV=2009.10.06/Makefile csw/mgar/pkg/libpopt/trunk/Makefile csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile csw/mgar/pkg/libproxy/trunk/Makefile csw/mgar/pkg/librsvg/trunk/Makefile csw/mgar/pkg/libsamplerate/trunk/Makefile csw/mgar/pkg/libschroedinger/trunk/Makefile csw/mgar/pkg/libsdl/trunk/Makefile csw/mgar/pkg/libserf/trunk/Makefile csw/mgar/pkg/libshout/trunk/Makefile csw/mgar/pkg/libsmi/trunk/Makefile csw/mgar/pkg/libsndfile/tags/libsndfile-1.0.20,REV=2009.11.04/Makefile csw/mgar/pkg/libsndfile/trunk/Makefile csw/mgar/pkg/libsoup/trunk/Makefile csw/mgar/pkg/libsoup2/trunk/Makefile csw/mgar/pkg/libspectre/trunk/Makefile csw/mgar/pkg/libspf2/trunk/Makefile csw/mgar/pkg/libssh2/trunk/Makefile csw/mgar/pkg/libtasn1/trunk/Makefile csw/mgar/pkg/libthai/trunk/Makefile csw/mgar/pkg/libtheora/trunk/Makefile csw/mgar/pkg/libtool/tags/libtool-2.2.6,REV=2009.09.04_rev=a/Makefile csw/mgar/pkg/libtool/tags/libtool-2.2.6-legacy-gcctags/Makefile csw/mgar/pkg/libtool/tags/libtool-2.2.6b,REV=2010.01.05/Makefile csw/mgar/pkg/libtool/trunk/Makefile csw/mgar/pkg/libunique/trunk/Makefile csw/mgar/pkg/libvanessa-socket/trunk/Makefile csw/mgar/pkg/libvorbis/trunk/Makefile csw/mgar/pkg/libwww/trunk/Makefile csw/mgar/pkg/libxml2/trunk/Makefile csw/mgar/pkg/libxslt/trunk/Makefile csw/mgar/pkg/log4sh/trunk/Makefile csw/mgar/pkg/logwatch/trunk/Makefile csw/mgar/pkg/loudmouth/trunk/Makefile csw/mgar/pkg/lutefisk/trunk/Makefile csw/mgar/pkg/lzop/trunk/Makefile csw/mgar/pkg/m4/trunk/Makefile csw/mgar/pkg/mailx/trunk/Makefile csw/mgar/pkg/mairix/trunk/Makefile csw/mgar/pkg/man2html/trunk/Makefile csw/mgar/pkg/mantis/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mcabber/trunk/Makefile csw/mgar/pkg/mediawiki/trunk/Makefile csw/mgar/pkg/memcached/tags/memcached-1.4.3,REV=2009.11.24/Makefile csw/mgar/pkg/memcached/trunk/Makefile csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mibdump/trunk/Makefile csw/mgar/pkg/miltergreylist/trunk/Makefile csw/mgar/pkg/mocha/trunk/Makefile csw/mgar/pkg/mod_macro/trunk/Makefile csw/mgar/pkg/mod_proxy_html/trunk/Makefile csw/mgar/pkg/mod_python/trunk/Makefile csw/mgar/pkg/mod_wsgi/trunk/Makefile csw/mgar/pkg/mpd/trunk/Makefile csw/mgar/pkg/mpg123/trunk/Makefile csw/mgar/pkg/msmtp/trunk/Makefile csw/mgar/pkg/msttcorefonts/trunk/Makefile csw/mgar/pkg/mtools/trunk/Makefile csw/mgar/pkg/mtr/trunk/Makefile csw/mgar/pkg/multitail/trunk/Makefile csw/mgar/pkg/munin/trunk/Makefile csw/mgar/pkg/mutt/trunk/Makefile csw/mgar/pkg/myodbc/trunk/Makefile csw/mgar/pkg/mysql-python/trunk/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile csw/mgar/pkg/mysql5/trunk/Makefile csw/mgar/pkg/nagios/trunk/Makefile csw/mgar/pkg/nagios_plugins/trunk/Makefile csw/mgar/pkg/nagvis/trunk/Makefile csw/mgar/pkg/nano/trunk/Makefile csw/mgar/pkg/ncdu/trunk/Makefile csw/mgar/pkg/ncftp/trunk/Makefile csw/mgar/pkg/ncmpc/trunk/Makefile csw/mgar/pkg/ncurses/trunk/Makefile csw/mgar/pkg/ndoutils/trunk/Makefile csw/mgar/pkg/neon/tags/neon-0.29.1,REV=2009.12.17/Makefile csw/mgar/pkg/neon/trunk/Makefile csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1/Makefile csw/mgar/pkg/netsnmp/trunk/Makefile csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nrpe/trunk/Makefile csw/mgar/pkg/nsca/trunk/Makefile csw/mgar/pkg/nsd/trunk/Makefile csw/mgar/pkg/nspr/trunk/Makefile csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nxcl/trunk/Makefile csw/mgar/pkg/oinkmaster/trunk/Makefile csw/mgar/pkg/openexr/trunk/Makefile csw/mgar/pkg/opengrok/trunk/Makefile csw/mgar/pkg/openjade/trunk/Makefile csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openvpn/trunk/Makefile csw/mgar/pkg/oracle/trunk/Makefile csw/mgar/pkg/orbit2/trunk/Makefile csw/mgar/pkg/orca/trunk/Makefile csw/mgar/pkg/otr/trunk/Makefile csw/mgar/pkg/pakchois/trunk/Makefile csw/mgar/pkg/pango/trunk/Makefile csw/mgar/pkg/pango-libthai/trunk/Makefile csw/mgar/pkg/patchutils/trunk/Makefile csw/mgar/pkg/pbzip2/trunk/Makefile csw/mgar/pkg/pcb/trunk/Makefile csw/mgar/pkg/pcre/tags/pcre-8.00,REV=2009.11.17/Makefile csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pdfjam/trunk/Makefile csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile csw/mgar/pkg/perl/tags/perl-5.8.8,REV=2009.11.12/Makefile csw/mgar/pkg/perl/trunk/Makefile csw/mgar/pkg/pgadmin3/trunk/Makefile csw/mgar/pkg/php4/trunk/files/depend.mk csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/Makefile.cswdir csw/mgar/pkg/php5/trunk/Makefile.php5dir csw/mgar/pkg/php5/trunk/extensions/php5_apache/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_apache2/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile csw/mgar/pkg/php5_apc/trunk/Makefile csw/mgar/pkg/php5_xdebug/trunk/Makefile csw/mgar/pkg/phpMyAdmin/trunk/Makefile csw/mgar/pkg/phpmode/tags/release-1.5.0,REV=2009.07.28/Makefile csw/mgar/pkg/phpmode/tags/release-1.5.0-20090728/Makefile csw/mgar/pkg/phpmode/trunk/Makefile csw/mgar/pkg/phpsysinfo/trunk/Makefile csw/mgar/pkg/pidgin/trunk/Makefile csw/mgar/pkg/pidgin_sipe/trunk/Makefile csw/mgar/pkg/pidginotr/trunk/Makefile csw/mgar/pkg/pigz/trunk/Makefile csw/mgar/pkg/pil/trunk/Makefile csw/mgar/pkg/pinentry/trunk/Makefile csw/mgar/pkg/pius/trunk/Makefile csw/mgar/pkg/pkgconfig/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pnp/trunk/Makefile csw/mgar/pkg/poppler/trunk/Makefile csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile csw/mgar/pkg/postfix/trunk/Makefile csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgrey/trunk/Makefile csw/mgar/pkg/pound/trunk/Makefile csw/mgar/pkg/pound2/trunk/Makefile csw/mgar/pkg/privoxy/trunk/Makefile csw/mgar/pkg/proxytunnel/trunk/Makefile csw/mgar/pkg/pth/trunk/Makefile csw/mgar/pkg/pubcookie/trunk/Makefile csw/mgar/pkg/puppet/branches/puppet-0.24.x/Makefile csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/pureftpd/trunk/Makefile csw/mgar/pkg/pv/trunk/Makefile csw/mgar/pkg/pwgen/trunk/Makefile csw/mgar/pkg/pxlib/trunk/Makefile csw/mgar/pkg/py_antlr/trunk/Makefile csw/mgar/pkg/pycairo/trunk/Makefile csw/mgar/pkg/pycurl/trunk/Makefile csw/mgar/pkg/pydes/trunk/Makefile csw/mgar/pkg/pydocutils/trunk/Makefile csw/mgar/pkg/pygobject/trunk/Makefile csw/mgar/pkg/pygtk/trunk/Makefile csw/mgar/pkg/pykstat/trunk/Makefile csw/mgar/pkg/pylxml/trunk/Makefile csw/mgar/pkg/pyorbit/trunk/Makefile csw/mgar/pkg/pysetuptools/trunk/Makefile csw/mgar/pkg/pysoappy/trunk/Makefile csw/mgar/pkg/pysqlite/trunk/Makefile csw/mgar/pkg/pysqlite2/trunk/Makefile csw/mgar/pkg/pysvn/trunk/Makefile csw/mgar/pkg/python/trunk/Makefile csw/mgar/pkg/python3/trunk/Makefile csw/mgar/pkg/pyyaml/trunk/Makefile csw/mgar/pkg/pyzor/trunk/Makefile csw/mgar/pkg/qhull/trunk/Makefile csw/mgar/pkg/qt4/trunk/Makefile csw/mgar/pkg/r/trunk/Makefile csw/mgar/pkg/rapidsvn/trunk/Makefile csw/mgar/pkg/rcairo/trunk/Makefile csw/mgar/pkg/rcs/trunk/Makefile csw/mgar/pkg/rdesktop/trunk/Makefile csw/mgar/pkg/re2c/Makefile csw/mgar/pkg/readline/tags/readline-6.0,REV=2009.03.31/Makefile csw/mgar/pkg/readline/trunk/Makefile csw/mgar/pkg/recode/trunk/Makefile csw/mgar/pkg/reportlab/trunk/Makefile csw/mgar/pkg/rlwrap/trunk/Makefile csw/mgar/pkg/rox-filer/trunk/Makefile csw/mgar/pkg/rrdtool/trunk/Makefile csw/mgar/pkg/rspec/trunk/Makefile csw/mgar/pkg/rtorrent/trunk/Makefile csw/mgar/pkg/ruby/trunk/Makefile csw/mgar/pkg/rubygems/trunk/Makefile csw/mgar/pkg/samba/trunk/Makefile csw/mgar/pkg/sar2rrd/trunk/Makefile csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/scrollkeeper/trunk/Makefile csw/mgar/pkg/sdlimage/trunk/Makefile csw/mgar/pkg/sdlmixer/trunk/Makefile csw/mgar/pkg/seamonkey/trunk/Makefile csw/mgar/pkg/sed/trunk/Makefile csw/mgar/pkg/sendmail/branches/benny/Makefile csw/mgar/pkg/sendmail/branches/mwatters/Makefile csw/mgar/pkg/sendmail/trunk/Makefile csw/mgar/pkg/sgml-xml-common/trunk/Makefile csw/mgar/pkg/shared-mime-info/trunk/Makefile csw/mgar/pkg/shmux/trunk/Makefile csw/mgar/pkg/shout-python/trunk/Makefile csw/mgar/pkg/siege/trunk/Makefile csw/mgar/pkg/silvercity/trunk/Makefile csw/mgar/pkg/slang/trunk/Makefile csw/mgar/pkg/smbldap-tools/trunk/Makefile csw/mgar/pkg/snort/trunk/Makefile csw/mgar/pkg/socat/trunk/Makefile csw/mgar/pkg/sox/trunk/Makefile csw/mgar/pkg/spamass-milter/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/speex/trunk/Makefile csw/mgar/pkg/spine/trunk/Makefile csw/mgar/pkg/sqlite3/tags/sqlite3-3.6.19,REV=2009.10.29/Makefile csw/mgar/pkg/sqlite3/tags/sqlite3-3.6.21,REV=2010.01.04/Makefile csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/squid/tags/squid-2.7,REV=2009.06.18_STABLE6/Makefile csw/mgar/pkg/squid/tags/squid-squid-2.7,REV=2009.06.18_STABLE6/Makefile csw/mgar/pkg/squid/trunk/Makefile csw/mgar/pkg/squidclamav/trunk/Makefile csw/mgar/pkg/squirrelmail/trunk/Makefile csw/mgar/pkg/ss5/trunk/Makefile csw/mgar/pkg/stunnel/trunk/Makefile csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo_ldap/trunk/Makefile csw/mgar/pkg/supybot/trunk/Makefile csw/mgar/pkg/swig/trunk/Makefile csw/mgar/pkg/syslog_ng/trunk/Makefile csw/mgar/pkg/sysstat/tags/sysstat-20091024,REV=2009.10.25/Makefile csw/mgar/pkg/sysstat/trunk/Makefile csw/mgar/pkg/tcl/trunk/Makefile csw/mgar/pkg/tcl85/trunk/Makefile csw/mgar/pkg/tcpdump/trunk/Makefile csw/mgar/pkg/tcpflow/trunk/Makefile csw/mgar/pkg/tcsh/trunk/Makefile csw/mgar/pkg/template/trunk/Makefile csw/mgar/pkg/texinfo/trunk/Makefile csw/mgar/pkg/thunderbird/branches/thunderbird3-packaging/Makefile csw/mgar/pkg/thunderbird/trunk/Makefile csw/mgar/pkg/tiff/trunk/Makefile csw/mgar/pkg/tig/trunk/Makefile csw/mgar/pkg/tightvnc/branches/tightvnc-1.5/Makefile csw/mgar/pkg/tightvnc/trunk/Makefile csw/mgar/pkg/tk/trunk/Makefile csw/mgar/pkg/tkcvs/trunk/Makefile csw/mgar/pkg/tnef/trunk/Makefile csw/mgar/pkg/trac/trunk/Makefile csw/mgar/pkg/trafshow/trunk/Makefile csw/mgar/pkg/transmission/trunk/Makefile csw/mgar/pkg/tuntap/trunk/Makefile csw/mgar/pkg/twisted/trunk/Makefile csw/mgar/pkg/ufraw/trunk/Makefile csw/mgar/pkg/unbound/trunk/Makefile csw/mgar/pkg/unixodbc/trunk/Makefile csw/mgar/pkg/unrtf/trunk/Makefile csw/mgar/pkg/urxvt/trunk/Makefile csw/mgar/pkg/vim/trunk/Makefile csw/mgar/pkg/vixiecron/trunk/Makefile csw/mgar/pkg/vorbistools/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/w3m/trunk/Makefile csw/mgar/pkg/watch/trunk/Makefile csw/mgar/pkg/wavpack/tags/wavpack-4.60.0,REV=2009.11.06/Makefile csw/mgar/pkg/wavpack/trunk/Makefile csw/mgar/pkg/websvn/trunk/Makefile csw/mgar/pkg/wget/trunk/Makefile csw/mgar/pkg/wgetpaste/trunk/Makefile csw/mgar/pkg/wireshark/trunk/Makefile csw/mgar/pkg/wmf/trunk/Makefile csw/mgar/pkg/wput/trunk/Makefile csw/mgar/pkg/wxwidgets/trunk/Makefile csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/Makefile csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/Makefile csw/mgar/pkg/x11/individual/x11_printproto/trunk/Makefile csw/mgar/pkg/x11/individual/x11_trapproto/trunk/Makefile csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/Makefile csw/mgar/pkg/x11/individual/x11_xf86rushproto/trunk/Makefile csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile csw/mgar/pkg/x11/lib/libfs/trunk/Makefile csw/mgar/pkg/x11/lib/libice/trunk/Makefile csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/Makefile csw/mgar/pkg/x11/lib/libsm/trunk/Makefile csw/mgar/pkg/x11/lib/libx11/trunk/Makefile csw/mgar/pkg/x11/lib/libxau/trunk/Makefile csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile csw/mgar/pkg/x11/lib/libxcursor/trunk/Makefile csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile csw/mgar/pkg/x11/lib/libxdmcp/trunk/Makefile csw/mgar/pkg/x11/lib/libxext/trunk/Makefile csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile csw/mgar/pkg/x11/lib/libxfontcache/trunk/Makefile csw/mgar/pkg/x11/lib/libxft/trunk/Makefile csw/mgar/pkg/x11/lib/libxi/trunk/Makefile csw/mgar/pkg/x11/lib/libxinerama/trunk/Makefile csw/mgar/pkg/x11/lib/libxkbfile/trunk/Makefile csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile csw/mgar/pkg/x11/lib/libxres/trunk/Makefile csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile csw/mgar/pkg/x11/lib/libxt/trunk/Makefile csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile csw/mgar/pkg/x11/lib/libxv/trunk/Makefile csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile csw/mgar/pkg/x11/lib/libxxf86misc/trunk/Makefile csw/mgar/pkg/x11/lib/libxxf86vm/trunk/Makefile csw/mgar/pkg/x11/lib/xrender/trunk/Makefile csw/mgar/pkg/x11/lib/xtrans/trunk/Makefile csw/mgar/pkg/x11/liblbxutil/trunk/Makefile csw/mgar/pkg/x11/liboldx/trunk/Makefile csw/mgar/pkg/x11/libwindowswm/trunk/Makefile csw/mgar/pkg/x11/libxevie/trunk/Makefile csw/mgar/pkg/x11/libxkbui/trunk/Makefile csw/mgar/pkg/x11/libxp/trunk/Makefile csw/mgar/pkg/x11/libxprintapputil/trunk/Makefile csw/mgar/pkg/x11/libxprintutil/trunk/Makefile csw/mgar/pkg/x11/libxtrap/trunk/Makefile csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_damageproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_dri2proto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_glproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_inputproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_kbproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_randrproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_recordproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_renderproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xextproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/Makefile csw/mgar/pkg/x11/proto/x11_xproto/trunk/Makefile csw/mgar/pkg/x11/xcb/libxcb/trunk/Makefile csw/mgar/pkg/x11/xcb/x11_xcbproto/trunk/Makefile csw/mgar/pkg/x11/xcb/xcb-util/trunk/Makefile csw/mgar/pkg/xapian-bindings/trunk/Makefile csw/mgar/pkg/xapian-core/trunk/Makefile csw/mgar/pkg/xbill/trunk/Makefile csw/mgar/pkg/xchat/trunk/Makefile csw/mgar/pkg/xchm/trunk/Makefile csw/mgar/pkg/xfce/dbh/trunk/Makefile csw/mgar/pkg/xfce/libxfce4menu/trunk/Makefile csw/mgar/pkg/xfce/libxfce4util/trunk/Makefile csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile csw/mgar/pkg/xfce/xfconf/trunk/Makefile csw/mgar/pkg/xmlrpc_c/trunk/Makefile csw/mgar/pkg/xmlstarlet/trunk/Makefile csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xpdf/trunk/Makefile csw/mgar/pkg/xterm/trunk/Makefile csw/mgar/pkg/xz/trunk/Makefile csw/mgar/pkg/yaml-mode/trunk/Makefile csw/mgar/pkg/yasm/trunk/Makefile csw/mgar/pkg/zlib/trunk/Makefile csw/mgar/pkg/zsh/trunk/Makefile csw/mgar/pkg/zshdb/trunk/Makefile Modified: csw/mgar/gar/v1/gar.mk =================================================================== --- csw/mgar/gar/v1/gar.mk 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/gar/v1/gar.mk 2010-02-03 18:36:29 UTC (rev 8335) @@ -121,7 +121,7 @@ @echo "[===== NOW BUILDING: $(DISTNAME) =====]" # prerequisite - Make sure that the system is in a sane state for building the package -PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) +PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) prerequisite: announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite $(DONADA) @@ -136,7 +136,7 @@ @$(MAKECOOKIE) # install-prerequisites - Install all packages which are prerequisites for the package to be build -install-prerequisites: $(addprefix install-prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS)) +install-prerequisites: $(addprefix install-prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS)) # fetch-list - Show list of files that would be retrieved by fetch. # NOTE: DOES NOT RUN pre-everything! Modified: csw/mgar/gar/v1/gar.pkg.mk =================================================================== --- csw/mgar/gar/v1/gar.pkg.mk 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/gar/v1/gar.pkg.mk 2010-02-03 18:36:29 UTC (rev 8335) @@ -208,4 +208,4 @@ @echo @echo "*** Dependencies" - @$(foreach P,$(PREREQUISITE_PKGS),echo "$P";) + @$(foreach P,$(BUILD_DEP_PKGS),echo "$P";) Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/gar/v2/gar.mk 2010-02-03 18:36:29 UTC (rev 8335) @@ -295,7 +295,7 @@ @echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]" # prerequisite - Make sure that the system is in a sane state for building the package -PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) +PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) # Force to be called in global modulation prerequisite: $(if $(filter global,$(MODULATION)),announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite) @@ -582,7 +582,7 @@ # the binaries should be executed by isaexec. This is usually bin, sbin and libexec. # # default: relocate to ISA subdirs if more than one ISA, use isaexec-wrapper for bin/, etc. -# NO_ISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/ +# NOISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/ # # Automatic merging is only possible if you have the default modulation "ISA" # Otherwise you *must* specify merge scripts for all modulations. @@ -598,7 +598,7 @@ MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= $(MERGE_SCRIPTS_isa-default) MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED)) else -ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) +ISAEXEC_DIRS ?= $(if $(NOISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) MERGE_DIRS_isa-default ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) MERGE_DIRS_isa-extra ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) MERGE_DIRS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSEDEXTRA)) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-03 18:36:29 UTC (rev 8335) @@ -49,7 +49,7 @@ GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}') GARPKG_v1 = CSWgar-v1 GARPKG_v2 = CSWgar-v2 -REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) +RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) @@ -65,7 +65,7 @@ GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}') GARPKG_v1 = CSWgar-v1 GARPKG_v2 = CSWgar-v2 -REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) +RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) @@ -403,7 +403,7 @@ # Dynamic depends are constructed as follows: # - Packages the currently constructed one depends on can be specified with -# REQUIRED_PKGS_ specifically, or REQUIRED_PKGS for all packages build. +# RUNTIME_DEP_PKGS_ specifically, or RUNTIME_DEP_PKGS for all packages build. # These are flagged as 'P' in the depend file. # - If multiple packages are build at the same time it is valid to have # dependencies between them. In this case it is necessary to define the package @@ -425,11 +425,11 @@ $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$F[1] eq "$C");)')),CSWcswclassutils) $(WORKDIR)/%.depend: $(WORKDIR) - $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ + $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(RUNTIME_DEP_PKGS_$*)$(RUNTIME_DEP_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ ($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\ echo "I $(PKG)";\ )\ - $(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ + $(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(RUNTIME_DEP_PKGS_$*) $(RUNTIME_DEP_PKGS),\ $(if $(SPKG_DESC_$(PKG)), \ echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | $(GAWK) '{ $$1 = "P"; print } ')"; \ Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-03 18:36:29 UTC (rev 8335) @@ -46,7 +46,7 @@ # SUGGESTION: you may want to add some or all of the following as depends: # (Feel free to ignore SUNW or SPRO packages) #for $pkg in $sorted($missing_deps) -REQUIRED_PKGS_$pkgname += $pkg +RUNTIME_DEP_PKGS_$pkgname += $pkg #end for #end if #if $surplus_deps Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-03 18:36:29 UTC (rev 8335) @@ -561,8 +561,8 @@ expected = u"""# CSWfoo: # SUGGESTION: you may want to add some or all of the following as depends: # (Feel free to ignore SUNW or SPRO packages) -REQUIRED_PKGS_CSWfoo += *SUNWlxsl -REQUIRED_PKGS_CSWfoo += SUNWgss +RUNTIME_DEP_PKGS_CSWfoo += *SUNWlxsl +RUNTIME_DEP_PKGS_CSWfoo += SUNWgss # The following dependencies might be unnecessary: # ? CSWlibxslt # ? CSWsudo Modified: csw/mgar/gar/v2-git/gar.mk =================================================================== --- csw/mgar/gar/v2-git/gar.mk 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/gar/v2-git/gar.mk 2010-02-03 18:36:29 UTC (rev 8335) @@ -295,7 +295,7 @@ @echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]" # prerequisite - Make sure that the system is in a sane state for building the package -PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) +PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) # Force to be called in global modulation prerequisite: $(if $(filter global,$(MODULATION)),announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite) @@ -619,7 +619,7 @@ # the binaries should be executed by isaexec. This is usually bin, sbin and libexec. # # default: relocate to ISA subdirs if more than one ISA, use isaexec-wrapper for bin/, etc. -# NO_ISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/ +# NOISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/ # # Automatic merging is only possible if you have the default modulation "ISA" # Otherwise you *must* specify merge scripts for all modulations. @@ -635,7 +635,7 @@ MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= $(MERGE_SCRIPTS_isa-default) MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED)) else -ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) +ISAEXEC_DIRS ?= $(if $(NOISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) MERGE_DIRS_isa-default ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) MERGE_DIRS_isa-extra ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) MERGE_DIRS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSEDEXTRA)) Modified: csw/mgar/gar/v2-git/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-git/gar.pkg.mk 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/gar/v2-git/gar.pkg.mk 2010-02-03 18:36:29 UTC (rev 8335) @@ -49,7 +49,7 @@ GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}') GARPKG_v1 = CSWgar-v1 GARPKG_v2 = CSWgar-v2 -REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) +RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) @@ -65,7 +65,7 @@ GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}') GARPKG_v1 = CSWgar-v1 GARPKG_v2 = CSWgar-v2 -REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) +RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) @@ -403,7 +403,7 @@ # Dynamic depends are constructed as follows: # - Packages the currently constructed one depends on can be specified with -# REQUIRED_PKGS_ specifically, or REQUIRED_PKGS for all packages build. +# RUNTIME_DEP_PKGS_ specifically, or RUNTIME_DEP_PKGS for all packages build. # These are flagged as 'P' in the depend file. # - If multiple packages are build at the same time it is valid to have # dependencies between them. In this case it is necessary to define the package @@ -425,11 +425,11 @@ $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$F[1] eq "$C");)')),CSWcswclassutils) $(WORKDIR)/%.depend: $(WORKDIR) - $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ + $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(RUNTIME_DEP_PKGS_$*)$(RUNTIME_DEP_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ ($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\ echo "I $(PKG)";\ )\ - $(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ + $(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(RUNTIME_DEP_PKGS_$*) $(RUNTIME_DEP_PKGS),\ $(if $(SPKG_DESC_$(PKG)), \ echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | $(GAWK) '{ $$1 = "P"; print } ')"; \ Modified: csw/mgar/gar/v2-git/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2-git/lib/python/checkpkg.py 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/gar/v2-git/lib/python/checkpkg.py 2010-02-03 18:36:29 UTC (rev 8335) @@ -46,7 +46,7 @@ # SUGGESTION: you may want to add some or all of the following as depends: # (Feel free to ignore SUNW or SPRO packages) #for $pkg in $sorted($missing_deps) -REQUIRED_PKGS_$pkgname += $pkg +RUNTIME_DEP_PKGS_$pkgname += $pkg #end for #end if #if $surplus_deps Modified: csw/mgar/gar/v2-git/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-git/lib/python/checkpkg_test.py 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/gar/v2-git/lib/python/checkpkg_test.py 2010-02-03 18:36:29 UTC (rev 8335) @@ -561,8 +561,8 @@ expected = u"""# CSWfoo: # SUGGESTION: you may want to add some or all of the following as depends: # (Feel free to ignore SUNW or SPRO packages) -REQUIRED_PKGS_CSWfoo += *SUNWlxsl -REQUIRED_PKGS_CSWfoo += SUNWgss +RUNTIME_DEP_PKGS_CSWfoo += *SUNWlxsl +RUNTIME_DEP_PKGS_CSWfoo += SUNWgss # The following dependencies might be unnecessary: # ? CSWlibxslt # ? CSWsudo Modified: csw/mgar/gar/v2-relocate/gar.mk =================================================================== --- csw/mgar/gar/v2-relocate/gar.mk 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/gar/v2-relocate/gar.mk 2010-02-03 18:36:29 UTC (rev 8335) @@ -231,7 +231,7 @@ @echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]" # prerequisite - Make sure that the system is in a sane state for building the package -PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) +PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) prerequisite: announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite $(DONADA) @@ -505,7 +505,7 @@ # the binaries should be executed by isaexec. This is usually bin, sbin and libexec. # # default: relocate to ISA subdirs if more than one ISA, use isaexec-wrapper for bin/, etc. -# NO_ISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/ +# NOISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/ # # Automatic merging is only possible if you have the default modulation "ISA" # Otherwise you *must* specify merge scripts for all modulations. @@ -519,7 +519,7 @@ ifeq ($(NEEDED_ISAS),$(ISA_DEFAULT)) MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) else -ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) +ISAEXEC_DIRS ?= $(if $(NOISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) MERGE_DIRS_isa-$(ISA_DEFAULT) ?= MERGE_DIRS_isa-$(ISA) ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) Modified: csw/mgar/gar/v2-relocate/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-relocate/gar.pkg.mk 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/gar/v2-relocate/gar.pkg.mk 2010-02-03 18:36:29 UTC (rev 8335) @@ -49,7 +49,7 @@ GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}') GARPKG_v1 = CSWgar-v1 GARPKG_v2 = CSWgar-v2 -REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) +RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) @@ -65,7 +65,7 @@ GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}') GARPKG_v1 = CSWgar-v1 GARPKG_v2 = CSWgar-v2 -REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) +RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) @@ -341,7 +341,7 @@ # Dynamic depends are constructed as follows: # - Packages the currently constructed one depends on can be specified with -# REQUIRED_PKGS_ specifically, or REQUIRED_PKGS for all packages build. +# RUNTIME_DEP_PKGS_ specifically, or RUNTIME_DEP_PKGS for all packages build. # These are flagged as 'P' in the depend file. # - If multiple packages are build at the same time it is valid to have # dependencies between them. In this case it is necessary to define the package @@ -356,11 +356,11 @@ # $_EXTRA_GAR_PKGS is for dynamic dependencies added by GAR itself (like CSWisaexec or CSWcswclassutils) .PRECIOUS: $(WORKDIR)/%.depend $(WORKDIR)/%.depend: $(WORKDIR) - $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ + $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(RUNTIME_DEP_PKGS_$*)$(RUNTIME_DEP_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ ($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\ echo "I $(PKG)";\ )\ - $(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ + $(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(RUNTIME_DEP_PKGS_$*) $(RUNTIME_DEP_PKGS),\ $(if $(SPKG_DESC_$(PKG)), \ echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | awk '{ $$1 = "P"; print } ')"; \ Modified: csw/mgar/gar/v2-skayser/gar.mk =================================================================== --- csw/mgar/gar/v2-skayser/gar.mk 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/gar/v2-skayser/gar.mk 2010-02-03 18:36:29 UTC (rev 8335) @@ -231,7 +231,7 @@ @echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]" # prerequisite - Make sure that the system is in a sane state for building the package -PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) +PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) prerequisite: announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite $(DONADA) @@ -507,7 +507,7 @@ # the binaries should be executed by isaexec. This is usually bin, sbin and libexec. # # default: relocate to ISA subdirs if more than one ISA, use isaexec-wrapper for bin/, etc. -# NO_ISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/ +# NOISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/ # # Automatic merging is only possible if you have the default modulation "ISA" # Otherwise you *must* specify merge scripts for all modulations. @@ -521,7 +521,7 @@ ifeq ($(NEEDED_ISAS),$(ISA_DEFAULT)) MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) else -ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) +ISAEXEC_DIRS ?= $(if $(NOISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) MERGE_DIRS_isa-$(ISA_DEFAULT) ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) MERGE_DIRS_isa-$(ISA) ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) Modified: csw/mgar/gar/v2-skayser/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-skayser/gar.pkg.mk 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/gar/v2-skayser/gar.pkg.mk 2010-02-03 18:36:29 UTC (rev 8335) @@ -49,7 +49,7 @@ GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}') GARPKG_v1 = CSWgar-v1 GARPKG_v2 = CSWgar-v2 -REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) +RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) @@ -65,7 +65,7 @@ GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}') GARPKG_v1 = CSWgar-v1 GARPKG_v2 = CSWgar-v2 -REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) +RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) @@ -340,7 +340,7 @@ # Dynamic depends are constructed as follows: # - Packages the currently constructed one depends on can be specified with -# REQUIRED_PKGS_ specifically, or REQUIRED_PKGS for all packages build. +# RUNTIME_DEP_PKGS_ specifically, or RUNTIME_DEP_PKGS for all packages build. # These are flagged as 'P' in the depend file. # - If multiple packages are build at the same time it is valid to have # dependencies between them. In this case it is necessary to define the package @@ -355,11 +355,11 @@ # $_EXTRA_GAR_PKGS is for dynamic dependencies added by GAR itself (like CSWisaexec or CSWcswclassutils) .PRECIOUS: $(WORKDIR)/%.depend $(WORKDIR)/%.depend: $(WORKDIR) - $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ + $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(RUNTIME_DEP_PKGS_$*)$(RUNTIME_DEP_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ ($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\ echo "I $(PKG)";\ )\ - $(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ + $(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(RUNTIME_DEP_PKGS_$*) $(RUNTIME_DEP_PKGS),\ $(if $(SPKG_DESC_$(PKG)), \ echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | awk '{ $$1 = "P"; print } ')"; \ Modified: csw/mgar/pkg/GeoIP/trunk/Makefile =================================================================== --- csw/mgar/pkg/GeoIP/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/GeoIP/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -11,8 +11,8 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWgeoip CSWgeoipdevel -REQUIRED_PKGS_CSWgeoip = CSWgeolitedb CSWzlib CSWgcc3corert -REQUIRED_PKGS_CSWgeoipdevel = CSWgeoip +RUNTIME_DEP_PKGS_CSWgeoip = CSWgeolitedb CSWzlib CSWgcc3corert +RUNTIME_DEP_PKGS_CSWgeoipdevel = CSWgeoip CATALOGNAME_CSWgeoip = geoip CATALOGNAME_CSWgeoipdevel = geoip_devel SPKG_DESC_CSWgeoip = $(DESCRIPTION) Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -20,12 +20,12 @@ LICENSE = LICENSE -REQUIRED_PKGS += CSWbzip2 CSWdjvulibrert CSWfconfig CSWftype2 CSWggettextrt -REQUIRED_PKGS += CSWglib2 CSWgs CSWgtk2 CSWilmbase CSWjasper CSWjbigkit -REQUIRED_PKGS += CSWjpeg CSWlcms CSWlibcairo CSWlibfpx CSWlibrsvg CSWlibxml2 -REQUIRED_PKGS += CSWopenexr CSWperl CSWpng CSWsunmath CSWtiff CSWwmf CSWzlib -REQUIRED_PKGS += CSWlibtoolrt CSWlibice CSWlibsm CSWlibxext CSWgraphviz -REQUIRED_PKGS += CSWlibx11 CSWlibxt +RUNTIME_DEP_PKGS += CSWbzip2 CSWdjvulibrert CSWfconfig CSWftype2 CSWggettextrt +RUNTIME_DEP_PKGS += CSWglib2 CSWgs CSWgtk2 CSWilmbase CSWjasper CSWjbigkit +RUNTIME_DEP_PKGS += CSWjpeg CSWlcms CSWlibcairo CSWlibfpx CSWlibrsvg CSWlibxml2 +RUNTIME_DEP_PKGS += CSWopenexr CSWperl CSWpng CSWsunmath CSWtiff CSWwmf CSWzlib +RUNTIME_DEP_PKGS += CSWlibtoolrt CSWlibice CSWlibsm CSWlibxext CSWgraphviz +RUNTIME_DEP_PKGS += CSWlibx11 CSWlibxt # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 Modified: csw/mgar/pkg/MailScanner/trunk/Makefile =================================================================== --- csw/mgar/pkg/MailScanner/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/MailScanner/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -19,7 +19,7 @@ PACKAGES = CSWmailscanner CATALOGNAME = mailscanner -#REQUIRED_PKGS = +#RUNTIME_DEP_PKGS = #ARCHALL = 1 Modified: csw/mgar/pkg/Vispan/trunk/Makefile =================================================================== --- csw/mgar/pkg/Vispan/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/Vispan/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -15,7 +15,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWpmgeoippureperl CSWpmnetcidr CSWpmnetdns CSWpmgd CSWpmgdgraph CSWpmnumberformat CSWpmmailsendmail +RUNTIME_DEP_PKGS = CSWpmgeoippureperl CSWpmnetcidr CSWpmnetdns CSWpmgd CSWpmgdgraph CSWpmnumberformat CSWpmmailsendmail CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/ZSI/trunk/Makefile =================================================================== --- csw/mgar/pkg/ZSI/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/ZSI/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -27,6 +27,6 @@ CATALOGNAME = py_zsi ARCHALL = 1 -REQUIRED_PKGS = CSWpyxml +RUNTIME_DEP_PKGS = CSWpyxml include gar/category.mk Modified: csw/mgar/pkg/aide/trunk/Makefile =================================================================== --- csw/mgar/pkg/aide/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/aide/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -24,8 +24,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWcurlrt CSWgcrypt CSWgpgerr CSWlibidn CSWlibmhash CSWlibpq -REQUIRED_PKGS += CSWoldaprt CSWosslrt CSWzlib +RUNTIME_DEP_PKGS = CSWcurlrt CSWgcrypt CSWgpgerr CSWlibidn CSWlibmhash CSWlibpq +RUNTIME_DEP_PKGS += CSWoldaprt CSWosslrt CSWzlib sysconfdir = /etc/opt/csw/aide PRESERVECONF = $(sysconfdir)/aide.conf Modified: csw/mgar/pkg/alpine/trunk/Makefile =================================================================== --- csw/mgar/pkg/alpine/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/alpine/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -58,8 +58,8 @@ TEST_TARGET = check -REQUIRED_PKGS = CSWggettextrt CSWiconv CSWtcl CSWsasl CSWosslrt -REQUIRED_PKGS += CSWkrb5lib CSWlibnet CSWncurses CSWoldaprt +RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv CSWtcl CSWsasl CSWosslrt +RUNTIME_DEP_PKGS += CSWkrb5lib CSWlibnet CSWncurses CSWoldaprt include files/install_scripts.mk include gar/category.mk Modified: csw/mgar/pkg/amavisd-new/trunk/Makefile =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/amavisd-new/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -20,22 +20,22 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS += CSWbdb47 -REQUIRED_PKGS += CSWperl -REQUIRED_PKGS += CSWcswclassutils -REQUIRED_PKGS += CSWpmiostringy -REQUIRED_PKGS += CSWpmnetserver -REQUIRED_PKGS += CSWpmmailtools -REQUIRED_PKGS += CSWpmmimetools -REQUIRED_PKGS += CSWiocompress -REQUIRED_PKGS += CSWpmarchivetar -REQUIRED_PKGS += CSWpmarchivezip -REQUIRED_PKGS += CSWspamassassin -REQUIRED_PKGS += CSWpmberkeleydb -REQUIRED_PKGS += CSWpmconverttnef -REQUIRED_PKGS += CSWpmconvertuulib -REQUIRED_PKGS += CSWpmmaildkim -REQUIRED_PKGS += CSWpmunixsyslog +RUNTIME_DEP_PKGS += CSWbdb47 +RUNTIME_DEP_PKGS += CSWperl +RUNTIME_DEP_PKGS += CSWcswclassutils +RUNTIME_DEP_PKGS += CSWpmiostringy +RUNTIME_DEP_PKGS += CSWpmnetserver +RUNTIME_DEP_PKGS += CSWpmmailtools +RUNTIME_DEP_PKGS += CSWpmmimetools +RUNTIME_DEP_PKGS += CSWiocompress +RUNTIME_DEP_PKGS += CSWpmarchivetar +RUNTIME_DEP_PKGS += CSWpmarchivezip +RUNTIME_DEP_PKGS += CSWspamassassin +RUNTIME_DEP_PKGS += CSWpmberkeleydb +RUNTIME_DEP_PKGS += CSWpmconverttnef +RUNTIME_DEP_PKGS += CSWpmconvertuulib +RUNTIME_DEP_PKGS += CSWpmmaildkim +RUNTIME_DEP_PKGS += CSWpmunixsyslog PATCHFILES += amavisd-agent.diff PATCHFILES += amavisd-nanny.diff Modified: csw/mgar/pkg/apache2/tags/apache-2.2.13-by-idogan/Makefile =================================================================== --- csw/mgar/pkg/apache2/tags/apache-2.2.13-by-idogan/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/apache2/tags/apache-2.2.13-by-idogan/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -40,19 +40,19 @@ DISTFILES += httpd-ssl.conf.CSW DISTFILES += update20to22 -REQUIRED_PKGS_CSWapache2 = CSWapache2c CSWap2prefork -REQUIRED_PKGS_CSWapache2c = CSWapache2rt CSWbdb CSWexpat CSWgdbm CSWiconv -REQUIRED_PKGS_CSWapache2c += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib -REQUIRED_PKGS_CSWapache2c += CSWsqlite3 CSWcswclassutils -REQUIRED_PKGS_CSWapache2rt = CSWbdb CSWexpat CSWgdbm CSWggettextrt CSWgsed -REQUIRED_PKGS_CSWapache2rt += CSWiconv CSWoldaprt CSWosslrt CSWperl CSWsasl -REQUIRED_PKGS_CSWapache2rt += CSWzlib CSWsqlite3 CSWlibnet CSWsqlite3rt -REQUIRED_PKGS_CSWap2prefork = CSWapache2c CSWapache2rt CSWbdb CSWexpat CSWgdbm -REQUIRED_PKGS_CSWap2prefork += CSWiconv CSWlibnet CSWoldaprt CSWosslrt CSWsasl -REQUIRED_PKGS_CSWap2prefork += CSWzlib CSWsqlite3 -REQUIRED_PKGS_CSWap2suexec = CSWapache2 -REQUIRED_PKGS_CSWapache2-devel = CSWapache2rt -REQUIRED_PKGS_CSWapache2-manual = CSWapache2 +RUNTIME_DEP_PKGS_CSWapache2 = CSWapache2c CSWap2prefork +RUNTIME_DEP_PKGS_CSWapache2c = CSWapache2rt CSWbdb CSWexpat CSWgdbm CSWiconv +RUNTIME_DEP_PKGS_CSWapache2c += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib +RUNTIME_DEP_PKGS_CSWapache2c += CSWsqlite3 CSWcswclassutils +RUNTIME_DEP_PKGS_CSWapache2rt = CSWbdb CSWexpat CSWgdbm CSWggettextrt CSWgsed +RUNTIME_DEP_PKGS_CSWapache2rt += CSWiconv CSWoldaprt CSWosslrt CSWperl CSWsasl +RUNTIME_DEP_PKGS_CSWapache2rt += CSWzlib CSWsqlite3 CSWlibnet CSWsqlite3rt +RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2c CSWapache2rt CSWbdb CSWexpat CSWgdbm +RUNTIME_DEP_PKGS_CSWap2prefork += CSWiconv CSWlibnet CSWoldaprt CSWosslrt CSWsasl +RUNTIME_DEP_PKGS_CSWap2prefork += CSWzlib CSWsqlite3 +RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 +RUNTIME_DEP_PKGS_CSWapache2-devel = CSWapache2rt +RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2 SPKG_CLASSES_CSWapache2c = none cswinitsmf Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -36,11 +36,11 @@ DISTFILES += httpd-ssl.conf.CSW DISTFILES += update20to22 -REQUIRED_PKGS_CSWapache2 = CSWbdb CSWexpat CSWgdbm CSWiconv -REQUIRED_PKGS_CSWapache2 += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib -REQUIRED_PKGS_CSWapache2 += CSWsqlite3rt CSWsqlite3 CSWcswclassutils -REQUIRED_PKGS_CSWapache2 += CSWggettextrt CSWgsed -REQUIRED_PKGS_CSWapache2 += CSWperl +RUNTIME_DEP_PKGS_CSWapache2 = CSWbdb CSWexpat CSWgdbm CSWiconv +RUNTIME_DEP_PKGS_CSWapache2 += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib +RUNTIME_DEP_PKGS_CSWapache2 += CSWsqlite3rt CSWsqlite3 CSWcswclassutils +RUNTIME_DEP_PKGS_CSWapache2 += CSWggettextrt CSWgsed +RUNTIME_DEP_PKGS_CSWapache2 += CSWperl # The SMF support: you don't need to specify cswinitsmf any more. You need to # make sure the the /etc/opt/csw/init.d/cswapache file gets installed during Modified: csw/mgar/pkg/apcupsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/apcupsd/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/apcupsd/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -18,7 +18,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWcswclassutils +RUNTIME_DEP_PKGS = CSWcswclassutils SPKG_CLASSES = none cswcpsampleconf cswinitsmf PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswapcupsd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/apcupsd\/apcupsd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' | grep -v \/etc\/rc Modified: csw/mgar/pkg/asciidoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/asciidoc/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/asciidoc/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -18,7 +18,7 @@ ARCHALL_CSWasciidoc = 1 -REQUIRED_PKGS_CSWasciidoc = CSWpython CSWgnulinks CSWggetopt +RUNTIME_DEP_PKGS_CSWasciidoc = CSWpython CSWgnulinks CSWggetopt MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz Modified: csw/mgar/pkg/autoconf/tags/autoconf-2.64,REV=2009.07.29/Makefile =================================================================== --- csw/mgar/pkg/autoconf/tags/autoconf-2.64,REV=2009.07.29/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/autoconf/tags/autoconf-2.64,REV=2009.07.29/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -17,8 +17,8 @@ PATCHFILES = use-csw-tools.patch -PREREQUISITE_PKGS = CSWhelp2man -REQUIRED_PKGS = CSWgawk CSWgm4 CSWperl +BUILD_DEP_PKGS = CSWhelp2man +RUNTIME_DEP_PKGS = CSWgawk CSWgm4 CSWperl CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/autoconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/autoconf/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/autoconf/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -17,8 +17,8 @@ PATCHFILES = 0001-Prefer-CSW-tools.patch -PREREQUISITE_PKGS = CSWhelp2man -REQUIRED_PKGS = CSWgawk CSWgm4 CSWperl +BUILD_DEP_PKGS = CSWhelp2man +RUNTIME_DEP_PKGS = CSWgawk CSWgm4 CSWperl CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/automake/trunk/Makefile =================================================================== --- csw/mgar/pkg/automake/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/automake/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -25,7 +25,7 @@ NOCHECKSUM = README.CSW NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz, $(SOURCEFILES)) -REQUIRED_PKGS = CSWperl +RUNTIME_DEP_PKGS = CSWperl CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/autoproject/trunk/Makefile =================================================================== --- csw/mgar/pkg/autoproject/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/autoproject/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -25,7 +25,7 @@ PATCHFILES = 0001-gawk-and-ggrep.patch UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz ARCHALL = 1 -REQUIRED_PKGS = CSWautomake CSWbash CSWgawk CSWggrep +RUNTIME_DEP_PKGS = CSWautomake CSWbash CSWgawk CSWggrep TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) AWK=gawk Modified: csw/mgar/pkg/awstats/trunk/Makefile =================================================================== --- csw/mgar/pkg/awstats/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/awstats/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -29,7 +29,7 @@ SPKG_SOURCEURL = http://awstats.sourceforge.net -REQUIRED_PKGS = CSWapache2 CSWperl +RUNTIME_DEP_PKGS = CSWapache2 CSWperl LICENSE = docs/LICENSE.TXT Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -26,8 +26,8 @@ PACKAGES = CSWbash -REQUIRED_PKGS = CSWggettextrt -REQUIRED_PKGS += CSWiconv +RUNTIME_DEP_PKGS = CSWggettextrt +RUNTIME_DEP_PKGS += CSWiconv SPKG_SOURCEURL = http://tiswww.case.edu/php/chet/bash/bashtop.html Modified: csw/mgar/pkg/bashdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/bashdb/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bashdb/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -26,7 +26,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -REQUIRED_PKGS = CSWbash +RUNTIME_DEP_PKGS = CSWbash CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/bazaar/trunk/Makefile =================================================================== --- csw/mgar/pkg/bazaar/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bazaar/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -17,7 +17,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)$(PATHREV)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS += CSWcswclassutils +RUNTIME_DEP_PKGS += CSWcswclassutils CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py Modified: csw/mgar/pkg/bdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -16,7 +16,7 @@ PACKAGES = CSWbdb CATALOGNAME = berkeleydb -REQUIRED_PKGS = CSWbdb47 +RUNTIME_DEP_PKGS = CSWbdb47 CONFIGURE_SCRIPTS = BUILD_SCRIPTS = Modified: csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile =================================================================== --- csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -25,7 +25,7 @@ PACKAGES = CSWbdb44 SPKG_DESC = BerkeleyDB 4.4 embedded database libraries and utilities CATALOGNAME = berkeleydb44 -REQUIRED_PKGS = CSWbdb +RUNTIME_DEP_PKGS = CSWbdb include gar/category.mk Modified: csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile =================================================================== --- csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -55,7 +55,7 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -NO_ISAEXEC = 1 +NOISAEXEC = 1 PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc @@ -69,7 +69,7 @@ SPKG_DESC_CSWbdb44-devel = BerkeleyDB 4.4 development support SPKG_DESC_CSWbdb44-doc = BerkeleyDB 4.4 documentation -REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44 +RUNTIME_DEP_PKGS_CSWbdb44-devel = CSWbdb44 INCOMPATIBLE_PKGS_CSWbdb44-doc = CSWbdb44doc LICENSE = LICENSE Modified: csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile =================================================================== --- csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -17,7 +17,7 @@ CATALOGNAME = berkeleydb3 ARCHALL = 1 -REQUIRED_PKGS = CSWbdb33 +RUNTIME_DEP_PKGS = CSWbdb33 CONFIGURE_SCRIPTS = BUILD_SCRIPTS = Modified: csw/mgar/pkg/bdb3/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb3/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb3/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -27,7 +27,7 @@ RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) #BUILD64 = 1 -NO_ISAEXEC = 1 +NOISAEXEC = 1 CONFIGURE_SCRIPTS = dist @@ -64,7 +64,7 @@ SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -REQUIRED_PKGS_CSWbdb3devel = CSWbdb3 +RUNTIME_DEP_PKGS_CSWbdb3devel = CSWbdb3 LICENSE = LICENSE Modified: csw/mgar/pkg/bdb4/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb4/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb4/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -17,7 +17,7 @@ CATALOGNAME = berkeleydb4 ARCHALL = 1 -REQUIRED_PKGS = CSWbdb42 +RUNTIME_DEP_PKGS = CSWbdb42 CONFIGURE_SCRIPTS = BUILD_SCRIPTS = Modified: csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile =================================================================== --- csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -25,7 +25,7 @@ PACKAGES = CSWbdb44 SPKG_DESC = BerkeleyDB 4.4 embedded database libraries and utilities CATALOGNAME = berkeleydb44 -REQUIRED_PKGS = CSWbdb +RUNTIME_DEP_PKGS = CSWbdb include gar/category.mk Modified: csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile =================================================================== --- csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -55,7 +55,7 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -NO_ISAEXEC = 1 +NOISAEXEC = 1 PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc @@ -69,7 +69,7 @@ SPKG_DESC_CSWbdb44-devel = BerkeleyDB 4.4 development support SPKG_DESC_CSWbdb44-doc = BerkeleyDB 4.4 documentation -REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44 +RUNTIME_DEP_PKGS_CSWbdb44-devel = CSWbdb44 INCOMPATIBLE_PKGS_CSWbdb44-doc = CSWbdb44doc LICENSE = LICENSE Modified: csw/mgar/pkg/bdb42/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb42/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb42/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -27,7 +27,7 @@ RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 -NO_ISAEXEC = 1 +NOISAEXEC = 1 CONFIGURE_SCRIPTS = dist @@ -64,7 +64,7 @@ SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -REQUIRED_PKGS_CSWbdb42devel = CSWbdb42 +RUNTIME_DEP_PKGS_CSWbdb42devel = CSWbdb42 LICENSE = LICENSE Modified: csw/mgar/pkg/bdb43/tags/bdb-consolidation-4.3.29,REV=2009.06.26/Makefile =================================================================== --- csw/mgar/pkg/bdb43/tags/bdb-consolidation-4.3.29,REV=2009.06.26/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb43/tags/bdb-consolidation-4.3.29,REV=2009.06.26/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -25,7 +25,7 @@ PACKAGES = CSWbdb43 SPKG_DESC = BerkeleyDB 4.3 libraries and utilities CATALOGNAME = berkeleydb43 -REQUIRED_PKGS = CSWbdb +RUNTIME_DEP_PKGS = CSWbdb include gar/category.mk install-custom: Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -27,7 +27,7 @@ WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix BUILD64 = 1 -NO_ISAEXEC = 1 +NOISAEXEC = 1 CONFIGURE_SCRIPTS = dist @@ -64,7 +64,7 @@ SPKG_SOURCEURL = http://www.oracle.com/technology/products/berkeley-db/index.html -REQUIRED_PKGS_CSWbdb43-devel = CSWbdb43 +RUNTIME_DEP_PKGS_CSWbdb43-devel = CSWbdb43 LICENSE = LICENSE Modified: csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile =================================================================== --- csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -25,7 +25,7 @@ PACKAGES = CSWbdb44 SPKG_DESC = BerkeleyDB 4.4 embedded database libraries and utilities CATALOGNAME = berkeleydb44 -REQUIRED_PKGS = CSWbdb +RUNTIME_DEP_PKGS = CSWbdb include gar/category.mk Modified: csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile =================================================================== --- csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -55,7 +55,7 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -NO_ISAEXEC = 1 +NOISAEXEC = 1 PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc @@ -69,7 +69,7 @@ SPKG_DESC_CSWbdb44-devel = BerkeleyDB 4.4 development support SPKG_DESC_CSWbdb44-doc = BerkeleyDB 4.4 documentation -REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44 +RUNTIME_DEP_PKGS_CSWbdb44-devel = CSWbdb44 INCOMPATIBLE_PKGS_CSWbdb44-doc = CSWbdb44doc LICENSE = LICENSE Modified: csw/mgar/pkg/bdb44/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb44/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb44/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -27,7 +27,7 @@ RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 -NO_ISAEXEC = 1 +NOISAEXEC = 1 CONFIGURE_SCRIPTS = dist @@ -64,7 +64,7 @@ SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44 +RUNTIME_DEP_PKGS_CSWbdb44-devel = CSWbdb44 LICENSE = LICENSE Modified: csw/mgar/pkg/bdb45/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb45/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb45/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -27,7 +27,7 @@ RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 -NO_ISAEXEC = 1 +NOISAEXEC = 1 CONFIGURE_SCRIPTS = dist @@ -62,7 +62,7 @@ SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -REQUIRED_PKGS_CSWbdb45devel = CSWbdb45 +RUNTIME_DEP_PKGS_CSWbdb45devel = CSWbdb45 LICENSE = LICENSE Modified: csw/mgar/pkg/bdb46/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb46/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb46/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -27,7 +27,7 @@ RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 -NO_ISAEXEC = 1 +NOISAEXEC = 1 CONFIGURE_SCRIPTS = dist @@ -62,7 +62,7 @@ SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -REQUIRED_PKGS_CSWbdb46devel = CSWbdb46 +RUNTIME_DEP_PKGS_CSWbdb46devel = CSWbdb46 LICENSE = LICENSE Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -27,7 +27,7 @@ RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 -NO_ISAEXEC = 1 +NOISAEXEC = 1 CONFIGURE_SCRIPTS = dist @@ -62,7 +62,7 @@ SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -REQUIRED_PKGS_CSWbdb47devel = CSWbdb47 +RUNTIME_DEP_PKGS_CSWbdb47devel = CSWbdb47 LICENSE = LICENSE Modified: csw/mgar/pkg/bdb48/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb48/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bdb48/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -27,7 +27,7 @@ RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) BUILD64 = 1 -NO_ISAEXEC = 1 +NOISAEXEC = 1 CONFIGURE_SCRIPTS = dist @@ -63,7 +63,7 @@ SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -REQUIRED_PKGS_CSWbdb48devel = CSWbdb48 +RUNTIME_DEP_PKGS_CSWbdb48devel = CSWbdb48 LICENSE = LICENSE Modified: csw/mgar/pkg/beautifulsoup/trunk/Makefile =================================================================== --- csw/mgar/pkg/beautifulsoup/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/beautifulsoup/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -35,7 +35,7 @@ INSTALL_SCRIPTS = beautifulsoup PACKAGES = CSWbeautifulsoup -REQUIRED_PKGS_CSWbeautifulsoup = CSWpython CSWcswclassutils +RUNTIME_DEP_PKGS_CSWbeautifulsoup = CSWpython CSWcswclassutils PROTOTYPE_FILTER = awk ' \ $$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } \ Modified: csw/mgar/pkg/bind/branches/stable/Makefile =================================================================== --- csw/mgar/pkg/bind/branches/stable/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bind/branches/stable/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -33,10 +33,10 @@ SPKG_DESC_CSWlibbind = ISC BIND DNS library package SPKG_DESC_CSWbindutils = ISC BIND DNS utilities package -REQUIRED_PKGS_CSWbind = CSWlibbind CSWbindutils CSWcswclassutils -REQUIRED_PKGS_CSWbinddevel = CSWbind -REQUIRED_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib -REQUIRED_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt +RUNTIME_DEP_PKGS_CSWbind = CSWlibbind CSWbindutils CSWcswclassutils +RUNTIME_DEP_PKGS_CSWbinddevel = CSWbind +RUNTIME_DEP_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib +RUNTIME_DEP_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = http://ftp.isc.org/isc/bind9/ Modified: csw/mgar/pkg/bind/branches/stable-9.4.3p3/Makefile =================================================================== --- csw/mgar/pkg/bind/branches/stable-9.4.3p3/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bind/branches/stable-9.4.3p3/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -20,7 +20,7 @@ DISTFILES += $(call admfiles,CSWbind,preinstall postinstall preremove) LICENSE = COPYRIGHT -REQUIRED_PKGS = CSWosslrt +RUNTIME_DEP_PKGS = CSWosslrt # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*)-([A-Z][0-9]) Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bind/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -41,11 +41,11 @@ SPKG_DESC_CSWbindutils = ISC BIND DNS utilities package SPKG_DESC_CSWbindchroot = ISC BIND DNS chroot package -REQUIRED_PKGS_CSWbind = CSWlibbind CSWbindutils CSWiconv CSWlibxml2 CSWosslrt CSWzlib -REQUIRED_PKGS_CSWbinddevel = CSWbind -REQUIRED_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib -REQUIRED_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt CSWzlib -REQUIRED_PKGS_CSWbindchroot = CSWbind +RUNTIME_DEP_PKGS_CSWbind = CSWlibbind CSWbindutils CSWiconv CSWlibxml2 CSWosslrt CSWzlib +RUNTIME_DEP_PKGS_CSWbinddevel = CSWbind +RUNTIME_DEP_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib +RUNTIME_DEP_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt CSWzlib +RUNTIME_DEP_PKGS_CSWbindchroot = CSWbind UPSTREAM_MASTER_SITES = http://ftp.isc.org/isc/bind9/ UFILES_REGEX = (\d+(?:\.\d+)*) Modified: csw/mgar/pkg/bind2nsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind2nsd/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bind2nsd/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -27,7 +27,7 @@ # UPSTREAM_MASTER_SITES = PACKAGES = CSWbind2nsd -REQUIRED_PKGS = CSWpython CSWpydes +RUNTIME_DEP_PKGS = CSWpython CSWpydes CATALOGNAME = bind2nsd SPKG_DESC = scripts to translate DNS information in BIND format to NSD format Modified: csw/mgar/pkg/binutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/binutils/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/binutils/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -14,7 +14,7 @@ PATCHFILES = 0001-Remove-gcc-specific-warning-no-error.patch PATCHFILES += 0002-Use-func-instead-of-FUNCTION.patch -REQUIRED_PKGS = CSWzlib CSWiconv CSWggettextrt +RUNTIME_DEP_PKGS = CSWzlib CSWiconv CSWggettextrt # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/bison/trunk/Makefile =================================================================== --- csw/mgar/pkg/bison/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/bison/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -11,8 +11,8 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -PREREQUISITE_PKGS = CSWgnulinks -REQUIRED_PKGS = CSWggettextrt CSWiconv CSWgm4 +BUILD_DEP_PKGS = CSWgnulinks +RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv CSWgm4 SPKG_SOURCEURL = http://www.gnu.org/software/bison/ Modified: csw/mgar/pkg/botnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/botnet/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/botnet/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -15,7 +15,7 @@ DISTFILES += $(call admfiles,CSWbotnet,) SPKG_DESC_CSWspamassassin = mail filter with a wide range of tests -REQUIRED_PKGS = CSWspamassassin CSWcswclassutils +RUNTIME_DEP_PKGS = CSWspamassassin CSWcswclassutils # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar Modified: csw/mgar/pkg/buildbot/trunk/Makefile =================================================================== --- csw/mgar/pkg/buildbot/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/buildbot/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -31,7 +31,7 @@ SPKG_CLASSES = none cswpycompile -REQUIRED_PKGS = CSWcswclassutils CSWpython CSWtwisted CSWzope CSWtextutils +RUNTIME_DEP_PKGS = CSWcswclassutils CSWpython CSWtwisted CSWzope CSWtextutils ARCHALL = 1 CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/cacti/trunk/Makefile =================================================================== --- csw/mgar/pkg/cacti/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cacti/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -25,8 +25,8 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -REQUIRED_PKGS = CSWrrd CSWnetsnmp CSWmysql5client CSWcswclassutils -REQUIRED_PKGS = CSWphp5 CSWap2modphp5 CSWphp5mysql CSWphp5snmp CSWphp5session CSWphp5sockets +RUNTIME_DEP_PKGS = CSWrrd CSWnetsnmp CSWmysql5client CSWcswclassutils +RUNTIME_DEP_PKGS = CSWphp5 CSWap2modphp5 CSWphp5mysql CSWphp5snmp CSWphp5session CSWphp5sockets SPKG_CLASSES = none cswusergroup Modified: csw/mgar/pkg/cadaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/cadaver/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cadaver/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -25,7 +25,7 @@ PACKAGES = CSWcadav CATALOGNAME_CSWcadav = cadaver -REQUIRED_PKGS = CSWggettextrt CSWiconv CSWneon CSWosslrt CSWreadline CSWzlib CSWgcrypt CSWgnutls CSWgpgerr +RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv CSWneon CSWosslrt CSWreadline CSWzlib CSWgcrypt CSWgnutls CSWgpgerr Modified: csw/mgar/pkg/cairomm/trunk/Makefile =================================================================== --- csw/mgar/pkg/cairomm/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cairomm/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -23,7 +23,7 @@ PKGFILES_CSWcairomm-devel += $(prefix)/lib/.*\.a PKGFILES_CSWcairomm-devel += $(prefix)/lib/pkgconfig/.* -REQUIRED_PKGS_CSWcairomm-devel = CSWcairomm +RUNTIME_DEP_PKGS_CSWcairomm-devel = CSWcairomm CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/cdecl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cdecl/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cdecl/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -18,8 +18,8 @@ LICENSE = README -REQUIRED_PKGS = CSWreadline -PREREQUISITE_PKGS = $(REQUIRED_PKGS) +RUNTIME_DEP_PKGS = CSWreadline +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/cfengine/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cfengine/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -22,7 +22,7 @@ CATALOGNAME_CSWcfengine = cfengine SPKG_DESC_CSWcfengine = A tool for administering Networks of Diverse Machines -REQUIRED_PKGS_CSWcfengine = CSWosslrt CSWbdb3 +RUNTIME_DEP_PKGS_CSWcfengine = CSWosslrt CSWbdb3 CATALOGNAME_CSWcfenginedoc = cfengine_doc SPKG_DESC_CSWcfenginedoc = Cfengine documentation Modified: csw/mgar/pkg/cgit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cgit/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cgit/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -16,7 +16,7 @@ * maintained by Lars Hjemli, who is happy to receive patches, suggestions and bug reports. endef -REQUIRED_PKGS_CSWcgit = CSWiconv CSWosslrt CSWzlib +RUNTIME_DEP_PKGS_CSWcgit = CSWiconv CSWosslrt CSWzlib #MASTER_SITES = http://hjemli.net/git/cgit/snapshot/ #DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz Modified: csw/mgar/pkg/chkconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/chkconfig/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/chkconfig/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -24,7 +24,7 @@ SPKG_DESC_CSWchkconfig = Checkconfig engine from Red Hat chkconfig-$(GARVERSION) SPKG_DESC_CSWalternatives = Alternatives engine from Red Hat chkconfig-$(GARVERSION) -REQUIRED_PKGS = CSWggettextrt CSWlibpopt +RUNTIME_DEP_PKGS = CSWggettextrt CSWlibpopt PKGFILES_CSWalternatives = .*alternatives.* Modified: csw/mgar/pkg/chmlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/chmlib/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/chmlib/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -23,7 +23,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 BUILD64 = 1 -NO_ISAEXEC = 1 +NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-examples Modified: csw/mgar/pkg/chromium/trunk/Makefile =================================================================== --- csw/mgar/pkg/chromium/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/chromium/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -14,9 +14,9 @@ # DISTFILES = chromium.r$(CHROMIUM_REVISION).tgz DISTFILES = UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWnspr CSWnss CSWffmpeg +RUNTIME_DEP_PKGS = CSWnspr CSWnss CSWffmpeg # CSWpyxml must be uninstalled -PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWlibxcbdevel CSWffmpeg CSWgperf CSWpython +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWnspr-devel CSWlibxcbdevel CSWffmpeg CSWgperf CSWpython CONFIGURE_SCRIPTS = chromium BUILD_SCRIPTS = chromium INSTALL_SCRIPTS = chromium Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/clamav/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -24,8 +24,8 @@ CATALOGNAME_CSWlibclamav = libclamav SPKG_DESC_CSWlibclamav = $(DESCRIPTION) Library -REQUIRED_PKGS_CSWclamav = CSWlibclamav CSWzlib CSWbzip2 CSWiconv CSWcswclassutils CSWncurses CSWlibtoolrt -REQUIRED_PKGS_CSWlibclamav = CSWzlib CSWbzip2 CSWiconv CSWlibtoolrt +RUNTIME_DEP_PKGS_CSWclamav = CSWlibclamav CSWzlib CSWbzip2 CSWiconv CSWcswclassutils CSWncurses CSWlibtoolrt +RUNTIME_DEP_PKGS_CSWlibclamav = CSWzlib CSWbzip2 CSWiconv CSWlibtoolrt # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/clearsilver/trunk/Makefile =================================================================== --- csw/mgar/pkg/clearsilver/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/clearsilver/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -15,9 +15,9 @@ PACKAGES = CSWcs CSWpmcs CSWpycs -REQUIRED_PKGS_CSWcs = CSWzlib CSWggettextrt -REQUIRED_PKGS_CSWpmcs = CSWcs CSWperl -REQUIRED_PKGS_CSWpycs = CSWcs CSWpython +RUNTIME_DEP_PKGS_CSWcs = CSWzlib CSWggettextrt +RUNTIME_DEP_PKGS_CSWpmcs = CSWcs CSWperl +RUNTIME_DEP_PKGS_CSWpycs = CSWcs CSWpython CATALOGNAME_CSWcs = clearsilver CATALOGNAME_CSWpmcs = pm_clearsilver @@ -35,7 +35,7 @@ EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' SPKG_CLASSES = none cswpycompile -REQUIRED_PKGS += CSWcswclassutils +RUNTIME_DEP_PKGS += CSWcswclassutils # We define upstream file regex so we can be notifed of # new upstream software release Modified: csw/mgar/pkg/clusterssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/clusterssh/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/clusterssh/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -17,10 +17,10 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -REQUIRED_PKGS = CSWperl -REQUIRED_PKGS += CSWpmtk -REQUIRED_PKGS += CSWpmx11protocol -# REQUIRED_PKGS += CSWossh +RUNTIME_DEP_PKGS = CSWperl +RUNTIME_DEP_PKGS += CSWpmtk +RUNTIME_DEP_PKGS += CSWpmx11protocol +# RUNTIME_DEP_PKGS += CSWossh ARCHALL = 1 Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cmake/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -21,8 +21,8 @@ CATALOGNAME_CSWcmake = cmake SPKG_DESC_CSWcmake = $(DESCRIPTION) -REQUIRED_PKGS_CSWcmake = CSWcurlrt CSWexpat CSWlibidn CSWoldaprt -REQUIRED_PKGS_CSWcmake += CSWosslrt CSWxmlrpc-c CSWzlib +RUNTIME_DEP_PKGS_CSWcmake = CSWcurlrt CSWexpat CSWlibidn CSWoldaprt +RUNTIME_DEP_PKGS_CSWcmake += CSWosslrt CSWxmlrpc-c CSWzlib # We define upstream file regex so we can be notifed of # new upstream software release Modified: csw/mgar/pkg/colordiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/colordiff/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/colordiff/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -16,7 +16,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWdiffutils CSWperl CSWless +RUNTIME_DEP_PKGS = CSWdiffutils CSWperl CSWless CONFIGURE_SCRIPTS = BUILD_ARGS = doc Modified: csw/mgar/pkg/colormake/trunk/Makefile =================================================================== --- csw/mgar/pkg/colormake/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/colormake/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -13,7 +13,7 @@ ARCHALL = 1 -REQUIRED_PKGS = CSWgmake CSWshutils CSWperl CSWless +RUNTIME_DEP_PKGS = CSWgmake CSWshutils CSWperl CSWless # We define upstream file regex so we can be notifed of new upstream # software release Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -12,7 +12,7 @@ SHELL = /opt/csw/bin/bash -PREREQUISITE_PKGS = CSWbash +BUILD_DEP_PKGS = CSWbash DESCRIPTION = GNU core utilities define BLURB @@ -25,8 +25,8 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = 0001-Fix-solaris-acl-support-breakage.patch -PREREQUISITE_PKGS = CSWautomake CSWautoconf CSWbison CSWggettext CSWgit -PREREQUISITE_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash +BUILD_DEP_PKGS = CSWautomake CSWautoconf CSWbison CSWggettext CSWgit +BUILD_DEP_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/cpan/Algorithm-Annotate/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Algorithm-Annotate/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Algorithm-Annotate/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -9,7 +9,7 @@ simliar to cvs annotate. endef -REQUIRED_PKGS = CSWpmalgdiff +RUNTIME_DEP_PKGS = CSWpmalgdiff PACKAGES = CSWpmalgannotate CATALOGNAME = pm_algorithmannotate Modified: csw/mgar/pkg/cpan/Algorithm-Depedency/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Algorithm-Depedency/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Algorithm-Depedency/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -13,8 +13,8 @@ PACKAGES = CSWpmalgorithmdep CATALOGNAME = pm_algorithmdep -PREREQUISITE_PKGS = CSWpmtestclassapi -REQUIRED_PKGS = CSWpmparamsutil +BUILD_DEP_PKGS = CSWpmtestclassapi +RUNTIME_DEP_PKGS = CSWpmparamsutil ARCHALL = 1 Modified: csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -10,8 +10,8 @@ endef # depends -REQUIRED_PKGS = CSWap2prefork -PREREQUISITE_PKGS = CSWap2prefork +RUNTIME_DEP_PKGS = CSWap2prefork +BUILD_DEP_PKGS = CSWap2prefork PACKAGES = CSWpmapachetst CATALOGNAME = pm_apachetst Modified: csw/mgar/pkg/cpan/Apache2-AuthzNIS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Apache2-AuthzNIS/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Apache2-AuthzNIS/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -12,7 +12,7 @@ CATALOGNAME = pm_ap2authznis ARCHALL = 1 -REQUIRED_PKGS = CSWpmnetnis CSWap2_modperl +RUNTIME_DEP_PKGS = CSWpmnetnis CSWap2_modperl include gar/category.mk Modified: csw/mgar/pkg/cpan/App-CLI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/App-CLI/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/App-CLI/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -12,7 +12,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpmappcli,) -REQUIRED_PKGS = CSWpmlclemktxtsimple CSWpmpodsimple +RUNTIME_DEP_PKGS = CSWpmlclemktxtsimple CSWpmpodsimple DEPENDS += cpan/Locale-Maketext-Simple DEPENDS += cpan/Pod-Simple Modified: csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -12,7 +12,7 @@ compressed or gzipped tar files. endef -REQUIRED_PKGS = CSWpmiozlib CSWpmiocompress CSWpmpkgconst CSWpmtextdiff +RUNTIME_DEP_PKGS = CSWpmiozlib CSWpmiocompress CSWpmpkgconst CSWpmtextdiff PACKAGES = CSWpmarchivetar CATALOGNAME = pm_archivetar Modified: csw/mgar/pkg/cpan/Archive-Zip/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Archive-Zip/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Archive-Zip/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -22,7 +22,7 @@ ARCHALL = 1 LICENSE = LICENSE -REQUIRED_PKGS = CSWpmiocompress +RUNTIME_DEP_PKGS = CSWpmiocompress # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -15,8 +15,8 @@ PACKAGES = CSWpmauthensasl CATALOGNAME = pm_authensasl -REQUIRED_PKGS = CSWpmgssapi CSWpmdigesthmac -PREREQUISITE_PKGS = CSWperl +RUNTIME_DEP_PKGS = CSWpmgssapi CSWpmdigesthmac +BUILD_DEP_PKGS = CSWperl ARCHALL = 1 Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -16,6 +16,6 @@ NOISALIST = 1 EXTRA_LIB = /opt/csw/bdb47/lib -REQUIRED_PKGS = CSWbdb47 +RUNTIME_DEP_PKGS = CSWbdb47 include gar/category.mk Modified: csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -10,7 +10,7 @@ PACKAGES = CSWpmbitvec CATALOGNAME = pm_bitvec -REQUIRED_PKGS = CSWpmcarpclan -PREREQUISITE_PKGS = CSWpmcarpclan +RUNTIME_DEP_PKGS = CSWpmcarpclan +BUILD_DEP_PKGS = CSWpmcarpclan include gar/category.mk Modified: csw/mgar/pkg/cpan/Cairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Cairo/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Cairo/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -9,8 +9,8 @@ # 3/73 skipped: Test::Number::Delta not available # all skipped: need Cairo with FreeType support and Font::FreeType -PREREQUISITE_PKGS = CSWlibcairodevel -REQUIRED_PKGS = CSWfconfig CSWftype2 CSWlibcairo CSWzlib +BUILD_DEP_PKGS = CSWlibcairodevel +RUNTIME_DEP_PKGS = CSWfconfig CSWftype2 CSWlibcairo CSWzlib PACKAGES = CSWpmcairo CATALOGNAME = pm_cairo Modified: csw/mgar/pkg/cpan/Capitalization/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Capitalization/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Capitalization/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -7,7 +7,7 @@ define BLURB endef -REQUIRED_PKGS = CSWpmdevelsymdump +RUNTIME_DEP_PKGS = CSWpmdevelsymdump PACKAGES = CSWpmcapitalization CATALOGNAME = pm_capitalization Modified: csw/mgar/pkg/cpan/Chart/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Chart/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Chart/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -9,7 +9,7 @@ and Pareto. endef -REQUIRED_PKGS = CSWpmgd +RUNTIME_DEP_PKGS = CSWpmgd PACKAGES = CSWpmchart CATALOGNAME = pm_chart Modified: csw/mgar/pkg/cpan/Class-Container/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-Container/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Class-Container/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -13,7 +13,7 @@ any of these objects. endef -REQUIRED_PKGS = CSWpmprmsvldt +RUNTIME_DEP_PKGS = CSWpmprmsvldt PACKAGES = CSWpmclscontainer CATALOGNAME = pm_clscontainer Modified: csw/mgar/pkg/cpan/Class-ReturnValue/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-ReturnValue/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Class-ReturnValue/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -10,8 +10,8 @@ return values) endef -PREREQUISITE_PKGS = CSWpmtestinline -REQUIRED_PKGS = CSWpmdevstacktrace +BUILD_DEP_PKGS = CSWpmtestinline +RUNTIME_DEP_PKGS = CSWpmdevstacktrace PACKAGES = CSWpmclassretval CATALOGNAME = pm_classretval Modified: csw/mgar/pkg/cpan/Compress-Bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Bzip2/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Compress-Bzip2/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -7,7 +7,7 @@ define BLURB endef -REQUIRED_PKGS = CSWbzip2 +RUNTIME_DEP_PKGS = CSWbzip2 PACKAGES = CSWpmcompressbzip2 CATALOGNAME = pm_compressbzip2 Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -9,7 +9,7 @@ compression library. endef -REQUIRED_PKGS = CSWzlib +RUNTIME_DEP_PKGS = CSWzlib CATALOGNAME = pm_compressrawzlib PACKAGES = CSWpmcompressrawzlib Modified: csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -14,7 +14,7 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = -REQUIRED_PKGS = CSWpmiocompress +RUNTIME_DEP_PKGS = CSWpmiocompress CATALOGNAME = pm_compresszlib PACKAGES = CSWpmcompresszlib Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -16,6 +16,6 @@ PACKAGES = CSWpmcryptosslbignum CATALOGNAME = pm_cryptosslbignum -REQUIRED_PKGS = CSWosslrt +RUNTIME_DEP_PKGS = CSWosslrt include gar/category.mk Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -13,7 +13,7 @@ PACKAGES = CSWpmcryptosslrsa CATALOGNAME = pm_osslrsa -REQUIRED_PKGS = CSWpmcryptosslrandom -PREREQUISITE_PKGS = CSWpmcryptosslrandom +RUNTIME_DEP_PKGS = CSWpmcryptosslrandom +BUILD_DEP_PKGS = CSWpmcryptosslrandom include gar/category.mk Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -12,6 +12,6 @@ PACKAGES = CSWpmcryptosslrandom CATALOGNAME = pm_osslrandom -REQUIRED_PKGS = CSWosslrt +RUNTIME_DEP_PKGS = CSWosslrt include gar/category.mk Modified: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -16,8 +16,8 @@ PACKAGES = CSWpmcryptssleay CATALOGNAME = pm_cryptssleay -REQUIRED_PKGS = CSWosslrt -PREREQUISITE_PKGS = CSWosslrt CSWpmmimebase64 +RUNTIME_DEP_PKGS = CSWosslrt +BUILD_DEP_PKGS = CSWosslrt CSWpmmimebase64 CONFIGURE_ARGS = --lib=$(prefix) Modified: csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -13,7 +13,7 @@ PACKAGES = CSWpmdbdsqlite CATALOGNAME = pm_dbdsqlite -REQUIRED_PKGS = CSWpmdbi +RUNTIME_DEP_PKGS = CSWpmdbi LICENSE = LICENSE Modified: csw/mgar/pkg/cpan/DBI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBI/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/DBI/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -18,6 +18,6 @@ PACKAGES = CSWpmdbi CATALOGNAME = pm_dbi -#REQUIRED_PKGS = CSWpmplrpc +#RUNTIME_DEP_PKGS = CSWpmplrpc include gar/category.mk Modified: csw/mgar/pkg/cpan/Data-Hierarchy/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Data-Hierarchy/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Data-Hierarchy/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -9,8 +9,8 @@ data attached to a hierarchical environment (like filesystem). endef -PREREQUISITE_PKGS = CSWpmtstexcept -REQUIRED_PKGS = CSWpmclone +BUILD_DEP_PKGS = CSWpmtstexcept +RUNTIME_DEP_PKGS = CSWpmclone PACKAGES = CSWpmdatahier CATALOGNAME = pm_datahier Modified: csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -15,7 +15,7 @@ PACKAGES = CSWpmdatecalc CATALOGNAME = pm_datecalc -PREREQUISITE_PKGS = CSWpmbitvec CSWpmcarpclan +BUILD_DEP_PKGS = CSWpmbitvec CSWpmcarpclan REQUIRES = CSWpmbitvec CSWpmcarpclan include gar/category.mk Modified: csw/mgar/pkg/cpan/DateTime/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/DateTime/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -14,8 +14,8 @@ PACKAGES = CSWpmdatetime CATALOGNAME = pm_datetime -REQUIRED_PKGS = CSWpmdatetimetimezone -REQUIRED_PKGS += CSWpmdatetimelocale +RUNTIME_DEP_PKGS = CSWpmdatetimetimezone +RUNTIME_DEP_PKGS += CSWpmdatetimelocale include gar/category.mk Modified: csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -14,7 +14,7 @@ CATALOGNAME = pm_datetimelocale ARCHALL = 1 -REQUIRED_PKGS = CSWpmlistmoreutils +RUNTIME_DEP_PKGS = CSWpmlistmoreutils include gar/category.mk Modified: csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -17,8 +17,8 @@ CATALOGNAME = pm_datetimetimezone ARCHALL = 1 -REQUIRED_PKGS = CSWpmclasssingleton -REQUIRED_PKGS += CSWpmparamsvalidate +RUNTIME_DEP_PKGS = CSWpmclasssingleton +RUNTIME_DEP_PKGS += CSWpmparamsvalidate include gar/category.mk Modified: csw/mgar/pkg/cpan/Devel-Caller/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Devel-Caller/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Devel-Caller/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -10,8 +10,8 @@ PACKAGES = CSWpmdevelcaller CATALOGNAME = pm_develcaller -REQUIRED_PKGS = CSWpmpadwalker -PREREQUISITE_PKGS = CSWpmpadwalker +RUNTIME_DEP_PKGS = CSWpmpadwalker +BUILD_DEP_PKGS = CSWpmpadwalker include gar/category.mk Modified: csw/mgar/pkg/cpan/Devel-LexAlias/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Devel-LexAlias/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Devel-LexAlias/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -12,8 +12,8 @@ PACKAGES = CSWpmdevellexalias CATALOGNAME = pm_devellexalias -REQUIRED_PKGS = CSWpmdevelcaller CSWpmpadwalker -PREREQUISITE_PKGS = CSWpmdevelcaller CSWpmpadwalker +RUNTIME_DEP_PKGS = CSWpmdevelcaller CSWpmpadwalker +BUILD_DEP_PKGS = CSWpmdevelcaller CSWpmpadwalker include gar/category.mk Modified: csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -7,7 +7,7 @@ define BLURB endef -REQUIRED_PKGS = CSWpmemaildateformat +RUNTIME_DEP_PKGS = CSWpmemaildateformat PACKAGES = CSWpmemailsimple CATALOGNAME = pm_emailsimple Modified: csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -14,8 +14,8 @@ PACKAGES = CSWpmeventlib CATALOGNAME = pm_eventlib -PREREQUISITE_PKGS = CSWlibevent-devel -REQUIRED_PKGS = CSWlibevent +BUILD_DEP_PKGS = CSWlibevent-devel +RUNTIME_DEP_PKGS = CSWlibevent # Sun cc inline function patch PATCHFILES = inline.diff Modified: csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -17,7 +17,7 @@ ARCHALL = 1 -REQUIRED_PKGS = CSWpmextutcbuilder +RUNTIME_DEP_PKGS = CSWpmextutcbuilder SPKG_VERSION = 2.20.02 Modified: csw/mgar/pkg/cpan/Font-Freetype/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Font-Freetype/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Font-Freetype/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -7,7 +7,7 @@ define BLURB endef -REQUIRED_PKGS = CSWftype2 +RUNTIME_DEP_PKGS = CSWftype2 PACKAGES = CSWpmfontfreetype CATALOGNAME = pm_fontfreetype Modified: csw/mgar/pkg/cpan/GD/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/GD/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/GD/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -13,8 +13,8 @@ PACKAGES = CSWpmgd CATALOGNAME = pm_gd -REQUIRED_PKGS = CSWftype2 CSWgd CSWiconv CSWjpeg CSWpng -REQUIRED_PKGS += CSWxpm CSWzlib CSWfconfig +RUNTIME_DEP_PKGS = CSWftype2 CSWgd CSWiconv CSWjpeg CSWpng +RUNTIME_DEP_PKGS += CSWxpm CSWzlib CSWfconfig CONFIGURE_ARGS = lib_gd_path $(libdir) CONFIGURE_ARGS += lib_ft_path $(libdir) Modified: csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -13,6 +13,6 @@ PACKAGES = CSWpmgssapi CATALOGNAME = pm_gssapi -REQUIRED_PKGS = CSWkrb5lib +RUNTIME_DEP_PKGS = CSWkrb5lib include gar/category.mk Modified: csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -16,7 +16,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWgeolitedb +RUNTIME_DEP_PKGS = CSWgeolitedb EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod Modified: csw/mgar/pkg/cpan/Gimp/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Gimp/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Gimp/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -15,7 +15,7 @@ DEPENDS += cpan/PDL cpan/Gtk2 -PREREQUISITE_PKGS = CSWpmpdl CSWpmgtk2 +BUILD_DEP_PKGS = CSWpmpdl CSWpmgtk2 PKGS_REQUIRED_CSWpmglib = CSWpmpdl CSWpmgtk2 CSWgimplibs CATALOGNAME = pm_gimp Modified: csw/mgar/pkg/cpan/Glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Glib/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Glib/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -12,8 +12,8 @@ environment, and are used in many unrelated projects. endef -PREREQUISITE_PKGS = CSWpmextutilsdepends CSWpmextutpkgconf -REQUIRED_PKGS_CSWpmglib = CSWpmextutilsdepends CSWpmextutpkgconf CSWggettextrt CSWglib2 +BUILD_DEP_PKGS = CSWpmextutilsdepends CSWpmextutpkgconf +RUNTIME_DEP_PKGS_CSWpmglib = CSWpmextutilsdepends CSWpmextutpkgconf CSWggettextrt CSWglib2 CATALOGNAME = pm_glib PACKAGES = CSWpmglib Modified: csw/mgar/pkg/cpan/HTML-Mason/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Mason/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/HTML-Mason/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -15,7 +15,7 @@ PACKAGES = CSWpmhtmlmason CATALOGNAME = pm_htmlmason -REQUIRED_PKGS = CSWpmexceptcls CSWpmclscontainer CSWpmprmsvldt CSWpmcachecache +RUNTIME_DEP_PKGS = CSWpmexceptcls CSWpmclscontainer CSWpmprmsvldt CSWpmcachecache ARCHALL = 1 Modified: csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -16,7 +16,7 @@ PACKAGES = CSWpmhtmlparser CATALOGNAME = pm_htmlparser -REQUIRED_PKGS = CSWpmhtmltagset +RUNTIME_DEP_PKGS = CSWpmhtmltagset CONFIGURE_ARGS = -n Modified: csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -21,8 +21,8 @@ endef -REQUIRED_PKGS = CSWpmcompressrawzlib -REQUIRED_PKGS += CSWpmcompressrawbz2 +RUNTIME_DEP_PKGS = CSWpmcompressrawzlib +RUNTIME_DEP_PKGS += CSWpmcompressrawbz2 PACKAGES = CSWpmiocompress CATALOGNAME = pm_iocompress Modified: csw/mgar/pkg/cpan/IO-Compress-Base/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Base/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/IO-Compress-Base/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -14,7 +14,7 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = -REQUIRED_PKGS = CSWpmiocompress +RUNTIME_DEP_PKGS = CSWpmiocompress CATALOGNAME = pm_iocompressbase PACKAGES = CSWpmiocompressbase Modified: csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -14,7 +14,7 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = -REQUIRED_PKGS = CSWpmiocompress +RUNTIME_DEP_PKGS = CSWpmiocompress CATALOGNAME = pm_iocompresszlib PACKAGES = CSWpmiocompresszlib Modified: csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -10,7 +10,7 @@ the digests after written a file. endef -REQUIRED_PKGS = pm_perlioviadyn +RUNTIME_DEP_PKGS = pm_perlioviadyn PACKAGES = CSWpmiodigest CATALOGNAME = pm_iodigest Modified: csw/mgar/pkg/cpan/IO-Zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Zlib/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/IO-Zlib/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -10,7 +10,7 @@ IO::Handle interface. endef -REQUIRED_PKGS = CSWpmcompresszlib +RUNTIME_DEP_PKGS = CSWpmcompresszlib PACKAGES = CSWpmiozlib CATALOGNAME = pm_iozlib Modified: csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -13,7 +13,7 @@ CATALOGNAME = pm_ipccmd ARCHALL = 1 -REQUIRED_PKGS = CSWpmlclemktxtsimple CSWpmmodloadcond CSWpmprmscheck +RUNTIME_DEP_PKGS = CSWpmlclemktxtsimple CSWpmmodloadcond CSWpmprmscheck include gar/category.mk Modified: csw/mgar/pkg/cpan/Lexical-Persistence/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Lexical-Persistence/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Lexical-Persistence/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -11,7 +11,7 @@ CATALOGNAME = pm_lexicalpersist ARCHALL = 1 -REQUIRED_PKGS = CSWpmpadwalker CSWpmdevellexalias +RUNTIME_DEP_PKGS = CSWpmpadwalker CSWpmdevellexalias include gar/category.mk Modified: csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -13,7 +13,7 @@ PACKAGES = CSWpmlocalegettext CATALOGNAME = pm_localegettext -REQUIRED_PKGS = CSWggettextrt +RUNTIME_DEP_PKGS = CSWggettextrt include gar/category.mk Modified: csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -20,7 +20,7 @@ CATALOGNAME = pm_lclemktxtsimple ARCHALL = 1 -REQUIRED_PKGS = CSWpmlclemktxtlex +RUNTIME_DEP_PKGS = CSWpmlclemktxtlex include gar/category.mk Modified: csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -9,7 +9,7 @@ and remove output objects as desired. endef -REQUIRED_PKGS = CSWpmprmsvldt CSWpmunivrequire +RUNTIME_DEP_PKGS = CSWpmprmsvldt CSWpmunivrequire PACKAGES = CSWpmlogdispatch CATALOGNAME = pm_logdispatch Modified: csw/mgar/pkg/cpan/Log-Message/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Message/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Log-Message/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -17,7 +17,7 @@ CATALOGNAME = pm_logmessage ARCHALL = 1 -REQUIRED_PKGS = CSWpmlclemktxtsimple CSWpmprmscheck CSWpmmodload +RUNTIME_DEP_PKGS = CSWpmlclemktxtsimple CSWpmprmscheck CSWpmmodload include gar/category.mk Modified: csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -13,7 +13,7 @@ CATALOGNAME = pm_logmsgsimple ARCHALL = 1 -REQUIRED_PKGS = CSWpmlogmessage +RUNTIME_DEP_PKGS = CSWpmlogmessage include gar/category.mk Modified: csw/mgar/pkg/cpan/MIME-Lite/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-Lite/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/MIME-Lite/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -14,8 +14,8 @@ PACKAGES = CSWpmmimelite CATALOGNAME = pm_mimelite -REQUIRED_PKGS = CSWpmmimetypes CSWpmmailtools CSWpmemaildateformat -PREREQUISITE_PKGS = $(REQUIRED_PKGS) +RUNTIME_DEP_PKGS = CSWpmmimetypes CSWpmmailtools CSWpmemaildateformat +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) # Do not prompt for stuff PATCHFILES = 0001-Skip-prompting.patch Modified: csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -14,7 +14,7 @@ PACKAGES = CSWpmmimetypes CATALOGNAME = pm_mimetypes -PREREQUISITE_PKGS = CSWpmtestpod +BUILD_DEP_PKGS = CSWpmtestpod ARCHALL = 1 Modified: csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -22,12 +22,12 @@ DEPENDS += cpan/MailTools DEPENDS += cpan/Net-DNS -REQUIRED_PKGS += CSWpmcryptosslrsa -REQUIRED_PKGS += CSWpmdigestsha -REQUIRED_PKGS += CSWpmdigestsha1 -REQUIRED_PKGS += CSWpmerror -REQUIRED_PKGS += CSWpmmailtools -REQUIRED_PKGS += CSWpmmimebase64 -REQUIRED_PKGS += CSWpmnetdns +RUNTIME_DEP_PKGS += CSWpmcryptosslrsa +RUNTIME_DEP_PKGS += CSWpmdigestsha +RUNTIME_DEP_PKGS += CSWpmdigestsha1 +RUNTIME_DEP_PKGS += CSWpmerror +RUNTIME_DEP_PKGS += CSWpmmailtools +RUNTIME_DEP_PKGS += CSWpmmimebase64 +RUNTIME_DEP_PKGS += CSWpmnetdns include gar/category.mk Modified: csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -16,7 +16,7 @@ # Required packages due to bug reports # http://www.opencsw.org/mantis/view.php?id=4139 # http://www.opencsw.org/mantis/view.php?id=4140 -REQUIRED_PKGS = CSWpmversion CSWpmnetaddrip +RUNTIME_DEP_PKGS = CSWpmversion CSWpmnetaddrip ARCHALL = 1 Modified: csw/mgar/pkg/cpan/Module-Build/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Build/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Module-Build/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -16,8 +16,8 @@ PACKAGES = CSWpmmodulebuild CATALOGNAME = pm_modulebuild -REQUIRED_PKGS = CSWpmarchivetar CSWpmextutparsexs CSWpmextutcbuilder CSWpmmodulesign -PREREQUISITE_PKGS = CSWperl +RUNTIME_DEP_PKGS = CSWpmarchivetar CSWpmextutparsexs CSWpmextutcbuilder CSWpmmodulesign +BUILD_DEP_PKGS = CSWperl ARCHALL = 1 Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -11,7 +11,7 @@ DISTFILES += $(call admfiles,CSWpmmodloadcond,) -REQUIRED_PKGS = CSWpmprmscheck CSWpmmodload CSWpmlclemktxtsimple +RUNTIME_DEP_PKGS = CSWpmprmscheck CSWpmmodload CSWpmlclemktxtsimple #SKIPTEST = 1 Modified: csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -14,6 +14,6 @@ CATALOGNAME = pm_netanalysis # depends -PREREQUISITE_PKGS = CSWpmnetpcap CSWpmnetpacket CSWpmtstmockobject +BUILD_DEP_PKGS = CSWpmnetpcap CSWpmnetpacket CSWpmtstmockobject include gar/category.mk Modified: csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -15,7 +15,7 @@ DISTFILES += COPYING -REQUIRED_PKGS = CSWpmdigesthmac CSWpmnetip +RUNTIME_DEP_PKGS = CSWpmdigesthmac CSWpmnetip DEPENDS += cpan/Net-IP Modified: csw/mgar/pkg/cpan/Net-NIS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-NIS/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Net-NIS/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -11,7 +11,7 @@ PACKAGES = CSWpmnetnis CATALOGNAME = pm_netnis -REQUIRED_PKGS = SUNWnisu +RUNTIME_DEP_PKGS = SUNWnisu include gar/category.mk Modified: csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -13,7 +13,7 @@ CATALOGNAME = pm_netpcap # depends -REQUIRED_PKGS = CSWlibpcap -PREREQUISITE_PKGS = CSWlibpcap CSWlibpcapdevel +RUNTIME_DEP_PKGS = CSWlibpcap +BUILD_DEP_PKGS = CSWlibpcap CSWlibpcapdevel include gar/category.mk Modified: csw/mgar/pkg/cpan/Net-SMTP-SSL/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-SMTP-SSL/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Net-SMTP-SSL/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -19,8 +19,8 @@ PACKAGES = CSWpmnetsmtpssl CATALOGNAME_CSWpmnetsmtpssl = pm_netsmtpssl -PREREQUISITE_PKGS = CSWperl -REQUIRED_PKGS = CSWpmiosocketssl +BUILD_DEP_PKGS = CSWperl +RUNTIME_DEP_PKGS = CSWpmiosocketssl include gar/category.mk Modified: csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -17,8 +17,8 @@ PACKAGES = CSWpmnetssleay CATALOGNAME = pm_netssleay -REQUIRED_PKGS = CSWosslrt -PREREQUISITE_PKGS = CSWossldevel +RUNTIME_DEP_PKGS = CSWosslrt +BUILD_DEP_PKGS = CSWossldevel PERL_CONFIGURE_ARGS = $(prefix) INSTALLDIRS=vendor Modified: csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile 2010-02-03 16:53:31 UTC (rev 8334) +++ csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) @@ -14,7 +14,7 @@ ARCHALL_CSWpmobjaccessor = 1 -REQUIRED_PKGS_CSWpmobjaccessor += CSWpmprmscheck +RUNTIME_DEP_PKGS_CSWpmobjaccessor += CSWpmprmscheck LICENSE = README Modified: csw/mgar/pkg/cpan/PDF-API2/trunk/Makefile =================================================================== @@ 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 jake_goerzen at users.sourceforge.net Wed Feb 3 22:32:01 2010 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 03 Feb 2010 21:32:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[8336] csw/mgar/pkg/hatari/trunk Message-ID: Revision: 8336 http://gar.svn.sourceforge.net/gar/?rev=8336&view=rev Author: jake_goerzen Date: 2010-02-03 21:31:57 +0000 (Wed, 03 Feb 2010) Log Message: ----------- upgrade to 1.3.1 Modified Paths: -------------- csw/mgar/pkg/hatari/trunk/Makefile csw/mgar/pkg/hatari/trunk/checksums Added Paths: ----------- csw/mgar/pkg/hatari/trunk/files/solaris8-compile.patch Removed Paths: ------------- csw/mgar/pkg/hatari/trunk/files/CSWhatari.depend csw/mgar/pkg/hatari/trunk/files/CSWhatari.gspec csw/mgar/pkg/hatari/trunk/files/stdint.h.diff Modified: csw/mgar/pkg/hatari/trunk/Makefile =================================================================== --- csw/mgar/pkg/hatari/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) +++ csw/mgar/pkg/hatari/trunk/Makefile 2010-02-03 21:31:57 UTC (rev 8336) @@ -1,5 +1,5 @@ GARNAME = hatari -GARVERSION = 1.2.0 +GARVERSION = 1.3.1 CATEGORIES = apps DESCRIPTION = Atari ST emulator @@ -9,14 +9,17 @@ MASTER_SITES = http://download.berlios.de/hatari/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWhatari, depend ) +PACKAGES = CSWhatari +RUNTIME_DEP_PKGS = CSWlibsdl CSWpng CSWreadline CSWzlib UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 LICENSE = gpl.txt -PATCHFILES = stdint.h.diff +PATCHFILES = solaris8-compile.patch + GARCOMPILER = GNU TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) LIBS='-lm -lsocket' BUILD_ARGS = LD_OPTIONS='-R/opt/csw/lib/$ISALIST -R/opt/csw/lib -L/opt/csw/lib' + include gar/category.mk Modified: csw/mgar/pkg/hatari/trunk/checksums =================================================================== --- csw/mgar/pkg/hatari/trunk/checksums 2010-02-03 18:36:29 UTC (rev 8335) +++ csw/mgar/pkg/hatari/trunk/checksums 2010-02-03 21:31:57 UTC (rev 8336) @@ -1,4 +1,2 @@ -4aecd42784fae8c5e8c9a9a341146fbb download/hatari-1.2.0.tar.bz2 -1f74fc77f3c0664cdd49e2c9cba3fe2d download/CSWhatari.gspec -c9dda36e1f7a79cf0c8b65d3503fdc5d download/CSWhatari.depend -26ec668f0b919c0d3c5dc264df17a83f download/stdint.h.diff +112b544ec4affb7c04e931088e62a115 hatari-1.3.1.tar.bz2 +7c76f74423cf214b5065f83632e4cb69 solaris8-compile.patch Deleted: csw/mgar/pkg/hatari/trunk/files/CSWhatari.depend =================================================================== --- csw/mgar/pkg/hatari/trunk/files/CSWhatari.depend 2010-02-03 18:36:29 UTC (rev 8335) +++ csw/mgar/pkg/hatari/trunk/files/CSWhatari.depend 2010-02-03 21:31:57 UTC (rev 8336) @@ -1,4 +0,0 @@ -P CSWlibsdl -P CSWpng -P CSWreadline -P CSWzlib Deleted: csw/mgar/pkg/hatari/trunk/files/CSWhatari.gspec =================================================================== --- csw/mgar/pkg/hatari/trunk/files/CSWhatari.gspec 2010-02-03 18:36:29 UTC (rev 8335) +++ csw/mgar/pkg/hatari/trunk/files/CSWhatari.gspec 2010-02-03 21:31:57 UTC (rev 8336) @@ -1,4 +0,0 @@ -%var bitname hatari -%var pkgname CSWhatari -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/gpl.txt Added: csw/mgar/pkg/hatari/trunk/files/solaris8-compile.patch =================================================================== --- csw/mgar/pkg/hatari/trunk/files/solaris8-compile.patch (rev 0) +++ csw/mgar/pkg/hatari/trunk/files/solaris8-compile.patch 2010-02-03 21:31:57 UTC (rev 8336) @@ -0,0 +1,45 @@ +diff -rupN hatari-1.3.1/src/breakcond.c hatari-1.3.1.new/src/breakcond.c +--- hatari-1.3.1/src/breakcond.c 2009-09-05 00:52:42.000000000 +0200 ++++ hatari-1.3.1.new/src/breakcond.c 2010-02-03 20:50:17.710281057 +0100 +@@ -951,7 +951,7 @@ static char *BreakCond_TokenizeExpressio + } + /* validate & copy other characters */ + if (!sep) { +- if (!(isalnum(*src) || isblank(*src) || ++ if (!(isalnum(*src) || isspace(*src) || + *src == '$' || *src == '%')) { + pstate->error = "invalid character"; + pstate->arg = src-expression; +diff -rupN hatari-1.3.1/src/int.c hatari-1.3.1.new/src/int.c +--- hatari-1.3.1/src/int.c 2009-09-05 00:52:43.000000000 +0200 ++++ hatari-1.3.1.new/src/int.c 2010-02-03 20:50:33.010231152 +0100 +@@ -66,7 +66,11 @@ + + const char Int_fileid[] = "Hatari int.c : " __DATE__ " " __TIME__; + +-#include ++#if defined (__SVR4) && defined (__sun) ++#include ++#else ++ #include ++#endif + #include + #include "main.h" + #include "blitter.h" +diff -rupN hatari-1.3.1/src/uae-cpu/sysdeps.h hatari-1.3.1.new/src/uae-cpu/sysdeps.h +--- hatari-1.3.1/src/uae-cpu/sysdeps.h 2009-09-05 00:52:44.000000000 +0200 ++++ hatari-1.3.1.new/src/uae-cpu/sysdeps.h 2010-02-03 20:50:53.445742428 +0100 +@@ -30,8 +30,11 @@ + #endif + + #include +-#include +- ++#if defined (__SVR4) && defined (__sun) ++#include ++#else ++ #include ++#endif + + #if EEXIST == ENOTEMPTY + #define BROKEN_OS_PROBABLY_AIX Deleted: csw/mgar/pkg/hatari/trunk/files/stdint.h.diff =================================================================== --- csw/mgar/pkg/hatari/trunk/files/stdint.h.diff 2010-02-03 18:36:29 UTC (rev 8335) +++ csw/mgar/pkg/hatari/trunk/files/stdint.h.diff 2010-02-03 21:31:57 UTC (rev 8336) @@ -1,31 +0,0 @@ -diff --speed-large-files --minimal -Nru hatari-1.2.0.orig/src/int.c hatari-1.2.0/src/int.c ---- hatari-1.2.0.orig/src/int.c 2009-01-24 15:12:44.000000000 +0100 -+++ hatari-1.2.0/src/int.c 2009-03-14 02:54:10.150429990 +0100 -@@ -66,7 +66,12 @@ - - const char Int_fileid[] = "Hatari int.c : " __DATE__ " " __TIME__; - -+#if defined (__SVR4) && defined (__sun) -+#include -+#else - #include -+#endif -+ - #include "main.h" - #include "blitter.h" - #include "dmaSnd.h" -diff --speed-large-files --minimal -Nru hatari-1.2.0.orig/src/uae-cpu/sysdeps.h hatari-1.2.0/src/uae-cpu/sysdeps.h ---- hatari-1.2.0.orig/src/uae-cpu/sysdeps.h 2009-01-24 15:12:45.000000000 +0100 -+++ hatari-1.2.0/src/uae-cpu/sysdeps.h 2009-03-14 02:54:19.410281923 +0100 -@@ -30,7 +30,11 @@ - #endif - - #include -+#if defined (__SVR4) && defined (__sun) -+#include -+#else - #include -+#endif - - - #if EEXIST == ENOTEMPTY This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Thu Feb 4 01:39:11 2010 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Thu, 04 Feb 2010 00:39:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8337] csw/mgar/pkg/hatari/trunk/Makefile Message-ID: Revision: 8337 http://gar.svn.sourceforge.net/gar/?rev=8337&view=rev Author: jake_goerzen Date: 2010-02-04 00:39:10 +0000 (Thu, 04 Feb 2010) Log Message: ----------- removed LD_OPTIONS; fixed RPATH Modified Paths: -------------- csw/mgar/pkg/hatari/trunk/Makefile Modified: csw/mgar/pkg/hatari/trunk/Makefile =================================================================== --- csw/mgar/pkg/hatari/trunk/Makefile 2010-02-03 21:31:57 UTC (rev 8336) +++ csw/mgar/pkg/hatari/trunk/Makefile 2010-02-04 00:39:10 UTC (rev 8337) @@ -10,7 +10,7 @@ MASTER_SITES = http://download.berlios.de/hatari/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 PACKAGES = CSWhatari -RUNTIME_DEP_PKGS = CSWlibsdl CSWpng CSWreadline CSWzlib +RUNTIME_DEP_PKGS = CSWlibsdl CSWpng CSWpython CSWreadline CSWzlib UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -19,7 +19,6 @@ GARCOMPILER = GNU TEST_SCRIPTS = -CONFIGURE_ARGS = $(DIRPATHS) LIBS='-lm -lsocket' -BUILD_ARGS = LD_OPTIONS='-R/opt/csw/lib/$ISALIST -R/opt/csw/lib -L/opt/csw/lib' +CONFIGURE_ARGS = $(DIRPATHS) LIBS='-lm -lsocket -L/opt/csw/lib' include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 4 02:20:16 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Feb 2010 01:20:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8338] csw/mgar/pkg Message-ID: Revision: 8338 http://gar.svn.sourceforge.net/gar/?rev=8338&view=rev Author: wahwah Date: 2010-02-04 01:20:14 +0000 (Thu, 04 Feb 2010) Log Message: ----------- slack: Initial commit Modified Paths: -------------- csw/mgar/pkg/slack/trunk/Makefile csw/mgar/pkg/slack/trunk/checksums Added Paths: ----------- csw/mgar/pkg/slack/ Modified: csw/mgar/pkg/slack/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-02-03 18:36:29 UTC (rev 8335) +++ csw/mgar/pkg/slack/trunk/Makefile 2010-02-04 01:20:14 UTC (rev 8338) @@ -2,184 +2,21 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = slack +GARVERSION = 0.15.2 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = a glorified wrapper around rsync define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://code.google.com/p/slack/ +MASTER_SITES = $(GOOGLE_MIRROR) +PATCHFILES = OpenCSW-layout.patch +PATCHFILES += use-OpenCSW-perl.patch DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +RUNTIME_DEP_PKGS_CSWslack += CSWperl +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +include gar/category.mk Modified: csw/mgar/pkg/slack/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-02-03 18:36:29 UTC (rev 8335) +++ csw/mgar/pkg/slack/trunk/checksums 2010-02-04 01:20:14 UTC (rev 8338) @@ -0,0 +1,3 @@ +5e01443b25fe2d34f14d22a6be6c6b1c OpenCSW-layout.patch +4056df8e7e152a6e4e6730708a86bd25 slack-0.15.2.tar.gz +c9b4cfbdb8bbb49725b3d5214582911a use-OpenCSW-perl.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 4 02:48:32 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Feb 2010 01:48:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8339] csw/mgar/pkg/slack/trunk/Makefile Message-ID: Revision: 8339 http://gar.svn.sourceforge.net/gar/?rev=8339&view=rev Author: wahwah Date: 2010-02-04 01:48:32 +0000 (Thu, 04 Feb 2010) Log Message: ----------- slack: ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/slack/trunk/Makefile Modified: csw/mgar/pkg/slack/trunk/Makefile =================================================================== --- csw/mgar/pkg/slack/trunk/Makefile 2010-02-04 01:20:14 UTC (rev 8338) +++ csw/mgar/pkg/slack/trunk/Makefile 2010-02-04 01:48:32 UTC (rev 8339) @@ -19,4 +19,5 @@ BUILD_SCRIPTS = TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) +ARCHALL_CSWslack = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 4 02:53:29 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Feb 2010 01:53:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8340] csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py Message-ID: Revision: 8340 http://gar.svn.sourceforge.net/gar/?rev=8340&view=rev Author: wahwah Date: 2010-02-04 01:53:28 +0000 (Thu, 04 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, adding archall check. Added Paths: ----------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py Added: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py 2010-02-04 01:53:28 UTC (rev 8340) @@ -0,0 +1,52 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""Verifies the architecture of the package.""" + +import os.path +import sys + +CHECKPKG_MODULE_NAME = "architecture check" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg + +def CheckArchitectureVsContents(pkg): + """Verifies the relationship between package contents and architecture.""" + errors = [] + binaries = pkg.ListBinaries() + pkginfo = pkg.GetParsedPkginfo() + arch = pkginfo["ARCH"] + if binaries and arch == "all": + errors.append(checkpkg.PackageError( + "The package can't be ARCHALL = 1 and contain binaries.")) + elif not binaries and arch != "all": + # This is not a clean way of handling messages for the user, but there's + # not better way at the moment. + print "Package %s does not contain any binaries." % pkg.pkgname + print "Consider making it ARCHALL = 1 instead of %s:" % arch + print "ARCHALL_%s = 1" % pkg.pkgname + print ("However, be aware that there might be other reasons " + "to keep it architecture-specific.") + return errors + + +def main(): + options, args = checkpkg.GetOptions() + pkgnames = args + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.extractdir, + pkgnames, + options.debug) + check_manager.RegisterIndividualCheck(CheckArchitectureVsContents) + exit_code, report = check_manager.Run() + print report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 4 02:55:40 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Feb 2010 01:55:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[8341] csw/mgar/pkg/slack/trunk/files Message-ID: Revision: 8341 http://gar.svn.sourceforge.net/gar/?rev=8341&view=rev Author: wahwah Date: 2010-02-04 01:55:40 +0000 (Thu, 04 Feb 2010) Log Message: ----------- slack: adding the patches Added Paths: ----------- csw/mgar/pkg/slack/trunk/files/OpenCSW-layout.patch csw/mgar/pkg/slack/trunk/files/use-OpenCSW-perl.patch Added: csw/mgar/pkg/slack/trunk/files/OpenCSW-layout.patch =================================================================== --- csw/mgar/pkg/slack/trunk/files/OpenCSW-layout.patch (rev 0) +++ csw/mgar/pkg/slack/trunk/files/OpenCSW-layout.patch 2010-02-04 01:55:40 UTC (rev 8341) @@ -0,0 +1,32 @@ +--- slack-0.15.2/Makefile.common.orig 2010-02-04 02:16:22.634323566 +0100 ++++ slack-0.15.2/Makefile.common 2010-02-04 02:16:38.426419871 +0100 +@@ -4,24 +4,22 @@ + PACKAGE=slack + VERSION=0.15.2 + +-DESTDIR = +- +-prefix = / +-exec_prefix = /usr +-sysconfdir = ${prefix}/etc ++prefix = /opt/csw ++exec_prefix = /opt/csw ++sysconfdir = /etc${prefix} + mandir = ${exec_prefix}/share/man + bindir = ${exec_prefix}/bin + sbindir = ${exec_prefix}/sbin + libdir = ${exec_prefix}/lib + libexecdir = ${exec_prefix}/lib +-localstatedir = ${prefix}/var ++localstatedir = /var${prefix} + + slack_libdir = ${libdir}/slack + slack_libexecdir = ${libexecdir}/slack + slack_localstatedir = ${localstatedir}/lib/slack + slack_localcachedir = ${localstatedir}/cache/slack + +-INSTALL = install ++INSTALL = ginstall + MKDIR = mkdir -p + + PRIVDIRMODE = 0700 Added: csw/mgar/pkg/slack/trunk/files/use-OpenCSW-perl.patch =================================================================== --- csw/mgar/pkg/slack/trunk/files/use-OpenCSW-perl.patch (rev 0) +++ csw/mgar/pkg/slack/trunk/files/use-OpenCSW-perl.patch 2010-02-04 01:55:40 UTC (rev 8341) @@ -0,0 +1,8 @@ +--- slack-0.15.2/test/gen_config_file.orig 2010-02-04 02:09:19.029289626 +0100 ++++ slack-0.15.2/test/gen_config_file 2010-02-04 02:09:27.503141517 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + + use test_util qw(gen_config_file); + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 4 03:04:14 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Feb 2010 02:04:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8342] csw/mgar/gar/v2/lib/python Message-ID: Revision: 8342 http://gar.svn.sourceforge.net/gar/?rev=8342&view=rev Author: wahwah Date: 2010-02-04 02:04:14 +0000 (Thu, 04 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, stay silent if the dependencies look good. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-04 01:55:40 UTC (rev 8341) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-04 02:04:14 UTC (rev 8342) @@ -41,7 +41,9 @@ (r".*\.rb", u"CSWruby"), ) -REPORT_TMPL = u"""# $pkgname: +REPORT_TMPL = u"""#if $missing_deps or $surplus_deps or $orphan_sonames +# $pkgname: +#end if #if $missing_deps # SUGGESTION: you may want to add some or all of the following as depends: # (Feel free to ignore SUNW or SPRO packages) @@ -61,9 +63,6 @@ # ! $soname #end for #end if -#if not $missing_deps and not $surplus_deps and not $orphan_sonames -# + Dependencies of $pkgname look good. -#end if """ ERROR_REPORT_TMPL = u"""#if $errors Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-04 01:55:40 UTC (rev 8341) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-04 02:04:14 UTC (rev 8342) @@ -578,9 +578,7 @@ orphan_sonames = set([]) testdata = (missing_deps, surplus_deps, orphan_sonames) checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") - expected = u"""# CSWfoo: -# + Dependencies of CSWfoo look good. -""" + expected = u"" result = checker.FormatDepsReport(*testdata) self.AssertTextEqual(result, expected) 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 Feb 4 09:54:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 04 Feb 2010 08:54:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8343] csw/mgar/pkg/xjobs/trunk Message-ID: Revision: 8343 http://gar.svn.sourceforge.net/gar/?rev=8343&view=rev Author: dmichelsen Date: 2010-02-04 08:54:53 +0000 (Thu, 04 Feb 2010) Log Message: ----------- xjobs: Update to 20100203 Modified Paths: -------------- csw/mgar/pkg/xjobs/trunk/Makefile csw/mgar/pkg/xjobs/trunk/checksums Modified: csw/mgar/pkg/xjobs/trunk/Makefile =================================================================== --- csw/mgar/pkg/xjobs/trunk/Makefile 2010-02-04 02:04:14 UTC (rev 8342) +++ csw/mgar/pkg/xjobs/trunk/Makefile 2010-02-04 08:54:53 UTC (rev 8343) @@ -1,5 +1,5 @@ GARNAME = xjobs -GARVERSION = 20091012 +GARVERSION = 20100203 CATEGORIES = utils DESCRIPTION = Executes jobs in parallel similar to xargs Modified: csw/mgar/pkg/xjobs/trunk/checksums =================================================================== --- csw/mgar/pkg/xjobs/trunk/checksums 2010-02-04 02:04:14 UTC (rev 8342) +++ csw/mgar/pkg/xjobs/trunk/checksums 2010-02-04 08:54:53 UTC (rev 8343) @@ -1 +1 @@ -276bd941a1fc178d2a4d79a0870e533a xjobs-20091012.tgz +364ff256ec497f3b69c675edf6dbb7c8 xjobs-20100203.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 4 11:05:38 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Feb 2010 10:05:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8344] csw/mgar/pkg/puppet Message-ID: Revision: 8344 http://gar.svn.sourceforge.net/gar/?rev=8344&view=rev Author: wahwah Date: 2010-02-04 10:05:38 +0000 (Thu, 04 Feb 2010) Log Message: ----------- puppet: Version bump to 0.25.4, better CSWpuppetmaster package, added the dependency on CSWruby Modified Paths: -------------- csw/mgar/pkg/puppet/branches/puppet-0.24.x/Makefile csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums Modified: csw/mgar/pkg/puppet/branches/puppet-0.24.x/Makefile =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.24.x/Makefile 2010-02-04 08:54:53 UTC (rev 8343) +++ csw/mgar/pkg/puppet/branches/puppet-0.24.x/Makefile 2010-02-04 10:05:38 UTC (rev 8344) @@ -34,19 +34,23 @@ # service isn't started upon the installation of CSWpuppet. PACKAGES = CSWpuppet CSWpuppetmaster -RUNTIME_DEP_PKGS = CSWfacter -BUILD_DEP_PKGS = -RUNTIME_DEP_PKGS_CSWpuppetmaster = CSWpuppet - -PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd -SPKG_DESC_CSWpuppet = System configuration management tool, client daemon +SPKG_DESC_CSWpuppet = System configuration management tool, client daemon SPKG_DESC_CSWpuppetmaster = System configuration management tool, server -ARCHALL=1 +RUNTIME_DEP_PKGS = CSWfacter +RUNTIME_DEP_PKGS += CSWruby +RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWpuppet -sysconfdir = /etc/opt/csw -localstatedir = /var/opt/csw +PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd +PKGFILES_CSWpuppetmaster += $(sbindir)/puppetmasterd +PKGFILES_CSWpuppetmaster += $(mandir)/man8/puppetmasterd.8 +PKGFILES_CSWpuppetmaster += $(libdir)/.*/puppet/application/puppetmasterd.rb +ARCHALL = 1 + +sysconfdir = /etc$(prefix) +localstatedir = /var$(prefix) + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2010-02-04 08:54:53 UTC (rev 8343) +++ csw/mgar/pkg/puppet/trunk/Makefile 2010-02-04 10:05:38 UTC (rev 8344) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh GARNAME = puppet -GARVERSION = 0.25.1 +GARVERSION = 0.25.4 CATEGORIES = apps define BLURB @@ -34,19 +34,23 @@ # service isn't started upon the installation of CSWpuppet. PACKAGES = CSWpuppet CSWpuppetmaster -RUNTIME_DEP_PKGS = CSWfacter -#BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -RUNTIME_DEP_PKGS_CSWpuppetmaster = CSWpuppet - -PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd -SPKG_DESC_CSWpuppet = System configuration management tool, client daemon +SPKG_DESC_CSWpuppet = System configuration management tool, client daemon SPKG_DESC_CSWpuppetmaster = System configuration management tool, server -ARCHALL=1 +RUNTIME_DEP_PKGS = CSWfacter +RUNTIME_DEP_PKGS += CSWruby +RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWpuppet -sysconfdir = /etc/opt/csw -localstatedir = /var/opt/csw +PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd +PKGFILES_CSWpuppetmaster += $(sbindir)/puppetmasterd +PKGFILES_CSWpuppetmaster += $(mandir)/man8/puppetmasterd.8 +PKGFILES_CSWpuppetmaster += $(libdir)/.*/puppet/application/puppetmasterd.rb +ARCHALL = 1 + +sysconfdir = /etc$(prefix) +localstatedir = /var$(prefix) + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2010-02-04 08:54:53 UTC (rev 8343) +++ csw/mgar/pkg/puppet/trunk/checksums 2010-02-04 10:05:38 UTC (rev 8344) @@ -3,4 +3,4 @@ f4a95dece2231805abf4754d72471de4 cswpuppetd aba2c79e589b9bd1c881a22aa663a213 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup -55ced6102fe6ad8b2ecb2b1384008167 puppet-0.25.1.tar.gz +69c97019fda5620f9f45f6ad64407e3b puppet-0.25.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Thu Feb 4 11:51:22 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Thu, 04 Feb 2010 10:51:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8345] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 8345 http://gar.svn.sourceforge.net/gar/?rev=8345&view=rev Author: aigoshin Date: 2010-02-04 10:51:21 +0000 (Thu, 04 Feb 2010) Log Message: ----------- nginx: package release 20100203 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/checksums csw/mgar/pkg/nginx/trunk/files/cswnginx Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2010-02-04 10:05:38 UTC (rev 8344) +++ csw/mgar/pkg/nginx/trunk/checksums 2010-02-04 10:51:21 UTC (rev 8345) @@ -1,2 +1,2 @@ -4e8863b34556eb28e3ee6849ffb1ed85 cswnginx +f2229b341ced83f872b78ade9c97fc8e cswnginx abc4f76af450eedeb063158bd963feaa nginx-0.7.65.tar.gz Modified: csw/mgar/pkg/nginx/trunk/files/cswnginx =================================================================== --- csw/mgar/pkg/nginx/trunk/files/cswnginx 2010-02-04 10:05:38 UTC (rev 8344) +++ csw/mgar/pkg/nginx/trunk/files/cswnginx 2010-02-04 10:51:21 UTC (rev 8345) @@ -143,7 +143,7 @@ stop) stop ;; -refresh|reload) +reload|refresh) check [ $RETVAL -eq 0 ] && reload ||: ;; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 4 13:32:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Feb 2010 12:32:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8346] csw/mgar/pkg/slack/trunk Message-ID: Revision: 8346 http://gar.svn.sourceforge.net/gar/?rev=8346&view=rev Author: wahwah Date: 2010-02-04 12:32:12 +0000 (Thu, 04 Feb 2010) Log Message: ----------- slack: using /opt/csw/lib/perl/csw for the Perl module Modified Paths: -------------- csw/mgar/pkg/slack/trunk/Makefile csw/mgar/pkg/slack/trunk/checksums csw/mgar/pkg/slack/trunk/files/OpenCSW-layout.patch Modified: csw/mgar/pkg/slack/trunk/Makefile =================================================================== --- csw/mgar/pkg/slack/trunk/Makefile 2010-02-04 10:51:21 UTC (rev 8345) +++ csw/mgar/pkg/slack/trunk/Makefile 2010-02-04 12:32:12 UTC (rev 8346) @@ -18,6 +18,5 @@ CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = -CONFIGURE_ARGS = $(DIRPATHS) ARCHALL_CSWslack = 1 include gar/category.mk Modified: csw/mgar/pkg/slack/trunk/checksums =================================================================== --- csw/mgar/pkg/slack/trunk/checksums 2010-02-04 10:51:21 UTC (rev 8345) +++ csw/mgar/pkg/slack/trunk/checksums 2010-02-04 12:32:12 UTC (rev 8346) @@ -1,3 +1,3 @@ -5e01443b25fe2d34f14d22a6be6c6b1c OpenCSW-layout.patch +a833b28145a02bcda5a3572d8e9500bc OpenCSW-layout.patch 4056df8e7e152a6e4e6730708a86bd25 slack-0.15.2.tar.gz c9b4cfbdb8bbb49725b3d5214582911a use-OpenCSW-perl.patch Modified: csw/mgar/pkg/slack/trunk/files/OpenCSW-layout.patch =================================================================== --- csw/mgar/pkg/slack/trunk/files/OpenCSW-layout.patch 2010-02-04 10:51:21 UTC (rev 8345) +++ csw/mgar/pkg/slack/trunk/files/OpenCSW-layout.patch 2010-02-04 12:32:12 UTC (rev 8346) @@ -1,5 +1,5 @@ ---- slack-0.15.2/Makefile.common.orig 2010-02-04 02:16:22.634323566 +0100 -+++ slack-0.15.2/Makefile.common 2010-02-04 02:16:38.426419871 +0100 +--- work/solaris8-sparc/build-isa-sparcv8/slack-0.15.2/Makefile.common.orig 2008-04-21 03:06:15.000000000 +0200 ++++ work/solaris8-sparc/build-isa-sparcv8/slack-0.15.2/Makefile.common 2010-02-04 13:29:57.516978313 +0100 @@ -4,24 +4,22 @@ PACKAGE=slack VERSION=0.15.2 @@ -20,7 +20,8 @@ -localstatedir = ${prefix}/var +localstatedir = /var${prefix} - slack_libdir = ${libdir}/slack +-slack_libdir = ${libdir}/slack ++slack_libdir = ${libdir}/perl/csw slack_libexecdir = ${libexecdir}/slack slack_localstatedir = ${localstatedir}/lib/slack slack_localcachedir = ${localstatedir}/cache/slack This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 4 13:54:45 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Feb 2010 12:54:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8347] csw/mgar/pkg/slack/trunk Message-ID: Revision: 8347 http://gar.svn.sourceforge.net/gar/?rev=8347&view=rev Author: wahwah Date: 2010-02-04 12:54:45 +0000 (Thu, 04 Feb 2010) Log Message: ----------- slack: Patched all the occurences of /usr/bin/perl. Modified Paths: -------------- csw/mgar/pkg/slack/trunk/Makefile csw/mgar/pkg/slack/trunk/checksums Added Paths: ----------- csw/mgar/pkg/slack/trunk/files/0001-OpenCSW-layout.patch csw/mgar/pkg/slack/trunk/files/0002-use-OpenCSW-perl.patch csw/mgar/pkg/slack/trunk/files/0003-gen_config_file-with-OpenCSW-perl.patch Removed Paths: ------------- csw/mgar/pkg/slack/trunk/files/OpenCSW-layout.patch csw/mgar/pkg/slack/trunk/files/use-OpenCSW-perl.patch Modified: csw/mgar/pkg/slack/trunk/Makefile =================================================================== --- csw/mgar/pkg/slack/trunk/Makefile 2010-02-04 12:32:12 UTC (rev 8346) +++ csw/mgar/pkg/slack/trunk/Makefile 2010-02-04 12:54:45 UTC (rev 8347) @@ -10,8 +10,9 @@ endef SPKG_SOURCEURL = http://code.google.com/p/slack/ MASTER_SITES = $(GOOGLE_MIRROR) -PATCHFILES = OpenCSW-layout.patch -PATCHFILES += use-OpenCSW-perl.patch +PATCHFILES = 0001-OpenCSW-layout.patch +PATCHFILES += 0002-use-OpenCSW-perl.patch +PATCHFILES += 0003-gen_config_file-with-OpenCSW-perl.patch DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz RUNTIME_DEP_PKGS_CSWslack += CSWperl Modified: csw/mgar/pkg/slack/trunk/checksums =================================================================== --- csw/mgar/pkg/slack/trunk/checksums 2010-02-04 12:32:12 UTC (rev 8346) +++ csw/mgar/pkg/slack/trunk/checksums 2010-02-04 12:54:45 UTC (rev 8347) @@ -1,3 +1,4 @@ -a833b28145a02bcda5a3572d8e9500bc OpenCSW-layout.patch +322b69da09e4676bed40231652b5c4e7 0001-OpenCSW-layout.patch +f11a6f0d4d7a40c73171ea10aede34e0 0002-use-OpenCSW-perl.patch +9788deb3ea2ecaa7b722e8b3afeacda1 0003-gen_config_file-with-OpenCSW-perl.patch 4056df8e7e152a6e4e6730708a86bd25 slack-0.15.2.tar.gz -c9b4cfbdb8bbb49725b3d5214582911a use-OpenCSW-perl.patch Added: csw/mgar/pkg/slack/trunk/files/0001-OpenCSW-layout.patch =================================================================== --- csw/mgar/pkg/slack/trunk/files/0001-OpenCSW-layout.patch (rev 0) +++ csw/mgar/pkg/slack/trunk/files/0001-OpenCSW-layout.patch 2010-02-04 12:54:45 UTC (rev 8347) @@ -0,0 +1,44 @@ +From ae2fee3f00fd779ebe738e820050042d439ddbc1 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Thu, 4 Feb 2010 13:44:58 +0100 +Subject: [PATCH 1/2] OpenCSW layout + +--- + Makefile.common | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile.common b/Makefile.common +index 198f557..e088698 100644 +--- a/Makefile.common ++++ b/Makefile.common +@@ -6,22 +6,22 @@ VERSION=0.15.2 + + DESTDIR = + +-prefix = / +-exec_prefix = /usr +-sysconfdir = ${prefix}/etc ++prefix = /opt/csw ++exec_prefix = /opt/csw ++sysconfdir = /etc${prefix} + mandir = ${exec_prefix}/share/man + bindir = ${exec_prefix}/bin + sbindir = ${exec_prefix}/sbin + libdir = ${exec_prefix}/lib + libexecdir = ${exec_prefix}/lib +-localstatedir = ${prefix}/var ++localstatedir = /var${prefix} + + slack_libdir = ${libdir}/slack + slack_libexecdir = ${libexecdir}/slack + slack_localstatedir = ${localstatedir}/lib/slack + slack_localcachedir = ${localstatedir}/cache/slack + +-INSTALL = install ++INSTALL = ginstall + MKDIR = mkdir -p + + PRIVDIRMODE = 0700 +-- +1.6.6 + Added: csw/mgar/pkg/slack/trunk/files/0002-use-OpenCSW-perl.patch =================================================================== --- csw/mgar/pkg/slack/trunk/files/0002-use-OpenCSW-perl.patch (rev 0) +++ csw/mgar/pkg/slack/trunk/files/0002-use-OpenCSW-perl.patch 2010-02-04 12:54:45 UTC (rev 8347) @@ -0,0 +1,173 @@ +From a455e74b9e71d83f4a039e8781036e9bb62bf242 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Thu, 4 Feb 2010 13:45:25 +0100 +Subject: [PATCH 2/2] use OpenCSW perl + +--- + src/slack | 6 +++--- + src/slack-diff | 2 +- + src/slack-getroles | 4 ++-- + src/slack-installfiles | 4 ++-- + src/slack-rolediff | 4 ++-- + src/slack-runscript | 6 +++--- + src/slack-stage | 4 ++-- + src/slack-sync | 4 ++-- + 8 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/src/slack b/src/slack +index d8e9fbb..3c9c4ce 100755 +--- a/src/slack ++++ b/src/slack +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + # $Id: slack 180 2008-01-19 08:26:19Z alan $ + # vim:sw=2 + # vim600:fdm=marker +@@ -19,8 +19,8 @@ use File::Path; + use File::Find; + use POSIX; # for strftime + +-use constant LIBEXEC_DIR => '/usr/lib/slack'; +-use constant LIB_DIR => '/usr/lib/slack'; ++use constant LIBEXEC_DIR => '/opt/csw/lib/slack'; ++use constant LIB_DIR => '/opt/csw/lib/slack'; + use lib LIB_DIR; + use Slack; + +diff --git a/src/slack-diff b/src/slack-diff +index dde4f16..9b2ca65 100755 +--- a/src/slack-diff ++++ b/src/slack-diff +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + # $Id: slack-diff 122 2006-09-27 07:34:32Z alan $ + # vim:sw=2 + # vim600:fdm=marker +diff --git a/src/slack-getroles b/src/slack-getroles +index 77eba20..604f4f6 100755 +--- a/src/slack-getroles ++++ b/src/slack-getroles +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + # $Id: slack-getroles 180 2008-01-19 08:26:19Z alan $ + # vim:sw=2 + # vim600:fdm=marker +@@ -17,7 +17,7 @@ use sigtrap qw(die untrapped normal-signals + + use File::Path; + +-use constant LIB_DIR => '/usr/lib/slack'; ++use constant LIB_DIR => '/opt/csw/lib/slack'; + use lib LIB_DIR; + use Slack; + +diff --git a/src/slack-installfiles b/src/slack-installfiles +index 65d1e22..5c3659d 100755 +--- a/src/slack-installfiles ++++ b/src/slack-installfiles +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + # $Id: slack-installfiles 180 2008-01-19 08:26:19Z alan $ + # vim:sw=2 + # vim600:fdm=marker +@@ -17,7 +17,7 @@ use sigtrap qw(die untrapped normal-signals + + use File::Path; + +-use constant LIB_DIR => '/usr/lib/slack'; ++use constant LIB_DIR => '/opt/csw/lib/slack'; + use lib LIB_DIR; + use Slack; + +diff --git a/src/slack-rolediff b/src/slack-rolediff +index 92def93..bd11fc4 100755 +--- a/src/slack-rolediff ++++ b/src/slack-rolediff +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + # $Id: slack-rolediff 125 2006-09-27 07:50:07Z alan $ + # vim:sw=2 + # vim600:fdm=marker +@@ -18,7 +18,7 @@ use sigtrap qw(die untrapped normal-signals + use File::Path; + use File::Find; + +-use constant LIB_DIR => '/usr/lib/slack'; ++use constant LIB_DIR => '/opt/csw/lib/slack'; + use lib LIB_DIR; + use Slack; + +diff --git a/src/slack-runscript b/src/slack-runscript +index 5125a83..3215074 100755 +--- a/src/slack-runscript ++++ b/src/slack-runscript +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + # $Id: slack-runscript 118 2006-09-25 18:35:17Z alan $ + # vim:sw=2 + # vim600:fdm=marker +@@ -17,7 +17,7 @@ use sigtrap qw(die untrapped normal-signals + use File::Path; + use File::Find; + +-use constant LIB_DIR => '/usr/lib/slack'; ++use constant LIB_DIR => '/opt/csw/lib/slack'; + use lib LIB_DIR; + use Slack; + +@@ -57,7 +57,7 @@ die "No roles given!\n\n$usage" unless @ARGV; + + # Start with a clean environment + %ENV = ( +- PATH => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', ++ PATH => '/opt/csw/sbin:/opt/csw/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', + ); + # Export certain variables to the environment. These are guaranteed to + # be set because we require them in get_options above. +diff --git a/src/slack-stage b/src/slack-stage +index 3833736..43f1bce 100755 +--- a/src/slack-stage ++++ b/src/slack-stage +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + # $Id: slack-stage 180 2008-01-19 08:26:19Z alan $ + # vim:sw=2 + # vim600:fdm=marker +@@ -19,7 +19,7 @@ use sigtrap qw(die untrapped normal-signals + use File::Path; + use File::Find; + +-use constant LIB_DIR => '/usr/lib/slack'; ++use constant LIB_DIR => '/opt/csw/lib/slack'; + use lib LIB_DIR; + use Slack; + +diff --git a/src/slack-sync b/src/slack-sync +index 3c58034..c886ce1 100755 +--- a/src/slack-sync ++++ b/src/slack-sync +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + # $Id: slack-sync 180 2008-01-19 08:26:19Z alan $ + # vim:sw=2 + # vim600:fdm=marker +@@ -17,7 +17,7 @@ use sigtrap qw(die untrapped normal-signals + + use File::Path; + +-use constant LIB_DIR => '/usr/lib/slack'; ++use constant LIB_DIR => '/opt/csw/lib/slack'; + use lib LIB_DIR; + use Slack; + +-- +1.6.6 + Added: csw/mgar/pkg/slack/trunk/files/0003-gen_config_file-with-OpenCSW-perl.patch =================================================================== --- csw/mgar/pkg/slack/trunk/files/0003-gen_config_file-with-OpenCSW-perl.patch (rev 0) +++ csw/mgar/pkg/slack/trunk/files/0003-gen_config_file-with-OpenCSW-perl.patch 2010-02-04 12:54:45 UTC (rev 8347) @@ -0,0 +1,22 @@ +From e80d079670eec46817df4756d014a32f5c0f4c42 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Thu, 4 Feb 2010 13:51:00 +0100 +Subject: [PATCH] gen_config_file with OpenCSW perl + +--- + test/gen_config_file | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/test/gen_config_file b/test/gen_config_file +index b70161e..99461b2 100755 +--- a/test/gen_config_file ++++ b/test/gen_config_file +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + + use test_util qw(gen_config_file); + +-- +1.6.6 + Deleted: csw/mgar/pkg/slack/trunk/files/OpenCSW-layout.patch =================================================================== --- csw/mgar/pkg/slack/trunk/files/OpenCSW-layout.patch 2010-02-04 12:32:12 UTC (rev 8346) +++ csw/mgar/pkg/slack/trunk/files/OpenCSW-layout.patch 2010-02-04 12:54:45 UTC (rev 8347) @@ -1,33 +0,0 @@ ---- work/solaris8-sparc/build-isa-sparcv8/slack-0.15.2/Makefile.common.orig 2008-04-21 03:06:15.000000000 +0200 -+++ work/solaris8-sparc/build-isa-sparcv8/slack-0.15.2/Makefile.common 2010-02-04 13:29:57.516978313 +0100 -@@ -4,24 +4,22 @@ - PACKAGE=slack - VERSION=0.15.2 - --DESTDIR = -- --prefix = / --exec_prefix = /usr --sysconfdir = ${prefix}/etc -+prefix = /opt/csw -+exec_prefix = /opt/csw -+sysconfdir = /etc${prefix} - mandir = ${exec_prefix}/share/man - bindir = ${exec_prefix}/bin - sbindir = ${exec_prefix}/sbin - libdir = ${exec_prefix}/lib - libexecdir = ${exec_prefix}/lib --localstatedir = ${prefix}/var -+localstatedir = /var${prefix} - --slack_libdir = ${libdir}/slack -+slack_libdir = ${libdir}/perl/csw - slack_libexecdir = ${libexecdir}/slack - slack_localstatedir = ${localstatedir}/lib/slack - slack_localcachedir = ${localstatedir}/cache/slack - --INSTALL = install -+INSTALL = ginstall - MKDIR = mkdir -p - - PRIVDIRMODE = 0700 Deleted: csw/mgar/pkg/slack/trunk/files/use-OpenCSW-perl.patch =================================================================== --- csw/mgar/pkg/slack/trunk/files/use-OpenCSW-perl.patch 2010-02-04 12:32:12 UTC (rev 8346) +++ csw/mgar/pkg/slack/trunk/files/use-OpenCSW-perl.patch 2010-02-04 12:54:45 UTC (rev 8347) @@ -1,8 +0,0 @@ ---- slack-0.15.2/test/gen_config_file.orig 2010-02-04 02:09:19.029289626 +0100 -+++ slack-0.15.2/test/gen_config_file 2010-02-04 02:09:27.503141517 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!/opt/csw/bin/perl -w - - use test_util qw(gen_config_file); - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Feb 4 17:26:50 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 04 Feb 2010 16:26:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8348] csw/mgar/pkg/spamassassin/trunk Message-ID: Revision: 8348 http://gar.svn.sourceforge.net/gar/?rev=8348&view=rev Author: bonivart Date: 2010-02-04 16:26:50 +0000 (Thu, 04 Feb 2010) Log Message: ----------- spamassassin: fix init script, deps Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd Added Paths: ----------- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.CSW Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2010-02-04 12:54:45 UTC (rev 8347) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2010-02-04 16:26:50 UTC (rev 8348) @@ -10,25 +10,31 @@ DNS blocklists, and collaborative filtering databases. endef -#MASTER_SITES = http://apache.jumper.nu/spamassassin/source/ -MASTER_SITES = http://people.apache.org/~jm/devel/ +#MASTER_SITES = http://people.apache.org/~jm/devel/ +MASTER_SITES = http://apache.dataphone.se/spamassassin/source/ DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz #DISTFILES = $(SPKG_NAME)-$(GARVERSION)-rc3.tar.gz DISTFILES += COPYING -RUNTIME_DEP_PKGS = CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha +RUNTIME_DEP_PKGS = CSWgnupg CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha RUNTIME_DEP_PKGS += CSWpmiosocketinet6 CSWpmiosocketssl CSWpmiozlib RUNTIME_DEP_PKGS += CSWpmipcountry CSWpmldap CSWpmlibwww CSWpmmaildkim RUNTIME_DEP_PKGS += CSWpmmailspf CSWpmmailtools CSWpmmimebase64 CSWpmnetaddrip CSWpmnetdns -RUNTIME_DEP_PKGS += CSWpmuri CSWpmhtmlparser CSWzlib +RUNTIME_DEP_PKGS += CSWrazor CSWpmuri CSWpmhtmlparser CSWzlib UFILES_REGEX = $(SPKG_NAME)-(\d+(?:\.\d+)*).tar.gz -SAMPLECONF = /opt/csw/etc/spamassassin/.+\.pre\.CSW -SAMPLECONF += /opt/csw/etc/spamassassin/local\.cf\.CSW +#SAMPLECONF = /opt/csw/etc/spamassassin/.+\.pre\.CSW +#SAMPLECONF += /opt/csw/etc/spamassassin/local\.cf\.CSW +SAMPLECONF = /etc/opt/csw/spamassassin/.+\.pre\.CSW +SAMPLECONF += /etc/opt/csw/spamassassin/local\.cf\.CSW +SAMPLECONF += /etc/opt/csw/spamassassin/spamd\.CSW +USERGROUP = /etc/opt/csw/pkg/CSWspamassassin/cswusergroup INITSMF = /etc/opt/csw/init.d/cswspamd -USERGROUP = /opt/csw/etc/CSWspamassassin/cswusergroup +MIGRATE_FILES = /opt/csw/etc/spamassassin +MIGRATE_DEST_DIR = /etc/opt/csw/spamassassin + CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom #TEST_SCRIPTS = custom @@ -49,7 +55,7 @@ configure-custom: @echo " ==> Configuring $(GARNAME) (custom)" @( cd $(WORKSRC) ; \ - perl Makefile.PL INSTALLDIRS=vendor DESTDIR=$(DESTDIR) CONFDIR=/opt/csw/etc/spamassassin LOCALSTATEDIR=/var/opt/csw/spamassassin CONTACT_ADDRESS=postmaster ) + perl Makefile.PL INSTALLDIRS=vendor DESTDIR=$(DESTDIR) CONFDIR=/etc/opt/csw/spamassassin LOCALSTATEDIR=/var/opt/csw/spamassassin CONTACT_ADDRESS=postmaster ) @$(MAKECOOKIE) pre-build-modulated: @@ -76,10 +82,13 @@ @rm -rf $(DESTDIR) @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME) - @ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/CSWspamassassin +# @ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/CSWspamassassin + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/spamassassin + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWspamassassin @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/CSWspamassassin.cswspamd $(DESTDIR)/etc/opt/csw/init.d/cswspamd - @ginstall -m 644 $(FILEDIR)/CSWspamassassin.cswusergroup $(DESTDIR)$(sysconfdir)/CSWspamassassin/cswusergroup + @ginstall -m 644 $(FILEDIR)/CSWspamassassin.cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWspamassassin/cswusergroup + @ginstall -m 644 $(FILEDIR)/CSWspamassassin.spamd.CSW $(DESTDIR)/etc/opt/csw/spamassassin/spamd.CSW @cp $(FILEDIR)/CSWspamassassin.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW @cp $(FILEDIR)/CSWspamassassin.README.spamd $(DESTDIR)$(docdir)/$(GARNAME)/README.spamd echo "WORKSRC: $(WORKSRC)" @@ -87,11 +96,12 @@ gmake DESTDIR=$(DESTDIR) install ) @( cd $(WORKSRC) ; \ cp -r C* INSTALL NOTICE README TRADEMARK U* ldap/ sql/ procmailrc.example sample-* $(DESTDIR)$(docdir)/$(GARNAME)/ ) - @( cd $(DESTDIR)/opt/csw/etc/spamassassin ; \ + @( cd $(DESTDIR)/etc/opt/csw/spamassassin ; \ mv local.cf local.cf.CSW ; \ mv init.pre init.pre.CSW ; \ mv v310.pre v310.pre.CSW ; \ mv v312.pre v312.pre.CSW ; \ + mv v330.pre v330.pre.CSW ; \ mv v320.pre v320.pre.CSW ) @rm -rf $(DESTDIR)/opt/csw/lib @$(MAKECOOKIE) Modified: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd =================================================================== --- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd 2010-02-04 12:54:45 UTC (rev 8347) +++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd 2010-02-04 16:26:50 UTC (rev 8348) @@ -1,35 +1,61 @@ #!/sbin/sh -# -# From: skod at ises-llc.com (Scott Griffith, ISES-LLC) -# To: , -# Subject: Re: [Spamassassin-talk] SysV-style startup script -# Date: Sat, 24 Nov 2001 12:09:16 -0700 -# Modified for CSW by Alex Moore -# -# In case there are any Solaris folks out there who aren't comfortable -# with their own rc scripts, here's what I've been using for Solaris 7 -# from day 1 with no problems. Filename: -# -# /etc/rc2.d/S78spamd +#RC_KLEV 0,1,2,S +#RC_SLEV 3 + +# rc-script for CSW SpamAssassin +# Peter Bonivart, 2010-02-01 + +# Source SMF includes +[ -r /lib/svc/share/smf_include.sh ] && . /lib/svc/share/smf_include.sh + +# Source config file +[ -r /etc/opt/csw/spamassassin/spamd ] && . /etc/opt/csw/spamassassin/spamd + +PROG=spamd PATH=$PATH:/usr/bin:/opt/csw/bin +#OPTIONS=-i 127.0.0.1 -m 10 --min-children=2 --max-conn-per-child=50 -s local2 --syslog-socket=inet -u spamd -x -r /opt/csw/var/spamd/spamd.pid +ZONE= # used for initialization, do not change + case "$1" in -'start') - if [ -x /usr/bin/spamd -o -x /opt/csw/bin/spamd ] - then - spamd -d -i 127.0.0.1 -m 10 --min-children=2 --max-conn-per-child=50 -s local2 --syslog-socket=inet -u spamd -x -r /opt/csw/var/spamd/spamd.pid - fi - ;; + start) + if [ -x /opt/csw/bin/spamd ]; then + if [ -d /var/opt/csw/spamassassin/3.003000 ]; then + echo "Starting $PROG." + /opt/csw/bin/spamd -d $OPTIONS + else + echo "Rules directory not found. Run sa-update to fetch rules." + fi + fi + ;; -'stop') - /usr/bin/pkill -9 -x -u 0 '(spamd)' - ;; + stop) + echo "Shutting down $PROG." + if [ -x /usr/bin/zonename ]; then + if [ "`/usr/bin/zonename`" = "global" ]; then + ZONE="-z global" + fi + fi + pkill $ZONE -x spamd + ;; -*) - echo "Usage: $0 { start | stop }" - exit 1 - ;; + restart) + $0 stop + echo "Waiting for $PROG to stop.\c" + while ( /usr/bin/pgrep -x $PROG > /dev/null ) ; do + echo ".\c" + sleep 1 + done + echo + sleep 1 + $0 start + ;; + + *) + echo "Usage: $0 { start | stop | restart }" + exit 1 + ;; esac + exit 0 - Added: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.CSW =================================================================== --- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.CSW (rev 0) +++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.CSW 2010-02-04 16:26:50 UTC (rev 8348) @@ -0,0 +1,7 @@ +# This is where you customize some settings of your SpamAssassin installation so +# you don't have to edit the scripts themselves as they will be replaced during +# upgrades. +# +# Peter Bonivart, OpenCSW + +OPTIONS=-i 127.0.0.1 -m 10 --min-children=2 --max-conn-per-child=50 -s local2 --syslog-socket=inet -u spamd -x -r /opt/csw/var/spamd/spamd.pid 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 Feb 4 19:04:02 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 04 Feb 2010 18:04:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[8349] csw/mgar/pkg/chkconfig/trunk Message-ID: Revision: 8349 http://gar.svn.sourceforge.net/gar/?rev=8349&view=rev Author: dmichelsen Date: 2010-02-04 18:04:02 +0000 (Thu, 04 Feb 2010) Log Message: ----------- chkconfig: Fix location to csw standards Modified Paths: -------------- csw/mgar/pkg/chkconfig/trunk/Makefile csw/mgar/pkg/chkconfig/trunk/checksums Added Paths: ----------- csw/mgar/pkg/chkconfig/trunk/files/0003-Fix-manpage-to-use-csw-pathes.patch Modified: csw/mgar/pkg/chkconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/chkconfig/trunk/Makefile 2010-02-04 16:26:50 UTC (rev 8348) +++ csw/mgar/pkg/chkconfig/trunk/Makefile 2010-02-04 18:04:02 UTC (rev 8349) @@ -16,6 +16,7 @@ PATCHFILES = alloca.patch PATCHFILES += 0001-Add-missing-include-to-alloca.h.patch PATCHFILES += 0002-Don-t-use-named-struct-initializers.patch +PATCHFILES += 0003-Fix-manpage-to-use-csw-pathes.patch UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -29,6 +30,8 @@ PKGFILES_CSWalternatives = .*alternatives.* CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-alt-links-dir=/etc/opt/csw/alternatives +CONFIGURE_ARGS += --with-alt-admin-dir=/var/opt/csw/alternatives TEST_TARGET = check Modified: csw/mgar/pkg/chkconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/chkconfig/trunk/checksums 2010-02-04 16:26:50 UTC (rev 8348) +++ csw/mgar/pkg/chkconfig/trunk/checksums 2010-02-04 18:04:02 UTC (rev 8349) @@ -1,4 +1,5 @@ d56d4f7b5aef5af5235943c384734780 0001-Add-missing-include-to-alloca.h.patch a1045173b8bc0a667883080f85a38597 0002-Don-t-use-named-struct-initializers.patch +5abe74bf8f38f45068f43f12b52cfc4b 0003-Fix-manpage-to-use-csw-pathes.patch 02019af22d048085f3006de791a0c95e alloca.patch 592a1fe77f3844d7748adbab6357ee25 chkconfig-1.3.30c.tar.gz Added: csw/mgar/pkg/chkconfig/trunk/files/0003-Fix-manpage-to-use-csw-pathes.patch =================================================================== --- csw/mgar/pkg/chkconfig/trunk/files/0003-Fix-manpage-to-use-csw-pathes.patch (rev 0) +++ csw/mgar/pkg/chkconfig/trunk/files/0003-Fix-manpage-to-use-csw-pathes.patch 2010-02-04 18:04:02 UTC (rev 8349) @@ -0,0 +1,47 @@ +From 0e158bd176da683072207633e7b2dddf68e33d7c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 4 Feb 2010 18:57:15 +0100 +Subject: [PATCH] Fix manpage to use csw pathes + +--- + alternatives.8 | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/alternatives.8 b/alternatives.8 +index 5598bf7..74e3783 100644 +--- a/alternatives.8 ++++ b/alternatives.8 +@@ -184,12 +184,12 @@ accessible via a generic name using the alternatives system. + .TP + alternatives directory + A directory, by default +-.IR /etc/alternatives , ++.IR /etc/opt/csw/alternatives , + containing the symlinks. + .TP + administrative directory + A directory, by default +-.IR /var/lib/alternatives , ++.IR /var/opt/csw/alternatives , + containing + .BR alternatives ' + state information. +@@ -352,13 +352,13 @@ what other alternatives are available + and the highest priority alternative currently installed. + .SH FILES + .TP +-.I /etc/alternatives/ ++.I /etc/opt/csw/alternatives/ + The default alternatives directory. + Can be overridden by the + .B --altdir + option. + .TP +-.I /var/lib/alternatives/ ++.I /var/opt/csw/alternatives/ + The default administration directory. + Can be overridden by the + .B --admindir +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Feb 4 19:26:43 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 04 Feb 2010 18:26:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8350] csw/mgar/pkg/chkconfig/trunk/Makefile Message-ID: Revision: 8350 http://gar.svn.sourceforge.net/gar/?rev=8350&view=rev Author: dmichelsen Date: 2010-02-04 18:26:43 +0000 (Thu, 04 Feb 2010) Log Message: ----------- alternatives: Add base directories Modified Paths: -------------- csw/mgar/pkg/chkconfig/trunk/Makefile Modified: csw/mgar/pkg/chkconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/chkconfig/trunk/Makefile 2010-02-04 18:04:02 UTC (rev 8349) +++ csw/mgar/pkg/chkconfig/trunk/Makefile 2010-02-04 18:26:43 UTC (rev 8350) @@ -30,9 +30,16 @@ PKGFILES_CSWalternatives = .*alternatives.* CONFIGURE_ARGS = $(DIRPATHS) +# The pathes are hardcoded in the manpage. If you adjust them here +# make sure to adjust it too. CONFIGURE_ARGS += --with-alt-links-dir=/etc/opt/csw/alternatives CONFIGURE_ARGS += --with-alt-admin-dir=/var/opt/csw/alternatives TEST_TARGET = check include gar/category.mk + +post-merge: + ginstall -d $(PKGROOT)/etc/opt/csw/alternatives + ginstall -d $(PKGROOT)/var/opt/csw/alternatives + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Feb 4 23:03:56 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 04 Feb 2010 22:03:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[8351] csw/mgar/pkg Message-ID: Revision: 8351 http://gar.svn.sourceforge.net/gar/?rev=8351&view=rev Author: hson Date: 2010-02-04 22:03:56 +0000 (Thu, 04 Feb 2010) Log Message: ----------- openmpi: Initial commit Added Paths: ----------- csw/mgar/pkg/openmpi/ csw/mgar/pkg/openmpi/branches/ csw/mgar/pkg/openmpi/tags/ csw/mgar/pkg/openmpi/trunk/ csw/mgar/pkg/openmpi/trunk/Makefile csw/mgar/pkg/openmpi/trunk/checksums csw/mgar/pkg/openmpi/trunk/files/ Property changes on: csw/mgar/pkg/openmpi/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/openmpi/trunk/Makefile =================================================================== --- csw/mgar/pkg/openmpi/trunk/Makefile (rev 0) +++ csw/mgar/pkg/openmpi/trunk/Makefile 2010-02-04 22:03:56 UTC (rev 8351) @@ -0,0 +1,20 @@ +GARNAME = openmpi +GARVERSION = 1.4.1 +CATEGORIES = lib + +DESCRIPTION = A High Performance Message Passing Library +define BLURB + Long description +endef + +MASTER_SITES = http://www.open-mpi.org/software/ompi/v$(GNOME_SUBV)/downloads/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# openmpi requires sparcv8plus +REQUESTED_ISAS = sparcv8plus sparcv9 i386 amd64 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/openmpi/trunk/checksums =================================================================== --- csw/mgar/pkg/openmpi/trunk/checksums (rev 0) +++ csw/mgar/pkg/openmpi/trunk/checksums 2010-02-04 22:03:56 UTC (rev 8351) @@ -0,0 +1 @@ +28a820c85e02973809df881fdeddd15e openmpi-1.4.1.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 Fri Feb 5 03:44:03 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 05 Feb 2010 02:44:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[8352] csw/mgar/pkg Message-ID: Revision: 8352 http://gar.svn.sourceforge.net/gar/?rev=8352&view=rev Author: bdwalton Date: 2010-02-05 02:44:03 +0000 (Fri, 05 Feb 2010) Log Message: ----------- ruby19: base commit for ruby 1.9 Added Paths: ----------- csw/mgar/pkg/ruby19/ csw/mgar/pkg/ruby19/branches/ csw/mgar/pkg/ruby19/tags/ csw/mgar/pkg/ruby19/trunk/ csw/mgar/pkg/ruby19/trunk/Makefile csw/mgar/pkg/ruby19/trunk/checksums csw/mgar/pkg/ruby19/trunk/files/ Property changes on: csw/mgar/pkg/ruby19/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/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-02-05 02:44:03 UTC (rev 8352) @@ -0,0 +1,25 @@ +GARNAME = ruby19 +GARVERSION = 1.9.1 +PATCHLEVEL = p376 +CATEGORIES = lang + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/1.9/ +DISTFILES = ruby-$(GARVERSION)-$(PATCHLEVEL).tar.gz + +# We define upstream file regex so we can be notifed of new upstream +# software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of +# MASTER_SITES, then uncomment the next line. Otherwise it is set by +# default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/ruby19/trunk/checksums =================================================================== 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 Feb 5 03:52:59 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 05 Feb 2010 02:52:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8353] csw/mgar/pkg/ruby19/trunk/checksums Message-ID: Revision: 8353 http://gar.svn.sourceforge.net/gar/?rev=8353&view=rev Author: bdwalton Date: 2010-02-05 02:52:59 +0000 (Fri, 05 Feb 2010) Log Message: ----------- ruby19: add checksums Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/checksums Modified: csw/mgar/pkg/ruby19/trunk/checksums =================================================================== --- csw/mgar/pkg/ruby19/trunk/checksums 2010-02-05 02:44:03 UTC (rev 8352) +++ csw/mgar/pkg/ruby19/trunk/checksums 2010-02-05 02:52:59 UTC (rev 8353) @@ -0,0 +1 @@ +ebb20550a11e7f1a2fbd6fdec2a3e0a3 ruby-1.9.1-p376.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Feb 5 10:18:48 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Feb 2010 09:18:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8354] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8354 http://gar.svn.sourceforge.net/gar/?rev=8354&view=rev Author: wahwah Date: 2010-02-05 09:18:48 +0000 (Fri, 05 Feb 2010) Log Message: ----------- mGAR v2: pkginfo, adding the OPENCSW_CATALOGNAME field for later use by checkpkg Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-05 02:52:59 UTC (rev 8353) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-05 09:18:48 UTC (rev 8354) @@ -540,8 +540,9 @@ echo "PSTAMP=$(LOGNAME)@$(shell hostname)-$(shell date '+%Y%m%d%H%M%S')"; \ echo "CLASSES=$(call pkgvar,SPKG_CLASSES,$*)"; \ echo "HOTLINE=http://www.opencsw.org/bugtrack/"; \ + echo "OPENCSW_CATALOGNAME=$(call catalogname,$*)"; \ + echo "OPENCSW_MODE64=$(call mode64,$*)"; \ echo "OPENCSW_REPOSITORY=$(call _URL)@$(call _REVISION)"; \ - echo "OPENCSW_MODE64=$(call mode64,$*)"; \ ) >$@ 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 Feb 5 10:28:34 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Feb 2010 09:28:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8355] csw/mgar/pkg/pysqlite2/trunk/Makefile Message-ID: Revision: 8355 http://gar.svn.sourceforge.net/gar/?rev=8355&view=rev Author: wahwah Date: 2010-02-05 09:28:33 +0000 (Fri, 05 Feb 2010) Log Message: ----------- pysqlite2: Adding LICENSE = LICENSE (a wish: can it be autodetected?) Modified Paths: -------------- csw/mgar/pkg/pysqlite2/trunk/Makefile Modified: csw/mgar/pkg/pysqlite2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysqlite2/trunk/Makefile 2010-02-05 09:18:48 UTC (rev 8354) +++ csw/mgar/pkg/pysqlite2/trunk/Makefile 2010-02-05 09:28:33 UTC (rev 8355) @@ -33,6 +33,8 @@ INSTALL_ARGS += --root=$(DESTDIR) INSTALL_ARGS += --prefix=$(prefix) +LICENSE = LICENSE + 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 wahwah at users.sourceforge.net Fri Feb 5 10:57:28 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Feb 2010 09:57:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[8356] csw/mgar/pkg/krb5/trunk Message-ID: Revision: 8356 http://gar.svn.sourceforge.net/gar/?rev=8356&view=rev Author: wahwah Date: 2010-02-05 09:57:28 +0000 (Fri, 05 Feb 2010) Log Message: ----------- krb5: Fixed the linking against /opt/csw/lib problem, fixed 'isblank' problem, fixed -lintlt problem with kproplog, it builds fine for sparcv8 Modified Paths: -------------- csw/mgar/pkg/krb5/trunk/Makefile csw/mgar/pkg/krb5/trunk/checksums Added Paths: ----------- csw/mgar/pkg/krb5/trunk/files/0002-libintl-for-kproplog.patch csw/mgar/pkg/krb5/trunk/files/0003-local-libraries-first-when-linking.patch csw/mgar/pkg/krb5/trunk/files/0004-libkdb_ldap-isblank-define.patch csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.patch Removed Paths: ------------- csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.diff Modified: csw/mgar/pkg/krb5/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5/trunk/Makefile 2010-02-05 09:28:33 UTC (rev 8355) +++ csw/mgar/pkg/krb5/trunk/Makefile 2010-02-05 09:57:28 UTC (rev 8356) @@ -17,7 +17,10 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-signed.tar -PATCHFILES = patch-man2html-perl.diff +PATCHFILES = patch-man2html-perl.patch +PATCHFILES += 0002-libintl-for-kproplog.patch +PATCHFILES += 0003-local-libraries-first-when-linking.patch +PATCHFILES += 0004-libkdb_ldap-isblank-define.patch BUILD_DEP_PKGS = CSWtcl Modified: csw/mgar/pkg/krb5/trunk/checksums =================================================================== --- csw/mgar/pkg/krb5/trunk/checksums 2010-02-05 09:28:33 UTC (rev 8355) +++ csw/mgar/pkg/krb5/trunk/checksums 2010-02-05 09:57:28 UTC (rev 8356) @@ -1,2 +1,5 @@ -9f7b3402b4731a7fa543db193bf1b564 download/krb5-1.7-signed.tar -6c2c7718f024c85f66fdc26398090c23 download/patch-man2html-perl.diff +ddcb250250f96a457798b469b3a813e8 0002-libintl-for-kproplog.patch +2f4671672bce98d1157b49ba7b6846c3 0003-local-libraries-first-when-linking.patch +f0bec7c3f02810838559e1dd764b111e 0004-libkdb_ldap-isblank-define.patch +9f7b3402b4731a7fa543db193bf1b564 krb5-1.7-signed.tar +6c2c7718f024c85f66fdc26398090c23 patch-man2html-perl.patch Added: csw/mgar/pkg/krb5/trunk/files/0002-libintl-for-kproplog.patch =================================================================== --- csw/mgar/pkg/krb5/trunk/files/0002-libintl-for-kproplog.patch (rev 0) +++ csw/mgar/pkg/krb5/trunk/files/0002-libintl-for-kproplog.patch 2010-02-05 09:57:28 UTC (rev 8356) @@ -0,0 +1,25 @@ +From 7aa639db0238c894c12d8d9728e684b3ddbdc5dc Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 5 Feb 2010 10:31:20 +0100 +Subject: [PATCH 2/4] libintl for kproplog + +--- + src/slave/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in +index 6ff3c71..31f6844 100644 +--- a/src/slave/Makefile.in ++++ b/src/slave/Makefile.in +@@ -27,7 +27,7 @@ kpropd: $(SERVEROBJS) $(KADMCLNT_DEPLIBS) $(KDB5_DEPLIB) $(KRB5_BASE_DEPLIBS) $( + $(CC_LINK) -o kpropd $(SERVEROBJS) $(KADMCLNT_LIBS) $(KDB5_LIB) $(KRB5_BASE_LIBS) $(APPUTILS_LIB) @LIBUTIL@ + + kproplog: $(LOGOBJS) +- $(CC_LINK) -o kproplog $(LOGOBJS) $(KADMSRV_LIBS) $(KRB5_BASE_LIBS) ++ $(CC_LINK) -o kproplog $(LOGOBJS) $(KADMSRV_LIBS) $(KRB5_BASE_LIBS) -lintl + + install:: + for f in kprop kpropd kproplog; do \ +-- +1.6.6 + Added: csw/mgar/pkg/krb5/trunk/files/0003-local-libraries-first-when-linking.patch =================================================================== --- csw/mgar/pkg/krb5/trunk/files/0003-local-libraries-first-when-linking.patch (rev 0) +++ csw/mgar/pkg/krb5/trunk/files/0003-local-libraries-first-when-linking.patch 2010-02-05 09:57:28 UTC (rev 8356) @@ -0,0 +1,25 @@ +From 3dca19491123f37817e84742ff802ec07cde24e7 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 5 Feb 2010 10:32:00 +0100 +Subject: [PATCH 3/4] local libraries first when linking + +--- + src/config/shlib.conf | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/config/shlib.conf b/src/config/shlib.conf +index 6972ff0..f680210 100644 +--- a/src/config/shlib.conf ++++ b/src/config/shlib.conf +@@ -373,7 +373,7 @@ mips-*-netbsd*) + else + PICFLAGS=-KPIC + # Solaris cc doesn't default to stuffing the SONAME field... +- LDCOMBINE='$(CC) $(CFLAGS) -dy -G -z text -h $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) $$initfini' ++ LDCOMBINE='$(CC) $(PROG_LIBPATH) $(CFLAGS) -dy -G -z text -h $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) $$initfini' + # + case $krb5_cv_host in + *-*-solaris2.[1-7] | *-*-solaris2.[1-7].*) +-- +1.6.6 + Added: csw/mgar/pkg/krb5/trunk/files/0004-libkdb_ldap-isblank-define.patch =================================================================== --- csw/mgar/pkg/krb5/trunk/files/0004-libkdb_ldap-isblank-define.patch (rev 0) +++ csw/mgar/pkg/krb5/trunk/files/0004-libkdb_ldap-isblank-define.patch 2010-02-05 09:57:28 UTC (rev 8356) @@ -0,0 +1,25 @@ +From 468a5bf5227b847f3975fa1f55d3fa2b7424f819 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 5 Feb 2010 10:34:03 +0100 +Subject: [PATCH 4/4] libkdb_ldap isblank define + +--- + src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c +index 08a87fe..20a4faa 100644 +--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c ++++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c +@@ -40,7 +40,7 @@ + #include + + #if defined(NEED_ISBLANK_PROTO) && !defined(isblank) +-extern int isblank(); ++# define isblank(c) ((c) == ' ' || (c) == '\t') + #endif + + krb5_error_code +-- +1.6.6 + Deleted: csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.diff =================================================================== --- csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.diff 2010-02-05 09:28:33 UTC (rev 8355) +++ csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.diff 2010-02-05 09:57:28 UTC (rev 8356) @@ -1,9 +0,0 @@ ---- krb5-1.6.3-orig/doc/man2html 2005-08-26 01:15:24.000000000 +0200 -+++ krb5-1.6.3/doc/man2html 2008-02-26 14:21:08.431774000 +0100 -@@ -1,5 +1,4 @@ --#!/usr/athena/bin/perl --#!/usr/local/bin/perl -+#!/usr/bin/perl - ##---------------------------------------------------------------------------## - ## File: - ## @(#) man2html 1.2 97/08/12 12:57:30 @(#) Copied: csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.patch (from rev 8347, csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.diff) =================================================================== --- csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.patch (rev 0) +++ csw/mgar/pkg/krb5/trunk/files/patch-man2html-perl.patch 2010-02-05 09:57:28 UTC (rev 8356) @@ -0,0 +1,9 @@ +--- krb5-1.6.3-orig/doc/man2html 2005-08-26 01:15:24.000000000 +0200 ++++ krb5-1.6.3/doc/man2html 2008-02-26 14:21:08.431774000 +0100 +@@ -1,5 +1,4 @@ +-#!/usr/athena/bin/perl +-#!/usr/local/bin/perl ++#!/usr/bin/perl + ##---------------------------------------------------------------------------## + ## File: + ## @(#) man2html 1.2 97/08/12 12:57:30 @(#) 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 Feb 5 11:29:21 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Feb 2010 10:29:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8357] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8357 http://gar.svn.sourceforge.net/gar/?rev=8357&view=rev Author: dmichelsen Date: 2010-02-05 10:29:21 +0000 (Fri, 05 Feb 2010) Log Message: ----------- mGAR v2: Add sanity checks for r8335 Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-05 09:57:28 UTC (rev 8356) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-05 10:29:21 UTC (rev 8357) @@ -67,6 +67,13 @@ GARPKG_v2 = CSWgar-v2 RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) +# Sanity checks for r8335 +$(if $(NO_ISAEXEC),$(error The deprecated variable 'NO_ISAEXEC' is defined, please replace it with NOISAEXEC)) +$(if $(PREREQUISITE_PKGS),$(error The deprecated variable 'PREREQUISITE_PKGS' is defined, please replace it with BUILD_DEP_PKGS)) +$(foreach P,$(SPKG_SPECS),$(if $(PREREQUISITE_PKGS_$P),$(error The deprecated variable 'PREREQUISITE_PKGS_$P' is defined, please replace it with BUILD_DEP_PKGS_$P))) +$(if $(REQUIRED_PKGS),$(error The deprecated variable 'REQUIRED_PKGS' is defined, please replace it with RUNTIME_DEP_PKGS)) +$(foreach P,$(SPKG_SPECS),$(if $(REQUIRED_PKGS_$P),$(error The deprecated variable 'REQUIRED_PACKAGES_$P' is defined, please replace it with RUNTIME_DEP_PKGS_$P))) + _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) # pkgname - Get the name of a package from a gspec-name or package-name This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Feb 5 14:31:11 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 05 Feb 2010 13:31:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8358] csw/mgar/pkg/clamav/trunk/Makefile Message-ID: Revision: 8358 http://gar.svn.sourceforge.net/gar/?rev=8358&view=rev Author: bonivart Date: 2010-02-05 13:31:10 +0000 (Fri, 05 Feb 2010) Log Message: ----------- clamav: add Sun bug id regarding compiler issues Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2010-02-05 10:29:21 UTC (rev 8357) +++ csw/mgar/pkg/clamav/trunk/Makefile 2010-02-05 13:31:10 UTC (rev 8358) @@ -36,6 +36,9 @@ PATCHFILES = CSWclamav.freshclam.conf.p PATCHFILES += CSWclamav.clamd.conf.p +# Seems to be a compiler bug forcing us to use -xO2 instead of -xO3 +# http://bugs.sun.com/view_bug.do?bug_id=6683773 +# New bug filed since the above one isn't really solved, no bug id yet OPT_FLAGS_SOS = -xO2 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Feb 5 15:15:28 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Feb 2010 14:15:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[8359] csw/mgar/pkg/krb5/trunk/Makefile Message-ID: Revision: 8359 http://gar.svn.sourceforge.net/gar/?rev=8359&view=rev Author: dmichelsen Date: 2010-02-05 14:15:27 +0000 (Fri, 05 Feb 2010) Log Message: ----------- krb5: Add license Modified Paths: -------------- csw/mgar/pkg/krb5/trunk/Makefile Modified: csw/mgar/pkg/krb5/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5/trunk/Makefile 2010-02-05 13:31:10 UTC (rev 8358) +++ csw/mgar/pkg/krb5/trunk/Makefile 2010-02-05 14:15:27 UTC (rev 8359) @@ -45,6 +45,8 @@ RUNTIME_DEP_PKGS_CSWkrb5libdev = CSWkrb5lib RUNTIME_DEP_PKGS_CSWkrb5user = CSWkrb5lib +LICENSE = doc/copyright.texinfo + CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure 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 Fri Feb 5 15:50:23 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 05 Feb 2010 14:50:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8360] csw/mgar/pkg/spamassassin/trunk/Makefile Message-ID: Revision: 8360 http://gar.svn.sourceforge.net/gar/?rev=8360&view=rev Author: bonivart Date: 2010-02-05 14:50:23 +0000 (Fri, 05 Feb 2010) Log Message: ----------- spamassassin: migrateconf changes Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2010-02-05 14:15:27 UTC (rev 8359) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2010-02-05 14:50:23 UTC (rev 8360) @@ -32,7 +32,8 @@ USERGROUP = /etc/opt/csw/pkg/CSWspamassassin/cswusergroup INITSMF = /etc/opt/csw/init.d/cswspamd -MIGRATE_FILES = /opt/csw/etc/spamassassin +MIGRATE_FILES = init.pre local.cf v310.pre v312.pre v320.pre +MIGRATE_SOURCE_DIR = /opt/csw/etc/spamassassin MIGRATE_DEST_DIR = /etc/opt/csw/spamassassin CONFIGURE_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 Fri Feb 5 16:20:09 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Feb 2010 15:20:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8361] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8361 http://gar.svn.sourceforge.net/gar/?rev=8361&view=rev Author: dmichelsen Date: 2010-02-05 15:20:09 +0000 (Fri, 05 Feb 2010) Log Message: ----------- mGAR v2: Fix bug which ignores MIGRATE_SOURCE_DIR and MIGRATE_DEST_DIR Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-05 14:50:23 UTC (rev 8360) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-05 15:20:09 UTC (rev 8361) @@ -608,8 +608,8 @@ @echo "X: $(MIGRATE_FILES_$*) Y: $(MIGRATE_FILES)" $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* $(_DBG)(echo "MIGRATE_FILES=\"$(or $(MIGRATE_FILES_$*),$(MIGRATE_FILES))\"";\ - $(if $(MIGRATE_SOURCE_DIR_$*),echo "SOURCE_DIR___default__=\"$(MIGRATE_SOURCE_DIR_$*)\"";)\ - $(if $(MIGRATE_DEST_DIR_$*),echo "DEST_DIR___default__=\"$(MIGRATE_DEST_DIR_$*)\"";)\ + $(if $(or $(MIGRATE_SOURCE_DIR_$*),$(MIGRATE_SOURCE_DIR)),echo "SOURCE_DIR___default__=\"$(or $(MIGRATE_SOURCE_DIR_$*),$(MIGRATE_SOURCE_DIR))\"";)\ + $(if $(or $(MIGRATE_DEST_DIR_$*),$(MIGRATE_DEST_DIR)),echo "DEST_DIR___default__=\"$(or $(MIGRATE_DEST_DIR_$*),$(MIGRATE_DEST_DIR))\"";)\ $(foreach F,$(or $(MIGRATE_FILES_$*),$(MIGRATE_FILES)),\ $(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst .,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\ $(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst .,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Feb 5 18:01:52 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 05 Feb 2010 17:01:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8362] csw/mgar/pkg Message-ID: Revision: 8362 http://gar.svn.sourceforge.net/gar/?rev=8362&view=rev Author: hson Date: 2010-02-05 17:01:51 +0000 (Fri, 05 Feb 2010) Log Message: ----------- expect: Initial commit Added Paths: ----------- csw/mgar/pkg/expect/ csw/mgar/pkg/expect/Makefile csw/mgar/pkg/expect/branches/ csw/mgar/pkg/expect/tags/ csw/mgar/pkg/expect/trunk/ csw/mgar/pkg/expect/trunk/Makefile csw/mgar/pkg/expect/trunk/checksums csw/mgar/pkg/expect/trunk/files/ csw/mgar/pkg/expect/trunk/files/expect-5.39.0-libdir.patch csw/mgar/pkg/expect/trunk/files/expect-5.42.1-missing-includes.patch csw/mgar/pkg/expect/trunk/files/expect-5.42.1-multilib.patch csw/mgar/pkg/expect/trunk/files/expect-5.43.0-avoid-tcl-internals-1.patch csw/mgar/pkg/expect/trunk/files/expect-5.43.0-missing-includes.patch csw/mgar/pkg/expect/trunk/files/expect-5.43.0-multilib.patch csw/mgar/pkg/expect/trunk/files/expect-5.44.1-destdir.patch csw/mgar/pkg/expect/trunk/files/expect-5.44.1-gfbsd.patch csw/mgar/pkg/expect/trunk/files/expect.m4 Added: csw/mgar/pkg/expect/Makefile =================================================================== --- csw/mgar/pkg/expect/Makefile (rev 0) +++ csw/mgar/pkg/expect/Makefile 2010-02-05 17:01:51 UTC (rev 8362) @@ -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/expect/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/expect/trunk/Makefile =================================================================== --- csw/mgar/pkg/expect/trunk/Makefile (rev 0) +++ csw/mgar/pkg/expect/trunk/Makefile 2010-02-05 17:01:51 UTC (rev 8362) @@ -0,0 +1,71 @@ +GARNAME = expect +GARVERSION = 5.43 +CATEGORIES = utils + +DESCRIPTION = Tool for automating interactive applications +define BLURB +Expect is a tool for automating interactive applications such as telnet, ftp, passwd, fsck, rlogin, tip, etc. Expect really makes this stuff trivial. Expect is also useful for testing these same applications. And by adding Tk, you can also wrap interactive applications in X11 GUIs. + +Expect can make easy all sorts of tasks that are prohibitively difficult with anything else. You will find that Expect is an absolutely invaluable tool - using it, you will be able to automate tasks that you've never even thought of before - and you'll be able to do this automation quickly and easily. +endef + +# For some reason upstream have recalled 5.44.1 and has 5.43 as primary on +# homepage as expect.tar.gz +MASTER_SITES = http://expect.nist.gov/ +DISTNAME = $(GARNAME)-$(GARVERSION) +DISTFILES = $(GARNAME).tar.gz +DISTFILES += expect.m4 + +PATCHFILES += expect-5.39.0-libdir.patch +#PATCHFILES += expect-5.42.1-missing-includes.patch +#PATCHFILES += expect-5.42.1-multilib.patch +PATCHFILES += expect-5.43.0-avoid-tcl-internals-1.patch +PATCHFILES += expect-5.43.0-missing-includes.patch +PATCHFILES += expect-5.43.0-multilib.patch +#PATCHFILES += expect-5.44.1-destdir.patch +#PATCHFILES += expect-5.44.1-gfbsd.patch + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared +CONFIGURE_ARGS += --with-tcl=/opt/csw/lib --with-tk=/opt/csw/lib +CONFIGURE_ARGS += --with-tclinclude=/export/home/hson/dev/mgar/pkg/tcl/trunk/work/solaris8-sparc/./build-isa-sparcv8/tcl8.5.7/generic/ +CONFIGURE_ARGS += --with-tkinclude=/export/home/hson/dev/mgar/pkg/tk/trunk/work/solaris8-sparc/./build-isa-sparcv8/tk8.5.7/generic/ + +TEST_TARGET = + +include gar/category.mk + +pre-configure-modulated: + ( cd $(WORKSRC); mv ../expect.m4 .; ) + ( cd $(WORKSRC); \ + gsed -i.orig 's#/usr/local/bin#/opt/csw/bin#' expect.man ; \ + gsed -i.orig 's#/usr/local/bin#/opt/csw/bin#' expectk.man ; \ + ) + #stops any example scripts being installed by default + ( cd $(WORKSRC); \ + gsed -i.orig \ + -e '/^install:/s/install-libraries //' \ + -e 's/^SCRIPTS_MANPAGES = /_&/' \ + Makefile.in ; \ + ) + #fixes "TCL_REG_BOSONLY undeclared" error due to a change in tcl8.5 + ( cd $(WORKSRC); \ + gsed -i.orig -e 's/^#include "tcl.h"/#include "tclInt.h"/' \ + exp_inter.c exp_command.c ; \ + ) + #fix missing define of HAVE_UNISTD_H in Dbg.c + ( cd $(WORKSRC); \ + gsed -i.orig -e 's/^\(#include \)/\1\n#include "expect_cf.h"/' \ + Dbg.c ; \ + ) +# @( cd $(WORKSRC); aclocal;autoconf) + @$(MAKECOOKIE) + +configure-%/configure: + @echo " ==> Running configure in $*" + cd $* && $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) + @$(MAKECOOKIE) Added: csw/mgar/pkg/expect/trunk/checksums =================================================================== --- csw/mgar/pkg/expect/trunk/checksums (rev 0) +++ csw/mgar/pkg/expect/trunk/checksums 2010-02-05 17:01:51 UTC (rev 8362) @@ -0,0 +1,7 @@ +c458386d5502fab2b49da03d16fb108c expect-5.39.0-libdir.patch +5661004ca23ddc9592f488142367c2f5 expect-5.43.0-avoid-tcl-internals-1.patch +3d67a79c1d7790c7e49b5df7f57b0290 expect-5.43.0-missing-includes.patch +2103ff302f6e8a0dd748772f6512b3a5 expect-5.43.0-multilib.patch +af7966f18f7ebc7ec48b7a6e095e90ff expect-5.44.1-destdir.patch +595b7a7c63f7ddb42e19c2537bb2891b expect.m4 +43e1dc0e0bc9492cf2e1a6f59f276bc3 expect.tar.gz Added: csw/mgar/pkg/expect/trunk/files/expect-5.39.0-libdir.patch =================================================================== --- csw/mgar/pkg/expect/trunk/files/expect-5.39.0-libdir.patch (rev 0) +++ csw/mgar/pkg/expect/trunk/files/expect-5.39.0-libdir.patch 2010-02-05 17:01:51 UTC (rev 8362) @@ -0,0 +1,11 @@ +--- expect-5.39/Makefile.in.libdir 2003-07-30 00:46:51.000000000 +0200 ++++ expect-5.39/Makefile.in 2003-11-17 17:54:52.000000000 +0100 +@@ -316,7 +316,7 @@ + CFLAGS_INT = $(MH_CFLAGS) $(CPPFLAGS) $(XCFLAGS) + + LIB_INSTALL_DIR = $(tcl_libdir) +-LIB_RUNTIME_DIR = $(tcl_libdir) ++LIB_RUNTIME_DIR = $(subst $(INSTALL_ROOT),,$(tcl_libdir)) + # I don't understand why Tcl splits these up, but it does. LIB_RUNTIME_DIR + # can appear as part of the LD_SEARCH_FLAGS inherited by configure. + Added: csw/mgar/pkg/expect/trunk/files/expect-5.42.1-missing-includes.patch =================================================================== --- csw/mgar/pkg/expect/trunk/files/expect-5.42.1-missing-includes.patch (rev 0) +++ csw/mgar/pkg/expect/trunk/files/expect-5.42.1-missing-includes.patch 2010-02-05 17:01:51 UTC (rev 8362) @@ -0,0 +1,33 @@ +diff -urN expect-5.42.orig/exp_glob.c expect-5.42/exp_glob.c +--- expect-5.42.orig/exp_glob.c 2009-06-02 00:07:02.429807485 -0400 ++++ expect-5.42/exp_glob.c 2009-06-02 00:09:05.039817979 -0400 +@@ -11,6 +11,7 @@ + + */ + ++#include + #include "expect_cf.h" + #include "tcl.h" + #include "exp_int.h" +diff -urN expect-5.42.orig/exp_main_exp.c expect-5.42/exp_main_exp.c +--- expect-5.42.orig/exp_main_exp.c 2009-06-02 00:07:02.429807485 -0400 ++++ expect-5.42/exp_main_exp.c 2009-06-02 00:08:09.867365455 -0400 +@@ -9,6 +9,7 @@ + + #include "expect_cf.h" + #include ++#include + #include "tcl.h" + #include "expect_tcl.h" + +diff -urN expect-5.42.orig/pty_termios.c expect-5.42/pty_termios.c +--- expect-5.42.orig/pty_termios.c 2009-06-02 00:07:02.449818499 -0400 ++++ expect-5.42/pty_termios.c 2009-06-02 00:08:41.878505396 -0400 +@@ -8,6 +8,7 @@ + */ + + #include ++#include + #include + + #if defined(SIGCLD) && !defined(SIGCHLD) Added: csw/mgar/pkg/expect/trunk/files/expect-5.42.1-multilib.patch =================================================================== --- csw/mgar/pkg/expect/trunk/files/expect-5.42.1-multilib.patch (rev 0) +++ csw/mgar/pkg/expect/trunk/files/expect-5.42.1-multilib.patch 2010-02-05 17:01:51 UTC (rev 8362) @@ -0,0 +1,11 @@ +--- expect-5.42/configure.in.orig 2004-12-21 03:02:36.095170881 -0800 ++++ expect-5.42/configure.in 2004-12-21 03:03:08.987170537 -0800 +@@ -1141,7 +1141,7 @@ + fi + + EXP_BUILD_LIB_SPEC="-L`pwd` -lexpect${EXP_LIB_VERSION}${DBGX}" +-EXP_LIB_SPEC="-L\${INSTALL_ROOT}\${exec_prefix}/lib -lexpect${EXP_LIB_VERSION}${DBGX}" ++EXP_LIB_SPEC="-L\${libdir} -lexpect${EXP_LIB_VERSION}${DBGX}" + EXP_UNSHARED_LIB_FILE=libexpect${EXP_LIB_VERSION}${DBGX}.a + + # The TCL_SHARED_LIB_SUFFIX macro below relies on the DBGX macro, Added: csw/mgar/pkg/expect/trunk/files/expect-5.43.0-avoid-tcl-internals-1.patch =================================================================== --- csw/mgar/pkg/expect/trunk/files/expect-5.43.0-avoid-tcl-internals-1.patch (rev 0) +++ csw/mgar/pkg/expect/trunk/files/expect-5.43.0-avoid-tcl-internals-1.patch 2010-02-05 17:01:51 UTC (rev 8362) @@ -0,0 +1,100 @@ +Submitted By: Bryan Kadzban +Date: 2008-01-12 +Initial Package Version: 5.43 +Upstream status: Not Submitted - Test Version +Origin: LFS ticket 2126 (http://wiki.linuxfromscratch.org/lfs/ticket/2126) +Description: Removes references to functions that Tcl 8.5 no longer exposes. + +diff -Naur expect-5.43/exp_command.c expect-5.43-patched/exp_command.c +--- expect-5.43/exp_command.c 2004-08-20 13:18:01.000000000 -0400 ++++ expect-5.43-patched/exp_command.c 2008-01-12 11:42:45.000000000 -0500 +@@ -2265,6 +2265,8 @@ + /*NOTREACHED*/ + } + ++static struct exp_cmd_data cmd_data[]; ++ + /*ARGSUSED*/ + static int + Exp_CloseObjCmd(clientData, interp, objc, objv) +@@ -2311,12 +2313,23 @@ + /* Historical note: we used "close" long before there was a */ + /* Tcl builtin by the same name. */ + ++ /* The code that registered this function as the handler for */ ++ /* the "close" command stored away the old handler in the */ ++ /* exp_cmd_data for the "close" command. */ ++ ++ struct exp_cmd_data *cmd_ptr; + Tcl_CmdInfo info; ++ ++ for(cmd_ptr = &cmd_data[0]; cmd_ptr->name; cmd_ptr++) { ++ if(strncmp(cmd_ptr->name, "close", 5) == 0) ++ break; ++ } ++ + Tcl_ResetResult(interp); + if (0 == Tcl_GetCommandInfo(interp,"close",&info)) { + info.clientData = 0; + } +- return(Tcl_CloseObjCmd(info.clientData,interp,objc_orig,objv_orig)); ++ return(cmd_ptr->old_objProc(info.clientData,interp,objc_orig,objv_orig)); + } + + if (chanName) { +@@ -2961,7 +2974,10 @@ + /* if successful (i.e., TCL_RETURN is returned) */ + /* modify the result, so that we will handle it specially */ + +- int result = Tcl_ReturnObjCmd(clientData,interp,objc,objv); ++ Tcl_CmdInfo info; ++ Tcl_GetCommandInfo(interp, "return", &info); ++ ++ int result = info.objProc(clientData,interp,objc,objv); + if (result == TCL_RETURN) + result = EXP_TCL_RETURN; + return result; +@@ -3062,8 +3078,7 @@ + + for (;c->name;c++) { + /* if already defined, don't redefine */ +- if ((c->flags & EXP_REDEFINE) || +- !(Tcl_FindHashEntry(&globalNsPtr->cmdTable,c->name) || ++ if (!(Tcl_FindHashEntry(&globalNsPtr->cmdTable,c->name) || + Tcl_FindHashEntry(&currNsPtr->cmdTable,c->name))) { + if (c->objproc) + Tcl_CreateObjCommand(interp,c->name, +@@ -3072,6 +3087,21 @@ + Tcl_CreateCommand(interp,c->name,c->proc, + c->data,exp_deleteProc); + } ++ else if (c->flags & EXP_REDEFINE) { /* unless the REDEFINE flag is present */ ++ Tcl_CmdInfo info; ++ ++ if (Tcl_GetCommandInfo(interp, c->name, &info)) { ++ c->old_proc = info.proc; ++ c->old_objProc = info.objProc; ++ } ++ ++ if (c->objproc) ++ Tcl_CreateObjCommand(interp,c->name, ++ c->objproc,c->data,exp_deleteObjProc); ++ else ++ Tcl_CreateCommand(interp,c->name,c->proc, ++ c->data,exp_deleteProc); ++ } + if (!(c->name[0] == 'e' && + c->name[1] == 'x' && + c->name[2] == 'p') +diff -Naur expect-5.43/exp_command.h expect-5.43-patched/exp_command.h +--- expect-5.43/exp_command.h 2008-01-12 11:44:11.000000000 -0500 ++++ expect-5.43-patched/exp_command.h 2008-01-12 11:26:05.000000000 -0500 +@@ -297,6 +297,8 @@ + Tcl_CmdProc *proc; + ClientData data; + int flags; ++ Tcl_CmdProc *old_proc; /* these store the procedure for the old command, */ ++ Tcl_ObjCmdProc *old_objProc; /* if any */ + }; + + EXTERN void exp_create_commands _ANSI_ARGS_((Tcl_Interp *, Added: csw/mgar/pkg/expect/trunk/files/expect-5.43.0-missing-includes.patch =================================================================== --- csw/mgar/pkg/expect/trunk/files/expect-5.43.0-missing-includes.patch (rev 0) +++ csw/mgar/pkg/expect/trunk/files/expect-5.43.0-missing-includes.patch 2010-02-05 17:01:51 UTC (rev 8362) @@ -0,0 +1,44 @@ +diff -urpN expect-5.43.orig/exp_glob.c expect-5.43/exp_glob.c +--- expect-5.43.orig/exp_glob.c 2009-06-07 19:36:31.000000000 +0200 ++++ expect-5.43/exp_glob.c 2009-06-07 19:39:04.000000000 +0200 +@@ -11,6 +11,7 @@ would appreciate credit if this program + + */ + ++#include + #include "expect_cf.h" + #include "tcl.h" + #include "exp_int.h" +diff -urpN expect-5.43.orig/exp_main_exp.c expect-5.43/exp_main_exp.c +--- expect-5.43.orig/exp_main_exp.c 2009-06-07 19:36:31.000000000 +0200 ++++ expect-5.43/exp_main_exp.c 2009-06-07 19:37:39.000000000 +0200 +@@ -9,6 +9,7 @@ would appreciate credit if this program + + #include "expect_cf.h" + #include ++#include + #include "tcl.h" + #include "expect_tcl.h" + +diff -urpN expect-5.43.orig/exp_trap.c expect-5.43/exp_trap.c +--- expect-5.43.orig/exp_trap.c 2009-06-07 19:36:31.000000000 +0200 ++++ expect-5.43/exp_trap.c 2009-06-07 19:38:51.000000000 +0200 +@@ -11,6 +11,7 @@ would appreciate credit if this program + #include "expect_cf.h" + + #include ++#include + #include + #include + +diff -urpN expect-5.43.orig/pty_termios.c expect-5.43/pty_termios.c +--- expect-5.43.orig/pty_termios.c 2009-06-07 19:36:31.000000000 +0200 ++++ expect-5.43/pty_termios.c 2009-06-07 19:38:19.000000000 +0200 +@@ -8,6 +8,7 @@ would appreciate credit if you use this + */ + + #include ++#include + #include + + #if defined(SIGCLD) && !defined(SIGCHLD) Added: csw/mgar/pkg/expect/trunk/files/expect-5.43.0-multilib.patch =================================================================== --- csw/mgar/pkg/expect/trunk/files/expect-5.43.0-multilib.patch (rev 0) +++ csw/mgar/pkg/expect/trunk/files/expect-5.43.0-multilib.patch 2010-02-05 17:01:51 UTC (rev 8362) @@ -0,0 +1,11 @@ +--- expect-5.42/configure.in.orig 2004-12-21 03:02:36.095170881 -0800 ++++ expect-5.42/configure.in 2004-12-21 03:03:08.987170537 -0800 +@@ -1141,7 +1141,7 @@ + fi + + EXP_BUILD_LIB_SPEC="-L`pwd` -lexpect${EXP_LIB_VERSION}${DBGX}" +-EXP_LIB_SPEC="-L\${INSTALL_ROOT}\${exec_prefix}/lib -lexpect${EXP_LIB_VERSION}${DBGX}" ++EXP_LIB_SPEC="-L\${libdir} -lexpect${EXP_LIB_VERSION}${DBGX}" + EXP_UNSHARED_LIB_FILE=libexpect${EXP_LIB_VERSION}${DBGX}.a + + # The TCL_SHARED_LIB_SUFFIX macro below relies on the DBGX macro, Added: csw/mgar/pkg/expect/trunk/files/expect-5.44.1-destdir.patch =================================================================== --- csw/mgar/pkg/expect/trunk/files/expect-5.44.1-destdir.patch (rev 0) +++ csw/mgar/pkg/expect/trunk/files/expect-5.44.1-destdir.patch 2010-02-05 17:01:51 UTC (rev 8362) @@ -0,0 +1,21 @@ +--- Makefile.in.orig 2008-10-26 13:15:44.000000000 +0100 ++++ Makefile.in 2008-10-26 13:16:25.000000000 +0100 +@@ -256,14 +256,14 @@ install-doc: doc + @mkdir -p $(DESTDIR)$(mandir)/man3 + @echo "Installing documentation in $(DESTDIR)$(mandir)" + # install Expectk man page if present +- $(INSTALL_DATA) $(srcdir)/expectk.man $(mandir)/man1/expectk.1 ; \ ++ $(INSTALL_DATA) $(srcdir)/expectk.man $(DESTDIR)$(mandir)/man1/expectk.1 ; \ + # install Expect man page +- $(INSTALL_DATA) $(srcdir)/expect.man $(mandir)/man1/expect.1 ++ $(INSTALL_DATA) $(srcdir)/expect.man $(DESTDIR)$(mandir)/man1/expect.1 + # install man page for Expect and Expectk libraries +- $(INSTALL_DATA) $(srcdir)/libexpect.man $(mandir)/man3/libexpect.3 ++ $(INSTALL_DATA) $(srcdir)/libexpect.man $(DESTDIR)$(mandir)/man3/libexpect.3 + -for i in $(SCRIPT_MANPAGE_LIST) ; do \ + if [ -f $(srcdir)/example/$$i.man ] ; then \ +- $(INSTALL_DATA) $(srcdir)/example/$$i.man $(mandir)/man1/$$i.1 ; \ ++ $(INSTALL_DATA) $(srcdir)/example/$$i.man $(DESTDIR)$(mandir)/man1/$$i.1 ; \ + else true; fi ; \ + done + Added: csw/mgar/pkg/expect/trunk/files/expect-5.44.1-gfbsd.patch =================================================================== --- csw/mgar/pkg/expect/trunk/files/expect-5.44.1-gfbsd.patch (rev 0) +++ csw/mgar/pkg/expect/trunk/files/expect-5.44.1-gfbsd.patch 2010-02-05 17:01:51 UTC (rev 8362) @@ -0,0 +1,19 @@ +Index: expect-5.44.1/tclconfig/tcl.m4 +=================================================================== +--- expect-5.44.1.orig/tclconfig/tcl.m4 ++++ expect-5.44.1/tclconfig/tcl.m4 +@@ -1395,12 +1395,12 @@ dnl AC_CHECK_TOOL(AR, ar, :) + FreeBSD-*) + # FreeBSD 3.* and greater have ELF. + SHLIB_CFLAGS="-fPIC" +- SHLIB_LD="ld -Bshareable -x" ++ SHLIB_LD="${CC} -shared" + SHLIB_LD_LIBS='${LIBS}' + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" +- LDFLAGS="$LDFLAGS -export-dynamic" ++ LDFLAGS="$LDFLAGS -Wl,-export-dynamic" + LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + if test "${TCL_THREADS}" = "1" ; then + # The -pthread needs to go in the CFLAGS, not LIBS Added: csw/mgar/pkg/expect/trunk/files/expect.m4 =================================================================== --- csw/mgar/pkg/expect/trunk/files/expect.m4 (rev 0) +++ csw/mgar/pkg/expect/trunk/files/expect.m4 2010-02-05 17:01:51 UTC (rev 8362) @@ -0,0 +1,609 @@ +dnl written by Rob Savoye for Cygnus Support +dnl major rewriting for Tcl 7.5 by Don Libes + +dnl CY_AC_PATH_TCLCONFIG and CY_AC_LOAD_TCLCONFIG should be invoked +dnl (in that order) before any other TCL macros. Similarly for TK. + +dnl CYGNUS LOCAL: This gets the right posix flag for gcc +AC_DEFUN(CY_AC_TCL_LYNX_POSIX, +[AC_REQUIRE([AC_PROG_CC])AC_REQUIRE([AC_PROG_CPP]) +AC_MSG_CHECKING([if running LynxOS]) +AC_CACHE_VAL(ac_cv_os_lynx, +[AC_EGREP_CPP(yes, +[/* + * The old Lynx "cc" only defines "Lynx", but the newer one uses "__Lynx__" + */ +#if defined(__Lynx__) || defined(Lynx) +yes +#endif +], ac_cv_os_lynx=yes, ac_cv_os_lynx=no)]) +# +if test "$ac_cv_os_lynx" = "yes" ; then + AC_MSG_RESULT(yes) + AC_DEFINE(LYNX) + AC_MSG_CHECKING([whether -mposix or -X is available]) + AC_CACHE_VAL(ac_cv_c_posix_flag, + [AC_TRY_COMPILE(,[ + /* + * This flag varies depending on how old the compiler is. + * -X is for the old "cc" and "gcc" (based on 1.42). + * -mposix is for the new gcc (at least 2.5.8). + */ + #if defined(__GNUC__) && __GNUC__ >= 2 + choke me + #endif + ], ac_cv_c_posix_flag=" -mposix", ac_cv_c_posix_flag=" -X")]) + CC="$CC $ac_cv_c_posix_flag" + AC_MSG_RESULT($ac_cv_c_posix_flag) + else + AC_MSG_RESULT(no) +fi +]) + +# +# Sometimes the native compiler is a bogus stub for gcc or /usr/ucb/cc. This +# makes configure think it's cross compiling. If --target wasn't used, then +# we can't configure, so something is wrong. We don't use the cache +# here cause if somebody fixes their compiler install, we want this to work. +AC_DEFUN(CY_AC_C_WORKS, +[# If we cannot compile and link a trivial program, we can't expect anything to work +AC_MSG_CHECKING(whether the compiler ($CC) actually works) +AC_TRY_COMPILE(, [/* don't need anything here */], + c_compiles=yes, c_compiles=no) + +AC_TRY_LINK(, [/* don't need anything here */], + c_links=yes, c_links=no) + +if test x"${c_compiles}" = x"no" ; then + AC_MSG_ERROR(the native compiler is broken and won't compile.) +fi + +if test x"${c_links}" = x"no" ; then + AC_MSG_ERROR(the native compiler is broken and won't link.) +fi +AC_MSG_RESULT(yes) +]) + +AC_DEFUN(CY_AC_PATH_TCLH, [ +# +# Ok, lets find the tcl source trees so we can use the headers +# Warning: transition of version 9 to 10 will break this algorithm +# because 10 sorts before 9. We also look for just tcl. We have to +# be careful that we don't match stuff like tclX by accident. +# the alternative search directory is involked by --with-tclinclude +# +no_tcl=true +AC_MSG_CHECKING(for Tcl private headers) +AC_ARG_WITH(tclinclude, [ --with-tclinclude directory where tcl private headers are], with_tclinclude=${withval}) +AC_CACHE_VAL(ac_cv_c_tclh,[ +# first check to see if --with-tclinclude was specified +if test x"${with_tclinclude}" != x ; then + if test -f ${with_tclinclude}/tclInt.h ; then + ac_cv_c_tclh=`(cd ${with_tclinclude}; pwd)` + elif test -f ${with_tclinclude}/generic/tclInt.h ; then + ac_cv_c_tclh=`(cd ${with_tclinclude}/generic; pwd)` + else + AC_MSG_ERROR([${with_tclinclude} directory doesn't contain private headers]) + fi +fi + +# next check if it came with Tcl configuration file +if test x"${ac_cv_c_tclconfig}" != x ; then + if test -f $ac_cv_c_tclconfig/../generic/tclInt.h ; then + ac_cv_c_tclh=`(cd $ac_cv_c_tclconfig/../generic; pwd)` + fi +fi + +# next check in private source directory +# +# since ls returns lowest version numbers first, reverse its output +if test x"${ac_cv_c_tclh}" = x ; then + for i in \ + ${srcdir}/../tcl \ + `ls -dr ${srcdir}/../tcl[[9]].[[0-9]].[[0-9]] ${srcdir}/../tcl[[9]].[[0-9]] 2>/dev/null` \ + `ls -dr ${srcdir}/../tcl[[8]].[[2-9]].[[0-9]] ${srcdir}/../tcl[[8]].[[2-9]] 2>/dev/null` \ + ${srcdir}/../../tcl \ + `ls -dr ${srcdir}/../../tcl[[9]].[[0-9]].[[0-9]] ${srcdir}/../../tcl[[9]].[[0-9]] 2>/dev/null` \ + `ls -dr ${srcdir}/../../tcl[[8]].[[2-9]].[[0-9]] ${srcdir}/../../tcl[[8]].[[2-9]] 2>/dev/null` \ + ${srcdir}/../../../tcl \ + `ls -dr ${srcdir}/../../../tcl[[9]].[[0-9]].[[0-9]] ${srcdir}/../../../tcl[[9]].[[0-9]] 2>/dev/null ` \ + `ls -dr ${srcdir}/../../../tcl[[8]].[[2-9]].[[0-9]] ${srcdir}/../../../tcl[[8]].[[2-9]] 2>/dev/null ` ; do + if test -f $i/generic/tclInt.h ; then + ac_cv_c_tclh=`(cd $i/generic; pwd)` + break + fi + done +fi +# finally check in a few common install locations +# +# since ls returns lowest version numbers first, reverse its output +if test x"${ac_cv_c_tclh}" = x ; then + for i in \ + `ls -dr /usr/local/src/tcl[[9]].[[0-9]].[[0-9]] /usr/local/src/tcl[[9]].[[0-9]] 2>/dev/null` \ + `ls -dr /usr/local/src/tcl[[8]].[[2-9]].[[0-9]] /usr/local/src/tcl[[8]].[[2-9]] 2>/dev/null` \ + `ls -dr /usr/local/lib/tcl[[9]].[[0-9]].[[0-9]] /usr/local/lib/tcl[[9]].[[0-9]] 2>/dev/null` \ + `ls -dr /usr/local/lib/tcl[[8]].[[2-9]].[[0-9]] /usr/local/lib/tcl[[8]].[[2-9]] 2>/dev/null` \ + /usr/local/src/tcl \ + /usr/local/lib/tcl \ + ${prefix}/include ; do + if test -f $i/generic/tclInt.h ; then + ac_cv_c_tclh=`(cd $i/generic; pwd)` + break + fi + done +fi +# see if one is installed +if test x"${ac_cv_c_tclh}" = x ; then + AC_HEADER_CHECK(tclInt.h, ac_cv_c_tclh=installed, ac_cv_c_tclh="") +fi +]) +if test x"${ac_cv_c_tclh}" = x ; then + TCLHDIR="# no Tcl private headers found" + TCLHDIRDASHI="# no Tcl private headers found" + AC_MSG_ERROR([Can't find Tcl private headers]) +fi +if test x"${ac_cv_c_tclh}" != x ; then + no_tcl="" + if test x"${ac_cv_c_tclh}" = x"installed" ; then + AC_MSG_RESULT([is installed]) + TCLHDIR="" + TCLHDIRDASHI="" + TCL_LIBRARY="" + else + AC_MSG_RESULT([found in ${ac_cv_c_tclh}]) + # this hack is cause the TCLHDIR won't print if there is a "-I" in it. + TCLHDIR="${ac_cv_c_tclh}" + TCLHDIRDASHI="-I${ac_cv_c_tclh} -I`dirname ${ac_cv_c_tclh}`/unix" + TCL_LIBRARY=`echo $TCLHDIR | sed -e 's/generic//'`library + fi +fi + +AC_SUBST(TCLHDIR) +AC_SUBST(TCLHDIRDASHI) +AC_SUBST(TCL_LIBRARY) +]) + + +AC_DEFUN(CY_AC_PATH_TCLCONFIG, [ +# +# Ok, lets find the tcl configuration +# First, look for one uninstalled. +# the alternative search directory is invoked by --with-tcl +# + +if test x"${no_tcl}" = x ; then + # we reset no_tcl in case something fails here + no_tcl=true + AC_ARG_WITH(tcl, [ --with-tcl directory containing tcl configuration (tclConfig.sh)], + with_tclconfig=${withval}) + AC_MSG_CHECKING([for Tcl configuration]) + AC_CACHE_VAL(ac_cv_c_tclconfig,[ + + # First check to see if --with-tcl was specified. + if test x"${with_tclconfig}" != x ; then + if test -f "${with_tclconfig}/tclConfig.sh" ; then + ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)` + else + AC_MSG_ERROR([${with_tclconfig} directory doesn't contain tclConfig.sh]) + fi + fi + + # then check for a private Tcl installation + if test x"${ac_cv_c_tclconfig}" = x ; then + for i in \ + ../tcl \ + `ls -dr ../tcl[[9]].[[0-9]].[[0-9]] ../tcl[[9]].[[0-9]] 2>/dev/null` \ + `ls -dr ../tcl[[8]].[[2-9]].[[0-9]] ../tcl[[8]].[[2-9]] 2>/dev/null` \ + ../../tcl \ + `ls -dr ../../tcl[[9]].[[0-9]].[[0-9]] ../../tcl[[9]].[[0-9]] 2>/dev/null` \ + `ls -dr ../../tcl[[8]].[[2-9]].[[0-9]] ../../tcl[[8]].[[2-9]] 2>/dev/null` \ + ../../../tcl \ + `ls -dr ../../../tcl[[9]].[[0-9]].[[0-9]] ../../../tcl[[9]].[[0-9]] 2>/dev/null` \ + `ls -dr ../../../tcl[[8]].[[2-9]].[[0-9]] ../../../tcl[[8]].[[2-9]] 2>/dev/null` ; do + if test -f "$i/unix/tclConfig.sh" ; then + ac_cv_c_tclconfig=`(cd $i/unix; pwd)` + break + fi + done + fi + # check in a few common install locations + if test x"${ac_cv_c_tclconfig}" = x ; then + for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do + if test -f "$i/tclConfig.sh" ; then + ac_cv_c_tclconfig=`(cd $i; pwd)` + break + fi + done + fi + # check in a few other private locations + if test x"${ac_cv_c_tclconfig}" = x ; then + for i in \ + ${srcdir}/../tcl \ + `ls -dr ${srcdir}/../tcl[[9]].[[0-9]].[[0-9]] ${srcdir}/../tcl[[9]].[[0-9]] 2>/dev/null` \ + `ls -dr ${srcdir}/../tcl[[8]].[[2-9]].[[0-9]] ${srcdir}/../tcl[[8]].[[2-9]] 2>/dev/null` ; do + if test -f "$i/unix/tclConfig.sh" ; then + ac_cv_c_tclconfig=`(cd $i/unix; pwd)` + break + fi + done + fi + ]) + if test x"${ac_cv_c_tclconfig}" = x ; then + TCLCONFIG="# no Tcl configs found" + AC_MSG_WARN(Can't find Tcl configuration definitions) + else + no_tcl= + TCLCONFIG=${ac_cv_c_tclconfig}/tclConfig.sh + AC_MSG_RESULT(found $TCLCONFIG) + fi +fi +]) + +# Defined as a separate macro so we don't have to cache the values +# from PATH_TCLCONFIG (because this can also be cached). +AC_DEFUN(CY_AC_LOAD_TCLCONFIG, [ + . $TCLCONFIG + +dnl AC_SUBST(TCL_VERSION) +dnl AC_SUBST(TCL_MAJOR_VERSION) +dnl AC_SUBST(TCL_MINOR_VERSION) +dnl AC_SUBST(TCL_CC) + AC_SUBST(TCL_DEFS) +dnl following is just to test if missing symbol can be handled by configure + AC_SUBST(TCL_DELETEME) + AC_SUBST(TCL_DBGX) + +dnl not used, don't export to save symbols +dnl AC_SUBST(TCL_LIB_FILE) + +dnl don't export, not used outside of configure +dnl AC_SUBST(TCL_LIBS) +dnl not used, don't export to save symbols +dnl AC_SUBST(TCL_PREFIX) + + AC_SUBST(TCL_EXEC_PREFIX) + +dnl not used, don't export to save symbols +dnl AC_SUBST(TCL_SHLIB_CFLAGS) + AC_SUBST(TCL_SHLIB_LD) +dnl don't export, not used outside of configure +dnl AC_SUBST(TCL_SHLIB_LD_LIBS) + +# Tcl defines TCL_SHLIB_SUFFIX but TCL_SHARED_LIB_SUFFIX then looks for it +# as just SHLIB_SUFFIX. How bizarre. + SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX + AC_SUBST(SHLIB_SUFFIX) + +dnl not used, don't export to save symbols +dnl AC_SUBST(TCL_DL_LIBS) + AC_SUBST(TCL_LD_FLAGS) +dnl don't export, not used outside of configure +dnl AC_SUBST(TCL_LD_SEARCH_FLAGS) +dnl AC_SUBST(TCL_COMPAT_OBJS) +dnl AC_SUBST(TCL_RANLIB) + +# if Tcl's build directory has been removed, TCL_LIB_SPEC should +# be used instead of TCL_BUILD_LIB_SPEC +SAVELIBS=$LIBS +# eval used to expand out TCL_DBGX +eval "LIBS=\"$TCL_BUILD_LIB_SPEC $TCL_LIBS\"" +AC_MSG_CHECKING([Tcl build library]) +AC_MSG_RESULT($LIBS) + +AC_CHECK_FUNC(Tcl_CreateCommand,[ + AC_MSG_CHECKING([if Tcl library build specification is valid]) + AC_MSG_RESULT(yes) +],[ + TCL_BUILD_LIB_SPEC=$TCL_LIB_SPEC + # Can't pull the following CHECKING call out since it will be + # broken up by the CHECK_FUNC just above. + AC_MSG_CHECKING([if Tcl library build specification is valid]) + AC_MSG_RESULT(no) +]) +LIBS=$SAVELIBS + + AC_SUBST(TCL_BUILD_LIB_SPEC) + AC_SUBST(TCL_LIB_SPEC) +dnl AC_SUBST(TCL_LIB_VERSIONS_OK) + + AC_SUBST(TCL_SHARED_LIB_SUFFIX) + +dnl not used, don't export to save symbols +dnl AC_SUBST(TCL_UNSHARED_LIB_SUFFIX) +]) + +# Warning: Tk definitions are very similar to Tcl definitions but +# are not precisely the same. There are a couple of differences, +# so don't do changes to Tcl thinking you can cut and paste it do +# the Tk differences and later simply substitute "Tk" for "Tcl". +# Known differences: +# - Acceptable Tcl major version #s is 8.2-9.* while Tk is 8.2-9.* +# - Searching for Tcl includes looking for tclInt.h, Tk looks for tk.h +# - Computing major/minor versions is different because Tk depends on +# headers to Tcl, Tk, and X. +# - Symbols in tkConfig.sh are different than tclConfig.sh +# - Acceptable for Tk to be missing but not Tcl. + +AC_DEFUN(CY_AC_PATH_TKH, [ +# +# Ok, lets find the tk source trees so we can use the headers +# If the directory (presumably symlink) named "tk" exists, use that one +# in preference to any others. Same logic is used when choosing library +# and again with Tcl. The search order is the best place to look first, then in +# decreasing significance. The loop breaks if the trigger file is found. +# Note the gross little conversion here of srcdir by cd'ing to the found +# directory. This converts the path from a relative to an absolute, so +# recursive cache variables for the path will work right. We check all +# the possible paths in one loop rather than many seperate loops to speed +# things up. +# the alternative search directory is involked by --with-tkinclude +# +#no_tk=true +AC_MSG_CHECKING(for Tk private headers) +AC_ARG_WITH(tkinclude, [ --with-tkinclude directory where tk private headers are], with_tkinclude=${withval}) +AC_CACHE_VAL(ac_cv_c_tkh,[ +# first check to see if --with-tkinclude was specified +if test x"${with_tkinclude}" != x ; then + if test -f ${with_tkinclude}/tk.h ; then + ac_cv_c_tkh=`(cd ${with_tkinclude}; pwd)` + elif test -f ${with_tkinclude}/generic/tk.h ; then + ac_cv_c_tkh=`(cd ${with_tkinclude}/generic; pwd)` + else + AC_MSG_ERROR([${with_tkinclude} directory doesn't contain private headers]) + fi +fi + +# next check if it came with Tk configuration file +if test x"${ac_cv_c_tkconfig}" != x ; then + if test -f $ac_cv_c_tkconfig/../generic/tk.h ; then + ac_cv_c_tkh=`(cd $ac_cv_c_tkconfig/../generic; pwd)` + fi +fi + +# next check in private source directory +# +# since ls returns lowest version numbers first, reverse its output +if test x"${ac_cv_c_tkh}" = x ; then + for i in \ + ${srcdir}/../tk \ + `ls -dr ${srcdir}/../tk[[4-9]].[[0-9]].[[0-9]] ${srcdir}/../tk[[4-9]].[[0-9]] 2>/dev/null` \ + `ls -dr ${srcdir}/../tk[[4-9]].[[0-9]].[[0-9]] ${srcdir}/../tk[[4-9]].[[0-9]] 2>/dev/null` \ + ${srcdir}/../../tk \ + `ls -dr ${srcdir}/../../tk[[4-9]].[[0-9]].[[0-9]] ${srcdir}/../../tk[[4-9]].[[0-9]] 2>/dev/null` \ + `ls -dr ${srcdir}/../../tk[[4-9]].[[0-9]].[[0-9]] ${srcdir}/../../tk[[4-9]].[[0-9]] 2>/dev/null` \ + ${srcdir}/../../../tk \ + `ls -dr ${srcdir}/../../../tk[[4-9]].[[0-9]].[[0-9]] ${srcdir}/../../../tk[[4-9]].[[0-9]] 2>/dev/null ` \ + `ls -dr ${srcdir}/../../../tk[[4-9]].[[0-9]].[[0-9]] ${srcdir}/../../../tk[[4-9]].[[0-9]] 2>/dev/null ` ; do + if test -f $i/generic/tk.h ; then + ac_cv_c_tkh=`(cd $i/generic; pwd)` + break + fi + done +fi +# finally check in a few common install locations +# +# since ls returns lowest version numbers first, reverse its output +if test x"${ac_cv_c_tkh}" = x ; then + for i in \ + `ls -dr /usr/local/src/tk[[4-9]].[[0-9]].[[0-9]] /usr/local/src/tk[[4-9]].[[0-9]] 2>/dev/null` \ + `ls -dr /usr/local/src/tk[[4-9]].[[0-9]].[[0-9]] /usr/local/src/tk[[4-9]].[[0-9]] 2>/dev/null` \ + `ls -dr /usr/local/lib/tk[[4-9]].[[0-9]].[[0-9]] /usr/local/lib/tk[[4-9]].[[0-9]] 2>/dev/null` \ + `ls -dr /usr/local/lib/tk[[4-9]].[[0-9]].[[0-9]] /usr/local/lib/tk[[4-9]].[[0-9]] 2>/dev/null` \ + /usr/local/src/tk \ + /usr/local/lib/tk \ + ${prefix}/include ; do + if test -f $i/generic/tk.h ; then + ac_cv_c_tkh=`(cd $i/generic; pwd)` + break + fi + done +fi +# see if one is installed +if test x"${ac_cv_c_tkh}" = x ; then + AC_HEADER_CHECK(tk.h, ac_cv_c_tkh=installed, ac_cv_c_tkh="") +fi +]) +if test x"${ac_cv_c_tkh}" != x ; then +# no_tk="" + if test x"${ac_cv_c_tkh}" = x"installed" ; then + AC_MSG_RESULT([is installed]) + TKHDIRDASHI="" + else + AC_MSG_RESULT([found in ${ac_cv_c_tkh}]) + # this hack is cause the TKHDIRDASHI won't print if there is a "-I" in it. + TKHDIRDASHI="-I${ac_cv_c_tkh}" + fi +else + TKHDIRDASHI="# no Tk directory found" + AC_MSG_WARN([Can't find Tk private headers]) + no_tk=true +fi + +AC_SUBST(TKHDIRDASHI) +]) + + +AC_DEFUN(CY_AC_PATH_TKCONFIG, [ +# +# Ok, lets find the tk configuration +# First, look for one uninstalled. +# the alternative search directory is invoked by --with-tk +# + +if test x"${no_tk}" = x ; then + # we reset no_tk in case something fails here + no_tk=true + AC_ARG_WITH(tk, [ --with-tk directory containing tk configuration (tkConfig.sh)], + with_tkconfig=${withval}) + AC_MSG_CHECKING([for Tk configuration]) + AC_CACHE_VAL(ac_cv_c_tkconfig,[ + + # First check to see if --with-tk was specified. + if test x"${with_tkconfig}" != x ; then + if test -f "${with_tkconfig}/tkConfig.sh" ; then + ac_cv_c_tkconfig=`(cd ${with_tkconfig}; pwd)` + else + AC_MSG_ERROR([${with_tkconfig} directory doesn't contain tkConfig.sh]) + fi + fi + + # then check for a private Tk library + if test x"${ac_cv_c_tkconfig}" = x ; then + for i in \ + ../tk \ + `ls -dr ../tk[[4-9]].[[0-9]].[[0-9]] ../tk[[4-9]].[[0-9]] 2>/dev/null` \ + `ls -dr ../tk[[4-9]].[[0-9]].[[0-9]] ../tk[[4-9]].[[0-9]] 2>/dev/null` \ + ../../tk \ + `ls -dr ../../tk[[4-9]].[[0-9]].[[0-9]] ../../tk[[4-9]].[[0-9]] 2>/dev/null` \ + `ls -dr ../../tk[[4-9]].[[0-9]].[[0-9]] ../../tk[[4-9]].[[0-9]] 2>/dev/null` \ + ../../../tk \ + `ls -dr ../../../tk[[4-9]].[[0-9]].[[0-9]] ../../../tk[[4-9]].[[0-9]] 2>/dev/null` \ + `ls -dr ../../../tk[[4-9]].[[0-9]].[[0-9]] ../../../tk[[4-9]].[[0-9]] 2>/dev/null` ; do + if test -f "$i/unix/tkConfig.sh" ; then + ac_cv_c_tkconfig=`(cd $i/unix; pwd)` + break + fi + done + fi + # check in a few common install locations + if test x"${ac_cv_c_tkconfig}" = x ; then + for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do + if test -f "$i/tkConfig.sh" ; then + ac_cv_c_tkconfig=`(cd $i; pwd)` + break + fi + done + fi + # check in a few other private locations + if test x"${ac_cv_c_tkconfig}" = x ; then + for i in \ + ${srcdir}/../tk \ + `ls -dr ${srcdir}/../tk[[4-9]].[[0-9]].[[0-9]] ${srcdir}/../tk[[4-9]].[[0-9]] 2>/dev/null` \ + `ls -dr ${srcdir}/../tk[[4-9]].[[0-9]].[[0-9]] ${srcdir}/../tk[[4-9]].[[0-9]] 2>/dev/null` ; do + if test -f "$i/unix/tkConfig.sh" ; then + ac_cv_c_tkconfig=`(cd $i/unix; pwd)` + break + fi + done + fi + ]) + if test x"${ac_cv_c_tkconfig}" = x ; then + TKCONFIG="# no Tk configs found" + AC_MSG_WARN(Can't find Tk configuration definitions) + else + no_tk= + TKCONFIG=${ac_cv_c_tkconfig}/tkConfig.sh + AC_MSG_RESULT(found $TKCONFIG) + fi +fi + +]) + +# Defined as a separate macro so we don't have to cache the values +# from PATH_TKCONFIG (because this can also be cached). +AC_DEFUN(CY_AC_LOAD_TKCONFIG, [ + if test -f "$TKCONFIG" ; then + . $TKCONFIG + fi + + AC_SUBST(TK_VERSION) +dnl not actually used, don't export to save symbols +dnl AC_SUBST(TK_MAJOR_VERSION) +dnl AC_SUBST(TK_MINOR_VERSION) + AC_SUBST(TK_DEFS) + + AC_SUBST(TK_DBGX) +dnl not used, don't export to save symbols + dnl AC_SUBST(TK_LIB_FILE) + +dnl not used outside of configure +dnl AC_SUBST(TK_LIBS) +dnl not used, don't export to save symbols +dnl AC_SUBST(TK_PREFIX) + +dnl not used, don't export to save symbols +dnl AC_SUBST(TK_EXEC_PREFIX) + + AC_SUBST(TK_XINCLUDES) + AC_SUBST(TK_XLIBSW) + +# if Tk's build directory has been removed, TK_LIB_SPEC should +# be used instead of TK_BUILD_LIB_SPEC +SAVELIBS=$LIBS +# eval used to expand out TK_DBGX +eval "LIBS=\"$TK_BUILD_LIB_SPEC $TCL_BUILD_LIB_SPEC $TK_LIBS\"" +AC_CHECK_FUNC(Tk_Init,[ + AC_MSG_CHECKING([if Tk library build specification is valid]) + AC_MSG_RESULT(yes) +],[ + TK_BUILD_LIB_SPEC=$TK_LIB_SPEC + # Can't pull the following CHECKING call out since it will be + # broken up by the CHECK_FUNC just above. + AC_MSG_CHECKING([if Tk library build specification is valid]) + AC_MSG_RESULT(no) +]) +LIBS=$SAVELIBS + + AC_SUBST(TK_BUILD_LIB_SPEC) + AC_SUBST(TK_LIB_SPEC) +]) + +#------------------------------------------------------------------------ +# SC_ENABLE_THREADS -- +# +# Specify if thread support should be enabled +# +# Arguments: +# none +# +# Results: +# +# Adds the following arguments to configure: +# --enable-threads +# +# Sets the following vars: +# THREADS_LIBS Thread library(s) +# +# Defines the following vars: +# TCL_THREADS +# _REENTRANT +# +#------------------------------------------------------------------------ + +AC_DEFUN(SC_ENABLE_THREADS, [ + AC_MSG_CHECKING(for building with threads) + AC_ARG_ENABLE(threads, [ --enable-threads build with threads (not supported)], + [tcl_ok=$enableval], [tcl_ok=no]) + + if test "$tcl_ok" = "yes"; then + AC_MSG_WARN([Expect is not fully thread-enabled. Although significant work has been done towards that goal, it is not complete. Continue compiling at your own risk.]) + fi +# if test "$tcl_ok" = "yes"; then +# AC_MSG_RESULT(yes) +# TCL_THREADS=1 +# AC_DEFINE(TCL_THREADS) +# AC_DEFINE(_REENTRANT) +# +# AC_CHECK_LIB(pthread,pthread_mutex_init,tcl_ok=yes,tcl_ok=no) +# if test "$tcl_ok" = "yes"; then +# # The space is needed +# THREADS_LIBS=" -lpthread" +# else +# TCL_THREADS=0 +# AC_MSG_WARN("Don t know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile...") +# fi +# else +# TCL_THREADS=0 +# AC_MSG_RESULT(no (default)) +# fi + + AC_MSG_RESULT(no (default)) + +]) + + +#------------------------------------------------------------------------ +## AK ## Macros which encapsulate the expect specific checks. +## AK ## This allows me to move them around in the configure.in +## AK ## + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Feb 5 23:36:47 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 05 Feb 2010 22:36:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[8363] csw/mgar/pkg/pari/trunk Message-ID: Revision: 8363 http://gar.svn.sourceforge.net/gar/?rev=8363&view=rev Author: wbonnet Date: 2010-02-05 22:36:47 +0000 (Fri, 05 Feb 2010) Log Message: ----------- Upgrade to version 2.3.5 Modified Paths: -------------- csw/mgar/pkg/pari/trunk/Makefile csw/mgar/pkg/pari/trunk/checksums Modified: csw/mgar/pkg/pari/trunk/Makefile =================================================================== --- csw/mgar/pkg/pari/trunk/Makefile 2010-02-05 17:01:51 UTC (rev 8362) +++ csw/mgar/pkg/pari/trunk/Makefile 2010-02-05 22:36:47 UTC (rev 8363) @@ -1,5 +1,5 @@ GARNAME = pari -GARVERSION = 2.1.7 +GARVERSION = 2.3.5 CATEGORIES = lib DESCRIPTION = efficient computations in number theory @@ -8,7 +8,7 @@ endef MASTER_SITES = http://pari.math.u-bordeaux.fr/pub/pari/unix/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWparigp,) # We define upstream file regex so we can be notifed of new upstream software release @@ -16,9 +16,11 @@ CONFIGURE_SCRIPTS = custom CONFIGURE_ARGS = --prefix=$(prefix) -CONFIGURE_ARGS += --miscdir=$(docdir)/pari +# CONFIGURE_ARGS += --miscdir=$(docdir)/pari BUILD_ARGS = gp +TEST_SCRIPTS = + include gar/category.mk configure-custom: Modified: csw/mgar/pkg/pari/trunk/checksums =================================================================== --- csw/mgar/pkg/pari/trunk/checksums 2010-02-05 17:01:51 UTC (rev 8362) +++ csw/mgar/pkg/pari/trunk/checksums 2010-02-05 22:36:47 UTC (rev 8363) @@ -1,2 +1,2 @@ -357b7a42e89e2761a5367bbcbfcca5f2 download/pari-2.1.7.tgz -c3e38b038b8314d2df6b14037c290ae9 download/CSWparigp.gspec +c3e38b038b8314d2df6b14037c290ae9 CSWparigp.gspec +6077c6db56fdd32e39a06a9bf320e1f7 pari-2.3.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Feb 6 08:12:34 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 06 Feb 2010 07:12:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8364] csw/mgar/pkg/urxvt/trunk Message-ID: Revision: 8364 http://gar.svn.sourceforge.net/gar/?rev=8364&view=rev Author: wahwah Date: 2010-02-06 07:12:34 +0000 (Sat, 06 Feb 2010) Log Message: ----------- urxvt: version bump to 9.07, removed unnecessary dependencies Modified Paths: -------------- csw/mgar/pkg/urxvt/trunk/Makefile csw/mgar/pkg/urxvt/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/urxvt/trunk/Makefile Modified: csw/mgar/pkg/urxvt/trunk/Makefile =================================================================== --- csw/mgar/pkg/urxvt/trunk/Makefile 2010-02-05 22:36:47 UTC (rev 8363) +++ csw/mgar/pkg/urxvt/trunk/Makefile 2010-02-06 07:12:34 UTC (rev 8364) @@ -1,9 +1,9 @@ # Copyright 2009 OpenCSW # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ GARNAME = rxvt-unicode -GARVERSION = 9.06 +GARVERSION = 9.07 CATEGORIES = apps DESCRIPTION = (ouR XVT, unicode) - a VT102 emulator for the X window system @@ -18,30 +18,22 @@ http://pod.tst.eu/http://cvs.schmorp.de/rxvt-unicode/doc/rxvt.1.pod endef -MASTER_SITES = http://dist.schmorp.de/rxvt-unicode/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += urxvt-wrapper -# PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris8.patch - -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -SPKG_SOURCEURL = http://software.schmorp.de/pkg/rxvt-unicode.html - -PACKAGES = CSWurxvt +MASTER_SITES = http://dist.schmorp.de/rxvt-unicode/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += urxvt-wrapper +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +SPKG_SOURCEURL = http://software.schmorp.de/pkg/rxvt-unicode.html +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +PACKAGES = CSWurxvt CATALOGNAME_CSWurxvt = urxvt - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-perl - -GARCOMPILER = GNU - +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-perl RUNTIME_DEP_PKGS_CSWurxvt = CSWbash -RUNTIME_DEP_PKGS_CSWurxvt += CSWfconfig -RUNTIME_DEP_PKGS_CSWurxvt += CSWftype2 -RUNTIME_DEP_PKGS_CSWurxvt += CSWlibxft2 -RUNTIME_DEP_PKGS_CSWurxvt += CSWlibxrender -RUNTIME_DEP_PKGS_CSWurxvt += CSWzlib +GARCOMPILER = GNU TEST_SCRIPTS = +include gar/category.mk + post-install-modulated: ginstall -m 755 -d $(DESTDIR)$(libexecdir) for b in urxvt urxvtd urxvtc; do \ @@ -50,5 +42,3 @@ done ginstall -m 755 $(FILEDIR)/urxvt-wrapper $(DESTDIR)$(libexecdir) @$(MAKECOOKIE) - -include gar/category.mk Property changes on: csw/mgar/pkg/urxvt/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/urxvt/trunk/checksums =================================================================== --- csw/mgar/pkg/urxvt/trunk/checksums 2010-02-05 22:36:47 UTC (rev 8363) +++ csw/mgar/pkg/urxvt/trunk/checksums 2010-02-06 07:12:34 UTC (rev 8364) @@ -1,2 +1,2 @@ -4cb9330e99fc0b0b05cebf3581557dd8 download/rxvt-unicode-9.06.tar.bz2 -d1fb3a5f721baf361574880f6cdc92be download/urxvt-wrapper +49bb52c99e002bf85eb41d8385d903b5 rxvt-unicode-9.07.tar.bz2 +d1fb3a5f721baf361574880f6cdc92be urxvt-wrapper 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 Feb 6 16:11:56 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 06 Feb 2010 15:11:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[8365] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 8365 http://gar.svn.sourceforge.net/gar/?rev=8365&view=rev Author: bdwalton Date: 2010-02-06 15:11:56 +0000 (Sat, 06 Feb 2010) Log Message: ----------- ruby19: setup some basic config options, gar stuff Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-02-06 07:12:34 UTC (rev 8364) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-02-06 15:11:56 UTC (rev 8365) @@ -3,13 +3,15 @@ PATCHLEVEL = p376 CATEGORIES = lang +DISTNAME = ruby-$(GARVERSION)-$(PATCHLEVEL) + DESCRIPTION = Brief description define BLURB Long description endef MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/1.9/ -DISTFILES = ruby-$(GARVERSION)-$(PATCHLEVEL).tar.gz +DISTFILES = $(DISTNAME).tar.gz # We define upstream file regex so we can be notifed of new upstream # software release @@ -21,5 +23,14 @@ # UPSTREAM_MASTER_SITES = CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --program-suffix=19 +CONFIGURE_ARGS += --enable-pthread include gar/category.mk + +ifdef USEGCC +GARCOMPILER = GNU +RUNTIME_DEP_PKGS_CSWruby19 += CSWgcc4corert +else +SOS11_LD_FLAGS = +endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Feb 6 16:20:24 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 06 Feb 2010 15:20:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8366] csw/mgar/pkg/exiftool/trunk Message-ID: Revision: 8366 http://gar.svn.sourceforge.net/gar/?rev=8366&view=rev Author: hson Date: 2010-02-06 15:20:24 +0000 (Sat, 06 Feb 2010) Log Message: ----------- exiftool: Update to 8.09 Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile csw/mgar/pkg/exiftool/trunk/checksums Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2010-02-06 15:11:56 UTC (rev 8365) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2010-02-06 15:20:24 UTC (rev 8366) @@ -1,5 +1,5 @@ GARNAME = exiftool -GARVERSION = 8.02 +GARVERSION = 8.09 CATEGORIES = cpan DESCRIPTION = Read, Write and Edit Image File Meta Information Modified: csw/mgar/pkg/exiftool/trunk/checksums =================================================================== --- csw/mgar/pkg/exiftool/trunk/checksums 2010-02-06 15:11:56 UTC (rev 8365) +++ csw/mgar/pkg/exiftool/trunk/checksums 2010-02-06 15:20:24 UTC (rev 8366) @@ -1,2 +1 @@ -13f9aae615a5de5e3c145b374950a75c CSWexiftool.gspec -fac7cef8a5e618ce84d090320403583c Image-ExifTool-8.02.tar.gz +4986e1acb04453350378c2161784ae6c Image-ExifTool-8.09.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Feb 7 00:45:26 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 06 Feb 2010 23:45:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[8367] csw/mgar/gar/v2 Message-ID: Revision: 8367 http://gar.svn.sourceforge.net/gar/?rev=8367&view=rev Author: wahwah Date: 2010-02-06 23:45:25 +0000 (Sat, 06 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, overrides implemented. See http://wiki.opencsw.org/checkpkg for documentation. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py csw/mgar/gar/v2/lib/python/opencsw.py Added Paths: ----------- csw/mgar/gar/v2/bin/analyze_module_results.py Added: csw/mgar/gar/v2/bin/analyze_module_results.py =================================================================== --- csw/mgar/gar/v2/bin/analyze_module_results.py (rev 0) +++ csw/mgar/gar/v2/bin/analyze_module_results.py 2010-02-06 23:45:25 UTC (rev 8367) @@ -0,0 +1,47 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +import optparse +import os +import sys + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + +def main(): + parser = optparse.OptionParser() + parser.add_option("-e", "--extract-dir", dest="extractdir", + help="Directory with extracted packages") + options, args = parser.parse_args() + pkgnames = args + packages = [opencsw.DirectoryFormatPackage( + os.path.join(options.extractdir, pkgname)) + for pkgname in pkgnames] + overrides_list = [pkg.GetOverrides() for pkg in packages] + files = os.listdir(options.extractdir) + error_tags = [] + for file_name in files: + if file_name.startswith("tags."): + fd = open(os.path.join(options.extractdir, file_name)) + for line in fd: + if line.startswith("#"): + continue + pkgname, tag_name, tag_info = checkpkg.ParseTagLine(line) + error_tags.append((pkgname, checkpkg.CheckpkgTag(tag_name, tag_info))) + overrides = reduce(lambda x, y: x + y, overrides_list) + tags_after_overrides = checkpkg.ApplyOverrides(error_tags, overrides) + exit_code = bool(tags_after_overrides) + if tags_after_overrides: + print "The reported error tags are:" + for tag in tags_after_overrides: + print "*", repr(tag) + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2/bin/analyze_module_results.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-02-06 15:20:24 UTC (rev 8366) +++ csw/mgar/gar/v2/bin/checkpkg 2010-02-06 23:45:25 UTC (rev 8367) @@ -569,6 +569,7 @@ checkpkg_scriptname=`basename $0` checkpkg_basedir=${0%/${checkpkg_scriptname}} plugindir=${checkpkg_basedir}/checkpkg.d +checkpkg_module_tag="checkpkg-" # Cleaning up old *.pyc files which can cause grief. This is because of the # move of Python libraries. @@ -591,21 +592,26 @@ module_name_format="%-40s" if [[ -d "$plugindir" ]]; then echo "Running modular tests" - # echo plugin dir exists - for plugin in "${plugindir}"/checkpkg-*; do + for plugin in "${plugindir}/${checkpkg_module_tag}"*; do if [[ -x "${plugin}" ]]; then - debugmsg "Executing: ${plugin} $extra_options -e \"${EXTRACTDIR}\" ${pkgnames}" plugin_base_name=`basename ${plugin}` plugin_log="${EXTRACTDIR}/${plugin_base_name}.log" log_files="${log_files} ${plugin_log}" plugin_name="`echo ${plugin} | sed -e 's+.*/checkpkg-++' | sed -e 's+\.py$++'`" + error_tag_file="tags.${plugin_name}" printf "${BOLD}${module_name_format}${COLOR_RESET} running..." "${plugin_name}" - ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} > "${plugin_log}" 2>&1 + debugmsg "Executing: ${plugin} $extra_options -e \"${EXTRACTDIR}\" ${pkgnames}" + ${plugin} \ + $extra_options \ + -e "${EXTRACTDIR}" \ + -o "${EXTRACTDIR}/${error_tag_file}" \ + ${pkgnames} \ + > "${plugin_log}" 2>&1 if [[ "$?" -ne 0 ]]; then - printf "\r${module_name_format} ${RED}[FAIL]${COLOR_RESET} \\n" "${plugin_name}" + printf "\r${module_name_format} ${RED}[ERROR]${COLOR_RESET} \\n" "${plugin_name}" test_suite_ok=0 else - printf "\r${module_name_format} ${GREEN}[OK]${COLOR_RESET} \\n" "${plugin_name}" + printf "\r${module_name_format} [Done] \\n" "${plugin_name}" fi else debugmsg "'${plugin}' is not executable" @@ -626,11 +632,34 @@ done if [[ ${test_suite_ok} -ne 1 ]]; then - errmsg "One or more modular tests have failed." + errmsg "One or more modular tests have finished with an error." else - print "All modular tests were successful." + print "All modular tests completed. Analyzing the reports." fi +override_info_printed=0 +for tagfile in ${EXTRACTDIR}/tags.*; do + if [[ -s "${tagfile}" ]]; then + if [[ "${override_info_printed}" -ne 1 ]]; then + echo "# You can use the following lines to create overrides" + echo "# See http://wiki.opencsw.org/checkpkg" + override_info_printed=1 + fi + echo "# ${tagfile}:" + cat "${tagfile}" + fi +done + +# Collecting errors and applying the overrides. +${checkpkg_basedir}/analyze_module_results.py \ + -e "${EXTRACTDIR}" \ + ${pkgnames} +if [[ "$?" -ne 0 ]]; then + errmsg "${RED}Modular checks are reporting errors.${COLOR_RESET}" +else + print "${GREEN}All modular tests were successful.${COLOR_RESET}" +fi + print "" # Cleaning up after all packages Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py 2010-02-06 15:20:24 UTC (rev 8366) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py 2010-02-06 23:45:25 UTC (rev 8367) @@ -11,6 +11,8 @@ import sys import re +CHECKPKG_MODULE_NAME = "class action scripts / prototype integrity" + # The following bit of code sets the correct path to Python libraries # distributed with GAR. path_list = [os.path.dirname(__file__), @@ -20,7 +22,7 @@ import opencsw -def CheckActionClasses(pkg): +def CheckActionClasses(pkg, debug): """Checks the consistency between classes in the prototype and pkginfo.""" errors = [] pkginfo = pkg.GetParsedPkginfo() @@ -29,29 +31,33 @@ pkgmap_classes = pkgmap.GetClasses() only_in_pkginfo = pkginfo_classes.difference(pkgmap_classes) only_in_pkgmap = pkgmap_classes.difference(pkginfo_classes) - for cls in only_in_pkginfo: - print "Class %s of %s is only in pkginfo" % (repr(cls), pkg.pkgname) - print "This shouldn't cause any problems, but it might be not necessary." - for cls in only_in_pkgmap: + for action_class in only_in_pkginfo: + error = checkpkg.CheckpkgTag( + "action-class-only-in-pkginfo", + action_class, + msg="This shouldn't cause any problems, but it might be not necessary.") + errors.append(error) + for action_class in only_in_pkgmap: errors.append( - opencsw.PackageError("Class %s is only in pkgmap" % repr(cls))) - if only_in_pkginfo or only_in_pkgmap: - print ("pkginfo_classes: %s, pkgmap classes: %s" - % (pkginfo_classes, pkgmap_classes)) + checkpkg.CheckpkgTag("action-class-only-in-pkgmap", action_class)) return errors def main(): options, args = checkpkg.GetOptions() pkgnames = args - check_manager = checkpkg.CheckpkgManager( - "class action scripts / prototype integrity", - options.extractdir, - pkgnames, - options.debug) + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.extractdir, + pkgnames, + options.debug) + # Registering functions defined above. check_manager.RegisterIndividualCheck(CheckActionClasses) - exit_code, report = check_manager.Run() - print report.strip() + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() sys.exit(exit_code) Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py 2010-02-06 15:20:24 UTC (rev 8366) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py 2010-02-06 23:45:25 UTC (rev 8367) @@ -1,4 +1,5 @@ #!/opt/csw/bin/python2.6 +# # $Id$ """Verifies the architecture of the package.""" @@ -15,15 +16,15 @@ sys.path.append(os.path.join(*path_list)) import checkpkg -def CheckArchitectureVsContents(pkg): +def CheckArchitectureVsContents(pkg, debug): """Verifies the relationship between package contents and architecture.""" errors = [] binaries = pkg.ListBinaries() pkginfo = pkg.GetParsedPkginfo() arch = pkginfo["ARCH"] if binaries and arch == "all": - errors.append(checkpkg.PackageError( - "The package can't be ARCHALL = 1 and contain binaries.")) + for binary in binaries: + errors.append(checkpkg.CheckpkgTag("archall-with-binaries"), binary) elif not binaries and arch != "all": # This is not a clean way of handling messages for the user, but there's # not better way at the moment. @@ -42,11 +43,18 @@ options.extractdir, pkgnames, options.debug) + check_manager.RegisterIndividualCheck(CheckArchitectureVsContents) - exit_code, report = check_manager.Run() - print report.strip() + + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() sys.exit(exit_code) if __name__ == '__main__': main() + +# vim:set sw=2 ts=2 sts=2 expandtab: Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-02-06 15:20:24 UTC (rev 8366) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-02-06 23:45:25 UTC (rev 8367) @@ -1,13 +1,13 @@ #!/opt/csw/bin/python2.6 # # $Id$ -# -# A check for dependencies between shared libraries. -# -# This is currently more of a prototype than a mature program, but it has some -# unit tests and it appears to be working. The main problem is that it's not -# divided into smaller testable sections. +"""A check for dependencies between shared libraries. +This is currently more of a prototype than a mature program, but it has some +unit tests and it appears to be working. The main problem is that it's not +divided into smaller testable sections. +""" + import os import os.path import copy @@ -16,7 +16,10 @@ import logging import sys import textwrap +from Cheetah import Template +CHECKPKG_MODULE_NAME = "shared library linking consistency" + # The following bit of code sets the correct path to Python libraries # distributed with GAR. path_list = [os.path.dirname(__file__), @@ -38,24 +41,14 @@ return isalist -def main(): +def CheckSharedLibraryConsistency(pkgs, debug): result_ok = True errors = [] - options, args = checkpkg.GetOptions() - pkgnames = args - if options.debug: - logging.basicConfig(level=logging.DEBUG) - else: - logging.basicConfig(level=logging.INFO) - checkers = [] - for pkgname in pkgnames: - checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) - checkers.append(checker) binaries = [] binaries_by_pkgname = {} sonames_by_pkgname = {} pkg_by_any_filename = {} - for checker in checkers: + for checker in pkgs: pkg_binary_paths = checker.ListBinaries() binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] binaries_by_pkgname[checker.pkgname] = binaries_base @@ -128,7 +121,7 @@ # same bit of code with do checking and reporting. # # TODO: Rewrite this using cheetah templates - if options.debug and needed_sonames: + if debug and needed_sonames: print "Analysis of sonames needed by the package set:" binaries_with_missing_sonames = set([]) for soname in needed_sonames: @@ -150,10 +143,13 @@ if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: print "However, it's a whitelisted soname." else: - errors.append( - checkpkg.Error("%s is required by %s, but " - "we don't know what provides it." - % (soname, binaries_by_soname[soname]))) + pass + # The error checking needs to be unified: done in one place only. + # errors.append( + # checkpkg.CheckpkgTag( + # "%s is required by %s, but " + # "we don't know what provides it." + # % (soname, binaries_by_soname[soname]))) if binaries_with_missing_sonames: print "The following are binaries with missing sonames:" binary_lines = " ".join(sorted(binaries_with_missing_sonames)) @@ -162,11 +158,11 @@ print dependent_pkgs = {} - for checker in checkers: + for checker in pkgs: pkgname = checker.pkgname dir_format_pkg = opencsw.DirectoryFormatPackage(checker.pkgpath) declared_dependencies = dir_format_pkg.GetDependencies() - if options.debug: + if debug: sanitized_pkgname = pkgname.replace("-", "_") data_file_name = "/var/tmp/checkpkg_test_data_%s.py" % sanitized_pkgname logging.warn("Saving test data to %s." % repr(data_file_name)) @@ -194,22 +190,46 @@ pkgs_by_filename, filenames_by_soname, pkg_by_any_filename) - print checker.FormatDepsReport(missing_deps, - surplus_deps, - orphan_sonames) + namespace = { + "pkgname": checker.pkgname, + "missing_deps": missing_deps, + "surplus_deps": surplus_deps, + "orphan_sonames": orphan_sonames, + } + t = Template.Template(checkpkg.REPORT_TMPL, searchList=[namespace]) + print unicode(t) for soname in orphan_sonames: - errors.append(checkpkg.Error("The following soname does't belong to " - "any package: %s" % soname)) + errors.append( + checkpkg.CheckpkgTag( + "orphan-soname", + soname)) + for missing_dep in missing_deps: + errors.append( + checkpkg.CheckpkgTag( + "missing-dependency", + missing_dep)) + return errors - if errors: - for error in errors: - logging.error(error) - sys.exit(1) - else: - sys.exit(0) +def main(): + options, args = checkpkg.GetOptions() + pkgnames = args + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.extractdir, + pkgnames, + options.debug) + check_manager.RegisterSetCheck(CheckSharedLibraryConsistency) + + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + if __name__ == '__main__': main() Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py 2010-02-06 15:20:24 UTC (rev 8366) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py 2010-02-06 23:45:25 UTC (rev 8367) @@ -19,7 +19,7 @@ LICENSE_TMPL = "/opt/csw/share/doc/%s/license" -def CheckLicenseFile(pkg): +def CheckLicenseFile(pkg, debug): """Checks for the presence of the license file.""" errors = [] pkgmap = pkg.GetPkgmap() @@ -27,12 +27,9 @@ license_path = LICENSE_TMPL % catalogname if license_path not in pkgmap.entries_by_path: errors.append( - opencsw.PackageError( - "%s file not present in the %s package" - % (repr(license_path), pkg.pkgname))) - errors.append( - opencsw.PackageError( - "See also: http://sourceforge.net/apps/trac/gar/wiki/CopyRight")) + checkpkg.CheckpkgTag( + "license-missing", + msg="See http://sourceforge.net/apps/trac/gar/wiki/CopyRight")) return errors @@ -45,8 +42,12 @@ options.debug) # Registering functions defined above. check_manager.RegisterIndividualCheck(CheckLicenseFile) - exit_code, report = check_manager.Run() - print report.strip() + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() sys.exit(exit_code) Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py 2010-02-06 15:20:24 UTC (rev 8366) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py 2010-02-06 23:45:25 UTC (rev 8367) @@ -22,7 +22,7 @@ # Defining checking functions. -def CheckForMissingSymbols(pkg): +def CheckForMissingSymbols(pkg, debug): """Looks for "symbol not found" in ldd -r output.""" errors = [] binaries = pkg.ListBinaries() @@ -37,9 +37,13 @@ stdout, stderr = ldd_proc.communicate() retcode = ldd_proc.wait() lines = stdout.splitlines() + missing_symbols = False for line in lines: if re.search(symbol_re, line): - errors.append(checkpkg.PackageError("%s: %s" % (pkg.pkgname, line))) + missing_symbols = True + binary_base = os.path.basename(binary) + if missing_symbols: + errors.append(checkpkg.CheckpkgTag("symbol-not-found", binary_base)) return errors @@ -55,8 +59,11 @@ # Registering functions defined above. check_manager.RegisterIndividualCheck(CheckForMissingSymbols) # Running the checks, reporting and exiting. - exit_code, report = check_manager.Run() - print report.strip() + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() sys.exit(exit_code) Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-02-06 15:20:24 UTC (rev 8366) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-02-06 23:45:25 UTC (rev 8367) @@ -26,23 +26,24 @@ }, } -def CheckObsoleteDeps(pkg): +def CheckObsoleteDeps(pkg, debug): """Checks for obsolete dependencies.""" errors = [] deps = set(pkg.GetDependencies()) obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) if obsolete_pkg_deps: for obsolete_pkg in obsolete_pkg_deps: - errors.append( - checkpkg.PackageError( - "Package %s should not depend on %s." - % (pkg.pkgname, obsolete_pkg))) + msg = "" if "hint" in OBSOLETE_DEPS[obsolete_pkg]: - errors.append( - checkpkg.PackageError("Hint: %s" % OBSOLETE_DEPS[obsolete_pkg]["hint"])) + msg += "Hint: %s" % OBSOLETE_DEPS[obsolete_pkg]["hint"] if "url" in OBSOLETE_DEPS[obsolete_pkg]: - errors.append( - checkpkg.PackageError("URL: %s" % OBSOLETE_DEPS[obsolete_pkg]["url"])) + if msg: + msg += ", " + msg += "URL: %s" % OBSOLETE_DEPS[obsolete_pkg]["url"] + if not msg: + msg = None + errors.append( + checkpkg.CheckpkgTag("obsolete-dependency", obsolete_pkg, msg=msg)) return errors @@ -54,8 +55,12 @@ pkgnames, options.debug) check_manager.RegisterIndividualCheck(CheckObsoleteDeps) - exit_code, report = check_manager.Run() - print report.strip() + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() sys.exit(exit_code) Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-02-06 15:20:24 UTC (rev 8366) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-02-06 23:45:25 UTC (rev 8367) @@ -18,16 +18,19 @@ sys.path.append(os.path.join(*path_list)) import checkpkg -# Defining checking functions. +# Defining the checking functions. They come in two flavors: individual +# package checks and set checks. -def MyCheckForAsinglePackage(pkg): +def MyCheckForAsinglePackage(pkg, debug): """Checks an individual package. Gets a DirctoryFormatPackage as an argument, and returns a list of errors. - Errors should be a list of checkpkg.PackageError objects: + Errors should be a list of checkpkg.CheckpkgTag objects: + errors.append(checkpkg.CheckpkgTag("tag-name")) - errors.append(checkpkg.PackageError("There's something wrong.")) + You can also add a parameter: + errors.append(checkpkg.CheckpkgTag("tag-name", "/opt/csw/bin/problem")) """ errors = [] # Checking code for an individual package goes here. See the @@ -37,11 +40,11 @@ # Here's how to report an error: something_is_wrong = False if something_is_wrong: - errors.append(checkpkg.PackageError("There's something wrong.")) + errors.append(checkpkg.CheckpkgTag("example-problem", "thing")) return errors -def MyCheckForAsetOfPackages(pkgs): +def MyCheckForAsetOfPackages(pkgs, debug): """Checks a set of packages. Sometimes individual checks aren't enough. If you need to write code which @@ -67,8 +70,11 @@ check_manager.RegisterIndividualCheck(MyCheckForAsinglePackage) check_manager.RegisterSetCheck(MyCheckForAsetOfPackages) # Running the checks, reporting and exiting. - exit_code, report = check_manager.Run() - print report.strip() + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() sys.exit(exit_code) Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-06 15:20:24 UTC (rev 8366) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-06 23:45:25 UTC (rev 8367) @@ -80,6 +80,18 @@ #end if """ +# http://www.cheetahtemplate.org/docs/users_guide_html_multipage/language.directives.closures.html +TAG_REPORT_TMPL = u"""#if $errors +# Tags reported by $name module +#for $pkgname in $errors +#for $tag in $errors[$pkgname] +$pkgname: ${tag.tag_name}#if $tag.tag_info# $tag.tag_info#end if# +#end for +#end for +#end if +""" + + class Error(Exception): pass @@ -99,6 +111,8 @@ parser.add_option("-d", "--debug", dest="debug", default=False, action="store_true", help="Turn on debugging messages") + parser.add_option("-o", "--output", dest="output", + help="Output error tag file") (options, args) = parser.parse_args() if not options.extractdir: raise ConfigurationError("ERROR: -e option is missing.") @@ -106,29 +120,18 @@ return options, set(args) -class CheckpkgBase(opencsw.DirectoryFormatPackage): - """This class has functionality overlapping with DirectoryFormatPackage - from the opencsw.py library. The classes should be merged. - """ +def FormatDepsReport(pkgname, missing_deps, surplus_deps, orphan_sonames): + """To be removed.""" + namespace = { + "pkgname": pkgname, + "missing_deps": missing_deps, + "surplus_deps": surplus_deps, + "orphan_sonames": orphan_sonames, + } + t = Template.Template(REPORT_TMPL, searchList=[namespace]) + return unicode(t) - def __init__(self, extractdir, pkgname): - self.extractdir = extractdir - self.pkgname = pkgname - self.pkgpath = os.path.join(self.extractdir, self.pkgname) - super(CheckpkgBase, self).__init__(self.pkgpath) - def FormatDepsReport(self, missing_deps, surplus_deps, orphan_sonames): - """To be removed.""" - namespace = { - "pkgname": self.pkgname, - "missing_deps": missing_deps, - "surplus_deps": surplus_deps, - "orphan_sonames": orphan_sonames, - } - t = Template.Template(REPORT_TMPL, searchList=[namespace]) - return unicode(t) - - class SystemPkgmap(object): """A class to hold and manipulate the /var/sadm/install/contents file. @@ -534,6 +537,20 @@ return binary_data +class CheckpkgTag(object): + """Represents a tag to be written to the checkpkg tag file.""" + + def __init__(self, tag_name, tag_info=None, severity=None, msg=None): + self.tag_name = tag_name + self.tag_info = tag_info + self.severity = severity + self.msg = msg + + def __repr__(self): + return (u"CheckpkgTag(%s, %s, ...)" + % (repr(self.tag_name), repr(self.tag_info))) + + class CheckpkgManager(object): """Takes care of calling checking functions""" @@ -553,31 +570,130 @@ def RegisterSetCheck(self, function): self.set_checks.append(function) - def Run(self): - """Runs all the checks - - Returns a tuple of an exit code and a report. - """ + def GetDirectoryFormatPackages(self): packages = [] - errors = {} for pkgname in self.pkgname_list: pkg_path = os.path.join(self.extractdir, pkgname) packages.append(opencsw.DirectoryFormatPackage(pkg_path)) + return packages + + def GetAllTags(self, packages): + errors = {} for pkg in packages: for function in self.individual_checks: - errors_for_pkg = function(pkg) + errors_for_pkg = function(pkg, debug=self.debug) if errors_for_pkg: errors[pkg.pkgname] = errors_for_pkg # Set checks for function in self.set_checks: - set_errors = function(packages) + set_errors = function(packages, debug=self.debug) if set_errors: - errors["The package set"] = set_errors + errors["package-set"] = set_errors + return errors + + def FormatReports(self, errors): namespace = { "name": self.name, "errors": errors, "debug": self.debug, } - t = Template.Template(ERROR_REPORT_TMPL, searchList=[namespace]) - exit_code = bool(errors) - return (exit_code, unicode(t)) + screen_t = Template.Template(ERROR_REPORT_TMPL, searchList=[namespace]) + tags_report_t = Template.Template(TAG_REPORT_TMPL, searchList=[namespace]) + screen_report = unicode(screen_t) + tags_report = unicode(tags_report_t) + return screen_report, tags_report + + def Run(self): + """Runs all the checks + + Returns a tuple of an exit code and a report. + """ + packages = self.GetDirectoryFormatPackages() + errors = self.GetAllTags(packages) + screen_report, tags_report = self.FormatReports(errors) + exit_code = 0 + return (exit_code, screen_report, tags_report) + + +def ParseTagLine(line): + """Parses a line from the tag.${module} file. + + Returns a triplet of pkgname, tagname, tag_info. + """ + level_1 = line.strip().split(":") + if len(level_1) > 1: + data_1 = level_1[1] + pkgname = level_1[0] + else: + data_1 = level_1[0] + pkgname = None + level_2 = re.split(WS_RE, data_1.strip()) + tag_name = level_2[0] + if len(level_2) > 1: + tag_info = " ".join(level_2[1:]) + else: + tag_info = None + return (pkgname, tag_name, tag_info) + + +class Override(object): + """Represents an override of a certain checkpkg tag. + + It's similar to checkpkg.CheckpkgTag, but serves a different purpose. + """ + + def __init__(self, pkgname, tag_name, tag_info): + self.pkgname = pkgname + self.tag_name = tag_name + self.tag_info = tag_info + + def __repr__(self): + return (u"Override(%s, %s, %s)" + % (self.pkgname, self.tag_name, self.tag_info)) + + def DoesApply(self, pkgname, tag): + """Figures out if this override applies to the given tag.""" + basket_a = {} + basket_b = {} + if self.pkgname: + basket_a["pkgname"] = self.pkgname + basket_b["pkgname"] = pkgname + if self.tag_info: + basket_a["tag_info"] = self.tag_info + basket_b["tag_info"] = tag.tag_info + basket_a["tag_name"] = self.tag_name + basket_b["tag_name"] = tag.tag_name + # print "comparing", basket_a, basket_b + return basket_a == basket_b + +def ParseOverrideLine(line): + level_1 = line.split(":") + if len(level_1) > 1: + pkgname = level_1[0] + data_1 = level_1[1] + else: + pkgname = None + data_1 = level_1[0] + level_2 = re.split(WS_RE, data_1.strip()) + if len(level_2) > 1: + tag_name = level_2[0] + tag_info = " ".join(level_2[1:]) + else: + tag_name = level_2[0] + tag_info = None + return Override(pkgname, tag_name, tag_info) + + +def ApplyOverrides(error_tags, overrides): + """Filters out all the error tags that overrides apply to.""" + tags_after_overrides = [] + # This can be done more efficiently after creating indexes, but I'm going to + # do an O(N*M) as if I didn't know anything about programming. :-P + for pkgname, tag in error_tags: + override_applies = False + for override in overrides: + if override.DoesApply(pkgname, tag): + override_applies = True + if not override_applies: + tags_after_overrides.append((pkgname, tag)) + return tags_after_overrides Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-06 15:20:24 UTC (rev 8366) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-06 23:45:25 UTC (rev 8367) @@ -5,6 +5,7 @@ import mox import difflib import checkpkg +import opencsw import testdata.checkpkg_test_data_CSWmysql51rt as d1 import testdata.checkpkg_test_data_CSWmysql51client as d2 import testdata.checkpkg_test_data_CSWmysql51 as d3 @@ -556,8 +557,8 @@ missing_deps = set([u'SUNWgss', u'*SUNWlxsl']) surplus_deps = set(['CSWsudo', 'CSWlibxslt']) orphan_sonames = set([u'libm.so.2']) - testdata = (missing_deps, surplus_deps, orphan_sonames) - checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") + testdata = ("CSWfoo", missing_deps, surplus_deps, orphan_sonames) + checker = opencsw.DirectoryFormatPackage("/tmp/nonexistent/CSWfoo") expected = u"""# CSWfoo: # SUGGESTION: you may want to add some or all of the following as depends: # (Feel free to ignore SUNW or SPRO packages) @@ -569,19 +570,151 @@ # The following required sonames would not be found at runtime: # ! libm.so.2 """ - result = checker.FormatDepsReport(*testdata) + result = checkpkg.FormatDepsReport(*testdata) self.AssertTextEqual(result, expected) def testNone(self): missing_deps = set([]) surplus_deps = set([]) orphan_sonames = set([]) - testdata = (missing_deps, surplus_deps, orphan_sonames) - checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") + testdata = ("CSWfoo", missing_deps, surplus_deps, orphan_sonames) + checker = opencsw.DirectoryFormatPackage("/tmp/nonexistent/CSWfoo") expected = u"" - result = checker.FormatDepsReport(*testdata) + result = checkpkg.FormatDepsReport(*testdata) self.AssertTextEqual(result, expected) +class CheckpkgTagsUnitTest(unittest.TestCase): + + def test_1(self): + m = checkpkg.CheckpkgManager("testname", "/tmp", ["CSWfoo"]) + tags = { + "CSWfoo": [ + checkpkg.CheckpkgTag("foo-tag", "foo-info"), + ], + } + screen_report, tags_report = m.FormatReports(tags) + expected = u'# Tags reported by testname module\nCSWfoo: foo-tag foo-info\n' + self.assertEqual(expected, tags_report) + + def test_2(self): + m = checkpkg.CheckpkgManager("testname", "/tmp", ["CSWfoo"]) + tags = { + "CSWfoo": [ + checkpkg.CheckpkgTag("foo-tag", "foo-info"), + checkpkg.CheckpkgTag("bar-tag", "bar-info"), + checkpkg.CheckpkgTag("baz-tag"), + ], + } + screen_report, tags_report = m.FormatReports(tags) + expected = (u'# Tags reported by testname module\n' + u'CSWfoo: foo-tag foo-info\n' + u'CSWfoo: bar-tag bar-info\n' + u'CSWfoo: baz-tag\n') + self.assertEqual(expected, tags_report) + + def testParseTagLine1(self): + line = "foo-tag" + self.assertEquals((None, "foo-tag", None), checkpkg.ParseTagLine(line)) + + def testParseTagLine2(self): + line = "CSWfoo: foo-tag" + self.assertEquals(("CSWfoo", "foo-tag", None), checkpkg.ParseTagLine(line)) + + def testParseTagLine3(self): + line = "CSWfoo: foo-tag foo-info" + self.assertEquals(("CSWfoo", "foo-tag", "foo-info"), checkpkg.ParseTagLine(line)) + + def testParseTagLine4(self): + line = "CSWfoo: foo-tag foo-info1 foo-info2" + self.assertEquals(("CSWfoo", "foo-tag", "foo-info1 foo-info2"), checkpkg.ParseTagLine(line)) + + +class ParseOverrideLineUnitTest(unittest.TestCase): + + def setUp(self): + line1 = "CSWfoo: foo-override" + line2 = "CSWfoo: foo-override foo-info" + line3 = "CSWfoo: foo-override foo-info-1 foo-info-2" + self.o1 = checkpkg.ParseOverrideLine(line1) + self.o2 = checkpkg.ParseOverrideLine(line2) + self.o3 = checkpkg.ParseOverrideLine(line3) + + def test_ParseOverridesLine1(self): + self.assertEqual("CSWfoo", self.o1.pkgname) + + def test_ParseOverridesLine2(self): + self.assertEqual("foo-override", self.o1.tag_name) + + def test_ParseOverridesLine3(self): + self.assertEqual(None, self.o1.tag_info) + + def test_ParseOverridesLine4(self): + self.assertEqual("foo-info", self.o2.tag_info) + + def test_ParseOverridesLine5(self): + self.assertEqual("CSWfoo", self.o3.pkgname) + + def test_ParseOverridesLine6(self): + self.assertEqual("foo-override", self.o3.tag_name) + + def test_ParseOverridesLine7(self): + self.assertEqual("foo-info-1 foo-info-2", self.o3.tag_info) + + +class ApplyOverridesUnitTest(unittest.TestCase): + + # This would be better, more terse. But requires metaclasses. + DATA_1 = ( + (None, 'tag1', 'info1', None, 'tag1', 'info1', None), + ) + + def test_1a(self): + """One tag, no overrides.""" + tags = [(None, checkpkg.CheckpkgTag("foo-tag"))] + overrides = [] + self.assertEqual(tags, checkpkg.ApplyOverrides(tags, overrides)) + + def test_1b(self): + """One override, matching by tag name only.""" + tags = [(None, checkpkg.CheckpkgTag("foo-tag"))] + overrides = [checkpkg.Override(None, "foo-tag", None)] + self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) + + def test_1c(self): + """One override, matching by tag name only, no pkgname.""" + tags = [(None, checkpkg.CheckpkgTag("foo-tag"))] + overrides = [checkpkg.Override(None, "foo-tag", None)] + self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) + + def test_2(self): + """One override, matching by tag name and tag info, no pkgname.""" + tags = [(None, checkpkg.CheckpkgTag("foo-tag", "tag-info-1"))] + overrides = [checkpkg.Override(None, "foo-tag", None)] + self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) + + def test_3(self): + """One override, matching by tag name, mismatching tag info, no pkgname.""" + tags = [(None, checkpkg.CheckpkgTag("foo-tag", "tag-info-1"))] + overrides = [checkpkg.Override(None, "foo-tag", "tag-info-2")] + self.assertEqual(tags, checkpkg.ApplyOverrides(tags, overrides)) + + def test_4(self): + tags = [("CSWfoo", checkpkg.CheckpkgTag("foo-tag", "tag-info-1"))] + overrides = [checkpkg.Override(None, "foo-tag", "tag-info-1")] + self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) + + def test_5(self): + tags = [("CSWfoo", checkpkg.CheckpkgTag("foo-tag", "tag-info-1"))] + overrides = [checkpkg.Override("CSWfoo", "foo-tag", "tag-info-1")] + self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) + + def test_5(self): + """Pkgname mismatch.""" + tags = [("CSWfoo", checkpkg.CheckpkgTag("foo-tag", "tag-info-1"))] + overrides = [checkpkg.Override("CSWbar", "foo-tag", "tag-info-1")] + self.assertEqual(tags, checkpkg.ApplyOverrides(tags, overrides)) + + if __name__ == '__main__': unittest.main() Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-06 15:20:24 UTC (rev 8366) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-06 23:45:25 UTC (rev 8367) @@ -23,6 +23,7 @@ import subprocess import tempfile import urllib2 +import checkpkg ARCHITECTURES = ["i386", "sparc", "all"] MAJOR_VERSION = "major version" @@ -536,6 +537,7 @@ def __init__(self, directory): self.directory = directory self.pkgname = os.path.split(directory)[1] + self.pkgpath = self.directory self.pkginfo_dict = None def GetCatalogname(self): @@ -694,7 +696,37 @@ file_basenames.extend(files) return file_basenames + def _GetOverridesStream(self): + catalogname = self.GetCatalogname() + file_path = os.path.join(self.directory, + "root", + "opt/csw/share/checkpkg/overrides", + catalogname) + # This might potentially cause a file descriptor leak, but I'm not going to + # worry about that at this stage. + logging.debug("Trying to open %s", repr(file_path)) + if os.path.isfile(file_path): + return open(file_path, "r") + else: + return None + def _ParseOverridesStream(self, stream): + overrides = [] + for line in stream: + if line.startswith("#"): + continue + overrides.append(checkpkg.ParseOverrideLine(line)) + return overrides + + def GetOverrides(self): + """Returns overrides, a list of checkpkg.Override instances.""" + stream = self._GetOverridesStream() + if stream: + return self._ParseOverridesStream(stream) + else: + return list() + + class Pkgmap(object): """Represents the pkgmap of the package. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Feb 7 05:10:38 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 07 Feb 2010 04:10:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8368] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 8368 http://gar.svn.sourceforge.net/gar/?rev=8368&view=rev Author: bdwalton Date: 2010-02-07 04:10:38 +0000 (Sun, 07 Feb 2010) Log Message: ----------- ruby19: stuff in a bunch of the package splitting stuff (from ruby 1.8, mostly) Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-02-06 23:45:25 UTC (rev 8367) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-02-07 04:10:38 UTC (rev 8368) @@ -3,13 +3,54 @@ PATCHLEVEL = p376 CATEGORIES = lang +TEST_SCRIPTS = + DISTNAME = ruby-$(GARVERSION)-$(PATCHLEVEL) -DESCRIPTION = Brief description +DESCRIPTION = An object-oriented language for quick and easy programming. define BLURB - Long description + Ruby is a language for quick and easy programming. Similar in scope to Perl + and Python, it has high-level data types, automatic memory management, + dynamic typing, a module system, exceptions, and a rich standard library. + What sets Ruby apart is a clean and consistent language design where + everything is an object. Other distinguishing features are CLU-style + iterators for loop abstraction, singleton classes/methods and lexical + closures. endef +PACKAGES = CSWruby19 CSWruby19doc CSWruby19tk CSWruby19dev CSWruby19mode CSWruby19modeel + +ARCHALL_CSWruby19doc = 1 +ARCHALL_CSWruby19mode = 1 +ARCHALL_CSWruby19modeel = 1 + +RUNTIME_DEP_PKGS_CSWruby19doc = CSWruby19 +RUNTIME_DEP_PKGS_CSWruby19tk = CSWruby19 CSWtk CSWtcl +RUNTIME_DEP_PKGS_CSWruby19mode = CSWemacscommon +RUNTIME_DEP_PKGS_CSWruby19modeel = CSWemacscommon + +CATALOGNAME_CSWruby19modeel = ruby19mode_el + +SPKG_DESC_CSWruby19doc = Documentation for Ruby 1.9 + +SPKG_DESC_CSWruby19tk = Ruby 1.9 Tcl/TK Extension + +SPKG_DESC_CSWruby19dev = Ruby 1.9 Extension Development Files + +SPKG_DESC_CSWruby19mode = Ruby 1.9 major mode for Emacs + +SPKG_DESC_CSWruby19modeel = Elisp source for ruby 1.9 mode + +PKGFILES_CSWruby19doc = $(datadir)/ri/.* $(docdir)/ruby19/sample.* + +PKGFILES_CSWruby19tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb + +PKGFILES_CSWruby19dev = $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a + +PKGFILES_CSWruby19mode = $(datadir)/emacs/site-lisp/.*elc$ + +PKGFILES_CSWruby19modeel = $(datadir)/emacs/site-lisp/.*el$ + MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/1.9/ DISTFILES = $(DISTNAME).tar.gz @@ -34,3 +75,54 @@ else SOS11_LD_FLAGS = endif + +MERGE_EXCLUDE_STATICLIBS = + +COMPILE_ELISP = 1 + +PI_TARGETS = samples rbconfig rbscripts rubymode + +post-install-modulated: $(PI_TARGETS) + @$(MAKECOOKIE) + +multiconfig: + @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" + @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS11 + @gcp $(FILEDIR)/rbconfig.rb.GCC4.$(GARCH) $(DESTDIR)/$(RBCONFIG).GCC4 + @gln -n -s $(RBCONFIG).SOS11 $(DESTDIR)$(RBCONFIG) + @gcp $(FILEDIR)/cswrbconfig $(DESTDIR)/opt/csw/bin/ + @chmod 755 $(DESTDIR)/opt/csw/bin/cswrbconfig + @ginstall -c -d -m 0755 $(DESTDIR)$(docdir)/ruby/ + @ginstall -c -m 0644 $(FILEDIR)/README.csw $(DESTDIR)$(docdir)/ruby/ + @$(MAKECONFIG) + +rubymode: RMDIR=$(DESTDIR)/$(datadir)/emacs/site-lisp/ruby-mode +rubymode: + @echo " ===> Installing and Compilingn ruby-mode elisp" + @(mkdir -p $(RMDIR); \ + cp $(WORKSRC)/misc/*el $(RMDIR)) + @$(MAKECOOKIE) + +# Fix up rbconfig +rbconfig: + @gsed -i -e s,$(DESTDIR),, \ + $(DESTDIR)$(libdir)/$(GARNAME)/$(GARVERSION)/$(GARCH)-solaris2.8/rbconfig.rb + @$(MAKECOOKIE) + +# Copy samples +samples: + @mkdir -p $(DESTDIR)$(docdir)/ruby/ + @cp -R $(WORKSRC_FIRSTMOD)/sample $(DESTDIR)$(docdir)/ruby/ + @for ext in bigdecimal dl tk ; do \ + cp -R $(WORKSRC_FIRSTMOD)/ext/$$ext/sample $(DESTDIR)$(docdir)/ruby/sample/$$ext ; \ + done + @$(MAKECOOKIE) + +# Some scripts come with /usr/local/bin/ruby hard coded. +rbscripts: + @echo " ==> Fixing shebang path in distributed ruby scripts" + @find $(DESTDIR)$(prefix) -type f -name '*.rb' -exec \ + perl -i -plne "s{^#!/usr/local/bin/ruby}{#!$(bindir)/ruby}g" {} \; + @$(MAKECOOKIE) + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Feb 7 12:06:43 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 07 Feb 2010 11:06:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8369] csw/mgar/gar/v2 Message-ID: Revision: 8369 http://gar.svn.sourceforge.net/gar/?rev=8369&view=rev Author: wahwah Date: 2010-02-07 11:06:43 +0000 (Sun, 07 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, refactored CheckpkgTag to include pkgname for better screen output Modified Paths: -------------- csw/mgar/gar/v2/bin/analyze_module_results.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py Modified: csw/mgar/gar/v2/bin/analyze_module_results.py =================================================================== --- csw/mgar/gar/v2/bin/analyze_module_results.py 2010-02-07 04:10:38 UTC (rev 8368) +++ csw/mgar/gar/v2/bin/analyze_module_results.py 2010-02-07 11:06:43 UTC (rev 8369) @@ -32,7 +32,7 @@ if line.startswith("#"): continue pkgname, tag_name, tag_info = checkpkg.ParseTagLine(line) - error_tags.append((pkgname, checkpkg.CheckpkgTag(tag_name, tag_info))) + error_tags.append(checkpkg.CheckpkgTag(pkgname, tag_name, tag_info)) overrides = reduce(lambda x, y: x + y, overrides_list) tags_after_overrides = checkpkg.ApplyOverrides(error_tags, overrides) exit_code = bool(tags_after_overrides) Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py 2010-02-07 04:10:38 UTC (rev 8368) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py 2010-02-07 11:06:43 UTC (rev 8369) @@ -33,13 +33,14 @@ only_in_pkgmap = pkgmap_classes.difference(pkginfo_classes) for action_class in only_in_pkginfo: error = checkpkg.CheckpkgTag( + pkg.pkgname, "action-class-only-in-pkginfo", action_class, msg="This shouldn't cause any problems, but it might be not necessary.") errors.append(error) for action_class in only_in_pkgmap: errors.append( - checkpkg.CheckpkgTag("action-class-only-in-pkgmap", action_class)) + checkpkg.CheckpkgTag(pkg.pkgname, "action-class-only-in-pkgmap", action_class)) return errors Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py 2010-02-07 04:10:38 UTC (rev 8368) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py 2010-02-07 11:06:43 UTC (rev 8369) @@ -24,7 +24,7 @@ arch = pkginfo["ARCH"] if binaries and arch == "all": for binary in binaries: - errors.append(checkpkg.CheckpkgTag("archall-with-binaries"), binary) + errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "archall-with-binaries"), binary) elif not binaries and arch != "all": # This is not a clean way of handling messages for the user, but there's # not better way at the moment. Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-02-07 04:10:38 UTC (rev 8368) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-02-07 11:06:43 UTC (rev 8369) @@ -202,11 +202,13 @@ for soname in orphan_sonames: errors.append( checkpkg.CheckpkgTag( + pkgname, "orphan-soname", soname)) for missing_dep in missing_deps: errors.append( checkpkg.CheckpkgTag( + pkgname, "missing-dependency", missing_dep)) return errors Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py 2010-02-07 04:10:38 UTC (rev 8368) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py 2010-02-07 11:06:43 UTC (rev 8369) @@ -28,6 +28,7 @@ if license_path not in pkgmap.entries_by_path: errors.append( checkpkg.CheckpkgTag( + pkg.pkgname, "license-missing", msg="See http://sourceforge.net/apps/trac/gar/wiki/CopyRight")) return errors Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py 2010-02-07 04:10:38 UTC (rev 8368) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py 2010-02-07 11:06:43 UTC (rev 8369) @@ -43,7 +43,7 @@ missing_symbols = True binary_base = os.path.basename(binary) if missing_symbols: - errors.append(checkpkg.CheckpkgTag("symbol-not-found", binary_base)) + errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "symbol-not-found", binary_base)) return errors Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-02-07 04:10:38 UTC (rev 8368) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-02-07 11:06:43 UTC (rev 8369) @@ -43,7 +43,8 @@ if not msg: msg = None errors.append( - checkpkg.CheckpkgTag("obsolete-dependency", obsolete_pkg, msg=msg)) + checkpkg.CheckpkgTag(pkg.pkgname, "obsolete-dependency", + obsolete_pkg, msg=msg)) return errors Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-02-07 04:10:38 UTC (rev 8368) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-02-07 11:06:43 UTC (rev 8369) @@ -27,10 +27,10 @@ Gets a DirctoryFormatPackage as an argument, and returns a list of errors. Errors should be a list of checkpkg.CheckpkgTag objects: - errors.append(checkpkg.CheckpkgTag("tag-name")) + errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "tag-name")) You can also add a parameter: - errors.append(checkpkg.CheckpkgTag("tag-name", "/opt/csw/bin/problem")) + errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "tag-name", "/opt/csw/bin/problem")) """ errors = [] # Checking code for an individual package goes here. See the @@ -40,7 +40,7 @@ # Here's how to report an error: something_is_wrong = False if something_is_wrong: - errors.append(checkpkg.CheckpkgTag("example-problem", "thing")) + errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "example-problem", "thing")) return errors Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-07 04:10:38 UTC (rev 8368) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-07 11:06:43 UTC (rev 8369) @@ -540,15 +540,16 @@ class CheckpkgTag(object): """Represents a tag to be written to the checkpkg tag file.""" - def __init__(self, tag_name, tag_info=None, severity=None, msg=None): + def __init__(self, pkgname, tag_name, tag_info=None, severity=None, msg=None): + self.pkgname = pkgname self.tag_name = tag_name self.tag_info = tag_info self.severity = severity self.msg = msg def __repr__(self): - return (u"CheckpkgTag(%s, %s, ...)" - % (repr(self.tag_name), repr(self.tag_info))) + return (u"CheckpkgTag(%s, %s, %s, ...)" + % (repr(self.pkgname), repr(self.tag_name), repr(self.tag_info))) class CheckpkgManager(object): @@ -588,7 +589,17 @@ for function in self.set_checks: set_errors = function(packages, debug=self.debug) if set_errors: - errors["package-set"] = set_errors + # These were generated by a set, but are likely to be bound to specific + # packages. We'll try to preserve the package assignments. + for tag in set_errors: + if tag.pkgname: + if not tag.pkgname in errors: + errors[tag.pkgname] = [] + errors[tag.pkgname].append(tag) + else: + if "package-set" not in errors: + errors["package-set"] = [] + errors["package-set"].append(error) return errors def FormatReports(self, errors): @@ -651,13 +662,13 @@ return (u"Override(%s, %s, %s)" % (self.pkgname, self.tag_name, self.tag_info)) - def DoesApply(self, pkgname, tag): + def DoesApply(self, tag): """Figures out if this override applies to the given tag.""" basket_a = {} basket_b = {} if self.pkgname: basket_a["pkgname"] = self.pkgname - basket_b["pkgname"] = pkgname + basket_b["pkgname"] = tag.pkgname if self.tag_info: basket_a["tag_info"] = self.tag_info basket_b["tag_info"] = tag.tag_info @@ -685,15 +696,16 @@ def ApplyOverrides(error_tags, overrides): - """Filters out all the error tags that overrides apply to.""" + """Filters out all the error tags that overrides apply to. + + O(N * M), but N and M are always small. + """ tags_after_overrides = [] - # This can be done more efficiently after creating indexes, but I'm going to - # do an O(N*M) as if I didn't know anything about programming. :-P - for pkgname, tag in error_tags: + for tag in error_tags: override_applies = False for override in overrides: - if override.DoesApply(pkgname, tag): + if override.DoesApply(tag): override_applies = True if not override_applies: - tags_after_overrides.append((pkgname, tag)) + tags_after_overrides.append(tag) return tags_after_overrides Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-07 04:10:38 UTC (rev 8368) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-07 11:06:43 UTC (rev 8369) @@ -590,7 +590,7 @@ m = checkpkg.CheckpkgManager("testname", "/tmp", ["CSWfoo"]) tags = { "CSWfoo": [ - checkpkg.CheckpkgTag("foo-tag", "foo-info"), + checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "foo-info"), ], } screen_report, tags_report = m.FormatReports(tags) @@ -601,9 +601,9 @@ m = checkpkg.CheckpkgManager("testname", "/tmp", ["CSWfoo"]) tags = { "CSWfoo": [ - checkpkg.CheckpkgTag("foo-tag", "foo-info"), - checkpkg.CheckpkgTag("bar-tag", "bar-info"), - checkpkg.CheckpkgTag("baz-tag"), + checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "foo-info"), + checkpkg.CheckpkgTag("CSWfoo", "bar-tag", "bar-info"), + checkpkg.CheckpkgTag("CSWfoo", "baz-tag"), ], } screen_report, tags_report = m.FormatReports(tags) @@ -671,47 +671,47 @@ def test_1a(self): """One tag, no overrides.""" - tags = [(None, checkpkg.CheckpkgTag("foo-tag"))] + tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag")] overrides = [] self.assertEqual(tags, checkpkg.ApplyOverrides(tags, overrides)) def test_1b(self): """One override, matching by tag name only.""" - tags = [(None, checkpkg.CheckpkgTag("foo-tag"))] + tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag")] overrides = [checkpkg.Override(None, "foo-tag", None)] self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) def test_1c(self): """One override, matching by tag name only, no pkgname.""" - tags = [(None, checkpkg.CheckpkgTag("foo-tag"))] + tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag")] overrides = [checkpkg.Override(None, "foo-tag", None)] self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) def test_2(self): """One override, matching by tag name and tag info, no pkgname.""" - tags = [(None, checkpkg.CheckpkgTag("foo-tag", "tag-info-1"))] + tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag")] overrides = [checkpkg.Override(None, "foo-tag", None)] self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) def test_3(self): """One override, matching by tag name, mismatching tag info, no pkgname.""" - tags = [(None, checkpkg.CheckpkgTag("foo-tag", "tag-info-1"))] + tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")] overrides = [checkpkg.Override(None, "foo-tag", "tag-info-2")] self.assertEqual(tags, checkpkg.ApplyOverrides(tags, overrides)) def test_4(self): - tags = [("CSWfoo", checkpkg.CheckpkgTag("foo-tag", "tag-info-1"))] + tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")] overrides = [checkpkg.Override(None, "foo-tag", "tag-info-1")] self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) def test_5(self): - tags = [("CSWfoo", checkpkg.CheckpkgTag("foo-tag", "tag-info-1"))] + tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")] overrides = [checkpkg.Override("CSWfoo", "foo-tag", "tag-info-1")] self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) def test_5(self): """Pkgname mismatch.""" - tags = [("CSWfoo", checkpkg.CheckpkgTag("foo-tag", "tag-info-1"))] + tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")] overrides = [checkpkg.Override("CSWbar", "foo-tag", "tag-info-1")] self.assertEqual(tags, checkpkg.ApplyOverrides(tags, overrides)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Feb 7 12:26:11 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 07 Feb 2010 11:26:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8370] csw/mgar/pkg Message-ID: Revision: 8370 http://gar.svn.sourceforge.net/gar/?rev=8370&view=rev Author: hson Date: 2010-02-07 11:26:11 +0000 (Sun, 07 Feb 2010) Log Message: ----------- eggdbus: Initial commit Added Paths: ----------- csw/mgar/pkg/eggdbus/ csw/mgar/pkg/eggdbus/Makefile csw/mgar/pkg/eggdbus/branches/ csw/mgar/pkg/eggdbus/tags/ csw/mgar/pkg/eggdbus/trunk/ csw/mgar/pkg/eggdbus/trunk/Makefile csw/mgar/pkg/eggdbus/trunk/checksums csw/mgar/pkg/eggdbus/trunk/files/ Added: csw/mgar/pkg/eggdbus/Makefile =================================================================== --- csw/mgar/pkg/eggdbus/Makefile (rev 0) +++ csw/mgar/pkg/eggdbus/Makefile 2010-02-07 11:26:11 UTC (rev 8370) @@ -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/eggdbus/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/eggdbus/trunk/Makefile =================================================================== --- csw/mgar/pkg/eggdbus/trunk/Makefile (rev 0) +++ csw/mgar/pkg/eggdbus/trunk/Makefile 2010-02-07 11:26:11 UTC (rev 8370) @@ -0,0 +1,54 @@ +GARNAME = eggdbus +GARVERSION = 0.6 +CATEGORIES = lib + +DESCRIPTION = EggDbus +define BLURB +endef + +MASTER_SITES = http://cgit.freedesktop.org/~david/eggdbus/snapshot/ +#DISTNAME = PolicyKit-$(GARVERSION) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWeggdbus CSWeggdbusdevel +CATALOGNAME_CSWeggdbus = eggdbus +CATALOGNAME_CSWeggdbusdevel = eggdbus_devel +SPKG_DESC_CSWeggdbus = eggdbus is an implementation of XMP +SPKG_DESC_CSWeggdbusdevel = eggdbus is an implementation of XMP - developer package + +#REQUIRED_PKGS_CSWeggdbus += CSWexpat CSWstlport CSWzlib CSWiconv +#REQUIRED_PKGS_CSWeggdbusdevel += CSWeggdbus + +#PREREQUISITE_PKGS += $(REQUIRED_PKGS_CSWeggdbus) + +PKGFILES_CSWeggdbusdevel = $(PKGFILES_DEVEL) + +SPKG_SOURCEURL = http://cgit.freedesktop.org/~david/eggdbus + +#CONFIGURE_SCRIPTS += $(WORKSRC)/autogen.sh +#CONFIGURE_SCRIPTS += $(WORKSRC)/configure + +BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +pre-configure-modulated: + @echo " ==> Regenerating build tools..." + @( cd $(WORKSRC) ; ./autogen.sh ) + @$(MAKECOOKIE) + +#pre-configure-modulated: +# @echo " ==> Regenerating build tools..." +# @(cd $(WORKSRC) ; \ +# aclocal && \ +# autoconf && \ +# libtoolize --automake --force && \ +# aclocal && \ +# automake -a ) +# @$(MAKECOOKIE) Added: csw/mgar/pkg/eggdbus/trunk/checksums =================================================================== --- csw/mgar/pkg/eggdbus/trunk/checksums (rev 0) +++ csw/mgar/pkg/eggdbus/trunk/checksums 2010-02-07 11:26:11 UTC (rev 8370) @@ -0,0 +1 @@ +0a111faa54dfba2cf432c2c8e8a76e06 eggdbus-0.6.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Feb 7 12:29:00 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 07 Feb 2010 11:29:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8371] csw/mgar/pkg Message-ID: Revision: 8371 http://gar.svn.sourceforge.net/gar/?rev=8371&view=rev Author: hson Date: 2010-02-07 11:29:00 +0000 (Sun, 07 Feb 2010) Log Message: ----------- gnome-mime-data: Initial commit Added Paths: ----------- csw/mgar/pkg/gnome-mime-data/ csw/mgar/pkg/gnome-mime-data/Makefile csw/mgar/pkg/gnome-mime-data/branches/ csw/mgar/pkg/gnome-mime-data/tags/ csw/mgar/pkg/gnome-mime-data/trunk/ csw/mgar/pkg/gnome-mime-data/trunk/Makefile csw/mgar/pkg/gnome-mime-data/trunk/checksums csw/mgar/pkg/gnome-mime-data/trunk/files/ Added: csw/mgar/pkg/gnome-mime-data/Makefile =================================================================== --- csw/mgar/pkg/gnome-mime-data/Makefile (rev 0) +++ csw/mgar/pkg/gnome-mime-data/Makefile 2010-02-07 11:29:00 UTC (rev 8371) @@ -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/gnome-mime-data/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/gnome-mime-data/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-mime-data/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnome-mime-data/trunk/Makefile 2010-02-07 11:29:00 UTC (rev 8371) @@ -0,0 +1,57 @@ +GARNAME = gnome-mime-data +GARVERSION = 2.18.0 +CATEGORIES = gnome + +DESCRIPTION = Library for writing single instance application +define BLURB + Unique is a library for writing single instance application. If you launch + a single instance application twice, the second instance will either just + quit or will send a message to the running instance. + + Unique makes it easy to write this kind of applications, by providing a + base class, taking care of all the IPC machinery needed to send messages + to a running instance, and also handling the startup notification side. +endef + +GNOME_PROJ = gnome-mime-data +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GNOME_PROJ)-$(GARVERSION) + +PACKAGES = CSWgmimedata CSWgmimedatadevel CSWgmimedatadoc +CATALOGNAME_CSWgmimedata = gmimedata +CATALOGNAME_CSWgmimedatadevel = gmimedata_devel +CATALOGNAME_CSWgmimedatadoc = gmimedata_doc + +SPKG_DESC_CSWgmimedata += Library for writing single instance application +SPKG_DESC_CSWgmimedatadevel += Library for writing single instance application - developer package +SPKG_DESC_CSWgmimedatadoc += Library for writing single instance application - documentation + +#REQUIRED_PKGS_CSWgmimedata += CSWfconfig CSWftype2 CSWggettextrt CSWglib2 +#REQUIRED_PKGS_CSWgmimedata += CSWgtk2 CSWlibatk CSWlibcairo CSWlibx11 CSWpango +#REQUIRED_PKGS_CSWgmimedata += CSWdbusglib CSWlibdbus CSWlibxext +REQUIRED_PKGS_CSWgmimedatadevel += CSWgmimedata +REQUIRED_PKGS_CSWgmimedatadoc += CSWgmimedata + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://live.gnome.org/gmimedata + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +BUILD64 = 1 + +PKGFILES_CSWgmimedatadevel = $(PKGFILES_DEVEL) +PKGFILES_CSWgmimedatadoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWgmimedatadoc = 1 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/gnome-mime-data/trunk/checksums =================================================================== --- csw/mgar/pkg/gnome-mime-data/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnome-mime-data/trunk/checksums 2010-02-07 11:29:00 UTC (rev 8371) @@ -0,0 +1 @@ +541858188f80090d12a33b5a7c34d42c gnome-mime-data-2.18.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Feb 7 12:38:09 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 07 Feb 2010 11:38:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8372] csw/mgar/pkg Message-ID: Revision: 8372 http://gar.svn.sourceforge.net/gar/?rev=8372&view=rev Author: hson Date: 2010-02-07 11:38:08 +0000 (Sun, 07 Feb 2010) Log Message: ----------- polkit: Initial commit Added Paths: ----------- csw/mgar/pkg/polkit/ csw/mgar/pkg/polkit/Makefile csw/mgar/pkg/polkit/branches/ csw/mgar/pkg/polkit/tags/ csw/mgar/pkg/polkit/trunk/ csw/mgar/pkg/polkit/trunk/Makefile csw/mgar/pkg/polkit/trunk/checksums csw/mgar/pkg/polkit/trunk/files/ Added: csw/mgar/pkg/polkit/Makefile =================================================================== --- csw/mgar/pkg/polkit/Makefile (rev 0) +++ csw/mgar/pkg/polkit/Makefile 2010-02-07 11:38:08 UTC (rev 8372) @@ -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/polkit/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/polkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/polkit/trunk/Makefile (rev 0) +++ csw/mgar/pkg/polkit/trunk/Makefile 2010-02-07 11:38:08 UTC (rev 8372) @@ -0,0 +1,60 @@ +GARNAME = polkit +GARVERSION = 0.96 +CATEGORIES = lib + +DESCRIPTION = PolicyKit +define BLURB + Exempi is an implementation of XMP. Version 2.x is based on Adobe XMP SDK + 4.1.1 and released under a BSD-style license like Adobe's. The 3 clause + BSD (aka New-BSD) license is compatible with GPL. The licensing is kept + identical in order to allow two-way merging of the code (ie sending our + change to the XMP SDK to Adobe for integration). + + The API is C based and means to be used from any language and be easier + to maintain ABI stability. +endef + +MASTER_SITES = http://cgit.freedesktop.org/PolicyKit/snapshot/ +DISTNAME = PolicyKit-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.bz2 + +UFILES_REGEX = PolicyKit-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWpolkit CSWpolkitdevel +CATALOGNAME_CSWpolkit = polkit +CATALOGNAME_CSWpolkitdevel = polkit_devel +SPKG_DESC_CSWpolkit = polkit is an implementation of XMP +SPKG_DESC_CSWpolkitdevel = polkit is an implementation of XMP - developer package + +RUNTIME_DEP_PKGS_CSWpolkit += CSWexpat CSWstlport CSWzlib CSWiconv +RUNTIME_DEP_PKGS_CSWpolkitdevel += CSWpolkit + +BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWpolkit) + +PKGFILES_CSWpolkitdevel = $(PKGFILES_DEVEL) + +SPKG_SOURCEURL = http://libopenraw.freedesktop.org/wiki/polkit + +CONFIGURE_SCRIPTS += $(WORKSRC)/autogen.sh +#CONFIGURE_SCRIPTS += $(WORKSRC)/configure + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +#pre-configure-modulated: +# @echo " ==> Regenerating build tools..." +# @( cd $(WORKSRC) ; "NOCONFIGURE=1" ./autogen.sh ) +# @$(MAKECOOKIE) + +#pre-configure-modulated: +# @echo " ==> Regenerating build tools..." +# @(cd $(WORKSRC) ; \ +# aclocal && \ +# autoconf && \ +# libtoolize --automake --force && \ +# aclocal && \ +# automake -a ) +# @$(MAKECOOKIE) Added: csw/mgar/pkg/polkit/trunk/checksums =================================================================== --- csw/mgar/pkg/polkit/trunk/checksums (rev 0) +++ csw/mgar/pkg/polkit/trunk/checksums 2010-02-07 11:38:08 UTC (rev 8372) @@ -0,0 +1 @@ +fbd8d49310ad885bd559b55633b548e1 PolicyKit-0.96.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Feb 7 12:58:18 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 07 Feb 2010 11:58:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8373] csw/mgar/pkg/tcl/trunk Message-ID: Revision: 8373 http://gar.svn.sourceforge.net/gar/?rev=8373&view=rev Author: hson Date: 2010-02-07 11:58:17 +0000 (Sun, 07 Feb 2010) Log Message: ----------- tcl: Fixes for amd64 build Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/Makefile csw/mgar/pkg/tcl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tcl/trunk/files/configure.patch csw/mgar/pkg/tcl/trunk/files/tcl.m4.patch Modified: csw/mgar/pkg/tcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2010-02-07 11:38:08 UTC (rev 8372) +++ csw/mgar/pkg/tcl/trunk/Makefile 2010-02-07 11:58:17 UTC (rev 8373) @@ -12,9 +12,10 @@ DISTNAME = $(GARNAME)$(GARVERSION) DISTFILES = $(DISTNAME)-src.tar.gz -# Patch to use libsunmath on x86 from -# http://sourceforge.net/tracker/index.php?func=detail&aid=1839067&group_id=10894&atid=110894 -PATCHFILES = patch-libsunmath-amd64.diff +# Fix for finding libsunmath on i386 and amd64 +PATCHFILES += configure.patch +PATCHFILES += tcl.m4.patch + PATCHDIR = $(WORKDIR)/$(DISTNAME) SPKG_SOURCEURL = http://www.tcl.tk/ @@ -29,6 +30,8 @@ WORKSRC = $(WORKDIR)/$(DISTNAME)/unix +LICENSE = license.terms + INCLUDE_FLAGS = CONFIGURE_ARGS = $(DIRPATHS) @@ -40,3 +43,8 @@ CFLAGS := $(filter-out -I%,$(CFLAGS)) DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS)) + +pre-configure-modulated: + @echo " ==> Regenerating build tools..." + @(cd $(WORKSRC) ; cp -p ../license.terms .; autoconf) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/tcl/trunk/checksums =================================================================== --- csw/mgar/pkg/tcl/trunk/checksums 2010-02-07 11:38:08 UTC (rev 8372) +++ csw/mgar/pkg/tcl/trunk/checksums 2010-02-07 11:58:17 UTC (rev 8373) @@ -1,2 +1,3 @@ -8c1bdbe43c9337c01287d074803d9767 download/patch-libsunmath-amd64.diff -f70ad8f78b5e4a9f792fe101f22b125f download/tcl8.5.7-src.tar.gz +dc8664f3dc92693aaaad68785e4426ae configure.patch +cc9b1bd7ddf8e27e97ef464806885349 tcl.m4.patch +f70ad8f78b5e4a9f792fe101f22b125f tcl8.5.7-src.tar.gz Added: csw/mgar/pkg/tcl/trunk/files/configure.patch =================================================================== --- csw/mgar/pkg/tcl/trunk/files/configure.patch (rev 0) +++ csw/mgar/pkg/tcl/trunk/files/configure.patch 2010-02-07 11:58:17 UTC (rev 8373) @@ -0,0 +1,36 @@ +--- tcl8.5.7/unix/configure.orig 2009-04-15 21:30:05.000000000 +0200 ++++ tcl8.5.7/unix/configure 2010-02-07 05:09:00.015791294 +0100 +@@ -8475,7 +8475,7 @@ + arch=`isainfo` + echo "$as_me:$LINENO: checking whether to use -lsunmath for fp rounding control" >&5 + echo $ECHO_N "checking whether to use -lsunmath for fp rounding control... $ECHO_C" >&6 +- if test "$arch" = "amd64 i386"; then ++ if test "$arch" = "amd64 i386" -o "$arch" = "i386"; then + + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +@@ -8679,13 +8679,13 @@ + fi + + case $system in +- SunOS-5.[1-9][0-9]*) ++ SunOS-5.[1-9][0-9]*|SunOS-5.[7-9]) + SHLIB_LD="\${CC} -G -z $textmode \${LDFLAGS}";; + *) + SHLIB_LD="/usr/ccs/bin/ld -G -z $textmode";; + esac + CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' +- LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' ++ LD_SEARCH_FLAGS='-L ${LIB_RUNTIME_DIR} -R ${LIB_RUNTIME_DIR}' + + fi + +@@ -8855,7 +8855,7 @@ + if test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""; then + + LIB_SUFFIX=${SHARED_LIB_SUFFIX} +- MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' ++ MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${LD_SEARCH_FLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}' + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)' + + else Added: csw/mgar/pkg/tcl/trunk/files/tcl.m4.patch =================================================================== --- csw/mgar/pkg/tcl/trunk/files/tcl.m4.patch (rev 0) +++ csw/mgar/pkg/tcl/trunk/files/tcl.m4.patch 2010-02-07 11:58:17 UTC (rev 8373) @@ -0,0 +1,44 @@ +--- tcl8.5.7/unix/tcl.m4.orig 2009-04-15 21:30:05.000000000 +0200 ++++ tcl8.5.7/unix/tcl.m4 2010-02-07 05:15:17.410781569 +0100 +@@ -1933,6 +1933,7 @@ + ], [ + do64bit_ok=yes + case $system in ++# Non functional check, m64/xarch depends on compiler not os version + SunOS-5.1[[1-9]]*|SunOS-5.[[2-9]][[0-9]]*) + CFLAGS="$CFLAGS -m64" + LDFLAGS="$LDFLAGS -m64";; +@@ -1951,7 +1952,7 @@ + AS_IF([test "$GCC" = yes],[use_sunmath=no],[ + arch=`isainfo` + AC_MSG_CHECKING([whether to use -lsunmath for fp rounding control]) +- AS_IF([test "$arch" = "amd64 i386"], [ ++ AS_IF([test "$arch" = "amd64 i386" -o "$arch" = "i386"], [ + AC_MSG_RESULT([yes]) + MATH_LIBS="-lsunmath $MATH_LIBS" + AC_CHECK_HEADER(sunmath.h) +@@ -1989,13 +1990,13 @@ + ], [ + AS_IF([test "$use_sunmath" = yes], [textmode=textoff],[textmode=text]) + case $system in +- SunOS-5.[[1-9]][[0-9]]*) ++ SunOS-5.[[1-9]][[0-9]]*|SunOS-5.[[7-9]]) + SHLIB_LD="\${CC} -G -z $textmode \${LDFLAGS}";; + *) + SHLIB_LD="/usr/ccs/bin/ld -G -z $textmode";; + esac + CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' +- LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' ++ LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR} -R${LIB_RUNTIME_DIR}' + ]) + ;; + UNIX_SV* | UnixWare-5*) +@@ -2078,7 +2079,7 @@ + + AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [ + LIB_SUFFIX=${SHARED_LIB_SUFFIX} +- MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' ++ MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${LD_SEARCH_FLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}' + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)' + ], [ + LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Feb 7 14:29:34 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 07 Feb 2010 13:29:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8374] csw/mgar/gar/v2/lib/python Message-ID: Revision: 8374 http://gar.svn.sourceforge.net/gar/?rev=8374&view=rev Author: wahwah Date: 2010-02-07 13:29:34 +0000 (Sun, 07 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, filtering out SUNW packages from missing deps. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-07 11:58:17 UTC (rev 8373) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-07 13:29:34 UTC (rev 8374) @@ -22,9 +22,9 @@ SONAME = "soname" CONFIG_MTIME = "mtime" DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) -DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", - u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms", - u"SUNWcslx"]) +DO_NOT_REPORT_MISSING = set([]) +DO_NOT_REPORT_MISSING_RE = [r"SUNW.*", r"\*SUNW.*"] + SYSTEM_SYMLINKS = ( ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), ("/64", ["/amd64", "/sparcv9"]), @@ -405,6 +405,11 @@ # Don't report itself as a suggested dependency. missing_deps = missing_deps.difference(set([pkgname])) missing_deps = missing_deps.difference(set(DO_NOT_REPORT_MISSING)) + for re_str in DO_NOT_REPORT_MISSING_RE: + padded_re = "^%s$" % re_str + missing_deps = filter(lambda x: not re.match(padded_re, x), + missing_deps) + missing_deps = set(missing_deps) surplus_deps = declared_dependencies_set.difference(auto_dependencies) surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS) orphan_sonames = orphan_sonames.difference(ALLOWED_ORPHAN_SONAMES) @@ -594,11 +599,11 @@ for tag in set_errors: if tag.pkgname: if not tag.pkgname in errors: - errors[tag.pkgname] = [] + errors[tag.pkgname] = [] errors[tag.pkgname].append(tag) else: if "package-set" not in errors: - errors["package-set"] = [] + errors["package-set"] = [] errors["package-set"].append(error) return errors Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-07 11:58:17 UTC (rev 8373) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-07 13:29:34 UTC (rev 8374) @@ -151,7 +151,7 @@ def testMissingDeps(self): # This tends to report itself... - expected = set([u'SUNWgss']) + expected = set([]) self.assertEquals(expected, self.missing_deps) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Feb 7 16:18:23 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 07 Feb 2010 15:18:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8375] csw/mgar/pkg/cswclassutils/trunk/files Message-ID: Revision: 8375 http://gar.svn.sourceforge.net/gar/?rev=8375&view=rev Author: bonivart Date: 2010-02-07 15:18:23 +0000 (Sun, 07 Feb 2010) Log Message: ----------- cswclassutils: add post install message script Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpostmsg csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpostmsg Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpostmsg =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpostmsg (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpostmsg 2010-02-07 15:18:23 UTC (rev 8375) @@ -0,0 +1,35 @@ +#!/bin/sh +# +# i.cswpostmsg - Class action script to display a message after install +# +# $Id: CSWcswclassutils.i.cswusergroup 6859 2009-10-14 14:04:00Z bdwalton $ +# +# Written by Peter Bonivart +# +# 2010-02-07 First release +# +# Documentation: http://wiki.opencsw.org/cswclassutils-package + +DEBUG= # clear to disable debug, set to anything to enable + +if [ "$DEBUG" ]; then + echo PACKAGE: $PKGINST +fi + +# Copy files +echo "Installing class ..." + +while read src dest; do + if [ "$DEBUG" ]; then + echo SRC: $src DEST: $dest + fi + + # Copy the conf-file + /usr/bin/cp $src $dest || exit 2 + + # display file if readable and regular + [ -f $dest -a -r $dest ] && cat $dest + +done + +exit 0 Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpostmsg =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpostmsg (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpostmsg 2010-02-07 15:18:23 UTC (rev 8375) @@ -0,0 +1,31 @@ +#!/bin/sh +# +# r.cswpostmsg - Class action script to display a message after install +# +# $Id: CSWcswclassutils.i.cswusergroup 6859 2009-10-14 14:04:00Z bdwalton $ +# +# Written by Peter Bonivart +# +# 2010-02-07 First release +# +# Documentation: http://wiki.opencsw.org/cswclassutils-package + +DEBUG= # clear to disable debug, set to anything to enable + +if [ "$DEBUG" ]; then + echo PACKAGE: $PKGINST +fi + +# Removing files +echo "Removing class ..." + +while read dest; do + if [ "$DEBUG" ]; then + echo SRC: $src DEST: $dest + fi + + echo $dest + rm -f $dest +done + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Feb 7 19:20:52 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 07 Feb 2010 18:20:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8376] csw/mgar/pkg/libexif/trunk Message-ID: Revision: 8376 http://gar.svn.sourceforge.net/gar/?rev=8376&view=rev Author: hson Date: 2010-02-07 18:20:51 +0000 (Sun, 07 Feb 2010) Log Message: ----------- 64-bit build Split package Fix for documentation to be installed Modified Paths: -------------- csw/mgar/pkg/libexif/trunk/Makefile csw/mgar/pkg/libexif/trunk/checksums csw/mgar/pkg/libexif/trunk/files/Makefile.patch Modified: csw/mgar/pkg/libexif/trunk/Makefile =================================================================== --- csw/mgar/pkg/libexif/trunk/Makefile 2010-02-07 15:18:23 UTC (rev 8375) +++ csw/mgar/pkg/libexif/trunk/Makefile 2010-02-07 18:20:51 UTC (rev 8376) @@ -14,22 +14,37 @@ SPKG_SOURCEURL = http://libexif.sourceforge.net +PACKAGES = CSWlibexif CSWlibexifdevel CSWlibexifdoc +CATALOGNAME_CSWlibexif = libexif +CATALOGNAME_CSWlibexifdevel = libexif_devel +CATALOGNAME_CSWlibexifdoc = libexif_doc +SPKG_DESC_CSWlibexif = $(DESCRIPTION) +SPKG_DESC_CSWlibexifdevel = $(DESCRIPTION) - developer package +SPKG_DESC_CSWlibexifdoc = $(DESCRIPTION) - API documentation package + +PKGFILES_CSWlibexifdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibexifdoc = $(sharedstatedir)/doc/libexif/libexif-api.html/.* + +RUNTIME_DEP_PKGS_CSWlibexif += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibexifdevel += CSWlibexif +RUNTIME_DEP_PKGS_CSWlibexifdoc += CSWlibexif + +ARCHALL_CSWlibexifdoc = 1 + LICENSE = COPYING -RUNTIME_DEP_PKGS += CSWggettextrt - -# We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=12272 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - +# Compatibility for Solaris find/tar PATCHFILES = Makefile.patch +# PATCHFILES += exif-tag.patch -CONFIGURE_ARGS = $(DIRPATHS) +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-docs + include gar/category.mk Modified: csw/mgar/pkg/libexif/trunk/checksums =================================================================== --- csw/mgar/pkg/libexif/trunk/checksums 2010-02-07 15:18:23 UTC (rev 8375) +++ csw/mgar/pkg/libexif/trunk/checksums 2010-02-07 18:20:51 UTC (rev 8376) @@ -1,3 +1,3 @@ -19e4a8ace576426613e54b5a267c2548 download/Makefile.patch -e7bf07b7e1012f6a32b17cf43389dd94 download/exif-tag.patch -56144a030a4c875c600b1ccf713f69f7 download/libexif-0.6.19.tar.bz2 +d01f10ba5fe0bd9ee979cdbcbe3a59ea Makefile.patch +e7bf07b7e1012f6a32b17cf43389dd94 exif-tag.patch +56144a030a4c875c600b1ccf713f69f7 libexif-0.6.19.tar.bz2 Modified: csw/mgar/pkg/libexif/trunk/files/Makefile.patch =================================================================== --- csw/mgar/pkg/libexif/trunk/files/Makefile.patch 2010-02-07 15:18:23 UTC (rev 8375) +++ csw/mgar/pkg/libexif/trunk/files/Makefile.patch 2010-02-07 18:20:51 UTC (rev 8376) @@ -1,25 +1,32 @@ -diff --speed-large-files --minimal -Nru libexif-0.6.17.orig/doc/Makefile.in libexif-0.6.17/doc/Makefile.in ---- libexif-0.6.17.orig/doc/Makefile.in 2008-11-06 09:54:12.000000000 +0100 -+++ libexif-0.6.17/doc/Makefile.in 2009-02-22 13:51:34.489490602 +0100 -@@ -437,7 +437,7 @@ +--- libexif-0.6.19/doc/Makefile.in.orig 2009-11-13 07:15:36.000000000 +0100 ++++ libexif-0.6.19/doc/Makefile.in 2010-02-07 18:16:53.833775611 +0100 +@@ -485,19 +485,19 @@ @BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE at install-apidocs-internals: $(HTML_APIDOC_INTERNALS_DIR).stamp @BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ mkdir -p "$(DESTDIR)$(docdir)" @BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ find "$(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_INTERNALS_DIR)" \ - at BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ \( -type d -exec chmod 0755 {} \; \) -or \ + at BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ \( -type d -exec chmod 0755 {} \; \) -o \ @BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ \( -type f -exec chmod 0644 {} \; \) - @BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ (unset CDPATH; cd "$(DOXYGEN_OUTPUT_DIR)" && tar cpf - "$(HTML_APIDOC_INTERNALS_DIR)") \ - @BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ | (cd "$(DESTDIR)$(docdir)" && tar xpf -) -@@ -446,7 +446,7 @@ +- at BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ (unset CDPATH; cd "$(DOXYGEN_OUTPUT_DIR)" && tar cpf - "$(HTML_APIDOC_INTERNALS_DIR)") \ +- at BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ | (cd "$(DESTDIR)$(docdir)" && tar xpf -) ++ at BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ (unset CDPATH; cd "$(DOXYGEN_OUTPUT_DIR)" && tar cf - "$(HTML_APIDOC_INTERNALS_DIR)") \ ++ at BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ | (cd "$(DESTDIR)$(docdir)" && tar xf -) + @BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE at uninstall-apidocs-internals: + @BUILD_DOCS_TRUE@@ENABLE_INTERNAL_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ rm -rf "$(DESTDIR)$(docdir)/$(HTML_APIDOC_INTERNALS_DIR)" @BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE at install-apidocs: $(HTML_APIDOC_DIR).stamp @BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ mkdir -p "$(DESTDIR)$(docdir)" @BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ find "$(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_DIR)" \ - at BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ \( -type d -exec chmod 0755 {} \; \) -or \ + at BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ \( -type d -exec chmod 0755 {} \; \) -o \ @BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ \( -type f -exec chmod 0644 {} \; \) - @BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ (unset CDPATH; cd "$(DOXYGEN_OUTPUT_DIR)" && tar cpf - "$(HTML_APIDOC_DIR)") \ - @BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ | (cd "$(DESTDIR)$(docdir)" && tar xpf -) -@@ -458,10 +458,10 @@ +- at BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ (unset CDPATH; cd "$(DOXYGEN_OUTPUT_DIR)" && tar cpf - "$(HTML_APIDOC_DIR)") \ +- at BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ | (cd "$(DESTDIR)$(docdir)" && tar xpf -) ++ at BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ (unset CDPATH; cd "$(DOXYGEN_OUTPUT_DIR)" && tar cf - "$(HTML_APIDOC_DIR)") \ ++ at BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ | (cd "$(DESTDIR)$(docdir)" && tar xf -) + @BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE at uninstall-apidocs: + @BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ rm -rf "$(DESTDIR)$(docdir)/$(HTML_APIDOC_DIR)" + @BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE at clean-apidocs: +@@ -506,10 +506,10 @@ @BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@$(DOXYGEN_UPLOAD): $(DOXYGEN_STAMPS) @BUILD_DOCS_TRUE@@HAVE_DOXYGEN_TRUE@ find $(DOXYGEN_OUTPUT_DIR) \( -type d -exec chmod a+rx,go-w,g+s {} \; \) \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Feb 7 19:47:57 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 07 Feb 2010 18:47:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8377] csw/mgar/pkg/libiptcdata/trunk Message-ID: Revision: 8377 http://gar.svn.sourceforge.net/gar/?rev=8377&view=rev Author: hson Date: 2010-02-07 18:47:57 +0000 (Sun, 07 Feb 2010) Log Message: ----------- 64-bit build Split package Upstream included our patch in latest release Modified Paths: -------------- csw/mgar/pkg/libiptcdata/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libiptcdata/trunk/files/iptc-dataset.patch Modified: csw/mgar/pkg/libiptcdata/trunk/Makefile =================================================================== --- csw/mgar/pkg/libiptcdata/trunk/Makefile 2010-02-07 18:20:51 UTC (rev 8376) +++ csw/mgar/pkg/libiptcdata/trunk/Makefile 2010-02-07 18:47:57 UTC (rev 8377) @@ -17,22 +17,39 @@ LICENSE = COPYING -RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv +PACKAGES = CSWlibiptcdata CSWlibiptcdatadevel CSWlibiptcdatadoc +#PACKAGES += CSWpy-libiptcdata +CATALOGNAME_CSWlibiptcdata = libiptcdata +CATALOGNAME_CSWlibiptcdatadevel = libiptcdata_devel +CATALOGNAME_CSWlibiptcdatadoc = libiptcdata_doc +#CATALOGNAME_CSWpy-libiptcdata = py_libiptcdata +SPKG_DESC_CSWlibiptcdata = $(DESCRIPTION) +SPKG_DESC_CSWlibiptcdatadevel = $(DESCRIPTION) - developer package +SPKG_DESC_CSWlibiptcdatadoc = $(DESCRIPTION) - documentation package +#SPKG_DESC_CSWpy-libiptcdata = $(DESCRIPTION) - Python bindings -# We define upstream file regex so we can be notifed of new upstream software release +RUNTIME_DEP_PKGS_CSWlibiptcdata = CSWggettextrt CSWiconv +RUNTIME_DEP_PKGS_CSWlibiptcdatadevel = CSWlibiptcdata +RUNTIME_DEP_PKGS_CSWlibiptcdatadoc = CSWlibiptcdata +#RUNTIME_DEP_PKGS_CSWpy-libiptcdata = CSWlibiptcdata CSWpython + +PKGFILES_CSWlibiptcdatadevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibiptcdatadoc = $(sharedstatedir)/gtk-doc/.* +#PKGFILES_CSWpy-libiptcdata = $(libdir).*/python/site-packages/.* + +ARCHALL_CSWlibiptcdatadoc = 1 + UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=130582 UPSTREAM_USE_SF = 1 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = +BUILD64 = 1 -# Patch submitted to upstream, pending new release -#PATCHFILES = iptc-dataset.patch +CONFIGURE_ARGS = $(DIRPATHS) +# Python isn't 64-bit yet +#CONFIGURE_ARGS += --enable-python +CONFIGURE_ARGS += --enable-gtk-doc -CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check -TEST_SCRIPTS = - include gar/category.mk Deleted: csw/mgar/pkg/libiptcdata/trunk/files/iptc-dataset.patch =================================================================== --- csw/mgar/pkg/libiptcdata/trunk/files/iptc-dataset.patch 2010-02-07 18:20:51 UTC (rev 8376) +++ csw/mgar/pkg/libiptcdata/trunk/files/iptc-dataset.patch 2010-02-07 18:47:57 UTC (rev 8377) @@ -1,11 +0,0 @@ ---- libiptcdata-1.0.2.orig/libiptcdata/iptc-dataset.c 2005-08-29 04:27:41.000000000 +0200 -+++ libiptcdata-1.0.2/libiptcdata/iptc-dataset.c 2009-02-16 14:40:15.166650866 +0100 -@@ -589,7 +589,7 @@ - return; - - printf ("%sTag: %d:%d ('%s')\n", buf, e->record, e->tag, -- iptc_tag_get_name (e->record, e->tag)); -+ iptc_tag_get_name (e->record, e->tag) ? iptc_tag_get_name (e->record, e->tag) : "NULL"); - /* printf ("%s Format: %i ('%s')\n", buf, e->format, - iptc_format_get_name (e->format)); */ - printf ("%s Size: %i\n", buf, e->size); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Sun Feb 7 21:51:27 2010 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sun, 07 Feb 2010 20:51:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[8378] csw/mgar/pkg/gkrellm/trunk Message-ID: Revision: 8378 http://gar.svn.sourceforge.net/gar/?rev=8378&view=rev Author: jake_goerzen Date: 2010-02-07 20:51:26 +0000 (Sun, 07 Feb 2010) Log Message: ----------- changed to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/gkrellm/trunk/Makefile csw/mgar/pkg/gkrellm/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/gkrellm/trunk/ Property changes on: csw/mgar/pkg/gkrellm/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/gkrellm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gkrellm/trunk/Makefile 2010-02-07 18:47:57 UTC (rev 8377) +++ csw/mgar/pkg/gkrellm/trunk/Makefile 2010-02-07 20:51:26 UTC (rev 8378) @@ -1,5 +1,5 @@ GARNAME = gkrellm -GARVERSION = 2.2.9 +GARVERSION = 2.3.4 CATEGORIES = gnome DESCRIPTION = System monitor package @@ -17,12 +17,13 @@ MASTER_SITES = http://members.dslextreme.com/users/billw/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +#DISTFILES += $(call admfiles,CSWgkrellm, ) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 # Patch up makefile to honor environment variables -PATCHFILES = suncc.diff +#PATCHFILES = suncc.diff # Disable configure scripts step CONFIGURE_SCRIPTS = @@ -34,11 +35,12 @@ BUILD_ARGS += LOCALEDIR=$(sharedstatedir)/locale BUILD_ARGS += enable_nls=0 solaris -INSTALL_ARGS = INSTALLROOT=$(prefix) -INSTALL_ARGS += INSTALLDIR=$(bindir) -INSTALL_ARGS += MANDIR=$(mandir) -INSTALL_ARGS += INCLUDEDIR=$(includedir) -INSTALL_ARGS += LOCALEDIR=$(sharedstatedir)/locale +INSTALL_ARGS = INSTALLROOT=$(DESTDIR) +INSTALL_ARGS += INSTALLDIR=$(DESTDIR)$(bindir) +INSTALL_ARGS += MANDIR=$(DESTDIR)$(mandir) +INSTALL_ARGS += INCLUDEDIR=$(DESTDIR)$(includedir) +INSTALL_ARGS += LOCALEDIR=$(DESTDIR)$(sharedstatedir)/locale +INSTALL_ARGS += enable_nls=0 install_solaris # No test suite TEST_SCRIPTS = Modified: csw/mgar/pkg/gkrellm/trunk/checksums =================================================================== --- csw/mgar/pkg/gkrellm/trunk/checksums 2010-02-07 18:47:57 UTC (rev 8377) +++ csw/mgar/pkg/gkrellm/trunk/checksums 2010-02-07 20:51:26 UTC (rev 8378) @@ -1,2 +1,2 @@ -5334155797901724f4eb46a82ad72395 download/gkrellm-2.2.9.tar.bz2 -55fbae52264cb14b07b6ec3951acc111 download/suncc.diff +d5543a439ee77950282d06b000048be7 download/gkrellm-2.3.2.tar.bz2 +22c2cef39ec5bd908049ea6b40ecd448 download/CSWgkrellm.gspec 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 Feb 7 22:04:15 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 07 Feb 2010 21:04:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[8379] csw/mgar/pkg/nss/trunk/Makefile Message-ID: Revision: 8379 http://gar.svn.sourceforge.net/gar/?rev=8379&view=rev Author: rthurner Date: 2010-02-07 21:04:15 +0000 (Sun, 07 Feb 2010) Log Message: ----------- nss - make it package at least for solaris 10 Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2010-02-07 20:51:26 UTC (rev 8378) +++ csw/mgar/pkg/nss/trunk/Makefile 2010-02-07 21:04:15 UTC (rev 8379) @@ -14,6 +14,10 @@ # TODO: nss-config # TODO: a better nss.pc +# the package does not compile on solaris8 +# so make it for solaris10 only at the moment +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + # For DBG builds PATCHFILES = whoami.patch # I'll let Wan-Teh decide what and where to patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Feb 7 22:09:50 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 07 Feb 2010 21:09:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8380] csw/mgar/pkg/gdbm/trunk Message-ID: Revision: 8380 http://gar.svn.sourceforge.net/gar/?rev=8380&view=rev Author: hson Date: 2010-02-07 21:09:50 +0000 (Sun, 07 Feb 2010) Log Message: ----------- gdbm: Add 64-bit build Modified Paths: -------------- csw/mgar/pkg/gdbm/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/gdbm/trunk/ Property changes on: csw/mgar/pkg/gdbm/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/gdbm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdbm/trunk/Makefile 2010-02-07 21:04:15 UTC (rev 8379) +++ csw/mgar/pkg/gdbm/trunk/Makefile 2010-02-07 21:09:50 UTC (rev 8380) @@ -11,9 +11,7 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWgdbm,) -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # Makefile install permissions patch @@ -26,5 +24,8 @@ INSTALL_ROOT = $(DESTDIR) export INSTALL_ROOT +EXTRA_COMMON_EXPORTS = INSTALL_ROOT +BUILD64 = 1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 01:21:23 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 00:21:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8381] csw/mgar/pkg/libffi/trunk Message-ID: Revision: 8381 http://gar.svn.sourceforge.net/gar/?rev=8381&view=rev Author: hson Date: 2010-02-08 00:21:23 +0000 (Mon, 08 Feb 2010) Log Message: ----------- Add 64-bit build Switch to Sun Studio Split package Modified Paths: -------------- csw/mgar/pkg/libffi/trunk/Makefile csw/mgar/pkg/libffi/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libffi/trunk/files/sun.patch Modified: csw/mgar/pkg/libffi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libffi/trunk/Makefile 2010-02-07 21:09:50 UTC (rev 8380) +++ csw/mgar/pkg/libffi/trunk/Makefile 2010-02-08 00:21:23 UTC (rev 8381) @@ -1,5 +1,5 @@ GARNAME = libffi -GARVERSION = 3.0.8 +GARVERSION = 3.0.9 CATEGORIES = lib DESCRIPTION = A portable foreign function interface library @@ -16,22 +16,43 @@ MASTER_SITES = ftp://sourceware.org/pub/libffi/ SPKG_SOURCEURL = http://sourceware.org/libffi/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = sun.patch -PACKAGES = CSWlibffi +PACKAGES = CSWlibffi CSWlibffidevel CATALOGNAME_CSWlibffi = libffi +CATALOGNAME_CSWlibffidevel = libffi_devel SPKG_DESC_CSWlibffi = $(DESCRIPTION) +SPKG_DESC_CSWlibffidevel = $(DESCRIPTION) - developer package +PKGFILES_CSWlibffidevel = $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibffi = CSWgcc4corert +LICENSE = LICENSE -# We define upstream file regex so we can be notifed of -# new upstream software release +RUNTIME_DEP_PKGS_CSWlibffidevel += CSWlibffi +#RUNTIME_DEP_PKGS_CSWlibffi = CSWgcc4corert + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -GARCOMPILER = GCC4 +GARCOMPILER = SOS12 BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -TEST_SCRIPTS = -TEST_TARGET = check + +# Tests fail since they are written for gcc only +#TEST_TARGET = check +TEST_TARGET = + include gar/category.mk + + +# v9.S is not needed when building 32-bit +pre-configure-isa-sparcv8: + @( cd $(WORKSRC); gsed -e "s|src/sparc/v9.S||" -e "s/AM_CFLAGS = .*/AM_CFLAGS = /" -i Makefile.am ; \ + aclocal; \ + automake) + +# v8.S will not build when building 64-bit +pre-configure-isa-sparcv9: + @( cd $(WORKSRC); gsed -e "s|src/sparc/v8.S||" -e "s/AM_CFLAGS = .*/AM_CFLAGS = /" -i Makefile.am ; \ + aclocal; \ + automake) Modified: csw/mgar/pkg/libffi/trunk/checksums =================================================================== --- csw/mgar/pkg/libffi/trunk/checksums 2010-02-07 21:09:50 UTC (rev 8380) +++ csw/mgar/pkg/libffi/trunk/checksums 2010-02-08 00:21:23 UTC (rev 8381) @@ -1 +1,2 @@ -188a4f79fdac2310044b44b7d3918ef9 download/libffi-3.0.8.tar.gz +1f300a7a7f975d4046f51c3022fa5ff1 libffi-3.0.9.tar.gz +e888c31e7320d06c4268f3e3d90394a7 sun.patch Added: csw/mgar/pkg/libffi/trunk/files/sun.patch =================================================================== --- csw/mgar/pkg/libffi/trunk/files/sun.patch (rev 0) +++ csw/mgar/pkg/libffi/trunk/files/sun.patch 2010-02-08 00:21:23 UTC (rev 8381) @@ -0,0 +1,58 @@ +diff -Nru libffi-3.0.9.orig/Makefile.in libffi-3.0.9/Makefile.in +--- libffi-3.0.9.orig/Makefile.in 2009-12-31 13:41:43.000000000 +0100 ++++ libffi-3.0.9/Makefile.in 2010-01-30 08:19:09.733833212 +0100 +@@ -478,7 +478,7 @@ + $(am__append_24) $(am__append_25) + libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) + nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) +-AM_CFLAGS = -Wall -g -fexceptions ++AM_CFLAGS = + libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(AM_LTLDFLAGS) + AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src + AM_CCASFLAGS = $(AM_CPPFLAGS) +diff -Nru libffi-3.0.9.orig/include/ffi_common.h libffi-3.0.9/include/ffi_common.h +--- libffi-3.0.9.orig/include/ffi_common.h 2009-12-29 16:22:26.000000000 +0100 ++++ libffi-3.0.9/include/ffi_common.h 2010-01-30 08:20:33.829433399 +0100 +@@ -84,7 +84,7 @@ + } extended_cif; + + /* Terse sized type definitions. */ +-#if defined(_MSC_VER) || defined(__sgi) ++#if defined(_MSC_VER) || defined(__sgi) || defined(__sun) + typedef unsigned char UINT8; + typedef signed char SINT8; + typedef unsigned short UINT16; +diff -Nru libffi-3.0.9.orig/src/x86/ffitarget.h libffi-3.0.9/src/x86/ffitarget.h +--- libffi-3.0.9.orig/src/x86/ffitarget.h 2009-12-29 16:22:26.000000000 +0100 ++++ libffi-3.0.9/src/x86/ffitarget.h 2010-01-30 08:23:16.480398204 +0100 +@@ -31,7 +31,7 @@ + + /* ---- System specific configurations ----------------------------------- */ + +-#if defined (X86_64) && defined (__i386__) ++#if defined (X86_64) && (defined (__i386__) || defined (__i386)) + #undef X86_64 + #define X86 + #endif +@@ -74,10 +74,10 @@ + #else + + /* ---- Intel x86 and AMD x86-64 - */ +-#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__)) ++#if !defined(X86_WIN32) && (defined(__i386__) || defined(__i386) || defined(__x86_64__) || defined(__x86_64)) + FFI_SYSV, + FFI_UNIX64, /* Unix variants all use the same ABI for x86-64 */ +-#ifdef __i386__ ++#if defined(__i386__) || defined(__i386) + FFI_DEFAULT_ABI = FFI_SYSV, + #else + FFI_DEFAULT_ABI = FFI_UNIX64, +@@ -96,7 +96,7 @@ + #define FFI_TYPE_SMALL_STRUCT_2B (FFI_TYPE_LAST + 2) + #define FFI_TYPE_SMALL_STRUCT_4B (FFI_TYPE_LAST + 3) + +-#if defined (X86_64) || (defined (__x86_64__) && defined (X86_DARWIN)) ++#if defined (X86_64) || ((defined (__x86_64__) || defined (__x86_64)) && defined (X86_DARWIN)) + #define FFI_TRAMPOLINE_SIZE 24 + #define FFI_NATIVE_RAW_API 0 + #else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 01:24:41 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 00:24:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[8382] csw/mgar/pkg/dbus-glib/trunk/Makefile Message-ID: Revision: 8382 http://gar.svn.sourceforge.net/gar/?rev=8382&view=rev Author: hson Date: 2010-02-08 00:24:41 +0000 (Mon, 08 Feb 2010) Log Message: ----------- dbus-glib: 64-bit build Modified Paths: -------------- csw/mgar/pkg/dbus-glib/trunk/Makefile Modified: csw/mgar/pkg/dbus-glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus-glib/trunk/Makefile 2010-02-08 00:21:23 UTC (rev 8381) +++ csw/mgar/pkg/dbus-glib/trunk/Makefile 2010-02-08 00:24:41 UTC (rev 8382) @@ -30,11 +30,13 @@ # PKGFILES_CSWdbusglibdev += $(prefix)/lib/.*\.a # PKGFILES_CSWdbusglibdev += $(prefix)/lib/pkgconfig/.* -CPPFLAGS += -I$(DESTDIR)/opt/csw/include/dbus-1.0 -CPPFLAGS += -I$(DESTDIR)/opt/csw/lib/dbus-1.0/include +#CPPFLAGS += -I$(DESTDIR)/opt/csw/include/dbus-1.0 +#CPPFLAGS += -I$(DESTDIR)/opt/csw/lib/dbus-1.0/include CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-tests +BUILD64 = 1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 01:25:57 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 00:25:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8383] csw/mgar/pkg/liblasi/trunk/Makefile Message-ID: Revision: 8383 http://gar.svn.sourceforge.net/gar/?rev=8383&view=rev Author: hson Date: 2010-02-08 00:25:57 +0000 (Mon, 08 Feb 2010) Log Message: ----------- Split package Add 64-bit build Modified Paths: -------------- csw/mgar/pkg/liblasi/trunk/Makefile Modified: csw/mgar/pkg/liblasi/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblasi/trunk/Makefile 2010-02-08 00:24:41 UTC (rev 8382) +++ csw/mgar/pkg/liblasi/trunk/Makefile 2010-02-08 00:25:57 UTC (rev 8383) @@ -25,11 +25,31 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(SOURCENAME)-$(GARVERSION).tar.gz +DISTNAME = $(SOURCENAME)-$(GARVERSION) +SPKG_SOURCEURL = http://unifont.org/lasi/ + PATCHFILES = liblasi-consts.diff RUNTIME_DEP_PKGS = CSWftype2 CSWggettextrt CSWglib2 CSWpango CSWzlib +PACKAGES = CSWliblasi CSWliblasidevel CSWliblasidoc +CATALOGNAME_CSWliblasi = liblasi +CATALOGNAME_CSWliblasidevel = liblasi_devel +CATALOGNAME_CSWliblasidoc = liblasi_doc + +SPKG_DESC_CSWliblasi = C++ Unicode support for PostScript +SPKG_DESC_CSWliblasidevel = C++ Unicode support for PostScript - developer package +SPKG_DESC_CSWliblasidoc = C++ Unicode support for PostScript - documentation package + +RUNTIME_DEP_PKGS_CSWliblasi += CSWftype2 CSWggettextrt CSWglib2 CSWpango +RUNTIME_DEP_PKGS_CSWliblasi += CSWfconfig +RUNTIME_DEP_PKGS_CSWliblasidevel += CSWliblasi +RUNTIME_DEP_PKGS_CSWliblasidoc = + +PKGFILES_CSWliblasidevel = $(PKGFILES_DEVEL) +PKGFILES_CSWliblasidoc = $(sharedstatedir)/doc/.* + CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom TEST_SCRIPTS = custom @@ -43,16 +63,29 @@ # 187113 is the group_id for the liblasi project on sourceforge UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE) = 187113 +BUILD64 = 1 + +CMAKE_CXX_FLAGS = $(CXXFLAGS) +EXTRA_COMMON_EXPORTS = CMAKE_CXX_FLAGS + include gar/category.mk -WORKSRC = $(WORKDIR)/$(SOURCENAME)-$(GARVERSION) +#WORKSRC = $(WORKDIR)/$(SOURCENAME)-$(GARVERSION) configure-custom: @echo " ==> Configuring $(GARNAME) (custom)" @( cd $(WORKSRC) ; \ - cmake -DCMAKE_INSTALL_PREFIX=/opt/csw \ + cmake -DCMAKE_INSTALL_PREFIX="$(prefix)" \ + -DCMAKE_INSTALL_EXEC_PREFIX:PATH="$(exec_prefix)" \ + -DCMAKE_INSTALL_BINDIR:PATH="$(bindir)" \ + -DCMAKE_INSTALL_DATADIR:PATH="$(datadir)" \ + -DCMAKE_INSTALL_LIBDIR:PATH="$(libdir)" \ + -DCMAKE_INSTALL_INCLUDEDIR:PATH="$(includedir)" \ + -DCMAKE_INSTALL_INFODIR:PATH="$(infodir)" \ + -DCMAKE_INSTALL_MANDIR:PATH="$(mandir)" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_CXX_FLAGS:STRING="$(CXXFLAGS)" \ . ) @$(MAKECOOKIE) @@ -70,7 +103,7 @@ @echo " ==> Installing $(GARNAME) (custom)" @( cd $(WORKSRC) ; \ gmake install DESTDIR=$(DESTDIR) ; \ - mv $(DESTDIR)/opt/csw/share/doc/$(SOURCENAME)-$(GARVERSION) $(DESTDIR)/opt/csw/share/doc/$(GARNAME) ; \ + mv $(DESTDIR)/opt/csw/share/doc/$(DISTNAME) $(DESTDIR)/opt/csw/share/doc/$(GARNAME) ; \ mv $(DESTDIR)/opt/csw/share/lasi$(GARVERSION)/* $(DESTDIR)/opt/csw/share/doc/$(GARNAME)/ ; \ rmdir $(DESTDIR)/opt/csw/share/lasi$(GARVERSION) ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 01:28:34 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 00:28:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8384] csw/mgar/pkg/dbus/trunk/Makefile Message-ID: Revision: 8384 http://gar.svn.sourceforge.net/gar/?rev=8384&view=rev Author: hson Date: 2010-02-08 00:28:34 +0000 (Mon, 08 Feb 2010) Log Message: ----------- dbus: Add 64-bit build Modified Paths: -------------- csw/mgar/pkg/dbus/trunk/Makefile Modified: csw/mgar/pkg/dbus/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus/trunk/Makefile 2010-02-08 00:25:57 UTC (rev 8383) +++ csw/mgar/pkg/dbus/trunk/Makefile 2010-02-08 00:28:34 UTC (rev 8384) @@ -18,9 +18,14 @@ SPKG_DESC_CSWlibdbus = $(DESCRIPTION) libraries SPKG_DESC_CSWlibdbusdev = $(DESCRIPTION) development package -DISTFILES += $(call admfiles,CSWdbus, preinstall, ) -DISTFILES += $(call admfiles,CSWlibdbusdev, ) -DISTFILES += $(call admfiles,CSWlibdbus, ) +PACKAGES = CSWdbus CSWlibdbus CSWlibdbusdev +CATALOGNAME_CSWdbus = dbus +CATALOGNAME_CSWlibdbus = libdbus +CATALOGNAME_CSWlibdbusdev = libdbusdev +#DISTFILES += $(call admfiles,CSWdbus, preinstall, ) +#DISTFILES += $(call admfiles,CSWlibdbusdev, ) +#DISTFILES += $(call admfiles,CSWlibdbus, ) +DISTFILES += CSWdbus.preinstall DISTFILES += cswdbus # Dynamic CSWlibdbusdev prototype @@ -41,9 +46,13 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-tests --with-xml=expat +BUILD64 = 1 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +include gar/category.mk + # moving configuration file & installing init script post-install: ( OLDDIR=`pwd` && cd $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/opt/csw/etc/dbus-1 && \ @@ -54,5 +63,4 @@ ln -s ../init.d/cswdbus $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/rc3.d/S52cswdbus ; ) @$(MAKECOOKIE) -include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 01:35:57 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 00:35:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8385] csw/mgar/pkg/gconf2/trunk Message-ID: Revision: 8385 http://gar.svn.sourceforge.net/gar/?rev=8385&view=rev Author: hson Date: 2010-02-08 00:35:57 +0000 (Mon, 08 Feb 2010) Log Message: ----------- gconf2: Some more modifcations in preparation for full build Modified Paths: -------------- csw/mgar/pkg/gconf2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gconf2/trunk/checksums csw/mgar/pkg/gconf2/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/gconf2/trunk/ Property changes on: csw/mgar/pkg/gconf2/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/gconf2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gconf2/trunk/Makefile 2010-02-08 00:28:34 UTC (rev 8384) +++ csw/mgar/pkg/gconf2/trunk/Makefile 2010-02-08 00:35:57 UTC (rev 8385) @@ -1,7 +1,7 @@ GARNAME = gconf2 GNOME_PROJ = GConf GARVERSION = 2.28.0 -CATEGORIES = lib +CATEGORIES = gnome DESCRIPTION = GNOME configuration database system define BLURB @@ -18,13 +18,25 @@ SPKG_SOURCEURL = http://projects.gnome.org/gconf/ -CONFIGURE_ARGS = $(DIRPATHS) - BUILD64 = 1 NOISAEXEC = 1 TEST_TARGET = check +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-static=no +CONFIGURE_ARGS += --enable-gtk-doc +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/gconf2/trunk/checksums =================================================================== --- csw/mgar/pkg/gconf2/trunk/checksums (rev 0) +++ csw/mgar/pkg/gconf2/trunk/checksums 2010-02-08 00:35:57 UTC (rev 8385) @@ -0,0 +1 @@ +ad2aeb9c7d906b274954c51a615caeac GConf-2.28.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 02:06:53 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 01:06:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8386] csw/mgar/pkg/gnomevfs2 Message-ID: Revision: 8386 http://gar.svn.sourceforge.net/gar/?rev=8386&view=rev Author: hson Date: 2010-02-08 01:06:52 +0000 (Mon, 08 Feb 2010) Log Message: ----------- gnomevfs2: Initial commit Added Paths: ----------- csw/mgar/pkg/gnomevfs2/branches/ csw/mgar/pkg/gnomevfs2/tags/ csw/mgar/pkg/gnomevfs2/trunk/Makefile csw/mgar/pkg/gnomevfs2/trunk/files/ Added: csw/mgar/pkg/gnomevfs2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnomevfs2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnomevfs2/trunk/Makefile 2010-02-08 01:06:52 UTC (rev 8386) @@ -0,0 +1,66 @@ +GARNAME = gnomevfs2 +GNOME_PROJ = gnome-vfs +GARVERSION = 2.24.2 +CATEGORIES = gnome + +DESCRIPTION = GnomeVFS - Filesystem Abstraction library +define BLURB +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWgnomevfs2 CSWgnomevfs2devel CSWgnomevfs2doc +CATALOGNAME_CSWgnomevfs2 = gnomevfs2 +CATALOGNAME_CSWgnomevfs2devel = gnomevfs2_devel +CATALOGNAME_CSWgnomevfs2doc = gnomevfs2_doc + +SPKG_DESC_CSWgnomevfs2 += $(DESCRIPTION) +SPKG_DESC_CSWgnomevfs2devel += $(DESCRIPTION) - developer package +SPKG_DESC_CSWgnomevfs2doc += $(DESCRIPTION) - documentation + +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWfconfig CSWftype2 CSWggettextrt CSWglib2 +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWgtk2 CSWlibatk CSWlibcairo CSWlibx11 +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWdbusglib CSWlibdbus CSWlibxext CSWpango +RUNTIME_DEP_PKGS_CSWgnomevfs2devel += CSWgnomevfs2 +RUNTIME_DEP_PKGS_CSWgnomevfs2doc += CSWgnomevfs2 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://projects.gnome.org/gnome-vfs/ + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +NOISAEXEC = 1 +#NOISALIST = 1 +# libdbus not 64-bit yet +BUILD64 = 1 + +PKGFILES_CSWgnomevfs2devel = $(PKGFILES_DEVEL) +PKGFILES_CSWgnomevfs2doc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWgnomevfs2doc = 1 + +LIBS = -lsocket -lnsl +export LIBS + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-static=no +CONFIGURE_ARGS += --enable-gtk-doc +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +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 hson at users.sourceforge.net Mon Feb 8 02:10:32 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 01:10:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8387] csw/mgar/pkg/gd/trunk/Makefile Message-ID: Revision: 8387 http://gar.svn.sourceforge.net/gar/?rev=8387&view=rev Author: hson Date: 2010-02-08 01:10:32 +0000 (Mon, 08 Feb 2010) Log Message: ----------- gd: Add 64-bit build Modified Paths: -------------- csw/mgar/pkg/gd/trunk/Makefile Modified: csw/mgar/pkg/gd/trunk/Makefile =================================================================== --- csw/mgar/pkg/gd/trunk/Makefile 2010-02-08 01:06:52 UTC (rev 8386) +++ csw/mgar/pkg/gd/trunk/Makefile 2010-02-08 01:10:32 UTC (rev 8387) @@ -22,15 +22,17 @@ #PATCHFILES = Makefile.diff RUNTIME_DEP_PKGS_CSWgd = CSWexpat CSWfconfig CSWftype2 CSWiconv -RUNTIME_DEP_PKGS_CSWgd += CSWjpeg CSWpng CSWxpm CSWzlib +RUNTIME_DEP_PKGS_CSWgd += CSWjpeg CSWpng CSWxpm CSWzlib CSWlibx11 -# We define upstream file regex so we can be notifed of -# new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 BUILD64 = 1 STRIP_LIBTOOL = 1 +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) CONFIGURE_ARGS += --with-png=$(prefix) @@ -43,13 +45,15 @@ ## There are no tests for this TEST_SCRIPTS = skip +include gar/category.mk + test-skip: $(DONADA) -post-extract-modulated: +pre-configure-modulated: grm -f $(WORKSRC)/config/ltmain.sh gcp /opt/csw/share/libtool/config/ltmain.sh $(WORKSRC)/config/ltmain.sh cd $(WORKSRC); aclocal cd $(WORKSRC); automake + @$(MAKECOOKIE) -include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 02:12:15 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 01:12:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[8388] csw/mgar/pkg/libunique/trunk/Makefile Message-ID: Revision: 8388 http://gar.svn.sourceforge.net/gar/?rev=8388&view=rev Author: hson Date: 2010-02-08 01:12:15 +0000 (Mon, 08 Feb 2010) Log Message: ----------- libunique: Remove some old stuff not needed after libcairo update Modified Paths: -------------- csw/mgar/pkg/libunique/trunk/Makefile Modified: csw/mgar/pkg/libunique/trunk/Makefile =================================================================== --- csw/mgar/pkg/libunique/trunk/Makefile 2010-02-08 01:10:32 UTC (rev 8387) +++ csw/mgar/pkg/libunique/trunk/Makefile 2010-02-08 01:12:15 UTC (rev 8388) @@ -32,6 +32,8 @@ RUNTIME_DEP_PKGS_CSWlibuniquedevel += CSWlibunique RUNTIME_DEP_PKGS_CSWlibuniquedoc += CSWlibunique +PREREQUISITE_PKGS += CSWdbusglibdev + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 SPKG_SOURCEURL = http://live.gnome.org/LibUnique @@ -39,12 +41,7 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -#This is ugly, should be EXTRA_LINKER_FLAGS, but due to libtool it doesn't work -EXTRA_LD_FLAGS_isa-i386 = -L/usr/openwin/lib -lXext -EXTRA_LD_FLAGS_isa-sparcv8 = -L/usr/openwin/lib -lXext -EXTRA_LD_FLAGS_isa-amd64 = -L/usr/openwin/lib/amd64 -lXext -EXTRA_LD_FLAGS_isa-sparcv9 = -L/usr/openwin/lib/sparcv9 -lXext -EXTRA_LD_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION)) +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) #NOISAEXEC = 1 #NOISALIST = 1 @@ -62,6 +59,10 @@ STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-static=no +CONFIGURE_ARGS += --enable-gtk-doc +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 02:37:39 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 01:37:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8389] csw/mgar/pkg/pango/trunk/Makefile Message-ID: Revision: 8389 http://gar.svn.sourceforge.net/gar/?rev=8389&view=rev Author: hson Date: 2010-02-08 01:37:39 +0000 (Mon, 08 Feb 2010) Log Message: ----------- Link with correct libXrender sysconfdir is different for different archs Modified Paths: -------------- csw/mgar/pkg/pango/trunk/Makefile Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2010-02-08 01:12:15 UTC (rev 8388) +++ csw/mgar/pkg/pango/trunk/Makefile 2010-02-08 01:37:39 UTC (rev 8389) @@ -38,6 +38,8 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) BUILD64 = 1 NOISALIST = 1 @@ -61,6 +63,13 @@ EXTRA_MERGE_EXCLUDE_FILES = .*/preload\.1\.gz +sysconfdir_isa-sparcv9 = $(prefix)/etc/64 +sysconfdir_isa-sparcv8 = $(prefix)/etc +sysconfdir_isa-i386 = $(prefix)/etc +sysconfdir_global = $(prefix)/etc +sysconfdir_isa-amd64 = $(prefix)/etc/64 +sysconfdir = $(sysconfdir_$(MODULATION)) + include gar/category.mk post-merge: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 02:38:46 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 01:38:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8390] csw/mgar/pkg/libbonobo2/trunk/Makefile Message-ID: Revision: 8390 http://gar.svn.sourceforge.net/gar/?rev=8390&view=rev Author: hson Date: 2010-02-08 01:38:46 +0000 (Mon, 08 Feb 2010) Log Message: ----------- libbonobo2: Link with CSW X11 libs Modified Paths: -------------- csw/mgar/pkg/libbonobo2/trunk/Makefile Modified: csw/mgar/pkg/libbonobo2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libbonobo2/trunk/Makefile 2010-02-08 01:37:39 UTC (rev 8389) +++ csw/mgar/pkg/libbonobo2/trunk/Makefile 2010-02-08 01:38:46 UTC (rev 8390) @@ -13,6 +13,12 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz BUILD64 = 1 + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 02:43:53 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 01:43:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8391] csw/mgar/pkg/libbonobo2/trunk/Makefile Message-ID: Revision: 8391 http://gar.svn.sourceforge.net/gar/?rev=8391&view=rev Author: hson Date: 2010-02-08 01:43:53 +0000 (Mon, 08 Feb 2010) Log Message: ----------- libbonobo2: Add extra exports Modified Paths: -------------- csw/mgar/pkg/libbonobo2/trunk/Makefile Modified: csw/mgar/pkg/libbonobo2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libbonobo2/trunk/Makefile 2010-02-08 01:38:46 UTC (rev 8390) +++ csw/mgar/pkg/libbonobo2/trunk/Makefile 2010-02-08 01:43:53 UTC (rev 8391) @@ -23,6 +23,12 @@ TEST_TARGET = check + +CPP = /usr/lib/cpp +EXTRA_COMMON_EXPORTS += CPP +CXXCPP = /usr/lib/cpp +EXTRA_COMMON_EXPORTS += CXXCPP + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 02:56:09 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 01:56:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8392] csw/mgar/pkg/gnomevfs2/trunk Message-ID: Revision: 8392 http://gar.svn.sourceforge.net/gar/?rev=8392&view=rev Author: hson Date: 2010-02-08 01:56:09 +0000 (Mon, 08 Feb 2010) Log Message: ----------- gnomevfs2: setprop for gar Modified Paths: -------------- csw/mgar/pkg/gnomevfs2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gnomevfs2/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/gnomevfs2/trunk/ Property changes on: csw/mgar/pkg/gnomevfs2/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/gnomevfs2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnomevfs2/trunk/Makefile 2010-02-08 01:43:53 UTC (rev 8391) +++ csw/mgar/pkg/gnomevfs2/trunk/Makefile 2010-02-08 01:56:09 UTC (rev 8392) @@ -8,8 +8,8 @@ endef MASTER_SITES = $(GNOME_MIRROR) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTNAME = $(GARNAME)-$(GARVERSION) +DISTNAME = $(GNOME_PROJ)-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.bz2 PACKAGES = CSWgnomevfs2 CSWgnomevfs2devel CSWgnomevfs2doc CATALOGNAME_CSWgnomevfs2 = gnomevfs2 @@ -63,4 +63,3 @@ TEST_TARGET = check include gar/category.mk - Added: csw/mgar/pkg/gnomevfs2/trunk/checksums =================================================================== --- csw/mgar/pkg/gnomevfs2/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnomevfs2/trunk/checksums 2010-02-08 01:56:09 UTC (rev 8392) @@ -0,0 +1 @@ +371d13e7306eb82e3fe3748a7584c440 gnome-vfs-2.24.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 02:57:31 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 01:57:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[8393] csw/mgar/pkg/gts/trunk/Makefile Message-ID: Revision: 8393 http://gar.svn.sourceforge.net/gar/?rev=8393&view=rev Author: hson Date: 2010-02-08 01:57:31 +0000 (Mon, 08 Feb 2010) Log Message: ----------- gts: Add 64-bit build Modified Paths: -------------- csw/mgar/pkg/gts/trunk/Makefile Modified: csw/mgar/pkg/gts/trunk/Makefile =================================================================== --- csw/mgar/pkg/gts/trunk/Makefile 2010-02-08 01:56:09 UTC (rev 8392) +++ csw/mgar/pkg/gts/trunk/Makefile 2010-02-08 01:57:31 UTC (rev 8393) @@ -16,13 +16,15 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +SPKG_SOURCEURL = http://gts.sourceforge.net/ + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # 1343 is the group_id for the gts project on sourceforge -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE) = 1343 +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=1343 UPSTREAM_USE_SF = 1 RUNTIME_DEP_PKGS = CSWggettextrt CSWglib2 @@ -31,4 +33,6 @@ PATCHFILES = gts-fabsf.diff +BUILD64 = 1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 03:01:13 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 02:01:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8394] csw/mgar/pkg/libidl/trunk/Makefile Message-ID: Revision: 8394 http://gar.svn.sourceforge.net/gar/?rev=8394&view=rev Author: hson Date: 2010-02-08 02:01:11 +0000 (Mon, 08 Feb 2010) Log Message: ----------- libidl: Add extra exports Modified Paths: -------------- csw/mgar/pkg/libidl/trunk/Makefile Modified: csw/mgar/pkg/libidl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libidl/trunk/Makefile 2010-02-08 01:57:31 UTC (rev 8393) +++ csw/mgar/pkg/libidl/trunk/Makefile 2010-02-08 02:01:11 UTC (rev 8394) @@ -26,4 +26,9 @@ PACKAGES = CSWlibidl +CPP = /usr/lib/cpp +EXTRA_COMMON_EXPORTS += CPP +CXXCPP = /usr/lib/cpp +EXTRA_COMMON_EXPORTS += CXXCPP + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 03:19:21 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 02:19:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8395] csw/mgar/pkg/gobject-introspection/trunk Message-ID: Revision: 8395 http://gar.svn.sourceforge.net/gar/?rev=8395&view=rev Author: hson Date: 2010-02-08 02:19:21 +0000 (Mon, 08 Feb 2010) Log Message: ----------- gobject-introspection: Add some patches to get it to build Modified Paths: -------------- csw/mgar/pkg/gobject-introspection/trunk/Makefile csw/mgar/pkg/gobject-introspection/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-01-ginvoke.diff csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-02-glib-compilation.diff csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-03-ginfo.diff csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-04-big-ending.diff csw/mgar/pkg/gobject-introspection/trunk/files/sunstudio.patch Modified: csw/mgar/pkg/gobject-introspection/trunk/Makefile =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/Makefile 2010-02-08 02:01:11 UTC (rev 8394) +++ csw/mgar/pkg/gobject-introspection/trunk/Makefile 2010-02-08 02:19:21 UTC (rev 8395) @@ -17,9 +17,18 @@ #CATALOGNAME_CSWgobjectintrospectiondevel = gobject_introspection_devel #CATALOGNAME_CSWgobjectintrospectiondoc = gobject_introspection_doc +#PKGFILES_CSWgobjectintrospectiondevel = $(PKGFILES_DEVEL) +#PKGFILES_CSWgobjectintrospectiondoc = $(sharedstatedir)/gtk-doc/.* + +#ARCHALL_CSWgobjectintrospectiondoc = 1 + BUILD_DEP_PKGS += CSWbison CSWlibffi -RUNTIME_DEP_PKGS += CSWgcc4corert +PATCHFILES += gobject-introspection-01-ginvoke.diff +PATCHFILES += gobject-introspection-02-glib-compilation.diff +PATCHFILES += gobject-introspection-03-ginfo.diff +PATCHFILES += gobject-introspection-04-big-ending.diff +PATCHFILES += sunstudio.patch UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -30,22 +39,28 @@ EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib NOISAEXEC = 1 -NOISALIST = 1 BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --x-include=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -SHELL = /opt/csw/bin/bash +#SHELL = /opt/csw/bin/bash -#PKGFILES_CSWgobjectintrospectiondevel = $(PKGFILES_DEVEL) -#PKGFILES_CSWgobjectintrospectiondoc = $(sharedstatedir)/gtk-doc/.* - -#ARCHALL_CSWgobjectintrospectiondoc = 1 - CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk -#PATH := /opt/csw/gnu:$(PATH) +pre-configure-modulated: + ( cd $(WORKSRC); \ + rm -f m4/lt~obsolete.m4 ; \ + rm -f m4/ltoptions.m4 ; \ + rm -f m4/libtool.m4 ; \ + rm -f m4/ltsugar.m4 ; \ + rm -f m4/ltversion.m4 ; \ + libtoolize --copy --force ; \ + aclocal -I m4 ; \ + autoheader ; \ + automake -a -c -f ; \ + autoconf ; \ + ) Modified: csw/mgar/pkg/gobject-introspection/trunk/checksums =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/checksums 2010-02-08 02:01:11 UTC (rev 8394) +++ csw/mgar/pkg/gobject-introspection/trunk/checksums 2010-02-08 02:19:21 UTC (rev 8395) @@ -1 +1,6 @@ 41205c14cbd86632806578448e29bd30 gobject-introspection-0.6.7.tar.bz2 +948f52dc7a6649f6e83a7b5bb4f905e8 gobject-introspection-01-ginvoke.diff +e09b30913029fffced1d9dc6f96e6a2e gobject-introspection-02-glib-compilation.diff +aa7aa32091d3c7a4cddbf78abe20d5d1 gobject-introspection-03-ginfo.diff +ab2070d09322745c666f303da35c837f gobject-introspection-04-big-ending.diff +924f1a75b7190abbf49183b1081448cd sunstudio.patch Added: csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-01-ginvoke.diff =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-01-ginvoke.diff (rev 0) +++ csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-01-ginvoke.diff 2010-02-08 02:19:21 UTC (rev 8395) @@ -0,0 +1,11 @@ +--- gobject-introspection-0.6.7/girepository/ginvoke.c-orig 2009-12-18 22:16:56.046770405 -0600 ++++ gobject-introspection-0.6.7/girepository/ginvoke.c 2009-12-18 22:18:57.863210834 -0600 +@@ -436,7 +436,7 @@ gi_cclosure_marshal_generic (GClosure *c + if (ffi_prep_cif (&cif, FFI_DEFAULT_ABI, n_args, rtype, atypes) != FFI_OK) + return; + +- g_return_val_if_fail (rvalue, FALSE); ++ g_return_if_fail (rvalue); + ffi_call (&cif, marshal_data ? marshal_data : cc->callback, rvalue, args); + + if (return_gvalue && G_VALUE_TYPE (return_gvalue)) Added: csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-02-glib-compilation.diff =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-02-glib-compilation.diff (rev 0) +++ csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-02-glib-compilation.diff 2010-02-08 02:19:21 UTC (rev 8395) @@ -0,0 +1,23 @@ +commit 2bab940ad9dd947379188cfa6f5990352660cd25 +Author: Halton Huo +Date: Wed Dec 23 16:27:40 2009 +0800 + + Add -DGLIB_COMPILATION for GLib-2.0.gir. + + Otherwise, suncc reports error when parsing /usr/include/glib-2.0/glib/ghostutils.h, + and stops parsing rest headers. + + https://bugzilla.gnome.org/show_bug.cgi?id=605108 + +diff --git a/gir/Makefile.am b/gir/Makefile.am +index db182f8..d7c32ca 100644 +--- a/gir/Makefile.am ++++ b/gir/Makefile.am +@@ -36,6 +36,7 @@ GLib_2_0_gir_CFLAGS = $(CPPFLAGS) \ + -I$(GLIB_INCLUDEDIR) \ + -I$(GLIB_LIBDIR)/glib-2.0/include \ + -DGETTEXT_PACKAGE=Dummy \ ++ -DGLIB_COMPILATION \ + -D__G_I18N_LIB_H__ + GLib_2_0_gir_ASSERTIONS = $(srcdir)/GLib-2.0.xpath + GLib_2_0_gir_FILES = \ Added: csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-03-ginfo.diff =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-03-ginfo.diff (rev 0) +++ csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-03-ginfo.diff 2010-02-08 02:19:21 UTC (rev 8395) @@ -0,0 +1,2631 @@ +commit 804f59f40c027cf1fb2944764adea564dff07678 +Author: Colin Walters +Date: Mon Dec 7 18:35:06 2009 -0500 + + Allow stack allocating GIBaseInfo, add stack retrieval variants + + We don't want to malloc each GIBaseInfo when they can be used in + function invocation; instead, allow stack allocation. + + There were a lot of structure typedefs which were actually just + exactly the same as GIBaseInfo, with the one exception of GITypeInfo. + + Instead, just put the single GITypeInfo boolean inside GIBaseInfo + as a bit in a bitfield. + + GIBaseInfo is still opaque publicly; GIRealInfo is the new + internal structure. + + Using this, add new functions to retrieve arguments and argument types + on the stack. + + https://bugzilla.gnome.org/show_bug.cgi?id=604074 + +diff --git a/girepository/ginfo.c b/girepository/ginfo.c +index 2aacb76..b11cc8f 100644 +--- a/girepository/ginfo.c ++++ b/girepository/ginfo.c +@@ -28,11 +28,19 @@ + #include "gtypelib.h" + #include "ginfo.h" + +-struct _GIBaseInfo ++typedef struct _GIRealInfo GIRealInfo; ++ ++/** ++ * We just use one structure for all of the info object ++ * types; in general, we should be reading data directly ++ * from the typelib, and not having computed data in ++ * per-type structures. ++ */ ++struct _GIRealInfo + { + /* Keep this part in sync with GIUnresolvedInfo below */ +- gint type; +- gint ref_count; ++ gint32 type; ++ gint32 ref_count; + GIRepository *repository; + GIBaseInfo *container; + +@@ -40,13 +48,18 @@ struct _GIBaseInfo + + GTypelib *typelib; + guint32 offset; ++ ++ guint32 type_is_embedded : 1; /* Used by GITypeInfo */ ++ guint32 reserved : 31; ++ ++ gpointer reserved2[4]; + }; + + struct _GIUnresolvedInfo + { + /* Keep this part in sync with GIBaseInfo above */ +- gint type; +- gint ref_count; ++ gint32 type; ++ gint32 ref_count; + GIRepository *repository; + GIBaseInfo *container; + +@@ -56,137 +69,68 @@ struct _GIUnresolvedInfo + const gchar *namespace; + }; + +-struct _GICallableInfo +-{ +- GIBaseInfo base; +-}; +- +-struct _GIFunctionInfo +-{ +- GICallableInfo callable; +-}; +- +-struct _GICallbackInfo +-{ +- GICallableInfo callable; +-}; +- +-struct _GIRegisteredTypeInfo +-{ +- GIBaseInfo base; +-}; +- +-struct _GIStructInfo +-{ +- GIRegisteredTypeInfo registered; +-}; +- +-struct _GIEnumInfo +-{ +- GIRegisteredTypeInfo registered; +-}; +- +-struct _GIObjectInfo +-{ +- GIRegisteredTypeInfo registered; +-}; +- +-struct _GIInterfaceInfo +-{ +- GIRegisteredTypeInfo registered; +-}; +- +-struct _GIConstantInfo +-{ +- GIBaseInfo base; +-}; +- +-struct _GIValueInfo +-{ +- GIBaseInfo base; +-}; +- +-struct _GISignalInfo +-{ +- GICallableInfo callable; +-}; +- +-struct _GIVFuncInfo +-{ +- GICallableInfo callable; +-}; +- +-struct _GIPropertyInfo +-{ +- GIBaseInfo base; +-}; +- +-struct _GIFieldInfo ++static void ++g_info_init (GIRealInfo *info, ++ GIInfoType type, ++ GIRepository *repository, ++ GIBaseInfo *container, ++ GTypelib *typelib, ++ guint32 offset) + { +- GIBaseInfo base; +-}; ++ memset (info, 0, sizeof (GIRealInfo)); + +-struct _GIArgInfo +-{ +- GIBaseInfo base; +-}; ++ /* Invalid refcount used to flag stack-allocated infos */ ++ info->ref_count = 0xFFFF; ++ info->type = type; + +-struct _GITypeInfo +-{ +- GIBaseInfo base; +- gboolean is_embedded; +-}; ++ info->typelib = typelib; ++ info->offset = offset; + +-struct _GIUnionInfo +-{ +- GIRegisteredTypeInfo registered; +-}; ++ if (container) ++ info->container = container; + ++ g_assert (G_IS_IREPOSITORY (repository)); ++ info->repository = repository; ++} + + /* info creation */ + GIBaseInfo * + g_info_new_full (GIInfoType type, +- GIRepository *repository, +- GIBaseInfo *container, +- GTypelib *typelib, +- guint32 offset) ++ GIRepository *repository, ++ GIBaseInfo *container, ++ GTypelib *typelib, ++ guint32 offset) + { +- GIBaseInfo *info; ++ GIRealInfo *info; + + g_return_val_if_fail (container != NULL || repository != NULL, NULL); + +- if (type == GI_INFO_TYPE_TYPE) +- info = (GIBaseInfo *)g_new0 (GITypeInfo, 1); +- else +- info = g_new0 (GIBaseInfo, 1); +- ++ info = g_new (GIRealInfo, 1); ++ ++ g_info_init (info, type, repository, container, typelib, offset); + info->ref_count = 1; +- info->type = type; +- +- info->typelib = typelib; +- info->offset = offset; + +- if (container) +- info->container = g_base_info_ref (container); ++ if (container && ((GIRealInfo *) container)->ref_count != 0xFFFF) ++ g_base_info_ref (info->container); + +- info->repository = g_object_ref (repository); ++ g_object_ref (info->repository); + +- return info; ++ return (GIBaseInfo*)info; + } + + GIBaseInfo * + g_info_new (GIInfoType type, +- GIBaseInfo *container, +- GTypelib *typelib, +- guint32 offset) ++ GIBaseInfo *container, ++ GTypelib *typelib, ++ guint32 offset) + { +- return g_info_new_full (type, container->repository, container, typelib, offset); ++ return g_info_new_full (type, ((GIRealInfo*)container)->repository, container, typelib, offset); + } + + static GIBaseInfo * + g_info_from_entry (GIRepository *repository, +- GTypelib *typelib, +- guint16 index) ++ GTypelib *typelib, ++ guint16 index) + { + GIBaseInfo *result; + DirEntry *entry = g_typelib_get_dir_entry (typelib, index); +@@ -200,31 +144,34 @@ g_info_from_entry (GIRepository *repository, + + result = g_irepository_find_by_name (repository, namespace, name); + if (result == NULL) +- { +- GIUnresolvedInfo *unresolved; ++ { ++ GIUnresolvedInfo *unresolved; + +- unresolved = g_new0 (GIUnresolvedInfo, 1); ++ unresolved = g_new0 (GIUnresolvedInfo, 1); + +- unresolved->type = GI_INFO_TYPE_UNRESOLVED; +- unresolved->ref_count = 1; +- unresolved->repository = g_object_ref (repository); +- unresolved->container = NULL; +- unresolved->name = name; +- unresolved->namespace = namespace; ++ unresolved->type = GI_INFO_TYPE_UNRESOLVED; ++ unresolved->ref_count = 1; ++ unresolved->repository = g_object_ref (repository); ++ unresolved->container = NULL; ++ unresolved->name = name; ++ unresolved->namespace = namespace; + +- return (GIBaseInfo*)unresolved; +- } +- return result; ++ return (GIBaseInfo *)unresolved; ++ } ++ return (GIBaseInfo *)result; + } + +- return result; ++ return (GIBaseInfo *)result; + } + + /* GIBaseInfo functions */ + GIBaseInfo * + g_base_info_ref (GIBaseInfo *info) + { +- info->ref_count++; ++ GIRealInfo *rinfo = (GIRealInfo*)info; ++ ++ g_assert (rinfo->ref_count != 0xFFFF); ++ ((GIRealInfo*)info)->ref_count++; + + return info; + } +@@ -232,18 +179,20 @@ g_base_info_ref (GIBaseInfo *info) + void + g_base_info_unref (GIBaseInfo *info) + { +- g_assert (info->ref_count > 0); +- info->ref_count--; ++ GIRealInfo *rinfo = (GIRealInfo*)info; ++ ++ g_assert (rinfo->ref_count > 0 && rinfo->ref_count != 0xFFFF); ++ rinfo->ref_count--; + +- if (!info->ref_count) ++ if (!rinfo->ref_count) + { +- if (info->container) +- g_base_info_unref (info->container); ++ if (rinfo->container && ((GIRealInfo *) rinfo->container)->ref_count != 0xFFFF) ++ g_base_info_unref (rinfo->container); + +- if (info->repository) +- g_object_unref (info->repository); ++ if (rinfo->repository) ++ g_object_unref (rinfo->repository); + +- g_free (info); ++ g_free (rinfo); + } + } + +@@ -251,14 +200,15 @@ GIInfoType + g_base_info_get_type (GIBaseInfo *info) + { + +- return info->type; ++ return ((GIRealInfo*)info)->type; + } + + const gchar * + g_base_info_get_name (GIBaseInfo *info) + { +- g_assert (info->ref_count > 0); +- switch (info->type) ++ GIRealInfo *rinfo = (GIRealInfo*)info; ++ g_assert (rinfo->ref_count > 0); ++ switch (rinfo->type) + { + case GI_INFO_TYPE_FUNCTION: + case GI_INFO_TYPE_CALLBACK: +@@ -272,64 +222,64 @@ g_base_info_get_name (GIBaseInfo *info) + case GI_INFO_TYPE_ERROR_DOMAIN: + case GI_INFO_TYPE_UNION: + { +- CommonBlob *blob = (CommonBlob *)&info->typelib->data[info->offset]; ++ CommonBlob *blob = (CommonBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return g_typelib_get_string (info->typelib, blob->name); ++ return g_typelib_get_string (rinfo->typelib, blob->name); + } + break; + + case GI_INFO_TYPE_VALUE: + { +- ValueBlob *blob = (ValueBlob *)&info->typelib->data[info->offset]; ++ ValueBlob *blob = (ValueBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return g_typelib_get_string (info->typelib, blob->name); ++ return g_typelib_get_string (rinfo->typelib, blob->name); + } + break; + + case GI_INFO_TYPE_SIGNAL: + { +- SignalBlob *blob = (SignalBlob *)&info->typelib->data[info->offset]; ++ SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return g_typelib_get_string (info->typelib, blob->name); ++ return g_typelib_get_string (rinfo->typelib, blob->name); + } + break; + + case GI_INFO_TYPE_PROPERTY: + { +- PropertyBlob *blob = (PropertyBlob *)&info->typelib->data[info->offset]; ++ PropertyBlob *blob = (PropertyBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return g_typelib_get_string (info->typelib, blob->name); ++ return g_typelib_get_string (rinfo->typelib, blob->name); + } + break; + + case GI_INFO_TYPE_VFUNC: + { +- VFuncBlob *blob = (VFuncBlob *)&info->typelib->data[info->offset]; ++ VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return g_typelib_get_string (info->typelib, blob->name); ++ return g_typelib_get_string (rinfo->typelib, blob->name); + } + break; + + case GI_INFO_TYPE_FIELD: + { +- FieldBlob *blob = (FieldBlob *)&info->typelib->data[info->offset]; ++ FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return g_typelib_get_string (info->typelib, blob->name); ++ return g_typelib_get_string (rinfo->typelib, blob->name); + } + break; + + case GI_INFO_TYPE_ARG: + { +- ArgBlob *blob = (ArgBlob *)&info->typelib->data[info->offset]; ++ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return g_typelib_get_string (info->typelib, blob->name); ++ return g_typelib_get_string (rinfo->typelib, blob->name); + } + break; + case GI_INFO_TYPE_UNRESOLVED: + { +- GIUnresolvedInfo *unresolved = (GIUnresolvedInfo *)info; ++ GIUnresolvedInfo *unresolved = (GIUnresolvedInfo *)info; + +- return unresolved->name; ++ return unresolved->name; + } + break; + case GI_INFO_TYPE_TYPE: +@@ -344,24 +294,26 @@ g_base_info_get_name (GIBaseInfo *info) + const gchar * + g_base_info_get_namespace (GIBaseInfo *info) + { +- Header *header = (Header *)info->typelib->data; ++ GIRealInfo *rinfo = (GIRealInfo*) info; ++ Header *header = (Header *)rinfo->typelib->data; + +- g_assert (info->ref_count > 0); ++ g_assert (rinfo->ref_count > 0); + +- if (info->type == GI_INFO_TYPE_UNRESOLVED) ++ if (rinfo->type == GI_INFO_TYPE_UNRESOLVED) + { + GIUnresolvedInfo *unresolved = (GIUnresolvedInfo *)info; + + return unresolved->namespace; + } + +- return g_typelib_get_string (info->typelib, header->namespace); ++ return g_typelib_get_string (rinfo->typelib, header->namespace); + } + + gboolean + g_base_info_is_deprecated (GIBaseInfo *info) + { +- switch (info->type) ++ GIRealInfo *rinfo = (GIRealInfo*) info; ++ switch (rinfo->type) + { + case GI_INFO_TYPE_FUNCTION: + case GI_INFO_TYPE_CALLBACK: +@@ -374,33 +326,33 @@ g_base_info_is_deprecated (GIBaseInfo *info) + case GI_INFO_TYPE_CONSTANT: + case GI_INFO_TYPE_ERROR_DOMAIN: + { +- CommonBlob *blob = (CommonBlob *)&info->typelib->data[info->offset]; ++ CommonBlob *blob = (CommonBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return blob->deprecated; ++ return blob->deprecated; + } + break; + + case GI_INFO_TYPE_VALUE: + { +- ValueBlob *blob = (ValueBlob *)&info->typelib->data[info->offset]; ++ ValueBlob *blob = (ValueBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return blob->deprecated; ++ return blob->deprecated; + } + break; + + case GI_INFO_TYPE_SIGNAL: + { +- SignalBlob *blob = (SignalBlob *)&info->typelib->data[info->offset]; ++ SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return blob->deprecated; ++ return blob->deprecated; + } + break; + + case GI_INFO_TYPE_PROPERTY: + { +- PropertyBlob *blob = (PropertyBlob *)&info->typelib->data[info->offset]; ++ PropertyBlob *blob = (PropertyBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return blob->deprecated; ++ return blob->deprecated; + } + break; + +@@ -426,7 +378,7 @@ g_base_info_is_deprecated (GIBaseInfo *info) + */ + const gchar * + g_base_info_get_attribute (GIBaseInfo *info, +- const gchar *name) ++ const gchar *name) + { + GIAttributeIter iter = { 0, }; + gchar *curname, *curvalue; +@@ -455,15 +407,14 @@ cmp_attribute (const void *av, + } + + static AttributeBlob * +-find_first_attribute (GIBaseInfo *info) ++find_first_attribute (GIRealInfo *rinfo) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; ++ Header *header = (Header *)rinfo->typelib->data; + AttributeBlob blob, *first, *res, *previous; + +- blob.offset = base->offset; ++ blob.offset = rinfo->offset; + +- first = (AttributeBlob *) &base->typelib->data[header->attributes]; ++ first = (AttributeBlob *) &rinfo->typelib->data[header->attributes]; + + res = bsearch (&blob, first, header->n_attributes, + header->attribute_blob_size, cmp_attribute); +@@ -472,7 +423,7 @@ find_first_attribute (GIBaseInfo *info) + return NULL; + + previous = res - 1; +- while (previous >= first && previous->offset == base->offset) ++ while (previous >= first && previous->offset == rinfo->offset) + { + res = previous; + previous = res - 1; +@@ -520,23 +471,23 @@ g_base_info_iterate_attributes (GIBaseInfo *info, + gchar **name, + gchar **value) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; + AttributeBlob *next, *after; + +- after = (AttributeBlob *) &base->typelib->data[header->attributes + ++ after = (AttributeBlob *) &rinfo->typelib->data[header->attributes + + header->n_attributes * header->attribute_blob_size]; + + if (iter->data != NULL) + next = (AttributeBlob *) iter->data; + else +- next = find_first_attribute (info); ++ next = find_first_attribute (rinfo); + +- if (next == NULL || next->offset != base->offset || next >= after) ++ if (next == NULL || next->offset != rinfo->offset || next >= after) + return FALSE; + +- *name = (gchar*) g_typelib_get_string (base->typelib, next->name); +- *value = (gchar*) g_typelib_get_string (base->typelib, next->value); ++ *name = (gchar*) g_typelib_get_string (rinfo->typelib, next->name); ++ *value = (gchar*) g_typelib_get_string (rinfo->typelib, next->value); + iter->data = next + 1; + + return TRUE; +@@ -545,13 +496,13 @@ g_base_info_iterate_attributes (GIBaseInfo *info, + GIBaseInfo * + g_base_info_get_container (GIBaseInfo *info) + { +- return info->container; ++ return ((GIRealInfo*)info)->container; + } + + GTypelib * + g_base_info_get_typelib (GIBaseInfo *info) + { +- return info->typelib; ++ return ((GIRealInfo*)info)->typelib; + } + + /* +@@ -571,25 +522,27 @@ gboolean + g_base_info_equal (GIBaseInfo *info1, GIBaseInfo *info2) + { + /* Compare the TypeLib pointers, which are mmapped. */ +- return info1->typelib->data + info1->offset == info2->typelib->data + info2->offset; ++ GIRealInfo *rinfo1 = (GIRealInfo*)info1; ++ GIRealInfo *rinfo2 = (GIRealInfo*)info2; ++ return rinfo1->typelib->data + rinfo1->offset == rinfo2->typelib->data + rinfo2->offset; + } + + /* GIFunctionInfo functions */ + const gchar * + g_function_info_get_symbol (GIFunctionInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- FunctionBlob *blob = (FunctionBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ FunctionBlob *blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return g_typelib_get_string (base->typelib, blob->symbol); ++ return g_typelib_get_string (rinfo->typelib, blob->symbol); + } + + GIFunctionInfoFlags + g_function_info_get_flags (GIFunctionInfo *info) + { + GIFunctionInfoFlags flags; +- GIBaseInfo *base = (GIBaseInfo *)info; +- FunctionBlob *blob = (FunctionBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ FunctionBlob *blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset]; + + flags = 0; + +@@ -618,9 +571,9 @@ g_function_info_get_flags (GIFunctionInfo *info) + GIPropertyInfo * + g_function_info_get_property (GIFunctionInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- FunctionBlob *blob = (FunctionBlob *)&base->typelib->data[base->offset]; +- GIInterfaceInfo *container = (GIInterfaceInfo *)base->container; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ FunctionBlob *blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset]; ++ GIInterfaceInfo *container = (GIInterfaceInfo *)rinfo->container; + + return g_interface_info_get_property (container, blob->index); + } +@@ -628,20 +581,21 @@ g_function_info_get_property (GIFunctionInfo *info) + GIVFuncInfo * + g_function_info_get_vfunc (GIFunctionInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- FunctionBlob *blob = (FunctionBlob *)&base->typelib->data[base->offset]; +- GIInterfaceInfo *container = (GIInterfaceInfo *)base->container; ++ GIRealInfo *rinfo = (GIRealInfo*)info; ++ FunctionBlob *blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset]; ++ GIInterfaceInfo *container = (GIInterfaceInfo *)rinfo->container; + + return g_interface_info_get_vfunc (container, blob->index); + } + +- + /* GICallableInfo functions */ + static guint32 + signature_offset (GICallableInfo *info) + { ++ GIRealInfo *rinfo = (GIRealInfo*)info; + int sigoff = -1; +- switch (info->base.type) ++ ++ switch (rinfo->type) + { + case GI_INFO_TYPE_FUNCTION: + sigoff = G_STRUCT_OFFSET (FunctionBlob, signature); +@@ -657,23 +611,32 @@ signature_offset (GICallableInfo *info) + break; + } + if (sigoff >= 0) +- return *(guint32 *)&info->base.typelib->data[info->base.offset + sigoff]; ++ return *(guint32 *)&rinfo->typelib->data[rinfo->offset + sigoff]; + return 0; + } + + GITypeInfo * + g_type_info_new (GIBaseInfo *container, +- GTypelib *typelib, +- guint32 offset) ++ GTypelib *typelib, ++ guint32 offset) + { + SimpleTypeBlob *type = (SimpleTypeBlob *)&typelib->data[offset]; +- GITypeInfo *type_info; + +- type_info = (GITypeInfo *) g_info_new (GI_INFO_TYPE_TYPE, container, typelib, +- (type->flags.reserved == 0 && type->flags.reserved2 == 0) ? offset : type->offset); +- type_info->is_embedded = FALSE; ++ return (GITypeInfo *) g_info_new (GI_INFO_TYPE_TYPE, container, typelib, ++ (type->flags.reserved == 0 && type->flags.reserved2 == 0) ? offset : type->offset); ++} + +- return type_info; ++static void ++g_type_info_init (GIBaseInfo *info, ++ GIBaseInfo *container, ++ GTypelib *typelib, ++ guint32 offset) ++{ ++ GIRealInfo *rinfo = (GIRealInfo*)container; ++ SimpleTypeBlob *type = (SimpleTypeBlob *)&typelib->data[offset]; ++ ++ g_info_init ((GIRealInfo*)info, GI_INFO_TYPE_TYPE, rinfo->repository, container, typelib, ++ (type->flags.reserved == 0 && type->flags.reserved2 == 0) ? offset : type->offset); + } + + /** +@@ -689,12 +652,36 @@ g_type_info_new (GIBaseInfo *container, + GITypeInfo * + g_callable_info_get_return_type (GICallableInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; ++ GIRealInfo *rinfo = (GIRealInfo *)info; + guint32 offset; + + offset = signature_offset (info); + +- return g_type_info_new (base, base->typelib, offset); ++ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, offset); ++} ++ ++ ++/** ++ * g_callable_info_load_return_type: ++ * @info: a #GICallableInfo ++ * @type: (out caller-allocates): Initialized with return type of @info ++ * ++ * Get information about a return value of callable; this ++ * function is a variant of g_callable_info_get_return_type() designed for stack ++ * allocation. ++ * ++ * The initialized @type must not be referenced after @info is deallocated. ++ */ ++void ++g_callable_info_load_return_type (GICallableInfo *info, ++ GITypeInfo *type) ++{ ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ guint32 offset; ++ ++ offset = signature_offset (info); ++ ++ g_type_info_init (type, (GIBaseInfo*)info, rinfo->typelib, offset); + } + + /** +@@ -708,8 +695,8 @@ g_callable_info_get_return_type (GICallableInfo *info) + gboolean + g_callable_info_may_return_null (GICallableInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- SignatureBlob *blob = (SignatureBlob *)&base->typelib->data[signature_offset (info)]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ SignatureBlob *blob = (SignatureBlob *)&rinfo->typelib->data[signature_offset (info)]; + + return blob->may_return_null; + } +@@ -726,8 +713,8 @@ g_callable_info_may_return_null (GICallableInfo *info) + GITransfer + g_callable_info_get_caller_owns (GICallableInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- SignatureBlob *blob = (SignatureBlob *)&base->typelib->data[signature_offset (info)]; ++ GIRealInfo *rinfo = (GIRealInfo*) info; ++ SignatureBlob *blob = (SignatureBlob *)&rinfo->typelib->data[signature_offset (info)]; + + if (blob->caller_owns_return_value) + return GI_TRANSFER_EVERYTHING; +@@ -748,12 +735,12 @@ g_callable_info_get_caller_owns (GICallableInfo *info) + gint + g_callable_info_get_n_args (GICallableInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; ++ GIRealInfo *rinfo = (GIRealInfo *)info; + gint offset; + SignatureBlob *blob; + + offset = signature_offset (info); +- blob = (SignatureBlob *)&base->typelib->data[offset]; ++ blob = (SignatureBlob *)&rinfo->typelib->data[offset]; + + return blob->n_arguments; + } +@@ -769,24 +756,51 @@ g_callable_info_get_n_args (GICallableInfo *info) + */ + GIArgInfo * + g_callable_info_get_arg (GICallableInfo *info, +- gint n) ++ gint n) ++{ ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ gint offset; ++ ++ offset = signature_offset (info); ++ ++ return (GIArgInfo *) g_info_new (GI_INFO_TYPE_ARG, (GIBaseInfo*)info, rinfo->typelib, ++ offset + header->signature_blob_size + n * header->arg_blob_size); ++} ++ ++/** ++ * g_callable_info_load_arg: ++ * @info: a #GICallableInfo ++ * @n: the argument index to fetch ++ * @arg: (out caller-allocates): Initialize with argument number @n ++ * ++ * Get information about a particular argument of this callable; this ++ * function is a variant of g_callable_info_get_arg() designed for stack ++ * allocation. ++ * ++ * The initialized @arg must not be referenced after @info is deallocated. ++ */ ++void ++g_callable_info_load_arg (GICallableInfo *info, ++ gint n, ++ GIArgInfo *arg) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; + gint offset; + + offset = signature_offset (info); + +- return (GIArgInfo *) g_info_new (GI_INFO_TYPE_ARG, base, base->typelib, +- offset + header->signature_blob_size + n * header->arg_blob_size); ++ g_info_init ((GIRealInfo*)arg, GI_INFO_TYPE_ARG, rinfo->repository, (GIBaseInfo*)info, rinfo->typelib, ++ offset + header->signature_blob_size + n * header->arg_blob_size); + } + + /* GIArgInfo function */ + GIDirection + g_arg_info_get_direction (GIArgInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->in && blob->out) + return GI_DIRECTION_INOUT; +@@ -799,8 +813,8 @@ g_arg_info_get_direction (GIArgInfo *info) + gboolean + g_arg_info_is_return_value (GIArgInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->return_value; + } +@@ -808,8 +822,8 @@ g_arg_info_is_return_value (GIArgInfo *info) + gboolean + g_arg_info_is_dipper (GIArgInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->dipper; + } +@@ -817,8 +831,8 @@ g_arg_info_is_dipper (GIArgInfo *info) + gboolean + g_arg_info_is_optional (GIArgInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->optional; + } +@@ -826,8 +840,8 @@ g_arg_info_is_optional (GIArgInfo *info) + gboolean + g_arg_info_may_be_null (GIArgInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->allow_none; + } +@@ -835,8 +849,8 @@ g_arg_info_may_be_null (GIArgInfo *info) + GITransfer + g_arg_info_get_ownership_transfer (GIArgInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->transfer_ownership) + return GI_TRANSFER_EVERYTHING; +@@ -849,8 +863,8 @@ g_arg_info_get_ownership_transfer (GIArgInfo *info) + GIScopeType + g_arg_info_get_scope (GIArgInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->scope; + } +@@ -858,8 +872,8 @@ g_arg_info_get_scope (GIArgInfo *info) + gint + g_arg_info_get_closure (GIArgInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->closure; + } +@@ -867,32 +881,57 @@ g_arg_info_get_closure (GIArgInfo *info) + gint + g_arg_info_get_destroy (GIArgInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->destroy; + } + ++/** ++ * g_arg_info_get_type: ++ * @info: A #GIArgInfo ++ * ++ * Returns: (transfer full): Information about the type of argument @info ++ */ + GITypeInfo * + g_arg_info_get_type (GIArgInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; ++ GIRealInfo *rinfo = (GIRealInfo *)info; + +- return g_type_info_new (base, base->typelib, base->offset + G_STRUCT_OFFSET (ArgBlob, arg_type)); ++ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + G_STRUCT_OFFSET (ArgBlob, arg_type)); ++} ++ ++/** ++ * g_arg_info_load_type: ++ * @info: A #GIArgInfo ++ * @type: (out caller-allocates): Initialized with information about type of @info ++ * ++ * Get information about a the type of given argument @info; this ++ * function is a variant of g_arg_info_get_type() designed for stack ++ * allocation. ++ * ++ * The initialized @type must not be referenced after @info is deallocated. ++ */ ++void ++g_arg_info_load_type (GIArgInfo *info, ++ GITypeInfo *type) ++{ ++ GIRealInfo *rinfo = (GIRealInfo*) info; ++ g_type_info_init (type, (GIBaseInfo*)info, rinfo->typelib, rinfo->offset + G_STRUCT_OFFSET (ArgBlob, arg_type)); + } + + /* GITypeInfo functions */ + gboolean + g_type_info_is_pointer (GITypeInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (type->flags.reserved == 0 && type->flags.reserved2 == 0) + return type->flags.pointer; + else + { +- InterfaceTypeBlob *iface = (InterfaceTypeBlob *)&base->typelib->data[base->offset]; ++ InterfaceTypeBlob *iface = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + return iface->pointer; + } +@@ -901,16 +940,16 @@ g_type_info_is_pointer (GITypeInfo *info) + GITypeTag + g_type_info_get_tag (GITypeInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + +- if (info->is_embedded) ++ if (rinfo->type_is_embedded) + return GI_TYPE_TAG_INTERFACE; + else if (type->flags.reserved == 0 && type->flags.reserved2 == 0) + return type->flags.tag; + else + { +- InterfaceTypeBlob *iface = (InterfaceTypeBlob *)&base->typelib->data[base->offset]; ++ InterfaceTypeBlob *iface = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + return iface->tag; + } +@@ -918,49 +957,58 @@ g_type_info_get_tag (GITypeInfo *info) + + GITypeInfo * + g_type_info_get_param_type (GITypeInfo *info, +- gint n) ++ gint n) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) + { +- ParamTypeBlob *param = (ParamTypeBlob *)&base->typelib->data[base->offset]; ++ ParamTypeBlob *param = (ParamTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + switch (param->tag) +- { +- case GI_TYPE_TAG_ARRAY: +- case GI_TYPE_TAG_GLIST: +- case GI_TYPE_TAG_GSLIST: +- case GI_TYPE_TAG_GHASH: +- return g_type_info_new (base, base->typelib, +- base->offset + sizeof (ParamTypeBlob) +- + sizeof (SimpleTypeBlob) * n); +- break; +- +- default: ; +- } ++ { ++ case GI_TYPE_TAG_ARRAY: ++ case GI_TYPE_TAG_GLIST: ++ case GI_TYPE_TAG_GSLIST: ++ case GI_TYPE_TAG_GHASH: ++ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, ++ rinfo->offset + sizeof (ParamTypeBlob) ++ + sizeof (SimpleTypeBlob) * n); ++ break; ++ default: ++ break; ++ } + } +- ++ + return NULL; + } + ++/** ++ * g_type_info_get_interface: ++ * @info: A #GITypeInfo ++ * ++ * For types which have #GI_TYPE_TAG_INTERFACE such as GObjects and boxed values, ++ * this function returns full information about the referenced type. You can then ++ * inspect the type of the returned #GIBaseInfo to further query whether it is ++ * a concrete GObject, a GInterface, a structure, etc. using g_base_info_get_type(). ++ */ + GIBaseInfo * + g_type_info_get_interface (GITypeInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + +- if (info->is_embedded) +- return (GIBaseInfo *) g_info_new (type->offset, base, base->typelib, +- base->offset); ++ if (rinfo->type_is_embedded) ++ return (GIBaseInfo *) g_info_new (type->offset, (GIBaseInfo*)info, rinfo->typelib, ++ rinfo->offset); + + if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) + { +- InterfaceTypeBlob *blob = (InterfaceTypeBlob *)&base->typelib->data[base->offset]; ++ InterfaceTypeBlob *blob = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->tag == GI_TYPE_TAG_INTERFACE) +- return g_info_from_entry (base->repository, base->typelib, blob->interface); ++ return g_info_from_entry (rinfo->repository, rinfo->typelib, blob->interface); + } + + return NULL; +@@ -969,12 +1017,12 @@ g_type_info_get_interface (GITypeInfo *info) + gint + g_type_info_get_array_length (GITypeInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) + { +- ArrayTypeBlob *blob = (ArrayTypeBlob *)&base->typelib->data[base->offset]; ++ ArrayTypeBlob *blob = (ArrayTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->tag == GI_TYPE_TAG_ARRAY) + { +@@ -989,12 +1037,12 @@ g_type_info_get_array_length (GITypeInfo *info) + gint + g_type_info_get_array_fixed_size (GITypeInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) + { +- ArrayTypeBlob *blob = (ArrayTypeBlob *)&base->typelib->data[base->offset]; ++ ArrayTypeBlob *blob = (ArrayTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->tag == GI_TYPE_TAG_ARRAY) + { +@@ -1009,12 +1057,12 @@ g_type_info_get_array_fixed_size (GITypeInfo *info) + gboolean + g_type_info_is_zero_terminated (GITypeInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) + { +- ArrayTypeBlob *blob = (ArrayTypeBlob *)&base->typelib->data[base->offset]; ++ ArrayTypeBlob *blob = (ArrayTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->tag == GI_TYPE_TAG_ARRAY) + return blob->zero_terminated; +@@ -1026,12 +1074,12 @@ g_type_info_is_zero_terminated (GITypeInfo *info) + gint + g_type_info_get_n_error_domains (GITypeInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) + { +- ErrorTypeBlob *blob = (ErrorTypeBlob *)&base->typelib->data[base->offset]; ++ ErrorTypeBlob *blob = (ErrorTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->tag == GI_TYPE_TAG_ERROR) + return blob->n_domains; +@@ -1042,19 +1090,19 @@ g_type_info_get_n_error_domains (GITypeInfo *info) + + GIErrorDomainInfo * + g_type_info_get_error_domain (GITypeInfo *info, +- gint n) ++ gint n) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) + { +- ErrorTypeBlob *blob = (ErrorTypeBlob *)&base->typelib->data[base->offset]; ++ ErrorTypeBlob *blob = (ErrorTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->tag == GI_TYPE_TAG_ERROR) +- return (GIErrorDomainInfo *) g_info_from_entry (base->repository, +- base->typelib, +- blob->domains[n]); ++ return (GIErrorDomainInfo *) g_info_from_entry (rinfo->repository, ++ rinfo->typelib, ++ blob->domains[n]); + } + + return NULL; +@@ -1065,20 +1113,20 @@ g_type_info_get_error_domain (GITypeInfo *info, + const gchar * + g_error_domain_info_get_quark (GIErrorDomainInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ErrorDomainBlob *blob = (ErrorDomainBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ErrorDomainBlob *blob = (ErrorDomainBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return g_typelib_get_string (base->typelib, blob->get_quark); ++ return g_typelib_get_string (rinfo->typelib, blob->get_quark); + } + + GIInterfaceInfo * + g_error_domain_info_get_codes (GIErrorDomainInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ErrorDomainBlob *blob = (ErrorDomainBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ErrorDomainBlob *blob = (ErrorDomainBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return (GIInterfaceInfo *) g_info_from_entry (base->repository, +- base->typelib, blob->error_codes); ++ return (GIInterfaceInfo *) g_info_from_entry (rinfo->repository, ++ rinfo->typelib, blob->error_codes); + } + + +@@ -1086,8 +1134,8 @@ g_error_domain_info_get_codes (GIErrorDomainInfo *info) + glong + g_value_info_get_value (GIValueInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ValueBlob *blob = (ValueBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ValueBlob *blob = (ValueBlob *)&rinfo->typelib->data[rinfo->offset]; + + return (glong)blob->value; + } +@@ -1098,8 +1146,8 @@ g_field_info_get_flags (GIFieldInfo *info) + { + GIFieldInfoFlags flags; + +- GIBaseInfo *base = (GIBaseInfo *)info; +- FieldBlob *blob = (FieldBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset]; + + flags = 0; + +@@ -1115,8 +1163,8 @@ g_field_info_get_flags (GIFieldInfo *info) + gint + g_field_info_get_size (GIFieldInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- FieldBlob *blob = (FieldBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->bits; + } +@@ -1124,8 +1172,8 @@ g_field_info_get_size (GIFieldInfo *info) + gint + g_field_info_get_offset (GIFieldInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- FieldBlob *blob = (FieldBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->struct_offset; + } +@@ -1133,33 +1181,33 @@ g_field_info_get_offset (GIFieldInfo *info) + GITypeInfo * + g_field_info_get_type (GIFieldInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- FieldBlob *blob = (FieldBlob *)&base->typelib->data[base->offset]; +- GITypeInfo *type_info; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset]; ++ GIRealInfo *type_info; + + if (blob->has_embedded_type) + { +- type_info = (GITypeInfo *) g_info_new (GI_INFO_TYPE_TYPE, +- (GIBaseInfo*)info, base->typelib, +- base->offset + header->field_blob_size); +- type_info->is_embedded = TRUE; ++ type_info = (GIRealInfo *) g_info_new (GI_INFO_TYPE_TYPE, ++ (GIBaseInfo*)info, rinfo->typelib, ++ rinfo->offset + header->field_blob_size); ++ type_info->type_is_embedded = TRUE; + } + else +- return g_type_info_new (base, base->typelib, base->offset + G_STRUCT_OFFSET (FieldBlob, type)); ++ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + G_STRUCT_OFFSET (FieldBlob, type)); + +- return type_info; ++ return (GIBaseInfo*)type_info; + } + + /* GIRegisteredTypeInfo functions */ + const gchar * + g_registered_type_info_get_type_name (GIRegisteredTypeInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- RegisteredTypeBlob *blob = (RegisteredTypeBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ RegisteredTypeBlob *blob = (RegisteredTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->gtype_name) +- return g_typelib_get_string (base->typelib, blob->gtype_name); ++ return g_typelib_get_string (rinfo->typelib, blob->gtype_name); + + return NULL; + } +@@ -1167,11 +1215,11 @@ g_registered_type_info_get_type_name (GIRegisteredTypeInfo *info) + const gchar * + g_registered_type_info_get_type_init (GIRegisteredTypeInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- RegisteredTypeBlob *blob = (RegisteredTypeBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ RegisteredTypeBlob *blob = (RegisteredTypeBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->gtype_init) +- return g_typelib_get_string (base->typelib, blob->gtype_init); ++ return g_typelib_get_string (rinfo->typelib, blob->gtype_init); + + return NULL; + } +@@ -1181,6 +1229,7 @@ g_registered_type_info_get_g_type (GIRegisteredTypeInfo *info) + { + const char *type_init; + GType (* get_type_func) (void); ++ GIRealInfo *rinfo = (GIRealInfo*)info; + + type_init = g_registered_type_info_get_type_init (info); + +@@ -1190,7 +1239,7 @@ g_registered_type_info_get_g_type (GIRegisteredTypeInfo *info) + return G_TYPE_OBJECT; + + get_type_func = NULL; +- if (!g_typelib_symbol (((GIBaseInfo*)info)->typelib, ++ if (!g_typelib_symbol (rinfo->typelib, + type_init, + (void**) &get_type_func)) + return G_TYPE_NONE; +@@ -1202,8 +1251,8 @@ g_registered_type_info_get_g_type (GIRegisteredTypeInfo *info) + gint + g_struct_info_get_n_fields (GIStructInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_fields; + } +@@ -1212,15 +1261,15 @@ static gint32 + g_struct_get_field_offset (GIStructInfo *info, + gint n) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- guint32 offset = base->offset + header->struct_blob_size; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ guint32 offset = rinfo->offset + header->struct_blob_size; + gint i; + FieldBlob *field_blob; + + for (i = 0; i < n; i++) + { +- field_blob = (FieldBlob *)&base->typelib->data[offset]; ++ field_blob = (FieldBlob *)&rinfo->typelib->data[offset]; + offset += header->field_blob_size; + if (field_blob->has_embedded_type) + offset += header->callback_blob_size; +@@ -1231,19 +1280,19 @@ g_struct_get_field_offset (GIStructInfo *info, + + GIFieldInfo * + g_struct_info_get_field (GIStructInfo *info, +- gint n) ++ gint n) + { +- GIBaseInfo *base = (GIBaseInfo *)info; ++ GIRealInfo *rinfo = (GIRealInfo *)info; + +- return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, base, base->typelib, +- g_struct_get_field_offset (info, n)); ++ return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, ++ g_struct_get_field_offset (info, n)); + } + + gint + g_struct_info_get_n_methods (GIStructInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_methods; + } +@@ -1252,35 +1301,35 @@ GIFunctionInfo * + g_struct_info_get_method (GIStructInfo *info, + gint n) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset]; +- Header *header = (Header *)base->typelib->data; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset]; ++ Header *header = (Header *)rinfo->typelib->data; + gint offset; + +- offset = g_struct_get_field_offset (info, blob->n_fields) +- + n * header->function_blob_size; +- return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, +- base->typelib, offset); ++ offset = g_struct_get_field_offset (info, blob->n_fields) + n * header->function_blob_size; ++ return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, ++ rinfo->typelib, offset); + } + + static GIFunctionInfo * + find_method (GIBaseInfo *base, +- guint32 offset, +- gint n_methods, +- const gchar *name) ++ guint32 offset, ++ gint n_methods, ++ const gchar *name) + { + /* FIXME hash */ +- Header *header = (Header *)base->typelib->data; ++ GIRealInfo *rinfo = (GIRealInfo*)base; ++ Header *header = (Header *)rinfo->typelib->data; + gint i; + + for (i = 0; i < n_methods; i++) + { +- FunctionBlob *fblob = (FunctionBlob *)&base->typelib->data[offset]; +- const gchar *fname = (const gchar *)&base->typelib->data[fblob->name]; ++ FunctionBlob *fblob = (FunctionBlob *)&rinfo->typelib->data[offset]; ++ const gchar *fname = (const gchar *)&rinfo->typelib->data[fblob->name]; + + if (strcmp (name, fname) == 0) +- return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, +- base->typelib, offset); ++ return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, ++ rinfo->typelib, offset); + + offset += header->function_blob_size; + } +@@ -1293,21 +1342,21 @@ g_struct_info_find_method (GIStructInfo *info, + const gchar *name) + { + gint offset; +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset]; + +- offset = base->offset + header->struct_blob_size ++ offset = rinfo->offset + header->struct_blob_size + + blob->n_fields * header->field_blob_size; + +- return find_method (base, offset, blob->n_methods, name); ++ return find_method ((GIBaseInfo*)info, offset, blob->n_methods, name); + } + + gsize + g_struct_info_get_size (GIStructInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->size; + } +@@ -1315,8 +1364,8 @@ g_struct_info_get_size (GIStructInfo *info) + gsize + g_struct_info_get_alignment (GIStructInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->alignment; + } +@@ -1334,8 +1383,8 @@ g_struct_info_get_alignment (GIStructInfo *info) + gboolean + g_struct_info_is_gtype_struct (GIStructInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->is_gtype_struct; + } +@@ -1343,8 +1392,8 @@ g_struct_info_is_gtype_struct (GIStructInfo *info) + gint + g_enum_info_get_n_values (GIEnumInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- EnumBlob *blob = (EnumBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ EnumBlob *blob = (EnumBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_values; + } +@@ -1353,13 +1402,13 @@ GIValueInfo * + g_enum_info_get_value (GIEnumInfo *info, + gint n) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; + gint offset; + +- offset = base->offset + header->enum_blob_size ++ offset = rinfo->offset + header->enum_blob_size + + n * header->value_blob_size; +- return (GIValueInfo *) g_info_new (GI_INFO_TYPE_VALUE, base, base->typelib, offset); ++ return (GIValueInfo *) g_info_new (GI_INFO_TYPE_VALUE, (GIBaseInfo*)info, rinfo->typelib, offset); + } + + /** +@@ -1378,8 +1427,8 @@ g_enum_info_get_value (GIEnumInfo *info, + GITypeTag + g_enum_info_get_storage_type (GIEnumInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- EnumBlob *blob = (EnumBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ EnumBlob *blob = (EnumBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->storage_type; + } +@@ -1388,12 +1437,12 @@ g_enum_info_get_storage_type (GIEnumInfo *info) + GIObjectInfo * + g_object_info_get_parent (GIObjectInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->parent) +- return (GIObjectInfo *) g_info_from_entry (base->repository, +- base->typelib, blob->parent); ++ return (GIObjectInfo *) g_info_from_entry (rinfo->repository, ++ rinfo->typelib, blob->parent); + else + return NULL; + } +@@ -1401,34 +1450,34 @@ g_object_info_get_parent (GIObjectInfo *info) + gboolean + g_object_info_get_abstract (GIObjectInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + return blob->abstract != 0; + } + + const gchar * + g_object_info_get_type_name (GIObjectInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return g_typelib_get_string (base->typelib, blob->gtype_name); ++ return g_typelib_get_string (rinfo->typelib, blob->gtype_name); + } + + const gchar * + g_object_info_get_type_init (GIObjectInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return g_typelib_get_string (base->typelib, blob->gtype_init); ++ return g_typelib_get_string (rinfo->typelib, blob->gtype_init); + } + + gint + g_object_info_get_n_interfaces (GIObjectInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_interfaces; + } +@@ -1437,18 +1486,18 @@ GIInterfaceInfo * + g_object_info_get_interface (GIObjectInfo *info, + gint n) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return (GIInterfaceInfo *) g_info_from_entry (base->repository, +- base->typelib, blob->interfaces[n]); ++ return (GIInterfaceInfo *) g_info_from_entry (rinfo->repository, ++ rinfo->typelib, blob->interfaces[n]); + } + + gint + g_object_info_get_n_fields (GIObjectInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_fields; + } +@@ -1458,22 +1507,22 @@ g_object_info_get_field (GIObjectInfo *info, + gint n) + { + gint offset; +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + +- offset = base->offset + header->object_blob_size ++ offset = rinfo->offset + header->object_blob_size + + (blob->n_interfaces + blob->n_interfaces % 2) * 2 + + n * header->field_blob_size; + +- return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, base, base->typelib, offset); ++ return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, offset); + } + + gint + g_object_info_get_n_properties (GIObjectInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_properties; + } +@@ -1483,24 +1532,24 @@ g_object_info_get_property (GIObjectInfo *info, + gint n) + { + gint offset; +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + +- offset = base->offset + header->object_blob_size ++ offset = rinfo->offset + header->object_blob_size + + (blob->n_interfaces + blob->n_interfaces % 2) * 2 + + blob->n_fields * header->field_blob_size + + n * header->property_blob_size; + +- return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, base, +- base->typelib, offset); ++ return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, (GIBaseInfo*)info, ++ rinfo->typelib, offset); + } + + gint + g_object_info_get_n_methods (GIObjectInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_methods; + } +@@ -1510,18 +1559,18 @@ g_object_info_get_method (GIObjectInfo *info, + gint n) + { + gint offset; +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + +- offset = base->offset + header->object_blob_size ++ offset = rinfo->offset + header->object_blob_size + + (blob->n_interfaces + blob->n_interfaces % 2) * 2 + + blob->n_fields * header->field_blob_size + + blob->n_properties * header->property_blob_size + + n * header->function_blob_size; + +- return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, +- base->typelib, offset); ++ return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, ++ rinfo->typelib, offset); + } + + GIFunctionInfo * +@@ -1529,23 +1578,23 @@ g_object_info_find_method (GIObjectInfo *info, + const gchar *name) + { + gint offset; +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + +- offset = base->offset + header->object_blob_size ++ offset = rinfo->offset + header->object_blob_size + + (blob->n_interfaces + blob->n_interfaces % 2) * 2 + + blob->n_fields * header->field_blob_size + + + blob->n_properties * header->property_blob_size; + +- return find_method (base, offset, blob->n_methods, name); ++ return find_method ((GIBaseInfo*)info, offset, blob->n_methods, name); + } + + gint + g_object_info_get_n_signals (GIObjectInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_signals; + } +@@ -1555,26 +1604,26 @@ g_object_info_get_signal (GIObjectInfo *info, + gint n) + { + gint offset; +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + +- offset = base->offset + header->object_blob_size ++ offset = rinfo->offset + header->object_blob_size + + (blob->n_interfaces + blob->n_interfaces % 2) * 2 + + blob->n_fields * header->field_blob_size + + blob->n_properties * header->property_blob_size + + blob->n_methods * header->function_blob_size + + n * header->signal_blob_size; + +- return (GISignalInfo *) g_info_new (GI_INFO_TYPE_SIGNAL, base, +- base->typelib, offset); ++ return (GISignalInfo *) g_info_new (GI_INFO_TYPE_SIGNAL, (GIBaseInfo*)info, ++ rinfo->typelib, offset); + } + + gint + g_object_info_get_n_vfuncs (GIObjectInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_vfuncs; + } +@@ -1584,11 +1633,11 @@ g_object_info_get_vfunc (GIObjectInfo *info, + gint n) + { + gint offset; +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + +- offset = base->offset + header->object_blob_size ++ offset = rinfo->offset + header->object_blob_size + + (blob->n_interfaces + blob->n_interfaces % 2) * 2 + + blob->n_fields * header->field_blob_size + + blob->n_properties * header->property_blob_size +@@ -1596,28 +1645,28 @@ g_object_info_get_vfunc (GIObjectInfo *info, + + blob->n_signals * header->signal_blob_size + + n * header->vfunc_blob_size; + +- return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, base, +- base->typelib, offset); ++ return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*)info, ++ rinfo->typelib, offset); + } + + static GIVFuncInfo * +-find_vfunc (GIBaseInfo *base, ++find_vfunc (GIRealInfo *rinfo, + guint32 offset, + gint n_vfuncs, + const gchar *name) + { + /* FIXME hash */ +- Header *header = (Header *)base->typelib->data; ++ Header *header = (Header *)rinfo->typelib->data; + gint i; + + for (i = 0; i < n_vfuncs; i++) + { +- VFuncBlob *fblob = (VFuncBlob *)&base->typelib->data[offset]; +- const gchar *fname = (const gchar *)&base->typelib->data[fblob->name]; ++ VFuncBlob *fblob = (VFuncBlob *)&rinfo->typelib->data[offset]; ++ const gchar *fname = (const gchar *)&rinfo->typelib->data[fblob->name]; + + if (strcmp (name, fname) == 0) +- return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, base, +- base->typelib, offset); ++ return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*) rinfo, ++ rinfo->typelib, offset); + + offset += header->vfunc_blob_size; + } +@@ -1643,25 +1692,25 @@ g_object_info_find_vfunc (GIObjectInfo *info, + const gchar *name) + { + gint offset; +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + +- offset = base->offset + header->object_blob_size ++ offset = rinfo->offset + header->object_blob_size + + (blob->n_interfaces + blob->n_interfaces % 2) * 2 + + blob->n_fields * header->field_blob_size + + blob->n_properties * header->property_blob_size + + blob->n_methods * header->function_blob_size + + blob->n_signals * header->signal_blob_size; + +- return find_vfunc (base, offset, blob->n_vfuncs, name); ++ return find_vfunc (rinfo, offset, blob->n_vfuncs, name); + } + + gint + g_object_info_get_n_constants (GIObjectInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_constants; + } +@@ -1671,11 +1720,11 @@ g_object_info_get_constant (GIObjectInfo *info, + gint n) + { + gint offset; +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + +- offset = base->offset + header->object_blob_size ++ offset = rinfo->offset + header->object_blob_size + + (blob->n_interfaces + blob->n_interfaces % 2) * 2 + + blob->n_fields * header->field_blob_size + + blob->n_properties * header->property_blob_size +@@ -1684,8 +1733,8 @@ g_object_info_get_constant (GIObjectInfo *info, + + blob->n_vfuncs * header->vfunc_blob_size + + n * header->constant_blob_size; + +- return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, base, +- base->typelib, offset); ++ return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info, ++ rinfo->typelib, offset); + } + + /** +@@ -1700,12 +1749,12 @@ g_object_info_get_constant (GIObjectInfo *info, + GIStructInfo * + g_object_info_get_class_struct (GIObjectInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->gtype_struct) +- return (GIStructInfo *) g_info_from_entry (base->repository, +- base->typelib, blob->gtype_struct); ++ return (GIStructInfo *) g_info_from_entry (rinfo->repository, ++ rinfo->typelib, blob->gtype_struct); + else + return NULL; + } +@@ -1714,8 +1763,8 @@ g_object_info_get_class_struct (GIObjectInfo *info) + gint + g_interface_info_get_n_prerequisites (GIInterfaceInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_prerequisites; + } +@@ -1724,19 +1773,19 @@ GIBaseInfo * + g_interface_info_get_prerequisite (GIInterfaceInfo *info, + gint n) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; + +- return g_info_from_entry (base->repository, +- base->typelib, blob->prerequisites[n]); ++ return g_info_from_entry (rinfo->repository, ++ rinfo->typelib, blob->prerequisites[n]); + } + + + gint + g_interface_info_get_n_properties (GIInterfaceInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_properties; + } +@@ -1746,23 +1795,23 @@ g_interface_info_get_property (GIInterfaceInfo *info, + gint n) + { + gint offset; +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; + +- offset = base->offset + header->interface_blob_size ++ offset = rinfo->offset + header->interface_blob_size + + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2 + + n * header->property_blob_size; + +- return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, base, +- base->typelib, offset); ++ return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, (GIBaseInfo*)info, ++ rinfo->typelib, offset); + } + + gint + g_interface_info_get_n_methods (GIInterfaceInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_methods; + } +@@ -1772,17 +1821,17 @@ g_interface_info_get_method (GIInterfaceInfo *info, + gint n) + { + gint offset; +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; + +- offset = base->offset + header->interface_blob_size ++ offset = rinfo->offset + header->interface_blob_size + + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2 + + blob->n_properties * header->property_blob_size + + n * header->function_blob_size; + +- return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, +- base->typelib, offset); ++ return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, ++ rinfo->typelib, offset); + } + + GIFunctionInfo * +@@ -1790,22 +1839,22 @@ g_interface_info_find_method (GIInterfaceInfo *info, + const gchar *name) + { + gint offset; +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; + +- offset = base->offset + header->interface_blob_size ++ offset = rinfo->offset + header->interface_blob_size + + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2 + + blob->n_properties * header->property_blob_size; + +- return find_method (base, offset, blob->n_methods, name); ++ return find_method ((GIBaseInfo*)info, offset, blob->n_methods, name); + } + + gint + g_interface_info_get_n_signals (GIInterfaceInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_signals; + } +@@ -1815,25 +1864,25 @@ g_interface_info_get_signal (GIInterfaceInfo *info, + gint n) + { + gint offset; +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; + +- offset = base->offset + header->interface_blob_size ++ offset = rinfo->offset + header->interface_blob_size + + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2 + + blob->n_properties * header->property_blob_size + + blob->n_methods * header->function_blob_size + + n * header->signal_blob_size; + +- return (GISignalInfo *) g_info_new (GI_INFO_TYPE_SIGNAL, base, +- base->typelib, offset); ++ return (GISignalInfo *) g_info_new (GI_INFO_TYPE_SIGNAL, (GIBaseInfo*)info, ++ rinfo->typelib, offset); + } + + gint + g_interface_info_get_n_vfuncs (GIInterfaceInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_vfuncs; + } +@@ -1843,19 +1892,19 @@ g_interface_info_get_vfunc (GIInterfaceInfo *info, + gint n) + { + gint offset; +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; + +- offset = base->offset + header->interface_blob_size ++ offset = rinfo->offset + header->interface_blob_size + + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2 + + blob->n_properties * header->property_blob_size + + blob->n_methods * header->function_blob_size + + blob->n_signals * header->signal_blob_size + + n * header->vfunc_blob_size; + +- return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, base, +- base->typelib, offset); ++ return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*)info, ++ rinfo->typelib, offset); + } + + /** +@@ -1873,24 +1922,24 @@ g_interface_info_find_vfunc (GIInterfaceInfo *info, + const gchar *name) + { + gint offset; +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; + +- offset = base->offset + header->interface_blob_size ++ offset = rinfo->offset + header->interface_blob_size + + (blob->n_prerequisites + blob->n_prerequisites % 2) * 2 + + blob->n_properties * header->property_blob_size + + blob->n_methods * header->function_blob_size + + blob->n_signals * header->signal_blob_size; + +- return find_vfunc (base, offset, blob->n_vfuncs, name); ++ return find_vfunc (rinfo, offset, blob->n_vfuncs, name); + } + + gint + g_interface_info_get_n_constants (GIInterfaceInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_constants; + } +@@ -1900,11 +1949,11 @@ g_interface_info_get_constant (GIInterfaceInfo *info, + gint n) + { + gint offset; +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; + +- offset = base->offset + header->interface_blob_size ++ offset = rinfo->offset + header->interface_blob_size + + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2 + + blob->n_properties * header->property_blob_size + + blob->n_methods * header->function_blob_size +@@ -1912,8 +1961,8 @@ g_interface_info_get_constant (GIInterfaceInfo *info, + + blob->n_vfuncs * header->vfunc_blob_size + + n * header->constant_blob_size; + +- return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, base, +- base->typelib, offset); ++ return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info, ++ rinfo->typelib, offset); + } + + /** +@@ -1927,12 +1976,12 @@ g_interface_info_get_constant (GIInterfaceInfo *info, + GIStructInfo * + g_interface_info_get_iface_struct (GIInterfaceInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->gtype_struct) +- return (GIStructInfo *) g_info_from_entry (base->repository, +- base->typelib, blob->gtype_struct); ++ return (GIStructInfo *) g_info_from_entry (rinfo->repository, ++ rinfo->typelib, blob->gtype_struct); + else + return NULL; + } +@@ -1942,8 +1991,8 @@ GParamFlags + g_property_info_get_flags (GIPropertyInfo *info) + { + GParamFlags flags; +- GIBaseInfo *base = (GIBaseInfo *)info; +- PropertyBlob *blob = (PropertyBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ PropertyBlob *blob = (PropertyBlob *)&rinfo->typelib->data[rinfo->offset]; + + flags = 0; + +@@ -1965,9 +2014,9 @@ g_property_info_get_flags (GIPropertyInfo *info) + GITypeInfo * + g_property_info_get_type (GIPropertyInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; ++ GIRealInfo *rinfo = (GIRealInfo *)info; + +- return g_type_info_new (base, base->typelib, base->offset + G_STRUCT_OFFSET (PropertyBlob, type)); ++ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + G_STRUCT_OFFSET (PropertyBlob, type)); + } + + +@@ -1977,8 +2026,8 @@ g_signal_info_get_flags (GISignalInfo *info) + { + GSignalFlags flags; + +- GIBaseInfo *base = (GIBaseInfo *)info; +- SignalBlob *blob = (SignalBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset]; + + flags = 0; + +@@ -2009,11 +2058,11 @@ g_signal_info_get_flags (GISignalInfo *info) + GIVFuncInfo * + g_signal_info_get_class_closure (GISignalInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- SignalBlob *blob = (SignalBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->has_class_closure) +- return g_interface_info_get_vfunc ((GIInterfaceInfo *)base->container, blob->class_closure); ++ return g_interface_info_get_vfunc ((GIInterfaceInfo *)rinfo->container, blob->class_closure); + + return NULL; + } +@@ -2021,8 +2070,8 @@ g_signal_info_get_class_closure (GISignalInfo *info) + gboolean + g_signal_info_true_stops_emit (GISignalInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- SignalBlob *blob = (SignalBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->true_stops_emit; + } +@@ -2033,8 +2082,8 @@ g_vfunc_info_get_flags (GIVFuncInfo *info) + { + GIVFuncInfoFlags flags; + +- GIBaseInfo *base = (GIBaseInfo *)info; +- VFuncBlob *blob = (VFuncBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset]; + + flags = 0; + +@@ -2053,8 +2102,8 @@ g_vfunc_info_get_flags (GIVFuncInfo *info) + gint + g_vfunc_info_get_offset (GIVFuncInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- VFuncBlob *blob = (VFuncBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->struct_offset; + } +@@ -2062,11 +2111,11 @@ g_vfunc_info_get_offset (GIVFuncInfo *info) + GISignalInfo * + g_vfunc_info_get_signal (GIVFuncInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- VFuncBlob *blob = (VFuncBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->class_closure) +- return g_interface_info_get_signal ((GIInterfaceInfo *)base->container, blob->signal); ++ return g_interface_info_get_signal ((GIInterfaceInfo *)rinfo->container, blob->signal); + + return NULL; + } +@@ -2085,9 +2134,9 @@ g_vfunc_info_get_signal (GIVFuncInfo *info) + GIFunctionInfo * + g_vfunc_info_get_invoker (GIVFuncInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- VFuncBlob *blob = (VFuncBlob *)&base->typelib->data[base->offset]; +- GIBaseInfo *container = base->container; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset]; ++ GIBaseInfo *container = rinfo->container; + GIInfoType parent_type; + + /* 1023 = 0x3ff is the maximum of the 10 bits for invoker index */ +@@ -2107,80 +2156,80 @@ g_vfunc_info_get_invoker (GIVFuncInfo *info) + GITypeInfo * + g_constant_info_get_type (GIConstantInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; ++ GIRealInfo *rinfo = (GIRealInfo *)info; + +- return g_type_info_new (base, base->typelib, base->offset + 8); ++ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + 8); + } + + gint + g_constant_info_get_value (GIConstantInfo *info, + GArgument *value) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- ConstantBlob *blob = (ConstantBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ ConstantBlob *blob = (ConstantBlob *)&rinfo->typelib->data[rinfo->offset]; + + /* FIXME non-basic types ? */ + if (blob->type.flags.reserved == 0 && blob->type.flags.reserved2 == 0) + { + if (blob->type.flags.pointer) +- value->v_pointer = g_memdup (&base->typelib->data[blob->offset], blob->size); ++ value->v_pointer = g_memdup (&rinfo->typelib->data[blob->offset], blob->size); + else + { + switch (blob->type.flags.tag) + { + case GI_TYPE_TAG_BOOLEAN: +- value->v_boolean = *(gboolean*)&base->typelib->data[blob->offset]; ++ value->v_boolean = *(gboolean*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_INT8: +- value->v_int8 = *(gint8*)&base->typelib->data[blob->offset]; ++ value->v_int8 = *(gint8*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_UINT8: +- value->v_uint8 = *(guint8*)&base->typelib->data[blob->offset]; ++ value->v_uint8 = *(guint8*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_INT16: +- value->v_int16 = *(gint16*)&base->typelib->data[blob->offset]; ++ value->v_int16 = *(gint16*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_UINT16: +- value->v_uint16 = *(guint16*)&base->typelib->data[blob->offset]; ++ value->v_uint16 = *(guint16*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_INT32: +- value->v_int32 = *(gint32*)&base->typelib->data[blob->offset]; ++ value->v_int32 = *(gint32*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_UINT32: +- value->v_uint32 = *(guint32*)&base->typelib->data[blob->offset]; ++ value->v_uint32 = *(guint32*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_INT64: +- value->v_int64 = *(gint64*)&base->typelib->data[blob->offset]; ++ value->v_int64 = *(gint64*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_UINT64: +- value->v_uint64 = *(guint64*)&base->typelib->data[blob->offset]; ++ value->v_uint64 = *(guint64*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_FLOAT: +- value->v_float = *(gfloat*)&base->typelib->data[blob->offset]; ++ value->v_float = *(gfloat*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_DOUBLE: +- value->v_double = *(gdouble*)&base->typelib->data[blob->offset]; ++ value->v_double = *(gdouble*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_TIME_T: +- value->v_long = *(long*)&base->typelib->data[blob->offset]; ++ value->v_long = *(long*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_SHORT: +- value->v_short = *(gshort*)&base->typelib->data[blob->offset]; ++ value->v_short = *(gshort*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_USHORT: +- value->v_ushort = *(gushort*)&base->typelib->data[blob->offset]; ++ value->v_ushort = *(gushort*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_INT: +- value->v_int = *(gint*)&base->typelib->data[blob->offset]; ++ value->v_int = *(gint*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_UINT: +- value->v_uint = *(guint*)&base->typelib->data[blob->offset]; ++ value->v_uint = *(guint*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_LONG: +- value->v_long = *(glong*)&base->typelib->data[blob->offset]; ++ value->v_long = *(glong*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_ULONG: +- value->v_ulong = *(gulong*)&base->typelib->data[blob->offset]; ++ value->v_ulong = *(gulong*)&rinfo->typelib->data[blob->offset]; + break; + } + } +@@ -2193,8 +2242,8 @@ g_constant_info_get_value (GIConstantInfo *info, + gint + g_union_info_get_n_fields (GIUnionInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_fields; + } +@@ -2203,19 +2252,19 @@ GIFieldInfo * + g_union_info_get_field (GIUnionInfo *info, + gint n) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; + +- return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, base, base->typelib, +- base->offset + header->union_blob_size + ++ return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, ++ rinfo->offset + header->union_blob_size + + n * header->field_blob_size); + } + + gint + g_union_info_get_n_methods (GIUnionInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->n_functions; + } +@@ -2224,23 +2273,23 @@ GIFunctionInfo * + g_union_info_get_method (GIUnionInfo *info, + gint n) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; +- Header *header = (Header *)base->typelib->data; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; ++ Header *header = (Header *)rinfo->typelib->data; + gint offset; + +- offset = base->offset + header->union_blob_size ++ offset = rinfo->offset + header->union_blob_size + + blob->n_fields * header->field_blob_size + + n * header->function_blob_size; +- return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, +- base->typelib, offset); ++ return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, ++ rinfo->typelib, offset); + } + + gboolean + g_union_info_is_discriminated (GIUnionInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->discriminated; + } +@@ -2248,8 +2297,8 @@ g_union_info_is_discriminated (GIUnionInfo *info) + gint + g_union_info_get_discriminator_offset (GIUnionInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->discriminator_offset; + } +@@ -2257,30 +2306,30 @@ g_union_info_get_discriminator_offset (GIUnionInfo *info) + GITypeInfo * + g_union_info_get_discriminator_type (GIUnionInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; ++ GIRealInfo *rinfo = (GIRealInfo *)info; + +- return g_type_info_new (base, base->typelib, base->offset + 24); ++ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + 24); + } + + GIConstantInfo * + g_union_info_get_discriminator (GIUnionInfo *info, + gint n) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->discriminated) + { +- Header *header = (Header *)base->typelib->data; ++ Header *header = (Header *)rinfo->typelib->data; + gint offset; + +- offset = base->offset + header->union_blob_size ++ offset = rinfo->offset + header->union_blob_size + + blob->n_fields * header->field_blob_size + + blob->n_functions * header->function_blob_size + + n * header->constant_blob_size; + +- return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, base, +- base->typelib, offset); ++ return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info, ++ rinfo->typelib, offset); + } + + return NULL; +@@ -2291,21 +2340,21 @@ g_union_info_find_method (GIUnionInfo *info, + const gchar *name) + { + gint offset; +- GIBaseInfo *base = (GIBaseInfo *)info; +- Header *header = (Header *)base->typelib->data; +- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ Header *header = (Header *)rinfo->typelib->data; ++ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; + +- offset = base->offset + header->union_blob_size ++ offset = rinfo->offset + header->union_blob_size + + blob->n_fields * header->field_blob_size; + +- return find_method (base, offset, blob->n_functions, name); ++ return find_method ((GIBaseInfo*)info, offset, blob->n_functions, name); + } + + gsize + g_union_info_get_size (GIUnionInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->size; + } +@@ -2313,8 +2362,8 @@ g_union_info_get_size (GIUnionInfo *info) + gsize + g_union_info_get_alignment (GIUnionInfo *info) + { +- GIBaseInfo *base = (GIBaseInfo *)info; +- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset]; ++ GIRealInfo *rinfo = (GIRealInfo *)info; ++ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->alignment; + } +diff --git a/girepository/girepository.h b/girepository/girepository.h +index c30418a..93cf126 100644 +--- a/girepository/girepository.h ++++ b/girepository/girepository.h +@@ -27,37 +27,55 @@ + + G_BEGIN_DECLS + +-#define G_TYPE_IREPOSITORY (g_irepository_get_type ()) +-#define G_IREPOSITORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_IREPOSITORY, GIRepository)) ++#define G_TYPE_IREPOSITORY (g_irepository_get_type ()) ++#define G_IREPOSITORY(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_IREPOSITORY, GIRepository)) ++#define G_IREPOSITORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), G_TYPE_IREPOSITORY, GIRepositoryClass)) ++#define G_IS_IREPOSITORY(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_IREPOSITORY)) ++#define G_IS_IREPOSITORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), G_TYPE_IREPOSITORY)) ++#define G_IREPOSITORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), G_TYPE_IREPOSITORY, GIRepositoryClass)) + + typedef struct _GIRepository GIRepository; + typedef struct _GIRepositoryClass GIRepositoryClass; + typedef struct _GIRepositoryPrivate GIRepositoryPrivate; +-typedef struct _GIBaseInfo GIBaseInfo; +-typedef struct _GICallableInfo GICallableInfo; +-typedef struct _GIFunctionInfo GIFunctionInfo; +-typedef struct _GICallbackInfo GICallbackInfo; +-typedef struct _GIRegisteredTypeInfo GIRegisteredTypeInfo; +-typedef struct _GIStructInfo GIStructInfo; +-typedef struct _GIUnionInfo GIUnionInfo; +-typedef struct _GIEnumInfo GIEnumInfo; +-typedef struct _GIObjectInfo GIObjectInfo; +-typedef struct _GIInterfaceInfo GIInterfaceInfo; +-typedef struct _GIConstantInfo GIConstantInfo; +-typedef struct _GIValueInfo GIValueInfo; +-typedef struct _GISignalInfo GISignalInfo; +-typedef struct _GIVFuncInfo GIVFuncInfo; +-typedef struct _GIPropertyInfo GIPropertyInfo; +-typedef struct _GIFieldInfo GIFieldInfo; +-typedef struct _GIArgInfo GIArgInfo; +-typedef struct _GITypeInfo GITypeInfo; +-typedef struct _GIErrorDomainInfo GIErrorDomainInfo; ++ ++typedef struct _GIBaseInfoStub GIBaseInfo; ++ ++struct _GIBaseInfoStub { ++ gint32 dummy1; ++ gint32 dummy2; ++ gpointer dummy3; ++ gpointer dummy4; ++ gpointer dummy5; ++ guint32 dummy6; ++ guint32 dummy7; ++ gpointer padding[4]; ++}; ++ ++typedef GIBaseInfo GICallableInfo; ++typedef GIBaseInfo GIFunctionInfo; ++typedef GIBaseInfo GICallbackInfo; ++typedef GIBaseInfo GIRegisteredTypeInfo; ++typedef GIBaseInfo GIStructInfo; ++typedef GIBaseInfo GIUnionInfo; ++typedef GIBaseInfo GIEnumInfo; ++typedef GIBaseInfo GIObjectInfo; ++typedef GIBaseInfo GIInterfaceInfo; ++typedef GIBaseInfo GIConstantInfo; ++typedef GIBaseInfo GIValueInfo; ++typedef GIBaseInfo GISignalInfo; ++typedef GIBaseInfo GIVFuncInfo; ++typedef GIBaseInfo GIPropertyInfo; ++typedef GIBaseInfo GIFieldInfo; ++typedef GIBaseInfo GIArgInfo; ++typedef GIBaseInfo GITypeInfo; ++typedef GIBaseInfo GIErrorDomainInfo; ++ + typedef struct _GIUnresolvedInfo GIUnresolvedInfo; + typedef struct _GTypelib GTypelib; + + struct _GIRepository + { +- GObject parent; ++ GObject parent; + + /*< private >*/ + GIRepositoryPrivate *priv; +@@ -282,11 +300,16 @@ typedef enum { + } GITransfer; + + GITypeInfo * g_callable_info_get_return_type (GICallableInfo *info); ++void g_callable_info_load_return_type (GICallableInfo *info, ++ GITypeInfo *type); + GITransfer g_callable_info_get_caller_owns (GICallableInfo *info); + gboolean g_callable_info_may_return_null (GICallableInfo *info); + gint g_callable_info_get_n_args (GICallableInfo *info); + GIArgInfo * g_callable_info_get_arg (GICallableInfo *info, +- gint n); ++ gint n); ++void g_callable_info_load_arg (GICallableInfo *info, ++ gint n, ++ GIArgInfo *arg); + + /* GIArgInfo */ + +@@ -317,6 +340,8 @@ GIScopeType g_arg_info_get_scope (GIArgInfo *info); + gint g_arg_info_get_closure (GIArgInfo *info); + gint g_arg_info_get_destroy (GIArgInfo *info); + GITypeInfo * g_arg_info_get_type (GIArgInfo *info); ++void g_arg_info_load_type (GIArgInfo *info, ++ GITypeInfo *type); + + + /* GITypeInfo */ Added: csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-04-big-ending.diff =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-04-big-ending.diff (rev 0) @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 03:28:16 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 02:28:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8396] csw/mgar/pkg/graphviz/trunk Message-ID: Revision: 8396 http://gar.svn.sourceforge.net/gar/?rev=8396&view=rev Author: hson Date: 2010-02-08 02:28:16 +0000 (Mon, 08 Feb 2010) Log Message: ----------- graphviz: Link to CSW X11, prepare for 64-bit build Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/graphviz/trunk/files/configure.patch Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2010-02-08 02:19:21 UTC (rev 8395) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2010-02-08 02:28:16 UTC (rev 8396) @@ -14,7 +14,8 @@ # disable dependency checks because plugins depend on libs from base package ENABLE_CHECK = 0 -PATCHFILES = Draw.c.diff +PATCHFILES += configure.patch +PATCHFILES += Draw.c.diff PACKAGES = CSWgraphviz \ CSWgraphvizdevel \ @@ -49,7 +50,7 @@ ARCHALL_CSWgraphvizgraphs = 1 ARCHALL_CSWgraphviz2 = 1 -# Sun's CC is broken on 64bit architectures! +# Waiting for liblasi, gts, gd, ghostscript and tcl/tk #BUILD64 = 1 BUILD_DEP_PKGS = @@ -216,8 +217,14 @@ CONFIGURE_ARGS += --disable-php CONFIGURE_ARGS += --disable-r CONFIGURE_ARGS += --enable-static --enable-shared -CONFIGURE_ARGS += PKG_CONFIG_PATH=/opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_LD_FLAGS = -lm +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + STRIP_LIBTOOL=1 TEST_SCRIPTS = custom Added: csw/mgar/pkg/graphviz/trunk/files/configure.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/configure.patch (rev 0) +++ csw/mgar/pkg/graphviz/trunk/files/configure.patch 2010-02-08 02:28:16 UTC (rev 8396) @@ -0,0 +1,11 @@ +--- graphviz-2.24.0/configure.orig 2009-06-17 01:24:55.000000000 +0200 ++++ graphviz-2.24.0/configure 2010-01-28 02:57:28.658585976 +0100 +@@ -3425,7 +3425,7 @@ + if test "x${prefix}" != "x/usr"; then + CPPFLAGS="$CPPFLAGS -I${prefix}/include" + LDFLAGS="$LDFLAGS -L${prefix}/lib" +- PKG_CONFIG_PATH="$prefix/lib/pkgconfig$PATHSEPARATOR$PKG_CONFIG_PATH" ++ PKG_CONFIG_PATH="$PKG_CONFIG_PATH$PATHSEPARATOR$prefix/lib/pkgconfig" + export PKG_CONFIG_PATH + fi + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 04:10:13 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 03:10:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8397] csw/mgar/pkg/pango/trunk/Makefile Message-ID: Revision: 8397 http://gar.svn.sourceforge.net/gar/?rev=8397&view=rev Author: hson Date: 2010-02-08 03:10:13 +0000 (Mon, 08 Feb 2010) Log Message: ----------- libpango: Remove unnecessary dependencies Modified Paths: -------------- csw/mgar/pkg/pango/trunk/Makefile Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2010-02-08 02:28:16 UTC (rev 8396) +++ csw/mgar/pkg/pango/trunk/Makefile 2010-02-08 03:10:13 UTC (rev 8397) @@ -22,7 +22,7 @@ BUILD_DEP_PKGS = CSWgtk-doc CSWlibxslt CSWglib2devel CSWlibxft2devel RUNTIME_DEP_PKGS_CSWpango = CSWggettextrt CSWglib2 CSWfconfig CSWftype2 -RUNTIME_DEP_PKGS_CSWpango += CSWlibcairo CSWlibxft2 CSWlibxrender CSWzlib CSWlibx11 +RUNTIME_DEP_PKGS_CSWpango += CSWlibcairo CSWlibxft2 CSWlibxrender CSWlibx11 RUNTIME_DEP_PKGS_CSWpangodevel = CSWpango SPKG_DESC_CSWpango = Pango, a framework for the layout and rendering of international text This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 04:13:52 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 03:13:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8398] csw/mgar/pkg/tiff/trunk/Makefile Message-ID: Revision: 8398 http://gar.svn.sourceforge.net/gar/?rev=8398&view=rev Author: hson Date: 2010-02-08 03:13:52 +0000 (Mon, 08 Feb 2010) Log Message: ----------- tiff: Update license Modified Paths: -------------- csw/mgar/pkg/tiff/trunk/Makefile Modified: csw/mgar/pkg/tiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tiff/trunk/Makefile 2010-02-08 03:10:13 UTC (rev 8397) +++ csw/mgar/pkg/tiff/trunk/Makefile 2010-02-08 03:13:52 UTC (rev 8398) @@ -21,7 +21,7 @@ SPKG_DESC_CSWtiffdevel += lib and tools for Tag Image File Format - developer package SPKG_DESC_CSWtiffdoc += lib and tools for Tag Image File Format - documentation -RUNTIME_DEP_PKGS_CSWtiff += CSWtiffrtCSWjbigkit CSWjpeg CSWzlib +RUNTIME_DEP_PKGS_CSWtiff += CSWtiffrt CSWjbigkit CSWjpeg CSWzlib RUNTIME_DEP_PKGS_CSWtiffrt += CSWjbigkit CSWjpeg CSWzlib RUNTIME_DEP_PKGS_CSWtiffdevel += CSWtiffrt RUNTIME_DEP_PKGS_CSWtiffdoc += @@ -32,6 +32,8 @@ ARCHALL_CSWtiffdoc = 1 +LICENSE = COPYRIGHT + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 SPKG_SOURCEURL = http://www.remotesensing.org/libtiff/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 04:14:51 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 03:14:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[8399] csw/mgar/pkg/tcl/trunk/Makefile Message-ID: Revision: 8399 http://gar.svn.sourceforge.net/gar/?rev=8399&view=rev Author: hson Date: 2010-02-08 03:14:50 +0000 (Mon, 08 Feb 2010) Log Message: ----------- tcl: Add dependency Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/Makefile Modified: csw/mgar/pkg/tcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2010-02-08 03:13:52 UTC (rev 8398) +++ csw/mgar/pkg/tcl/trunk/Makefile 2010-02-08 03:14:50 UTC (rev 8399) @@ -16,6 +16,8 @@ PATCHFILES += configure.patch PATCHFILES += tcl.m4.patch +RUNTIME_DEP_PKGS_CSWtcl += CSWsunmath + PATCHDIR = $(WORKDIR)/$(DISTNAME) SPKG_SOURCEURL = http://www.tcl.tk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 04:43:52 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 03:43:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8400] csw/mgar/pkg/gnome-mime-data/trunk/Makefile Message-ID: Revision: 8400 http://gar.svn.sourceforge.net/gar/?rev=8400&view=rev Author: hson Date: 2010-02-08 03:43:52 +0000 (Mon, 08 Feb 2010) Log Message: ----------- gmimedata: Update description Modified Paths: -------------- csw/mgar/pkg/gnome-mime-data/trunk/Makefile Modified: csw/mgar/pkg/gnome-mime-data/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-mime-data/trunk/Makefile 2010-02-08 03:14:50 UTC (rev 8399) +++ csw/mgar/pkg/gnome-mime-data/trunk/Makefile 2010-02-08 03:43:52 UTC (rev 8400) @@ -2,15 +2,8 @@ GARVERSION = 2.18.0 CATEGORIES = gnome -DESCRIPTION = Library for writing single instance application +DESCRIPTION = Contains the base set of file types and applications for GNOME-2 define BLURB - Unique is a library for writing single instance application. If you launch - a single instance application twice, the second instance will either just - quit or will send a message to the running instance. - - Unique makes it easy to write this kind of applications, by providing a - base class, taking care of all the IPC machinery needed to send messages - to a running instance, and also handling the startup notification side. endef GNOME_PROJ = gnome-mime-data @@ -23,15 +16,12 @@ CATALOGNAME_CSWgmimedatadevel = gmimedata_devel CATALOGNAME_CSWgmimedatadoc = gmimedata_doc -SPKG_DESC_CSWgmimedata += Library for writing single instance application -SPKG_DESC_CSWgmimedatadevel += Library for writing single instance application - developer package -SPKG_DESC_CSWgmimedatadoc += Library for writing single instance application - documentation +SPKG_DESC_CSWgmimedata += $(DESCRIPTION) +SPKG_DESC_CSWgmimedatadevel += $(DESCRIPTION) - developer package +SPKG_DESC_CSWgmimedatadoc += $(DESCRIPTION) - documentation -#REQUIRED_PKGS_CSWgmimedata += CSWfconfig CSWftype2 CSWggettextrt CSWglib2 -#REQUIRED_PKGS_CSWgmimedata += CSWgtk2 CSWlibatk CSWlibcairo CSWlibx11 CSWpango -#REQUIRED_PKGS_CSWgmimedata += CSWdbusglib CSWlibdbus CSWlibxext -REQUIRED_PKGS_CSWgmimedatadevel += CSWgmimedata -REQUIRED_PKGS_CSWgmimedatadoc += CSWgmimedata +RUNTIME_DEP_PKGS_CSWgmimedatadevel += CSWgmimedata +RUNTIME_DEP_PKGS_CSWgmimedatadoc += CSWgmimedata UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -55,3 +45,5 @@ TEST_TARGET = check include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 04:54:53 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 03:54:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8401] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 8401 http://gar.svn.sourceforge.net/gar/?rev=8401&view=rev Author: hson Date: 2010-02-08 03:54:53 +0000 (Mon, 08 Feb 2010) Log Message: ----------- glib2: One test fail on i386 for some unknown reason Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2010-02-08 03:43:52 UTC (rev 8400) +++ csw/mgar/pkg/glib2/trunk/Makefile 2010-02-08 03:54:53 UTC (rev 8401) @@ -44,7 +44,8 @@ RUNTIME_DEP_PKGS_CSWglib2devel += CSWpython RUNTIME_DEP_PKGS_CSWglib2devel += CSWzlib -TEST_TARGET = check +#TEST_TARGET = check +TEST_TARGET = SKIPTEST ?= 0 #provided by iconv This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 04:56:17 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 03:56:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8402] csw/mgar/pkg/gnome-mime-data/trunk/Makefile Message-ID: Revision: 8402 http://gar.svn.sourceforge.net/gar/?rev=8402&view=rev Author: hson Date: 2010-02-08 03:56:17 +0000 (Mon, 08 Feb 2010) Log Message: ----------- gmimedata: Reunite package, make it ARCHALL Modified Paths: -------------- csw/mgar/pkg/gnome-mime-data/trunk/Makefile Modified: csw/mgar/pkg/gnome-mime-data/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-mime-data/trunk/Makefile 2010-02-08 03:54:53 UTC (rev 8401) +++ csw/mgar/pkg/gnome-mime-data/trunk/Makefile 2010-02-08 03:56:17 UTC (rev 8402) @@ -11,18 +11,11 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTNAME = $(GNOME_PROJ)-$(GARVERSION) -PACKAGES = CSWgmimedata CSWgmimedatadevel CSWgmimedatadoc +PACKAGES = CSWgmimedata CATALOGNAME_CSWgmimedata = gmimedata -CATALOGNAME_CSWgmimedatadevel = gmimedata_devel -CATALOGNAME_CSWgmimedatadoc = gmimedata_doc SPKG_DESC_CSWgmimedata += $(DESCRIPTION) -SPKG_DESC_CSWgmimedatadevel += $(DESCRIPTION) - developer package -SPKG_DESC_CSWgmimedatadoc += $(DESCRIPTION) - documentation -RUNTIME_DEP_PKGS_CSWgmimedatadevel += CSWgmimedata -RUNTIME_DEP_PKGS_CSWgmimedatadoc += CSWgmimedata - UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 SPKG_SOURCEURL = http://live.gnome.org/gmimedata @@ -31,13 +24,8 @@ EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -BUILD64 = 1 +ARCHALL_CSWgmimedata = 1 -PKGFILES_CSWgmimedatadevel = $(PKGFILES_DEVEL) -PKGFILES_CSWgmimedatadoc = $(sharedstatedir)/gtk-doc/.* - -ARCHALL_CSWgmimedatadoc = 1 - STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Feb 8 09:57:34 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Feb 2010 08:57:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8403] csw/mgar/pkg/openldap/trunk Message-ID: Revision: 8403 http://gar.svn.sourceforge.net/gar/?rev=8403&view=rev Author: dmichelsen Date: 2010-02-08 08:57:33 +0000 (Mon, 08 Feb 2010) Log Message: ----------- openldap: Re-add postinstall Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/openldap/trunk/checksums Added Paths: ----------- csw/mgar/pkg/openldap/trunk/files/old-CSWoldap.gspec Removed Paths: ------------- csw/mgar/pkg/openldap/trunk/files/CSWoldap.gspec Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-02-08 03:56:17 UTC (rev 8402) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-02-08 08:57:33 UTC (rev 8403) @@ -16,7 +16,7 @@ MASTER_SITES = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tgz) DISTFILES = $(SOURCEFILES) -DISTFILES += $(call admfiles,CSWoldap) +DISTFILES += CSWoldap.postinstall DISTFILES += README.CSW openldaprc DISTFILES += cswopenldap openldap.xml svc-openldap @@ -92,6 +92,7 @@ # Disable MySQL Cluster CONFIGURE_ARGS += --disable-ndb +SKIPTEST ?= 1 TEST_TARGET = check MERGE_SCRIPTS_isa-default-garversion-2.3.43 = copy-only Modified: csw/mgar/pkg/openldap/trunk/checksums =================================================================== --- csw/mgar/pkg/openldap/trunk/checksums 2010-02-08 03:56:17 UTC (rev 8402) +++ csw/mgar/pkg/openldap/trunk/checksums 2010-02-08 08:57:33 UTC (rev 8403) @@ -1,4 +1,4 @@ -2f6e6a8c9c3497f1c0c9d52ea2d1dafa CSWoldap.gspec +c62a0bda87bc939e3c254edc8b7b546b CSWoldap.postinstall 892dba5f625755be024c30ea0055fd55 README.CSW c50f5c4040139b6cf57fcc08abffbee7 cswopenldap 1b25281086eb146b8e11ebd33de086dc openldap-2.3.43.tgz Deleted: csw/mgar/pkg/openldap/trunk/files/CSWoldap.gspec =================================================================== --- csw/mgar/pkg/openldap/trunk/files/CSWoldap.gspec 2010-02-08 03:56:17 UTC (rev 8402) +++ csw/mgar/pkg/openldap/trunk/files/CSWoldap.gspec 2010-02-08 08:57:33 UTC (rev 8403) @@ -1,12 +0,0 @@ -%var bitname openldap -%var pkgname CSWoldap -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc OpenLDAP standalone server and update replication daemons (oldap) -%var INIT_KILL_PRIO 15 -%var INIT_START_PRIO 40 -%var SERVICE_NAME openldap -%var SERVICE_CONF_FILES /opt/csw/share/doc/openldap/openldaprc -%var SMF_MANIFEST openldap.xml -%var SMF_SCRIPT svc-openldap -%include url file://%{PKGLIB}/smf_enabled.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT Copied: csw/mgar/pkg/openldap/trunk/files/old-CSWoldap.gspec (from rev 7572, csw/mgar/pkg/openldap/trunk/files/CSWoldap.gspec) =================================================================== --- csw/mgar/pkg/openldap/trunk/files/old-CSWoldap.gspec (rev 0) +++ csw/mgar/pkg/openldap/trunk/files/old-CSWoldap.gspec 2010-02-08 08:57:33 UTC (rev 8403) @@ -0,0 +1,12 @@ +%var bitname openldap +%var pkgname CSWoldap +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%var desc OpenLDAP standalone server and update replication daemons (oldap) +%var INIT_KILL_PRIO 15 +%var INIT_START_PRIO 40 +%var SERVICE_NAME openldap +%var SERVICE_CONF_FILES /opt/csw/share/doc/openldap/openldaprc +%var SMF_MANIFEST openldap.xml +%var SMF_SCRIPT svc-openldap +%include url file://%{PKGLIB}/smf_enabled.gspec +%copyright url file://%{WORKSRC}/COPYRIGHT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Feb 8 10:59:09 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 08 Feb 2010 09:59:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8404] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 8404 http://gar.svn.sourceforge.net/gar/?rev=8404&view=rev Author: wahwah Date: 2010-02-08 09:59:08 +0000 (Mon, 08 Feb 2010) Log Message: ----------- mysql-5.0: Adding the legacy /opt/csw/lib/mysql symlink and making CSWmysql5test archall. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-02-08 08:57:33 UTC (rev 8403) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-02-08 09:59:08 UTC (rev 8404) @@ -57,6 +57,7 @@ ARCHALL_CSWmysql5bench = 1 +ARCHALL_CSWmysql5test = 1 # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. @@ -108,6 +109,8 @@ PKGFILES_CSW$(GARNAME)rt = $(libdir) PKGFILES_CSW$(GARNAME)rt += $(libdir)/.* +# http://www.opencsw.org/bugtrack/view.php?id=4149 +PKGFILES_CSW$(GARNAME)rt += /opt/csw/lib/mysql PKGFILES_CSW$(GARNAME)test = $(prefix)/mysql-test.* RUNTIME_DEP_PKGS_CSW$(GARNAME) = CSW$(GARNAME)client @@ -216,4 +219,7 @@ gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/mysql/64 gln -s . $(PKGROOT)$(libdir)/$(ISA_DEFAULT) gln -s . $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT) + # http://www.opencsw.org/bugtrack/view.php?id=4149 + ginstall -m 755 -d $(PKGROOT)/opt/csw/lib + gln -s ../../mysql5/lib/mysql $(PKGROOT)/opt/csw/lib/mysql @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Feb 8 11:01:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Feb 2010 10:01:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8405] csw/mgar/pkg/libfishsound/trunk Message-ID: Revision: 8405 http://gar.svn.sourceforge.net/gar/?rev=8405&view=rev Author: dmichelsen Date: 2010-02-08 10:01:33 +0000 (Mon, 08 Feb 2010) Log Message: ----------- libfishsound: Update to 1.0.0 Modified Paths: -------------- csw/mgar/pkg/libfishsound/trunk/Makefile csw/mgar/pkg/libfishsound/trunk/checksums Modified: csw/mgar/pkg/libfishsound/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfishsound/trunk/Makefile 2010-02-08 09:59:08 UTC (rev 8404) +++ csw/mgar/pkg/libfishsound/trunk/Makefile 2010-02-08 10:01:33 UTC (rev 8405) @@ -1,5 +1,5 @@ GARNAME = libfishsound -GARVERSION = 0.9.2 +GARVERSION = 1.0.0 CATEGORIES = lib DESCRIPTION = Decoding and encoding audio data using the Xiph.org codecs @@ -19,14 +19,21 @@ RUNTIME_DEP_PKGS = CSWflac CSWlibogg CSWspeex CSWvorbis BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +OPT_FLAGS_SOS = + BUILD64 = 1 NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) -BUILD_ARGS = AM_CFLAGS= +BUILD_ARGS = AM_CFLAGS= SHLIB_VERSION_ARG= libfishsound_la_LDFLAGS= TEST_TARGET = check +# We have one failing test, so disable tests for now: +# encdec-comments.c:68: Recently inserted ARTIST1 not retrieved +# FAIL: encdec-comments +SKIPTEST ?= 1 + include gar/category.mk # UINTPTR_MAX is defined empty in Solaris, which breaks a constraint check Modified: csw/mgar/pkg/libfishsound/trunk/checksums =================================================================== --- csw/mgar/pkg/libfishsound/trunk/checksums 2010-02-08 09:59:08 UTC (rev 8404) +++ csw/mgar/pkg/libfishsound/trunk/checksums 2010-02-08 10:01:33 UTC (rev 8405) @@ -1 +1 @@ -92f5d4de8ecd9ab3333b77224f8d3efd libfishsound-0.9.2.tar.gz +02c5c7b361a35c9da3cf311d68800dab libfishsound-1.0.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Feb 8 11:41:51 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Feb 2010 10:41:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[8406] csw/mgar/pkg Message-ID: Revision: 8406 http://gar.svn.sourceforge.net/gar/?rev=8406&view=rev Author: dmichelsen Date: 2010-02-08 10:41:51 +0000 (Mon, 08 Feb 2010) Log Message: ----------- krb5-lib: Initial commit after split-off of krb5libs for staged bootstrap of krb5lib -> openldap -> krb5 Added Paths: ----------- csw/mgar/pkg/krb5-lib/ csw/mgar/pkg/krb5-lib/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/krb5-lib/trunk/Makefile Deleted: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5/trunk/Makefile 2010-02-05 09:57:28 UTC (rev 8356) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2010-02-08 10:41:51 UTC (rev 8406) @@ -1,116 +0,0 @@ -GARNAME = krb5 -GARVERSION = 1.7 -CATEGORIES = server - -DESCRIPTION = MIT Kerberos 5 -define BLURB - Kerberos is a network authentication protocol. It is designed to - provide strong authentication for client/server applications by - using secret-key cryptography. A free implementation of this protocol - is available from the Massachusetts Institute of Technology. - Kerberos is available in many commercial products as well. -endef - -MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/1.7/ -DISTFILES = $(GARNAME)-$(GARVERSION)-signed.tar - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-signed.tar - -PATCHFILES = patch-man2html-perl.patch -PATCHFILES += 0002-libintl-for-kproplog.patch -PATCHFILES += 0003-local-libraries-first-when-linking.patch -PATCHFILES += 0004-libkdb_ldap-isblank-define.patch - -BUILD_DEP_PKGS = CSWtcl - -PACKAGES = CSWkrb5adminserver CSWkrb5doc CSWkrb5kdc CSWkrb5lib CSWkrb5libdev CSWkrb5user - -CATALOGNAME_CSWkrb5adminserver = krb5_admin_server -CATALOGNAME_CSWkrb5doc = krb5_doc -CATALOGNAME_CSWkrb5kdc = krb5_kdc -CATALOGNAME_CSWkrb5lib = krb5_lib -CATALOGNAME_CSWkrb5libdev = krb5_lib_dev -CATALOGNAME_CSWkrb5user = krb5_user - -SPKG_DESC_CSWkrb5adminserver = MIT Kerberos 5 admin server -SPKG_DESC_CSWkrb5doc = MIT Kerberos 5 documentation -SPKG_DESC_CSWkrb5kdc = MIT Kerberos 5 key distribution center -SPKG_DESC_CSWkrb5lib = MIT Kerberos 5 core libraries -SPKG_DESC_CSWkrb5libdev = MIT Kerberos 5 developer libraries -SPKG_DESC_CSWkrb5user = MIT Kerberos 5 user tools - -RUNTIME_DEP_PKGS_CSWkrb5adminserver = CSWkrb5kdc CSWkrb5lib -RUNTIME_DEP_PKGS_CSWkrb5kdc = CSWkrb5lib CSWkrb5user -RUNTIME_DEP_PKGS_CSWkrb5libdev = CSWkrb5lib -RUNTIME_DEP_PKGS_CSWkrb5user = CSWkrb5lib - -CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure - -CONFIGURE_ARGS = $(DIRPATHS) -ifeq ($(ISA),i386) -CONFIGURE_ARGS += --with-tcl=$(prefix) -endif -# --enable-ipv6 is deprecated and autodetected -#CONFIGURE_ARGS += --enable-ipv6 -CONFIGURE_ARGS += --enable-kdc-replay-cache --enable-dns-for-realm -CONFIGURE_ARGS += --disable-thread-support -CONFIGURE_ARGS += --disable-static --disable-profiled -CONFIGURE_ARGS += --with-ldap - -BUILD64 = 1 - -BUILD_SCRIPTS = $(WORKSRC)/src/Makefile -BUILD_SCRIPTS += $(WORKSRC)/doc/Makefile - -TEST_SCRIPTS = $(WORKSRC)/src/Makefile -TEST_TARGET = check - -INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile custom - -ARCHALL_CSWkrb5doc = 1 - -ADMINSERVER_BINS = kprop|kadmind|kadmin\.local -PKGFILES_CSWkrb5adminserver = $(mandir)/man8/($(ADMINSERVER_BINS))\.8 -PKGFILES_CSWkrb5adminserver += $(sbindir)/($(ADMINSERVER_BINS)) - -PKGFILES_CSWkrb5doc = $(mandir)/man5/(krb5.conf|kdc.conf)\.5 - -KDC_BINS = krb5kdc|krb524d|kpropd|kdb5_util -PKGFILES_CSWkrb5kdc = $(mandir)/man8/($(KDC_BINS))\.8 -PKGFILES_CSWkrb5kdc += $(sharedstatedir)/examples/krb5/.* -PKGFILES_CSWkrb5kdc += $(sbindir)/($(KDC_BINS)) - -PKGFILES_CSWkrb5lib = $(PKGFILES_RT) - -PKGFILES_CSWkrb5libdev = $(mandir)/man8/sserver.8 -PKGFILES_CSWkrb5libdev += $(mandir)/man1/(sclient|krb5-config|compile_et)\.1 -PKGFILES_CSWkrb5libdev += $(sbindir)/(uuserver|sserver|sim_server|gss-server) -PKGFILES_CSWkrb5libdev += $(includedir)/.* -PKGFILES_CSWkrb5libdev += $(bindir)/(uuclient|sim_client|sclient|krb5-config|gss-client|compile_et) - -# User gets all the rest -#USER_BINS = kvno|ksu|krb524init|kpasswd|klist|kinit|kdestroy -#USER_SBINS = ktutil|kadmin|k5srvutil -#PKGFILES_CSWkrb5user = $(mandir)/man8/($(USER_SBINS))\.8 -#PKGFILES_CSWkrb5user += $(mandir)/man1/($(USER_BINS))\.1 -#PKGFILES_CSWkrb5user += $(sharedstatedir)/examples/krb5/krb5.conf -#PKGFILES_CSWkrb5user += $(bindir)/($(USER_BINS)) - -include gar/category.mk - -# The flags must not contain additional spaces or the build freaks out -CFLAGS := $(strip $(CFLAGS) -L$(libdir) -D__EXTENSIONS__) -CXXFLAGS := $(strip $(CXXFLAGS) -D__EXTENSIONS__) -#LDFLAGS := $(strip $(LDFLAGS)) - -EXTRA_LINKER_FLAGS := $(LD_OPTIONS) -LD_OPTIONS := - -post-extract-modulated: - @# TODO: Check signature - @cd $(WORKDIR) && (gzip -c -d $(GARNAME)-$(GARVERSION).tar.gz | tar xf -) - @$(MAKECOOKIE) - -install-custom: - @echo " ==> Installing documentation" Copied: csw/mgar/pkg/krb5-lib/trunk/Makefile (from rev 8359, csw/mgar/pkg/krb5/trunk/Makefile) =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2010-02-08 10:41:51 UTC (rev 8406) @@ -0,0 +1,82 @@ +GARNAME = krb5 +GARVERSION = 1.7 +CATEGORIES = server + +DESCRIPTION = MIT Kerberos 5 +define BLURB + Kerberos is a network authentication protocol. It is designed to + provide strong authentication for client/server applications by + using secret-key cryptography. A free implementation of this protocol + is available from the Massachusetts Institute of Technology. + Kerberos is available in many commercial products as well. +endef + +MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/1.7/ +DISTFILES = $(GARNAME)-$(GARVERSION)-signed.tar + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-signed.tar + +PATCHFILES = patch-man2html-perl.patch +PATCHFILES += 0002-libintl-for-kproplog.patch +PATCHFILES += 0003-local-libraries-first-when-linking.patch +PATCHFILES += 0004-libkdb_ldap-isblank-define.patch + +BUILD_DEP_PKGS = CSWtcl + +PACKAGES = CSWkrb5lib CSWkrb5libdev + +CATALOGNAME_CSWkrb5lib = krb5_lib +CATALOGNAME_CSWkrb5libdev = krb5_lib_dev + +SPKG_DESC_CSWkrb5lib = MIT Kerberos 5 core libraries +SPKG_DESC_CSWkrb5libdev = MIT Kerberos 5 developer libraries + +RUNTIME_DEP_PKGS_CSWkrb5libdev = CSWkrb5lib + +LICENSE = doc/copyright.texinfo + +CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure + +CONFIGURE_ARGS = $(DIRPATHS) +ifeq ($(ISA),i386) +CONFIGURE_ARGS += --with-tcl=$(prefix) +endif +# --enable-ipv6 is deprecated and autodetected +#CONFIGURE_ARGS += --enable-ipv6 +CONFIGURE_ARGS += --enable-kdc-replay-cache --enable-dns-for-realm +CONFIGURE_ARGS += --disable-thread-support +CONFIGURE_ARGS += --disable-static --disable-profiled +CONFIGURE_ARGS += --without-ldap + +BUILD64 = 1 + +BUILD_SCRIPTS = $(WORKSRC)/src/Makefile + +TEST_SCRIPTS = $(WORKSRC)/src/Makefile +TEST_TARGET = check + +INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile + +PKGFILES_CSWkrb5lib = $(PKGFILES_RT) + +PKGFILES_CSWkrb5libdev = $(mandir)/man8/sserver.8 +PKGFILES_CSWkrb5libdev += $(mandir)/man1/(sclient|krb5-config|compile_et)\.1 +PKGFILES_CSWkrb5libdev += $(sbindir)/(uuserver|sserver|sim_server|gss-server) +PKGFILES_CSWkrb5libdev += $(includedir)/.* +PKGFILES_CSWkrb5libdev += $(bindir)/(uuclient|sim_client|sclient|krb5-config|gss-client|compile_et) + +include gar/category.mk + +# The flags must not contain additional spaces or the build freaks out +CFLAGS := $(strip $(CFLAGS) -L$(libdir) -D__EXTENSIONS__) +CXXFLAGS := $(strip $(CXXFLAGS) -D__EXTENSIONS__) +#LDFLAGS := $(strip $(LDFLAGS)) + +EXTRA_LINKER_FLAGS := $(LD_OPTIONS) +LD_OPTIONS := + +post-extract-modulated: + @# TODO: Check signature + @cd $(WORKDIR) && (gzip -c -d $(GARNAME)-$(GARVERSION).tar.gz | tar xf -) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 14:28:53 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 13:28:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8407] csw/mgar/pkg/gengetopt/trunk/Makefile Message-ID: Revision: 8407 http://gar.svn.sourceforge.net/gar/?rev=8407&view=rev Author: hson Date: 2010-02-08 13:28:52 +0000 (Mon, 08 Feb 2010) Log Message: ----------- gengetopt: Update to 2.22.4 Modified Paths: -------------- csw/mgar/pkg/gengetopt/trunk/Makefile Modified: csw/mgar/pkg/gengetopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/gengetopt/trunk/Makefile 2010-02-08 10:41:51 UTC (rev 8406) +++ csw/mgar/pkg/gengetopt/trunk/Makefile 2010-02-08 13:28:52 UTC (rev 8407) @@ -1,5 +1,5 @@ GARNAME = gengetopt -GARVERSION = 2.22.3 +GARVERSION = 2.22.4 CATEGORIES = utils DESCRIPTION = parses the command line options This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Feb 8 14:35:17 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 08 Feb 2010 13:35:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8408] csw/mgar/pkg/iso-codes/trunk/Makefile Message-ID: Revision: 8408 http://gar.svn.sourceforge.net/gar/?rev=8408&view=rev Author: hson Date: 2010-02-08 13:35:17 +0000 (Mon, 08 Feb 2010) Log Message: ----------- iso-codes: Add correct license file Modified Paths: -------------- csw/mgar/pkg/iso-codes/trunk/Makefile Modified: csw/mgar/pkg/iso-codes/trunk/Makefile =================================================================== --- csw/mgar/pkg/iso-codes/trunk/Makefile 2010-02-08 13:28:52 UTC (rev 8407) +++ csw/mgar/pkg/iso-codes/trunk/Makefile 2010-02-08 13:35:17 UTC (rev 8408) @@ -15,8 +15,8 @@ CATALOGNAME = iso_codes SPKG_SOURCEURL = http://alioth.debian.org/projects/pkg-isocodes/ +LICENSE = LICENSE -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) 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 Feb 8 15:10:42 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Feb 2010 14:10:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[8409] csw/mgar/pkg/krb5-lib/trunk/Makefile Message-ID: Revision: 8409 http://gar.svn.sourceforge.net/gar/?rev=8409&view=rev Author: dmichelsen Date: 2010-02-08 14:10:28 +0000 (Mon, 08 Feb 2010) Log Message: ----------- krb5-lib: Disable tests for now Modified Paths: -------------- csw/mgar/pkg/krb5-lib/trunk/Makefile Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2010-02-08 13:35:17 UTC (rev 8408) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2010-02-08 14:10:28 UTC (rev 8409) @@ -56,6 +56,8 @@ TEST_SCRIPTS = $(WORKSRC)/src/Makefile TEST_TARGET = check +SKIPTEST ?= 1 + INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile PKGFILES_CSWkrb5lib = $(PKGFILES_RT) 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 Feb 8 15:15:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Feb 2010 14:15:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8410] csw/mgar/pkg Message-ID: Revision: 8410 http://gar.svn.sourceforge.net/gar/?rev=8410&view=rev Author: dmichelsen Date: 2010-02-08 14:15:00 +0000 (Mon, 08 Feb 2010) Log Message: ----------- oracle-instantclient: Initial commit Modified Paths: -------------- csw/mgar/pkg/oracle-instantclient/trunk/Makefile csw/mgar/pkg/oracle-instantclient/trunk/checksums Added Paths: ----------- csw/mgar/pkg/oracle-instantclient/ Modified: csw/mgar/pkg/oracle-instantclient/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk6/trunk/Makefile 2010-02-04 08:54:53 UTC (rev 8343) +++ csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-02-08 14:15:00 UTC (rev 8410) @@ -1,9 +1,8 @@ -GARNAME = jdk6 -SPKG_VERSION = 1.6.0_16 -GARVERSION = 6u16 -CATEGORIES = lang +GARNAME = orainstclient +GARVERSION = 10.2.0.4.0 +CATEGORIES = apps -DESCRIPTION = Java Development Kit 6 +DESCRIPTION = Oracle Instant Client define BLURB endef @@ -11,59 +10,31 @@ # manually and put into /home/src before packaging. MASTER_SITES = manual:// -SUFFIXES_sparc = sparc sparcv9 -SUFFIXES_i386 = i586 x64 -SUFFIXES = $(SUFFIXES_sparc) $(SUFFIXES_i386) +DISTFILES_sparc-32 = basic-10.2.0.4.0-solaris-sparc32.zip sdk-10.2.0.4.0-solaris-sparc32.zip +DISTFILES_sparc-64 = basic-10.2.0.4.0-solaris-sparc64.zip sdk-10.2.0.4.0-solaris-sparc64.zip +DISTFILES_i386-32 = instantclient-basic-solaris-x86-6432-10.2.0.2-20060526.zip instantclient-sdk-solaris-x86-6432-10.2.0.2-20060526.zip +DISTFILES_i386-64 = instantclient-basic-solaris-x86-64-10.2.0.2-2006-05-26.zip instantclient-sdk-solaris-x86-64-10.2.0.2-2006-05-26.zip -DISTNAME = jdk$(SPKG_VERSION) -DISTFILES = $(foreach S,$(SUFFIXES),jdk-$(GARVERSION)-solaris-$S.sh) -NOEXTRACT = $(foreach S,$(filter-out $(SUFFIXES_$(GARCH)),$(SUFFIXES)),jdk-$(GARVERSION)-solaris-$S.sh) +DISTFILES = $(foreach A,sparc i386,$(foreach S,32 64,$(DISTFILES_$A-$S))) +NOEXTRACT = $(filter-out $(DISTFILES_$(GARCH)-32) $(DISTFILES_$(GARCH)-64),$(DISTFILES)) -SPKG_SOURCEURL = http://java.sun.com/javase/downloads/index.jsp +BUILD_DEP_PKGS = CSWchrpath -PACKAGES = CSWjdk6 CSWjre6 CSWjdk CSWjre +SPKG_SOURCEURL = http://www.oracle.com/technology/software/tech/oci/instantclient/index.html -CATALOGNAME_CSWjdk6 = jdk6 -CATALOGNAME_CSWjre6 = jre6 -CATALOGNAME_CSWjdk = jdk -CATALOGNAME_CSWjre = jre +PACKAGES = CSWoracleinstclient102 +CATALOGNAME = oracleinstclient102 -ARCHALL_CSWjdk = 1 -ARCHALL_CSWjre = 1 +# LICENSE = LICENSE -LICENSE = LICENSE +NO_ISAEXEC = 1 -SPKG_DESC_CSWjdk6 = Java Development Kit 6 -SPKG_DESC_CSWjre6 = Java Runtime Environment 6 -SPKG_DESC_CSWjdk = Java Delopment Kit - Latest Version (now CSWjdk6) -SPKG_DESC_CSWjre = Java Runtime Environment - Latest Version (now CSWjre6) - -RUNTIME_DEP_PKGS_CSWjdk6 = CSWjre6 -RUNTIME_DEP_PKGS_CSWjdk = CSWjdk6 -RUNTIME_DEP_PKGS_CSWjre = CSWjre6 - -MANPAGES_JRE = java.1 javaws.1 keytool.1 orbd.1 pack200.1 policytool.1 rmid.1 rmiregistry.1 -MANPAGES_JRE += servertool.1 tnameserv.1 unpack200.1 - -MANPAGE_REGEX = ($(shell echo $(MANPAGES_JRE) | perl -lne 's/\./\\./g;print join("|",split)')) - +BUILD64 = 1 CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = INSTALL_SCRIPTS = custom -PKGFILES_CSWjdk = $(prefix)/java/jdk/latest - -PKGFILES_CSWjre = $(prefix)/java/jre/latest -PKGFILES_CSWjre += $(prefix)/java/man - -PKGFILES_CSWjre6 = $(prefix)/java/jdk/$(DISTNAME)/jre/.* -PKGFILES_CSWjre6 += $(prefix)/java/jdk/$(DISTNAME)/man/.*/$(MANPAGE_REGEX) -PKGFILES_CSWjre6 += $(prefix)/java/jre/jre$(SPKG_VERSION) -PKGFILES_CSWjre6 += $(prefix)/java/jre/jre6 - -# CSWjdk6 gets all the rest - # Tell the user to download the file manually manual//%: @echo @@ -75,36 +46,25 @@ @echo " $(GARCHIVEDIR)" @echo -# rule to extract files with shell -# Clear DISPLAY or the installer will bring up advertisement -shell-extract-archive-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); DISPLAY= MORE="-10000" sh $$D -noregister) - @$(MAKECOOKIE) +define custom-zip-extract +zip-extract-$(1): + ginstall -d $$(EXTRACTDIR)/$(2) + unzip $$(DOWNLOADDIR)/$$(notdir $(1)) -d $$(EXTRACTDIR)/$(2) + @mkdir -p $$(COOKIEDIR)/$$(@D) && date >> $$(COOKIEDIR)/$$@ +endef -extract-archive-%.sh: shell-extract-archive-%.sh - @$(MAKECOOKIE) - include gar/category.mk +$(foreach A,sparc i386,$(foreach S,32 64,$(foreach F,$(DISTFILES_$A-$S),$(eval $(call custom-zip-extract,$F,$A-$S))))) + install-custom: @echo " ==> Installing $(GARNAME)" - - @rm -rf $(DESTDIR)$(prefix)/java - @ginstall -d $(DESTDIR)$(prefix)/java/jdk - @(cd $(WORKDIR); pax -r -w $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk) - @rm -f $(DESTDIR)$(prefix)/java/jdk/latest - @gln -sf jdk6 $(DESTDIR)$(prefix)/java/jdk/latest - @rm -f $(DESTDIR)$(prefix)/java/jdk/jdk6 - @gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk/jdk6 - - @ginstall -d $(DESTDIR)$(prefix)/java/jre - @rm -f $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) - @gln -sf ../jdk/$(DISTNAME)/jre $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) - @rm -f $(DESTDIR)$(prefix)/java/jre/latest - @gln -sf jre6 $(DESTDIR)$(prefix)/java/jre/latest - @rm -f $(DESTDIR)$(prefix)/java/jre/jre6 - @gln -sf jre$(SPKG_VERSION) $(DESTDIR)$(prefix)/java/jre/jre6 - - @gln -sf ../man $(DESTDIR)$(prefix)/java/jdk/$(DISTNAME)/jre/man + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/genezi $(DESTDIR)$(bindir) + chrpath -r $(libdir) $(DESTDIR)$(bindir)/genezi + ginstall -d $(DESTDIR)$(libdir) + ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/*.so* $(DESTDIR)$(libdir) + ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/*.jar $(DESTDIR)$(libdir) + ginstall -d $(DESTDIR)$(includedir)/oracle/10.2/ + ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/sdk/include/* $(DESTDIR)$(includedir)/oracle/10.2/ @$(MAKECOOKIE) Modified: csw/mgar/pkg/oracle-instantclient/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk6/trunk/checksums 2010-02-04 08:54:53 UTC (rev 8343) +++ csw/mgar/pkg/oracle-instantclient/trunk/checksums 2010-02-08 14:15:00 UTC (rev 8410) @@ -1,8 +1,8 @@ -49e3f19f300f9634301324c66e9c538f download/CSWjdk.gspec -e97f304567b9a3504ed23ab5203b1d6a download/CSWjdk6.gspec -e8c5435c1ec2ee4b55bc64a7e43092f5 download/CSWjre.gspec -db63838ec6ecabef9af5dbaeece93854 download/CSWjre6.gspec -3b3403d0b8a5bba0f681f2bca66a2294 download/jdk-6u16-solaris-i586.sh -d1ac0843e934663fa0d6b64fc6482bad download/jdk-6u16-solaris-sparc.sh -ac9da8dfdde3ae213d4dd0d8867b00a1 download/jdk-6u16-solaris-sparcv9.sh -3b80a03228161bc58ae96e2399a3b939 download/jdk-6u16-solaris-x64.sh +39bb3fa3621ba2050a4d1f764f844913 basic-10.2.0.4.0-solaris-sparc32.zip +27224a32a71872d86e82db6119dc01db basic-10.2.0.4.0-solaris-sparc64.zip +77e4ccd5b2fb07d369175816d43d53db instantclient-basic-solaris-x86-64-10.2.0.2-2006-05-26.zip +f69498645ed1e3b37535b579af35e323 instantclient-basic-solaris-x86-6432-10.2.0.2-20060526.zip +9176c1d2926e0fb249e9a272a37c83f7 instantclient-sdk-solaris-x86-64-10.2.0.2-2006-05-26.zip +6f2fbc94d1125c0dc9abb730abb2c961 instantclient-sdk-solaris-x86-6432-10.2.0.2-20060526.zip +14bce0a857876f3414c55d0e298ce2dc sdk-10.2.0.4.0-solaris-sparc32.zip +c76102374ee8c6e27caa334194e3065a sdk-10.2.0.4.0-solaris-sparc64.zip 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 Feb 8 15:30:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Feb 2010 14:30:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8411] csw/mgar/pkg/oracle-instantclient/trunk/Makefile Message-ID: Revision: 8411 http://gar.svn.sourceforge.net/gar/?rev=8411&view=rev Author: dmichelsen Date: 2010-02-08 14:30:00 +0000 (Mon, 08 Feb 2010) Log Message: ----------- oracle-instantclient: Fix NOISAEXEC Modified Paths: -------------- csw/mgar/pkg/oracle-instantclient/trunk/Makefile Modified: csw/mgar/pkg/oracle-instantclient/trunk/Makefile =================================================================== --- csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-02-08 14:15:00 UTC (rev 8410) +++ csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-02-08 14:30:00 UTC (rev 8411) @@ -27,7 +27,7 @@ # LICENSE = LICENSE -NO_ISAEXEC = 1 +NOISAEXEC = 1 BUILD64 = 1 CONFIGURE_SCRIPTS = 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 Feb 8 15:40:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Feb 2010 14:40:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8412] csw/mgar/pkg/oracle-instantclient/trunk/Makefile Message-ID: Revision: 8412 http://gar.svn.sourceforge.net/gar/?rev=8412&view=rev Author: dmichelsen Date: 2010-02-08 14:40:57 +0000 (Mon, 08 Feb 2010) Log Message: ----------- oracle-instantclient: genezi is not available on x86, skip completely for now Modified Paths: -------------- csw/mgar/pkg/oracle-instantclient/trunk/Makefile Modified: csw/mgar/pkg/oracle-instantclient/trunk/Makefile =================================================================== --- csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-02-08 14:30:00 UTC (rev 8411) +++ csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-02-08 14:40:57 UTC (rev 8412) @@ -60,8 +60,8 @@ install-custom: @echo " ==> Installing $(GARNAME)" ginstall -d $(DESTDIR)$(bindir) - ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/genezi $(DESTDIR)$(bindir) - chrpath -r $(libdir) $(DESTDIR)$(bindir)/genezi + #ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/genezi $(DESTDIR)$(bindir) + #chrpath -r $(libdir) $(DESTDIR)$(bindir)/genezi ginstall -d $(DESTDIR)$(libdir) ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/*.so* $(DESTDIR)$(libdir) ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/*.jar $(DESTDIR)$(libdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Feb 8 15:45:19 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Feb 2010 14:45:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8413] csw/mgar/pkg/oracle-instantclient/trunk/Makefile Message-ID: Revision: 8413 http://gar.svn.sourceforge.net/gar/?rev=8413&view=rev Author: dmichelsen Date: 2010-02-08 14:45:19 +0000 (Mon, 08 Feb 2010) Log Message: ----------- oracle-instantclient: Shorten name Modified Paths: -------------- csw/mgar/pkg/oracle-instantclient/trunk/Makefile Modified: csw/mgar/pkg/oracle-instantclient/trunk/Makefile =================================================================== --- csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-02-08 14:40:57 UTC (rev 8412) +++ csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-02-08 14:45:19 UTC (rev 8413) @@ -22,8 +22,8 @@ SPKG_SOURCEURL = http://www.oracle.com/technology/software/tech/oci/instantclient/index.html -PACKAGES = CSWoracleinstclient102 -CATALOGNAME = oracleinstclient102 +PACKAGES = CSWorainstclient102 +CATALOGNAME = orainstclient102 # LICENSE = LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Feb 8 16:33:37 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Feb 2010 15:33:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8414] csw/mgar/pkg/oracle-instantclient/trunk/Makefile Message-ID: Revision: 8414 http://gar.svn.sourceforge.net/gar/?rev=8414&view=rev Author: dmichelsen Date: 2010-02-08 15:33:37 +0000 (Mon, 08 Feb 2010) Log Message: ----------- oracle-instantclient: Change layout Modified Paths: -------------- csw/mgar/pkg/oracle-instantclient/trunk/Makefile Modified: csw/mgar/pkg/oracle-instantclient/trunk/Makefile =================================================================== --- csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-02-08 14:45:19 UTC (rev 8413) +++ csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-02-08 15:33:37 UTC (rev 8414) @@ -10,13 +10,17 @@ # manually and put into /home/src before packaging. MASTER_SITES = manual:// -DISTFILES_sparc-32 = basic-10.2.0.4.0-solaris-sparc32.zip sdk-10.2.0.4.0-solaris-sparc32.zip -DISTFILES_sparc-64 = basic-10.2.0.4.0-solaris-sparc64.zip sdk-10.2.0.4.0-solaris-sparc64.zip -DISTFILES_i386-32 = instantclient-basic-solaris-x86-6432-10.2.0.2-20060526.zip instantclient-sdk-solaris-x86-6432-10.2.0.2-20060526.zip -DISTFILES_i386-64 = instantclient-basic-solaris-x86-64-10.2.0.2-2006-05-26.zip instantclient-sdk-solaris-x86-64-10.2.0.2-2006-05-26.zip +DISTFILES_sparc-32-instantclient = basic-10.2.0.4.0-solaris-sparc32.zip +DISTFILES_sparc-32-sdk = sdk-10.2.0.4.0-solaris-sparc32.zip +DISTFILES_sparc-64-instantclient = basic-10.2.0.4.0-solaris-sparc64.zip +DISTFILES_sparc-64-sdk = sdk-10.2.0.4.0-solaris-sparc64.zip +DISTFILES_i386-32-instantclient = instantclient-basic-solaris-x86-6432-10.2.0.2-20060526.zip +DISTFILES_i386-32-sdk = instantclient-sdk-solaris-x86-6432-10.2.0.2-20060526.zip +DISTFILES_i386-64-instantclient = instantclient-basic-solaris-x86-64-10.2.0.2-2006-05-26.zip +DISTFILES_i386-64-sdk = instantclient-sdk-solaris-x86-64-10.2.0.2-2006-05-26.zip -DISTFILES = $(foreach A,sparc i386,$(foreach S,32 64,$(DISTFILES_$A-$S))) -NOEXTRACT = $(filter-out $(DISTFILES_$(GARCH)-32) $(DISTFILES_$(GARCH)-64),$(DISTFILES)) +DISTFILES = $(foreach A,sparc i386,$(foreach S,32 64,$(foreach T,instantclient sdk,$(DISTFILES_$A-$S-$T)))) +NOEXTRACT = $(filter-out $(foreach S,32 64,$(foreach T,instantclient sdk,$(DISTFILES_$(GARCH)-$S-$T))),$(DISTFILES)) BUILD_DEP_PKGS = CSWchrpath @@ -53,18 +57,26 @@ @mkdir -p $$(COOKIEDIR)/$$(@D) && date >> $$(COOKIEDIR)/$$@ endef +TARGETDIR_32 = . +TARGETDIR_64 = 64 + +MERGE_SCRIPTS_isa-default = copy-all +MERGE_SCRIPTS_isa-default64 = copy-all + include gar/category.mk -$(foreach A,sparc i386,$(foreach S,32 64,$(foreach F,$(DISTFILES_$A-$S),$(eval $(call custom-zip-extract,$F,$A-$S))))) +$(foreach A,sparc i386,$(foreach S,32 64,$(foreach T,instantclient sdk,$(foreach F,$(DISTFILES_$A-$S-$T),$(eval $(call custom-zip-extract,$F,$A-$S)))))) install-custom: @echo " ==> Installing $(GARNAME)" - ginstall -d $(DESTDIR)$(bindir) + #ginstall -d $(DESTDIR)$(bindir) #ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/genezi $(DESTDIR)$(bindir) #chrpath -r $(libdir) $(DESTDIR)$(bindir)/genezi - ginstall -d $(DESTDIR)$(libdir) - ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/*.so* $(DESTDIR)$(libdir) - ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/*.jar $(DESTDIR)$(libdir) - ginstall -d $(DESTDIR)$(includedir)/oracle/10.2/ - ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/sdk/include/* $(DESTDIR)$(includedir)/oracle/10.2/ + #ginstall -d $(DESTDIR)$(libdir) + #ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/*.so* $(DESTDIR)$(libdir) + #ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/*.jar $(DESTDIR)$(libdir) + #ginstall -d $(DESTDIR)$(includedir)/oracle/10.2/ + #ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/sdk/include/* $(DESTDIR)$(includedir)/oracle/10.2/ + ginstall -d $(DESTDIR)$(prefix)/instantclient_10_2/$(TARGETDIR_$(MEMORYMODEL)) + cp -r $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/* $(DESTDIR)$(prefix)/instantclient_10_2/$(TARGETDIR_$(MEMORYMODEL))/ @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Feb 8 16:41:34 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 08 Feb 2010 15:41:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8415] csw/mgar/pkg/cpan/GD/trunk Message-ID: Revision: 8415 http://gar.svn.sourceforge.net/gar/?rev=8415&view=rev Author: bensons Date: 2010-02-08 15:41:34 +0000 (Mon, 08 Feb 2010) Log Message: ----------- cpan GD: fixed build, linking against legacy libjpeg62 Modified Paths: -------------- csw/mgar/pkg/cpan/GD/trunk/Makefile csw/mgar/pkg/cpan/GD/trunk/checksums Modified: csw/mgar/pkg/cpan/GD/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/GD/trunk/Makefile 2010-02-08 15:33:37 UTC (rev 8414) +++ csw/mgar/pkg/cpan/GD/trunk/Makefile 2010-02-08 15:41:34 UTC (rev 8415) @@ -15,7 +15,11 @@ RUNTIME_DEP_PKGS = CSWftype2 CSWgd CSWiconv CSWjpeg CSWpng RUNTIME_DEP_PKGS += CSWxpm CSWzlib CSWfconfig +BUILD_DEP_PKGS = CSWgd +# if we build against libjpeg7, we need to patch one test +# PATCHFILES = diff-GD.t + CONFIGURE_ARGS = lib_gd_path $(libdir) CONFIGURE_ARGS += lib_ft_path $(libdir) CONFIGURE_ARGS += lib_png_path $(libdir) @@ -27,3 +31,5 @@ BUILD_OVERRIDE_DIRS = CCFLAGS include gar/category.mk +pre-build-modulated: + gsed -i'' 's,-ljpeg,/opt/csw/lib/libjpeg.so.62,' $(WORKSRC)/Makefile Modified: csw/mgar/pkg/cpan/GD/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/GD/trunk/checksums 2010-02-08 15:33:37 UTC (rev 8414) +++ csw/mgar/pkg/cpan/GD/trunk/checksums 2010-02-08 15:41:34 UTC (rev 8415) @@ -1 +1 @@ -9b9a4d78a5af0616a96264b0aa354859 download/GD-2.44.tar.gz +9b9a4d78a5af0616a96264b0aa354859 GD-2.44.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Feb 8 16:52:32 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 08 Feb 2010 15:52:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8416] csw/mgar/pkg/cpan/GD/trunk/files/diff-GD.t Message-ID: Revision: 8416 http://gar.svn.sourceforge.net/gar/?rev=8416&view=rev Author: bensons Date: 2010-02-08 15:52:32 +0000 (Mon, 08 Feb 2010) Log Message: ----------- cpan GD: added patchfile in case we are going to link against libjpeg7 or higher Added Paths: ----------- csw/mgar/pkg/cpan/GD/trunk/files/diff-GD.t Added: csw/mgar/pkg/cpan/GD/trunk/files/diff-GD.t =================================================================== --- csw/mgar/pkg/cpan/GD/trunk/files/diff-GD.t (rev 0) +++ csw/mgar/pkg/cpan/GD/trunk/files/diff-GD.t 2010-02-08 15:52:32 UTC (rev 8416) @@ -0,0 +1,11 @@ +--- GD-2.44.orig/t/GD.t 2005-03-09 21:56:28.000000000 +0100 ++++ GD-2.44/t/GD.t 2010-02-04 20:06:06.460022236 +0100 +@@ -75,7 +75,7 @@ + } + + if (GD::Image->can('newFromJpeg')) { +- compare(test10('frog.jpg'),10); ++ print "ok ",10," # Skip, see CPAN bug 49053\n"; + } else { + print "ok ",10," # Skip, no JPEG support\n"; + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Feb 8 17:09:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 08 Feb 2010 16:09:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8417] csw/mgar/pkg/krb5-lib/trunk/Makefile Message-ID: Revision: 8417 http://gar.svn.sourceforge.net/gar/?rev=8417&view=rev Author: wahwah Date: 2010-02-08 16:09:00 +0000 (Mon, 08 Feb 2010) Log Message: ----------- krb5-lib: Added overrides with some notes Modified Paths: -------------- csw/mgar/pkg/krb5-lib/trunk/Makefile Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2010-02-08 15:52:32 UTC (rev 8416) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2010-02-08 16:09:00 UTC (rev 8417) @@ -60,7 +60,8 @@ INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile -PKGFILES_CSWkrb5lib = $(PKGFILES_RT) +PKGFILES_CSWkrb5lib = $(PKGFILES_RT) +PKGFILES_CSWkrb5lib += $(datadir)/checkpkg/overrides/krb5_lib PKGFILES_CSWkrb5libdev = $(mandir)/man8/sserver.8 PKGFILES_CSWkrb5libdev += $(mandir)/man1/(sclient|krb5-config|compile_et)\.1 @@ -82,3 +83,27 @@ @# TODO: Check signature @cd $(WORKDIR) && (gzip -c -d $(GARNAME)-$(GARVERSION).tar.gz | tar xf -) @$(MAKECOOKIE) + +post-merge: + ginstall -m 755 -d $(PKGROOT)$(datadir)/checkpkg/overrides + (echo "CSWkrb5lib: symbol-not-found"; \ + echo "CSWkrb5libdev: symbol-not-found sclient"; \ + ) > $(PKGROOT)$(datadir)/checkpkg/overrides/krb5_lib + @$(MAKECOOKIE) + +# Notes: Potential solutions for the overrides integration in GAR: +# +# OVERRIDES_CSWkrb5lib = a_name +# OVERRIDES_CSWkrb5lib_a_name = symbol-not-found +# +# Or: +# +# define OVERRIDES_CSWkrb5lib +# symbol-not-found +# endef +# +# Note: In either case, the result content should be: +# +# CSWkrb5lib: symbol-not-found +# +# ...placed in /opt/csw/share/checkpkg/overrides/krb5_lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Feb 8 17:22:47 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 08 Feb 2010 16:22:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[8418] csw/mgar/pkg/examples/loose-files/trunk Message-ID: Revision: 8418 http://gar.svn.sourceforge.net/gar/?rev=8418&view=rev Author: wahwah Date: 2010-02-08 16:22:47 +0000 (Mon, 08 Feb 2010) Log Message: ----------- examples/loose-files: Added a license override Modified Paths: -------------- csw/mgar/pkg/examples/loose-files/trunk/Makefile csw/mgar/pkg/examples/loose-files/trunk/checksums Modified: csw/mgar/pkg/examples/loose-files/trunk/Makefile =================================================================== --- csw/mgar/pkg/examples/loose-files/trunk/Makefile 2010-02-08 16:09:00 UTC (rev 8417) +++ csw/mgar/pkg/examples/loose-files/trunk/Makefile 2010-02-08 16:22:47 UTC (rev 8418) @@ -36,4 +36,7 @@ -d $(DESTDIR)$(prefix)/$(dir $F) \ && ginstall $(WORKDIR)/$(notdir $F) \ $(DESTDIR)$(prefix)/$(dir $F);) + ginstall -m 755 -d $(DESTDIR)$(datadir)/checkpkg/overrides + echo "CSWloosefilesexa: license-missing" \ + > $(DESTDIR)$(datadir)/checkpkg/overrides/loose_files_example @$(MAKECOOKIE) Modified: csw/mgar/pkg/examples/loose-files/trunk/checksums =================================================================== --- csw/mgar/pkg/examples/loose-files/trunk/checksums 2010-02-08 16:09:00 UTC (rev 8417) +++ csw/mgar/pkg/examples/loose-files/trunk/checksums 2010-02-08 16:22:47 UTC (rev 8418) @@ -1,2 +1,2 @@ -1738ceecf464e2b847c27cf9e7c410a6 curses.h -f50d8b08c2ae68dc9b090c2c39abc4f0 grep +d388c5613c830fb4571d0457f53580a0 curses.h +492eba390abe4fe74c185d0d343c2b81 grep This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Feb 8 17:38:31 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 08 Feb 2010 16:38:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[8419] csw/mgar/pkg/examples/multiple-versions/trunk/ Makefile Message-ID: Revision: 8419 http://gar.svn.sourceforge.net/gar/?rev=8419&view=rev Author: wahwah Date: 2010-02-08 16:38:31 +0000 (Mon, 08 Feb 2010) Log Message: ----------- examples/multiple-versions: Added overrides Modified Paths: -------------- csw/mgar/pkg/examples/multiple-versions/trunk/Makefile Modified: csw/mgar/pkg/examples/multiple-versions/trunk/Makefile =================================================================== --- csw/mgar/pkg/examples/multiple-versions/trunk/Makefile 2010-02-08 16:22:47 UTC (rev 8418) +++ csw/mgar/pkg/examples/multiple-versions/trunk/Makefile 2010-02-08 16:38:31 UTC (rev 8419) @@ -43,3 +43,9 @@ BUILD64 = 1 include gar/category.mk + +post-merge: + ginstall -m 755 -d $(PKGROOT)$(prefix)/share/checkpkg/overrides + echo "CSWmultiple-versions: license-missing" \ + > $(PKGROOT)$(prefix)/share/checkpkg/overrides/$(CATALOGNAME) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Feb 8 19:29:03 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 08 Feb 2010 18:29:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[8420] csw/mgar/pkg/postgrey/trunk Message-ID: Revision: 8420 http://gar.svn.sourceforge.net/gar/?rev=8420&view=rev Author: bonivart Date: 2010-02-08 18:29:03 +0000 (Mon, 08 Feb 2010) Log Message: ----------- postgrey: add pm_berkeleydb as dep, use csw perl in script Modified Paths: -------------- csw/mgar/pkg/postgrey/trunk/Makefile csw/mgar/pkg/postgrey/trunk/checksums Added Paths: ----------- csw/mgar/pkg/postgrey/trunk/files/postgrey.p Modified: csw/mgar/pkg/postgrey/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgrey/trunk/Makefile 2010-02-08 16:38:31 UTC (rev 8419) +++ csw/mgar/pkg/postgrey/trunk/Makefile 2010-02-08 18:29:03 UTC (rev 8420) @@ -10,10 +10,11 @@ MASTER_SITES = http://postgrey.schweikert.ch/pub/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -RUNTIME_DEP_PKGS = CSWperl CSWpmiomultiplex CSWpmnetserver CSWbdb48 CSWpostfix +RUNTIME_DEP_PKGS = CSWperl CSWpmiomultiplex CSWpmnetserver +RUNTIME_DEP_PKGS += CSWbdb48 CSWpostfix CSWpmberkeleydb + ARCHALL = 1 -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_SCRIPTS = @@ -25,6 +26,8 @@ USERGROUP = /etc/opt/csw/pkg/CSWpostgrey/cswusergroup SAMPLECONF = /etc/opt/csw/postfix/postgrey_whitelist_clients /etc/opt/csw/postfix/postgrey_whitelist_recipients +PATCHFILES = postgrey.p + include gar/category.mk install-custom: Modified: csw/mgar/pkg/postgrey/trunk/checksums =================================================================== --- csw/mgar/pkg/postgrey/trunk/checksums 2010-02-08 16:38:31 UTC (rev 8419) +++ csw/mgar/pkg/postgrey/trunk/checksums 2010-02-08 18:29:03 UTC (rev 8420) @@ -1 +1,2 @@ 524a4e165bf997996f3bccade394712f postgrey-1.32.tar.gz +c1715a65ee323b0b0dcc2fbab9a85425 postgrey.p Added: csw/mgar/pkg/postgrey/trunk/files/postgrey.p =================================================================== --- csw/mgar/pkg/postgrey/trunk/files/postgrey.p (rev 0) +++ csw/mgar/pkg/postgrey/trunk/files/postgrey.p 2010-02-08 18:29:03 UTC (rev 8420) @@ -0,0 +1,8 @@ +--- /postgrey 2010-02-08 18:56:02.741619819 +0100 ++++ /postgrey 2010-02-08 18:56:02.741619819 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -T -w ++#!/opt/csw/bin/perl -T -w + + # Postgrey: a Postfix Greylisting Policy Server + # Copyright (c) 2004-2007 ETH Zurich 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 Feb 9 01:52:42 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 09 Feb 2010 00:52:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[8421] csw/mgar/pkg/cswclassutils/branches Message-ID: Revision: 8421 http://gar.svn.sourceforge.net/gar/?rev=8421&view=rev Author: skayser Date: 2010-02-09 00:52:41 +0000 (Tue, 09 Feb 2010) Log Message: ----------- cswclassutils: branching for i.cswusergroup ID range feature Modified Paths: -------------- csw/mgar/pkg/cswclassutils/branches/cswclassutils-usergroup-idrange/files/CSWcswclassutils.i.cswusergroup Added Paths: ----------- csw/mgar/pkg/cswclassutils/branches/cswclassutils-usergroup-idrange/ Modified: csw/mgar/pkg/cswclassutils/branches/cswclassutils-usergroup-idrange/files/CSWcswclassutils.i.cswusergroup =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup 2010-02-08 18:29:03 UTC (rev 8420) +++ csw/mgar/pkg/cswclassutils/branches/cswclassutils-usergroup-idrange/files/CSWcswclassutils.i.cswusergroup 2010-02-09 00:52:41 UTC (rev 8421) @@ -9,13 +9,205 @@ # 2009-02-10 First release # # Documentation: http://wiki.opencsw.org/cswclassutils-package +# +# TODO +# ! calls to useradd, groupadd, and getent are not PKG_INSTALL_ROOT aware, +# but CAS via -R might be flawed anyway, needs inspection eventually. +# ! path to /etc/shadow in set_user_nologin() are not PKG_ISNTALL_ROOT aware +# ! on failure to determine UID/GID it might be more robust to not exit_error +# but instead only display a warning -DEBUG= # clear to disable debug, set to anything to enable +DEBUG=${DEBUG:-} # set via environment to enable debugging +UID_MIN_DEFAULT=100 +UID_MAX_DEFAULT=999 +GID_MIN_DEFAULT=100 +GID_MAX_DEFAULT=999 + +# Retrieve min/max UID/GID settings from csw.conf. Use usergroup_ variables +# to be naming-consistant with the already existing usergroup_remove variable. +# See http://www.opencsw.org/mantis/view.php?id=3637 +# +# Internally, we use shorter var names which makes it IMHO easier to +# code (particularly WRT to 80 chars width) and read the code, but it's a bit +# of a PITA at the same time. Thoughts? + +if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then + . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +fi +if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then + . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +fi + +UID_MIN_CFGNAME=usergroup_uid_low +UID_MAX_CFGNAME=usergroup_uid_high +GID_MIN_CFGNAME=usergroup_gid_low +GID_MAX_CFGNAME=usergroup_gid_high + +UID_MIN=`eval echo \$\{$UID_MIN_CFGNAME:-$UID_MIN_DEFAULT}` +UID_MAX=`eval echo \$\{$UID_MAX_CFGNAME:-$UID_MAX_DEFAULT}` +GID_MIN=`eval echo \$\{$GID_MIN_CFGNAME:-$GID_MIN_DEFAULT}` +GID_MAX=`eval echo \$\{$GID_MAX_CFGNAME:-$GID_MAX_DEFAULT}` + +# Functions + +exit_error() { + echo "ERROR: $*" >&2 + exit 1 +} + +is_numeric() { + case "$1" in *[^0-9]*) return 1;; esac + [ -z "$1" ] && return 1 + return 0 +} + +first_avail_uid() { + for uid in `/usr/bin/getent passwd | cut -d: -f3 | sort -n` + do + [ $uid -lt $UID_MIN ] && continue + [ $uid -gt $UID_MAX ] && break + eval UID_TAKEN_$uid=1 + done + + uid=$UID_MIN + while test $uid -le $UID_MAX + do + [ `eval echo \$\{UID_TAKEN_$uid:-0}` -eq 1 ] || { echo $uid; return; } + uid=`expr $uid + 1` + done + echo -1 +} + +first_avail_gid() { + for gid in `/usr/bin/getent group | cut -d: -f3 | sort -n` + do + [ $gid -lt $GID_MIN ] && continue + [ $gid -gt $GID_MAX ] && break + eval GID_TAKEN_$gid=1 + done + + gid=$GID_MIN + while test $gid -le $GID_MAX + do + [ `eval echo \$\{GID_TAKEN_$gid:-0}` -eq 1 ] || { echo $gid; return; } + gid=`expr $gid + 1` + done + echo -1 +} + +# Validate ID range settings, ref. useradd(1m) and groupadd(1m) for sys limit +# Currently defined by MAXUID in /usr/include/sys/param.h -> 2147483647 + +is_numeric $UID_MIN || exit_error "$UID_MIN_CFGNAME is non-numeric ($UID_MIN)" +is_numeric $UID_MAX || exit_error "$UID_MAX_CFGNAME is non-numeric ($UID_MAX)" +is_numeric $GID_MIN || exit_error "$GID_MIN_CFGNAME is non-numeric ($GID_MIN)" +is_numeric $GID_MAX || exit_error "$GID_MAX_CFGNAME is non-numeric ($GID_MAX)" + +test $UID_MIN -ge 0 \ + -a $UID_MAX -le 2147483647 \ + -a $UID_MIN -lt $UID_MAX \ + -a $GID_MIN -ge 0 \ + -a $GID_MAX -le 2147483647 \ + -a $GID_MIN -lt $GID_MAX || \ + exit_error "usergroup ID range settings are invalid + +Settings are + $UID_MIN_CFGNAME: $UID_MIN + $UID_MAX_CFGNAME: $UID_MAX + $GID_MIN_CFGNAME: $GID_MIN + $GID_MAX_CFGNAME: $GID_MAX + +Constraints are + $UID_MIN_CFGNAME and $GID_MIN_CFGNAME must be >0 + $UID_MAX_CFGNAME and $GID_MAX_CFGNAME must be <2147483647 + $UID_MIN_CFGNAME must be < $UID_MAX_CFGNAME + $GID_MIN_CFGNAME must be < $GID_MAX_CFGNAME +" + if [ "$DEBUG" ]; then echo PACKAGE: $PKGINST fi +create_group() { + + group="$1" + + if /bin/getent group $group > /dev/null; then + echo Group $group already exists + return + fi + + gid=`first_avail_gid` + if [ "$gid" == "-1" ]; then + exit_error "Failed to determine GID for group $group" + fi + + if /usr/sbin/groupadd -g $gid $group > /dev/null; then + echo Group $group has been added + else + exit_error "Failed to add group $group" + fi +} + +create_user() { + user="$1" + group="$2" + gcos="$3" + dir="$4" + shell="$5" + create="$6" + + if /bin/getent passwd $user > /dev/null; then + echo User $user already exists + return + fi + + [ -n "$group" ] && group="-g $group" + [ -n "$gcos" ] && gcos="-c $gcos" + [ -n "$dir" ] && dir="-d $dir" + [ -n "$shell" ] && shell="-s $shell" + [ -n "$create" ] && create="-m" + + if /usr/sbin/useradd $gcos $group $create $dir $shell $user > /dev/null; then + echo User $user has been added + else + exit_error "Failed to add user $user" + fi +} + +set_user_nologin() { + case "`uname -r`" in + 5.8|5.9) + # for old solaris, we munge the shadow file manually. + omask=`umask` + umask 0377 + + awk 'BEGIN { FS=":"; OFS=":" } $1 == "'$user'" { $2 = "NP" } { print }' /etc/shadow > /etc/shadow.$PKGINST + if [ $? -ne 0 ]; then + rm /etc/shadow.$PKGINST + exit_error "Setting NP for '$user' failed." + fi + + if cmp -s /etc/shadow /etc/shadow.$PKGINST; then + rm /etc/shadow.$PKGINST + else + echo "Updating account '$user' to be no-login (NP)" + chgrp sys /etc/shadow.$PKGINST + cp -p /etc/shadow /etc/shadow.CSW && \ + mv /etc/shadow.$PKGINST /etc/shadow + fi + umask $omask + ;; + *) + # for modern solaris, use the built-in tools + if ! passwd -N $user; then + exit_error "Setting NP for '$user' failed." + fi + ;; + esac +} + # Copy files echo "Installing class ..." @@ -28,6 +220,7 @@ /usr/bin/cp $src $dest || exit 2 for i in `cat $dest | sed 's/ /_/g'`; do + user=`echo $i | awk -F':' '{print $1}'` group=`echo $i | awk -F':' '{print $2}'` gcos=`echo $i | awk -F':' '{print $3}'` @@ -35,88 +228,21 @@ shell=`echo $i | awk -F':' '{print $5}'` create=`echo $i | awk -F':' '{print $6}'` nopass=`echo $i | awk -F':' '{print $8}'` + if [ -n "$group" ]; then - /bin/getent group $group > /dev/null - if [ $? -ne 0 ]; then - /usr/sbin/groupadd $group > /dev/null - if [ $? -eq 0 ]; then - echo Group $group has been added - else - echo ERROR: Failed to add group $group - fi - else - echo Group $group already exists - fi + create_group $group else echo No group to create fi if [ -n "$user" ]; then - /bin/getent passwd $user > /dev/null - if [ $? -ne 0 ]; then - if [ -n "$group" ]; then - group="-g $group" - fi - if [ -n "$gcos" ]; then - gcos="-c $gcos" - fi - if [ -n "$dir" ]; then - dir="-d $dir" - fi - if [ -n "$shell" ]; then - shell="-s $shell" - fi - if [ -n "$create" ]; then - create="-m" - fi - /usr/sbin/useradd $gcos $group $create $dir $shell $user > /dev/null - if [ $? -eq 0 ]; then - echo User $user has been added - else - echo ERROR: Failed to add user $user - fi - else - echo User $user already exists - fi - - if [ -n "$nopass" ]; then - case "`uname -r`" in - 5.8|5.9) - # for old solaris, we munge the shadow file manually. - omask=`umask` - umask 0377 - awk 'BEGIN { FS=":"; OFS=":" } $1 == "'$user'" { $2 = "NP" } { print }' /etc/shadow > /etc/shadow.$PKGINST - if [ $? -eq 0 ]; then - cmp -s /etc/shadow /etc/shadow.$PKGINST - if [ $? -ne 0 ]; then - echo "Updating account '$user' to be no-login (NP)" - chgrp sys /etc/shadow.$PKGINST - cp -p /etc/shadow /etc/shadow.CSW && \ - mv /etc/shadow.$PKGINST /etc/shadow - else - rm /etc/shadow.$PKGINST - fi - else - echo "ERROR: Setting NP for '$user' failed." - rm /etc/shadow.$PKGINST - fi - umask $omask - ;; - *) - # for modern solaris, use the built-in tools - passwd -N $user - if [ $? -ne 0 ]; then - echo "ERROR: Setting NP for '$user' failed." - fi - ;; - esac - fi + create_user "$user" "$group" "$gcos" "$dir" "$shell" "$create" + [ -n "$nopass" ] && set_user_nologin "$user" else echo No user to create fi echo done - done exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Feb 9 01:54:20 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 09 Feb 2010 00:54:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8422] csw/mgar/pkg/wmf/trunk/Makefile Message-ID: Revision: 8422 http://gar.svn.sourceforge.net/gar/?rev=8422&view=rev Author: hson Date: 2010-02-09 00:54:20 +0000 (Tue, 09 Feb 2010) Log Message: ----------- wmf: Split packages Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2010-02-09 00:52:41 UTC (rev 8421) +++ csw/mgar/pkg/wmf/trunk/Makefile 2010-02-09 00:54:20 UTC (rev 8422) @@ -17,26 +17,42 @@ SPKG_SOURCEURL = http://wvware.sourceforge.net -PACKAGES = CSWwmf CSWwmfdevel CSWwmfdoc +PACKAGES = CSWwmf CSWlibwmfdevel CSWwmfdoc CSWwmffonts CSWlibwmf CATALOGNAME_CSWwmf = wmf -CATALOGNAME_CSWwmfdevel = wmf_devel +CATALOGNAME_CSWlibwmf = libwmf +CATALOGNAME_CSWlibwmfdevel = libwmf_devel CATALOGNAME_CSWwmfdoc = wmf_doc +CATALOGNAME_CSWwmffonts = wmf_fonts SPKG_DESC_CSWwmf += Library and tools for manipulating Windows metafiles -SPKG_DESC_CSWwmfdevel += Library and tools for manipulating Windows metafiles - developer package +SPKG_DESC_CSWlibwmf += Library and tools for manipulating Windows metafiles - runtime package +SPKG_DESC_CSWlibwmfdevel += Library and tools for manipulating Windows metafiles - developer package SPKG_DESC_CSWwmfdoc += Library and tools for manipulating Windows metafiles - documentation +SPKG_DESC_CSWwmffonts += Library and tools for manipulating Windows metafiles - fonts RUNTIME_DEP_PKGS_CSWwmf += CSWexpat CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 RUNTIME_DEP_PKGS_CSWwmf += CSWjpeg CSWlibx11 CSWpng CSWzlib -RUNTIME_DEP_PKGS_CSWwmfdevel += CSWwmf +RUNTIME_DEP_PKGS_CSWwmf += CSWwmffonts CSWlibwmf +RUNTIME_DEP_PKGS_CSWlibwmf += CSWwmffonts +RUNTIME_DEP_PKGS_CSWlibwmf += CSWexpat +RUNTIME_DEP_PKGS_CSWlibwmf += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibwmf += CSWjpeg +RUNTIME_DEP_PKGS_CSWlibwmf += CSWlibx11 +RUNTIME_DEP_PKGS_CSWlibwmf += CSWpng +RUNTIME_DEP_PKGS_CSWlibwmf += CSWzlib +RUNTIME_DEP_PKGS_CSWlibwmfdevel += CSWlibwmf RUNTIME_DEP_PKGS_CSWwmfdoc += CSWwmf +RUNTIME_DEP_PKGS_CSWwmffonts += BUILD_DEP_PKGS += CSWgtk2devel -PKGFILES_CSWwmfdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibwmf = $(PKGFILES_RT) +PKGFILES_CSWlibwmfdevel = $(PKGFILES_DEVEL) PKGFILES_CSWwmfdoc = $(sharedstatedir)/doc/.* +PKGFILES_CSWwmffonts = $(sharedstatedir)/libwmf/fonts/.* ARCHALL_CSWwmfdoc = 1 +ARCHALL_CSWwmffonts = 1 BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Feb 9 01:56:59 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 09 Feb 2010 00:56:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8423] csw/mgar/pkg/cswclassutils/branches/ cswclassutils-usergroup-idrange/files/CSWcswclassutils.i.cswusergroup Message-ID: Revision: 8423 http://gar.svn.sourceforge.net/gar/?rev=8423&view=rev Author: skayser Date: 2010-02-09 00:56:59 +0000 (Tue, 09 Feb 2010) Log Message: ----------- cswclassutils: committed changes don't show up, test commit Modified Paths: -------------- csw/mgar/pkg/cswclassutils/branches/cswclassutils-usergroup-idrange/files/CSWcswclassutils.i.cswusergroup Modified: csw/mgar/pkg/cswclassutils/branches/cswclassutils-usergroup-idrange/files/CSWcswclassutils.i.cswusergroup =================================================================== --- csw/mgar/pkg/cswclassutils/branches/cswclassutils-usergroup-idrange/files/CSWcswclassutils.i.cswusergroup 2010-02-09 00:54:20 UTC (rev 8422) +++ csw/mgar/pkg/cswclassutils/branches/cswclassutils-usergroup-idrange/files/CSWcswclassutils.i.cswusergroup 2010-02-09 00:56:59 UTC (rev 8423) @@ -16,6 +16,7 @@ # ! path to /etc/shadow in set_user_nologin() are not PKG_ISNTALL_ROOT aware # ! on failure to determine UID/GID it might be more robust to not exit_error # but instead only display a warning +# DEBUG=${DEBUG:-} # set via environment to enable debugging This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Feb 9 02:12:08 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 09 Feb 2010 01:12:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8424] csw/mgar/pkg/gengetopt/trunk/checksums Message-ID: Revision: 8424 http://gar.svn.sourceforge.net/gar/?rev=8424&view=rev Author: hson Date: 2010-02-09 01:12:08 +0000 (Tue, 09 Feb 2010) Log Message: ----------- gengetopt: Updated checksum file Modified Paths: -------------- csw/mgar/pkg/gengetopt/trunk/checksums Modified: csw/mgar/pkg/gengetopt/trunk/checksums =================================================================== --- csw/mgar/pkg/gengetopt/trunk/checksums 2010-02-09 00:56:59 UTC (rev 8423) +++ csw/mgar/pkg/gengetopt/trunk/checksums 2010-02-09 01:12:08 UTC (rev 8424) @@ -1 +1 @@ -9f42beca6220df43812725c07d1e843c download/gengetopt-2.22.3.tar.gz +e69d1b051784eb3a1c9fae36cb8b25ea gengetopt-2.22.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Feb 9 02:24:17 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 09 Feb 2010 01:24:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8425] csw/mgar/pkg/wmf/trunk/Makefile Message-ID: Revision: 8425 http://gar.svn.sourceforge.net/gar/?rev=8425&view=rev Author: hson Date: 2010-02-09 01:24:17 +0000 (Tue, 09 Feb 2010) Log Message: ----------- wmf: Rename package Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2010-02-09 01:12:08 UTC (rev 8424) +++ csw/mgar/pkg/wmf/trunk/Makefile 2010-02-09 01:24:17 UTC (rev 8425) @@ -17,17 +17,17 @@ SPKG_SOURCEURL = http://wvware.sourceforge.net -PACKAGES = CSWwmf CSWlibwmfdevel CSWwmfdoc CSWwmffonts CSWlibwmf +PACKAGES = CSWwmf CSWlibwmfdevel CSWlibwmfdoc CSWwmffonts CSWlibwmf CATALOGNAME_CSWwmf = wmf CATALOGNAME_CSWlibwmf = libwmf CATALOGNAME_CSWlibwmfdevel = libwmf_devel -CATALOGNAME_CSWwmfdoc = wmf_doc +CATALOGNAME_CSWlibwmfdoc = wmf_doc CATALOGNAME_CSWwmffonts = wmf_fonts SPKG_DESC_CSWwmf += Library and tools for manipulating Windows metafiles SPKG_DESC_CSWlibwmf += Library and tools for manipulating Windows metafiles - runtime package SPKG_DESC_CSWlibwmfdevel += Library and tools for manipulating Windows metafiles - developer package -SPKG_DESC_CSWwmfdoc += Library and tools for manipulating Windows metafiles - documentation +SPKG_DESC_CSWlibwmfdoc += Library and tools for manipulating Windows metafiles - documentation SPKG_DESC_CSWwmffonts += Library and tools for manipulating Windows metafiles - fonts RUNTIME_DEP_PKGS_CSWwmf += CSWexpat CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 @@ -41,14 +41,14 @@ RUNTIME_DEP_PKGS_CSWlibwmf += CSWpng RUNTIME_DEP_PKGS_CSWlibwmf += CSWzlib RUNTIME_DEP_PKGS_CSWlibwmfdevel += CSWlibwmf -RUNTIME_DEP_PKGS_CSWwmfdoc += CSWwmf +RUNTIME_DEP_PKGS_CSWlibwmfdoc += CSWwmf RUNTIME_DEP_PKGS_CSWwmffonts += BUILD_DEP_PKGS += CSWgtk2devel PKGFILES_CSWlibwmf = $(PKGFILES_RT) PKGFILES_CSWlibwmfdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWwmfdoc = $(sharedstatedir)/doc/.* +PKGFILES_CSWlibwmfdoc = $(sharedstatedir)/doc/.* PKGFILES_CSWwmffonts = $(sharedstatedir)/libwmf/fonts/.* ARCHALL_CSWwmfdoc = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Feb 9 05:24:02 2010 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 09 Feb 2010 04:24:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[8426] csw/mgar/pkg/gkrellm/trunk Message-ID: Revision: 8426 http://gar.svn.sourceforge.net/gar/?rev=8426&view=rev Author: jake_goerzen Date: 2010-02-09 04:24:02 +0000 (Tue, 09 Feb 2010) Log Message: ----------- update to 2.3.4 work in progress Modified Paths: -------------- csw/mgar/pkg/gkrellm/trunk/Makefile csw/mgar/pkg/gkrellm/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gkrellm/trunk/files/Makefile csw/mgar/pkg/gkrellm/trunk/files/server.Makefile csw/mgar/pkg/gkrellm/trunk/files/src.Makefile Modified: csw/mgar/pkg/gkrellm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gkrellm/trunk/Makefile 2010-02-09 01:24:17 UTC (rev 8425) +++ csw/mgar/pkg/gkrellm/trunk/Makefile 2010-02-09 04:24:02 UTC (rev 8426) @@ -17,14 +17,10 @@ MASTER_SITES = http://members.dslextreme.com/users/billw/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -#DISTFILES += $(call admfiles,CSWgkrellm, ) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -# Patch up makefile to honor environment variables -#PATCHFILES = suncc.diff - # Disable configure scripts step CONFIGURE_SCRIPTS = @@ -33,16 +29,21 @@ BUILD_ARGS += MANDIR=$(mandir) BUILD_ARGS += INCLUDEDIR=$(includedir) BUILD_ARGS += LOCALEDIR=$(sharedstatedir)/locale -BUILD_ARGS += enable_nls=0 solaris +BUILD_ARGS += enable_nls=1 solaris INSTALL_ARGS = INSTALLROOT=$(DESTDIR) INSTALL_ARGS += INSTALLDIR=$(DESTDIR)$(bindir) INSTALL_ARGS += MANDIR=$(DESTDIR)$(mandir) INSTALL_ARGS += INCLUDEDIR=$(DESTDIR)$(includedir) INSTALL_ARGS += LOCALEDIR=$(DESTDIR)$(sharedstatedir)/locale -INSTALL_ARGS += enable_nls=0 install_solaris +INSTALL_ARGS += enable_nls=1 install_solaris # No test suite TEST_SCRIPTS = include gar/category.mk + +pre-configure-modulated: + @cp $(FILEDIR)/Makefile $(WORKROOTDIR)/build-$(MODULATIONS)/$(GARNAME)-$(GARVERSION)/Makefile + @cp $(FILEDIR)/src.Makefile $(WORKROOTDIR)/build-$(MODULATIONS)/$(GARNAME)-$(GARVERSION)/src/Makefile + @cp $(FILEDIR)/server.Makefile $(WORKROOTDIR)/build-$(MODULATIONS)/$(GARNAME)-$(GARVERSION)/server/Makefile Modified: csw/mgar/pkg/gkrellm/trunk/checksums =================================================================== --- csw/mgar/pkg/gkrellm/trunk/checksums 2010-02-09 01:24:17 UTC (rev 8425) +++ csw/mgar/pkg/gkrellm/trunk/checksums 2010-02-09 04:24:02 UTC (rev 8426) @@ -1,2 +1 @@ -d5543a439ee77950282d06b000048be7 download/gkrellm-2.3.2.tar.bz2 -22c2cef39ec5bd908049ea6b40ecd448 download/CSWgkrellm.gspec +270917784da6bf1292aba0c82af726d6 gkrellm-2.3.4.tar.bz2 Added: csw/mgar/pkg/gkrellm/trunk/files/Makefile =================================================================== --- csw/mgar/pkg/gkrellm/trunk/files/Makefile (rev 0) +++ csw/mgar/pkg/gkrellm/trunk/files/Makefile 2010-02-09 04:24:02 UTC (rev 8426) @@ -0,0 +1,325 @@ +# To make GKrellM for different systems, you can simply: +# For Linux: +# make +# For FreeBSD 2.X: +# make freebsd2 +# For FreeBSD 3.X or later: +# make freebsd +# For NetBSD 1.5 - 1.6.X +# make netbsd1 +# For NetBSD 2.X +# make netbsd2 +# For OpenBSD +# make openbsd +# For Darwin / Mac OS X +# make darwin +# For Solaris 2.x (8 tested so far): +# make solaris +# For libgtop if you have version 1.1.x installed: +# make gtop +# For libgtop if you have version 1.0.x installed in /usr/include & /usr/lib, +# uncomment GTOP lines below: +# make gtop1.0 +# or, eg. if libgtop 1.0 is installed in /opt/gnome/include & /opt/gnome/lib +# make gtop1.0 GTOP_PREFIX=/opt/gnome +# +# Then: +# make install +# To override default install locations /usr/local/bin and /usr/local/include +# to, for example, /usr/bin and /usr/include: +# make install INSTALLDIR=/usr/bin INCLUDEDIR=/usr/include +# +# ------------------------------------------------------------------ +# If you want to override the default behaviour for the above simple "make" +# steps, then uncomment and edit the appropriate lines below. +# +# Default +#-------- +EXTRAOBJS = md5c.o +BINMODE = 755 + +# FreeBSD 2.X +#------------ +#SYS_LIBS = -lkvm +#EXTRAOBJS = +#BINMODE = 4111 + + +# FreeBSD 3.X or later +#--------------------- +#SYS_LIBS = -lkvm -ldevstat +#EXTRAOBJS = +#BINMODE = 4111 + +# NetBSD 1.5 - 1.6.X +#------------------ +#SYS_LIBS=-lkvm +#EXTRAOBJS = +#MANDIR = $(INSTALLROOT)/man/man1 + +# NetBSD +#------------------ +#SYS_LIBS=-lkvm -lpthread +#EXTRAOBJS = +#MANDIR = $(INSTALLROOT)/man/man1 + +# OpenBSD +#------------------ +#SYS_LIBS=-lkvm -lpthread +#EXTRAOBJS = +#BINMODE=2755 + +# Solaris 2.x +#------------ +SYS_LIBS = -lkstat -lkvm -ldevinfo -lm -lnsl -lsocket -lresolv +EXTRAOBJS = md5c.o +BINMODE=2755 +LOCALEDIR = /opt/csw/share/locale + +# "make gtop1.0" defaults. If you don't have gnome or libgtop 1.1.x +# installed, uncomment and edit these if necessary for a libgtop install. +# Or, see below about specifying them on the command line. These are not +# used if you "make gnome-gtop" or "make gtop". +#----------------------------------- +#GTOP_PREFIX = /usr +#GTOP_INCLUDE = -I$(GTOP_PREFIX)/include +#GTOP_LIBS = -L$(GTOP_PREFIX)/lib -lgtop -lgtop_common -lgtop_sysdeps -lXau +#GTOP_LIBS_D = -L$(GTOP_PREFIX)/lib -lgtop -lgtop_common -lgtop_sysdeps +#export GTOP_INCLUDE GTOP_LIBS GTOP_LIBS_D + +VERSION = 2.3.4 + +INSTALLROOT ?= $(DESTDIR)$(PREFIX) + +ifeq ($(INSTALLROOT),) + INSTALLROOT = /usr/local +endif + +INSTALLDIR = $(INSTALLROOT)/bin +SINSTALLDIR ?= $(INSTALLDIR) +MANDIR ?= $(INSTALLROOT)/share/man/man1 +SMANDIR ?= $(MANDIR) +MANMODE = 644 +MANDIRMODE = 755 +INCLUDEDIR = $(INSTALLROOT)/include +INCLUDEMODE = 644 +INCLUDEDIRMODE = 755 +INSTALL ?= install +PKGCONFIGDIR ?= $(INSTALLROOT)/lib/pkgconfig +LOCALEDIR ?= $(INSTALLROOT)/share/locale + +OS_NAME=$(shell uname -s) +OS_RELEASE=$(shell uname -r) + +export SYS_LIBS EXTRAOBJS BINMODE +export INSTALLDIR SINSTALLDIR INCLUDEDIR INCLUDEMODE INCLUDEDIRMODE LOCALEDIR +export MANDIR SMANDIR MANDIRMODE MANMODE +export OS_NAME OS_RELEASE + +enable_nls=1 +debug=0 +export enable_nls +export debug + +all gkrellm: gkrellm.pc + (cd po && ${MAKE} all) + (cd src && ${MAKE} gkrellm) + (cd server && ${MAKE} gkrellmd) + +# win32 needs a Libs: line and ${prefix} for paths so we install a different +# pkg-config file than what gets used on unix +# TODO: move to src/Makefile and install a gkrellmd.pc from server/Makefile +gkrellm.pc_win: Makefile + echo "prefix=$(INSTALLROOT)" > gkrellm.pc + echo "Name: GKrellM" >> gkrellm.pc + echo "Description: Extensible GTK system monitoring application" >> gkrellm.pc + echo "Version: $(VERSION)" >> gkrellm.pc + echo "Requires: gtk+-2.0 >= 2.0.0" >> gkrellm.pc + echo 'Cflags: -I$${prefix}/include' >> gkrellm.pc + echo 'Libs: -L$${prefix}/lib -lgkrellm' >> gkrellm.pc + +gkrellm.pc: Makefile + echo "prefix=$(INSTALLROOT)" > gkrellm.pc + echo "Name: GKrellM" >> gkrellm.pc + echo "Description: Extensible GTK system monitoring application" >> gkrellm.pc + echo "Version: $(VERSION)" >> gkrellm.pc + echo "Requires: gtk+-2.0 >= 2.0.0" >> gkrellm.pc + echo "Cflags: -I$(INCLUDEDIR)" >> gkrellm.pc + +install: install_gkrellm.pc + (cd po && ${MAKE} install) + (cd src && ${MAKE} install) + (cd server && ${MAKE} install) + +uninstall: + (cd po && ${MAKE} uninstall) + (cd src && ${MAKE} uninstall) + (cd server && ${MAKE} uninstall) + rm -f $(PKGCONFIGDIR)/gkrellm.pc + +install_gkrellm.pc: + $(INSTALL) -d $(PKGCONFIGDIR) + $(INSTALL) -m $(INCLUDEMODE) -c gkrellm.pc $(PKGCONFIGDIR) + +install_darwin install_darwin9 install_macosx: install_gkrellm.pc + (cd po && ${MAKE} install) + (cd src && ${MAKE} install STRIP="") + (cd server && ${MAKE} install STRIP="") + +install_freebsd: install_gkrellm.pc + (cd po && ${MAKE} install) + (cd src && ${MAKE} install_freebsd) + (cd server && ${MAKE} install_freebsd) + +install_netbsd: install_gkrellm.pc + (cd po && ${MAKE} install) + (cd src && ${MAKE} install_netbsd) + (cd server && ${MAKE} install_netbsd) + +install_openbsd: install_gkrellm.pc + (cd po && ${MAKE} install) + (cd src && ${MAKE} install_openbsd) + (cd server && ${MAKE} install_openbsd) + +install_solaris: install_gkrellm.pc + (cd po && ${MAKE} install) + (cd src && ${MAKE} install_solaris) + (cd server && ${MAKE} install_solaris) + +install_windows: + (${MAKE} INSTALL=/bin/install install_gkrellm.pc) + (cd po && ${MAKE} \ + INSTALL=/bin/install INSTALLDIR=$(INSTALLROOT) LOCALEDIR=$(INSTALLROOT)/share/locale \ + install) + (cd src && ${MAKE} \ + INSTALL=/bin/install INSTALLDIR=$(INSTALLROOT) LOCALEDIR=$(INSTALLROOT)/share/locale \ + install_windows) + (cd server && ${MAKE} \ + INSTALL=/bin/install SINSTALLDIR=$(INSTALLROOT) LOCALEDIR=$(INSTALLROOT)/share/locale \ + install_windows) + +clean: + (cd po && ${MAKE} clean) + (cd src && ${MAKE} clean) + (cd server && ${MAKE} clean) + rm -f gkrellm.pc + +freebsd2: gkrellm.pc + (cd po && ${MAKE} all) + (cd src && ${MAKE} freebsd2) + (cd server && ${MAKE} \ + EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellmd ) + +freebsd3 freebsd4 freebsd5 freebsd: gkrellm.pc + (cd po && ${MAKE} all) + (cd src && ${MAKE} freebsd) + (cd server && ${MAKE} \ + EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellmd ) + +darwin: gkrellm.pc + (cd po && ${MAKE} all) + (cd src && ${MAKE} GTK_CONFIG=gtk-config STRIP= HAVE_GETADDRINFO=1 \ + EXTRAOBJS= SYS_LIBS="-lkvm -framework IOKit" \ + LINK_FLAGS="-prebind -Wl,-bind_at_load -framework CoreFoundation -lX11" \ + gkrellm ) + (cd server && ${MAKE} GTK_CONFIG=gtk-config STRIP= HAVE_GETADDRINFO=1 \ + EXTRAOBJS= SYS_LIBS="-lkvm -framework IOKit" \ + LINK_FLAGS="-prebind -Wl,-bind_at_load -framework CoreFoundation" \ + gkrellmd ) + +darwin9: gkrellm.pc + (cd po && ${MAKE} all) + (cd src && ${MAKE} GTK_CONFIG=gtk-config STRIP= HAVE_GETADDRINFO=1 \ + EXTRAOBJS= SYS_LIBS="-framework IOKit" \ + LINK_FLAGS="-prebind -Wl,-bind_at_load -framework CoreFoundation -lX11" \ + gkrellm ) + (cd server && ${MAKE} GTK_CONFIG=gtk-config STRIP= HAVE_GETADDRINFO=1 \ + EXTRAOBJS= SYS_LIBS="-framework IOKit" \ + LINK_FLAGS="-prebind -Wl,-bind_at_load -framework CoreFoundation" \ + gkrellmd ) + +macosx: gkrellm.pc + (cd po && ${MAKE} all) + (cd src && ${MAKE} macosx) + (cd server && ${MAKE} macosx) + +netbsd1: gkrellm.pc + (cd po && ${MAKE} all) + (cd src && ${MAKE} \ + EXTRAOBJS= SYS_LIBS="-lkvm" \ + SMC_LIBS="-L/usr/X11R6/lib -lSM -lICE -Wl,-R/usr/X11R6/lib" \ + gkrellm ) + (cd server && ${MAKE} \ + EXTRAOBJS= SYS_LIBS="-lkvm" gkrellmd ) + +netbsd2: gkrellm.pc + (cd po && ${MAKE} all) + (cd src && ${MAKE} \ + EXTRAOBJS= SYS_LIBS="-lkvm -pthread" \ + SMC_LIBS="-L/usr/X11R6/lib -lSM -lICE -R/usr/X11R6/lib" \ + gkrellm ) + (cd server && ${MAKE} \ + EXTRAOBJS= SYS_LIBS="-lkvm -pthread" gkrellmd ) + +openbsd: gkrellm.pc + (cd po && ${MAKE} all) + (cd src && ${MAKE} \ + PTHREAD_INC=-I${PREFIX}/include EXTRAOBJS= \ + SYS_LIBS="-lkvm -pthread" gkrellm ) + (cd server && ${MAKE} \ + PTHREAD_INC=-I${PREFIX}/include EXTRAOBJS= \ + SYS_LIBS="-lkvm -pthread" gkrellmd ) + +solaris: gkrellm.pc + (cd po && ${MAKE} MSGFMT_OPT="-v -o" \ + LOCALEDIR=/opt/csw/share/locale all) +ifeq ($(OS_RELEASE),5.8) + (cd src && ${MAKE} CC=cc \ + SYS_LIBS="-lkstat -lkvm -ldevinfo -lresolv -lsocket -L/usr/openwin/lib -lX11 -lintl" \ + LINK_FLAGS="-lm -lnsl -lsocket -lX11" gkrellm ) + (cd server && ${MAKE} CC=cc \ + CFLAGS="-DSOLARIS_8" \ + SYS_LIBS="-lkstat -lkvm -ldevinfo -lsocket -lnsl -lintl" \ + LINK_FLAGS="-lm -lnsl -lrt -lsocket" gkrellmd ) +else + (cd src && ${MAKE} CC=gcc \ + CFLAGS="-Wno-implicit-int" \ + SYS_LIBS="-lkstat -lkvm -ldevinfo -lresolv -lsocket -lX11" LINK_FLAGS="" gkrellm ) + (cd server && ${MAKE} CC=gcc \ + CFLAGS="-Wno-implicit-int" \ + SYS_LIBS="-lkstat -lkvm -ldevinfo -lsocket -lnsl" LINK_FLAGS="" gkrellmd ) +endif + +gnome-gtop: gkrellm.pc + (cd po && ${MAKE} all) + (cd src && ${MAKE} GTOP_PREFIX="\`gnome-config --prefix libgtop\`" \ + GTOP_INCLUDE="\`gnome-config --cflags libgtop\`" \ + GTOP_LIBS="\`gnome-config --libs libgtop\`" \ + SYS_LIBS= gkrellm ) + (cd server && ${MAKE} GTOP_PREFIX="\`gnome-config --prefix libgtop\`" \ + GTOP_INCLUDE="\`gnome-config --cflags libgtop\`" \ + GTOP_LIBS_D="\`gnome-config --libs libgtop\`" \ + SYS_LIBS= gkrellmd ) + +gtop: gkrellm.pc + (cd po && ${MAKE} all) + (cd src && ${MAKE} GTOP_INCLUDE="\`libgtop-config --cflags\`" \ + GTOP_LIBS="\`libgtop-config --libs\`" \ + SYS_LIBS="-lXau" gkrellm ) + (cd server && ${MAKE} GTOP_INCLUDE="\`libgtop-config --cflags\`" \ + GTOP_LIBS_D="\`libgtop-config --libs\`" \ + SYS_LIBS= gkrellmd ) + +gtop1.0: gkrellm.pc + (cd po && ${MAKE} all) + (cd src && ${MAKE} gkrellm ) + (cd server && ${MAKE} gkrellmd ) + +windows: gkrellm.pc_win + (cd po && ${MAKE} LOCALEDIR="share/locale" all) + (cd src && ${MAKE} LOCALEDIR="share/locale" windows ) + (cd server && ${MAKE} LOCALEDIR="share/locale" windows) + +msgmerge: + (cd po && ${MAKE} messages) + (cd po && ${MAKE} merge) Added: csw/mgar/pkg/gkrellm/trunk/files/server.Makefile =================================================================== --- csw/mgar/pkg/gkrellm/trunk/files/server.Makefile (rev 0) +++ csw/mgar/pkg/gkrellm/trunk/files/server.Makefile 2010-02-09 04:24:02 UTC (rev 8426) @@ -0,0 +1,252 @@ +PACKAGE_D ?= gkrellmd +PKG_CONFIG ?= pkg-config +BINMODE ?= 755 +BINEXT ?= + +INSTALLROOT ?= $(DESTDIR)$(PREFIX) +ifeq ($(INSTALLROOT),) + INSTALLROOT = /usr/local +endif + +SINSTALLDIR ?= $(INSTALLROOT)/bin +INSTALLDIRMODE ?= 755 + +INCLUDEDIR ?= $(INSTALLROOT)/include +INCLUDEMODE ?= 644 +INCLUDEDIRMODE ?= 755 + +LIBDIR ?= $(INSTALLROOT)/lib +LIBDIRMODE ?= 755 + +CFGDIR ?= $(INSTALLROOT)/etc +CFGDIRMODE ?= 755 +CFGMODE ?= 644 + +SMANDIR ?= $(INSTALLROOT)/share/man/man1 +MANMODE ?= 644 +MANDIRMODE ?= 755 +INSTALL ?= install +EXTRAOBJS = + +SHARED_PATH = ../shared +# Make GNU Make search for sources somewhere else as well +VPATH = $(SHARED_PATH) + +ifeq ($(without-libsensors),yes) + CONFIGURE_ARGS += --without-libsensors +endif +ifeq ($(without-libsensors),1) + CONFIGURE_ARGS += --without-libsensors +endif + +DUMMY_VAR := $(shell ./configure $(CONFIGURE_ARGS)) + +HAVE_LIBSENSORS = $(shell grep -c HAVE_LIBSENSORS configure.h) +ifeq ($(HAVE_LIBSENSORS),1) + SENSORS_LIBS ?= -lsensors +endif + + +CC ?= gcc +STRIP ?= -s + +GKRELLMD_INCLUDES = gkrellmd.h $(SHARED_PATH)/log.h + +PKG_INCLUDE = `$(PKG_CONFIG) --cflags glib-2.0 gthread-2.0` +PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0` + +GLIB12_INCLUDE = `glib-config --cflags` +GLIB12_LIB = `glib-config --libs glib gmodule` + +FLAGS = $(PKG_INCLUDE) + +ifeq ($(glib12),1) + FLAGS = -O2 $(GLIB12_INCLUDE) +endif +ifeq ($(glib12),yes) + FLAGS = -O2 $(GLIB12_INCLUDE) +endif +FLAGS += $(GTOP_INCLUDE) $(PTHREAD_INC) -I.. -I$(SHARED_PATH) -DGKRELLM_SERVER + +LIBS = $(PKG_LIB) +ifeq ($(glib12),1) + LIBS = $(GLIB12_LIB) +endif +ifeq ($(glib12),yes) + LIBS = $(GLIB12_LIB) +endif +LIBS += $(GTOP_LIBS_D) $(SYS_LIBS) $(SENSORS_LIBS) + +ifeq ($(debug),1) + FLAGS += -g +endif +ifeq ($(debug),yes) + FLAGS += -g +endif + +ifeq ($(profile),1) + FLAGS += -g -pg +endif +ifeq ($(profile),yes) + FLAGS += -g -pg +endif + +ifeq ($(enable_nls),1) + FLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\" +endif +ifeq ($(enable_nls),yes) + FLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\" +endif + +ifneq ($(PACKAGE_D),gkrellmd) + FLAGS += -DPACKAGE_D=\"$(PACKAGE_D)\" +endif + +ifeq ($(HAVE_GETADDRINFO),1) + FLAGS += -DHAVE_GETADDRINFO +endif + +override CC += $(FLAGS) + +OS_NAME=$(shell uname -s) +OS_RELEASE=$(shell uname -r) + +OBJS = main.o monitor.o mail.o plugins.o glib.o utils.o sysdeps-unix.o log.o + +all: gkrellmd + +gkrellmd: $(OBJS) $(EXTRAOBJS) + $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd $(LIBS) $(LINK_FLAGS) + +static: $(OBJS) $(EXTRAOBJS) + $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \ + $(LIBS) $(LINK_FLAGS) + +freebsd2: + $(MAKE) GTK_CONFIG=gtk12-config \ + EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellmd + +freebsd3 freebsd: + $(MAKE) GTK_CONFIG=gtk12-config \ + EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellmd + +darwin: + $(MAKE) GTK_CONFIG=gtk-config STRIP= \ + EXTRAOBJS= SYS_LIBS="-lkvm -lmd5" \ + LINK_FLAGS="-flat_namespace -undefined warning" gkrellmd + +darwin9: + $(MAKE) GTK_CONFIG=gtk-config STRIP= \ + EXTRAOBJS= SYS_LIBS="-lmd5" \ + LINK_FLAGS="-flat_namespace -undefined warning" gkrellmd + +macosx: + $(MAKE) STRIP= HAVE_GETADDRINFO=1 \ + EXTRAOBJS= SYS_LIBS="-lkvm" \ + LINK_FLAGS="-flat_namespace -undefined warning" \ + gkrellmd + +netbsd1: + $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm" gkrellmd + +netbsd2: + $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -pthread" gkrellmd + +openbsd: + $(MAKE) SYS_LIBS="-lkvm -pthread" gkrellmd + +solaris: +ifeq ($(OS_RELEASE),5.8) + $(MAKE) CFLAGS="-Wno-implicit-int" \ + SYS_LIBS="-lkstat -lkvm -ldevinfo -lsocket -lnsl -lintl" \ + LINK_FLAGS="" gkrellmd +else + $(MAKE) CFLAGS="-Wno-implicit-int" \ + SYS_LIBS="-lkstat -lkvm -ldevinfo -lsocket -lnsl" \ + LINK_FLAGS="" gkrellmd +endif + +windows: libgkrellmd.a + $(MAKE) \ + CFLAGS="${CFLAGS} -D_WIN32_WINNT=0x0500 -DWINVER=0x0500" \ + LINK_FLAGS="${LINK_FLAGS} -mconsole" \ + EXTRAOBJS="win32-resource.o win32-plugin.o" \ + SYS_LIBS=" -llargeint -lws2_32 -lpdh -lnetapi32 -liphlpapi -lntdll -lintl" \ + gkrellmd + +install: install_bin install_inc install_man + +install_bin: + $(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR) + $(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE_D)$(BINEXT) $(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT) + +install_inc: + $(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2 + $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2 + +install_man: + $(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR) + $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1 + +install_cfg: + $(INSTALL) -d -m $(CFGDIRMODE) $(CFGDIR) + $(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(CFGDIR)/gkrellmd.conf + +uninstall: + rm -f $(SINSTALLDIR)/$(PACKAGE_D) + rm -f $(SMANDIR)/$(PACKAGE_D).1 + +install_darwin install_darwin9 install_macosx: + $(MAKE) install STRIP= + +install_freebsd: + $(MAKE) install + chgrp kmem $(SINSTALLDIR)/$(PACKAGE_D) + chmod g+s $(SINSTALLDIR)/$(PACKAGE_D) + +install_netbsd: + $(MAKE) SMANDIR="$(INSTALLROOT)/man/man1" install + +install_openbsd: + $(MAKE) install + chgrp kmem $(SINSTALLDIR)/$(PACKAGE_D) + chmod g+sx $(SINSTALLDIR)/$(PACKAGE_D) + +install_solaris: + $(MAKE) install INSTALL=/usr/ucb/install + chgrp sys $(SINSTALLDIR)/$(PACKAGE_D) + chmod g+s $(SINSTALLDIR)/$(PACKAGE_D) + +install_windows: install_inc install_cfg + $(MAKE) BINEXT=".exe" install_bin + $(INSTALL) -d -m $(LIBDIRMODE) $(LIBDIR) + $(INSTALL) -c -m $(BINMODE) libgkrellmd.a $(LIBDIR) + +clean: + $(RM) *.o *~ *.bak configure.h configure.log gkrellmd gkrellmd.exe \ + libgkrellmd.a core + +SYSDEPS = ../src/sysdeps/bsd-common.c ../src/sysdeps/bsd-net-open.c \ + ../src/sysdeps/darwin.c \ + ../src/sysdeps/freebsd.c ../src/sysdeps/gtop.c \ + ../src/sysdeps/linux.c ../src/sysdeps/netbsd.c \ + ../src/sysdeps/openbsd.c ../src/sysdeps/sensors-common.c \ + ../src/sysdeps/solaris.c ../src/sysdeps/win32.c + +GKRELLMD_H = gkrellmd.h gkrellmd-private.h + +main.o: main.c $(GKRELLMD_H) +monitor.o: monitor.c $(GKRELLMD_H) +mail.o: mail.c $(GKRELLMD_H) +plugins.o: plugins.c $(GKRELLMD_H) +glib.o: glib.c $(GKRELLMD_H) +utils.o: utils.c $(GKRELLMD_H) +sysdeps-unix.o: sysdeps-unix.c ../src/gkrellm-sysdeps.h $(SYSDEPS) $(GKRELLMD_H) +log.o: $(SHARED_PATH)/log.c $(SHARED_PATH)/log.h $(GKRELLMD_H) +win32-gui.o: win32-gui.c +win32-plugin.o: win32-plugin.c win32-plugin.h $(GKRELLMD_H) +win32-resource.o: win32-resource.rc win32-resource.h + windres -I.. -o win32-resource.o win32-resource.rc +win32-libgkrellmd.o: win32-libgkrellmd.c win32-plugin.h $(GKRELLMD_H) +libgkrellmd.a: win32-libgkrellmd.o + ar -cr libgkrellmd.a win32-libgkrellmd.o Added: csw/mgar/pkg/gkrellm/trunk/files/src.Makefile =================================================================== --- csw/mgar/pkg/gkrellm/trunk/files/src.Makefile (rev 0) +++ csw/mgar/pkg/gkrellm/trunk/files/src.Makefile 2010-02-09 04:24:02 UTC (rev 8426) @@ -0,0 +1,369 @@ +PACKAGE ?= gkrellm +PKG_CONFIG ?= pkg-config +BINMODE ?= 755 +BINEXT ?= + +INSTALLROOT ?= $(DESTDIR)$(PREFIX) +ifeq ($(INSTALLROOT),) + INSTALLROOT = /usr/local +endif + +INSTALLDIR ?= $(INSTALLROOT)/bin +INSTALLDIRMODE ?= 755 +INCLUDEDIR ?= $(INSTALLROOT)/include +INCLUDEMODE ?= 644 +INCLUDEDIRMODE ?= 755 +LIBDIR ?= $(INSTALLROOT)/lib +LIBDIRMODE ?= 755 +MANDIR ?= $(INSTALLROOT)/share/man/man1 +MANMODE ?= 644 +MANDIRMODE ?= 755 +INSTALL ?= install +SMC_LIBS ?= -lSM -lICE + +X11_LIBS ?= -L/usr/openwin/lib -lX11 + +SHARED_PATH = ../shared +# Make GNU Make search for sources somewhere else as well +VPATH = $(SHARED_PATH) + + +ifeq ($(without-gnutls),1) + CONFIGURE_ARGS += --without-gnutls +endif +ifeq ($(without-gnutls),yes) + CONFIGURE_ARGS += --without-gnutls +endif +ifeq ($(without-ssl),1) + CONFIGURE_ARGS += --without-ssl +endif +ifeq ($(without-ssl),yes) + CONFIGURE_ARGS += --without-ssl +endif +ifeq ($(without-libsensors),yes) + CONFIGURE_ARGS += --without-libsensors +endif +ifeq ($(without-libsensors),1) + CONFIGURE_ARGS += --without-libsensors +endif +ifeq ($(without-ntlm),yes) + CONFIGURE_ARGS += --without-ntlm +endif +ifeq ($(without-ntlm),1) + CONFIGURE_ARGS += --without-ntlm +endif +DUMMY_VAR := $(shell ./configure $(CONFIGURE_ARGS)) + +HAVE_GNUTLS = $(shell grep -c HAVE_GNUTLS configure.h) +HAVE_SSL = $(shell grep -c HAVE_SSL configure.h) +HAVE_NTLM = $(shell grep -c HAVE_NTLM configure.h) +HAVE_LIBSENSORS = $(shell grep -c HAVE_LIBSENSORS configure.h) + +ifeq ($(HAVE_GNUTLS),1) + SSL_LIBS ?= -lgnutls-openssl +else +ifeq ($(HAVE_SSL),1) + SSL_LIBS ?= -lssl -lcrypto +else + EXTRAOBJS ?= md5c.o +endif +endif + +ifeq ($(HAVE_NTLM),1) + NTLM_INCLUDES = `$(PKG_CONFIG) --cflags libntlm` + NTLM_LIBS = `$(PKG_CONFIG) --libs libntlm` +endif + +ifeq ($(HAVE_LIBSENSORS),1) + SENSORS_LIBS ?= -lsensors +endif + +CC ?= gcc +STRIP ?= -s + +GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h $(SHARED_PATH)/log.h + +PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0` +PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0` + +FLAGS = -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC) \ + ${NTLM_INCLUDES} -DGKRELLM_CLIENT + +LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS) \ + $(NTLM_LIBS) $(X11_LIBS) + +ifeq ($(debug),1) + FLAGS += -g +endif +ifeq ($(debug),yes) + FLAGS += -g +endif + +ifeq ($(profile),1) + FLAGS += -g -pg +endif +ifeq ($(profile),yes) + FLAGS += -g -pg +endif + +ifeq ($(enable_nls),1) + FLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\" +endif +ifeq ($(enable_nls),yes) + FLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\" +endif + +ifneq ($(PACKAGE),gkrellm) + FLAGS += -DPACKAGE=\"$(PACKAGE)\" +endif + +ifeq ($(HAVE_GETADDRINFO),1) + FLAGS += -DHAVE_GETADDRINFO +endif + + +override CC += $(FLAGS) + +OBJS = main.o alerts.o battery.o base64.o clock.o cpu.o disk.o fs.o \ + hostname.o inet.o mail.o mem.o net.o proc.o sensors.o uptime.o \ + chart.o panel.o config.o gui.o krell.o plugins.o pixops.o \ + client.o utils.o sysdeps-unix.o deprecated.o log.o + +UNIXOBJS = winops-x11.o + +all: gkrellm + +gkrellm: check_env $(OBJS) $(UNIXOBJS) $(EXTRAOBJS) + $(CC) $(OBJS) $(UNIXOBJS) $(EXTRAOBJS) -o gkrellm $(LIBS) $(LINK_FLAGS) + +static: check_env $(OBJS) $(UNIXOBJS) $(EXTRAOBJS) + $(CC) $(OBJS) $(UNIXOBJS) $(EXTRAOBJS) -o gkrellm.static -static \ + $(LIBS) $(LINK_FLAGS) + +freebsd2: +ifeq ($(HAVE_SSL),1) + $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm" gkrellm +else + $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellm +endif + +freebsd3 freebsd: +ifeq ($(HAVE_SSL),1) + $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat" gkrellm +else + $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellm +endif + +darwin: +ifeq ($(HAVE_SSL),1) + $(MAKE) GTK_CONFIG=gtk-config STRIP= \ + EXTRAOBJS= SYS_LIBS="-lkvm" \ + gkrellm +else + $(MAKE) GTK_CONFIG=gtk-config STRIP= \ + EXTRAOBJS= SYS_LIBS="-lkvm -lmd5" \ + gkrellm +endif + +darwin9: +ifeq ($(HAVE_SSL),1) + $(MAKE) GTK_CONFIG=gtk-config STRIP= \ + EXTRAOBJS= SYS_LIBS="" \ + gkrellm +else + $(MAKE) GTK_CONFIG=gtk-config STRIP= \ + EXTRAOBJS= SYS_LIBS="-lmd5" \ + gkrellm +endif + +macosx: + $(MAKE) STRIP= HAVE_GETADDRINFO=1 \ + EXTRAOBJS="winops-gtk-mac.o" \ + LINK_FLAGS="-Wl,-bind_at_load -framework CoreFoundation" \ + SYS_LIBS="-lkvm -framework IOKit" \ + SMC_LIBS="" \ + UNIXOBJS="" \ + gkrellm + +netbsd1: + $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm" \ + SMC_LIBS="-L/usr/X11R6/lib -lSM -lICE -Wl,-R/usr/X11R6/lib" \ + gkrellm +netbsd2: + $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -pthread" \ + SMC_LIBS="-L/usr/X11R6/lib -lSM -lICE -R/usr/X11R6/lib" \ + gkrellm + +openbsd: + $(MAKE) GTK_CONFIG=gtk-config GTOP_LIBS= SYS_LIBS="-lkvm -pthread" gkrellm + +solaris: + $(MAKE) CFLAGS="-Wno-implicit-int" \ + SYS_LIBS="-lkstat -lkvm -ldevinfo" gkrellm + +windows: libgkrellm.a + $(MAKE) \ + CFLAGS="${CFLAGS} -D_WIN32_WINNT=0x0500 -DWINVER=0x0500" \ + LINK_FLAGS="${LINK_FLAGS} -mwindows" \ + EXTRAOBJS="${EXTRAOBJS} winops-win32.o win32-plugin.o win32-resource.o" \ + SYS_LIBS=" -llargeint -lws2_32 -lpdh -lnetapi32 -liphlpapi -lntdll -lintl" \ + SMC_LIBS="" \ + UNIXOBJS="" \ + gkrellm + +install: install_bin install_inc install_man + +install_bin: + $(INSTALL) -d -m $(INSTALLDIRMODE) $(INSTALLDIR) + $(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE)$(BINEXT) $(INSTALLDIR)/$(PACKAGE)$(BINEXT) + +install_inc: + $(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2 + $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(INCLUDEDIR)/gkrellm2 + +install_man: + $(INSTALL) -d -m $(MANDIRMODE) $(MANDIR) + $(INSTALL) -c -m $(MANMODE) ../gkrellm.1 $(MANDIR)/$(PACKAGE).1 + +uninstall: + $(RM) $(INSTALLDIR)/$(PACKAGE) + $(RM) -r $(INCLUDEDIR)/gkrellm2 + $(RM) $(MANDIR)/$(PACKAGE).1 + $(RM) $(LIBDIR)/libgkrellm.a + +install_darwin install_darwin9 install_macosx: + $(MAKE) install STRIP= + +install_freebsd: + $(MAKE) install + chgrp kmem $(INSTALLDIR)/$(PACKAGE) + chmod g+s $(INSTALLDIR)/$(PACKAGE) + +install_netbsd: + $(MAKE) MANDIR="$(INSTALLROOT)/man/man1" install + +install_openbsd: + $(MAKE) install + chgrp kmem $(INSTALLDIR)/$(PACKAGE) + chmod g+sx $(INSTALLDIR)/$(PACKAGE) + +install_solaris: + $(MAKE) install INSTALL=/usr/ucb/install + chgrp sys $(INSTALLDIR)/$(PACKAGE) + chmod g+s $(INSTALLDIR)/$(PACKAGE) + +install_windows: + $(MAKE) BINEXT=".exe" install_bin install_inc + $(INSTALL) -d -m $(LIBDIRMODE) $(LIBDIR) + $(INSTALL) -c -m $(BINMODE) libgkrellm.a $(LIBDIR) + +clean: + $(RM) *.o *~ *.bak configure.h configure.log gkrellm gkrellm.exe \ + libgkrellm.a sysdeps/*.o core + +IMAGES = \ + ../pixmaps/frame_top.xpm \ + ../pixmaps/frame_bottom.xpm \ + ../pixmaps/frame_left.xpm \ + ../pixmaps/frame_right.xpm \ + \ + ../pixmaps/button_panel_out.xpm \ + ../pixmaps/button_panel_in.xpm \ + ../pixmaps/button_meter_out.xpm \ + ../pixmaps/button_meter_in.xpm \ + \ + ../pixmaps/bg_chart.xpm \ + ../pixmaps/bg_grid.xpm \ + ../pixmaps/bg_panel.xpm \ + ../pixmaps/bg_meter.xpm \ + \ + ../pixmaps/data_in.xpm \ + ../pixmaps/data_in_grid.xpm \ + ../pixmaps/data_out.xpm \ + ../pixmaps/data_out_grid.xpm \ + \ + ../pixmaps/net/decal_net_leds.xpm \ + ../pixmaps/decal_misc.xpm \ + ../pixmaps/decal_alarm.xpm \ + ../pixmaps/decal_warn.xpm \ + \ + ../pixmaps/krell_panel.xpm \ + ../pixmaps/krell_meter.xpm \ + ../pixmaps/krell_slider.xpm \ + ../pixmaps/krell_mini.xpm \ + ../pixmaps/fs/bg_panel.xpm \ + ../pixmaps/host/bg_panel.xpm \ + ../pixmaps/mail/decal_mail.xpm \ + ../pixmaps/mail/krell_mail.xpm \ + ../pixmaps/mail/krell_mail_daemon.xpm \ + ../pixmaps/timer/bg_panel.xpm \ + ../pixmaps/timer/bg_timer.xpm \ + ../pixmaps/timer/decal_timer_button.xpm \ + ../pixmaps/uptime/bg_panel.xpm \ + \ + ../pixmaps/gkrellmms/bg_panel.xpm \ + ../pixmaps/gkrellmms/spacer_top.xpm \ + ../pixmaps/gkrellmms/spacer_bottom.xpm \ + ../pixmaps/gkrellmms/bg_scroll.xpm \ + ../pixmaps/pmu/bg_panel.xpm \ + ../pixmaps/pmu/spacer_top.xpm \ + ../pixmaps/pmu/spacer_bottom.xpm \ + ../pixmaps/volume/bg_panel.xpm \ + ../pixmaps/volume/spacer_top.xpm \ + ../pixmaps/volume/spacer_bottom.xpm \ + ../pixmaps/bg_separator.xpm + +SYSDEPS_SRC = sysdeps/bsd-common.c sysdeps/bsd-net-open.c sysdeps/freebsd.c \ + sysdeps/gtop.c sysdeps/linux.c sysdeps/netbsd.c sysdeps/openbsd.c \ + sysdeps/solaris.c sysdeps/darwin.c sysdeps/sensors-common.c \ + sysdeps/win32.c + +GKRELLM_H = gkrellm.h gkrellm-private.h +GKRELLM_H_SYS = gkrellm.h gkrellm-public-proto.h gkrellm-private.h \ + gkrellm-sysdeps.h + +main.o: main.c $(GKRELLM_H) +alerts.o: alerts.c $(GKRELLM_H) +battery.o: battery.c $(GKRELLM_H_SYS) +base64.o: base64.c +clock.o: clock.c $(GKRELLM_H_SYS) +cpu.o: cpu.c $(GKRELLM_H_SYS) +disk.o: disk.c $(GKRELLM_H_SYS) +fs.o: fs.c $(GKRELLM_H_SYS) +hostname.o: hostname.c $(GKRELLM_H_SYS) +inet.o: inet.c $(GKRELLM_H_SYS) +mail.o: mail.c md5.h $(GKRELLM_H_SYS) +md5c.o: md5.h +mem.o: mem.c $(GKRELLM_H_SYS) +net.o: net.c $(GKRELLM_H_SYS) +proc.o: proc.c $(GKRELLM_H_SYS) +sensors.o: sensors.c $(GKRELLM_H_SYS) ../pixmaps/sensors/bg_volt.xpm +uptime.o: uptime.c $(GKRELLM_H_SYS) +chart.o: chart.c $(GKRELLM_H) +panel.o: panel.c $(GKRELLM_H) +config.o: config.c $(GKRELLM_H) $(IMAGES) +krell.o: krell.c $(GKRELLM_H) +gui.o: gui.c $(GKRELLM_H) +plugins.o: plugins.c $(GKRELLM_H) +pixops.o: pixops.c $(GKRELLM_H) +client.o: client.c $(GKRELLM_H) +utils.o: utils.c $(GKRELLM_H) +sysdeps-unix.o: sysdeps-unix.c $(GKRELLM_H_SYS) $(SYSDEPS_SRC) +log.o: $(SHARED_PATH)/log.c $(SHARED_PATH)/log.h $(GKRELLM_H) +deprecated.o: deprecated.c $(GKRELLM_H) + +winops-x11.o: winops-x11.c $(GKRELLM_H) +winops-gtk-mac.o: winops-gtk-mac.c $(GKRELLM_H) +winops-win32.o: winops-win32.c $(GKRELLM_H) + +win32-plugin.o: win32-plugin.c win32-plugin.h +win32-libgkrellm.o: win32-libgkrellm.c win32-plugin.h +win32-resource.o: win32-resource.rc win32-resource.h + windres -o win32-resource.o win32-resource.rc + +libgkrellm.a: win32-libgkrellm.o + ar -cr libgkrellm.a win32-libgkrellm.o + +# Checks if the build environment is ok +check_env: + $(PKG_CONFIG) --atleast-version=2.4 gtk+-2.0 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 Feb 9 10:02:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Feb 2010 09:02:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8427] csw/mgar/pkg/python/branches Message-ID: Revision: 8427 http://gar.svn.sourceforge.net/gar/?rev=8427&view=rev Author: dmichelsen Date: 2010-02-09 09:02:25 +0000 (Tue, 09 Feb 2010) Log Message: ----------- python: Make branch with patch for Python bug 7242 Modified Paths: -------------- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile csw/mgar/pkg/python/branches/python-2.6.4+patch7242/checksums Added Paths: ----------- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/ csw/mgar/pkg/python/branches/python-2.6.4+patch7242/files/patch_2.diff.txt Modified: csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2010-02-08 10:41:51 UTC (rev 8406) +++ csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile 2010-02-09 09:02:25 UTC (rev 8427) @@ -45,6 +45,11 @@ PATCHFILES += setup.diff PATCHFILES += getpass.patch +# Fix for Python bug 7242: Forking in a thread raises RuntimeError +# http://bugs.python.org/issue7242 +# This shows up in failing tests on Mercurial +PATCHFILES += patch_2.diff.txt + # Test for sunaudiodev fails. SKIPTEST = 1 Modified: csw/mgar/pkg/python/branches/python-2.6.4+patch7242/checksums =================================================================== --- csw/mgar/pkg/python/trunk/checksums 2010-02-08 10:41:51 UTC (rev 8406) +++ csw/mgar/pkg/python/branches/python-2.6.4+patch7242/checksums 2010-02-09 09:02:25 UTC (rev 8427) @@ -6,6 +6,7 @@ 33f4094ee46ce865d3973a197f3fb4a0 makesetup.diff 22c5f741b1744213eaef0818ab280ad5 modules.diff afcc79a94e2f8a576c7906a9700e35a0 multiprocess.diff +851c64bcab0b4d91d2c14f7f63d53500 patch_2.diff.txt 05724da367b025ce525de2bb704af6e3 pyport.diff a1d114e8a20870675649aeef007a9cac python-config-in.diff 1d2763e140ff30a491b3ce11d1a44f97 setup.diff Added: csw/mgar/pkg/python/branches/python-2.6.4+patch7242/files/patch_2.diff.txt =================================================================== --- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/files/patch_2.diff.txt (rev 0) +++ csw/mgar/pkg/python/branches/python-2.6.4+patch7242/files/patch_2.diff.txt 2010-02-09 09:02:25 UTC (rev 8427) @@ -0,0 +1,63 @@ +diff -ur Python-2.6.4/Modules/posixmodule.c Python-2.6.4.patched/Modules/posixmodule.c +--- Python-2.6.4/Modules/posixmodule.c 2009-09-16 16:06:36.000000000 -0400 ++++ Python-2.6.4.patched/Modules/posixmodule.c 2010-01-22 10:00:18.000000000 -0500 +@@ -3634,11 +3634,12 @@ + int result; + _PyImport_AcquireLock(); + pid = fork1(); ++ if (pid == 0) ++ PyOS_AfterFork(); ++ + result = _PyImport_ReleaseLock(); + if (pid == -1) + return posix_error(); +- if (pid == 0) +- PyOS_AfterFork(); + if (result < 0) { + /* Don't clobber the OSError if the fork failed. */ + PyErr_SetString(PyExc_RuntimeError, +@@ -3663,11 +3664,12 @@ + int result; + _PyImport_AcquireLock(); + pid = fork(); ++ if (pid == 0) ++ PyOS_AfterFork(); ++ + result = _PyImport_ReleaseLock(); + if (pid == -1) + return posix_error(); +- if (pid == 0) +- PyOS_AfterFork(); + if (result < 0) { + /* Don't clobber the OSError if the fork failed. */ + PyErr_SetString(PyExc_RuntimeError, +@@ -3781,11 +3783,12 @@ + + _PyImport_AcquireLock(); + pid = forkpty(&master_fd, NULL, NULL, NULL); ++ if (pid == 0) ++ PyOS_AfterFork(); ++ + result = _PyImport_ReleaseLock(); + if (pid == -1) + return posix_error(); +- if (pid == 0) +- PyOS_AfterFork(); + if (result < 0) { + /* Don't clobber the OSError if the fork failed. */ + PyErr_SetString(PyExc_RuntimeError, +diff -ur Python-2.6.4/Python/import.c Python-2.6.4.patched/Python/import.c +--- Python-2.6.4/Python/import.c 2009-09-16 16:06:36.000000000 -0400 ++++ Python-2.6.4.patched/Python/import.c 2010-01-26 07:03:14.000000000 -0500 +@@ -303,10 +303,9 @@ + void + _PyImport_ReInitLock(void) + { +-#ifdef _AIX + if (import_lock != NULL) + import_lock = PyThread_allocate_lock(); +-#endif ++ import_lock_thread = PyThread_get_thread_ident(); + } + + #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Feb 9 10:02:34 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 09 Feb 2010 09:02:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8428] csw/mgar/pkg/cpan/XML-LibXML/trunk Message-ID: Revision: 8428 http://gar.svn.sourceforge.net/gar/?rev=8428&view=rev Author: bensons Date: 2010-02-09 09:02:34 +0000 (Tue, 09 Feb 2010) Log Message: ----------- cpan XML-LibXML: added postinstall script Modified Paths: -------------- csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile csw/mgar/pkg/cpan/XML-LibXML/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/XML-LibXML/trunk/files/CSWpmxmllibxml.postinstall Modified: csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile 2010-02-09 09:02:25 UTC (rev 8427) +++ csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile 2010-02-09 09:02:34 UTC (rev 8428) @@ -11,15 +11,24 @@ several packages which are not described in this section. endef +DISTFILES += CSWpmxmllibxml.postinstall + PACKAGES = CSWpmxmllibxml CSWpmxmllibxmlcom CATALOGNAME_CSWpmxmllibxml = pm_xmllibxml SPKG_DESC_CSWpmxmllibxml = Binding for libxml2 CATALOGNAME_CSWpmxmllibxmlcom = pm_xmllibxmlcom SPKG_DESC_CSWpmxmllibxmlcom = Constants and Character Encoding Routines PKGFILES_CSWpmxmllibxmlcom = this-is-just-an-empty-stub +ARCHALL_CSWpmxmllibxmlcom = 1 -BUILD_DEP_PKGS = CSWpmxmlnssupp CSWpmxmlsax CSWlibxml2 CSWlibxml2devel -RUNTIME_DEP_PKGS = CSWpmxmlnssupp CSWpmxmlsax CSWlibxml2 CSWlibxml2devel +RUNTIME_DEP_PKGS_CSWpmxmllibxml += CSWiconv +RUNTIME_DEP_PKGS_CSWpmxmllibxml += CSWzlib +RUNTIME_DEP_PKGS_CSWpmxmllibxml += CSWpmxmlnssupp +RUNTIME_DEP_PKGS_CSWpmxmllibxml += CSWpmxmlsax +RUNTIME_DEP_PKGS_CSWpmxmllibxml += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWpmxmllibxml += CSWlibxml2devel +BUILD_DEP_PKGS_CSWpmxmllibxml = $(RUNTIME_DEP_PKGS_CSWpmxmllibxml) +RUNTIME_DEP_PKGS_CSWpmxmllibxmlcom = CSWpmxmllibxml CONFIGURE_ENV += SKIP_SAX_INSTALL=1 Modified: csw/mgar/pkg/cpan/XML-LibXML/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-LibXML/trunk/checksums 2010-02-09 09:02:25 UTC (rev 8427) +++ csw/mgar/pkg/cpan/XML-LibXML/trunk/checksums 2010-02-09 09:02:34 UTC (rev 8428) @@ -1 +1,2 @@ +b2099f1674f4b660aeacfd8d4775d989 CSWpmxmllibxml.postinstall 33d4294f708e20c298cfe534d1166844 XML-LibXML-1.70.tar.gz Added: csw/mgar/pkg/cpan/XML-LibXML/trunk/files/CSWpmxmllibxml.postinstall =================================================================== --- csw/mgar/pkg/cpan/XML-LibXML/trunk/files/CSWpmxmllibxml.postinstall (rev 0) +++ csw/mgar/pkg/cpan/XML-LibXML/trunk/files/CSWpmxmllibxml.postinstall 2010-02-09 09:02:34 UTC (rev 8428) @@ -0,0 +1,10 @@ +#!/bin/sh + +cat <add_parser(q(XML::SAX::PurePerl))->save_parsers();" + +============================ +EoF 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 Feb 9 10:12:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Feb 2010 09:12:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8429] csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile Message-ID: Revision: 8429 http://gar.svn.sourceforge.net/gar/?rev=8429&view=rev Author: dmichelsen Date: 2010-02-09 09:12:25 +0000 (Tue, 09 Feb 2010) Log Message: ----------- perl 5.10.1: Modify linkage of libperl.so Modified Paths: -------------- csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile Modified: csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile =================================================================== --- csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile 2010-02-09 09:02:34 UTC (rev 8428) +++ csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile 2010-02-09 09:12:25 UTC (rev 8429) @@ -22,6 +22,7 @@ RUNTIME_DEP_PKGS_CSWperl = CSWbdb47 CSWgdbm RUNTIME_DEP_PKGS_CSWperldoc = CSWperl INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags + SPKG_DESC_CSWperl = $(DESCRIPTION) SPKG_DESC_CSWperldoc = Perl documentation @@ -111,7 +112,7 @@ EXTRA_INC += $(prefix)/bdb47/include #EXTRA_LDFLAGS = -lperl -EXTRA_LDFLAGS = -L/opt/csw/lib/libperl.so +EXTRA_LDFLAGS = -L$(libdir) -lperl EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* @@ -133,6 +134,11 @@ include gar/category.mk +post-extract-modulated: + mkdir -p $(WORKSRC) + gln -s libperl.so.5.10.1 $(WORKSRC)/libperl.so + @$(MAKECOOKIE) + ifneq ($(CORE_UPDATES),) POST_TARGETS = install-core-updates include files/updatecore.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 Feb 9 10:20:28 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 09 Feb 2010 09:20:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[8430] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 8430 http://gar.svn.sourceforge.net/gar/?rev=8430&view=rev Author: bonivart Date: 2010-02-09 09:20:28 +0000 (Tue, 09 Feb 2010) Log Message: ----------- cswclassutils: working on bugs 4075, 4118 and 4143 Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-02-09 09:12:25 UTC (rev 8429) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-02-09 09:20:28 UTC (rev 8430) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.31 +GARVERSION = 1.32 CATEGORIES = utils DESCRIPTION = CSW class action utilities Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf 2010-02-09 09:12:25 UTC (rev 8429) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf 2010-02-09 09:20:28 UTC (rev 8430) @@ -32,7 +32,8 @@ else echo Copying sample config to $confdest [ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync > /dev/null 2>&1 - contents=`grep "^$dest" /var/sadm/install/contents` + file=`echo $dest | sed -e "s,$PKG_INSTALL_ROOT,,"` + contents=`grep "^$file" $PKG_INSTALL_ROOT/var/sadm/install/contents` mode=`echo $contents | awk '{print $4}'` user=`echo $contents | awk '{print $5}'` group=`echo $contents | awk '{print $6}'` Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf 2010-02-09 09:12:25 UTC (rev 8429) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf 2010-02-09 09:20:28 UTC (rev 8430) @@ -92,6 +92,11 @@ FMRI= if [ "`grep '^#FMRI' $dest`" ]; then FMRI=`grep '^#FMRI' $dest | awk '{print $2}'` + if [ "`echo $FMRI | grep '.'`" ]; then + echo "WARNING! FMRI path contained an illegal dot (removed)" + FMRI=`echo $FMRI | sed 's/\.//g'` + echo "New FMRI path: $FMRI" + fi fi if [ ! "$FMRI" ]; then FMRI=network Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2010-02-09 09:12:25 UTC (rev 8429) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2010-02-09 09:20:28 UTC (rev 8430) @@ -40,7 +40,8 @@ else echo Copying sample config to $confdest [ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync > /dev/null 2>&1 - contents=`grep "^$dest" /var/sadm/install/contents` + file=`echo $dest | sed -e "s,$PKG_INSTALL_ROOT,,"` + contents=`grep "^$file" $PKG_INSTALL_ROOT/var/sadm/install/contents` mode=`echo $contents | awk '{print $4}'` user=`echo $contents | awk '{print $5}'` group=`echo $contents | awk '{print $6}'` 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 Feb 9 10:26:25 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 09 Feb 2010 09:26:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8431] csw/mgar/pkg/cswclassutils/trunk/checksums Message-ID: Revision: 8431 http://gar.svn.sourceforge.net/gar/?rev=8431&view=rev Author: bonivart Date: 2010-02-09 09:26:25 +0000 (Tue, 09 Feb 2010) Log Message: ----------- cswclassutils: forgot checksums Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2010-02-09 09:20:28 UTC (rev 8430) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2010-02-09 09:26:25 UTC (rev 8431) @@ -1,11 +1,12 @@ 48a97af56d55bc90ce90303228ed8cc3 COPYING -fe030911decab669145b3017ed4fdf10 CSWcswclassutils.i.cswcpsampleconf +0b221f753df5c3f953ecdcb90ece6456 CSWcswclassutils.i.cswcpsampleconf 9a6f5ad4919b78e4083491edcd86db0c CSWcswclassutils.i.cswcrontab 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices 4f2e9de463cb4b17ba6e1b3dfdf18913 CSWcswclassutils.i.cswinetd -fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf -9b47f2ac9b8ddbdd3aa30ad59a808af6 CSWcswclassutils.i.cswmigrateconf -c875d62c8ddaad0de2e18fff7946e1e8 CSWcswclassutils.i.cswpreserveconf +6abb13158fee906870d1d68dc0fae6f3 CSWcswclassutils.i.cswinitsmf +17382424148caa223f161ddfd2fb427a CSWcswclassutils.i.cswmigrateconf +79e4e0699a94a2d878f8ba73438c64b8 CSWcswclassutils.i.cswpostmsg +d40da31a034daaf269b9f381fb93e88b CSWcswclassutils.i.cswpreserveconf 9018419febe06c12e89d66cc76e7261f CSWcswclassutils.i.cswpycompile 1282bef941c49d98a061b3701a1fda7c CSWcswclassutils.i.cswtexinfo 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup @@ -15,6 +16,7 @@ 9039ea60ad4c3f8994205fb242a49a72 CSWcswclassutils.r.cswinetd 791db9c2f6685aca67043820d260fc60 CSWcswclassutils.r.cswinitsmf f7a2a10bbf0f88c1909a31141e6d83ce CSWcswclassutils.r.cswmigrateconf +cd1f26f0fe03e4537ed68fa6354f670b CSWcswclassutils.r.cswpostmsg 96453922952c92c6c5a024e54ed8525f CSWcswclassutils.r.cswpreserveconf 02326250b63d3c75c45a8ff81768e923 CSWcswclassutils.r.cswpycompile ed76f47b045b000ab78154a90cf90ed4 CSWcswclassutils.r.cswtexinfo 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 Feb 9 11:35:23 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Feb 2010 10:35:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8432] csw/mgar/pkg/cpan/Pango/trunk/Makefile Message-ID: Revision: 8432 http://gar.svn.sourceforge.net/gar/?rev=8432&view=rev Author: dmichelsen Date: 2010-02-09 10:35:23 +0000 (Tue, 09 Feb 2010) Log Message: ----------- cpan/Pango: Fix build Modified Paths: -------------- csw/mgar/pkg/cpan/Pango/trunk/Makefile Modified: csw/mgar/pkg/cpan/Pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Pango/trunk/Makefile 2010-02-09 09:26:25 UTC (rev 8431) +++ csw/mgar/pkg/cpan/Pango/trunk/Makefile 2010-02-09 10:35:23 UTC (rev 8432) @@ -11,4 +11,19 @@ PACKAGES = CSWpmpango CATALOGNAME = pm_pango +LICENSE = LICENSE + +RUNTIME_DEP_PKGS_CSWpmpango += CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWlibcairo CSWpango + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + include gar/category.mk + +post-merge: + ginstall -m 755 -d $(PKGROOT)$(prefix)/share/checkpkg/overrides + echo "CSWpmpango: symbol-not-found" \ + > $(PKGROOT)$(prefix)/share/checkpkg/overrides/$(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 Tue Feb 9 11:40:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Feb 2010 10:40:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8433] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 8433 http://gar.svn.sourceforge.net/gar/?rev=8433&view=rev Author: dmichelsen Date: 2010-02-09 10:40:32 +0000 (Tue, 09 Feb 2010) Log Message: ----------- mGAR v2: Reorder linker pathes to have most specific one on front Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-02-09 10:35:23 UTC (rev 8432) +++ csw/mgar/gar/v2/gar.conf.mk 2010-02-09 10:40:32 UTC (rev 8433) @@ -497,10 +497,10 @@ # may not be a subdirectory for the 32-bit standard case (this would normally # be a symlink of the form lib/sparcv8 -> . and lib/i386 -> .). This is most likely # the case for libraries in $(EXTRA_LIB) for which no links generated in CSWcommon. -RUNPATH_DIRS ?= $(libpath_install) $(filter-out $(libpath_install),$(libdir_install)) $(EXTRA_LIB) $(EXTRA_RUNPATH_DIRS) +RUNPATH_DIRS ?= $(EXTRA_RUNPATH_DIRS) $(EXTRA_LIB) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install) ifndef NOISALIST -RUNPATH_ISALIST ?= $(libpath_install) $(filter-out $(libpath_install),$(libdir_install)) $(EXTRA_LIB) $(EXTRA_RUNPATH_ISALIST) +RUNPATH_ISALIST ?= $(EXTRA_RUNPATH_DIRS) $(EXTRA_LIB) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install) endif # Iterate over all directories in RUNPATH_DIRS, prefix each directory with one @@ -508,7 +508,7 @@ RUNPATH_LINKER_FLAGS ?= $(foreach D,$(RUNPATH_DIRS),$(addprefix -R,$(addsuffix /\$$ISALIST,$(filter $D,$(RUNPATH_ISALIST))) $(abspath $D/$(MM_LIBDIR)))) $(addprefix -R,$(filter-out $(RUNPATH_DIRS),$(RUNPATH_ISALIST))) $(EXTRA_RUNPATH_LINKER_FLAGS) endif -LINKER_FLAGS ?= $(foreach ELIB,$(libpath_install) $(filter-out $(libpath_install),$(libdir_install)) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) +LINKER_FLAGS ?= $(foreach ELIB,$(EXTRA_LIB) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) 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 Feb 9 14:11:40 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Feb 2010 13:11:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[8434] csw/mgar/pkg/cpan/Pango/trunk/Makefile Message-ID: Revision: 8434 http://gar.svn.sourceforge.net/gar/?rev=8434&view=rev Author: dmichelsen Date: 2010-02-09 13:11:40 +0000 (Tue, 09 Feb 2010) Log Message: ----------- cpan/Pango: Fix dependencies Modified Paths: -------------- csw/mgar/pkg/cpan/Pango/trunk/Makefile Modified: csw/mgar/pkg/cpan/Pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Pango/trunk/Makefile 2010-02-09 10:40:32 UTC (rev 8433) +++ csw/mgar/pkg/cpan/Pango/trunk/Makefile 2010-02-09 13:11:40 UTC (rev 8434) @@ -13,7 +13,8 @@ LICENSE = LICENSE -RUNTIME_DEP_PKGS_CSWpmpango += CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWlibcairo CSWpango +RUNTIME_DEP_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWlibcairo CSWpango +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Tue Feb 9 14:37:16 2010 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Tue, 09 Feb 2010 13:37:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8435] csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc Message-ID: Revision: 8435 http://gar.svn.sourceforge.net/gar/?rev=8435&view=rev Author: d_pocock Date: 2010-02-09 13:37:16 +0000 (Tue, 09 Feb 2010) Log Message: ----------- Update for Ganglia 3.1.6 tarball Modified Paths: -------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile 2010-02-09 13:11:40 UTC (rev 8434) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile 2010-02-09 13:37:16 UTC (rev 8435) @@ -1,5 +1,5 @@ GARNAME = ganglia -GARVERSION = 3.1.5.2258 +GARVERSION = 3.1.6 CATEGORIES = utils # How should we set this? @@ -101,7 +101,7 @@ ifeq ($(GARVERSION),3.1.4) TEST_SCRIPTS = endif -ifeq ($(GARVERSION),3.1.5.2258) +ifeq ($(GARVERSION),3.1.5) TEST_SCRIPTS = endif ifeq ($(GARVERSION),3.1.6) Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums 2010-02-09 13:11:40 UTC (rev 8434) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums 2010-02-09 13:37:16 UTC (rev 8435) @@ -2,5 +2,5 @@ c4c333a46db391464e372ad8ede4993c download/CSWgangliaweb.preremove 25d302948e25837bf17757d5e23e4955 download/cswgmetad c6bb96c949dbb989d06ebb36b6af885d download/cswgmond -cd33957a91bcf0fd5207002674faef0f download/ganglia-3.1.5.2258.tar.gz +39134ccba646fce6979958bf9c0fc8d7 download/ganglia-3.1.6.tar.gz 2ff504ecb546aca2cdd6ee09af9a417e download/httpd-ganglia.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Feb 9 14:52:45 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Feb 2010 13:52:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8436] csw/mgar/pkg/cpan/Gtk2/trunk/Makefile Message-ID: Revision: 8436 http://gar.svn.sourceforge.net/gar/?rev=8436&view=rev Author: dmichelsen Date: 2010-02-09 13:52:45 +0000 (Tue, 09 Feb 2010) Log Message: ----------- cpan/Gtk2: Fix build Modified Paths: -------------- csw/mgar/pkg/cpan/Gtk2/trunk/Makefile Modified: csw/mgar/pkg/cpan/Gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Gtk2/trunk/Makefile 2010-02-09 13:37:16 UTC (rev 8435) +++ csw/mgar/pkg/cpan/Gtk2/trunk/Makefile 2010-02-09 13:52:45 UTC (rev 8436) @@ -14,7 +14,21 @@ PACKAGES = CSWpmgtk2 CATALOGNAME = pm_gtk2 -PKGS_REQUIRED = CSWpmglib CSWgtk2 CSWpmcairo -#PKGS_REQUIRED += CSWpmpango +LICENSE = LICENSE +RUNTIME_DEP_PKGS = CSWpmglib CSWgtk2 CSWpmpango CSWpmcairo CSWfconfig CSWftype2 CSWggettextrt +RUNTIME_DEP_PKGS += CSWglib2 CSWlibatk CSWlibcairo CSWpango +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + include gar/category.mk + +post-merge: + ginstall -m 755 -d $(PKGROOT)$(prefix)/share/checkpkg/overrides + echo "CSWpmgtk2: symbol-not-found" \ + > $(PKGROOT)$(prefix)/share/checkpkg/overrides/$(CATALOGNAME) + @$(MAKECOOKIE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Tue Feb 9 15:04:24 2010 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Tue, 09 Feb 2010 14:04:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8437] csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc Message-ID: Revision: 8437 http://gar.svn.sourceforge.net/gar/?rev=8437&view=rev Author: d_pocock Date: 2010-02-09 14:04:24 +0000 (Tue, 09 Feb 2010) Log Message: ----------- Update for new GAR, add all dependencies Modified Paths: -------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile 2010-02-09 13:52:45 UTC (rev 8436) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile 2010-02-09 14:04:24 UTC (rev 8437) @@ -45,6 +45,7 @@ BUILD_DEP_PKGS = CSWexpat CSWlibconfuse CSWapache2rt CSWapache2-devel CSWrrd CSWpcre RUNTIME_DEP_PKGS_CSWgangliart = CSWexpat CSWlibconfuse CSWapache2rt +RUNTIME_DEP_PKGS_CSWgangliart += CSWpcrert RUNTIME_DEP_PKGS_CSWgangliaagent = CSWexpat CSWlibconfuse CSWapache2rt RUNTIME_DEP_PKGS_CSWgangliaagent += CSWgangliart CSWpcrert RUNTIME_DEP_PKGS_CSWgangliamodpython = CSWlibconfuse CSWapache2rt CSWgangliart @@ -52,6 +53,7 @@ RUNTIME_DEP_PKGS_CSWgangliadevel = CSWexpat CSWlibconfuse CSWapache2rt RUNTIME_DEP_PKGS_CSWgangliagmetad = CSWexpat CSWlibconfuse CSWapache2rt RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWgangliart CSWgangliaagent CSWrrd +RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWpcrert RUNTIME_DEP_PKGS_CSWgangliaweb = CSWgangliagmetad RUNTIME_DEP_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2modphp5 CSWrrd Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums 2010-02-09 13:52:45 UTC (rev 8436) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums 2010-02-09 14:04:24 UTC (rev 8437) @@ -1,6 +1,6 @@ -f3436682e339279357aa98473a9f2b8a download/CSWgangliaweb.postinstall -c4c333a46db391464e372ad8ede4993c download/CSWgangliaweb.preremove -25d302948e25837bf17757d5e23e4955 download/cswgmetad -c6bb96c949dbb989d06ebb36b6af885d download/cswgmond -39134ccba646fce6979958bf9c0fc8d7 download/ganglia-3.1.6.tar.gz -2ff504ecb546aca2cdd6ee09af9a417e download/httpd-ganglia.conf.CSW +f3436682e339279357aa98473a9f2b8a CSWgangliaweb.postinstall +c4c333a46db391464e372ad8ede4993c CSWgangliaweb.preremove +25d302948e25837bf17757d5e23e4955 cswgmetad +c6bb96c949dbb989d06ebb36b6af885d cswgmond +39134ccba646fce6979958bf9c0fc8d7 ganglia-3.1.6.tar.gz +2ff504ecb546aca2cdd6ee09af9a417e httpd-ganglia.conf.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 Feb 9 15:38:26 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Feb 2010 14:38:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[8438] csw/mgar/pkg/cpan/Tk/trunk Message-ID: Revision: 8438 http://gar.svn.sourceforge.net/gar/?rev=8438&view=rev Author: dmichelsen Date: 2010-02-09 14:38:25 +0000 (Tue, 09 Feb 2010) Log Message: ----------- cpan/Tk: Move to mGAR v2 and 804.028 Modified Paths: -------------- csw/mgar/pkg/cpan/Tk/trunk/Makefile csw/mgar/pkg/cpan/Tk/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/cpan/Tk/trunk/ Property changes on: csw/mgar/pkg/cpan/Tk/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Tk/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Tk/trunk/Makefile 2010-02-09 14:04:24 UTC (rev 8437) +++ csw/mgar/pkg/cpan/Tk/trunk/Makefile 2010-02-09 14:38:25 UTC (rev 8438) @@ -1,17 +1,20 @@ GARNAME = Tk -GARVERSION = 804.027 +GARVERSION = 804.028 CATEGORIES = cpan -AUTHOR = NI-S +AUTHOR = SREZIC -DESCRIPTION = write Tk applications in Perl. +DESCRIPTION = A Graphical User Interface ToolKit perl module define BLURB In writing the perl Tk extension, the goals were to provide a complete interface to the latest production version of John Ousterhout's Tk, while providing an Object Oriented interface to perl code. endef -DISTFILES += CSWpmtk.gspec +PACKAGES = CSWpmtk +CATALOGNAME = pm_tk +RUNTIME_DEP_PKGS = CSWjpeg CSWpng CSWzlib + # Use Solaris zlib/png/jpeg #PATCHFILES = syslibs.diff Modified: csw/mgar/pkg/cpan/Tk/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Tk/trunk/checksums 2010-02-09 14:04:24 UTC (rev 8437) +++ csw/mgar/pkg/cpan/Tk/trunk/checksums 2010-02-09 14:38:25 UTC (rev 8438) @@ -1,3 +1,2 @@ -f0b75a2dde2033bbcbc605cae95dabff download/CSWpmtk.gspec -d1ca4a6bff6dae4d937fabde4e86256b download/Tk-804.027.tar.gz -840832e195ef80d99390a17eb7f11aae download/nl_langinfo.diff +7153c1c411b0dd005a0660179e5c5900 Tk-804.028.tar.gz +840832e195ef80d99390a17eb7f11aae nl_langinfo.diff 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 Feb 9 15:58:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Feb 2010 14:58:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8439] csw/mgar/pkg/clearsilver/trunk Message-ID: Revision: 8439 http://gar.svn.sourceforge.net/gar/?rev=8439&view=rev Author: dmichelsen Date: 2010-02-09 14:58:06 +0000 (Tue, 09 Feb 2010) Log Message: ----------- clearsilver: Minor fixes, doesn't compile cleanly yet Modified Paths: -------------- csw/mgar/pkg/clearsilver/trunk/Makefile csw/mgar/pkg/clearsilver/trunk/checksums Added Paths: ----------- csw/mgar/pkg/clearsilver/trunk/files/0001-Do-not-use-Wall-on-Sun-Studio.patch Modified: csw/mgar/pkg/clearsilver/trunk/Makefile =================================================================== --- csw/mgar/pkg/clearsilver/trunk/Makefile 2010-02-09 14:38:25 UTC (rev 8438) +++ csw/mgar/pkg/clearsilver/trunk/Makefile 2010-02-09 14:58:06 UTC (rev 8439) @@ -12,11 +12,15 @@ MASTER_SITES = http://www.clearsilver.net/downloads/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = perlbuild.diff +PATCHFILES += 0001-Do-not-use-Wall-on-Sun-Studio.patch +LICENSE = LICENSE + PACKAGES = CSWcs CSWpmcs CSWpycs RUNTIME_DEP_PKGS_CSWcs = CSWzlib CSWggettextrt -RUNTIME_DEP_PKGS_CSWpmcs = CSWcs CSWperl +RUNTIME_DEP_PKGS_CSWpmcs = CSWcs CSWperl CSWggettextrt CSWzlib RUNTIME_DEP_PKGS_CSWpycs = CSWcs CSWpython CATALOGNAME_CSWcs = clearsilver @@ -27,22 +31,15 @@ SPKG_DESC_CSWpmcs = Clearsilver Perl language binding SPKG_DESC_CSWpycs = Clearsilver Python language binding -PKGFILES_CSWpmcs = $(libdir)/perl/.* -PKGFILES_CSWpmcs += $(mandir)/.*perl.* -PKGFILES_CSWpycs = $(libdir)/python.*/.* -PKGFILES_CSWpycs += $(mandir)/.*python.* +PKGFILES_CSWpmcs = .*perl.* +PKGFILES_CSWpycs = .*python.* -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc -PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES = none cswpycompile -RUNTIME_DEP_PKGS += CSWcswclassutils +PYCOMPILE = 1 # We define upstream file regex so we can be notifed of # new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*) -PATCHFILES += perlbuild.diff - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-python=$(bindir)/python CONFIGURE_ARGS += --with-perl=$(bindir)/perl @@ -62,12 +59,15 @@ # No test target TEST_SCRIPTS = +EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal\.pod + include gar/category.mk PATH := $(PATH):$(SOS11_CC_HOME)/bin ## Move lone perl manpage to the package man location post-install-modulated: - @(gmv $(INSTALLISADIR)$(prefix)/man/man3/ClearSilver.3perl \ - $(INSTALLISADIR)$(prefix)/share/man/man3/ClearSilver.3perl) - @(grm -fr $(INSTALLISADIR)$(prefix)/man/man3) + gmv $(INSTALLISADIR)$(prefix)/man/man3/ClearSilver.3perl \ + $(INSTALLISADIR)$(prefix)/share/man/man3/ClearSilver.3perl + grm -fr $(INSTALLISADIR)$(prefix)/man/man3 + @$(MAKECOOKIE) Modified: csw/mgar/pkg/clearsilver/trunk/checksums =================================================================== --- csw/mgar/pkg/clearsilver/trunk/checksums 2010-02-09 14:38:25 UTC (rev 8438) +++ csw/mgar/pkg/clearsilver/trunk/checksums 2010-02-09 14:58:06 UTC (rev 8439) @@ -1,2 +1,3 @@ -b8c0c7fbe0ef5e06e0c935f134304d44 download/clearsilver-0.10.5.tar.gz -1c25fda8bb2666658d8ddcf3ad9b7235 download/perlbuild.diff +48928da718dbcd215c1c31534b9679c2 0001-Do-not-use-Wall-on-Sun-Studio.patch +b8c0c7fbe0ef5e06e0c935f134304d44 clearsilver-0.10.5.tar.gz +1c25fda8bb2666658d8ddcf3ad9b7235 perlbuild.diff Added: csw/mgar/pkg/clearsilver/trunk/files/0001-Do-not-use-Wall-on-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/clearsilver/trunk/files/0001-Do-not-use-Wall-on-Sun-Studio.patch (rev 0) +++ csw/mgar/pkg/clearsilver/trunk/files/0001-Do-not-use-Wall-on-Sun-Studio.patch 2010-02-09 14:58:06 UTC (rev 8439) @@ -0,0 +1,25 @@ +From 8768d20d192fde3c7de11cf994c374dae57657ea Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 9 Feb 2010 15:20:31 +0100 +Subject: [PATCH] Do not use Wall on Sun Studio + +--- + rules.mk.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/rules.mk.in b/rules.mk.in +index 2bb9ce4..8083a33 100644 +--- a/rules.mk.in ++++ b/rules.mk.in +@@ -84,7 +84,7 @@ PERL = @PERL@ + RUBY = @RUBY@ + + CPPFLAGS = -I$(NEOTONIC_ROOT) @CPPFLAGS@ +-CFLAGS = @CFLAGS@ -Wall $(CPPFLAGS) $(PICFLG) ++CFLAGS = @CFLAGS@ $(CPPFLAGS) $(PICFLG) + OUTPUT_OPTION = -o $@ + LD = $(CC) -o + LDFLAGS = -L$(LIB_DIR) @LDFLAGS@ +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Feb 9 16:17:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Feb 2010 15:17:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[8440] csw/mgar/pkg/cpan/ExtUtils-F77/trunk Message-ID: Revision: 8440 http://gar.svn.sourceforge.net/gar/?rev=8440&view=rev Author: dmichelsen Date: 2010-02-09 15:17:12 +0000 (Tue, 09 Feb 2010) Log Message: ----------- cpan/ExtUtils-F77: Update to mGAR v2 and 1.16 Modified Paths: -------------- csw/mgar/pkg/cpan/ExtUtils-F77/trunk/Makefile csw/mgar/pkg/cpan/ExtUtils-F77/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/ExtUtils-F77/trunk/files/CSWpmextutilsf77.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/ExtUtils-F77/trunk/ Property changes on: csw/mgar/pkg/cpan/ExtUtils-F77/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/ExtUtils-F77/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-F77/trunk/Makefile 2010-02-09 14:58:06 UTC (rev 8439) +++ csw/mgar/pkg/cpan/ExtUtils-F77/trunk/Makefile 2010-02-09 15:17:12 UTC (rev 8440) @@ -1,9 +1,9 @@ GARNAME = ExtUtils-F77 -GARVERSION = 1.15 +GARVERSION = 1.16 CATEGORIES = cpan AUTHOR = KGB -DESCRIPTION = simple interface to F77 libs +DESCRIPTION = Simple interface to F77 libs define BLURB This module tries to figure out how to link C programs with Fortran subroutines on your system. Basically one must add a list of Fortran runtime @@ -11,6 +11,9 @@ OS/compiler combination! endef -DISTFILES += CSWpmextutilsf77.gspec +PACKAGES = CSWpmextutilsf77 +CATALOGNAME = pm_extutilsf77 +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/ExtUtils-F77/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-F77/trunk/checksums 2010-02-09 14:58:06 UTC (rev 8439) +++ csw/mgar/pkg/cpan/ExtUtils-F77/trunk/checksums 2010-02-09 15:17:12 UTC (rev 8440) @@ -1,2 +1 @@ -8d8518520851a94d96ae38a1ed4844fc download/CSWpmextutilsf77.gspec -29eda7785a5b78d23f31f057b7474ac1 download/ExtUtils-F77-1.15.tar.gz +af925e7e8a2876a5fd9b6c4660e37664 ExtUtils-F77-1.16.tar.gz Deleted: csw/mgar/pkg/cpan/ExtUtils-F77/trunk/files/CSWpmextutilsf77.gspec =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-F77/trunk/files/CSWpmextutilsf77.gspec 2010-02-09 14:58:06 UTC (rev 8439) +++ csw/mgar/pkg/cpan/ExtUtils-F77/trunk/files/CSWpmextutilsf77.gspec 2010-02-09 15:17:12 UTC (rev 8440) @@ -1,5 +0,0 @@ -%var bitname pm_extutilsf77 -%var pkgname CSWpmextutilsf77 -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Feb 9 16:19:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Feb 2010 15:19:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8441] csw/mgar/pkg/cpan/ExtUtils-F77/trunk/Makefile Message-ID: Revision: 8441 http://gar.svn.sourceforge.net/gar/?rev=8441&view=rev Author: dmichelsen Date: 2010-02-09 15:19:22 +0000 (Tue, 09 Feb 2010) Log Message: ----------- cpan/ExtUtils-F77: Strip garbage Modified Paths: -------------- csw/mgar/pkg/cpan/ExtUtils-F77/trunk/Makefile Modified: csw/mgar/pkg/cpan/ExtUtils-F77/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-F77/trunk/Makefile 2010-02-09 15:17:12 UTC (rev 8440) +++ csw/mgar/pkg/cpan/ExtUtils-F77/trunk/Makefile 2010-02-09 15:19:22 UTC (rev 8441) @@ -16,4 +16,7 @@ ARCHALL = 1 +# Exclude crap the author has accidently left there from his Mac OS system +EXTRA_MERGE_EXCLUDE_FILES = .*/\..* + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Feb 9 16:32:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Feb 2010 15:32:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8442] csw/mgar/pkg/cpan Message-ID: Revision: 8442 http://gar.svn.sourceforge.net/gar/?rev=8442&view=rev Author: dmichelsen Date: 2010-02-09 15:32:17 +0000 (Tue, 09 Feb 2010) Log Message: ----------- cpan/Astro-FITS-Header: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Astro-FITS-Header/ csw/mgar/pkg/cpan/Astro-FITS-Header/branches/ csw/mgar/pkg/cpan/Astro-FITS-Header/tags/ csw/mgar/pkg/cpan/Astro-FITS-Header/trunk/ csw/mgar/pkg/cpan/Astro-FITS-Header/trunk/Makefile csw/mgar/pkg/cpan/Astro-FITS-Header/trunk/checksums csw/mgar/pkg/cpan/Astro-FITS-Header/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Astro-FITS-Header/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Astro-FITS-Header/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Astro-FITS-Header/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Astro-FITS-Header/trunk/Makefile 2010-02-09 15:32:17 UTC (rev 8442) @@ -0,0 +1,27 @@ +GARNAME = Astro-FITS-Header +GARVERSION = 3.01 +CATEGORIES = cpan +AUTHOR = TJENNESS + +DESCRIPTION = Object Orientated interface to FITS HDUs +define BLURB + Astro::FITS::Header and associated sub-classes are tools for reading, + modifying and then writing out FITS standard header blocks to FITS, NDF + and GSD files. The module now fully supports ESO HIERARCH header keywords. + Support for instantiating Astro::FITS:Header objects from Starlink::AST + FrameSet objects is also supported. +endef + +PACKAGES = CSWpmastrofitsheader +CATALOGNAME = pm_astrofitsheader + +# Missing dependencies (TBD): +# t/ast.t ...... skipped: Starlink::AST not available. +# t/cfitsio.t .. skipped: Astro::FITS::CFITSIO module not available +# t/gsd.t ...... skipped: GSD module not available +# t/ndf.t ...... skipped: NDF module not available + + +LICENSE = GPL + +include gar/category.mk Added: csw/mgar/pkg/cpan/Astro-FITS-Header/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Astro-FITS-Header/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Astro-FITS-Header/trunk/checksums 2010-02-09 15:32:17 UTC (rev 8442) @@ -0,0 +1 @@ +d3c412321625f902b95a50be20f21d6d Astro-FITS-Header-3.01.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 Feb 9 16:55:23 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Feb 2010 15:55:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8443] csw/mgar/pkg Message-ID: Revision: 8443 http://gar.svn.sourceforge.net/gar/?rev=8443&view=rev Author: dmichelsen Date: 2010-02-09 15:55:23 +0000 (Tue, 09 Feb 2010) Log Message: ----------- cfitsio: Initial commit Added Paths: ----------- csw/mgar/pkg/cfitsio/ csw/mgar/pkg/cfitsio/branches/ csw/mgar/pkg/cfitsio/tags/ csw/mgar/pkg/cfitsio/trunk/ csw/mgar/pkg/cfitsio/trunk/Makefile csw/mgar/pkg/cfitsio/trunk/checksums csw/mgar/pkg/cfitsio/trunk/files/ Property changes on: csw/mgar/pkg/cfitsio/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/cfitsio/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfitsio/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cfitsio/trunk/Makefile 2010-02-09 15:55:23 UTC (rev 8443) @@ -0,0 +1,37 @@ +GARNAME = cfitsio +GARVERSION = 3.24 +CATEGORIES = lib + +DESCRIPTION = A library of C and Fortran subroutines for reading and writing data files in FITS +define BLURB + CFITSIO provides simple high-level routines for reading and writing FITS files that + insulate the programmer from the internal complexities of the FITS format. + CFITSIO also provides many advanced features for manipulating and filtering the + information in FITS files +endef + +MASTER_SITES = ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/ +DISTFILES = $(GARNAME)3240.tar.gz + +DISTNAME = $(GARNAME) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://heasarc.gsfc.nasa.gov/fitsio/ + +LICENSE = License.txt + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD_ARGS = all testprog + +TEST_SCRIPTS = custom + +include gar/category.mk + +# Test procedure taken from README +test-custom: + (cd $(WORKSRC); ./testprog > testprog.lis; diff testprog.lis testprog.out && cmp testprog.fit testprog.std) + @$(MAKECOOKIE) Added: csw/mgar/pkg/cfitsio/trunk/checksums =================================================================== --- csw/mgar/pkg/cfitsio/trunk/checksums (rev 0) +++ csw/mgar/pkg/cfitsio/trunk/checksums 2010-02-09 15:55:23 UTC (rev 8443) @@ -0,0 +1 @@ +ba34e71562ed381a238678daffb116fb cfitsio3240.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Feb 9 22:45:33 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 09 Feb 2010 21:45:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8444] csw/mgar/pkg/cpan/mod_perl2/trunk Message-ID: Revision: 8444 http://gar.svn.sourceforge.net/gar/?rev=8444&view=rev Author: bensons Date: 2010-02-09 21:45:33 +0000 (Tue, 09 Feb 2010) Log Message: ----------- cpam mod_perl2: bumped to version 2.0.4 and take over for package Modified Paths: -------------- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile csw/mgar/pkg/cpan/mod_perl2/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.depend csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.depend.GTOP csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.gspec csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.postinstall csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.preremove csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.prototype csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.space Modified: csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-02-09 15:55:23 UTC (rev 8443) +++ csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-02-09 21:45:33 UTC (rev 8444) @@ -1,8 +1,8 @@ GARNAME = mod_perl -DISTVERSION = 2.0.3 +DISTVERSION = 2.0.4 GARVERSION = $(subst -,,$(DISTVERSION)) CATEGORIES = cpan -AUTHOR = PGOLLUCCI +AUTHOR = GOZER DESCRIPTION = Persistent Perl interpreter for Apache 2.x define BLURB @@ -24,17 +24,13 @@ # _default_ vhost, causing a lookup of 255.255.255.255. # -#MASTER_SITES = http://perl.apache.org/dist/ -#MASTER_SITES += http://people.apache.org/~pgollucci/mp2/ -#MODDIST = mod_perl-$(DISTVERSION).tar.gz -#WORKSRC = $(WORKDIR)/mod_perl-$(DISTVERSION) +PACKAGES = CSWap2modperl +CATALOGNAME = ap2_modperl -pkgfiles = prototype depend postinstall preremove space -DISTFILES += $(call admfiles,CSWap2modperl,$(pkgfiles)) -DISTFILES += startup.pl.CSW httpd-perl.conf.CSW +RUNTIME_DEP_PKGS = CSWapache2 CSWapache2rt CSWpmapachetst CSWexpat CSWiconv +RUNTIME_DEP_PKGS += CSWbdb CSWoldaprt CSWapr +#BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -#BUILDDEPS += cpan/Apache-Test server/apache2 - CONFIGURE_ARGS = MP_APXS=$(prefix)/apache2/sbin/apxs CONFIGURE_ARGS += MP_PROMPT_DEFAULT=1 CONFIGURE_ARGS += MP_DEBUG=1 @@ -66,4 +62,3 @@ $(WORKDIR)/httpd-perl.conf.CSW \ $(DESTDIR)$(prefix)/apache2/etc/extra @$(MAKECOOKIE) - Modified: csw/mgar/pkg/cpan/mod_perl2/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/mod_perl2/trunk/checksums 2010-02-09 15:55:23 UTC (rev 8443) +++ csw/mgar/pkg/cpan/mod_perl2/trunk/checksums 2010-02-09 21:45:33 UTC (rev 8444) @@ -1,9 +1,9 @@ -852f7237f8e589f3431cda92df6a8d7d download/CSWap2modperl.gspec -0d968b26817781028112137d16ac7b33 download/CSWap2modperl.prototype -9fe7c7577cb7b74a12de72ec2da7ed25 download/CSWap2modperl.depend -bce39a803cbcc9ab82458cef8d57b650 download/CSWap2modperl.postinstall -b266995026ff19ad4366b4518e648006 download/CSWap2modperl.preremove -0dd379f20ceb32fc77bb3a9bf045097f download/CSWap2modperl.space -4aa0fc5876b33fa32ff8a18a7c70a82a download/startup.pl.CSW -74414e7cba18ec2c10d3bf262f3d661b download/httpd-perl.conf.CSW -b40e2adf67c6be15a0041af1c67b6997 download/mod_perl-2.0.3.tar.gz +9fe7c7577cb7b74a12de72ec2da7ed25 CSWap2modperl.depend +852f7237f8e589f3431cda92df6a8d7d CSWap2modperl.gspec +bce39a803cbcc9ab82458cef8d57b650 CSWap2modperl.postinstall +b266995026ff19ad4366b4518e648006 CSWap2modperl.preremove +7c728dbb1990e4029ce791182f55f9b0 CSWap2modperl.prototype +0dd379f20ceb32fc77bb3a9bf045097f CSWap2modperl.space +74414e7cba18ec2c10d3bf262f3d661b httpd-perl.conf.CSW +1a05625ae6843085f985f5da8214502a mod_perl-2.0.4.tar.gz +4aa0fc5876b33fa32ff8a18a7c70a82a startup.pl.CSW Deleted: csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.depend =================================================================== --- csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.depend 2010-02-09 15:55:23 UTC (rev 8443) +++ csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.depend 2010-02-09 21:45:33 UTC (rev 8444) @@ -1,7 +0,0 @@ -P CSWapache2 apache2 - Apache 2.2 web server -P CSWapache2rt apache2rt - Apache 2.2 runtime libraries -P CSWexpat expat - XML Parser Toolkit -P CSWiconv libiconv - GNU iconv library -P CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt) -P CSWperl perl - A high-level, general-purpose programming language. -P CSWsqlite3 sqlite3 - An embeddable SQL engine in a C library Deleted: csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.depend.GTOP =================================================================== --- csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.depend.GTOP 2010-02-09 15:55:23 UTC (rev 8443) +++ csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.depend.GTOP 2010-02-09 21:45:33 UTC (rev 8444) @@ -1,11 +0,0 @@ -P CSWcommon common - common files and dirs for CSW packages -P CSWapache2 apache2 - apache 2.0 web server -P CSWapache2rt apache2rt - apache 2.0 runtime libraries -P CSWexpat expat - XML Parser Toolkit -P CSWgdbm gdbm - GNU dbm -P CSWggettext ggettext - GNU gettext -P CSWglib2 glib2 - Low-level core library that forms the basis of GTK+ -P CSWiconv libiconv - GNU iconv library -P CSWlibgtop libgtop - library that fetches system related information -P CSWoldap openldap - ldap clients,libraries and server -P CSWperl perl - A high-level, general-purpose programming language Deleted: csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.gspec =================================================================== --- csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.gspec 2010-02-09 15:55:23 UTC (rev 8443) +++ csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.gspec 2010-02-09 21:45:33 UTC (rev 8444) @@ -1,4 +0,0 @@ -%var bitname ap2_modperl -%var pkgname CSWap2modperl -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.postinstall =================================================================== --- csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.postinstall 2010-02-09 15:55:23 UTC (rev 8443) +++ csw/mgar/pkg/cpan/mod_perl2/trunk/files/CSWap2modperl.postinstall 2010-02-09 21:45:33 UTC (rev 8444) @@ -1,52 +0,0 @@ -#!/bin/sh - -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -AP2_PREFIX=$CSW_PREFIX/apache2 -AP2_BINDIR=$AP2_PREFIX/sbin -AP2_LIBEXEC=$AP2_PREFIX/libexec -AP2_CONFDIR=$AP2_PREFIX/etc -AP2_EXTRADIR=$AP2_CONFDIR/extra -AP2_CONFIG=$AP2_CONFDIR/httpd.conf - -# Enable the perl module -PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} -chroot $PKG_INSTALL_ROOT \ - $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n perl mod_perl.so - -# Configure mod_perl in httpd.conf -if [ -n "`egrep 'IfModule (mod_perl|perl_module)' $AP2_CONFIG`" ] -then - echo "Existing mod_perl configuration detected" -elif [ -n "`egrep '#Include etc/extra/httpd-perl.conf' $AP2_CONFIG`" ]; then - echo "Re-enabling existing config" - perl -i -plne 's,^#(Include etc/extra/httpd-perl.conf),$1,' $AP2_CONFIG -else - echo "Adding Include for extra/http-perl.conf to httpd.conf" - cat << END >> $AP2_CONFIG - -Include etc/extra/httpd-perl.conf -END -fi - -# Copy templates -for file in $AP2_CONFDIR/startup.pl $AP2_EXTRADIR/httpd-perl.conf -do - if [ ! -f "$file" ]; then - echo "Creating $file" - cp $file.CSW $file - else - echo "Preserving existing $file" - fi -done -chmod 555 $AP2_CONFDIR/startup.pl - -# Finito -cat < Revision: 8445 http://gar.svn.sourceforge.net/gar/?rev=8445&view=rev Author: wahwah Date: 2010-02-10 06:21:18 +0000 (Wed, 10 Feb 2010) Log Message: ----------- mGAR v2: moving update_contents_cache.py to the gar/bin directory Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Added Paths: ----------- csw/mgar/gar/v2/bin/update_contents_cache.py Removed Paths: ------------- csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-02-09 21:45:33 UTC (rev 8444) +++ csw/mgar/gar/v2/bin/checkpkg 2010-02-10 06:21:18 UTC (rev 8445) @@ -582,7 +582,7 @@ done # /var/sadm/install/contents cache update -${plugindir}/update_contents_cache.py +${checkpkg_basedir}/update_contents_cache.py if [[ "${DEBUG}" != "" ]]; then extra_options="--debug" Deleted: csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py 2010-02-09 21:45:33 UTC (rev 8444) +++ csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py 2010-02-10 06:21:18 UTC (rev 8445) @@ -1,28 +0,0 @@ -#!/opt/csw/bin/python2.6 -# -# $Id$ -# -# This file only creates an instance of SystemPkgmap in order to update the -# package cache (if necessary), and display the information about the update. - -import os -import os.path -import sys -import logging - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.getcwd(), - os.path.split(sys.argv[0])[0], - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg - -def main(): - print "Checking if the package cache is up to date." - logging.basicConfig(level=logging.INFO) - test_pkgmap = checkpkg.SystemPkgmap() - - -if __name__ == '__main__': - main() Copied: csw/mgar/gar/v2/bin/update_contents_cache.py (from rev 8433, csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py) =================================================================== --- csw/mgar/gar/v2/bin/update_contents_cache.py (rev 0) +++ csw/mgar/gar/v2/bin/update_contents_cache.py 2010-02-10 06:21:18 UTC (rev 8445) @@ -0,0 +1,28 @@ +#!/opt/csw/bin/python2.6 +# +# $Id$ +# +# This file only creates an instance of SystemPkgmap in order to update the +# package cache (if necessary), and display the information about the update. + +import os +import os.path +import sys +import logging + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.getcwd(), + os.path.split(sys.argv[0])[0], + "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg + +def main(): + print "Checking if the package cache is up to date." + logging.basicConfig(level=logging.INFO) + test_pkgmap = checkpkg.SystemPkgmap() + + +if __name__ == '__main__': + main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Feb 10 07:25:58 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Feb 2010 06:25:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8446] csw/mgar/gar/v2/bin/checkpkg.d/README Message-ID: Revision: 8446 http://gar.svn.sourceforge.net/gar/?rev=8446&view=rev Author: wahwah Date: 2010-02-10 06:25:58 +0000 (Wed, 10 Feb 2010) Log Message: ----------- mGAR v2: checkpkg.d, link to the wiki page in the README file Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/README Modified: csw/mgar/gar/v2/bin/checkpkg.d/README =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/README 2010-02-10 06:21:18 UTC (rev 8445) +++ csw/mgar/gar/v2/bin/checkpkg.d/README 2010-02-10 06:25:58 UTC (rev 8446) @@ -2,10 +2,12 @@ This directory contains modular checks. Each check is an executable file, written in any language, accepting specific command line options and returning -the result as a status exit code. +the result by writing to a text file. To see the required flags, issue: ./checkpkg-you-can-write-your-own.py -h Each test's file name must begin with "checkpkg-". + +See http://wiki.opencsw.org/checkpkg for more information. 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 Feb 10 11:28:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Feb 2010 10:28:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8447] csw/mgar/pkg/cpan/Calendar-CSA/trunk Message-ID: Revision: 8447 http://gar.svn.sourceforge.net/gar/?rev=8447&view=rev Author: dmichelsen Date: 2010-02-10 10:28:11 +0000 (Wed, 10 Feb 2010) Log Message: ----------- cpan/Calendar-CSA: Update to mGAR v2, doesn't compile with Perl 5.10 Modified Paths: -------------- csw/mgar/pkg/cpan/Calendar-CSA/trunk/Makefile csw/mgar/pkg/cpan/Calendar-CSA/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Calendar-CSA/trunk/files/CSWpmccsa.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Calendar-CSA/trunk/ Property changes on: csw/mgar/pkg/cpan/Calendar-CSA/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Calendar-CSA/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Calendar-CSA/trunk/Makefile 2010-02-10 06:25:58 UTC (rev 8446) +++ csw/mgar/pkg/cpan/Calendar-CSA/trunk/Makefile 2010-02-10 10:28:11 UTC (rev 8447) @@ -8,6 +8,7 @@ Perl extension to interface with CDE Calendar Manager. endef -DISTFILES += CSWpmccsa.gspec +PACKAGES = CSWpmccsa +CATALOGNAME = pm_calendar_csa include gar/category.mk Modified: csw/mgar/pkg/cpan/Calendar-CSA/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Calendar-CSA/trunk/checksums 2010-02-10 06:25:58 UTC (rev 8446) +++ csw/mgar/pkg/cpan/Calendar-CSA/trunk/checksums 2010-02-10 10:28:11 UTC (rev 8447) @@ -1,2 +1,2 @@ -a91e7a97a0c92fbaf08a5d0c97bd3016 download/CSWpmccsa.gspec -2e6d10347646aa243775e7bd25c1d687 download/Calendar-CSA-0.8.tar.gz +a91e7a97a0c92fbaf08a5d0c97bd3016 CSWpmccsa.gspec +2e6d10347646aa243775e7bd25c1d687 Calendar-CSA-0.8.tar.gz Deleted: csw/mgar/pkg/cpan/Calendar-CSA/trunk/files/CSWpmccsa.gspec =================================================================== --- csw/mgar/pkg/cpan/Calendar-CSA/trunk/files/CSWpmccsa.gspec 2010-02-10 06:25:58 UTC (rev 8446) +++ csw/mgar/pkg/cpan/Calendar-CSA/trunk/files/CSWpmccsa.gspec 2010-02-10 10:28:11 UTC (rev 8447) @@ -1,7 +0,0 @@ -%var bitname pm_calendar_csa -%var pkgname CSWpmccsa -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1997 Kenneth Albanowski. All rights reserved. -This program is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Feb 10 11:36:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Feb 2010 10:36:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8448] csw/mgar/pkg Message-ID: Revision: 8448 http://gar.svn.sourceforge.net/gar/?rev=8448&view=rev Author: dmichelsen Date: 2010-02-10 10:36:15 +0000 (Wed, 10 Feb 2010) Log Message: ----------- c-ares: Initial commit Added Paths: ----------- csw/mgar/pkg/c-ares/ csw/mgar/pkg/c-ares/branches/ csw/mgar/pkg/c-ares/tags/ csw/mgar/pkg/c-ares/trunk/ csw/mgar/pkg/c-ares/trunk/Makefile csw/mgar/pkg/c-ares/trunk/checksums csw/mgar/pkg/c-ares/trunk/files/ Property changes on: csw/mgar/pkg/c-ares/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/c-ares/trunk/Makefile =================================================================== --- csw/mgar/pkg/c-ares/trunk/Makefile (rev 0) +++ csw/mgar/pkg/c-ares/trunk/Makefile 2010-02-10 10:36:15 UTC (rev 8448) @@ -0,0 +1,25 @@ +GARNAME = c-ares +GARVERSION = 1.7.0 +CATEGORIES = lib + +DESCRIPTION = Perform DNS requests and name resolves asynchronously +define BLURB +endef + +MASTER_SITES = http://c-ares.haxx.se/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWlibcares +CATALOGNAME = libcares + +LICENSE = README.cares + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/c-ares/trunk/checksums =================================================================== --- csw/mgar/pkg/c-ares/trunk/checksums (rev 0) +++ csw/mgar/pkg/c-ares/trunk/checksums 2010-02-10 10:36:15 UTC (rev 8448) @@ -0,0 +1 @@ +15ab7852306b554b0b1145f41005a3bb c-ares-1.7.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Feb 10 11:36:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Feb 2010 10:36:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8449] csw/mgar/pkg/curl/trunk Message-ID: Revision: 8449 http://gar.svn.sourceforge.net/gar/?rev=8449&view=rev Author: dmichelsen Date: 2010-02-10 10:36:22 +0000 (Wed, 10 Feb 2010) Log Message: ----------- curl: Update version to 7.20.0 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/curl/trunk/checksums Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2010-02-10 10:36:15 UTC (rev 8448) +++ csw/mgar/pkg/curl/trunk/Makefile 2010-02-10 10:36:22 UTC (rev 8449) @@ -1,5 +1,5 @@ GARNAME = curl -GARVERSION = 7.19.7 +GARVERSION = 7.20.0 CATEGORIES = net DESCRIPTION = Command line tool and library for client-side URL transfers. @@ -44,10 +44,9 @@ # We are doing 64 bit only for the libs NOISAEXEC = 1 -RUNTIME_DEP_PKGS_CSWcurl = CSWiconv CSWlibidn CSWlibnet CSWoldaprt CSWosslrt -RUNTIME_DEP_PKGS_CSWcurl += CSWsasl CSWzlib CSWcurlrt -RUNTIME_DEP_PKGS_CSWcurlrt = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl -RUNTIME_DEP_PKGS_CSWcurldevel = CSWcurlrt +RUNTIME_DEP_PKGS_CSWcurl = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl CSWcurlrt +RUNTIME_DEP_PKGS_CSWcurlrt = CSWlibidn CSWoldaprt CSWosslrt CSWzlib +RUNTIME_DEP_PKGS_CSWcurldevel = CSWcurl SKIPTEST = 1 Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2010-02-10 10:36:15 UTC (rev 8448) +++ csw/mgar/pkg/curl/trunk/checksums 2010-02-10 10:36:22 UTC (rev 8449) @@ -1,4 +1,4 @@ -79a8fbb2eed5464b97bdf94bee109380 curl-7.19.7.tar.bz2 +3dda78c4a808d9a779dc3a2ae81b47d8 curl-7.20.0.tar.bz2 f6e1a6d234d7f6811bb1c598ba9b7c8f curlbuild.h a09fcad6dfcd9636061dfab7598357be libcurl.so.2.0.2.i b46b41659b805013740eeb76e759af4b libcurl.so.2.0.2.s This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Feb 10 12:02:16 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 10 Feb 2010 11:02:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8450] csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile Message-ID: Revision: 8450 http://gar.svn.sourceforge.net/gar/?rev=8450&view=rev Author: bensons Date: 2010-02-10 11:02:16 +0000 (Wed, 10 Feb 2010) Log Message: ----------- cpan mod_prel2: removed dependency Modified Paths: -------------- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile Modified: csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-02-10 10:36:22 UTC (rev 8449) +++ csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-02-10 11:02:16 UTC (rev 8450) @@ -28,7 +28,7 @@ CATALOGNAME = ap2_modperl RUNTIME_DEP_PKGS = CSWapache2 CSWapache2rt CSWpmapachetst CSWexpat CSWiconv -RUNTIME_DEP_PKGS += CSWbdb CSWoldaprt CSWapr +RUNTIME_DEP_PKGS += CSWbdb CSWoldaprt #BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CONFIGURE_ARGS = MP_APXS=$(prefix)/apache2/sbin/apxs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Feb 10 13:29:11 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 10 Feb 2010 12:29:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8451] csw/mgar/pkg/cpan/libapreq2/trunk Message-ID: Revision: 8451 http://gar.svn.sourceforge.net/gar/?rev=8451&view=rev Author: bensons Date: 2010-02-10 12:29:11 +0000 (Wed, 10 Feb 2010) Log Message: ----------- cpan libapreq2: adjusted to current GAR version, bumped version, take over maintainership. Still needs fixing because of STRIP_LIBTOOL breaks some Makefiles Modified Paths: -------------- csw/mgar/pkg/cpan/libapreq2/trunk/Makefile csw/mgar/pkg/cpan/libapreq2/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWap2modapreq2.depend csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWap2modapreq2.gspec csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWap2modapreq2.postinstall csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWap2modapreq2.preremove csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWap2modapreq2.prototype csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWlibapreq2-devel.depend csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWlibapreq2-devel.gspec csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWlibapreq2-devel.prototype csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWlibapreq2.depend csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWlibapreq2.gspec csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWlibapreq2.prototype csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWpmapreq2.depend csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWpmapreq2.gspec csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWpmapreq2.prototype Modified: csw/mgar/pkg/cpan/libapreq2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/libapreq2/trunk/Makefile 2010-02-10 11:02:16 UTC (rev 8450) +++ csw/mgar/pkg/cpan/libapreq2/trunk/Makefile 2010-02-10 12:29:11 UTC (rev 8451) @@ -1,5 +1,5 @@ GARNAME = libapreq2 -GARVERSION = 2.08 +GARVERSION = 2.12 CATEGORIES = cpan AUTHOR = JOESUF @@ -11,19 +11,42 @@ manpage for more details. endef -DISTFILES = $(call admfiles,CSWlibapreq2,depend prototype) -DISTFILES += $(call admfiles,CSWlibapreq2-devel,depend prototype) -CSWap2modapreq2_admfiles = depend prototype postinstall preremove -DISTFILES += $(call admfiles,CSWap2modapreq2,$(CSWap2modapreq2_admfiles)) -DISTFILES += $(call admfiles,CSWpmapreq2,depend prototype) +PACKAGES = CSWlibapreq2 CSWlibapreq2-devel CSWap2modapreq2 CSWpmapreq2 +# individual packages below +CATALOGNAME_CSWlibapreq2 = libapreq2 +SPKG_DESC_CSWlibapreq2 = Apache Request Library +PKGFILES_CSWlibapreq2 = /opt/csw/apache2/lib/libapreq2.so.* +RUNTIME_DEP_PKGS_CSWlibapreq2 += CSWiconv +RUNTIME_DEP_PKGS_CSWlibapreq2 += CSWapache2rt +RUNTIME_DEP_PKGS_CSWlibapreq2 += CSWbdb47 +CATALOGNAME_CSWlibapreq2-devel = libapreq2_devel +SPKG_DESC_CSWlibapreq2-devel = Apache Request Library development support +PKGFILES_CSWlibapreq2-devel += /opt/csw/apache2/bin/apreq2-config +PKGFILES_CSWlibapreq2-devel += /opt/csw/apache2/include/apreq2/.* +PKGFILES_CSWlibapreq2-devel += /opt/csw/apache2/lib/libapreq2.a +ARCHALL_CSWlibapreq2-devel = 1 +RUNTIME_DEP_PKGS_CSWlibapreq2-devel += CSWlibapreq2 + +CATALOGNAME_CSWap2modapreq2 = ap2_modapreq2 +SPKG_DESC_CSWap2modapreq2 = libapreq2 filter module for Apache 2 +PKGFILES_CSWap2modapreq2 = /opt/csw/apache2/libexec/mod_apreq2.so +RUNTIME_DEP_PKGS_CSWap2modapreq2 += CSWiconv +RUNTIME_DEP_PKGS_CSWap2modapreq2 += CSWapache2rt +RUNTIME_DEP_PKGS_CSWap2modapreq2 += CSWlibapreq2 + +CATALOGNAME_CSWpmapreq2 = pm_apreq2 +SPKG_DESC_CSWpmapreq2 = libapreq2 Perl language bindings +PKGFILES_CSWpmapreq2 += /opt/csw/lib/perl/.* +PKGFILES_CSWpmapreq2 += /opt/csw/share/man/.* +RUNTIME_DEP_PKGS_CSWpmapreq2 += CSWap2modperl +RUNTIME_DEP_PKGS_CSWpmapreq2 += CSWpmapachetst +RUNTIME_DEP_PKGS_CSWpmapreq2 += CSWpmextutxsbld + # Ensure args are requestrecs PATCHFILES += requestrec.diff -MODDIST = $(GARNAME)-$(GARVERSION).tar.gz -DEPENDS += cpan/Apache-Test -DEPENDS += cpan/ExtUtils-XSBuilder -DEPENDS += cpan/mod_perl2 +# BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWbdb47-devel AP2_ROOT = $(prefix)/apache2 @@ -40,10 +63,11 @@ FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/apache2/lib STRIP_DIRS += $(DESTDIR)$(prefix)/apache2/libexec -EXTRA_INC = $(prefix)/bdb43/include -EXTRA_LIB = $(prefix)/bdb43/lib $(prefix)/apache2/lib +EXTRA_INC = $(prefix)/bdb47/include +EXTRA_LIB = $(prefix)/bdb47/lib $(prefix)/apache2/lib SKIPTEST = 1 +STRIP_LIBTOOL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/libapreq2/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/libapreq2/trunk/checksums 2010-02-10 11:02:16 UTC (rev 8450) +++ csw/mgar/pkg/cpan/libapreq2/trunk/checksums 2010-02-10 12:29:11 UTC (rev 8451) @@ -1,16 +1,2 @@ -765d8e8009a6cc8658de2390179f8637 download/CSWlibapreq2.gspec -12ef382f0aa9a804df62d4991df938da download/CSWlibapreq2.depend -df6a07c72415bdd81ca80d7cab278735 download/CSWlibapreq2.prototype -036dfe470694cfd6a7e451056f3a3c15 download/CSWlibapreq2-devel.gspec -40fc500077b55a2637d822e44823f09f download/CSWlibapreq2-devel.depend -2cc95f6d091c0fec240c6df0150a47ac download/CSWlibapreq2-devel.prototype -03b645121b96110cac1c121e4e5e5026 download/CSWap2modapreq2.gspec -a63d8b9c7b235f421a84e0204f9a3f41 download/CSWap2modapreq2.depend -47ccc18b83d43c498bf9e50db79245d8 download/CSWap2modapreq2.prototype -1b232fb2b8b585eca307327b826455cb download/CSWap2modapreq2.postinstall -23cf6d9b0cd407b84bc038e4f7330fc8 download/CSWap2modapreq2.preremove -83935adaa08c8738b1020b9c5049c5c9 download/CSWpmapreq2.gspec -57db2339454179f36a5195eb0237ac2f download/CSWpmapreq2.depend -b242f7f8d0a47a8569ee9685305451aa download/CSWpmapreq2.prototype -9fb3deec448f74c455d4ffc13846ea9f download/libapreq2-2.08.tar.gz -500218b67e41bd8ed189b3cb5f031e98 download/requestrec.diff +76e2acde0d82246dea6f2565f3746eec libapreq2-2.12.tar.gz +500218b67e41bd8ed189b3cb5f031e98 requestrec.diff Deleted: csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWap2modapreq2.depend =================================================================== --- csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWap2modapreq2.depend 2010-02-10 11:02:16 UTC (rev 8450) +++ csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWap2modapreq2.depend 2010-02-10 12:29:11 UTC (rev 8451) @@ -1,8 +0,0 @@ -P CSWapache2 apache2 - Apache 2.2 web server -P CSWapache2rt apache2rt - Apache 2.2 runtime libraries -P CSWbdb44 berkeleydb44 - embedded database libraries and utilities -P CSWexpat expat - XML Parser Toolkit -P CSWiconv libiconv - GNU iconv library -P CSWlibapreq2 libapreq2 - Apache Request Library -P CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt) -P CSWsqlite3 sqlite3 - An embeddable SQL engine in a C library Deleted: csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWap2modapreq2.gspec =================================================================== --- csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWap2modapreq2.gspec 2010-02-10 11:02:16 UTC (rev 8450) +++ csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWap2modapreq2.gspec 2010-02-10 12:29:11 UTC (rev 8451) @@ -1,5 +0,0 @@ -%var bitname ap2_modapreq2 -%var pkgname CSWap2modapreq2 -%include url file://%{PKGLIB}/csw_cpan.gspec -%var desc libapreq2 filter module for Apache 2 -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWap2modapreq2.postinstall =================================================================== --- csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWap2modapreq2.postinstall 2010-02-10 11:02:16 UTC (rev 8450) +++ csw/mgar/pkg/cpan/libapreq2/trunk/files/CSWap2modapreq2.postinstall 2010-02-10 12:29:11 UTC (rev 8451) @@ -1,24 +0,0 @@ -#!/bin/sh - -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -AP2_PREFIX=$CSW_PREFIX/apache2 -AP2_BINDIR=$AP2_PREFIX/sbin -AP2_LIBEXEC=$AP2_PREFIX/libexec -AP2_CONFDIR=$AP2_PREFIX/etc -AP2_EXTRADIR=$AP2_CONFDIR/extra -AP2_CONFIG=$AP2_CONFDIR/httpd.conf - -# Enable the apreq module -PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} -chroot $PKG_INSTALL_ROOT \ - $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n apreq mod_apreq2.so - -# Finito -cat < Revision: 8452 http://gar.svn.sourceforge.net/gar/?rev=8452&view=rev Author: bensons Date: 2010-02-10 12:37:22 +0000 (Wed, 10 Feb 2010) Log Message: ----------- cpan libapreq2: remove ARCHALL for devel package Modified Paths: -------------- csw/mgar/pkg/cpan/libapreq2/trunk/Makefile Modified: csw/mgar/pkg/cpan/libapreq2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/libapreq2/trunk/Makefile 2010-02-10 12:29:11 UTC (rev 8451) +++ csw/mgar/pkg/cpan/libapreq2/trunk/Makefile 2010-02-10 12:37:22 UTC (rev 8452) @@ -15,7 +15,7 @@ # individual packages below CATALOGNAME_CSWlibapreq2 = libapreq2 SPKG_DESC_CSWlibapreq2 = Apache Request Library -PKGFILES_CSWlibapreq2 = /opt/csw/apache2/lib/libapreq2.so.* +PKGFILES_CSWlibapreq2 = /opt/csw/apache2/lib/libapreq2.so.* RUNTIME_DEP_PKGS_CSWlibapreq2 += CSWiconv RUNTIME_DEP_PKGS_CSWlibapreq2 += CSWapache2rt RUNTIME_DEP_PKGS_CSWlibapreq2 += CSWbdb47 @@ -25,7 +25,6 @@ PKGFILES_CSWlibapreq2-devel += /opt/csw/apache2/bin/apreq2-config PKGFILES_CSWlibapreq2-devel += /opt/csw/apache2/include/apreq2/.* PKGFILES_CSWlibapreq2-devel += /opt/csw/apache2/lib/libapreq2.a -ARCHALL_CSWlibapreq2-devel = 1 RUNTIME_DEP_PKGS_CSWlibapreq2-devel += CSWlibapreq2 CATALOGNAME_CSWap2modapreq2 = ap2_modapreq2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Feb 10 13:40:07 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Feb 2010 12:40:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[8453] csw/mgar/gar/v2-checkpkg-stats/ Message-ID: Revision: 8453 http://gar.svn.sourceforge.net/gar/?rev=8453&view=rev Author: wahwah Date: 2010-02-10 12:40:07 +0000 (Wed, 10 Feb 2010) Log Message: ----------- Creating a branch to implement separate stats collection. Added Paths: ----------- csw/mgar/gar/v2-checkpkg-stats/ Property changes on: csw/mgar/gar/v2-checkpkg-stats ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Feb 10 13:43:08 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Feb 2010 12:43:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8454] csw/mgar/pkg/c-ares/trunk/Makefile Message-ID: Revision: 8454 http://gar.svn.sourceforge.net/gar/?rev=8454&view=rev Author: dmichelsen Date: 2010-02-10 12:43:08 +0000 (Wed, 10 Feb 2010) Log Message: ----------- libcares: Split off devel packages Modified Paths: -------------- csw/mgar/pkg/c-ares/trunk/Makefile Modified: csw/mgar/pkg/c-ares/trunk/Makefile =================================================================== --- csw/mgar/pkg/c-ares/trunk/Makefile 2010-02-10 12:40:07 UTC (rev 8453) +++ csw/mgar/pkg/c-ares/trunk/Makefile 2010-02-10 12:43:08 UTC (rev 8454) @@ -2,7 +2,7 @@ GARVERSION = 1.7.0 CATEGORIES = lib -DESCRIPTION = Perform DNS requests and name resolves asynchronously +DESCRIPTION = c-ares library to perform DNS requests and name resolves asynchronously define BLURB endef @@ -12,9 +12,14 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWlibcares -CATALOGNAME = libcares +PACKAGES = CSWlibcares CSWlibcaresdevel +CATALOGNAME_CSWlibcares = libcares +CATALOGNAME_CSWlibcaresdevel = libcares_devel + +SPKG_DESC_CSWlibcares = $(DESCRIPTION) +SPKG_DESC_CSWlibcaresdevel = c-ares library developer files + LICENSE = README.cares BUILD64 = 1 @@ -22,4 +27,6 @@ TEST_TARGET = check +PKGFILES_CSWlibcaresdevel = $(PKGFILES_DEVEL) + 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 Feb 10 13:55:21 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Feb 2010 12:55:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8455] csw/mgar/pkg/c-ares/trunk/Makefile Message-ID: Revision: 8455 http://gar.svn.sourceforge.net/gar/?rev=8455&view=rev Author: dmichelsen Date: 2010-02-10 12:55:21 +0000 (Wed, 10 Feb 2010) Log Message: ----------- c-ares: Add runtime deps Modified Paths: -------------- csw/mgar/pkg/c-ares/trunk/Makefile Modified: csw/mgar/pkg/c-ares/trunk/Makefile =================================================================== --- csw/mgar/pkg/c-ares/trunk/Makefile 2010-02-10 12:43:08 UTC (rev 8454) +++ csw/mgar/pkg/c-ares/trunk/Makefile 2010-02-10 12:55:21 UTC (rev 8455) @@ -20,6 +20,8 @@ SPKG_DESC_CSWlibcares = $(DESCRIPTION) SPKG_DESC_CSWlibcaresdevel = c-ares library developer files +RUNTIME_DEP_PKGS_CSWlibcaresdevel = CSWlibcares + LICENSE = README.cares BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Feb 10 14:14:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Feb 2010 13:14:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8456] csw/mgar/pkg/cpan/Parse-RecDescent/trunk Message-ID: Revision: 8456 http://gar.svn.sourceforge.net/gar/?rev=8456&view=rev Author: dmichelsen Date: 2010-02-10 13:14:47 +0000 (Wed, 10 Feb 2010) Log Message: ----------- cpan/Parse-RecDescent: Update to 1.963 Modified Paths: -------------- csw/mgar/pkg/cpan/Parse-RecDescent/trunk/Makefile csw/mgar/pkg/cpan/Parse-RecDescent/trunk/checksums Modified: csw/mgar/pkg/cpan/Parse-RecDescent/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Parse-RecDescent/trunk/Makefile 2010-02-10 12:55:21 UTC (rev 8455) +++ csw/mgar/pkg/cpan/Parse-RecDescent/trunk/Makefile 2010-02-10 13:14:47 UTC (rev 8456) @@ -1,20 +1,20 @@ GARNAME = Parse-RecDescent -GARVERSION = 1.96.0 +GARVERSION = 1.963 CATEGORIES = cpan AUTHOR = DCONWAY -DESCRIPTION = generate recursive-descent parsers +DESCRIPTION = Generate recursive-descent parsers define BLURB Parse::RecDescent incrementally generates top-down recursive-descent text parsers from simple yacc-like grammar specifications. endef +PACKAGES = CSWpmparserecdescent CATALOGNAME = pm_parserecdescent -PACKAGES = CSWpmparserecdescent -ARCHALL_CSWpmparserecdescent = 1 +ARCHALL = 1 -RUNTIME_DEP_PKGS_CSWpmparserecdescent = CSWpmversion +RUNTIME_DEP_PKGS = CSWpmversion LICENSE = README Modified: csw/mgar/pkg/cpan/Parse-RecDescent/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Parse-RecDescent/trunk/checksums 2010-02-10 12:55:21 UTC (rev 8455) +++ csw/mgar/pkg/cpan/Parse-RecDescent/trunk/checksums 2010-02-10 13:14:47 UTC (rev 8456) @@ -1 +1 @@ -373dc01e102d81d01a4fb1431c5ff3fb download/Parse-RecDescent-1.96.0.tar.gz +b9ff7942e8f576697e08662932acdec0 Parse-RecDescent-1.963.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Feb 10 14:22:17 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Feb 2010 13:22:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8457] csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py Message-ID: Revision: 8457 http://gar.svn.sourceforge.net/gar/?rev=8457&view=rev Author: wahwah Date: 2010-02-10 13:22:17 +0000 (Wed, 10 Feb 2010) Log Message: ----------- mGAR v2: checkpkg-archall.py, recognize arch-specific paths as reasons to make packages arch-specific Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py 2010-02-10 13:14:47 UTC (rev 8456) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py 2010-02-10 13:22:17 UTC (rev 8457) @@ -5,6 +5,7 @@ """Verifies the architecture of the package.""" import os.path +import re import sys CHECKPKG_MODULE_NAME = "architecture check" @@ -16,16 +17,32 @@ sys.path.append(os.path.join(*path_list)) import checkpkg +ARCH_RE = re.compile(r"(sparcv(8|9)|i386|amd64)") + def CheckArchitectureVsContents(pkg, debug): """Verifies the relationship between package contents and architecture.""" errors = [] binaries = pkg.ListBinaries() pkginfo = pkg.GetParsedPkginfo() + pkgmap = pkg.GetPkgmap() arch = pkginfo["ARCH"] - if binaries and arch == "all": - for binary in binaries: - errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "archall-with-binaries"), binary) - elif not binaries and arch != "all": + reasons_to_be_arch_specific = [] + for pkgmap_path in pkgmap.entries_by_path: + # print "pkgmap_path", repr(pkgmap_path), type(pkgmap_path) + if re.search(ARCH_RE, str(pkgmap_path)): + reasons_to_be_arch_specific.append(( + "archall-with-arch-paths", + pkgmap_path, + "path %s looks arch-specific" % pkgmap_path)) + for binary in binaries: + reasons_to_be_arch_specific.append(( + "archall-with-binaries", + binary, + "package contains binary %s" % binary)) + if arch == "all": + for tag, param, desc in reasons_to_be_arch_specific: + errors.append(checkpkg.CheckpkgTag(pkg.pkgname, tag, param)) + elif not reasons_to_be_arch_specific: # This is not a clean way of handling messages for the user, but there's # not better way at the moment. print "Package %s does not contain any binaries." % pkg.pkgname 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 Feb 10 14:36:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Feb 2010 13:36:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[8458] csw/mgar/gar/v2 Message-ID: Revision: 8458 http://gar.svn.sourceforge.net/gar/?rev=8458&view=rev Author: dmichelsen Date: 2010-02-10 13:36:12 +0000 (Wed, 10 Feb 2010) Log Message: ----------- mGAR v2: Add checkpkg overrides Modified Paths: -------------- csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-02-10 13:22:17 UTC (rev 8457) +++ csw/mgar/gar/v2/gar.mk 2010-02-10 13:36:12 UTC (rev 8458) @@ -712,7 +712,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license merge-classutils $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge +merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge @$(DONADA) merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential) @@ -788,7 +788,7 @@ .PHONY: remerge reset-merge reset-merge-modulated remerge: reset-merge merge -reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-src +reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-src @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge @rm -rf $(PKGROOT) @$(DONADA) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-10 13:22:17 UTC (rev 8457) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-10 13:36:12 UTC (rev 8458) @@ -657,6 +657,19 @@ reset-merge-etcservices: @rm -f $(COOKIEDIR)/merge-etcservices $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-etcservices-$(SPEC)) +merge-checkpkgoverrides-%: + @echo "[ Generating checkpkg override for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/checkpkg/overrides + $(_DBG)$(foreach O,$(or $(CHECKPKG_OVERRIDES_$*),$(CHECKPKG_OVERRIDES)),echo "$O" | \ + perl -F'\|' -ane 'unshift @F,"$*" if(@F<2); print "$$F[0]: $$F[1]";print " $$F[2]" if( $$F[2] );' \ + > $(PKGROOT)/opt/csw/share/checkpkg/overrides/$(call catalogname,$*)) + @$(MAKECOOKIE) + +merge-checkpkgoverrides: $(foreach S,$(SPKG_SPECS),$(if $(or $(CHECKPKG_OVERRIDES_$S),$(CHECKPKG_OVERRIDES)),merge-checkpkgoverrides-$S)) + +reset-merge-checkpkgoverrides: + @rm -f $(COOKIEDIR)/merge-checkpkgoverrides $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-checkpkgoverrides-$(SPEC)) + merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE)) merge-src: fetch $(_DBG)mkdir -p $(_SRCDIR)/files 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 Feb 10 15:50:42 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Feb 2010 14:50:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[8459] csw/mgar/pkg/gkrellm/trunk Message-ID: Revision: 8459 http://gar.svn.sourceforge.net/gar/?rev=8459&view=rev Author: dmichelsen Date: 2010-02-10 14:50:42 +0000 (Wed, 10 Feb 2010) Log Message: ----------- gkrellm: Update to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/gkrellm/trunk/Makefile csw/mgar/pkg/gkrellm/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gkrellm/trunk/files/0001-Add-LOG_MAKEPRI.patch csw/mgar/pkg/gkrellm/trunk/files/0002-Do-not-tingle-with-file-owner.patch Modified: csw/mgar/pkg/gkrellm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gkrellm/trunk/Makefile 2010-02-10 13:36:12 UTC (rev 8458) +++ csw/mgar/pkg/gkrellm/trunk/Makefile 2010-02-10 14:50:42 UTC (rev 8459) @@ -17,10 +17,18 @@ MASTER_SITES = http://members.dslextreme.com/users/billw/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += Makefile server.Makefile src.Makefile +PATCHFILES = 0001-Add-LOG_MAKEPRI.patch +PATCHFILES += 0002-Do-not-tingle-with-file-owner.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +DEP_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 CSWlibatk CSWlibcairo CSWpango + +# Make sure to remove this after the X11 issues have all been settled +EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so + # Disable configure scripts step CONFIGURE_SCRIPTS = @@ -41,9 +49,28 @@ # No test suite TEST_SCRIPTS = +INSTALL_OVERRIDE_VARS = INSTALL +INSTALL_OVERRIDE_VAR_INSTALL = /usr/ucb/install + +# Fix owner and permissions from src/Makefile: +# chgrp sys $(INSTALLDIR)/$(PACKAGE) +# chmod g+s $(INSTALLDIR)/$(PACKAGE) +# chgrp sys $(SINSTALLDIR)/$(PACKAGE_D) +# chmod g+s $(SINSTALLDIR)/$(PACKAGE_D) + +PROTOTYPE_MODIFIERS = sgid +PROTOTYPE_FILES_sgid = $(bindir)/gkrellmd? +PROTOTYPE_PERMS_sgid = 2755 +PROTOTYPE_GROUP_sgid = sys + +# This is for the missing X11 symbol XSolarisIASetProcessInfo. +# It does no harm, though. +CHECKPKG_OVERRIDES = CSWgkrellm|symbol-not-found|gkrellm + include gar/category.mk -pre-configure-modulated: - @cp $(FILEDIR)/Makefile $(WORKROOTDIR)/build-$(MODULATIONS)/$(GARNAME)-$(GARVERSION)/Makefile - @cp $(FILEDIR)/src.Makefile $(WORKROOTDIR)/build-$(MODULATIONS)/$(GARNAME)-$(GARVERSION)/src/Makefile - @cp $(FILEDIR)/server.Makefile $(WORKROOTDIR)/build-$(MODULATIONS)/$(GARNAME)-$(GARVERSION)/server/Makefile +post-extract-modulated: + -cp $(WORKDIR)/Makefile $(WORKSRC)/Makefile + -cp $(WORKDIR)/src.Makefile $(WORKSRC)/src/Makefile + -cp $(WORKDIR)/server.Makefile $(WORKSRC)/server/Makefile + @$(MAKECOOKIE) Modified: csw/mgar/pkg/gkrellm/trunk/checksums =================================================================== --- csw/mgar/pkg/gkrellm/trunk/checksums 2010-02-10 13:36:12 UTC (rev 8458) +++ csw/mgar/pkg/gkrellm/trunk/checksums 2010-02-10 14:50:42 UTC (rev 8459) @@ -1 +1,6 @@ +87043d318f1fecd878671a63b8446b24 0001-Add-LOG_MAKEPRI.patch +8a1b298516f7d1e18e34080902353aae 0002-Do-not-tingle-with-file-owner.patch +955c4ffeb0a0223e3120ac5b66134617 Makefile 270917784da6bf1292aba0c82af726d6 gkrellm-2.3.4.tar.bz2 +ff576ffe06797d2e7f7997cc934e210d server.Makefile +cce3ee260271f8886a76cbb6ae70d0af src.Makefile Added: csw/mgar/pkg/gkrellm/trunk/files/0001-Add-LOG_MAKEPRI.patch =================================================================== --- csw/mgar/pkg/gkrellm/trunk/files/0001-Add-LOG_MAKEPRI.patch (rev 0) +++ csw/mgar/pkg/gkrellm/trunk/files/0001-Add-LOG_MAKEPRI.patch 2010-02-10 14:50:42 UTC (rev 8459) @@ -0,0 +1,24 @@ +From 9f429e5beefac906601c3dbbc12daa9b317d9284 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 10 Feb 2010 14:58:04 +0100 +Subject: [PATCH] Add LOG_MAKEPRI + +--- + server/main.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/server/main.c b/server/main.c +index ce0e370..9b2fe7a 100644 +--- a/server/main.c ++++ b/server/main.c +@@ -37,6 +37,7 @@ + + #if !defined(WIN32) + #include ++#define LOG_MAKEPRI(facility,priority) ((facility)|(priority)) + #endif // !WIN32 + + // win32 defines addrinfo but only supports getaddrinfo call on winxp or newer +-- +1.6.6 + Added: csw/mgar/pkg/gkrellm/trunk/files/0002-Do-not-tingle-with-file-owner.patch =================================================================== --- csw/mgar/pkg/gkrellm/trunk/files/0002-Do-not-tingle-with-file-owner.patch (rev 0) +++ csw/mgar/pkg/gkrellm/trunk/files/0002-Do-not-tingle-with-file-owner.patch 2010-02-10 14:50:42 UTC (rev 8459) @@ -0,0 +1,43 @@ +From d52165d5155ddaffb8110d5ff7d5d4350eee0737 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 10 Feb 2010 15:18:26 +0100 +Subject: [PATCH] Do not tingle with file owner + +--- + server/Makefile | 4 ++-- + src/Makefile | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/server/Makefile b/server/Makefile +index 98775c1..6bd51a4 100644 +--- a/server/Makefile ++++ b/server/Makefile +@@ -214,8 +214,8 @@ install_openbsd: + + install_solaris: + $(MAKE) install INSTALL=/usr/ucb/install +- chgrp sys $(SINSTALLDIR)/$(PACKAGE_D) +- chmod g+s $(SINSTALLDIR)/$(PACKAGE_D) ++ #chgrp sys $(SINSTALLDIR)/$(PACKAGE_D) ++ #chmod g+s $(SINSTALLDIR)/$(PACKAGE_D) + + install_windows: install_inc install_cfg + $(MAKE) BINEXT=".exe" install_bin +diff --git a/src/Makefile b/src/Makefile +index 9fe7ed5..9ccd5f7 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -249,8 +249,8 @@ install_openbsd: + + install_solaris: + $(MAKE) install INSTALL=/usr/ucb/install +- chgrp sys $(INSTALLDIR)/$(PACKAGE) +- chmod g+s $(INSTALLDIR)/$(PACKAGE) ++ #chgrp sys $(INSTALLDIR)/$(PACKAGE) ++ #chmod g+s $(INSTALLDIR)/$(PACKAGE) + + install_windows: + $(MAKE) BINEXT=".exe" install_bin install_inc +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Feb 10 15:52:13 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Feb 2010 14:52:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8460] csw/mgar/gar/v2 Message-ID: Revision: 8460 http://gar.svn.sourceforge.net/gar/?rev=8460&view=rev Author: dmichelsen Date: 2010-02-10 14:52:13 +0000 (Wed, 10 Feb 2010) Log Message: ----------- mGAR v2: Now DEP_PKGS and DEP_PKGS_* is allowed to specific RUNTIME_ and BUILD_ in one go Modified Paths: -------------- csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-02-10 14:50:42 UTC (rev 8459) +++ csw/mgar/gar/v2/gar.mk 2010-02-10 14:52:13 UTC (rev 8460) @@ -295,7 +295,7 @@ @echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]" # prerequisite - Make sure that the system is in a sane state for building the package -PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) +PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS) $(DEP_PKGS) $(foreach S,$(_PKG_SPECS),$(DEP_PKGS_$S))) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) # Force to be called in global modulation prerequisite: $(if $(filter global,$(MODULATION)),announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-10 14:50:42 UTC (rev 8459) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-10 14:52:13 UTC (rev 8460) @@ -432,11 +432,11 @@ $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$F[1] eq "$C");)')),CSWcswclassutils) $(WORKDIR)/%.depend: $(WORKDIR) - $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(RUNTIME_DEP_PKGS_$*)$(RUNTIME_DEP_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ + $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(RUNTIME_DEP_PKGS_$*)$(RUNTIME_DEP_PKGS)$(DEP_PKGS)$(DEP_PKGS_$*)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ ($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\ echo "I $(PKG)";\ )\ - $(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(RUNTIME_DEP_PKGS_$*) $(RUNTIME_DEP_PKGS),\ + $(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(or $(RUNTIME_DEP_PKGS_$*),$(RUNTIME_DEP_PKGS),$(DEP_PKGS_$*),$(DEP_PKGS)),\ $(if $(SPKG_DESC_$(PKG)), \ echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | $(GAWK) '{ $$1 = "P"; print } ')"; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Feb 10 15:53:31 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 10 Feb 2010 14:53:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[8461] csw/mgar/pkg/cpan/libapreq2/trunk/Makefile Message-ID: Revision: 8461 http://gar.svn.sourceforge.net/gar/?rev=8461&view=rev Author: bensons Date: 2010-02-10 14:53:31 +0000 (Wed, 10 Feb 2010) Log Message: ----------- cpan libapreq2: adjust library Makefile Modified Paths: -------------- csw/mgar/pkg/cpan/libapreq2/trunk/Makefile Modified: csw/mgar/pkg/cpan/libapreq2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/libapreq2/trunk/Makefile 2010-02-10 14:52:13 UTC (rev 8460) +++ csw/mgar/pkg/cpan/libapreq2/trunk/Makefile 2010-02-10 14:53:31 UTC (rev 8461) @@ -73,6 +73,8 @@ pre-package: test fix-cfgscript fix-cfgscript: - @perl -i -plne 's/(APREQ_(?:SOURCE|BUILD)_DIR=).*$$/\1""/' \ + perl -i -plne 's/(APREQ_(?:SOURCE|BUILD)_DIR=).*$$/\1""/' \ $(DESTDIR)$(prefix)/apache2/bin/apreq2-config +post-configure-modulated: + gsed -i'' 's/^BUILT_SOURCES.*//' $(WORKSRC)/library/Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Feb 10 16:06:09 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 10 Feb 2010 15:06:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8462] csw/mgar/gar/v2/bin/fixlibtool Message-ID: Revision: 8462 http://gar.svn.sourceforge.net/gar/?rev=8462&view=rev Author: bensons Date: 2010-02-10 15:06:09 +0000 (Wed, 10 Feb 2010) Log Message: ----------- fixlibtool: handle comments, when replacing .la archives. handle multilines while addid -L and -R Modified Paths: -------------- csw/mgar/gar/v2/bin/fixlibtool Modified: csw/mgar/gar/v2/bin/fixlibtool =================================================================== --- csw/mgar/gar/v2/bin/fixlibtool 2010-02-10 14:53:31 UTC (rev 8461) +++ csw/mgar/gar/v2/bin/fixlibtool 2010-02-10 15:06:09 UTC (rev 8462) @@ -21,7 +21,6 @@ # @$(MAKECOOKIE) # #################################################### - umask 0022 PATH=/opt/csw/bin @@ -34,7 +33,8 @@ ## Fix Makefiles for mk in $(gfind ${BASEPATH} -name Makefile -print); do gcp ${mk} ${mk}.orig - LT_FILES=$(for lib in $(ggrep '/opt/csw.*/lib/.*\.la' ${mk}); do \ + LT_FILES=$(for lib in $(gegrep -v '^#|^$' ${mk} | \ + ggrep '/opt/csw.*/lib/.*\.la'); do \ echo $lib |gsed -ne '/\/opt.*\.la/p'; done) for file in ${LT_FILES}; do LIB_NAME=$(ggrep 'dlname=' ${file} | \ @@ -44,7 +44,7 @@ fixpath=$(gecho $file |gsed 's/\//\\\//g') gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >${mk}.new LIB_DIR=$(ggrep 'libdir=' ${file} | gsed -e "s/.*'\(.*\)'/\1/") - gsed "s,\(LDFLAGS =.*\),\1 -R${LIB_DIR} -L${LIB_DIR}," ${mk}.new >${mk} + perl -pe 's,(LDFLAGS =[^\\]*)(\\)?\n,$1 -R'${LIB_DIR}' -L'${LIB_DIR}' $2\n,' ${mk}.new >${mk} gchmod +x ${mk} done done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Feb 10 16:08:35 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 10 Feb 2010 15:08:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[8463] csw/mgar/pkg/cpan/libapreq2/trunk/Makefile Message-ID: Revision: 8463 http://gar.svn.sourceforge.net/gar/?rev=8463&view=rev Author: bensons Date: 2010-02-10 15:08:35 +0000 (Wed, 10 Feb 2010) Log Message: ----------- cpan libapreq2: work around libtool used in apache2 Modified Paths: -------------- csw/mgar/pkg/cpan/libapreq2/trunk/Makefile Modified: csw/mgar/pkg/cpan/libapreq2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/libapreq2/trunk/Makefile 2010-02-10 15:06:09 UTC (rev 8462) +++ csw/mgar/pkg/cpan/libapreq2/trunk/Makefile 2010-02-10 15:08:35 UTC (rev 8463) @@ -46,7 +46,6 @@ PATCHFILES += requestrec.diff # BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWbdb47-devel - AP2_ROOT = $(prefix)/apache2 CONFIGURE_ARGS = --enable-perl-glue @@ -66,6 +65,7 @@ EXTRA_LIB = $(prefix)/bdb47/lib $(prefix)/apache2/lib SKIPTEST = 1 +# apache2 is not yet libtool free STRIP_LIBTOOL = 1 include gar/category.mk @@ -76,5 +76,8 @@ perl -i -plne 's/(APREQ_(?:SOURCE|BUILD)_DIR=).*$$/\1""/' \ $(DESTDIR)$(prefix)/apache2/bin/apreq2-config +# since apache2 is not yet free of libtool, we need to remove +# the BUILT_SOURCES targets, which in fact are libapr-1.la and +# libaprutil-1.la. Once apache is libtool free we can remove this. post-configure-modulated: gsed -i'' 's/^BUILT_SOURCES.*//' $(WORKSRC)/library/Makefile 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 Feb 10 16:23:29 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Feb 2010 15:23:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8464] csw/mgar/pkg Message-ID: Revision: 8464 http://gar.svn.sourceforge.net/gar/?rev=8464&view=rev Author: dmichelsen Date: 2010-02-10 15:23:29 +0000 (Wed, 10 Feb 2010) Log Message: ----------- freeglut: Initial commit, doesn't build yet Added Paths: ----------- csw/mgar/pkg/freeglut/ csw/mgar/pkg/freeglut/branches/ csw/mgar/pkg/freeglut/tags/ csw/mgar/pkg/freeglut/trunk/ csw/mgar/pkg/freeglut/trunk/Makefile csw/mgar/pkg/freeglut/trunk/checksums csw/mgar/pkg/freeglut/trunk/files/ Property changes on: csw/mgar/pkg/freeglut/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/freeglut/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeglut/trunk/Makefile (rev 0) +++ csw/mgar/pkg/freeglut/trunk/Makefile 2010-02-10 15:23:29 UTC (rev 8464) @@ -0,0 +1,22 @@ +GARNAME = freeglut +GARVERSION = 2.6.0 +CATEGORIES = lib + +DESCRIPTION = OpenSourced alternative to the OpenGL Utility Toolkit +define BLURB +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://freeglut.sourceforge.net/ + +DEP_PKGS = CSWmesa + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/freeglut/trunk/checksums =================================================================== --- csw/mgar/pkg/freeglut/trunk/checksums (rev 0) +++ csw/mgar/pkg/freeglut/trunk/checksums 2010-02-10 15:23:29 UTC (rev 8464) @@ -0,0 +1 @@ +39f0f2de89f399529d2b981188082218 freeglut-2.6.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Feb 10 16:23:59 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Feb 2010 15:23:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8465] csw/mgar/pkg/cpan Message-ID: Revision: 8465 http://gar.svn.sourceforge.net/gar/?rev=8465&view=rev Author: dmichelsen Date: 2010-02-10 15:23:59 +0000 (Wed, 10 Feb 2010) Log Message: ----------- cpan/OpenGL: Initial commit, needs freeglut Added Paths: ----------- csw/mgar/pkg/cpan/OpenGL/ csw/mgar/pkg/cpan/OpenGL/branches/ csw/mgar/pkg/cpan/OpenGL/tags/ csw/mgar/pkg/cpan/OpenGL/trunk/ csw/mgar/pkg/cpan/OpenGL/trunk/Makefile csw/mgar/pkg/cpan/OpenGL/trunk/checksums csw/mgar/pkg/cpan/OpenGL/trunk/files/ Property changes on: csw/mgar/pkg/cpan/OpenGL/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/OpenGL/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/OpenGL/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/OpenGL/trunk/Makefile 2010-02-10 15:23:59 UTC (rev 8465) @@ -0,0 +1,15 @@ +GARNAME = OpenGL +GARVERSION = 0.62 +CATEGORIES = cpan +AUTHOR = CHM + +DESCRIPTION = OpenGL Perl Bindings +define BLURB +endef + +PACKAGES = CSWpmopengl +CATALOGNAME = pm_opengl + +DEP_PKGS = CSWfreeglut + +include gar/category.mk Added: csw/mgar/pkg/cpan/OpenGL/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/OpenGL/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/OpenGL/trunk/checksums 2010-02-10 15:23:59 UTC (rev 8465) @@ -0,0 +1 @@ +905407fa94ca0fc9c1e0ae7c140a4272 OpenGL-0.62.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 Feb 10 16:31:08 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Feb 2010 15:31:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8466] csw/mgar/pkg/cpan Message-ID: Revision: 8466 http://gar.svn.sourceforge.net/gar/?rev=8466&view=rev Author: dmichelsen Date: 2010-02-10 15:31:08 +0000 (Wed, 10 Feb 2010) Log Message: ----------- cpan/PDL: Move to mGAR v2, doesn't compile yet Modified Paths: -------------- csw/mgar/pkg/cpan/Date-Manip/trunk/Makefile csw/mgar/pkg/cpan/Date-Manip/trunk/checksums csw/mgar/pkg/cpan/Digest-HMAC/trunk/Makefile csw/mgar/pkg/cpan/Digest-HMAC/trunk/checksums csw/mgar/pkg/cpan/Gimp/trunk/Makefile csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile csw/mgar/pkg/cpan/Inline/trunk/Makefile csw/mgar/pkg/cpan/Inline/trunk/checksums csw/mgar/pkg/cpan/PDL/trunk/Makefile csw/mgar/pkg/cpan/PDL/trunk/checksums csw/mgar/pkg/cpan/SVK/trunk/Makefile csw/mgar/pkg/cpan/SVK/trunk/checksums csw/mgar/pkg/cpan/Search-Xapian/trunk/Makefile csw/mgar/pkg/cpan/Search-Xapian/trunk/checksums csw/mgar/pkg/cpan/Test-Pod/trunk/Makefile csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/Makefile csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/DBD-Oracle/ csw/mgar/pkg/cpan/DBD-Oracle/branches/ csw/mgar/pkg/cpan/DBD-Oracle/tags/ csw/mgar/pkg/cpan/DBD-Oracle/trunk/ csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile csw/mgar/pkg/cpan/DBD-Oracle/trunk/checksums csw/mgar/pkg/cpan/DBD-Oracle/trunk/files/ csw/mgar/pkg/cpan/Image-ExifTool/ csw/mgar/pkg/cpan/Image-ExifTool/branches/ csw/mgar/pkg/cpan/Image-ExifTool/tags/ csw/mgar/pkg/cpan/Image-ExifTool/trunk/ csw/mgar/pkg/cpan/Inline/trunk/files/0001-Skip-question-on-install.patch csw/mgar/pkg/cpan/PerlIO-via-Bzip2/ csw/mgar/pkg/cpan/PerlIO-via-Bzip2/branches/ csw/mgar/pkg/cpan/PerlIO-via-Bzip2/tags/ csw/mgar/pkg/cpan/PerlIO-via-Bzip2/trunk/ csw/mgar/pkg/cpan/PerlIO-via-Bzip2/trunk/Makefile csw/mgar/pkg/cpan/PerlIO-via-Bzip2/trunk/checksums csw/mgar/pkg/cpan/PerlIO-via-Bzip2/trunk/files/ csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Date-Manip/trunk/files/CSWpmdatemanip.gspec csw/mgar/pkg/cpan/DateManip/ csw/mgar/pkg/cpan/Digest-HMAC/trunk/files/CSWpmdigesthmac.depend csw/mgar/pkg/cpan/Digest-HMAC/trunk/files/CSWpmdigesthmac.gspec csw/mgar/pkg/cpan/Image-ExifTool/branches/ csw/mgar/pkg/cpan/Image-ExifTool/tags/ csw/mgar/pkg/cpan/Image-ExifTool/trunk/ csw/mgar/pkg/cpan/Inline/trunk/files/CSWpminline.depend csw/mgar/pkg/cpan/Inline/trunk/files/CSWpminline.gspec csw/mgar/pkg/cpan/Inline/trunk/files/inline.diff csw/mgar/pkg/cpan/PDL/trunk/files/CSWpmpdl.depend csw/mgar/pkg/cpan/PDL/trunk/files/CSWpmpdl.gspec csw/mgar/pkg/cpan/SVK/trunk/files/CSWsvk.gspec csw/mgar/pkg/cpan/SVK/trunk/files/CSWsvk.prototype csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/files/CSWpmtestpodcoverage.depend csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/files/CSWpmtestpodcoverage.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Digest-HMAC/trunk/ csw/mgar/pkg/cpan/Inline/trunk/ csw/mgar/pkg/cpan/PDL/trunk/ csw/mgar/pkg/cpan/SVK/trunk/ csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/ Property changes on: csw/mgar/pkg/cpan/DBD-Oracle/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile 2010-02-10 15:31:08 UTC (rev 8466) @@ -0,0 +1,20 @@ +GARNAME = DBD-Oracle +GARVERSION = 1.23 +CATEGORIES = cpan +AUTHOR = PYTHIAN + +DESCRIPTION = Oracle database driver for the DBI module +define BLURB +endef + +PACKAGES = CSWpmdbdoracle +CATALOGNAME = pm_dbdoracle + +ORACLE_HOME = /opt/csw/instantclient_10_2/$(MM_LIBDIR) +EXTRA_CONFIGURE_EXPORTS = ORACLE_HOME + +NOISALIST = 1 +# EXTRA_LIB = /opt/csw/oracle/product/10.2.0/client/lib +# EXTRA_INC = $(includedir)/oracle/10.2 + +include gar/category.mk Added: csw/mgar/pkg/cpan/DBD-Oracle/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DBD-Oracle/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/DBD-Oracle/trunk/checksums 2010-02-10 15:31:08 UTC (rev 8466) @@ -0,0 +1 @@ +9dc45c29a0e17ac1c2ec424e6ce26720 DBD-Oracle-1.23.tar.gz Modified: csw/mgar/pkg/cpan/Date-Manip/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Date-Manip/trunk/Makefile 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Date-Manip/trunk/Makefile 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,5 +1,5 @@ GARNAME = Date-Manip -GARVERSION = 5.54 +GARVERSION = 6.01 CATEGORIES = cpan AUTHOR = SBECK @@ -11,6 +11,9 @@ easily done. endef -DISTFILES += CSWpmdatemanip.gspec +PACKAGES = CSWpmdatemanip +CATALOGNAME = pm_datemanip +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Date-Manip/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Date-Manip/trunk/checksums 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Date-Manip/trunk/checksums 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,2 +1 @@ -5331314d9f9f66b0c88c6643159a8657 download/CSWpmdatemanip.gspec -16c343329bad644b17f4f8ec5fb243cf download/Date-Manip-5.54.tar.gz +bd29dbc876a446521cdb9de51493cd67 Date-Manip-6.01.tar.gz Deleted: csw/mgar/pkg/cpan/Date-Manip/trunk/files/CSWpmdatemanip.gspec =================================================================== --- csw/mgar/pkg/cpan/Date-Manip/trunk/files/CSWpmdatemanip.gspec 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Date-Manip/trunk/files/CSWpmdatemanip.gspec 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,8 +0,0 @@ -%var bitname pm_datemanip -%var pkgname CSWpmdatemanip -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1995-2003 Sullivan Beck. All rights reserved. -This program is free software; you can redistribute it and/or modify it -under the same terms as Perl itself. Property changes on: csw/mgar/pkg/cpan/Digest-HMAC/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Digest-HMAC/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Digest-HMAC/trunk/Makefile 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Digest-HMAC/trunk/Makefile 2010-02-10 15:31:08 UTC (rev 8466) @@ -3,15 +3,18 @@ CATEGORIES = cpan AUTHOR = GAAS -DESCRIPTION = keyed-hashing for message authentication +DESCRIPTION = Keyed-hashing for message authentication define BLURB HMAC is used for message integrity checks between two parties that share a secret key, and works in combination with some other Digest algorithm, usually MD5 or SHA-1. The HMAC mechanism is described in RFC 2104. endef -DISTFILES += CSWpmdigesthmac.gspec CSWpmdigesthmac.depend +REQUIRED_PKGS = CSWpmdigestsha1 -DEPENDS += cpan/Digest-SHA1 +PACKAGES = CSWpmdigesthmac +CATALOGNAME = pm_digesthmac +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Digest-HMAC/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Digest-HMAC/trunk/checksums 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Digest-HMAC/trunk/checksums 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,3 +1 @@ -b2d13ce3a3fb13282b18bc1be970df49 download/CSWpmdigesthmac.gspec -2150a1d9a182515f07e692510c4f3674 download/CSWpmdigesthmac.depend 32dc54c765100c638b5d7f7ff4c5c626 download/Digest-HMAC-1.01.tar.gz Deleted: csw/mgar/pkg/cpan/Digest-HMAC/trunk/files/CSWpmdigesthmac.depend =================================================================== --- csw/mgar/pkg/cpan/Digest-HMAC/trunk/files/CSWpmdigesthmac.depend 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Digest-HMAC/trunk/files/CSWpmdigesthmac.depend 2010-02-10 15:31:08 UTC (rev 8466) @@ -1 +0,0 @@ -P CSWpmdigestsha1 pm_digestsha1 - interface to the SHA-1 Algorithm Deleted: csw/mgar/pkg/cpan/Digest-HMAC/trunk/files/CSWpmdigesthmac.gspec =================================================================== --- csw/mgar/pkg/cpan/Digest-HMAC/trunk/files/CSWpmdigesthmac.gspec 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Digest-HMAC/trunk/files/CSWpmdigesthmac.gspec 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,10 +0,0 @@ -%var bitname pm_digesthmac -%var pkgname CSWpmdigesthmac -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 1998-2001 Gisle Aas. -Copyright 1998 Graham Barr. - -This library is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. Modified: csw/mgar/pkg/cpan/Gimp/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Gimp/trunk/Makefile 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Gimp/trunk/Makefile 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,5 +1,5 @@ GARNAME = Gimp -GARVERSION = 2.0 +GARVERSION = 2.2pre1 CATEGORIES = cpan AUTHOR = SJBURGES @@ -9,19 +9,11 @@ higher (including 2.0). endef -DISTFILES += CSWpmgimp.gspec CSWpmgimp.depend - -DEPENDS += utils/gimp -DEPENDS += cpan/PDL cpan/Gtk2 - - -BUILD_DEP_PKGS = CSWpmpdl CSWpmgtk2 -PKGS_REQUIRED_CSWpmglib = CSWpmpdl CSWpmgtk2 CSWgimplibs - +PACKAGES = CSWpmgimp CATALOGNAME = pm_gimp -PACKAGES = CSWpmgimp -ARCHALL_CSWpmgimp = 1 +RUNTIME_DEP_PKGS = CSWpmpdl CSWpmgtk2 CSWgimplibs +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) LICENSE = README Modified: csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile 2010-02-10 15:31:08 UTC (rev 8466) @@ -24,6 +24,11 @@ RUNTIME_DEP_PKGS = CSWpmcompressrawzlib RUNTIME_DEP_PKGS += CSWpmcompressrawbz2 +# Uncomment if all packages who depend on these have switched to depend on this package +#INCOMPATIBLE_PKGS = CSWpmcompresszlib +#INCOMPATIBLE_PKGS += CSWpmiocompressbase +#INCOMPATIBLE_PKGS += CSWpmiocompresszlib + PACKAGES = CSWpmiocompress CATALOGNAME = pm_iocompress Property changes on: csw/mgar/pkg/cpan/Inline/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Inline/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Inline/trunk/Makefile 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Inline/trunk/Makefile 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,9 +1,9 @@ GARNAME = Inline -GARVERSION = 0.44 +GARVERSION = 0.45 CATEGORIES = cpan -AUTHOR = INGY +AUTHOR = SISYPHUS -DESCRIPTION = write Perl subroutines in other programming languages. +DESCRIPTION = Write Perl subroutines in other programming languages define BLURB The Inline module allows you to put source code from other programming languages directly "inline" in a Perl script or module. The code is @@ -11,11 +11,14 @@ Perl. endef -DISTFILES += CSWpminline.gspec CSWpminline.depend +PATCHFILES = 0001-Skip-question-on-install.patch -# Enable building included Inline::C -PATCHFILES += inline.diff +PACKAGES = CSWpminline +CATALOGNAME = pm_inline -DEPENDS += cpan/Parse-RecDescent +ARCHALL = 1 +# The current licensing is unknown as is stated on CPAN +CHECKPKG_OVERRIDES = license-missing + include gar/category.mk Modified: csw/mgar/pkg/cpan/Inline/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Inline/trunk/checksums 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Inline/trunk/checksums 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,4 +1,2 @@ -26c1f2020c8a29bfa3c774a1d0f4051f download/CSWpminline.gspec -737756fbcd7276890f88420cfd4760d5 download/CSWpminline.depend -840f47d9b6cef39e68370faf9dceab2c download/Inline-0.44.tar.gz -f8f0b67e6047eb31bfc3368892918280 download/inline.diff +15c2202c3ee504e73158850a006f16ed 0001-Skip-question-on-install.patch +63140a6c911f1576fdee71ba4457610f Inline-0.45.tar.gz Copied: csw/mgar/pkg/cpan/Inline/trunk/files/0001-Skip-question-on-install.patch (from rev 8406, csw/mgar/pkg/cpan/Inline/trunk/files/inline.diff) =================================================================== --- csw/mgar/pkg/cpan/Inline/trunk/files/0001-Skip-question-on-install.patch (rev 0) +++ csw/mgar/pkg/cpan/Inline/trunk/files/0001-Skip-question-on-install.patch 2010-02-10 15:31:08 UTC (rev 8466) @@ -0,0 +1,34 @@ +From 1f06fd58ce8ec425d21138e3b36a7b66eb555db8 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 10 Feb 2010 13:52:02 +0100 +Subject: [PATCH] Skip question on install + +--- + C/Makefile.PL | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/C/Makefile.PL b/C/Makefile.PL +index 294846b..a290a62 100644 +--- a/C/Makefile.PL ++++ b/C/Makefile.PL +@@ -58,12 +58,12 @@ END + # ' + } + +-my $answer = ''; + my $default = $found ? "y" : "n"; +-while (1) { +- $answer = prompt ('Do you want to install Inline::C?', $default); +- last if $answer =~ /^(y|yes|n|no)$/i; +-} ++my $answer = $default; ++#while (1) { ++# $answer = prompt ('Do you want to install Inline::C?', $default); ++# last if $answer =~ /^(y|yes|n|no)$/i; ++#} + + if ($answer =~ /^(y|yes)$/i) { + WriteMakefile( +-- +1.6.6 + Deleted: csw/mgar/pkg/cpan/Inline/trunk/files/CSWpminline.depend =================================================================== --- csw/mgar/pkg/cpan/Inline/trunk/files/CSWpminline.depend 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Inline/trunk/files/CSWpminline.depend 2010-02-10 15:31:08 UTC (rev 8466) @@ -1 +0,0 @@ -P CSWpmparserecdescent pm_parserecdescent - %var bitname pm_parserecdescent Deleted: csw/mgar/pkg/cpan/Inline/trunk/files/CSWpminline.gspec =================================================================== --- csw/mgar/pkg/cpan/Inline/trunk/files/CSWpminline.gspec 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Inline/trunk/files/CSWpminline.gspec 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,11 +0,0 @@ -%var bitname pm_inline -%var pkgname CSWpminline -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2000, 2001, 2002. Brian Ingerson. All rights reserved. - -This program is free software; you can redistribute it and/or modify it -under the same terms as Perl itself. - -See http://www.perl.com/perl/misc/Artistic.html Deleted: csw/mgar/pkg/cpan/Inline/trunk/files/inline.diff =================================================================== --- csw/mgar/pkg/cpan/Inline/trunk/files/inline.diff 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Inline/trunk/files/inline.diff 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,27 +0,0 @@ ---- Inline-0.44.orig/C/Makefile.PL 2002-10-28 10:26:08.000000000 -0800 -+++ Inline-0.44/C/Makefile.PL 2004-04-15 17:39:48.548769669 -0700 -@@ -13,7 +13,7 @@ - } - else { - for my $lib (split $delim, $ENV{PATH}) { -- $found = -f File::Spec->catfile($lib,"$cc$exe") and last; -+ $found = -e File::Spec->catfile($lib,"$cc$exe") and last; - } - } - -@@ -57,10 +57,11 @@ - - my $answer = ''; - my $default = $found ? "y" : "n"; --while (1) { -- $answer = prompt ('Do you want to install Inline::C?', $default); -- last if $answer =~ /^(y|yes|n|no)$/i; --} -+#while (1) { -+# $answer = prompt ('Do you want to install Inline::C?', $default); -+# last if $answer =~ /^(y|yes|n|no)$/i; -+#} -+$answer = 'y'; - - if ($answer =~ /^(y|yes)$/i) { - WriteMakefile( Property changes on: csw/mgar/pkg/cpan/PDL/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/PDL/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/PDL/trunk/Makefile 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/PDL/trunk/Makefile 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,7 +1,7 @@ GARNAME = PDL -GARVERSION = 2.4.3 +GARVERSION = 2.4.6 CATEGORIES = cpan -AUTHOR = CSOE +AUTHOR = CHM DESCRIPTION = The Perl Data Language define BLURB @@ -11,8 +11,10 @@ several paths for device-independent graphics output. endef -DISTFILES += CSWpmpdl.gspec CSWpmpdl.depend +PACKAGES = CSWpmpdl +CATALOGNAME = pm_pdl -DEPENDS += cpan/Inline cpan/ExtUtils-F77 +RUNTIME_DEP_PKGS = CSWpmextutilsf77 CSWpminline +#BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) include gar/category.mk Modified: csw/mgar/pkg/cpan/PDL/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/PDL/trunk/checksums 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/PDL/trunk/checksums 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,3 +1 @@ -a54dacbd7445d34f81cbc1cd690cb726 download/CSWpmpdl.gspec -43d7d3da02892c2366d88191e83fa672 download/CSWpmpdl.depend -8fa453a4ac90d5c0382020d5635ad90a download/PDL-2.4.3.tar.gz +a4aa5f3fd7363824e8f555d0245c4ac7 PDL-2.4.6.tar.gz Deleted: csw/mgar/pkg/cpan/PDL/trunk/files/CSWpmpdl.depend =================================================================== --- csw/mgar/pkg/cpan/PDL/trunk/files/CSWpmpdl.depend 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/PDL/trunk/files/CSWpmpdl.depend 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,2 +0,0 @@ -P CSWpmextutilsf77 pm_extutilsf77 - simple interface to F77 libs -P CSWpminline pm_inline - write Perl subroutines in other programming languages. Deleted: csw/mgar/pkg/cpan/PDL/trunk/files/CSWpmpdl.gspec =================================================================== --- csw/mgar/pkg/cpan/PDL/trunk/files/CSWpmpdl.gspec 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/PDL/trunk/files/CSWpmpdl.gspec 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,4 +0,0 @@ -%var bitname pm_pdl -%var pkgname CSWpmpdl -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/COPYING Property changes on: csw/mgar/pkg/cpan/PerlIO-via-Bzip2/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/PerlIO-via-Bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/PerlIO-via-Bzip2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/PerlIO-via-Bzip2/trunk/Makefile 2010-02-10 15:31:08 UTC (rev 8466) @@ -0,0 +1,16 @@ +GARNAME = PerlIO-via-Bzip2 +GARVERSION = 0.02 +CATEGORIES = cpan +AUTHOR = ARJEN + +DESCRIPTION = PerlIO layer for Bzip2 (de)compression +define BLURB +endef + +PACKAGES = CSWpmperlioviabzip2 +CATALOGNAME = pm_perlioviabzip2 + +Warning: prerequisite Compress::Bzip2 1.03 not found. + + +include gar/category.mk Added: csw/mgar/pkg/cpan/PerlIO-via-Bzip2/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/PerlIO-via-Bzip2/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/PerlIO-via-Bzip2/trunk/checksums 2010-02-10 15:31:08 UTC (rev 8466) @@ -0,0 +1 @@ +1ec8c4b0772301deeb1a4639b3282f09 download/PerlIO-via-Bzip2-0.02.tar.gz Property changes on: csw/mgar/pkg/cpan/SVK/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/SVK/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/SVK/trunk/Makefile 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/SVK/trunk/Makefile 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,5 +1,5 @@ GARNAME = SVK -GARVERSION = 2.0.0 +GARVERSION = 2.2.1 CATEGORIES = cpan AUTHOR = CLKAO @@ -9,53 +9,20 @@ Subversion filesystem but provides additional features. endef -DISTFILES = $(call admfiles,CSWsvk,depend prototype) +REQUIRED_PKGS = CSWpmalgannotate CSWpmalgdiff CSWpmappcli CSWpmclone CSWpmclsaccessor CSWpmclsautouse +REQUIRED_PKGS += CSWpmclsdtainherit CSWpmcompresszlib CSWpmdatahier CSWpmfiletype CSWpmfreezethaw CSWpmiodigest +REQUIRED_PKGS += CSWpmiopager CSWpmlclemktxtlex CSWpmlclemktxtsimple CSWpmlistmoreut CSWpmlog4perl +REQUIRED_PKGS += CSWpmpathclass CSWpmperlioeol CSWpmperlioviadyn CSWpmperlioviasym CSWpmpodescapes +REQUIRED_PKGS += CSWpmpodsimple CSWpmregexpshellish CSWpmsvn CSWpmsvnmirror CSWpmsvnsimple CSWpmtermreadkey +REQUIRED_PKGS += CSWpmtimedate CSWpmunivrequire CSWpmuri CSWpmyaml CSWpmyamlsyck MODDIST = $(GARNAME)-v$(GARVERSION).tar.gz +WORKSRC = $(WORKDIR)/$(GARNAME)-v$(GARVERSION) -# Build -#BUILDDEPS += cpan/ExtUtils-AutoInstall +PACKAGES = CSWsvk +CATALOGNAME = svk -# Core -DEPENDS += utils/subversion -DEPENDS += cpan/Algorithm-Annotate -DEPENDS += cpan/Algorithm-Diff -DEPENDS += cpan/App-CLI -DEPENDS += cpan/Class-Accessor -DEPENDS += cpan/Class-Autouse -DEPENDS += cpan/Class-Data-Inheritable -DEPENDS += cpan/Data-Hierarchy -DEPENDS += cpan/IO-Digest -DEPENDS += cpan/List-MoreUtils -DEPENDS += cpan/Path-Class -DEPENDS += cpan/PerlIO-eol -DEPENDS += cpan/PerlIO-via-dynamic -DEPENDS += cpan/PerlIO-via-symlink -DEPENDS += cpan/SVN-Simple -DEPENDS += cpan/TermReadKey -DEPENDS += cpan/UNIVERSAL-require -DEPENDS += cpan/URI -DEPENDS += cpan/YAML -DEPENDS += cpan/YAML-Syck +ARCHALL = 1 -# No longer needed? -#DEPENDS += cpan/Regexp-Shellish -#DEPENDS += cpan/Clone -#DEPENDS += cpan/Pod-Escapes -#DEPENDS += cpan/Pod-Simple -#DEPENDS += cpan/TimeDate -#DEPENDS += cpan/File-Type - -# Features -DEPENDS += cpan/Compress-Zlib -DEPENDS += cpan/FreezeThaw -DEPENDS += cpan/IO-Pager -DEPENDS += cpan/Locale-Maketext-Lexicon -DEPENDS += cpan/Locale-Maketext-Simple -DEPENDS += cpan/Log-Log4perl -DEPENDS += cpan/SVN-Mirror - -WORKSRC = $(WORKDIR)/$(GARNAME)-v$(GARVERSION) - include gar/category.mk Modified: csw/mgar/pkg/cpan/SVK/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/SVK/trunk/checksums 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/SVK/trunk/checksums 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,4 +1 @@ -25547bbf7a52bc430f7d1c01d55dfa74 download/CSWsvk.gspec -52ca23cbbcf545704c14ca3a322efc63 download/CSWsvk.depend -702248294e9cfd29acc1e0b5dbf7d564 download/CSWsvk.prototype -37ff4acde9f9a0f987bde48b32616ab3 download/SVK-v2.0.0.tar.gz +5778f876a744acebde5c9bff0bb865ce download/SVK-v2.2.1.tar.gz Deleted: csw/mgar/pkg/cpan/SVK/trunk/files/CSWsvk.gspec =================================================================== --- csw/mgar/pkg/cpan/SVK/trunk/files/CSWsvk.gspec 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/SVK/trunk/files/CSWsvk.gspec 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,11 +0,0 @@ -%var bitname svk -%var pkgname CSWsvk -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 2003-2005 by Chia-liang Kao . - -This program is free software; you can redistribute it and/or modify it -under the same terms as Perl itself. - -See http://www.perl.com/perl/misc/Artistic.html Deleted: csw/mgar/pkg/cpan/SVK/trunk/files/CSWsvk.prototype =================================================================== --- csw/mgar/pkg/cpan/SVK/trunk/files/CSWsvk.prototype 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/SVK/trunk/files/CSWsvk.prototype 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,262 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/svk 0555 root bin -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/SVK 0755 root bin -f none /opt/csw/lib/perl/csw/auto/SVK/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/svk.1 0444 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/SVK.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Add.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Admin.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Annotate.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Cat.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Checkout.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Cleanup.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Cmerge.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Commit.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Copy.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Delete.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Depotmap.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Describe.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Diff.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Help.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Ignore.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Import.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Info.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::List.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Log.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Merge.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Mirror.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Mkdir.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Move.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Patch.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Propdel.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Propedit.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Propget.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Proplist.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Propset.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Pull.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Push.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Resolved.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Revert.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Smerge.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Status.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Switch.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Sync.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Update.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Command::Verify.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Depot.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Editor::Checkout.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Editor::Combine.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Editor::Combiner.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Editor::Composite.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Editor::Copy.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Editor::CopyHandler.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Editor::Diff.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Editor::Merge.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Editor::Patch.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Editor::Rename.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Editor::SubTree.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Editor::Translate.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Editor::TxnCleanup.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Editor::XD.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Help::Environment.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Help::Index.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Help::Intro.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Help::View.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Help::zh_cn::Index.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Help::zh_tw::Index.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Inspector.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Log::ChangedPath.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Log::ChangedPaths.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Log::Filter.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Log::Filter::Author.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Log::Filter::Grep.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Log::Filter::Head.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Log::Filter::Output.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Log::Filter::Selection.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Log::Filter::Std.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Log::Filter::XML.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Log::FilterPipeline.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Logger.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Merge.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::MimeDetect.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::MimeDetect::FileLibMagic.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::MimeDetect::FileMMagic.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::MimeDetect::FileType.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::MimeDetect::Internal.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Mirror.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Mirror::Backend::SVNRa.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Mirror::Backend::SVNRaPipe.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::MirrorCatalog.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Notify.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Patch.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Patchset.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Path.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Path::Checkout.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Resolve.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Target::Universal.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Util.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::Version.3perl 0444 root bin -f none /opt/csw/share/man/man3/SVK::XD.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/SVK 0755 root bin -f none /opt/csw/share/perl/csw/SVK.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Accessor.pm 0444 root bin -d none /opt/csw/share/perl/csw/SVK/Command 0755 root bin -f none /opt/csw/share/perl/csw/SVK/Command.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Add.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Admin.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Annotate.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Cat.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Checkout.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Cleanup.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Cmerge.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Commit.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Copy.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Delete.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Depotmap.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Describe.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Diff.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Help.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Ignore.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Import.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Info.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/List.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Log.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Merge.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Mirror.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Mkdir.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Move.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Patch.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Propdel.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Propedit.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Propget.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Proplist.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Propset.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Pull.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Push.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Resolved.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Revert.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Smerge.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Status.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Switch.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Sync.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Update.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Command/Verify.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Config.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Depot.pm 0444 root bin -d none /opt/csw/share/perl/csw/SVK/Editor 0755 root bin -f none /opt/csw/share/perl/csw/SVK/Editor.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/ByPass.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/Checkout.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/Combine.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/Combiner.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/Composite.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/Copy.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/CopyHandler.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/Delay.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/Diff.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/Dynamic.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/InteractiveCommitter.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/InteractiveStatus.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/MapRev.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/Merge.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/Patch.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/Rename.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/Serialize.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/Sign.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/Status.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/SubTree.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/Translate.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/TxnCleanup.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/View.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Editor/XD.pm 0444 root bin -d none /opt/csw/share/perl/csw/SVK/Help 0755 root bin -f none /opt/csw/share/perl/csw/SVK/Help/Environment.pod 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Help/Index.pod 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Help/Intro.pod 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Help/View.pod 0444 root bin -d none /opt/csw/share/perl/csw/SVK/Help/zh_cn 0755 root bin -f none /opt/csw/share/perl/csw/SVK/Help/zh_cn/Index.pod 0444 root bin -d none /opt/csw/share/perl/csw/SVK/Help/zh_tw 0755 root bin -f none /opt/csw/share/perl/csw/SVK/Help/zh_tw/Index.pod 0444 root bin -d none /opt/csw/share/perl/csw/SVK/I18N 0755 root bin -f none /opt/csw/share/perl/csw/SVK/I18N.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/I18N/i_default.po 0444 root bin -f none /opt/csw/share/perl/csw/SVK/I18N/zh_cn.po 0444 root bin -f none /opt/csw/share/perl/csw/SVK/I18N/zh_tw.po 0444 root bin -d none /opt/csw/share/perl/csw/SVK/Inspector 0755 root bin -f none /opt/csw/share/perl/csw/SVK/Inspector.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Inspector/Compat.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Inspector/Root.pm 0444 root bin -d none /opt/csw/share/perl/csw/SVK/Log 0755 root bin -f none /opt/csw/share/perl/csw/SVK/Log/ChangedPath.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Log/ChangedPaths.pm 0444 root bin -d none /opt/csw/share/perl/csw/SVK/Log/Filter 0755 root bin -f none /opt/csw/share/perl/csw/SVK/Log/Filter.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Log/Filter/Author.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Log/Filter/Grep.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Log/Filter/Head.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Log/Filter/Output.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Log/Filter/Selection.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Log/Filter/Std.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Log/Filter/XML.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Log/FilterPipeline.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Logger.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Merge.pm 0444 root bin -d none /opt/csw/share/perl/csw/SVK/MimeDetect 0755 root bin -f none /opt/csw/share/perl/csw/SVK/MimeDetect.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/MimeDetect/FileLibMagic.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/MimeDetect/FileMMagic.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/MimeDetect/FileType.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/MimeDetect/Internal.pm 0444 root bin -d none /opt/csw/share/perl/csw/SVK/Mirror 0755 root bin -f none /opt/csw/share/perl/csw/SVK/Mirror.pm 0444 root bin -d none /opt/csw/share/perl/csw/SVK/Mirror/Backend 0755 root bin -f none /opt/csw/share/perl/csw/SVK/Mirror/Backend/SVNRa.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Mirror/Backend/SVNRaPipe.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Mirror/Backend/SVNSync.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/MirrorCatalog.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Notify.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Patch.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Patchset.pm 0444 root bin -d none /opt/csw/share/perl/csw/SVK/Path 0755 root bin -f none /opt/csw/share/perl/csw/SVK/Path.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Path/Checkout.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Path/Txn.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Path/View.pm 0444 root bin -d none /opt/csw/share/perl/csw/SVK/Resolve 0755 root bin -f none /opt/csw/share/perl/csw/SVK/Resolve.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Resolve/AraxisMerge.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Resolve/Emacs.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Resolve/FileMerge.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Resolve/GVim.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Resolve/GtkDiff.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Resolve/Guiffy.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Resolve/KDiff3.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Resolve/Meld.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Resolve/P4WinMerge.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Resolve/TkDiff.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Resolve/TortoiseMerge.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Resolve/Vim.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Resolve/XXDiff.pm 0444 root bin -d none /opt/csw/share/perl/csw/SVK/Root 0755 root bin -f none /opt/csw/share/perl/csw/SVK/Root.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Root/Checkout.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Root/View.pm 0444 root bin -d none /opt/csw/share/perl/csw/SVK/Target 0755 root bin -f none /opt/csw/share/perl/csw/SVK/Target/Universal.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Test.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Util.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/Version.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/View.pm 0444 root bin -f none /opt/csw/share/perl/csw/SVK/XD.pm 0444 root bin Modified: csw/mgar/pkg/cpan/Search-Xapian/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Search-Xapian/trunk/Makefile 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Search-Xapian/trunk/Makefile 2010-02-10 15:31:08 UTC (rev 8466) @@ -13,4 +13,7 @@ BUILD_DEP_PKGS = CSWxapiancore RUNTIME_DEP_PKGS = $(BUILD_DEP_PKGS) +PATCHFILES = search-xapian-bool.patch +PATCHDIRLEVEL = 0 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Search-Xapian/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Search-Xapian/trunk/checksums 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Search-Xapian/trunk/checksums 2010-02-10 15:31:08 UTC (rev 8466) @@ -1 +1,2 @@ 732c23816cdb79f66ed83a3c25e8975f download/Search-Xapian-1.0.16.0.tar.gz +767ffa553a372f00002503716b1bed12 download/search-xapian-bool.patch Modified: csw/mgar/pkg/cpan/Test-Pod/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Pod/trunk/Makefile 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Test-Pod/trunk/Makefile 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,17 +1,20 @@ GARNAME = Test-Pod -GARVERSION = 1.26 +GARVERSION = 1.41 CATEGORIES = cpan AUTHOR = PETDANCE -DESCRIPTION = check for POD errors in files +DESCRIPTION = Check for POD errors in files define BLURB Check POD files for errors or warnings in a test file, using Pod::Simple to do the heavy lifting. endef -DISTFILES += CSWpmtestpod.gspec CSWpmtestpod.depend +PACKAGES = CSWpmtestpod +CATALOGNAME = pm_testpod -DEPENDS += cpan/Pod-Simple cpan/IO-stringy -BUILDDEPS += cpan/Test-Builder-Tester +REQUIRED_PKGS = CSWpmiostringy CSWpmpodsimple +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWpmtestsimple +ARCHALL = 1 + include gar/category.mk Property changes on: csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/Makefile 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/Makefile 2010-02-10 15:31:08 UTC (rev 8466) @@ -7,9 +7,14 @@ define BLURB endef -DISTFILES += $(call admfiles,CSWpmtestpodcoverage,depend) +PREREQUISITE_PKGS = CSWpmtstbldrtester CSWpmpodcoverage +REQUIRED_PKGS = CSWpmpodsimple CSWpmiostringy -DEPENDS += cpan/Pod-Simple cpan/IO-stringy -BUILDDEPS += cpan/Test-Builder-Tester +DISTFILES = COPYING +PACKAGES = CSWpmtestpodcoverage +CATALOGNAME = pm_testpodcoverage + +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/checksums 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/checksums 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,3 +1,2 @@ -7e76f8e4a90fca6a2e363c69d929add2 download/CSWpmtestpodcoverage.gspec -f1b3d087146d094ae502a4abdcba7a3f download/CSWpmtestpodcoverage.depend +7e76f8e4a90fca6a2e363c69d929add2 download/COPYING 33405cca7c75b7b89c06ba30eea66692 download/Test-Pod-Coverage-1.08.tar.gz Copied: csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/files/COPYING (from rev 5970, csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/files/CSWpmtestpodcoverage.gspec) =================================================================== --- csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/files/COPYING 2010-02-10 15:31:08 UTC (rev 8466) @@ -0,0 +1,9 @@ +%var bitname pm_testpodcoverage +%var pkgname CSWpmtestpodcoverage +%var arch all +%include url file://%{PKGLIB}/csw_cpan.gspec +%copyright +Copyright 2004, Andy Lester, All Rights Reserved. + +You may use, modify, and distribute this package under the +same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/files/CSWpmtestpodcoverage.depend =================================================================== --- csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/files/CSWpmtestpodcoverage.depend 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/files/CSWpmtestpodcoverage.depend 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,2 +0,0 @@ -P CSWpmpodsimple pm_podsimple - Framework for parsing Pod -P CSWpmiostringy pm_iostringy - Perl I/O on in-core objects like strings and arrays Deleted: csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/files/CSWpmtestpodcoverage.gspec =================================================================== --- csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/files/CSWpmtestpodcoverage.gspec 2010-02-10 15:23:59 UTC (rev 8465) +++ csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/files/CSWpmtestpodcoverage.gspec 2010-02-10 15:31:08 UTC (rev 8466) @@ -1,9 +0,0 @@ -%var bitname pm_testpodcoverage -%var pkgname CSWpmtestpodcoverage -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 2004, Andy Lester, All Rights Reserved. - -You may use, modify, and distribute this package under the -same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Feb 10 16:52:30 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Feb 2010 15:52:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8467] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8467 http://gar.svn.sourceforge.net/gar/?rev=8467&view=rev Author: dmichelsen Date: 2010-02-10 15:52:30 +0000 (Wed, 10 Feb 2010) Log Message: ----------- mGAR v2: Add POSTMSG for CAS cswpostmsg Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-10 15:31:08 UTC (rev 8466) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-10 15:52:30 UTC (rev 8467) @@ -212,6 +212,7 @@ _CSWCLASSES += cswinetd _CSWCLASSES += cswinitsmf _CSWCLASSES += cswtexinfo +_CSWCLASSES += cswpostmsg # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. @@ -359,6 +360,7 @@ $(if $(PROTOTYPE_GROUP_$M),$$F[5] = "$(PROTOTYPE_GROUP_$M)";)\ $(if $(PROTOTYPE_FILES_$M),})\ )\ + $(foreach F,$(POSTMSG),$$F[1] = "cswpostmsg" if( $$F[2] eq "$F" );)\ print join(" ", at F),"\n";' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Feb 10 17:13:40 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 10 Feb 2010 16:13:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[8469] csw/mgar/pkg/svclog/trunk/files/COPYING Message-ID: Revision: 8469 http://gar.svn.sourceforge.net/gar/?rev=8469&view=rev Author: skayser Date: 2010-02-10 16:13:39 +0000 (Wed, 10 Feb 2010) Log Message: ----------- svclog: added COPYING Added Paths: ----------- csw/mgar/pkg/svclog/trunk/files/COPYING Added: csw/mgar/pkg/svclog/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/svclog/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/svclog/trunk/files/COPYING 2010-02-10 16:13:39 UTC (rev 8469) @@ -0,0 +1,21 @@ +CDDL HEADER START + +The contents of this file are subject to the terms of the +Common Development and Distribution License, Version 1.0 only +(the "License"). You may not use this file except in compliance +with the License. + +You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +or http://www.opensolaris.org/os/licensing. +See the License for the specific language governing permissions +and limitations under the License. + +When distributing Covered Code, include this CDDL HEADER in each +file and include the License file at usr/src/OPENSOLARIS.LICENSE. +If applicable, add the following below this CDDL HEADER, with the +fields enclosed by brackets "[]" replaced with your own identifying +information: Portions Copyright [yyyy] [name of copyright owner] + +CDDL HEADER END + +Copyright 2007 Peter A. van Gemert This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Feb 10 17:10:53 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 10 Feb 2010 16:10:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8468] csw/mgar/pkg Message-ID: Revision: 8468 http://gar.svn.sourceforge.net/gar/?rev=8468&view=rev Author: skayser Date: 2010-02-10 16:10:53 +0000 (Wed, 10 Feb 2010) Log Message: ----------- svclog: initial commit Added Paths: ----------- csw/mgar/pkg/svclog/ csw/mgar/pkg/svclog/branches/ csw/mgar/pkg/svclog/tags/ csw/mgar/pkg/svclog/trunk/ csw/mgar/pkg/svclog/trunk/Makefile csw/mgar/pkg/svclog/trunk/checksums csw/mgar/pkg/svclog/trunk/files/ csw/mgar/pkg/svclog/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/svclog/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/svclog/trunk/Makefile =================================================================== --- csw/mgar/pkg/svclog/trunk/Makefile (rev 0) +++ csw/mgar/pkg/svclog/trunk/Makefile 2010-02-10 16:10:53 UTC (rev 8468) @@ -0,0 +1,37 @@ +GARNAME = svclog +GARVERSION = 1.5 +CATEGORIES = apps + +DESCRIPTION = Displays log file content of SMF service (Solaris 10 only) +define BLURB + Long description +endef + +VENDOR_URL = http://www2.petervg.nl/software/source/svclog +MASTER_SITES = http://www2.petervg.nl/software/source/ +DISTFILES = svclog +DISTFILES += COPYING + +# Only makes sense on Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +# Simple script copy, none of the usual steps required +EXTRACT_SCRIPTS = +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + ginstall -Dm755 $(WORKDIR)/svclog $(DESTDIR)$(bindir)/svclog + @$(MAKECOOKIE) + +# Install changelog.CSW +post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) + +install-changelog-%: + ginstall -D $(FILEDIR)/changelog.CSW \ + $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW + @$(MAKECOOKIE) Added: csw/mgar/pkg/svclog/trunk/checksums =================================================================== --- csw/mgar/pkg/svclog/trunk/checksums (rev 0) +++ csw/mgar/pkg/svclog/trunk/checksums 2010-02-10 16:10:53 UTC (rev 8468) @@ -0,0 +1,2 @@ +937460a15bed6418476217d99afd021f COPYING +d8c33f4175ceb8124b4abc3c8a4c5258 svclog Added: csw/mgar/pkg/svclog/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/svclog/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/svclog/trunk/files/changelog.CSW 2010-02-10 16:10:53 UTC (rev 8468) @@ -0,0 +1,5 @@ +svclog (1.5,REV=2010.02.10) + + * Initial release. + + -- Sebastian Kayser Wed, 10 Feb 2010 17:09:43 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Feb 10 17:26:56 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 10 Feb 2010 16:26:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[8470] csw/mgar/pkg/svclog/trunk/Makefile Message-ID: Revision: 8470 http://gar.svn.sourceforge.net/gar/?rev=8470&view=rev Author: skayser Date: 2010-02-10 16:26:56 +0000 (Wed, 10 Feb 2010) Log Message: ----------- svclog: update DESCRIPTION Modified Paths: -------------- csw/mgar/pkg/svclog/trunk/Makefile Modified: csw/mgar/pkg/svclog/trunk/Makefile =================================================================== --- csw/mgar/pkg/svclog/trunk/Makefile 2010-02-10 16:13:39 UTC (rev 8469) +++ csw/mgar/pkg/svclog/trunk/Makefile 2010-02-10 16:26:56 UTC (rev 8470) @@ -2,7 +2,7 @@ GARVERSION = 1.5 CATEGORIES = apps -DESCRIPTION = Displays log file content of SMF service (Solaris 10 only) +DESCRIPTION = Displays log file content for SMF services define BLURB Long description endef This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Feb 10 17:27:46 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 10 Feb 2010 16:27:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8471] csw/mgar/pkg/svclog/trunk/Makefile Message-ID: Revision: 8471 http://gar.svn.sourceforge.net/gar/?rev=8471&view=rev Author: skayser Date: 2010-02-10 16:27:46 +0000 (Wed, 10 Feb 2010) Log Message: ----------- svclog: set ARCHALL=1 Modified Paths: -------------- csw/mgar/pkg/svclog/trunk/Makefile Modified: csw/mgar/pkg/svclog/trunk/Makefile =================================================================== --- csw/mgar/pkg/svclog/trunk/Makefile 2010-02-10 16:26:56 UTC (rev 8470) +++ csw/mgar/pkg/svclog/trunk/Makefile 2010-02-10 16:27:46 UTC (rev 8471) @@ -12,6 +12,8 @@ DISTFILES = svclog DISTFILES += COPYING +ARCHALL = 1 + # Only makes sense on Solaris 10 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Feb 10 17:33:10 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 10 Feb 2010 16:33:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[8472] csw/mgar/pkg/svclog/trunk/Makefile Message-ID: Revision: 8472 http://gar.svn.sourceforge.net/gar/?rev=8472&view=rev Author: skayser Date: 2010-02-10 16:33:10 +0000 (Wed, 10 Feb 2010) Log Message: ----------- svclog: correct mode for changelog.CSW Modified Paths: -------------- csw/mgar/pkg/svclog/trunk/Makefile Modified: csw/mgar/pkg/svclog/trunk/Makefile =================================================================== --- csw/mgar/pkg/svclog/trunk/Makefile 2010-02-10 16:27:46 UTC (rev 8471) +++ csw/mgar/pkg/svclog/trunk/Makefile 2010-02-10 16:33:10 UTC (rev 8472) @@ -34,6 +34,6 @@ post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) install-changelog-%: - ginstall -D $(FILEDIR)/changelog.CSW \ + ginstall -Dm 644 $(FILEDIR)/changelog.CSW \ $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW @$(MAKECOOKIE) 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 Feb 10 19:03:46 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 10 Feb 2010 18:03:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8473] csw/mgar/pkg/postgrey/trunk Message-ID: Revision: 8473 http://gar.svn.sourceforge.net/gar/?rev=8473&view=rev Author: bonivart Date: 2010-02-10 18:03:46 +0000 (Wed, 10 Feb 2010) Log Message: ----------- postgrey: add conf file Modified Paths: -------------- csw/mgar/pkg/postgrey/trunk/Makefile csw/mgar/pkg/postgrey/trunk/checksums csw/mgar/pkg/postgrey/trunk/files/CSWpostgrey.init Added Paths: ----------- csw/mgar/pkg/postgrey/trunk/files/postgrey Modified: csw/mgar/pkg/postgrey/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgrey/trunk/Makefile 2010-02-10 16:33:10 UTC (rev 8472) +++ csw/mgar/pkg/postgrey/trunk/Makefile 2010-02-10 18:03:46 UTC (rev 8473) @@ -22,9 +22,10 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -INITSMF = /etc/opt/csw/init.d/cswpostgrey +INITSMF = /opt/csw/etc/init.d/cswpostgrey USERGROUP = /etc/opt/csw/pkg/CSWpostgrey/cswusergroup -SAMPLECONF = /etc/opt/csw/postfix/postgrey_whitelist_clients /etc/opt/csw/postfix/postgrey_whitelist_recipients +SAMPLECONF = /etc/opt/csw/postfix/postgrey_whitelist_clients /etc/opt/csw/postfix/postgrey_whitelist_recipients +SAMPLECONF += /etc/opt/csw/postgrey PATCHFILES = postgrey.p @@ -32,11 +33,12 @@ install-custom: @echo " ==> Installing $(GARNAME) (custom)" - @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall -m 755 $(FILEDIR)/CSWpostgrey.init $(DESTDIR)/etc/opt/csw/init.d/cswpostgrey + @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/init.d + @ginstall -m 755 $(FILEDIR)/CSWpostgrey.init $(DESTDIR)/opt/csw/etc/init.d/cswpostgrey @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/postfix @ginstall -m 644 $(WORKSRC)/postgrey_whitelist_clients $(DESTDIR)/etc/opt/csw/postfix @ginstall -m 644 $(WORKSRC)/postgrey_whitelist_recipients $(DESTDIR)/etc/opt/csw/postfix + @ginstall -m 644 $(WORKSRC)/postgrey $(DESTDIR)/etc/opt/csw/ @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWpostgrey @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWpostgrey/cswusergroup @ginstall -m 755 -d $(DESTDIR)$(sbindir) Modified: csw/mgar/pkg/postgrey/trunk/checksums =================================================================== --- csw/mgar/pkg/postgrey/trunk/checksums 2010-02-10 16:33:10 UTC (rev 8472) +++ csw/mgar/pkg/postgrey/trunk/checksums 2010-02-10 18:03:46 UTC (rev 8473) @@ -1,2 +1,2 @@ 524a4e165bf997996f3bccade394712f postgrey-1.32.tar.gz -c1715a65ee323b0b0dcc2fbab9a85425 postgrey.p +108ad95e20c54d4512f65a19103e2b16 postgrey.p Modified: csw/mgar/pkg/postgrey/trunk/files/CSWpostgrey.init =================================================================== --- csw/mgar/pkg/postgrey/trunk/files/CSWpostgrey.init 2010-02-10 16:33:10 UTC (rev 8472) +++ csw/mgar/pkg/postgrey/trunk/files/CSWpostgrey.init 2010-02-10 18:03:46 UTC (rev 8473) @@ -1,15 +1,25 @@ #!/sbin/sh -# 2009-12-02 Peter Bonivart +#RC_KLEV 0,1,2,S +#RC_SLEV 3 -if [ -f /lib/svc/share/smf_include.sh ]; then - . /lib/svc/share/smf_include.sh -fi +# rc-script for CSWpostgrey +# Peter Bonivart, 2010-02-01 +# Source SMF includes +[ -r /lib/svc/share/smf_include.sh ] && . /lib/svc/share/smf_include.sh + +# Source config file +[ -r /etc/opt/csw/postgrey ] && . /etc/opt/csw/postgrey + SERVICE=postgrey +PATH=$PATH:/usr/bin:/opt/csw/bin -OPTIONS="--inet=10023 -d --whitelist-clients=/etc/opt/csw/postfix/postgrey_whitelist_clients --whitelist-recipients=/etc/opt/csw/postfix/postgrey_whitelist_recipients --pidfile=/var/opt/csw/postgrey/postgrey.pid" +# Use /etc/opt/csw/postgrey to configure the options instead of editing this file +#OPTIONS="--inet=10023 -d --whitelist-clients=/etc/opt/csw/postfix/postgrey_whitelist_clients --whitelist-recipients=/etc/opt/csw/postfix/postgrey_whitelist_recipients --pidfile=/var/opt/csw/postgrey/postgrey.pid" +ZONE= # used for initialization, do not change + case "$1" in start) echo "Starting $SERVICE ..." @@ -17,7 +27,12 @@ ;; stop) echo "Stopping $SERVICE ..." - pkill $SERVICE + if [ -x /usr/bin/zonename ]; then + if [ "`/usr/bin/zonename`" = "global" ]; then + ZONE="-z global" + fi + fi + pkill $ZONE -x $SERVICE ;; restart) echo "Restarting $SERVICE ... " Added: csw/mgar/pkg/postgrey/trunk/files/postgrey =================================================================== --- csw/mgar/pkg/postgrey/trunk/files/postgrey (rev 0) +++ csw/mgar/pkg/postgrey/trunk/files/postgrey 2010-02-10 18:03:46 UTC (rev 8473) @@ -0,0 +1,7 @@ +# This is where you customize some settings of your postgrey installation so +# you don't have to edit the scripts themselves as they will be replaced during +# upgrades. +# +# Peter Bonivart, OpenCSW + +OPTIONS="--inet=10023 -d --whitelist-clients=/etc/opt/csw/postfix/postgrey_whitelist_clients --whitelist-recipients=/etc/opt/csw/postfix/postgrey_whitelist_recipients --pidfile=/var/opt/csw/postgrey/postgrey.pid" 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 Feb 10 19:28:50 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 10 Feb 2010 18:28:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8474] csw/mgar/pkg/spamassassin/trunk Message-ID: Revision: 8474 http://gar.svn.sourceforge.net/gar/?rev=8474&view=rev Author: bonivart Date: 2010-02-10 18:28:48 +0000 (Wed, 10 Feb 2010) Log Message: ----------- spamassassin: add new class cswpostmsg to display upgrade message Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.postmsg Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2010-02-10 18:03:46 UTC (rev 8473) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2010-02-10 18:28:48 UTC (rev 8474) @@ -31,6 +31,7 @@ SAMPLECONF += /etc/opt/csw/spamassassin/spamd\.CSW USERGROUP = /etc/opt/csw/pkg/CSWspamassassin/cswusergroup INITSMF = /etc/opt/csw/init.d/cswspamd +POSTMSG = /opt/csw/share/doc/spamassassin/README.upgrade MIGRATE_FILES = init.pre local.cf v310.pre v312.pre v320.pre MIGRATE_SOURCE_DIR = /opt/csw/etc/spamassassin @@ -92,6 +93,7 @@ @ginstall -m 644 $(FILEDIR)/CSWspamassassin.spamd.CSW $(DESTDIR)/etc/opt/csw/spamassassin/spamd.CSW @cp $(FILEDIR)/CSWspamassassin.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW @cp $(FILEDIR)/CSWspamassassin.README.spamd $(DESTDIR)$(docdir)/$(GARNAME)/README.spamd + @cp $(FILEDIR)/CSWspamassassin.postmsg $(DESTDIR)$(docdir)/$(GARNAME)/README.upgrade echo "WORKSRC: $(WORKSRC)" @( cd $(WORKSRC) ; \ gmake DESTDIR=$(DESTDIR) install ) Added: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.postmsg =================================================================== --- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.postmsg (rev 0) +++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.postmsg 2010-02-10 18:28:48 UTC (rev 8474) @@ -0,0 +1,31 @@ + +Note for Users Upgrading to SpamAssassin 3.3.0 +----------------------------------------------- + +- Rules are no longer included with SpamAssassin "out of the box". You will + need to immediately run "sa-update", or download the additional rules .tgz + package and run "sa-update --install" with it, to get a ruleset. + +- The BETA label has been taken off of the SpamAssassin SQL support. Please + be aware that occasional changes may still be made to this area of the + code. You should be sure to read this upgrade document each time you + install a new version to determine if any SQL updates need to be made to + your local installation. + +- The DKIM plugin is now enabled by default for new installs, if the perl + module Mail::DKIM is installed. However, installation of SpamAssassin + will not overwrite existing .pre configuration files, so to use DKIM when + upgrading from a previous release that did not use DKIM, a directive: + + loadplugin Mail::SpamAssassin::Plugin::DKIM + + will need to be uncommented in file "v312.pre", or added to some + other .pre file, such as local.pre. + +- More info here: http://svn.apache.org/repos/asf/spamassassin/branches/3.3/build/announcements/3.3.0.txt + +- Also note that the configuration dir has moved from + /opt/csw/etc/spamassassin to /etc/opt/csw/spamassassin. Your standard + configuration files will be moved automatically. Please check the old + location for any files that may need to be moved manually. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Feb 11 03:16:27 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 11 Feb 2010 02:16:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[8475] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 8475 http://gar.svn.sourceforge.net/gar/?rev=8475&view=rev Author: bdwalton Date: 2010-02-11 02:16:26 +0000 (Thu, 11 Feb 2010) Log Message: ----------- ruby19: use proper make target for test suite Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-02-10 18:28:48 UTC (rev 8474) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-02-11 02:16:26 UTC (rev 8475) @@ -3,7 +3,7 @@ PATCHLEVEL = p376 CATEGORIES = lang -TEST_SCRIPTS = +TEST_TARGET = check DISTNAME = ruby-$(GARVERSION)-$(PATCHLEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Feb 11 04:10:20 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 11 Feb 2010 03:10:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8476] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 8476 http://gar.svn.sourceforge.net/gar/?rev=8476&view=rev Author: bdwalton Date: 2010-02-11 03:10:20 +0000 (Thu, 11 Feb 2010) Log Message: ----------- ruby19: disable test suite Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-02-11 02:16:26 UTC (rev 8475) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-02-11 03:10:20 UTC (rev 8476) @@ -3,7 +3,8 @@ PATCHLEVEL = p376 CATEGORIES = lang -TEST_TARGET = check +# TEST_TARGET = check +TEST_SCRIPT = DISTNAME = ruby-$(GARVERSION)-$(PATCHLEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 11 08:58:05 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Feb 2010 07:58:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[8477] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 8477 http://gar.svn.sourceforge.net/gar/?rev=8477&view=rev Author: wahwah Date: 2010-02-11 07:58:05 +0000 (Thu, 11 Feb 2010) Log Message: ----------- libxslt: Adding an override for libxsltmod.so Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2010-02-11 03:10:20 UTC (rev 8476) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2010-02-11 07:58:05 UTC (rev 8477) @@ -53,4 +53,6 @@ PKGFILES_CSWpylibxslt = $(libdir)/python.* PKGFILES_CSWpylibxslt += $(docdir)/libxslt-python-$(GARVERSION)/.* +CHECKPKG_OVERRIDES = CSWpylibxslt|symbol-not-found|libxsltmod.so + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Thu Feb 11 09:40:45 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Thu, 11 Feb 2010 08:40:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8478] csw/mgar/pkg/xpdf/trunk/Makefile Message-ID: Revision: 8478 http://gar.svn.sourceforge.net/gar/?rev=8478&view=rev Author: bensons Date: 2010-02-11 08:40:45 +0000 (Thu, 11 Feb 2010) Log Message: ----------- xpdf: removed Xpm dependency Modified Paths: -------------- csw/mgar/pkg/xpdf/trunk/Makefile Modified: csw/mgar/pkg/xpdf/trunk/Makefile =================================================================== --- csw/mgar/pkg/xpdf/trunk/Makefile 2010-02-11 07:58:05 UTC (rev 8477) +++ csw/mgar/pkg/xpdf/trunk/Makefile 2010-02-11 08:40:45 UTC (rev 8478) @@ -23,8 +23,10 @@ RUNTIME_DEP_PKGS = CSWftype2 CSWt1lib CSWxpm CSWgsfonts CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-Xpm-library=$(libdir) -CONFIGURE_ARGS += --with-Xpm-includes=$(includedir) +#CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +#CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib +#CONFIGURE_ARGS += --with-Xpm-library=$(libdir) +#CONFIGURE_ARGS += --with-Xpm-includes=$(includedir) CONFIGURE_ARGS += --with-t1-library=$(libdir) CONFIGURE_ARGS += --with-t1-includes=$(includedir) CONFIGURE_ARGS += --with-freetype2-library=$(libdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 11 10:04:10 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Feb 2010 09:04:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[8479] csw/mgar/pkg/python/branches/python-2.6.4+patch7242/ Makefile Message-ID: Revision: 8479 http://gar.svn.sourceforge.net/gar/?rev=8479&view=rev Author: wahwah Date: 2010-02-11 09:04:10 +0000 (Thu, 11 Feb 2010) Log Message: ----------- python/branches/python-2.6.4+patch7242: Adding overrides Modified Paths: -------------- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile Modified: csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile =================================================================== --- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile 2010-02-11 08:40:45 UTC (rev 8478) +++ csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile 2010-02-11 09:04:10 UTC (rev 8479) @@ -116,7 +116,9 @@ PKGFILES_CSWpython-test += $(libdir)/python/lib2to3/tests.* PKGFILES_CSWpython-test += $(libdir)/python/sqlite3/test.* -ARCHALL_CSWpython-rt = 1 +ARCHALL_CSWpython-rt = 1 +ARCHALL_CSWpython-test = 1 +ARCHALL_CSWidle = 1 RUNTIME_DEP_PKGS_CSWidle = CSWpython CSWpython-tk RUNTIME_DEP_PKGS_CSWpython = CSWbdb47 CSWbzip2 CSWgdbm CSWggettextrt @@ -141,6 +143,17 @@ SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter) SPKG_DESC_CSWpython-test = Python Test modules +LICENSE = LICENSE + +CHECKPKG_OVERRIDES = CSWpython-devel|symbol-not-found|python.o +CHECKPKG_OVERRIDES += CSWpython|symbol-not-found|xxsubtype.so +CHECKPKG_OVERRIDES += CSWpython|symbol-not-found|_cursesmodule.so +CHECKPKG_OVERRIDES += CSWpython|symbol-not-found|_curses_panel.so + +# Checkpkg should be able to guess that, perhaps symlink information is +# missing? +CHECKPKG_OVERRIDES += CSWpython|missing-dependency|CSWbdb + include gar/category.mk post-install-modulated: install-deprecated-libs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 11 10:12:46 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Feb 2010 09:12:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8480] csw/mgar/gar/v2 Message-ID: Revision: 8480 http://gar.svn.sourceforge.net/gar/?rev=8480&view=rev Author: wahwah Date: 2010-02-11 09:12:46 +0000 (Thu, 11 Feb 2010) Log Message: ----------- mGAR v2: tests, added a test case for overrides Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/tests/run_tests.py Added Paths: ----------- csw/mgar/gar/v2/tests/overrides_test.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-11 09:04:10 UTC (rev 8479) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-11 09:12:46 UTC (rev 8480) @@ -726,7 +726,16 @@ else: return list() + def GetFileContent(self, pkg_file_path): + if pkg_file_path.startswith("/"): + pkg_file_path = pkg_file_path[1:] + file_path = os.path.join(self.directory, "root", pkg_file_path) + fd = open(file_path, "r") + content = fd.read() + fd.close() + return content + class Pkgmap(object): """Represents the pkgmap of the package. Added: csw/mgar/gar/v2/tests/overrides_test.py =================================================================== --- csw/mgar/gar/v2/tests/overrides_test.py (rev 0) +++ csw/mgar/gar/v2/tests/overrides_test.py 2010-02-11 09:12:46 UTC (rev 8480) @@ -0,0 +1,25 @@ +# $Id$ + +import os.path +import sys +import unittest +sys.path.append("../lib/python") +import gartest + +class OverridesUnitTest(unittest.TestCase): + """Tests CHECKPKG_OVERRIDES support.""" + + def testPkginfoName(self): + """Checks that the GARNAME makes it to the NAME in pkginfo.""" + mybuild = gartest.DynamicGarBuild() + mybuild.SetGarVariable("GARNAME", "overrides-test") + mybuild.SetGarVariable("CATALOGNAME", "overrides_test") + mybuild.SetGarVariable("CHECKPKG_OVERRIDES", "CSWoverrides-test|example-tag|example-parameter") + mybuild.WriteGarFiles() + self.assertEquals(0, mybuild.Build()) + pkg = mybuild.GetFirstBuiltPackage() + overr_file = "/opt/csw/share/checkpkg/overrides/overrides_test" + expected = 'CSWoverrides-test: example-tag example-parameter\n' + self.assertEqual(expected, pkg.GetFileContent(overr_file)) + overrides = pkg.GetOverrides() + self.assertEqual(1, len(overrides)) Property changes on: csw/mgar/gar/v2/tests/overrides_test.py ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/gar/v2/tests/run_tests.py =================================================================== --- csw/mgar/gar/v2/tests/run_tests.py 2010-02-11 09:04:10 UTC (rev 8479) +++ csw/mgar/gar/v2/tests/run_tests.py 2010-02-11 09:12:46 UTC (rev 8480) @@ -10,9 +10,10 @@ # To add more test files, create .py file and add a corresponding line # here: -from opencsw_test import * -from checkpkg_test import * -from example_test import * +from opencsw_test import * +from checkpkg_test import * +from example_test import * +from overrides_test import * if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Feb 11 10:25:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Feb 2010 09:25:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8481] csw/mgar/pkg/patch/trunk Message-ID: Revision: 8481 http://gar.svn.sourceforge.net/gar/?rev=8481&view=rev Author: dmichelsen Date: 2010-02-11 09:25:11 +0000 (Thu, 11 Feb 2010) Log Message: ----------- patch: Update to 2.6.1 Modified Paths: -------------- csw/mgar/pkg/patch/trunk/Makefile csw/mgar/pkg/patch/trunk/checksums Added Paths: ----------- csw/mgar/pkg/patch/trunk/files/ csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch Modified: csw/mgar/pkg/patch/trunk/Makefile =================================================================== --- csw/mgar/pkg/patch/trunk/Makefile 2010-02-11 09:12:46 UTC (rev 8480) +++ csw/mgar/pkg/patch/trunk/Makefile 2010-02-11 09:25:11 UTC (rev 8481) @@ -1,5 +1,5 @@ GARNAME = patch -GARVERSION = 2.6 +GARVERSION = 2.6.1 CATEGORIES = utils DESCRIPTION = GNU patch utility @@ -9,15 +9,21 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Add-missing-strnlen.c-from-GNUlib.patch PACKAGES = CSWgpatch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +DEP_PKGS = CSWlibgnugetopt + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g +EXTRA_LINKER_FLAGS = -lgnugetopt +BUILD_ARGS = SHELL=bash + INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir mandir TEST_TARGET = check Modified: csw/mgar/pkg/patch/trunk/checksums =================================================================== --- csw/mgar/pkg/patch/trunk/checksums 2010-02-11 09:12:46 UTC (rev 8480) +++ csw/mgar/pkg/patch/trunk/checksums 2010-02-11 09:25:11 UTC (rev 8481) @@ -1 +1,2 @@ -bc71d33c35004db3768465bcaf9ed23c patch-2.6.tar.gz +d976e6d1af14d714cffa3e6579cf7afa 0001-Add-missing-strnlen.c-from-GNUlib.patch +d758eb96d3f75047efc004a720d33daf patch-2.6.1.tar.gz Added: csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch =================================================================== --- csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch (rev 0) +++ csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch 2010-02-11 09:25:11 UTC (rev 8481) @@ -0,0 +1,50 @@ +From 301697b91b91d3b08059a9e18ce8154040762d63 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 11 Feb 2010 10:19:05 +0100 +Subject: [PATCH] Add missing strnlen.c from GNUlib + +--- + gl/lib/strnlen.c | 31 +++++++++++++++++++++++++++++++ + 1 files changed, 31 insertions(+), 0 deletions(-) + create mode 100644 gl/lib/strnlen.c + +diff --git a/gl/lib/strnlen.c b/gl/lib/strnlen.c +new file mode 100644 +index 0000000..d346d32 +--- /dev/null ++++ b/gl/lib/strnlen.c +@@ -0,0 +1,31 @@ ++/* Find the length of STRING, but scan at most MAXLEN characters. ++ Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. ++ Written by Simon Josefsson. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2, or (at your option) ++ any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software Foundation, ++ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ ++ ++#include ++ ++#include ++ ++/* Find the length of STRING, but scan at most MAXLEN characters. ++ If no '\0' terminator is found in that many characters, return MAXLEN. */ ++ ++size_t ++strnlen (const char *string, size_t maxlen) ++{ ++ const char *end = memchr (string, '\0', maxlen); ++ return end ? (size_t) (end - string) : maxlen; ++} +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Feb 11 10:33:19 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Feb 2010 09:33:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8482] csw/mgar/pkg/patch/trunk/Makefile Message-ID: Revision: 8482 http://gar.svn.sourceforge.net/gar/?rev=8482&view=rev Author: dmichelsen Date: 2010-02-11 09:33:18 +0000 (Thu, 11 Feb 2010) Log Message: ----------- patch: Overriding install dirs is no longer necessary Modified Paths: -------------- csw/mgar/pkg/patch/trunk/Makefile Modified: csw/mgar/pkg/patch/trunk/Makefile =================================================================== --- csw/mgar/pkg/patch/trunk/Makefile 2010-02-11 09:25:11 UTC (rev 8481) +++ csw/mgar/pkg/patch/trunk/Makefile 2010-02-11 09:33:18 UTC (rev 8482) @@ -24,8 +24,6 @@ EXTRA_LINKER_FLAGS = -lgnugetopt BUILD_ARGS = SHELL=bash -INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir mandir - 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 Thu Feb 11 10:56:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Feb 2010 09:56:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8483] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8483 http://gar.svn.sourceforge.net/gar/?rev=8483&view=rev Author: dmichelsen Date: 2010-02-11 09:56:22 +0000 (Thu, 11 Feb 2010) Log Message: ----------- mGAR v2: Fix override variable assembly Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-11 09:33:18 UTC (rev 8482) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-11 09:56:22 UTC (rev 8483) @@ -662,9 +662,9 @@ merge-checkpkgoverrides-%: @echo "[ Generating checkpkg override for package $* ]" $(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/checkpkg/overrides - $(_DBG)$(foreach O,$(or $(CHECKPKG_OVERRIDES_$*),$(CHECKPKG_OVERRIDES)),echo "$O" | \ - perl -F'\|' -ane 'unshift @F,"$*" if(@F<2); print "$$F[0]: $$F[1]";print " $$F[2]" if( $$F[2] );' \ - > $(PKGROOT)/opt/csw/share/checkpkg/overrides/$(call catalogname,$*)) + $(_DBG)($(foreach O,$(or $(CHECKPKG_OVERRIDES_$*),$(CHECKPKG_OVERRIDES)),echo "$O";)) | \ + perl -F'\|' -ane 'unshift @F,"$*" if(@F<2); $$F[0].=":"; print join(" ", at F );' \ + > $(PKGROOT)/opt/csw/share/checkpkg/overrides/$(call catalogname,$*) @$(MAKECOOKIE) merge-checkpkgoverrides: $(foreach S,$(SPKG_SPECS),$(if $(or $(CHECKPKG_OVERRIDES_$S),$(CHECKPKG_OVERRIDES)),merge-checkpkgoverrides-$S)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Thu Feb 11 12:32:54 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Thu, 11 Feb 2010 11:32:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8484] csw/mgar/pkg/cpan/DBD-mysql/trunk Message-ID: Revision: 8484 http://gar.svn.sourceforge.net/gar/?rev=8484&view=rev Author: bensons Date: 2010-02-11 11:32:54 +0000 (Thu, 11 Feb 2010) Log Message: ----------- cpan DBD-mysql: bump version, link against libmysql5 Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile csw/mgar/pkg/cpan/DBD-mysql/trunk/checksums Modified: csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile 2010-02-11 09:56:22 UTC (rev 8483) +++ csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile 2010-02-11 11:32:54 UTC (rev 8484) @@ -1,5 +1,5 @@ GARNAME = DBD-mysql -GARVERSION = 4.012 +GARVERSION = 4.013 CATEGORIES = cpan AUTHOR = CAPTTOFU @@ -17,12 +17,15 @@ CATALOGNAME = pm_dbdmysql PACKAGES = CSWpmdbdmysql -ARCHALL_CSWpmdbdmysql = 1 +# ARCHALL_CSWpmdbdmysql = 1 LICENSE = README -PKGS_REQUIRED_CSWpmdbdmysql = CSWmysql4 +PKGS_REQUIRED_CSWpmdbdmysql = CSWmysql5 CONFIGURE_ARGS += --ssl +CONFIGURE_ARGS += --testuser=test +CONFIGURE_ARGS += --mysql_config=$(prefix)/mysql5/bin/mysql_config +EXTRA_LIB = $(prefix)/mysql5/lib/mysql include gar/category.mk Modified: csw/mgar/pkg/cpan/DBD-mysql/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DBD-mysql/trunk/checksums 2010-02-11 09:56:22 UTC (rev 8483) +++ csw/mgar/pkg/cpan/DBD-mysql/trunk/checksums 2010-02-11 11:32:54 UTC (rev 8484) @@ -1,3 +1 @@ -4c0cca46df9ca5438484f48a7a1142cc download/CSWpmdbdmysql.gspec -882cfc02f0fd6a7892b45bc34a8a9755 download/CSWpmdbdmysql.depend -157f817d26a52aaaff61ce38f7043b95 download/DBD-mysql-4.003.tar.gz +0b28c245eb4cc49d5071db91bd8819b1 DBD-mysql-4.013.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Thu Feb 11 12:48:30 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Thu, 11 Feb 2010 11:48:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8485] csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile Message-ID: Revision: 8485 http://gar.svn.sourceforge.net/gar/?rev=8485&view=rev Author: bensons Date: 2010-02-11 11:48:30 +0000 (Thu, 11 Feb 2010) Log Message: ----------- cpan DBD-mysql: added zlib dependency Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile Modified: csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile 2010-02-11 11:32:54 UTC (rev 8484) +++ csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile 2010-02-11 11:48:30 UTC (rev 8485) @@ -21,10 +21,11 @@ LICENSE = README -PKGS_REQUIRED_CSWpmdbdmysql = CSWmysql5 +BUILD_DEP_PKGS = CSWmysql5 CSWmysql5rt CSWmysql5devel CSWzlib +RUNTIME_DEP_PKGS = CSWmysql5rt CSWzlib CONFIGURE_ARGS += --ssl -CONFIGURE_ARGS += --testuser=test +CONFIGURE_ARGS += --testuser=root CONFIGURE_ARGS += --mysql_config=$(prefix)/mysql5/bin/mysql_config EXTRA_LIB = $(prefix)/mysql5/lib/mysql 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 Feb 11 13:04:42 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Feb 2010 12:04:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[8486] csw/mgar/pkg/chkconfig/trunk Message-ID: Revision: 8486 http://gar.svn.sourceforge.net/gar/?rev=8486&view=rev Author: dmichelsen Date: 2010-02-11 12:04:42 +0000 (Thu, 11 Feb 2010) Log Message: ----------- alternatives: Add class actions scripts Modified Paths: -------------- csw/mgar/pkg/chkconfig/trunk/Makefile csw/mgar/pkg/chkconfig/trunk/checksums Added Paths: ----------- csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives Modified: csw/mgar/pkg/chkconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/chkconfig/trunk/Makefile 2010-02-11 11:48:30 UTC (rev 8485) +++ csw/mgar/pkg/chkconfig/trunk/Makefile 2010-02-11 12:04:42 UTC (rev 8486) @@ -13,6 +13,8 @@ MASTER_SITES = http://www.sfr-fresh.com/unix/privat/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWalternatives.i.cswalternatives +DISTFILES += CSWalternatives.r.cswalternatives PATCHFILES = alloca.patch PATCHFILES += 0001-Add-missing-include-to-alloca.h.patch PATCHFILES += 0002-Don-t-use-named-struct-initializers.patch @@ -42,4 +44,7 @@ post-merge: ginstall -d $(PKGROOT)/etc/opt/csw/alternatives ginstall -d $(PKGROOT)/var/opt/csw/alternatives + ginstall -d $(PKGROOT)/usr/sadm/install/scripts + ginstall $(WORKDIR)/CSWalternatives.i.cswalternatives $(PKGROOT)/usr/sadm/install/scripts/i.cswalternatives + ginstall $(WORKDIR)/CSWalternatives.r.cswalternatives $(PKGROOT)/usr/sadm/install/scripts/r.cswalternatives @$(MAKECOOKIE) Modified: csw/mgar/pkg/chkconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/chkconfig/trunk/checksums 2010-02-11 11:48:30 UTC (rev 8485) +++ csw/mgar/pkg/chkconfig/trunk/checksums 2010-02-11 12:04:42 UTC (rev 8486) @@ -1,5 +1,7 @@ d56d4f7b5aef5af5235943c384734780 0001-Add-missing-include-to-alloca.h.patch a1045173b8bc0a667883080f85a38597 0002-Don-t-use-named-struct-initializers.patch 5abe74bf8f38f45068f43f12b52cfc4b 0003-Fix-manpage-to-use-csw-pathes.patch +9fcb33b563739c901979bee70a76fb69 CSWalternatives.i.cswalternatives +b894fb63bd824403aa56034ac6a0bb57 CSWalternatives.r.cswalternatives 02019af22d048085f3006de791a0c95e alloca.patch 592a1fe77f3844d7748adbab6357ee25 chkconfig-1.3.30c.tar.gz Added: csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives =================================================================== --- csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives (rev 0) +++ csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives 2010-02-11 12:04:42 UTC (rev 8486) @@ -0,0 +1,37 @@ +#!/bin/sh +# +# i.cswalternatives - Class action script for +# registering applications in alternatives +# +# Written and maintained by Dagobert Michelsen +# +# 2010-02-11 Initial release + +: ${PKG_INSTALL_ROOT:=/} + +while read src dest; do + /usr/bin/cp $src $dest || exit 2 + + cat $dest | while read C; do + set -- $C + + echo "Registering alternative $3 ..." + + A="--install $1 $2 $3 $4" + shift; shift; shift; shift + + while [ $# -gt 0 ]; do + A="$A --slave $1 $2 $3" + shift; shift; shift + done + + if [ -x ${PKG_INSTALL_ROOT}/opt/csw/sbin/alternatives ]; then + chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives $A + else + echo "ERROR: /opt/csw/sbin/alternatives could not be found" >&2 + exit 2 + fi + done +done + +exit 0 Added: csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives =================================================================== --- csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives (rev 0) +++ csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives 2010-02-11 12:04:42 UTC (rev 8486) @@ -0,0 +1,27 @@ +#!/bin/sh +# +# r.cswalternatives - Class action script for +# registering applications in alternatives +# +# Written and maintained by Dagobert Michelsen +# +# 2010-02-11 Initial release + +: ${PKG_INSTALL_ROOT:=/} + +while read dest; do + cat $dest | while read C; do + set -- $C + + echo "Unregistering alternative $3 ..." + + if [ -x ${PKG_INSTALL_ROOT}/opt/csw/sbin/alternatives ]; then + chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives --remove $2 $3 + else + echo "ERROR: /opt/csw/sbin/alternatives could not be found" >&2 + exit 2 + fi + done +done + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Thu Feb 11 13:18:42 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Thu, 11 Feb 2010 12:18:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[8487] csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile Message-ID: Revision: 8487 http://gar.svn.sourceforge.net/gar/?rev=8487&view=rev Author: bensons Date: 2010-02-11 12:18:42 +0000 (Thu, 11 Feb 2010) Log Message: ----------- cpan DBD-mysql: added dependency Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile Modified: csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile 2010-02-11 12:04:42 UTC (rev 8486) +++ csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile 2010-02-11 12:18:42 UTC (rev 8487) @@ -21,8 +21,8 @@ LICENSE = README -BUILD_DEP_PKGS = CSWmysql5 CSWmysql5rt CSWmysql5devel CSWzlib -RUNTIME_DEP_PKGS = CSWmysql5rt CSWzlib +BUILD_DEP_PKGS = CSWmysql5 CSWmysql5rt CSWmysql5devel CSWzlib CSWosslrt CSWpmdbi +RUNTIME_DEP_PKGS = CSWmysql5rt CSWzlib CSWosslrt CSWpmdbi CONFIGURE_ARGS += --ssl CONFIGURE_ARGS += --testuser=root 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 Feb 11 13:41:18 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Feb 2010 12:41:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8488] csw/mgar/pkg/automake/trunk/Makefile Message-ID: Revision: 8488 http://gar.svn.sourceforge.net/gar/?rev=8488&view=rev Author: dmichelsen Date: 2010-02-11 12:41:18 +0000 (Thu, 11 Feb 2010) Log Message: ----------- automake: Add alternatives Modified Paths: -------------- csw/mgar/pkg/automake/trunk/Makefile Modified: csw/mgar/pkg/automake/trunk/Makefile =================================================================== --- csw/mgar/pkg/automake/trunk/Makefile 2010-02-11 12:18:42 UTC (rev 8487) +++ csw/mgar/pkg/automake/trunk/Makefile 2010-02-11 12:41:18 UTC (rev 8488) @@ -46,6 +46,23 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.9.6 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.10.3 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* +# alternatives [options] --install link name path priority [- +# -slave link name path]... [--initscript service] + +ALTERNATIVES = 1.6 1.7 1.8 1.9 1.10 1.11 +ALTERNATIVE_1.6 = $(bindir)/automake automake $(bindir)/automake-1.6 60 +ALTERNATIVE_1.6 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.6 +ALTERNATIVE_1.7 = $(bindir)/automake automake $(bindir)/automake-1.7 70 +ALTERNATIVE_1.7 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.7 +ALTERNATIVE_1.8 = $(bindir)/automake automake $(bindir)/automake-1.8 80 +ALTERNATIVE_1.8 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.8 +ALTERNATIVE_1.9 = $(bindir)/automake automake $(bindir)/automake-1.9 90 +ALTERNATIVE_1.9 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.9 +ALTERNATIVE_1.10 = $(bindir)/automake automake $(bindir)/automake-1.10 100 +ALTERNATIVE_1.10 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.10 +ALTERNATIVE_1.11 = $(bindir)/automake automake $(bindir)/automake-1.11 110 +ALTERNATIVE_1.11 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.11 + include gar/category.mk $(DOWNLOADDIR)/README.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 Thu Feb 11 13:43:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Feb 2010 12:43:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8489] csw/mgar/pkg/automake/trunk/Makefile Message-ID: Revision: 8489 http://gar.svn.sourceforge.net/gar/?rev=8489&view=rev Author: dmichelsen Date: 2010-02-11 12:43:00 +0000 (Thu, 11 Feb 2010) Log Message: ----------- automake: Add alternatives Modified Paths: -------------- csw/mgar/pkg/automake/trunk/Makefile Modified: csw/mgar/pkg/automake/trunk/Makefile =================================================================== --- csw/mgar/pkg/automake/trunk/Makefile 2010-02-11 12:41:18 UTC (rev 8488) +++ csw/mgar/pkg/automake/trunk/Makefile 2010-02-11 12:43:00 UTC (rev 8489) @@ -75,8 +75,6 @@ post-merge: @rm -f $(PKGROOT)$(bindir)/aclocal - @gln -s aclocal-1.11 $(PKGROOT)$(bindir)/aclocal @rm -f $(PKGROOT)$(bindir)/automake - @gln -s automake-1.11 $(PKGROOT)$(bindir)/automake @ginstall $(WORKDIR)/README.CSW $(PKGROOT)$(docdir)/$(GARNAME)/ @$(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 Thu Feb 11 14:09:52 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Feb 2010 13:09:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8490] csw/mgar/gar/v2 Message-ID: Revision: 8490 http://gar.svn.sourceforge.net/gar/?rev=8490&view=rev Author: dmichelsen Date: 2010-02-11 13:09:52 +0000 (Thu, 11 Feb 2010) Log Message: ----------- mGAR v2: Add directory of system class action scripts to commondirs Modified Paths: -------------- csw/mgar/gar/v2/bin/update-commondirs csw/mgar/gar/v2/etc/commondirs-i386 csw/mgar/gar/v2/etc/commondirs-sparc Modified: csw/mgar/gar/v2/bin/update-commondirs =================================================================== --- csw/mgar/gar/v2/bin/update-commondirs 2010-02-11 12:43:00 UTC (rev 8489) +++ csw/mgar/gar/v2/bin/update-commondirs 2010-02-11 13:09:52 UTC (rev 8490) @@ -29,7 +29,10 @@ print ($l[3] =~ /([^=]*)/); print "\n"; } - ' $TMPDIR/CSWcommon/pkgmap; echo "/var"; echo "/var/run") > ../etc/commondirs-$1 + ' $TMPDIR/CSWcommon/pkgmap + echo "/var"; echo "/var/run" + echo "/usr"; echo "/usr/sadm"; echo "/usr/sadm/install"; echo "/usr/sadm/install/scripts" + ) > ../etc/commondirs-$1 rm -rf $TMPDIR } Modified: csw/mgar/gar/v2/etc/commondirs-i386 =================================================================== --- csw/mgar/gar/v2/etc/commondirs-i386 2010-02-11 12:43:00 UTC (rev 8489) +++ csw/mgar/gar/v2/etc/commondirs-i386 2010-02-11 13:09:52 UTC (rev 8490) @@ -156,3 +156,7 @@ /var/opt/csw/pkg-hooks /var /var/run +/usr +/usr/sadm +/usr/sadm/install +/usr/sadm/install/scripts Modified: csw/mgar/gar/v2/etc/commondirs-sparc =================================================================== --- csw/mgar/gar/v2/etc/commondirs-sparc 2010-02-11 12:43:00 UTC (rev 8489) +++ csw/mgar/gar/v2/etc/commondirs-sparc 2010-02-11 13:09:52 UTC (rev 8490) @@ -160,3 +160,7 @@ /var/opt/csw/pkg-hooks /var /var/run +/usr +/usr/sadm +/usr/sadm/install +/usr/sadm/install/scripts 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 Feb 11 14:14:52 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Feb 2010 13:14:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8491] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 8491 http://gar.svn.sourceforge.net/gar/?rev=8491&view=rev Author: dmichelsen Date: 2010-02-11 13:14:52 +0000 (Thu, 11 Feb 2010) Log Message: ----------- cswclassutils: Use built-in exclude of /usr/sadm/install/scripts from GAR and use prototype modifiers Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-02-11 13:09:52 UTC (rev 8490) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-02-11 13:14:52 UTC (rev 8491) @@ -22,7 +22,10 @@ CASLIST = $(foreach F,$(CASFILES), $(subst $(FILEDIR)/CSW$(GARNAME).,,$(F))) DISTFILES += $(subst $(FILEDIR)/,,$(CASFILES)) -PROTOTYPE_FILTER = sed -e '/^d.*\/usr/d; /scripts/{ s/bin/sys/; }' +PROTOTYPE_MODIFIERS = cas +PROTOTYPE_FILES_cas = /usr/sadm/install/scripts/.* +PROTOTYPE_USER_cas = bin +PROTOTYPE_GROUP_cas = sys include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Feb 11 14:22:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Feb 2010 13:22:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8492] csw/mgar/gar/v2/Makefile Message-ID: Revision: 8492 http://gar.svn.sourceforge.net/gar/?rev=8492&view=rev Author: dmichelsen Date: 2010-02-11 13:22:16 +0000 (Thu, 11 Feb 2010) Log Message: ----------- mGAR v2: Stop the unwary Modified Paths: -------------- csw/mgar/gar/v2/Makefile Modified: csw/mgar/gar/v2/Makefile =================================================================== --- csw/mgar/gar/v2/Makefile 2010-02-11 13:14:52 UTC (rev 8491) +++ csw/mgar/gar/v2/Makefile 2010-02-11 13:22:16 UTC (rev 8492) @@ -1,3 +1,7 @@ + +stoptheunwary: + $(error "*** You are in the GAR directory and probably didn't mean to call make") + FILTER_DIRS = CVS/ bin/ meta/ # top-level Makefile for the entire tree. %: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Feb 11 14:31:16 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 11 Feb 2010 13:31:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8493] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 8493 http://gar.svn.sourceforge.net/gar/?rev=8493&view=rev Author: bonivart Date: 2010-02-11 13:31:15 +0000 (Thu, 11 Feb 2010) Log Message: ----------- cswclassutils: more fixes for bug 4118 Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpostmsg csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpostmsg Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-02-11 13:22:16 UTC (rev 8492) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-02-11 13:31:15 UTC (rev 8493) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.32 +GARVERSION = 1.33 CATEGORIES = utils DESCRIPTION = CSW class action utilities Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2010-02-11 13:22:16 UTC (rev 8492) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2010-02-11 13:31:15 UTC (rev 8493) @@ -1,12 +1,12 @@ 48a97af56d55bc90ce90303228ed8cc3 COPYING -0b221f753df5c3f953ecdcb90ece6456 CSWcswclassutils.i.cswcpsampleconf +9846081f8109dc9149dc026b89fbf137 CSWcswclassutils.i.cswcpsampleconf 9a6f5ad4919b78e4083491edcd86db0c CSWcswclassutils.i.cswcrontab 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices 4f2e9de463cb4b17ba6e1b3dfdf18913 CSWcswclassutils.i.cswinetd 6abb13158fee906870d1d68dc0fae6f3 CSWcswclassutils.i.cswinitsmf 17382424148caa223f161ddfd2fb427a CSWcswclassutils.i.cswmigrateconf -79e4e0699a94a2d878f8ba73438c64b8 CSWcswclassutils.i.cswpostmsg -d40da31a034daaf269b9f381fb93e88b CSWcswclassutils.i.cswpreserveconf +64c2401821581ebd699ed686be48480a CSWcswclassutils.i.cswpostmsg +0fc6128391af4c9aebf72b84755532cb CSWcswclassutils.i.cswpreserveconf 9018419febe06c12e89d66cc76e7261f CSWcswclassutils.i.cswpycompile 1282bef941c49d98a061b3701a1fda7c CSWcswclassutils.i.cswtexinfo 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup @@ -16,7 +16,7 @@ 9039ea60ad4c3f8994205fb242a49a72 CSWcswclassutils.r.cswinetd 791db9c2f6685aca67043820d260fc60 CSWcswclassutils.r.cswinitsmf f7a2a10bbf0f88c1909a31141e6d83ce CSWcswclassutils.r.cswmigrateconf -cd1f26f0fe03e4537ed68fa6354f670b CSWcswclassutils.r.cswpostmsg +202339120c817728986248cf397c6b2d CSWcswclassutils.r.cswpostmsg 96453922952c92c6c5a024e54ed8525f CSWcswclassutils.r.cswpreserveconf 02326250b63d3c75c45a8ff81768e923 CSWcswclassutils.r.cswpycompile ed76f47b045b000ab78154a90cf90ed4 CSWcswclassutils.r.cswtexinfo Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf 2010-02-11 13:22:16 UTC (rev 8492) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcpsampleconf 2010-02-11 13:31:15 UTC (rev 8493) @@ -31,15 +31,21 @@ echo $confdest already exists. Not overwriting else echo Copying sample config to $confdest - [ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync > /dev/null 2>&1 - file=`echo $dest | sed -e "s,$PKG_INSTALL_ROOT,,"` + [ -x $PKG_INSTALL_ROOT/usr/bin/pkgadm ] && $PKG_INSTALL_ROOT/usr/bin/pkgadm sync > /dev/null 2>&1 + if [ "$PKG_INSTALL_ROOT" ]; then + file=`echo $dest | sed -e "s,$PKG_INSTALL_ROOT,,"` + else + file=$dest + fi + cp $dest $confdest contents=`grep "^$file" $PKG_INSTALL_ROOT/var/sadm/install/contents` - mode=`echo $contents | awk '{print $4}'` - user=`echo $contents | awk '{print $5}'` - group=`echo $contents | awk '{print $6}'` - cp $dest $confdest - chmod $mode $confdest - chown $user:$group $confdest + if [ "$contents" ]; then + mode=`echo $contents | awk '{print $4}'` + user=`echo $contents | awk '{print $5}'` + group=`echo $contents | awk '{print $6}'` + chmod $mode $confdest + chown $user:$group $confdest + fi fi done Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpostmsg =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpostmsg 2010-02-11 13:22:16 UTC (rev 8492) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpostmsg 2010-02-11 13:31:15 UTC (rev 8493) @@ -2,7 +2,7 @@ # # i.cswpostmsg - Class action script to display a message after install # -# $Id: CSWcswclassutils.i.cswusergroup 6859 2009-10-14 14:04:00Z bdwalton $ +# $Id$ # # Written by Peter Bonivart # Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2010-02-11 13:22:16 UTC (rev 8492) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2010-02-11 13:31:15 UTC (rev 8493) @@ -39,15 +39,21 @@ echo $confdest already exists. Not overwriting else echo Copying sample config to $confdest - [ -x /usr/bin/pkgadm ] && /usr/bin/pkgadm sync > /dev/null 2>&1 - file=`echo $dest | sed -e "s,$PKG_INSTALL_ROOT,,"` + [ -x $PKG_INSTALL_ROOT/usr/bin/pkgadm ] && $PKG_INSTALL_ROOT/usr/bin/pkgadm sync > /dev/null 2>&1 + if [ "$PKG_INSTALL_ROOT" ]; then + file=`echo $dest | sed -e "s,$PKG_INSTALL_ROOT,,"` + else + file=$dest + fi + cp $dest $confdest contents=`grep "^$file" $PKG_INSTALL_ROOT/var/sadm/install/contents` - mode=`echo $contents | awk '{print $4}'` - user=`echo $contents | awk '{print $5}'` - group=`echo $contents | awk '{print $6}'` - cp $dest $confdest - chmod $mode $confdest - chown $user:$group $confdest + if [ "$contents" ]; then + mode=`echo $contents | awk '{print $4}'` + user=`echo $contents | awk '{print $5}'` + group=`echo $contents | awk '{print $6}'` + chmod $mode $confdest + chown $user:$group $confdest + fi fi done Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpostmsg =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpostmsg 2010-02-11 13:22:16 UTC (rev 8492) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpostmsg 2010-02-11 13:31:15 UTC (rev 8493) @@ -2,7 +2,7 @@ # # r.cswpostmsg - Class action script to display a message after install # -# $Id: CSWcswclassutils.i.cswusergroup 6859 2009-10-14 14:04:00Z bdwalton $ +# $Id$ # # Written by Peter Bonivart # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Feb 11 14:47:50 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 11 Feb 2010 13:47:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8494] csw/mgar/pkg/cswclassutils/trunk/files Message-ID: Revision: 8494 http://gar.svn.sourceforge.net/gar/?rev=8494&view=rev Author: bonivart Date: 2010-02-11 13:47:50 +0000 (Thu, 11 Feb 2010) Log Message: ----------- cswclassutils: set Id keyword on postmsg class scripts Property Changed: ---------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpostmsg csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpostmsg Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpostmsg ___________________________________________________________________ Added: svn:keywords + Id Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpostmsg ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Feb 11 14:49:35 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 11 Feb 2010 13:49:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[8495] csw/mgar/pkg/cswclassutils/trunk/checksums Message-ID: Revision: 8495 http://gar.svn.sourceforge.net/gar/?rev=8495&view=rev Author: bonivart Date: 2010-02-11 13:49:35 +0000 (Thu, 11 Feb 2010) Log Message: ----------- cswclassutils: forgot checksums (again :-) Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2010-02-11 13:47:50 UTC (rev 8494) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2010-02-11 13:49:35 UTC (rev 8495) @@ -5,7 +5,7 @@ 4f2e9de463cb4b17ba6e1b3dfdf18913 CSWcswclassutils.i.cswinetd 6abb13158fee906870d1d68dc0fae6f3 CSWcswclassutils.i.cswinitsmf 17382424148caa223f161ddfd2fb427a CSWcswclassutils.i.cswmigrateconf -64c2401821581ebd699ed686be48480a CSWcswclassutils.i.cswpostmsg +8ab721535d43dcef702538d394e7a2ce CSWcswclassutils.i.cswpostmsg 0fc6128391af4c9aebf72b84755532cb CSWcswclassutils.i.cswpreserveconf 9018419febe06c12e89d66cc76e7261f CSWcswclassutils.i.cswpycompile 1282bef941c49d98a061b3701a1fda7c CSWcswclassutils.i.cswtexinfo @@ -16,7 +16,7 @@ 9039ea60ad4c3f8994205fb242a49a72 CSWcswclassutils.r.cswinetd 791db9c2f6685aca67043820d260fc60 CSWcswclassutils.r.cswinitsmf f7a2a10bbf0f88c1909a31141e6d83ce CSWcswclassutils.r.cswmigrateconf -202339120c817728986248cf397c6b2d CSWcswclassutils.r.cswpostmsg +76a18fed9174724f866ede53edda41fc CSWcswclassutils.r.cswpostmsg 96453922952c92c6c5a024e54ed8525f CSWcswclassutils.r.cswpreserveconf 02326250b63d3c75c45a8ff81768e923 CSWcswclassutils.r.cswpycompile ed76f47b045b000ab78154a90cf90ed4 CSWcswclassutils.r.cswtexinfo 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 Feb 11 15:02:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Feb 2010 14:02:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8496] csw/mgar/pkg/chkconfig/trunk Message-ID: Revision: 8496 http://gar.svn.sourceforge.net/gar/?rev=8496&view=rev Author: dmichelsen Date: 2010-02-11 14:02:58 +0000 (Thu, 11 Feb 2010) Log Message: ----------- alternatives: Remove cas file on pkgrm Modified Paths: -------------- csw/mgar/pkg/chkconfig/trunk/checksums csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives Modified: csw/mgar/pkg/chkconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/chkconfig/trunk/checksums 2010-02-11 13:49:35 UTC (rev 8495) +++ csw/mgar/pkg/chkconfig/trunk/checksums 2010-02-11 14:02:58 UTC (rev 8496) @@ -2,6 +2,6 @@ a1045173b8bc0a667883080f85a38597 0002-Don-t-use-named-struct-initializers.patch 5abe74bf8f38f45068f43f12b52cfc4b 0003-Fix-manpage-to-use-csw-pathes.patch 9fcb33b563739c901979bee70a76fb69 CSWalternatives.i.cswalternatives -b894fb63bd824403aa56034ac6a0bb57 CSWalternatives.r.cswalternatives +918f71026f5ec5b08dcf138866f3979b CSWalternatives.r.cswalternatives 02019af22d048085f3006de791a0c95e alloca.patch 592a1fe77f3844d7748adbab6357ee25 chkconfig-1.3.30c.tar.gz Modified: csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives =================================================================== --- csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives 2010-02-11 13:49:35 UTC (rev 8495) +++ csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives 2010-02-11 14:02:58 UTC (rev 8496) @@ -22,6 +22,8 @@ exit 2 fi done + + rm -f $dest done exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Feb 11 16:02:45 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 11 Feb 2010 15:02:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8497] csw/mgar/pkg/libsoup/trunk Message-ID: Revision: 8497 http://gar.svn.sourceforge.net/gar/?rev=8497&view=rev Author: hson Date: 2010-02-11 15:02:45 +0000 (Thu, 11 Feb 2010) Log Message: ----------- Add empty libsoup2 package for compat Include old libraries for compat Ready for release Modified Paths: -------------- csw/mgar/pkg/libsoup/trunk/Makefile csw/mgar/pkg/libsoup/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libsoup/trunk/files/old_libs_i386.tar.bz2 csw/mgar/pkg/libsoup/trunk/files/old_libs_sparc.tar.bz2 Modified: csw/mgar/pkg/libsoup/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsoup/trunk/Makefile 2010-02-11 14:02:58 UTC (rev 8496) +++ csw/mgar/pkg/libsoup/trunk/Makefile 2010-02-11 15:02:45 UTC (rev 8497) @@ -1,6 +1,6 @@ GARNAME = libsoup GARVERSION = 2.26.3 -CATEGORIES = lib +CATEGORIES = gnome DESCRIPTION = HTTP client/server library for GNOME @@ -8,31 +8,48 @@ endef MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += old_libs_i386.tar.bz2 +DISTFILES += old_libs_sparc.tar.bz2 - -PACKAGES = CSWlibsoup CSWlibsoupdevel CSWlibsoupdoc +PACKAGES = CSWlibsoup CSWlibsoupdevel CSWlibsoupdoc CSWlibsoup2 CATALOGNAME_CSWlibsoup = libsoup +CATALOGNAME_CSWlibsoup2 = libsoup2 CATALOGNAME_CSWlibsoupdevel = libsoup_devel CATALOGNAME_CSWlibsoupdoc = libsoup_doc SPKG_DESC_CSWlibsoup += HTTP client/server library for GNOME +# For compat with old packages +SPKG_DESC_CSWlibsoup2 += HTTP client/server library for GNOME - dummy package SPKG_DESC_CSWlibsoupdevel += HTTP client/server library for GNOME - developer package SPKG_DESC_CSWlibsoupdoc += HTTP client/server library for GNOME - documentation RUNTIME_DEP_PKGS_CSWlibsoup += CSWgconf2 CSWgcrypt CSWggettextrt CSWglib2 RUNTIME_DEP_PKGS_CSWlibsoup += CSWgnutls CSWgpgerr CSWlibproxy CSWlibxml2 RUNTIME_DEP_PKGS_CSWlibsoup += CSWsqlite3rt +# Required for old libraries +RUNTIME_DEP_PKGS_CSWlibsoup += CSWiconv +RUNTIME_DEP_PKGS_CSWlibsoup += CSWsunmath +RUNTIME_DEP_PKGS_CSWlibsoup += CSWzlib +RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWlibsoup RUNTIME_DEP_PKGS_CSWlibsoupdevel += CSWlibsoup RUNTIME_DEP_PKGS_CSWlibsoupdoc += BUILD_DEP_PKGS += CSWlibproxy +PKGFILES_CSWlibsoup2 = non-existing PKGFILES_CSWlibsoupdevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibsoupdoc = $(sharedstatedir)/gtk-doc/.* ARCHALL_CSWlibsoupdoc = 1 +ARCHALL_CSWlibsoup2 = 1 -# We define upstream file regex so we can be notifed of new upstream software release +# libgnutls.so.11 no longer exists, but in case someone still use libsoup-2.0.so +# and still have libgnutls.so.11 we override checkpkg +CHECKPKG_OVERRIDES += CSWlibsoup|orphan-soname|libgnutls.so.11 +CHECKPKG_OVERRIDES += CSWlibsoup|symbol-not-found|libsoup-2.0.so.0.0.0 +# Possible bug in checkpkg +CHECKPKG_OVERRIDES += CSWlibsoup|symbol-not-found|libsoup-gnome-2.4.so.1.2.0 + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 EXTRA_INC = /opt/csw/X11/include @@ -41,6 +58,7 @@ EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-libgcrypt-prefix=$(prefix) CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) @@ -54,3 +72,20 @@ TEST_TARGET = include gar/category.mk + +# Include old libraries package for compatibility +post-install-isa-sparcv8: + @(bzip2 -dc $(DOWNLOADDIR)/old_libs_sparc.tar.bz2 | (cd $(INSTALLISADIR)$(libdir);tar xf -)) + ( if [ ! -r $(INSTALLISADIR)$(libdir)/libsoup-2.0.so.0 ] ; then ln -s libsoup-2.0.so.0.0.0 $(INSTALLISADIR)$(libdir)/libsoup-2.0.so.0 ; fi ) + ( if [ ! -r $(INSTALLISADIR)$(libdir)/libsoup-2.0.so ] ; then ln -s libsoup-2.0.so.0.0.0 $(INSTALLISADIR)$(libdir)/libsoup-2.0.so ; fi ) + ( if [ ! -r $(INSTALLISADIR)$(libdir)/libsoup-2.2.so.8 ] ; then ln -s libsoup-2.2.so.8.4.0 $(INSTALLISADIR)$(libdir)/libsoup-2.2.so.8 ; fi ) + ( if [ ! -r $(INSTALLISADIR)$(libdir)/libsoup-2.2.so ] ; then ln -s libsoup-2.2.so.8.4.0 $(INSTALLISADIR)$(libdir)/libsoup-2.2.so ; fi ) + $(MAKECOOKIE) + +post-install-isa-i386: + @(bzip2 -dc $(DOWNLOADDIR)/old_libs_i386.tar.bz2 | (cd $(INSTALLISADIR)$(libdir);tar xf -)) + ( if [ ! -r $(INSTALLISADIR)$(libdir)/libsoup-2.0.so.0 ] ; then ln -s libsoup-2.0.so.0.0.0 $(INSTALLISADIR)$(libdir)/libsoup-2.0.so.0 ; fi ) + ( if [ ! -r $(INSTALLISADIR)$(libdir)/libsoup-2.0.so ] ; then ln -s libsoup-2.0.so.0.0.0 $(INSTALLISADIR)$(libdir)/libsoup-2.0.so ; fi ) + ( if [ ! -r $(INSTALLISADIR)$(libdir)/libsoup-2.2.so.8 ] ; then ln -s libsoup-2.2.so.8.4.0 $(INSTALLISADIR)$(libdir)/libsoup-2.2.so.8 ; fi ) + ( if [ ! -r $(INSTALLISADIR)$(libdir)/libsoup-2.2.so ] ; then ln -s libsoup-2.2.so.8.4.0 $(INSTALLISADIR)$(libdir)/libsoup-2.2.so ; fi ) + $(MAKECOOKIE) Modified: csw/mgar/pkg/libsoup/trunk/checksums =================================================================== --- csw/mgar/pkg/libsoup/trunk/checksums 2010-02-11 14:02:58 UTC (rev 8496) +++ csw/mgar/pkg/libsoup/trunk/checksums 2010-02-11 15:02:45 UTC (rev 8497) @@ -1 +1,3 @@ 19f15636380a9a08a0f071cc53069b80 libsoup-2.26.3.tar.bz2 +7664d9f4057e9d7ce89d3dd7d7466061 old_libs_i386.tar.bz2 +8bdff7a9f5b23bd63ffcf6fef24734e5 old_libs_sparc.tar.bz2 Added: csw/mgar/pkg/libsoup/trunk/files/old_libs_i386.tar.bz2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/libsoup/trunk/files/old_libs_i386.tar.bz2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/libsoup/trunk/files/old_libs_sparc.tar.bz2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/libsoup/trunk/files/old_libs_sparc.tar.bz2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Feb 11 16:21:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Feb 2010 15:21:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8498] csw/mgar/pkg/chkconfig/trunk Message-ID: Revision: 8498 http://gar.svn.sourceforge.net/gar/?rev=8498&view=rev Author: dmichelsen Date: 2010-02-11 15:21:03 +0000 (Thu, 11 Feb 2010) Log Message: ----------- alternatives: Update CAS Modified Paths: -------------- csw/mgar/pkg/chkconfig/trunk/checksums csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives Modified: csw/mgar/pkg/chkconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/chkconfig/trunk/checksums 2010-02-11 15:02:45 UTC (rev 8497) +++ csw/mgar/pkg/chkconfig/trunk/checksums 2010-02-11 15:21:03 UTC (rev 8498) @@ -1,7 +1,7 @@ d56d4f7b5aef5af5235943c384734780 0001-Add-missing-include-to-alloca.h.patch a1045173b8bc0a667883080f85a38597 0002-Don-t-use-named-struct-initializers.patch 5abe74bf8f38f45068f43f12b52cfc4b 0003-Fix-manpage-to-use-csw-pathes.patch -9fcb33b563739c901979bee70a76fb69 CSWalternatives.i.cswalternatives -918f71026f5ec5b08dcf138866f3979b CSWalternatives.r.cswalternatives +7acb4c811cecd886e010104270e6f2ff CSWalternatives.i.cswalternatives +9f2c7b5521878d39b4524588bf421eef CSWalternatives.r.cswalternatives 02019af22d048085f3006de791a0c95e alloca.patch 592a1fe77f3844d7748adbab6357ee25 chkconfig-1.3.30c.tar.gz Modified: csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives =================================================================== --- csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives 2010-02-11 15:02:45 UTC (rev 8497) +++ csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives 2010-02-11 15:21:03 UTC (rev 8498) @@ -7,6 +7,8 @@ # # 2010-02-11 Initial release +set -x + : ${PKG_INSTALL_ROOT:=/} while read src dest; do @@ -15,22 +17,36 @@ cat $dest | while read C; do set -- $C - echo "Registering alternative $3 ..." + ALTLINK="$1" + ALTNAME="$2" + ALTPATH="$3" + ALTPRIO="$4" - A="--install $1 $2 $3 $4" + echo "Registering '$ALTNAME' alternative $ALTPATH ..." + + ARGS="--install $ALTLINK $ALTNAME $ALTPATH $ALTPRIO" shift; shift; shift; shift while [ $# -gt 0 ]; do - A="$A --slave $1 $2 $3" + ARGS="$ARGS --slave $1 $2 $3" shift; shift; shift done - if [ -x ${PKG_INSTALL_ROOT}/opt/csw/sbin/alternatives ]; then - chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives $A - else + if [ ! -x ${PKG_INSTALL_ROOT}/opt/csw/sbin/alternatives ]; then + chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives $ARGS echo "ERROR: /opt/csw/sbin/alternatives could not be found" >&2 exit 2 fi + + # Redo previous manual selection if this is an upgrade + if [ -L "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$ALTNAME" ]; then + CHOICE=`/usr/bin/perl -e 'print readlink $ARGV[0]' "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$ALTNAME"` + if [ "${CHOICE}" = "$ALTPATH" ]; then + echo "Applying previous manual selection ${CHOICE} ..." + chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives --set $ALTNAME ${CHOICE} + rm -f ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$ALTNAME + fi + fi done done Modified: csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives =================================================================== --- csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives 2010-02-11 15:02:45 UTC (rev 8497) +++ csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives 2010-02-11 15:21:03 UTC (rev 8498) @@ -7,14 +7,28 @@ # # 2010-02-11 Initial release +set -x + : ${PKG_INSTALL_ROOT:=/} while read dest; do cat $dest | while read C; do set -- $C - echo "Unregistering alternative $3 ..." + # If we are in manual mode and the selected item is about to be removed + # make sure to remember the selection for next install to be reset. + if egrep '^manual$' ${PKG_INSTALL_ROOT}/var/opt/csw/alternatives/$2 >/dev/null 2>&1; then + CHOICE="`perl -e 'print readlink $ARGV[0]' ${PKG_INSTALL_ROOT}/etc/opt/csw/alternatives/$2`" + if [ "$3" = "${CHOICE}" ]; then + mkdir -p ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives + rm -f ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$2 + ln -s "${CHOICE}" ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$2 + fi + fi + + echo "Unregistering '$2' alternative $3 ..." + if [ -x ${PKG_INSTALL_ROOT}/opt/csw/sbin/alternatives ]; then chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives --remove $2 $3 else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Thu Feb 11 16:32:49 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Thu, 11 Feb 2010 15:32:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[8499] csw/mgar/pkg/cpan/Crypt-SSLeay/trunk Message-ID: Revision: 8499 http://gar.svn.sourceforge.net/gar/?rev=8499&view=rev Author: bensons Date: 2010-02-11 15:32:46 +0000 (Thu, 11 Feb 2010) Log Message: ----------- cpan Crypt-SSLeay: fix failing test via unset of https_proxy while running as non root user Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/noask.diff Modified: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile 2010-02-11 15:21:03 UTC (rev 8498) +++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile 2010-02-11 15:32:46 UTC (rev 8499) @@ -10,9 +10,6 @@ perldoc LWP for more information on POST requests. endef -# Don't ask about networked tests -- the answer is no. -PATCHFILES += noask.diff - PACKAGES = CSWpmcryptssleay CATALOGNAME = pm_cryptssleay @@ -20,8 +17,9 @@ BUILD_DEP_PKGS = CSWosslrt CSWpmmimebase64 CONFIGURE_ARGS = --lib=$(prefix) +# unset https_proxy, otherwise 1 test will fail as non root user +CONFIGURE_ENV += https_proxy= +# dont ask stupid questions +CONFIGURE_ENV += PERL_MM_USE_DEFAULT=1 include gar/category.mk - -pre-test-modulated: - gsed -i'' 's,fail(,pass(,' $(WORKSRC)/t/01-connect.t Modified: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/checksums 2010-02-11 15:21:03 UTC (rev 8498) +++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/checksums 2010-02-11 15:32:46 UTC (rev 8499) @@ -1,2 +1 @@ 82264180f5911dce33dbd85e24b1f36b Crypt-SSLeay-0.57.tar.gz -39e34bc08f09e4630359eb135272222e noask.diff Deleted: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/noask.diff =================================================================== --- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/noask.diff 2010-02-11 15:21:03 UTC (rev 8498) +++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/noask.diff 2010-02-11 15:32:46 UTC (rev 8499) @@ -1,20 +0,0 @@ ---- Crypt-SSLeay-0.57.orig/Makefile.PL 2007-09-17 22:36:59.000000000 +0200 -+++ Crypt-SSLeay-0.57/Makefile.PL 2010-01-29 18:42:01.080390444 +0100 -@@ -282,11 +282,12 @@ - these tests may fail (through no fault of the code). - - INFO -- my $network_tests = prompt -- "Do you want to run the live tests (y/N) ?", -- 'N'; -- print OUT "network_tests ", ($network_tests =~ /y/i) ? 1 : 0, "\n"; -- close OUT; -+ #my $network_tests = prompt -+ # "Do you want to run the live tests (y/N) ?", -+ # 'N'; -+ #print OUT "network_tests ", ($network_tests =~ /y/i) ? 1 : 0, "\n"; -+ #close OUT; -+ print OUT "network_tests 0\n"; - } - - ## HELPERS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Feb 11 16:50:51 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Feb 2010 15:50:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[8500] csw/mgar/pkg/chkconfig/trunk Message-ID: Revision: 8500 http://gar.svn.sourceforge.net/gar/?rev=8500&view=rev Author: dmichelsen Date: 2010-02-11 15:50:51 +0000 (Thu, 11 Feb 2010) Log Message: ----------- alternatives: Some cas fixes Modified Paths: -------------- csw/mgar/pkg/chkconfig/trunk/checksums csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives Modified: csw/mgar/pkg/chkconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/chkconfig/trunk/checksums 2010-02-11 15:32:46 UTC (rev 8499) +++ csw/mgar/pkg/chkconfig/trunk/checksums 2010-02-11 15:50:51 UTC (rev 8500) @@ -1,7 +1,7 @@ d56d4f7b5aef5af5235943c384734780 0001-Add-missing-include-to-alloca.h.patch a1045173b8bc0a667883080f85a38597 0002-Don-t-use-named-struct-initializers.patch 5abe74bf8f38f45068f43f12b52cfc4b 0003-Fix-manpage-to-use-csw-pathes.patch -7acb4c811cecd886e010104270e6f2ff CSWalternatives.i.cswalternatives -9f2c7b5521878d39b4524588bf421eef CSWalternatives.r.cswalternatives +d021adfa40e57e62c435654111e7f08c CSWalternatives.i.cswalternatives +cd3e42659af6e3adfa8a220bd95dad29 CSWalternatives.r.cswalternatives 02019af22d048085f3006de791a0c95e alloca.patch 592a1fe77f3844d7748adbab6357ee25 chkconfig-1.3.30c.tar.gz Modified: csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives =================================================================== --- csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives 2010-02-11 15:32:46 UTC (rev 8499) +++ csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives 2010-02-11 15:50:51 UTC (rev 8500) @@ -7,8 +7,6 @@ # # 2010-02-11 Initial release -set -x - : ${PKG_INSTALL_ROOT:=/} while read src dest; do @@ -33,13 +31,14 @@ done if [ ! -x ${PKG_INSTALL_ROOT}/opt/csw/sbin/alternatives ]; then - chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives $ARGS echo "ERROR: /opt/csw/sbin/alternatives could not be found" >&2 exit 2 fi + chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives $ARGS + # Redo previous manual selection if this is an upgrade - if [ -L "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$ALTNAME" ]; then + if /usr/bin/test -L "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$ALTNAME"; then CHOICE=`/usr/bin/perl -e 'print readlink $ARGV[0]' "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$ALTNAME"` if [ "${CHOICE}" = "$ALTPATH" ]; then echo "Applying previous manual selection ${CHOICE} ..." Modified: csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives =================================================================== --- csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives 2010-02-11 15:32:46 UTC (rev 8499) +++ csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives 2010-02-11 15:50:51 UTC (rev 8500) @@ -7,8 +7,6 @@ # # 2010-02-11 Initial release -set -x - : ${PKG_INSTALL_ROOT:=/} while read dest; do @@ -21,6 +19,7 @@ if egrep '^manual$' ${PKG_INSTALL_ROOT}/var/opt/csw/alternatives/$2 >/dev/null 2>&1; then CHOICE="`perl -e 'print readlink $ARGV[0]' ${PKG_INSTALL_ROOT}/etc/opt/csw/alternatives/$2`" if [ "$3" = "${CHOICE}" ]; then + echo "Preserving '$2' manual choice ${CHOICE} ..." mkdir -p ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives rm -f ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$2 ln -s "${CHOICE}" ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Thu Feb 11 17:07:46 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Thu, 11 Feb 2010 16:07:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8501] csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile Message-ID: Revision: 8501 http://gar.svn.sourceforge.net/gar/?rev=8501&view=rev Author: bensons Date: 2010-02-11 16:07:45 +0000 (Thu, 11 Feb 2010) Log Message: ----------- cpan mod_perl2: removed dependency Modified Paths: -------------- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile Modified: csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-02-11 15:50:51 UTC (rev 8500) +++ csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-02-11 16:07:45 UTC (rev 8501) @@ -27,7 +27,7 @@ PACKAGES = CSWap2modperl CATALOGNAME = ap2_modperl -RUNTIME_DEP_PKGS = CSWapache2 CSWapache2rt CSWpmapachetst CSWexpat CSWiconv +RUNTIME_DEP_PKGS = CSWapache2 CSWapache2rt CSWexpat CSWiconv RUNTIME_DEP_PKGS += CSWbdb CSWoldaprt #BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) 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 Feb 11 17:23:24 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Feb 2010 16:23:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8502] csw/mgar/pkg/mutt/trunk/Makefile Message-ID: Revision: 8502 http://gar.svn.sourceforge.net/gar/?rev=8502&view=rev Author: dmichelsen Date: 2010-02-11 16:23:24 +0000 (Thu, 11 Feb 2010) Log Message: ----------- mutt: More fixes towards 'alternatives' Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2010-02-11 16:07:45 UTC (rev 8501) +++ csw/mgar/pkg/mutt/trunk/Makefile 2010-02-11 16:23:24 UTC (rev 8502) @@ -75,14 +75,19 @@ MIGRATE_FILES_CSWmutt-base = mime.types Muttrc MERGE_SCRIPTS_isa-default-slang-no = copy-all -MERGE_SCRIPTS_isa-default-slang-yes = copy-mutt-only +MERGE_SCRIPTS_isa-default-slang-yes = copy-all -PKGFILES_CSWmutt-ncurses = $(bindir)/mutt +EXTRA_PAX_ARGS_slang-no = -s ",\.$(bindir)/mutt$$,.$(bindir)/mutt-ncurses,p" +EXTRA_PAX_ARGS_slang-yes = -s ",\.$(bindir)/mutt$$,.$(bindir)/mutt-slang,p" -s ",.*,," +EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_slang-$(SLANG)) + +# CSWmutt-base gets all the rest +PKGFILES_CSWmutt-ncurses = $(bindir)/mutt-ncurses PKGFILES_CSWmutt-slang = $(bindir)/mutt-slang +ALTERNATIVES_CSWmutt-ncurses = ncurses +ALTERNATIVES_CSWmutt-slang = slang +ALTERNATIVE_ncurses = $(bindir)/mutt mutt $(bindir)/mutt-ncurses 100 +ALTERNATIVE_slang = $(bindir)/mutt mutt $(bindir)/mutt-slang 200 + include gar/category.mk - -merge-copy-mutt-only: $(PKGROOT) - ginstall -d $(PKGROOT)$(bindir) - ginstall $(INSTALLISADIR)$(bindir)/mutt $(PKGROOT)$(bindir)/mutt-slang - @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 11 17:50:55 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Feb 2010 16:50:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[8503] csw/mgar/pkg Message-ID: Revision: 8503 http://gar.svn.sourceforge.net/gar/?rev=8503&view=rev Author: wahwah Date: 2010-02-11 16:50:55 +0000 (Thu, 11 Feb 2010) Log Message: ----------- shflags: Initial commit Modified Paths: -------------- csw/mgar/pkg/shflags/trunk/Makefile csw/mgar/pkg/shflags/trunk/checksums Added Paths: ----------- csw/mgar/pkg/shflags/ Modified: csw/mgar/pkg/shflags/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-02-09 10:40:32 UTC (rev 8433) +++ csw/mgar/pkg/shflags/trunk/Makefile 2010-02-11 16:50:55 UTC (rev 8503) @@ -1,185 +1,38 @@ -# Copyright 2009 OpenCSW +# Copyrigh -e '/^##/d' Makefile 2009 OpenCSW # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = shflags +GARVERSION = 1.0.3 +CATEGORIES = apps +DESCRIPTION = command-line flags module for Unix shell scripts define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +SPKG_SOURCEURL = http://code.google.com/p/shflags/ +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tgz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz +ARCHALL = 1 +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = shflags +TEST_SCRIPTS = shflags + CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true -#include gar/category.mk +LICENSE = doc/LICENSE.shunit2 + +include gar/category.mk + +install-shflags: + ginstall -m 755 -d $(DESTDIR)$(libdir)/shflags + ginstall -m 644 $(WORKSRC)/src/shflags $(DESTDIR)$(libdir)/shflags + ginstall -m 755 -d $(DESTDIR)$(docdir)/shflags + for f in $(WORKSRC)/README* $(WORKSRC)/doc/*; do \ + ginstall -m 644 $${f} $(DESTDIR)$(docdir)/shflags; \ + done + @$(MAKECOOKIE) + +test-shflags: + $(WORKSRC)/bin/gen_test_results.sh + @$(MAKECOOKIE) Modified: csw/mgar/pkg/shflags/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-02-09 10:40:32 UTC (rev 8433) +++ csw/mgar/pkg/shflags/trunk/checksums 2010-02-11 16:50:55 UTC (rev 8503) @@ -0,0 +1 @@ +b4d7133696ec05b71b27d8df5e278f0f shflags-1.0.3.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 11 18:08:55 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Feb 2010 17:08:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[8504] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 8504 http://gar.svn.sourceforge.net/gar/?rev=8504&view=rev Author: wahwah Date: 2010-02-11 17:08:55 +0000 (Thu, 11 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, a better error message for double depends Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-02-11 16:50:55 UTC (rev 8503) +++ csw/mgar/gar/v2/bin/checkpkg 2010-02-11 17:08:55 UTC (rev 8504) @@ -512,7 +512,7 @@ | sort | uniq -c | awk '{print $1}' | sort | uniq | wc -l)" if [[ "$repeated_depends" -gt 1 ]]; then cat $EXTRACTDIR/$pkgname/install/depend - errmsg "$pkgname has multiple depends" + errmsg "$pkgname lists a dependency more than once, see above" fi #to retain a record of all packages currently being examined from $@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Feb 11 18:23:25 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 11 Feb 2010 17:23:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8505] csw/mgar/pkg/postgrey/trunk/Makefile Message-ID: Revision: 8505 http://gar.svn.sourceforge.net/gar/?rev=8505&view=rev Author: bonivart Date: 2010-02-11 17:23:24 +0000 (Thu, 11 Feb 2010) Log Message: ----------- postgrey: fix file copy bug in package Modified Paths: -------------- csw/mgar/pkg/postgrey/trunk/Makefile Modified: csw/mgar/pkg/postgrey/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgrey/trunk/Makefile 2010-02-11 17:08:55 UTC (rev 8504) +++ csw/mgar/pkg/postgrey/trunk/Makefile 2010-02-11 17:23:24 UTC (rev 8505) @@ -38,7 +38,7 @@ @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/postfix @ginstall -m 644 $(WORKSRC)/postgrey_whitelist_clients $(DESTDIR)/etc/opt/csw/postfix @ginstall -m 644 $(WORKSRC)/postgrey_whitelist_recipients $(DESTDIR)/etc/opt/csw/postfix - @ginstall -m 644 $(WORKSRC)/postgrey $(DESTDIR)/etc/opt/csw/ + @ginstall -m 644 $(FILEDIR)/postgrey $(DESTDIR)/etc/opt/csw/ @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWpostgrey @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWpostgrey/cswusergroup @ginstall -m 755 -d $(DESTDIR)$(sbindir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Feb 11 19:43:27 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 11 Feb 2010 18:43:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[8506] csw/mgar/pkg Message-ID: Revision: 8506 http://gar.svn.sourceforge.net/gar/?rev=8506&view=rev Author: skayser Date: 2010-02-11 18:43:27 +0000 (Thu, 11 Feb 2010) Log Message: ----------- poster: initial commit Added Paths: ----------- csw/mgar/pkg/poster/ csw/mgar/pkg/poster/branches/ csw/mgar/pkg/poster/tags/ csw/mgar/pkg/poster/trunk/ csw/mgar/pkg/poster/trunk/Makefile csw/mgar/pkg/poster/trunk/checksums csw/mgar/pkg/poster/trunk/files/ csw/mgar/pkg/poster/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/poster/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/poster/trunk/Makefile =================================================================== --- csw/mgar/pkg/poster/trunk/Makefile (rev 0) +++ csw/mgar/pkg/poster/trunk/Makefile 2010-02-11 18:43:27 UTC (rev 8506) @@ -0,0 +1,44 @@ +GARNAME = poster +GARVERSION = 20050907 +CATEGORIES = apps + +DESCRIPTION = Create large posters out of PostScript pages +define BLURB + Poster takes a one-page PostScript file and scales it to a specified + size. It can tile the resulting image into multiple smaller pages that + can be pasted together to form the big poster. Poster prefers EPS as its + input although freer forms of PostScript are also understood. +endef + +VENDOR_URL = http://packages.debian.org/lenny/poster +MASTER_SITES = http://ftp.debian.org/debian/pool/main/p/poster/ +DISTFILES = $(GARNAME)_$(GARVERSION).orig.tar.gz +UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).orig.tar.gz + +# Trivial build w/o configure and test +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +# Get rid of gcc'isms +pre-build-modulated: + gsed -i \ + -e '/^CFLAGS/d' \ + -e 's/gcc/$$(CC)/' \ + $(WORKSRC)/Makefile + @$(MAKECOOKIE) + +install-custom: + ginstall -Dm755 $(WORKSRC)/poster $(DESTDIR)$(bindir)/poster + ginstall -Dm755 $(WORKSRC)/poster.1 $(DESTDIR)$(mandir)/man1/poster.1 + @$(MAKECOOKIE) + +# Instsall changelog.CSW +post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) + +install-changelog-%: + ginstall -D $(FILEDIR)/changelog.CSW \ + $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW + @$(MAKECOOKIE) Added: csw/mgar/pkg/poster/trunk/checksums =================================================================== --- csw/mgar/pkg/poster/trunk/checksums (rev 0) +++ csw/mgar/pkg/poster/trunk/checksums 2010-02-11 18:43:27 UTC (rev 8506) @@ -0,0 +1 @@ +c094522c17d33ee41200b631a721f87d poster_20050907.orig.tar.gz Added: csw/mgar/pkg/poster/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/poster/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/poster/trunk/files/changelog.CSW 2010-02-11 18:43:27 UTC (rev 8506) @@ -0,0 +1,5 @@ +poster (20050907,REV=2010.02.11) + + * Initial release. + + -- Sebastian Kayser Thu, 11 Feb 2010 19:26:24 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Feb 12 00:58:44 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Feb 2010 23:58:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8507] csw/mgar/gar/v2/tests/overrides_test.py Message-ID: Revision: 8507 http://gar.svn.sourceforge.net/gar/?rev=8507&view=rev Author: wahwah Date: 2010-02-11 23:58:44 +0000 (Thu, 11 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, added a test case for two overrides Modified Paths: -------------- csw/mgar/gar/v2/tests/overrides_test.py Modified: csw/mgar/gar/v2/tests/overrides_test.py =================================================================== --- csw/mgar/gar/v2/tests/overrides_test.py 2010-02-11 18:43:27 UTC (rev 8506) +++ csw/mgar/gar/v2/tests/overrides_test.py 2010-02-11 23:58:44 UTC (rev 8507) @@ -9,12 +9,13 @@ class OverridesUnitTest(unittest.TestCase): """Tests CHECKPKG_OVERRIDES support.""" - def testPkginfoName(self): - """Checks that the GARNAME makes it to the NAME in pkginfo.""" + def testOneOverride(self): + """Checks that CHECKPKG_OVERRIDES variable creates an override.""" mybuild = gartest.DynamicGarBuild() mybuild.SetGarVariable("GARNAME", "overrides-test") mybuild.SetGarVariable("CATALOGNAME", "overrides_test") - mybuild.SetGarVariable("CHECKPKG_OVERRIDES", "CSWoverrides-test|example-tag|example-parameter") + mybuild.SetGarVariable("CHECKPKG_OVERRIDES", + "CSWoverrides-test|example-tag|example-parameter") mybuild.WriteGarFiles() self.assertEquals(0, mybuild.Build()) pkg = mybuild.GetFirstBuiltPackage() @@ -23,3 +24,22 @@ self.assertEqual(expected, pkg.GetFileContent(overr_file)) overrides = pkg.GetOverrides() self.assertEqual(1, len(overrides)) + + def testTwoOverriders(self): + """Checks that CHECKPKG_OVERRIDES variable creates overrides.""" + mybuild = gartest.DynamicGarBuild() + mybuild.SetGarVariable("GARNAME", "overrides-test") + mybuild.SetGarVariable("CATALOGNAME", "overrides_test") + mybuild.SetGarVariable( + "CHECKPKG_OVERRIDES", + ("CSWoverrides-test|example-tag-1|example-parameter-1 " + "CSWoverrides-test|example-tag-2|example-parameter-2")) + mybuild.WriteGarFiles() + self.assertEquals(0, mybuild.Build()) + pkg = mybuild.GetFirstBuiltPackage() + overr_file = "/opt/csw/share/checkpkg/overrides/overrides_test" + expected = ('CSWoverrides-test: example-tag-1 example-parameter-1\n' + 'CSWoverrides-test: example-tag-2 example-parameter-2\n') + self.assertEqual(expected, pkg.GetFileContent(overr_file)) + overrides = pkg.GetOverrides() + self.assertEqual(2, len(overrides)) 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 Feb 12 02:16:22 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 12 Feb 2010 01:16:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8508] csw/mgar/pkg/postfix/branches/postfix-2.6 Message-ID: Revision: 8508 http://gar.svn.sourceforge.net/gar/?rev=8508&view=rev Author: skayser Date: 2010-02-12 01:16:22 +0000 (Fri, 12 Feb 2010) Log Message: ----------- postfix: 2.6 release getting closer Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix Added Paths: ----------- csw/mgar/pkg/postfix/branches/postfix-2.6/files/README.CSW csw/mgar/pkg/postfix/branches/postfix-2.6/files/README.upgradefrom.24 csw/mgar/pkg/postfix/branches/postfix-2.6/files/migrate-queuefiles.sh Removed Paths: ------------- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall csw/mgar/pkg/postfix/branches/postfix-2.6/files/upgrade Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-11 23:58:44 UTC (rev 8507) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-12 01:16:22 UTC (rev 8508) @@ -1,12 +1,8 @@ # TODO (release-critical prefixed with !, non release-critical with *) -# ! Handle system integration (refer to README.CSW or alike), see -# http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5313 # ! Update to most recent postfix version (2.6.5 as of 13th Jan 2010) -# ! Verify CONFIG_FILES list (can this be generated on the fly?) -# ! Ship simple default configuration -# ! Build, install and test package (bails out on existing spool files? -# works? spool permissions ok?) +# ! Build, install and test package (works? spool permissions ok?) # WRT to permissions, run "postfix set-permissions" and compare +# * Ship simple default configuration # # NICE TO KNOW # - 2.4.6,REV=2008.05.28 preserves modified configuration files via @@ -31,12 +27,11 @@ MASTER_SITES = ftp://ftp.porcupine.org/mirrors/postfix-release/official/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +LICENSE = LICENSE TLS_LICENSE -DISTFILES += CSWpostfix.checkinstall - # Tag configuration files for handling via cswclassutils -CONFIG_BASE = /etc/opt/csw/postfix/ -CONFIG_FILES = access +CONFIG_BASE := /etc/opt/csw/postfix/ +CONFIG_FILES := access CONFIG_FILES += aliases CONFIG_FILES += canonical CONFIG_FILES += generic @@ -46,11 +41,17 @@ CONFIG_FILES += relocated CONFIG_FILES += transport CONFIG_FILES += virtual -SAMPLECONF = $(addprefix $(CONFIG_BASE), $(CONFIG_FILES)) +SAMPLECONF := $(addprefix $(CONFIG_BASE), $(CONFIG_FILES)) -INITSMF = /etc/opt/csw/init.d/cswpostfix -USERGROUP = $(sysconfdir)/pkg/CSWpostfix/cswusergroup +sysconfdir = /etc/opt/csw +INITSMF = $(sysconfdir)/init.d/csw$(GARNAME) +USERGROUP = $(sysconfdir)/pkg/CSW$(GARNAME)/cswusergroup +# For the sake of simplicity and user choice we dropped the automatic +# replacement of the /usr/{lib,bin} sendmail binaries. Ref. +# http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5313 +POSTMSG = POSTMSG = $(DOCDIR)/$(GARNAME)/README.upgradefrom.24 + # Make postdrop setgid so that it can deliver to $(DEF_QUEUE_DIR)/maildrop PROTOTYPE_MODIFIERS = makesgid PROTOTYPE_FILES_makesgid = $(sbindir)/postdrop @@ -80,6 +81,7 @@ PROTOTYPE_CLASS_pid = ugfiles EXTRA_MERGE_EXCLUDE_FILES = /etc/opt/csw/postfix/LICENSE +EXTRA_MERGE_EXCLUDE_FILES += /etc/opt/csw/postfix/TLS_LICENSE EXTRA_MERGE_EXCLUDE_FILES += /etc/opt/csw/postfix/makedefs.out STRIP_DIRS = $(DESTDIR)$(libexecdir)/postfix @@ -190,7 +192,7 @@ AUXLIBS='$(AUXLIBS)' \ DEBUG= \ OPT= - @$(MAKECOOKIE) + @$(MAKECOOIE) install-custom: $(MAKE) -C $(WORKSRC) non-interactive-package install_root=$(DESTDIR) \ @@ -212,4 +214,28 @@ $(DESTDIR)/etc/opt/csw/init.d/cswpostfix ginstall -D $(FILEDIR)/cswusergroup \ $(DESTDIR)$(sysconfdir)/pkg/CSWpostfix/cswusergroup + + # Helper script for spool location migration (2.4.x -> 2.6.x) + ginstall -Dm 755 $(FILEDIR)/migrate-queuefiles.sh \ + $(DESTDIR)$(docdir)/$(GARNAME)/scripts/migrate-queuefiles.sh @$(MAKECOOKIE) + +post-merge-modulated: verify-config + +# Warn if there are any files in $(sysconfdir)/postfix which are not +# covered by cswsampleconf. This is a safety net in case new config file +# get introduced by more recent postfix versions. I know this runs for +# most bloated awkwardness. Feel free to trim it down. +verify-config: SHIPPED_CFGFILES = $(wildcard $(PKGROOT)$(CONFIG_BASE)*) +verify-config: SHIPPED_CFGFILES := $(subst $(PKGROOT),,$(SHIPPED_CFGFILES)) +verify-config: IGNORE_FILES += /etc/opt/csw/postfix/bounce.cf.default +verify-config: IGNORE_FILES += /etc/opt/csw/postfix/main.cf.default +verify-config: IGNORE_FILES += $(addsuffix .CSW, $(SAMPLECONF)) +verify-config: SHELL=/bin/bash +verify-config: + @echo "Checking for files in $(CONFIG_BASE) not covered by cswsampleconf" + @gdiff \ + <( echo $(IGNORE_FILES) | tr " " "\n" | sort) \ + <( echo $(SHIPPED_CFGFILES) | tr " " "\n" | sort ) + @echo "OK" + @$(MAKECOOKIE) Deleted: csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall 2010-02-11 23:58:44 UTC (rev 8507) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall 2010-02-12 01:16:22 UTC (rev 8508) @@ -1,71 +0,0 @@ -#!/bin/sh -# Copied from the CSWcupsd.preinstall script (obsolete_dir_file_name adjusted) -# https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/cups/trunk/files/CSWcupsd.preinstall -# -# $Id$ -# - -set -u - -PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" -readonly PKG_INSTALL_ROOT - -obsolete_directories="/opt/csw/etc/postfix:/etc/opt/csw/postfix" - -obsolete_dir_information=" -This directory is obsolete. Files in this directory are going to be ignored. -Please move your data to the new location. - -Feel free to remove this file afterwards. -" -obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" - -for dirpair in ${obsolete_directories}; do - obsolete_dir=`echo ${dirpair} | cut -d: -f1` - new_dir=`echo ${dirpair} | cut -d: -f2` - if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then - echo - echo "*******************************************************************" - echo "* The old configuration directory ${obsolete_dir} still exists. " - echo "* Please move your configuration to ${new_dir}. " - echo "* " - echo "* Installation will continue in 10 seconds. " - echo "* Press CTRL+C if you want to stop now. " - echo "*******************************************************************" - echo - sleep 10 - - # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" - if touch "${fn}" 2>/dev/null; then - echo "${obsolete_dir_information}" > "${fn}" - fi - fi -done - -# Verify that there are no possibly important files in the old spool location -# (where old <= 2.4.6,REV=2008.05.28). Bail out otherwise and instruct user to -# manually migrate. Skips named pipes as well as all files in pid/. -old_spooldir="/opt/csw/var/spool/postfix/" -new_spooldir="/var/opt/csw/ -old_spoolfiles=`find ${PKG_INSTALL_ROOT}/opt/csw/var/spool/postfix/ \ - -name pid -prune -o ! -type d ! -type p | grep -v '/pid$'` -if [ "${old_spoolfiles}" != "" ]; then - echo - echo "*******************************************************************" - echo "* The old spool directory ${old_spooldir} still contains files. " - echo "* Please migrate these as needed to ${new_spooldir}. " - echo "* " - echo "* Installation will now terminate. Please restart the installation " - echo "* once the files have been migrated or removed. " - echo "*******************************************************************" - echo - echo "*******************************************************************" - echo "* This is the list of affected files: " - echo ${old_spoolfiles} - echo - - exit 1 -fi - -exit 0 Added: csw/mgar/pkg/postfix/branches/postfix-2.6/files/README.CSW =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/README.CSW (rev 0) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/README.CSW 2010-02-12 01:16:22 UTC (rev 8508) @@ -0,0 +1,75 @@ +Replacing the system sendmail binaries +-------------------------------------- +This package will not automatically substitute the common sendmail binaries +with links to the postfix binaries. Thus, the following files will be untouched +and possibly belong to the system sendmail installation. + + /usr/lib/sendmail + /usr/bin/mailq + /usr/bin/newaliases + +This makes the package installation less troublesome for shared zones and +leaves the choice of fully replacing your system sendmail up to you. If you +intend to replace those binaries above with the ones from this postfix package, +there are two approaches (both currently _not_ supported in in shared zones): + +#1: For testing purposes - allows for quick rollback, possibly harmful + +This approach temporarily moves away the system sendmail binaries and replaces +them with links to the postfix binaries. This lets you test this postfix +package and easily roll back to the system sendmail in case you need to. It is +_not_ suited for long term operations as system sendmail patches will possibly +break those symlinks or worse, overwrite your postfix binaries with patched +sendmail versions. + +Put in place: + + mv /usr/lib/sendmail /usr/lib/sendmail.SYSTEM + mv /usr/bin/mailq /usr/bin/mailq.SYSTEM + mv /usr/bin/newaliases /usr/bin/newaliases.SYSTEM + + ln -s /opt/csw/sbin/sendmail /usr/lib/sendmail + ln -s /opt/csw/bin/newaliases /usr/bin/newaliases + ln -s /opt/csw/bin/mailq /usr/bin/mailq + +Roll back: + + rm /usr/lib/sendmail /usr/bin/newaliases /usr/bin/mailq + mv /usr/lib/sendmail.SYSTEM /usr/lib/sendmail + mv /usr/bin/mailq.SYSTEM /usr/bin/mailq + mv /usr/bin/newaliases.SYSTEM /usr/bin/newaliases + +#2: Recommended for production systems and long term operations + +This approach fully removes the system sendmail packages and replaces the +binaries with links to the postfix binaries. Patches for the system sendmail +will be skipped and won't harm your setup. Keep your Solaris media available +in case you want to re-install the system sendmail packages. + +Remove system sendmail: + + echo "rdepend=nocheck" > ~/admin-postfix + echo "action=nocheck" >> ~/admin-postfix + pkgrm -na ~/admin-postfix SUNWsndmr SUNWsndmu + rm ~/admin-postfix + +Depending on the speed of your system the pkgrm might take a while. + +Put in place: + + ln -s /opt/csw/sbin/sendmail /usr/lib/sendmail + ln -s /opt/csw/bin/newaliases /usr/bin/newaliases + ln -s /opt/csw/bin/mailq /usr/bin/mailq + +Roll back: + + echo "idepend=nocheck" > ~/admin-postfix + echo "action=nocheck" >> ~/admin-postfix + rm /usr/lib/sendmail /usr/bin/newaliases /usr/bin/mailq + pkgadd -na ~/admin-postfix \ + -d /Solaris_X/Products/ SUNWsndmr SUNWsndmu + rm ~/admin-postfix + +You might want to apply additional system sendmail patches that have been +released since the Solaris release from which you install those sendmail +packages. Added: csw/mgar/pkg/postfix/branches/postfix-2.6/files/README.upgradefrom.24 =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/README.upgradefrom.24 (rev 0) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/README.upgradefrom.24 2010-02-12 01:16:22 UTC (rev 8508) @@ -0,0 +1,27 @@ +Note for users upgrading from postfix 2.4.6 and previous +-------------------------------------------------------- + +- Starting with postfix 2.6.x the spool location has changed from + + /opt/csw/var/spool/postfix to + /var/opt/csw/spool/postfix + + If you have any pending email in the old spool location, please move + it to the new spool location and run "postsuper" before starting + postfix. An example script on how this can be done is shipped with the + package (migrate-queuefiles.sh). Make sure to understand what you are + doing. + +- Starting with postfix 2.6.x this package will _not_ automatically + substitute the common sendmail binaries with links to the postfix + binaries any more. Thus, the following files will be untouched and + possibly belong to the system sendmail installation. + + /usr/lib/sendmail + /usr/bin/mailq + /usr/bin/newaliases + + This makes the package installation less troublesome for shared zones + and leaves the choice of fully replacing your system sendmail up to you. + If you intend to replace those binaries above with the ones from this + postfix package, please see README.CSW. Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix 2010-02-11 23:58:44 UTC (rev 8507) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix 2010-02-12 01:16:22 UTC (rev 8508) @@ -3,13 +3,15 @@ # Start or stop Postfix # # Origionally written by Valery Kotchiev -# Maintained by Darin Perusich +# Adjusted by Darin Perusich +# Adjusted by Sebastian Kayser # based on debians's postfix init.d script # # cswclassutils settings -#MANIFEST /var/opt/csw/svc/manifest/network/cswpostfix.xml +#AUTOENABLE NO PATH=/bin:/usr/bin:/sbin:/usr/sbin +CFGDIR=/etc/opt/csw/postfix DAEMON=/opt/csw/sbin/postfix PIDFILE=/var/opt/csw/run/postfix.pid NAME=Postfix @@ -20,7 +22,7 @@ case "$1" in start) - if [ ! -f $pf_config_directory/aliases.dir ]; then + if [ ! -f $CFGDIR/aliases.dir ]; then /opt/csw/bin/newaliases fi Added: csw/mgar/pkg/postfix/branches/postfix-2.6/files/migrate-queuefiles.sh =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/migrate-queuefiles.sh (rev 0) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/migrate-queuefiles.sh 2010-02-12 01:16:22 UTC (rev 8508) @@ -0,0 +1,27 @@ +#!/bin/bash +# +# move-spool.sh: +# helper script to move possible queue files from the CSWpostfix 2.4.x +# spool location to the CSWpostfix >= 2.6.x spool location. +# +# $Id$ + + +SPOOL_OLD=/opt/csw/var/spool/postfix +SPOOL_NEW=/var/opt/csw/spool/postfix +QDIRS="incoming active deferred corrupt hold bounce defer trace" + +[ -x /usr/bin/zonename ] && ZONEOPT="-z `/usr/bin/zonename`" +if pgrep $ZONEOPT master; then + echo "Make sure postfix is not running! Exiting." + exit 1 +fi + +for qdir in $QDIRS; do + [ -d ${SPOOL_OLD}/$qdir ] || continue + echo "Moving from ${SPOOL_OLD}/$qdir to ${SPOOL_NEW}/$qdir" + cd ${SPOOLDIR_NEW}/$qdir && \ + find ${SPOOLDIR_OLD}/$qdir -type f -exec mv '{}' . + +done + +echo "No errors so far? Then please run postsuper now." Deleted: csw/mgar/pkg/postfix/branches/postfix-2.6/files/upgrade =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/upgrade 2010-02-11 23:58:44 UTC (rev 8507) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/upgrade 2010-02-12 01:16:22 UTC (rev 8508) @@ -1,46 +0,0 @@ -#!/bin/sh -# Copied from the CSWcupsd.preinstall script (obsolete_dir_file_name adjusted) -# https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/cups/trunk/files/CSWcupsd.preinstall -# -# $Id$ -# - -set -u - -PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" -readonly PKG_INSTALL_ROOT - -obsolete_directories="/opt/csw/etc/postfix:/etc/opt/csw/postfix" - -obsolete_dir_information=" -This directory is obsolete. Files in this directory are going to be ignored. -Please move your data to the new location. - -Feel free to remove this file afterwards. -" -obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" - -for dirpair in ${obsolete_directories}; do - obsolete_dir=`echo ${dirpair} | cut -d: -f1` - new_dir=`echo ${dirpair} | cut -d: -f2` - if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then - echo - echo "*******************************************************************" - echo "* The old configuration directory ${obsolete_dir} still exists. " - echo "* Please move your configuration to ${new_dir}. " - echo "* " - echo "* Installation will continue in 10 seconds. " - echo "* Press CTRL+C if you want to stop now. " - echo "*******************************************************************" - echo - sleep 10 - - # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" - if touch "${fn}" 2>/dev/null; then - echo "${obsolete_dir_information}" > "${fn}" - fi - fi -done - -exit 0 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 Feb 12 03:05:48 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 12 Feb 2010 02:05:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8509] csw/mgar/pkg/postfix/branches/postfix-2.6 Message-ID: Revision: 8509 http://gar.svn.sourceforge.net/gar/?rev=8509&view=rev Author: skayser Date: 2010-02-12 02:05:48 +0000 (Fri, 12 Feb 2010) Log Message: ----------- postfix 2.6: bumping to 2.6.5 Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile csw/mgar/pkg/postfix/branches/postfix-2.6/checksums Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-12 01:16:22 UTC (rev 8508) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-12 02:05:48 UTC (rev 8509) @@ -9,7 +9,7 @@ # package-shipped CAS class csw_conf. # GARNAME = postfix -GARVERSION = 2.6.2 +GARVERSION = 2.6.5 CATEGORIES = server DESCRIPTION = A high-performance mail transport agent @@ -220,22 +220,24 @@ $(DESTDIR)$(docdir)/$(GARNAME)/scripts/migrate-queuefiles.sh @$(MAKECOOKIE) -post-merge-modulated: verify-config +# Fails. A subsequent manual verify-config run is successfull, +# seems as if there might be some delay required. +#post-merge-modulated: verify-config # Warn if there are any files in $(sysconfdir)/postfix which are not # covered by cswsampleconf. This is a safety net in case new config file # get introduced by more recent postfix versions. I know this runs for # most bloated awkwardness. Feel free to trim it down. -verify-config: SHIPPED_CFGFILES = $(wildcard $(PKGROOT)$(CONFIG_BASE)*) -verify-config: SHIPPED_CFGFILES := $(subst $(PKGROOT),,$(SHIPPED_CFGFILES)) -verify-config: IGNORE_FILES += /etc/opt/csw/postfix/bounce.cf.default -verify-config: IGNORE_FILES += /etc/opt/csw/postfix/main.cf.default -verify-config: IGNORE_FILES += $(addsuffix .CSW, $(SAMPLECONF)) -verify-config: SHELL=/bin/bash -verify-config: - @echo "Checking for files in $(CONFIG_BASE) not covered by cswsampleconf" - @gdiff \ - <( echo $(IGNORE_FILES) | tr " " "\n" | sort) \ - <( echo $(SHIPPED_CFGFILES) | tr " " "\n" | sort ) - @echo "OK" - @$(MAKECOOKIE) +#verify-config: SHIPPED_CFGFILES = $(wildcard $(PKGROOT)$(CONFIG_BASE)*) +#verify-config: SHIPPED_CFGFILES := $(subst $(PKGROOT),,$(SHIPPED_CFGFILES)) +#verify-config: IGNORE_FILES += /etc/opt/csw/postfix/bounce.cf.default +#verify-config: IGNORE_FILES += /etc/opt/csw/postfix/main.cf.default +#verify-config: IGNORE_FILES += $(addsuffix .CSW, $(SAMPLECONF)) +#verify-config: SHELL=/bin/bash +#verify-config: +# @echo "Checking for files in $(CONFIG_BASE) not covered by cswsampleconf" +# @gdiff \ +# <( echo $(IGNORE_FILES) | tr " " "\n" | sort) \ +# <( echo $(SHIPPED_CFGFILES) | tr " " "\n" | sort ) +# @echo "OK" +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/checksums =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/checksums 2010-02-12 01:16:22 UTC (rev 8508) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/checksums 2010-02-12 02:05:48 UTC (rev 8509) @@ -1,2 +1 @@ -a5247da640e70b66144632e724a8d895 CSWpostfix.checkinstall -1f0edbd521d2b0473626f4d61e8bb4eb postfix-2.6.2.tar.gz +6b954cfb3eb6141dac1e773281211717 postfix-2.6.5.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 Fri Feb 12 04:23:36 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Feb 2010 03:23:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8510] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 8510 http://gar.svn.sourceforge.net/gar/?rev=8510&view=rev Author: bdwalton Date: 2010-02-12 03:23:35 +0000 (Fri, 12 Feb 2010) Log Message: ----------- coreutils: turn off test suite for now Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2010-02-12 02:05:48 UTC (rev 8509) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2010-02-12 03:23:35 UTC (rev 8510) @@ -39,7 +39,8 @@ CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw/ CONFIGURE_ARGS += --enable-no-install-program=chcon -TEST_TARGET = check +#TEST_TARGET = check +TEST_TARGET = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Feb 12 05:12:56 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Feb 2010 04:12:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[8511] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 8511 http://gar.svn.sourceforge.net/gar/?rev=8511&view=rev Author: bdwalton Date: 2010-02-12 04:12:56 +0000 (Fri, 12 Feb 2010) Log Message: ----------- coreutils: add runtime deps Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2010-02-12 03:23:35 UTC (rev 8510) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2010-02-12 04:12:56 UTC (rev 8511) @@ -14,6 +14,8 @@ BUILD_DEP_PKGS = CSWbash +RUNTIME_DEP_PKGS = CSWiconv CSWggettextrt CSWlibgmp + DESCRIPTION = GNU core utilities define BLURB The GNU Core Utilities are the basic file, shell and text manipulation utilities of the GNU operating system. These are the core utilities which are expected to exist on every operating system. 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 Feb 12 10:17:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Feb 2010 09:17:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[8512] csw/mgar/pkg/c-ares/trunk Message-ID: Revision: 8512 http://gar.svn.sourceforge.net/gar/?rev=8512&view=rev Author: dmichelsen Date: 2010-02-12 09:17:31 +0000 (Fri, 12 Feb 2010) Log Message: ----------- c-ares: Seperate includes for 32/64 bit Modified Paths: -------------- csw/mgar/pkg/c-ares/trunk/Makefile csw/mgar/pkg/c-ares/trunk/checksums Added Paths: ----------- csw/mgar/pkg/c-ares/trunk/files/ares_build.h Modified: csw/mgar/pkg/c-ares/trunk/Makefile =================================================================== --- csw/mgar/pkg/c-ares/trunk/Makefile 2010-02-12 04:12:56 UTC (rev 8511) +++ csw/mgar/pkg/c-ares/trunk/Makefile 2010-02-12 09:17:31 UTC (rev 8512) @@ -8,6 +8,7 @@ MASTER_SITES = http://c-ares.haxx.se/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += ares_build.h # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -29,6 +30,17 @@ TEST_TARGET = check +EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/ares_build.h$$,.$(includedir)/ares_build-32.h,p" +EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/ares_build.h$$,.$(includedir)/ares_build-64.h,p" +EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) + PKGFILES_CSWlibcaresdevel = $(PKGFILES_DEVEL) +POSTMSG = /opt/csw/share/doc/libcares/license +POSTMSG += /opt/csw/lib/pkgconfig/libcares.pc + include gar/category.mk + +post-merge: + ginstall $(FILEDIR)/ares_build.h $(PKGROOT)$(includedir)/ares_build.h + @$(MAKECOOKIE) Modified: csw/mgar/pkg/c-ares/trunk/checksums =================================================================== --- csw/mgar/pkg/c-ares/trunk/checksums 2010-02-12 04:12:56 UTC (rev 8511) +++ csw/mgar/pkg/c-ares/trunk/checksums 2010-02-12 09:17:31 UTC (rev 8512) @@ -1 +1,2 @@ +86e9bb345124ecaa520a68c4c482a122 ares_build.h 15ab7852306b554b0b1145f41005a3bb c-ares-1.7.0.tar.gz Copied: csw/mgar/pkg/c-ares/trunk/files/ares_build.h (from rev 8478, csw/mgar/pkg/curl/trunk/files/curlbuild.h) =================================================================== --- csw/mgar/pkg/c-ares/trunk/files/ares_build.h (rev 0) +++ csw/mgar/pkg/c-ares/trunk/files/ares_build.h 2010-02-12 09:17:31 UTC (rev 8512) @@ -0,0 +1,6 @@ +/* Allow 32 and 64 bit headers to coexist */ +#if defined __amd64 || defined __x86_64 || defined __sparcv9 +#include "ares_build-64.h" +#else +#include "ares_build-32.h" +#endif 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 Feb 12 10:50:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Feb 2010 09:50:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[8513] csw/mgar/pkg/c-ares/trunk/Makefile Message-ID: Revision: 8513 http://gar.svn.sourceforge.net/gar/?rev=8513&view=rev Author: dmichelsen Date: 2010-02-12 09:50:56 +0000 (Fri, 12 Feb 2010) Log Message: ----------- c-ares: Rip out extra lines for testing GAR :-( Modified Paths: -------------- csw/mgar/pkg/c-ares/trunk/Makefile Modified: csw/mgar/pkg/c-ares/trunk/Makefile =================================================================== --- csw/mgar/pkg/c-ares/trunk/Makefile 2010-02-12 09:17:31 UTC (rev 8512) +++ csw/mgar/pkg/c-ares/trunk/Makefile 2010-02-12 09:50:56 UTC (rev 8513) @@ -36,9 +36,6 @@ PKGFILES_CSWlibcaresdevel = $(PKGFILES_DEVEL) -POSTMSG = /opt/csw/share/doc/libcares/license -POSTMSG += /opt/csw/lib/pkgconfig/libcares.pc - include gar/category.mk post-merge: 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 Feb 12 12:17:19 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Feb 2010 11:17:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8514] csw/mgar/pkg/chkconfig/trunk/Makefile Message-ID: Revision: 8514 http://gar.svn.sourceforge.net/gar/?rev=8514&view=rev Author: dmichelsen Date: 2010-02-12 11:17:18 +0000 (Fri, 12 Feb 2010) Log Message: ----------- chkconfig: Add preservation dir to package Modified Paths: -------------- csw/mgar/pkg/chkconfig/trunk/Makefile Modified: csw/mgar/pkg/chkconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/chkconfig/trunk/Makefile 2010-02-12 09:50:56 UTC (rev 8513) +++ csw/mgar/pkg/chkconfig/trunk/Makefile 2010-02-12 11:17:18 UTC (rev 8514) @@ -43,6 +43,7 @@ post-merge: ginstall -d $(PKGROOT)/etc/opt/csw/alternatives + ginstall -d $(PKGROOT)/etc/opt/csw/preserve/CSWalternatives/alternatives ginstall -d $(PKGROOT)/var/opt/csw/alternatives ginstall -d $(PKGROOT)/usr/sadm/install/scripts ginstall $(WORKDIR)/CSWalternatives.i.cswalternatives $(PKGROOT)/usr/sadm/install/scripts/i.cswalternatives This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Feb 12 12:51:21 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 12 Feb 2010 11:51:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8515] csw/mgar/pkg/cpan/mod_perl/trunk Message-ID: Revision: 8515 http://gar.svn.sourceforge.net/gar/?rev=8515&view=rev Author: bensons Date: 2010-02-12 11:51:21 +0000 (Fri, 12 Feb 2010) Log Message: ----------- cpan mod_perl: bumped version, adjusted GAR recipe Modified Paths: -------------- csw/mgar/pkg/cpan/mod_perl/trunk/Makefile csw/mgar/pkg/cpan/mod_perl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/mod_perl/trunk/files/patch-apaci-Makefile.tmpl Removed Paths: ------------- csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.depend csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.gspec csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.postinstall csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.preremove csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.prototype csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.space csw/mgar/pkg/cpan/mod_perl/trunk/files/apxsinstall.diff Modified: csw/mgar/pkg/cpan/mod_perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/mod_perl/trunk/Makefile 2010-02-12 11:17:18 UTC (rev 8514) +++ csw/mgar/pkg/cpan/mod_perl/trunk/Makefile 2010-02-12 11:51:21 UTC (rev 8515) @@ -1,5 +1,5 @@ GARNAME = mod_perl -GARVERSION = 1.29 +GARVERSION = 1.31 CATEGORIES = cpan AUTHOR = GOZER @@ -12,12 +12,13 @@ an external interpreter and the penalty of Perl start-up time. endef -pkgfiles = prototype depend postinstall preremove space -DISTFILES += $(call admfiles,CSWmodperl,$(pkgfiles)) -DISTFILES += test.pl README +PACKAGES = CSWmodperl +CATALOGNAME = mod_perl +RUNTIME_DEP_PKGS = CSWapache CSWbdb + # Disable installation of module using apxs -PATCHFILES += apxsinstall.diff +PATCHFILES += patch-apaci-Makefile.tmpl CONFIGURE_ARGS = USE_APXS=1 CONFIGURE_ARGS += WITH_APXS=$(prefix)/apache/bin/apxs @@ -26,6 +27,7 @@ PERL_CONFIGURE_ARGS = INSTALLSITEARCH=$(prefix)/apache/lib/perl PERL_CONFIGURE_ARGS += INSTALLSITEMAN3DIR=$(prefix)/apache/man/man3 +# PERL_CONFIGURE_ARGS += LIBS=-lpthread INSTALL_SCRIPTS = custom @@ -33,18 +35,14 @@ install-custom: ( cd $(WORKSRC) ; $(INSTALL_ENV) make install DESTDIR=$(DESTDIR) ) - @$(MAKECOOKIE) - -post-install: - install -d $(DESTDIR)$(docdir)/mod_perl - install -m 0644 \ - $(WORKDIR)/README $(DESTDIR)$(docdir)/mod_perl - install -d $(DESTDIR)$(prefix)/apache/perl - install -m 0755 \ - $(WORKDIR)/test.pl $(DESTDIR)$(prefix)/apache/perl - install -d $(DESTDIR)$(prefix)/apache/libexec + ginstall -d $(DESTDIR)$(docdir)/mod_perl + ginstall -m 0644 \ + $(FILEDIR)/README $(DESTDIR)$(docdir)/mod_perl + ginstall -d $(DESTDIR)$(prefix)/apache/perl + ginstall -m 0755 \ + $(FILEDIR)/test.pl $(DESTDIR)$(prefix)/apache/perl + ginstall -d $(DESTDIR)$(prefix)/apache/libexec strip $(WORKSRC)/apaci/libperl.so - install -m 0755 \ + ginstall -m 0755 \ $(WORKSRC)/apaci/libperl.so $(DESTDIR)$(prefix)/apache/libexec @$(MAKECOOKIE) - Modified: csw/mgar/pkg/cpan/mod_perl/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/mod_perl/trunk/checksums 2010-02-12 11:17:18 UTC (rev 8514) +++ csw/mgar/pkg/cpan/mod_perl/trunk/checksums 2010-02-12 11:51:21 UTC (rev 8515) @@ -1,10 +1,2 @@ -ca9fc075c55baa19a49c97e4083f4c0f download/CSWmodperl.gspec -c8a2791741f027064eb34d9819eeff24 download/CSWmodperl.prototype -c74adeeec1d3f5ecbae9418eff99768e download/CSWmodperl.depend -50cbcbae4d19c84243acd5073a5f4f64 download/CSWmodperl.postinstall -40fe2a410077319379155bdd75a8e5d9 download/CSWmodperl.preremove -0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodperl.space -5fe7d67173c18f73424e47f00d9e97eb download/test.pl -6541df2fd21f00a2e607e9e48687a0f5 download/README -1491931790509b9af06fc037d02b0e7a download/mod_perl-1.29.tar.gz -25626caea63515487503db7275ab6130 download/apxsinstall.diff +d2188bf500e9f00cd78dc97c3fbf6b97 mod_perl-1.31.tar.gz +26f984ee99ba623370d19335d9a6b9ac patch-apaci-Makefile.tmpl Deleted: csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.depend =================================================================== --- csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.depend 2010-02-12 11:17:18 UTC (rev 8514) +++ csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.depend 2010-02-12 11:51:21 UTC (rev 8515) @@ -1 +0,0 @@ -P CSWapache apache - apache webserver with mod_ssl included Deleted: csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.gspec =================================================================== --- csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.gspec 2010-02-12 11:17:18 UTC (rev 8514) +++ csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.gspec 2010-02-12 11:51:21 UTC (rev 8515) @@ -1,4 +0,0 @@ -%var bitname mod_perl -%var pkgname CSWmodperl -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.postinstall =================================================================== --- csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.postinstall 2010-02-12 11:17:18 UTC (rev 8514) +++ csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.postinstall 2010-02-12 11:51:21 UTC (rev 8515) @@ -1,42 +0,0 @@ -#!/bin/sh - -AP_ROOT=$PKG_ROOT_DIR/opt/csw/apache -AP_CONF=$AP_ROOT/conf/httpd.conf -AP_LIBEXEC=$AP_ROOT/libexec -APXS=$AP_ROOT/bin/apxs - -# Look for "AddModule perl_module" or some variant thereof -[ -z "`grep perl_module $AP_CONF`" ] && exit 0 - -# Back up the existing config -cp $AP_CONF $AP_CONF.pre-perl - -# Enable the perl module -chroot ${PKG_ROOT_DIR:-'/'} \ - $APXS -S LIBEXECDIR=$AP_LIBEXEC -e -a -n perl libperl.so - -cat >>$CONFFILE < - PerlModule Apache::Registry - Alias /perl/ /opt/csw/apache/perl/ - - SetHandler perl-script - PerlHandler Apache::Registry - PerlSendHeader On - Options +ExecCGI - - -END - -# Finito -cat < Revision: 8516 http://gar.svn.sourceforge.net/gar/?rev=8516&view=rev Author: bensons Date: 2010-02-12 12:15:26 +0000 (Fri, 12 Feb 2010) Log Message: ----------- cpan mod_perl2: added RUNTIME_DEP_PKGS Modified Paths: -------------- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile Modified: csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-02-12 11:51:21 UTC (rev 8515) +++ csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-02-12 12:15:26 UTC (rev 8516) @@ -28,7 +28,7 @@ CATALOGNAME = ap2_modperl RUNTIME_DEP_PKGS = CSWapache2 CSWapache2rt CSWexpat CSWiconv -RUNTIME_DEP_PKGS += CSWbdb CSWoldaprt +RUNTIME_DEP_PKGS += CSWbdb CSWoldaprt CSWapr #BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CONFIGURE_ARGS = MP_APXS=$(prefix)/apache2/sbin/apxs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Feb 12 13:25:50 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 12 Feb 2010 12:25:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8517] csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile Message-ID: Revision: 8517 http://gar.svn.sourceforge.net/gar/?rev=8517&view=rev Author: bensons Date: 2010-02-12 12:25:49 +0000 (Fri, 12 Feb 2010) Log Message: ----------- cpan mod_perl2: revoke last commit Modified Paths: -------------- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile Modified: csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-02-12 12:15:26 UTC (rev 8516) +++ csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-02-12 12:25:49 UTC (rev 8517) @@ -28,7 +28,7 @@ CATALOGNAME = ap2_modperl RUNTIME_DEP_PKGS = CSWapache2 CSWapache2rt CSWexpat CSWiconv -RUNTIME_DEP_PKGS += CSWbdb CSWoldaprt CSWapr +RUNTIME_DEP_PKGS += CSWbdb CSWoldaprt #BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CONFIGURE_ARGS = MP_APXS=$(prefix)/apache2/sbin/apxs 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 Feb 12 13:30:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Feb 2010 12:30:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[8518] csw/mgar/pkg/setoolkit/trunk Message-ID: Revision: 8518 http://gar.svn.sourceforge.net/gar/?rev=8518&view=rev Author: dmichelsen Date: 2010-02-12 12:30:56 +0000 (Fri, 12 Feb 2010) Log Message: ----------- setoolkit: Update to 3.5.1, cleanup Makefile Modified Paths: -------------- csw/mgar/pkg/setoolkit/trunk/Makefile csw/mgar/pkg/setoolkit/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/setoolkit/trunk/files/CSWsetoolkit.depend csw/mgar/pkg/setoolkit/trunk/files/CSWsetoolkit.gspec csw/mgar/pkg/setoolkit/trunk/files/CSWsetoolkit.prototype Modified: csw/mgar/pkg/setoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/setoolkit/trunk/Makefile 2010-02-12 12:25:49 UTC (rev 8517) +++ csw/mgar/pkg/setoolkit/trunk/Makefile 2010-02-12 12:30:56 UTC (rev 8518) @@ -1,5 +1,5 @@ GARNAME = setoolkit -GARVERSION = 3.5.0 +GARVERSION = 3.5.1 DISTNAME = $(GARNAME)-$(GARVERSION) CATEGORIES = utils @@ -16,16 +16,16 @@ SF_PROJ = setoolkit MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz -DISTFILES += $(call admfiles,CSWsetoolkit,depend) # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=189279 UPSTREAM_USE_SF = 1 UFILES_REGEX = SE.Toolkit.(\d+(?:\.\d+)*) -CONFIGURE_ARGS = $(DIRPATHS) +BUILD_DEP_PKGS = CSWpydocutils BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) # Don't relocate $(bindir) as it contains a shell wrapper ISAEXEC_DIRS = $(libexecdir) @@ -36,6 +36,12 @@ EXTRA_MERGE_EXCLUDE_FILES_amd64 = $(bindir)/se EXTRA_MERGE_EXCLUDE_FILES_sparcv9 = $(bindir)/se +# Testsuite must be run as root SKIPTEST = 1 +# This is intended behaviour as the missing symbols are provided by the "se" binary +# and the libs are to be used only by "se". +CHECKPKG_OVERRIDES = CSWsetoolkit|symbol-not-found|libsegui.so +CHECKPKG_OVERRIDES += CSWsetoolkit|symbol-not-found|libsenet.so + include gar/category.mk Modified: csw/mgar/pkg/setoolkit/trunk/checksums =================================================================== --- csw/mgar/pkg/setoolkit/trunk/checksums 2010-02-12 12:25:49 UTC (rev 8517) +++ csw/mgar/pkg/setoolkit/trunk/checksums 2010-02-12 12:30:56 UTC (rev 8518) @@ -1,3 +1 @@ -ef6080e6252716e4d270ba4e0b4884f9 download/setoolkit-3.5.0.tar.gz -ba1ceb07f691ac2d1ed6eb59cb474f46 download/CSWsetoolkit.gspec -53022417352e45cada7b31cf88e9b598 download/CSWsetoolkit.depend +c9ccd992e747668bb4d8921fb2423e1c setoolkit-3.5.1.tar.gz Deleted: csw/mgar/pkg/setoolkit/trunk/files/CSWsetoolkit.depend =================================================================== --- csw/mgar/pkg/setoolkit/trunk/files/CSWsetoolkit.depend 2010-02-12 12:25:49 UTC (rev 8517) +++ csw/mgar/pkg/setoolkit/trunk/files/CSWsetoolkit.depend 2010-02-12 12:30:56 UTC (rev 8518) @@ -1 +0,0 @@ -P CSWisaexec isaexec - sneaky wrapper around Sun isaexec Deleted: csw/mgar/pkg/setoolkit/trunk/files/CSWsetoolkit.gspec =================================================================== --- csw/mgar/pkg/setoolkit/trunk/files/CSWsetoolkit.gspec 2010-02-12 12:25:49 UTC (rev 8517) +++ csw/mgar/pkg/setoolkit/trunk/files/CSWsetoolkit.gspec 2010-02-12 12:30:56 UTC (rev 8518) @@ -1,4 +0,0 @@ -%var bitname setoolkit -%var pkgname CSWsetoolkit -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/setoolkit/trunk/files/CSWsetoolkit.prototype =================================================================== --- csw/mgar/pkg/setoolkit/trunk/files/CSWsetoolkit.prototype 2010-02-12 12:25:49 UTC (rev 8517) +++ csw/mgar/pkg/setoolkit/trunk/files/CSWsetoolkit.prototype 2010-02-12 12:30:56 UTC (rev 8518) @@ -1,268 +0,0 @@ -d none /opt/csw/bin 0755 root bin -l none /opt/csw/bin/se=isaexec -#f none /opt/csw/pw_example.sh=$WORKDIR/adrian/bin/pw_example.sh 0755 root bin -#f none /opt/csw/workollator_example.sh=$WORKDIR/adrian/bin/workollator_example.sh 0755 root bin -d none /opt/csw/bin 0755 root bin -d none /opt/csw/bin/$optdir32 0755 root bin -f none /opt/csw/bin/$optdir32/se=$WORKDIR/se 0555 root bin -d none /opt/csw/bin/$optdir64 0755 root bin -f none /opt/csw/bin/$optdir64/se=$WORKDIR64/se 0555 root bin -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/$arch64 0755 root bin -!default 0644 root bin -f none /opt/csw/lib/libsenet.so=$WORKDIR/sex/net/lib/.libs/libsenet.so -f none /opt/csw/lib/libsegui.so=$WORKDIR/sex/gui/lib/.libs/libsegui.so -f none /opt/csw/lib/$arch64/libsenet.so=$WORKDIR64/sex/net/lib/.libs/libsenet.so -f none /opt/csw/lib/$arch64/libsegui.so=$WORKDIR64/sex/gui/lib/.libs/libsegui.so -d none /opt/csw/lib/app-defaults 0755 -f none /opt/csw/lib/app-defaults/Segui=$WORKDIR/sex/gui/lib/Segui -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1m 0755 root bin -f none /opt/csw/share/man/man1m/se.1m=$WORKDIR/doc/se.1m -d none /opt/csw 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/doc 0755 root bin -d none /opt/csw/share/doc/se 0755 root bin -f none /opt/csw/share/doc/se/USERS.MANUAL.html=$WORKDIR/doc/USERS.MANUAL.html -f none /opt/csw/share/doc/se/EXAMPLES.DOC=$WORKDIR/doc/EXAMPLES.DOC -f none /opt/csw/share/doc/se/REPORTING.BUGS=$WORKDIR/doc/REPORTING.BUGS -f none /opt/csw/share/doc/se/README.INSTALL=$WORKDIR/doc/README.INSTALL -f none /opt/csw/share/doc/se/README.RELEASE=$WORKDIR/doc/README.RELEASE -f none /opt/csw/share/doc/se/CHANGES=$WORKDIR/doc/CHANGES -f none /opt/csw/share/doc/se/FAQ=$WORKDIR/doc/FAQ -f none /opt/csw/share/doc/se/GUI.MANUAL=$WORKDIR/sex/gui/doc/GUI.MANUAL -d none /opt/csw/share/se 0755 root bin -d none /opt/csw/share/se/include 0755 root bin -f none /opt/csw/share/se/include/app_wrap_class.se=$WORKDIR/include/app_wrap_class.se -f none /opt/csw/share/se/include/condvar.se=$WORKDIR/include/condvar.se -f none /opt/csw/share/se/include/ctlr_class.se=$WORKDIR/include/ctlr_class.se -f none /opt/csw/share/se/include/ctype.se=$WORKDIR/include/ctype.se -f none /opt/csw/share/se/include/devinfo.se=$WORKDIR/include/devinfo.se -f none /opt/csw/share/se/include/dirent.se=$WORKDIR/include/dirent.se -f none /opt/csw/share/se/include/diskinfo.se=$WORKDIR/include/diskinfo.se -f none /opt/csw/share/se/include/dlfcn.se=$WORKDIR/include/dlfcn.se -f none /opt/csw/share/se/include/errno.se=$WORKDIR/include/errno.se -f none /opt/csw/share/se/include/fcntl.se=$WORKDIR/include/fcntl.se -f none /opt/csw/share/se/include/kstat.se=$WORKDIR/include/kstat.se -f none /opt/csw/share/se/include/math.se=$WORKDIR/include/math.se -f none /opt/csw/share/se/include/mib.se=$WORKDIR/include/mib.se -f none /opt/csw/share/se/include/mnt_class.se=$WORKDIR/include/mnt_class.se -f none /opt/csw/share/se/include/mutex.se=$WORKDIR/include/mutex.se -f none /opt/csw/share/se/include/ndd.se=$WORKDIR/include/ndd.se -f none /opt/csw/share/se/include/netdb.se=$WORKDIR/include/netdb.se -f none /opt/csw/share/se/include/netif.se=$WORKDIR/include/netif.se -f none /opt/csw/share/se/include/nfs_clnt.se=$WORKDIR/include/nfs_clnt.se -f none /opt/csw/share/se/include/p_iostat_class.se=$WORKDIR/include/p_iostat_class.se -f none /opt/csw/share/se/include/p_netstat_class.se=$WORKDIR/include/p_netstat_class.se -f none /opt/csw/share/se/include/p_vmstat_class.se=$WORKDIR/include/p_vmstat_class.se -f none /opt/csw/share/se/include/partinfo.se=$WORKDIR/include/partinfo.se -f none /opt/csw/share/se/include/poll.se=$WORKDIR/include/poll.se -f none /opt/csw/share/se/include/proc.se=$WORKDIR/include/proc.se -f none /opt/csw/share/se/include/processor.se=$WORKDIR/include/processor.se -f none /opt/csw/share/se/include/pwd.se=$WORKDIR/include/pwd.se -f none /opt/csw/share/se/include/rpc_clnt.se=$WORKDIR/include/rpc_clnt.se -f none /opt/csw/share/se/include/se.se=$WORKDIR/include/se.se -f none /opt/csw/share/se/include/se_trees.se=$WORKDIR/include/se_trees.se -f none /opt/csw/share/se/include/signal.se=$WORKDIR/include/signal.se -f none /opt/csw/share/se/include/socket.se=$WORKDIR/include/socket.se -f none /opt/csw/share/se/include/stat.se=$WORKDIR/include/stat.se -f none /opt/csw/share/se/include/statvfs.se=$WORKDIR/include/statvfs.se -f none /opt/csw/share/se/include/stdio.se=$WORKDIR/include/stdio.se -f none /opt/csw/share/se/include/stdlib.se=$WORKDIR/include/stdlib.se -f none /opt/csw/share/se/include/string.se=$WORKDIR/include/string.se -f none /opt/csw/share/se/include/sys_kstat.se=$WORKDIR/include/sys_kstat.se -f none /opt/csw/share/se/include/sys_swap.se=$WORKDIR/include/sys_swap.se -f none /opt/csw/share/se/include/sysdepend.se=$WORKDIR/include/sysdepend.se -f none /opt/csw/share/se/include/sysinfo_class.se=$WORKDIR/include/sysinfo_class.se -f none /opt/csw/share/se/include/syslog.se=$WORKDIR/include/syslog.se -f none /opt/csw/share/se/include/systeminfo.se=$WORKDIR/include/systeminfo.se -f none /opt/csw/share/se/include/tapeinfo.se=$WORKDIR/include/tapeinfo.se -f none /opt/csw/share/se/include/time.se=$WORKDIR/include/time.se -f none /opt/csw/share/se/include/tiuser.se=$WORKDIR/include/tiuser.se -f none /opt/csw/share/se/include/types.se=$WORKDIR/include/types.se -f none /opt/csw/share/se/include/uio.se=$WORKDIR/include/uio.se -f none /opt/csw/share/se/include/unistd.se=$WORKDIR/include/unistd.se -f none /opt/csw/share/se/include/uptime_class.se=$WORKDIR/include/uptime_class.se -f none /opt/csw/share/se/include/utmp.se=$WORKDIR/include/utmp.se -f none /opt/csw/share/se/include/utsname.se=$WORKDIR/include/utsname.se -f none /opt/csw/share/se/include/vfs.se=$WORKDIR/include/vfs.se -f none /opt/csw/share/se/include/vmstat_class.se=$WORKDIR/include/vmstat_class.se -f none /opt/csw/share/se/include/wait.se=$WORKDIR/include/wait.se -f none /opt/csw/share/se/include/gui_defines.h=$WORKDIR/sex/gui/include/gui_defines.h -f none /opt/csw/share/se/include/gui_lib.se=$WORKDIR/sex/gui/include/gui_lib.se -f none /opt/csw/share/se/include/multi_rstat_class.se=$WORKDIR/sex/net/include/multi_rstat_class.se -f none /opt/csw/share/se/include/net_lib.se=$WORKDIR/sex/net/include/net_lib.se -f none /opt/csw/share/se/include/rstat_class.se=$WORKDIR/sex/net/include/rstat_class.se -f none /opt/csw/share/se/include/live_rules.se=$WORKDIR/adrian/include/live_rules.se -f none /opt/csw/share/se/include/logfile.se=$WORKDIR/adrian/include/logfile.se -f none /opt/csw/share/se/include/process_class.se=$WORKDIR/adrian/include/process_class.se -f none /opt/csw/share/se/include/process_rules.se=$WORKDIR/adrian/include/process_rules.se -f none /opt/csw/share/se/include/pure_rules.se=$WORKDIR/adrian/include/pure_rules.se -f none /opt/csw/share/se/include/pure_rules_dutch.se=$WORKDIR/adrian/include/pure_rules_dutch.se -f none /opt/csw/share/se/include/pure_rules_swedish.se=$WORKDIR/adrian/include/pure_rules_swedish.se -f none /opt/csw/share/se/include/tcp_class.se=$WORKDIR/adrian/include/tcp_class.se -f none /opt/csw/share/se/include/tcp_rules.se=$WORKDIR/adrian/include/tcp_rules.se -f none /opt/csw/share/se/include/tcp_rules_dutch.se=$WORKDIR/adrian/include/tcp_rules_dutch.se -f none /opt/csw/share/se/include/workload_class.se=$WORKDIR/adrian/include/workload_class.se -d none /opt/csw/share/se 0755 root bin -d none /opt/csw/share/se/examples 0755 root other -f none /opt/csw/share/se/examples/cpg.se=$WORKDIR/examples/cpg.se 0644 root other -f none /opt/csw/share/se/examples/webtune.se=$WORKDIR/examples/webtune.se 0644 root other -f none /opt/csw/share/se/examples/cpus.se=$WORKDIR/examples/cpus.se 0644 root other -f none /opt/csw/share/se/examples/swap.se=$WORKDIR/examples/swap.se 0644 root other -f none /opt/csw/share/se/examples/mpvmstat.se=$WORKDIR/examples/mpvmstat.se 0644 root other -f none /opt/csw/share/se/examples/disks.se=$WORKDIR/examples/disks.se 0644 root other -f none /opt/csw/share/se/examples/swapctl.se=$WORKDIR/examples/swapctl.se 0644 root other -f none /opt/csw/share/se/examples/util.se=$WORKDIR/examples/util.se 0644 root other -f none /opt/csw/share/se/examples/iost.se=$WORKDIR/examples/iost.se 0644 root other -f none /opt/csw/share/se/examples/collisions.se=$WORKDIR/examples/collisions.se 0644 root other -f none /opt/csw/share/se/examples/vmstat.se=$WORKDIR/examples/vmstat.se 0644 root other -f none /opt/csw/share/se/examples/ps-p.se=$WORKDIR/examples/ps-p.se 0644 root other -f none /opt/csw/share/se/examples/syslog.se=$WORKDIR/examples/syslog.se 0644 root other -f none /opt/csw/share/se/examples/nproc.se=$WORKDIR/examples/nproc.se 0644 root other -f none /opt/csw/share/se/examples/nfsstat.se=$WORKDIR/examples/nfsstat.se 0644 root other -f none /opt/csw/share/se/examples/netstat.se=$WORKDIR/examples/netstat.se 0644 root other -f none /opt/csw/share/se/examples/net.se=$WORKDIR/examples/net.se 0644 root other -f none /opt/csw/share/se/examples/pwatch.se=$WORKDIR/examples/pwatch.se 0644 root other -f none /opt/csw/share/se/examples/siostat.se=$WORKDIR/examples/siostat.se 0644 root other -f none /opt/csw/share/se/examples/ps-ax.se=$WORKDIR/examples/ps-ax.se 0644 root other -f none /opt/csw/share/se/examples/hostid.se=$WORKDIR/examples/hostid.se 0644 root other -f none /opt/csw/share/se/examples/xiostat.se=$WORKDIR/examples/xiostat.se 0644 root other -f none /opt/csw/share/se/examples/kvmname.se=$WORKDIR/examples/kvmname.se 0644 root other -f none /opt/csw/share/se/examples/dumpkstats.se=$WORKDIR/examples/dumpkstats.se 0644 root other -f none /opt/csw/share/se/examples/xio.se=$WORKDIR/examples/xio.se 0644 root other -f none /opt/csw/share/se/examples/limits.se=$WORKDIR/examples/limits.se 0644 root other -f none /opt/csw/share/se/examples/iostat.se=$WORKDIR/examples/iostat.se 0644 root other -f none /opt/csw/share/se/examples/uptime.se=$WORKDIR/examples/uptime.se 0644 root other -f none /opt/csw/share/se/examples/ctlr.se=$WORKDIR/examples/ctlr.se 0644 root other -f none /opt/csw/share/se/examples/uname.se=$WORKDIR/examples/uname.se 0644 root other -f none /opt/csw/share/se/examples/aw.se=$WORKDIR/examples/aw.se 0644 root other -d none /opt/csw/share/se/examples 0755 root other -d none /opt/csw/share/se/examples/data 0755 root other -f none /opt/csw/share/se/examples/data/xload_icon=$WORKDIR/sex/gui/examples/data/xload_icon 0644 root other -f none /opt/csw/share/se/examples/data/cpu_meter_icon=$WORKDIR/sex/gui/examples/data/cpu_meter_icon 0644 root other -f none /opt/csw/share/se/examples/data/xit_icon=$WORKDIR/sex/gui/examples/data/xit_icon 0644 root other -f none /opt/csw/share/se/examples/infotool.se=$WORKDIR/sex/gui/examples/infotool.se 0644 root other -f none /opt/csw/share/se/examples/cpu_meter.se=$WORKDIR/sex/gui/examples/cpu_meter.se 0644 root other -f none /opt/csw/share/se/examples/mini_cpu.se=$WORKDIR/sex/gui/examples/mini_cpu.se 0644 root other -f none /opt/csw/share/se/examples/xit.se=$WORKDIR/sex/gui/examples/xit.se 0644 root other -f none /opt/csw/share/se/examples/multi_meter.se=$WORKDIR/sex/gui/examples/multi_meter.se 0644 root other -f none /opt/csw/share/se/examples/xload.se=$WORKDIR/sex/gui/examples/xload.se 0644 root other -d none /opt/csw/share/se/examples 0755 root other -d none /opt/csw/share/se/examples/net_example 0755 root other -f none /opt/csw/share/se/examples/net_example/client.se=$WORKDIR/sex/net/examples/net_example/client.se 0644 root other -f none /opt/csw/share/se/examples/net_example/sample.se=$WORKDIR/sex/net/examples/net_example/sample.se 0644 root other -f none /opt/csw/share/se/examples/net_example/server.se=$WORKDIR/sex/net/examples/net_example/server.se 0644 root other -f none /opt/csw/share/se/examples/mrvmstat.se=$WORKDIR/sex/net/examples/mrvmstat.se 0644 root other -f none /opt/csw/share/se/examples/rvmstat.se=$WORKDIR/sex/net/examples/rvmstat.se 0644 root other -d none /opt/csw/share/se/examples 0755 root other -d none /opt/csw/share/se/examples/data 0755 root other -f none /opt/csw/share/se/examples/data/ram=$WORKDIR/adrian/examples/data/ram 0644 root other -f none /opt/csw/share/se/examples/data/dnlc=$WORKDIR/adrian/examples/data/dnlc 0644 root other -f none /opt/csw/share/se/examples/data/callog.root=$WORKDIR/adrian/examples/data/callog.root 0644 root other -f none /opt/csw/share/se/examples/data/nfs_client=$WORKDIR/adrian/examples/data/nfs_client 0644 root other -f none /opt/csw/share/se/examples/data/zoom=$WORKDIR/adrian/examples/data/zoom 0644 root other -f none /opt/csw/share/se/examples/data/cpu=$WORKDIR/adrian/examples/data/cpu 0644 root other -f none /opt/csw/share/se/examples/data/blank=$WORKDIR/adrian/examples/data/blank 0644 root other -f none /opt/csw/share/se/examples/data/network=$WORKDIR/adrian/examples/data/network 0644 root other -f none /opt/csw/share/se/examples/data/kmem=$WORKDIR/adrian/examples/data/kmem 0644 root other -f none /opt/csw/share/se/examples/data/disk=$WORKDIR/adrian/examples/data/disk 0644 root other -f none /opt/csw/share/se/examples/data/inode=$WORKDIR/adrian/examples/data/inode 0644 root other -f none /opt/csw/share/se/examples/data/adrian=$WORKDIR/adrian/examples/data/adrian 0644 root other -f none /opt/csw/share/se/examples/data/mutex=$WORKDIR/adrian/examples/data/mutex 0644 root other -f none /opt/csw/share/se/examples/data/drip.au=$WORKDIR/adrian/examples/data/drip.au 0644 root other -f none /opt/csw/share/se/examples/data/richp=$WORKDIR/adrian/examples/data/richp 0644 root other -f none /opt/csw/share/se/examples/data/adrian.bio=$WORKDIR/adrian/examples/data/adrian.bio 0644 root other -f none /opt/csw/share/se/examples/data/swap=$WORKDIR/adrian/examples/data/swap 0644 root other -f none /opt/csw/share/se/examples/data/tpry.desc=$WORKDIR/adrian/examples/data/tpry.desc 0644 root other -f none /opt/csw/share/se/examples/data/richp.bio=$WORKDIR/adrian/examples/data/richp.bio 0644 root other -f none /opt/csw/share/se/examples/pure_test.se=$WORKDIR/adrian/examples/pure_test.se 0644 root other -f none /opt/csw/share/se/examples/netstatx.se=$WORKDIR/adrian/examples/netstatx.se 0644 root other -f none /opt/csw/share/se/examples/iomonitor.se=$WORKDIR/adrian/examples/iomonitor.se 0644 root other -f none /opt/csw/share/se/examples/virtual_adrian_lite.se=$WORKDIR/adrian/examples/virtual_adrian_lite.se 0644 root other -f none /opt/csw/share/se/examples/nx.se=$WORKDIR/adrian/examples/nx.se 0644 root other -f none /opt/csw/share/se/examples/bigbrother.se=$WORKDIR/adrian/examples/bigbrother.se 0644 root other -f none /opt/csw/share/se/examples/perfmeter.se=$WORKDIR/adrian/examples/perfmeter.se 0644 root other -f none /opt/csw/share/se/examples/tpry.se=$WORKDIR/adrian/examples/tpry.se 0644 root other -f none /opt/csw/share/se/examples/nfsmonitor.se=$WORKDIR/adrian/examples/nfsmonitor.se 0644 root other -f none /opt/csw/share/se/examples/msacct_off.se=$WORKDIR/adrian/examples/msacct_off.se 0644 root other -f none /opt/csw/share/se/examples/pry.se=$WORKDIR/adrian/examples/pry.se 0644 root other -f none /opt/csw/share/se/examples/msacct.se=$WORKDIR/adrian/examples/msacct.se 0644 root other -f none /opt/csw/share/se/examples/cpuchk.se=$WORKDIR/adrian/examples/cpuchk.se 0644 root other -f none /opt/csw/share/se/examples/workollator.se=$WORKDIR/adrian/examples/workollator.se 0644 root other -f none /opt/csw/share/se/examples/cpustat.se=$WORKDIR/adrian/examples/cpustat.se 0644 root other -f none /opt/csw/share/se/examples/zoom.se=$WORKDIR/adrian/examples/zoom.se 0644 root other -f none /opt/csw/share/se/examples/pw.se=$WORKDIR/adrian/examples/pw.se 0644 root other -f none /opt/csw/share/se/examples/percollator.se=$WORKDIR/adrian/examples/percollator.se 0644 root other -f none /opt/csw/share/se/examples/pw_log.se=$WORKDIR/adrian/examples/pw_log.se 0644 root other -f none /opt/csw/share/se/examples/vmmonitor.se=$WORKDIR/adrian/examples/vmmonitor.se 0644 root other -f none /opt/csw/share/se/examples/peer.se=$WORKDIR/adrian/examples/peer.se 0644 root other -f none /opt/csw/share/se/examples/monlog.se=$WORKDIR/adrian/examples/monlog.se 0644 root other -f none /opt/csw/share/se/examples/tcp_monitor.se=$WORKDIR/adrian/examples/tcp_monitor.se 0644 root other -f none /opt/csw/share/se/examples/live_test.se=$WORKDIR/adrian/examples/live_test.se 0644 root other -f none /opt/csw/share/se/examples/netmonitor.se=$WORKDIR/adrian/examples/netmonitor.se 0644 root other -f none /opt/csw/share/se/examples/vader.se=$WORKDIR/adrian/examples/vader.se 0644 root other -f none /opt/csw/share/se/examples/darth.se=$WORKDIR/adrian/examples/darth.se 0644 root other -f none /opt/csw/share/se/examples/virtual_adrian.se=$WORKDIR/adrian/examples/virtual_adrian.se 0644 root other -f none /opt/csw/share/se/examples/pea.se=$WORKDIR/adrian/examples/pea.se 0644 root other -f none /opt/csw/share/se/examples/peac.se=$WORKDIR/adrian/examples/peac.se 0644 root other -f none /opt/csw/share/se/examples/mon_cm.se=$WORKDIR/adrian/examples/mon_cm.se 0644 root other -d none /opt/csw/etc 0755 root bin -d none /opt/csw/etc/init.d 0755 root other -f none /opt/csw/etc/init.d/vader=$WORKDIR/etc/init.d/vader 0644 root other -f none /opt/csw/etc/init.d/percol=$WORKDIR/etc/init.d/percol 0644 root other -f none /opt/csw/etc/init.d/mon_cm=$WORKDIR/etc/init.d/mon_cm 0644 root other -f none /opt/csw/etc/init.d/monlog=$WORKDIR/etc/init.d/monlog 0644 root other -f none /opt/csw/etc/init.d/va_monitor=$WORKDIR/etc/init.d/va_monitor 0644 root other -d none /opt/csw/etc/rc0.d 0755 root other -s none /opt/csw/etc/rc0.d/K34vader=/opt/csw/etc/init.d/vader -s none /opt/csw/etc/rc0.d/K60percol=/opt/csw/etc/init.d/percol -s none /opt/csw/etc/rc0.d/K60mon_cm=/opt/csw/etc/init.d/mon_cm -s none /opt/csw/etc/rc0.d/K60monlog=/opt/csw/etc/init.d/monlog -s none /opt/csw/etc/rc0.d/K60va_monitor=/opt/csw/etc/init.d/va_monitor -d none /opt/csw/etc/rc2.d 0755 root other -s none /opt/csw/etc/rc2.d/S90mon_cm=/opt/csw/etc/init.d/mon_cm -s none /opt/csw/etc/rc2.d/S89vader=/opt/csw/etc/init.d/vader -s none /opt/csw/etc/rc2.d/S90monlog=/opt/csw/etc/init.d/monlog -s none /opt/csw/etc/rc2.d/S90va_monitor=/opt/csw/etc/init.d/va_monitor -d none /opt/csw/etc/rc3.d 0755 root other -s none /opt/csw/etc/rc3.d/S99percol=/opt/csw/etc/init.d/percol -f none /opt/csw/etc/se_defines=$WORKDIR/etc/se_defines 0644 root other -f none /opt/csw/share/se/se-mode.el=$WORKDIR/etc/se-mode.el 0644 root other -f none /opt/csw/share/se/se-mode.elc=$WORKDIR/etc/se-mode.elc 0644 root other -d none /opt/csw/share/se/contrib 0755 root other -d none /opt/csw/share/se/contrib/perfbar 0755 root other -f none /opt/csw/share/se/contrib/perfbar/author=$WORKDIR/contrib/perfbar/author 0644 root other -f none /opt/csw/share/se/contrib/perfbar/perfbar.se=$WORKDIR/contrib/perfbar/perfbar.se 0644 root other -d none /opt/csw/share/se/contrib/kview 0755 root other -f none /opt/csw/share/se/contrib/kview/author=$WORKDIR/contrib/kview/author 0644 root other -f none /opt/csw/share/se/contrib/kview/kviewx.se=$WORKDIR/contrib/kview/kviewx.se 0644 root other -d none /opt/csw/share/se/contrib/watch 0755 root other -f none /opt/csw/share/se/contrib/watch/author=$WORKDIR/contrib/watch/author 0644 root other -f none /opt/csw/share/se/contrib/watch/watch.se=$WORKDIR/contrib/watch/watch.se 0644 root other -d none /opt/csw/share/se/contrib/dfstats 0755 root other -f none /opt/csw/share/se/contrib/dfstats/author=$WORKDIR/contrib/dfstats/author 0644 root other -f none /opt/csw/share/se/contrib/dfstats/fs_class.se=$WORKDIR/contrib/dfstats/fs_class.se 0644 root other -f none /opt/csw/share/se/contrib/dfstats/mdf.se=$WORKDIR/contrib/dfstats/mdf.se 0644 root other -f none /opt/csw/share/se/contrib/dfstats/df_stats.se=$WORKDIR/contrib/dfstats/df_stats.se 0644 root other -d none /opt/csw/share/se/contrib/iops 0755 root other -f none /opt/csw/share/se/contrib/iops/iops.se=$WORKDIR/contrib/iops/iops.se 0644 root other -f none /opt/csw/share/se/contrib/iops/author=$WORKDIR/contrib/iops/author 0644 root other -d none /opt/csw/share/se/contrib/psrsetstat 0755 root other -f none /opt/csw/share/se/contrib/psrsetstat/author=$WORKDIR/contrib/psrsetstat/author 0644 root other -f none /opt/csw/share/se/contrib/psrsetstat/psrsetstat.se=$WORKDIR/contrib/psrsetstat/psrsetstat.se 0644 root other -d none /opt/csw/share/se/toptool 0755 root other -f none /opt/csw/share/se/toptool/toptool=$WORKDIR/toptool/toptool 0644 root other -f none /opt/csw/share/se/toptool/toptool.se=$WORKDIR/toptool/toptool.se 0644 root other -d none /opt/csw/share/se/dio 0755 root other -f none /opt/csw/share/se/dio/dio.se=$WORKDIR/dio/dio.se 0644 root other -f none /opt/csw/share/se/dio/dio_disk.se=$WORKDIR/dio/dio_disk.se 0644 root other -d none /opt/csw/share/se/perfmon 0755 root other -f none /opt/csw/share/se/perfmon/perfmon=$WORKDIR/perfmon/perfmon 0644 root other -f none /opt/csw/share/se/perfmon/p_vmstat_class.se=$WORKDIR/perfmon/p_vmstat_class.se 0644 root other -f none /opt/csw/share/se/perfmon/vmstat_class.se=$WORKDIR/perfmon/vmstat_class.se 0644 root other -f none /opt/csw/share/se/perfmon/perfmon.se=$WORKDIR/perfmon/perfmon.se 0644 root other -d none /opt/csw/share/se/workollator 0755 root other -f none /opt/csw/share/se/workollator/pwgrab=$WORKDIR/workollator/pwgrab 0644 root other -f none /opt/csw/share/se/workollator/explode.csh=$WORKDIR/workollator/explode.csh 0644 root other -f none /opt/csw/share/se/workollator/README=$WORKDIR/workollator/README 0644 root other 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 Feb 12 13:34:04 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Feb 2010 12:34:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[8519] csw/mgar/pkg/setoolkit/trunk/Makefile Message-ID: Revision: 8519 http://gar.svn.sourceforge.net/gar/?rev=8519&view=rev Author: dmichelsen Date: 2010-02-12 12:34:04 +0000 (Fri, 12 Feb 2010) Log Message: ----------- setoolkit: Fix exclusion rule name Modified Paths: -------------- csw/mgar/pkg/setoolkit/trunk/Makefile Modified: csw/mgar/pkg/setoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/setoolkit/trunk/Makefile 2010-02-12 12:30:56 UTC (rev 8518) +++ csw/mgar/pkg/setoolkit/trunk/Makefile 2010-02-12 12:34:04 UTC (rev 8519) @@ -33,8 +33,8 @@ MERGE_EXCLUDE_FILES = .*~ $(bindir)/.*\.sh .*\.la # Don't add the shell wrapper for other ISAs -EXTRA_MERGE_EXCLUDE_FILES_amd64 = $(bindir)/se -EXTRA_MERGE_EXCLUDE_FILES_sparcv9 = $(bindir)/se +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = $(bindir)/se +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = $(bindir)/se # Testsuite must be run as root SKIPTEST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Feb 12 14:18:20 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Feb 2010 13:18:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8520] csw/mgar/gar/v2 Message-ID: Revision: 8520 http://gar.svn.sourceforge.net/gar/?rev=8520&view=rev Author: dmichelsen Date: 2010-02-12 13:18:19 +0000 (Fri, 12 Feb 2010) Log Message: ----------- mGAR v2: Support for cswalternatives Modified Paths: -------------- csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-02-12 12:34:04 UTC (rev 8519) +++ csw/mgar/gar/v2/gar.mk 2010-02-12 13:18:19 UTC (rev 8520) @@ -712,7 +712,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge +merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge @$(DONADA) merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential) @@ -788,7 +788,7 @@ .PHONY: remerge reset-merge reset-merge-modulated remerge: reset-merge merge -reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-src +reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-alternatives reset-merge-src @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge @rm -rf $(PKGROOT) @$(DONADA) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-12 12:34:04 UTC (rev 8519) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-12 13:18:19 UTC (rev 8520) @@ -361,6 +361,7 @@ $(if $(PROTOTYPE_FILES_$M),})\ )\ $(foreach F,$(POSTMSG),$$F[1] = "cswpostmsg" if( $$F[2] eq "$F" );)\ + $$F[1] = "cswalternatives" if( $$F[2] =~ m,^/opt/csw/share/alternatives/[^/]+$$, );\ print join(" ", at F),"\n";' @@ -392,7 +393,8 @@ -n "$(ISAEXEC_FILES_$*)" -o \ -n "$(ISAEXEC_FILES)" ]; then \ (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license -I /etc/opt/csw/pkg/$*/cswmigrateconf) \ - $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license -X /etc/opt/csw/pkg/$S/cswmigrateconf) \ + $(if $(or $(ALTERNATIVES_$*),$(ALTERNATIVES)),-I /opt/csw/share/alternatives/$(call catalogname,$*)) \ + $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license -X /etc/opt/csw/pkg/$S/cswmigrateconf -X /opt/csw/share/alternatives/$(call catalogname,$S)) \ $(foreach I,$(EXTRA_PKGFILES_INCLUDED) $(EXTRA_PKGFILES_INCLUDED_$*),-i '$I') \ $(foreach X,$(EXTRA_PKGFILES_EXCLUDED) $(EXTRA_PKGFILES_EXCLUDED_$*),-x '$X') \ $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \ @@ -431,6 +433,7 @@ # The dependencies to CSWcswclassutils and CSWtexinfo are only added if there are files # actually matching the _TEXINFO_FILTER. This is done at the prototype-level. $(WORKDIR)/%.depend: $(WORKDIR)/$*.prototype +$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswalternatives")')),CSWalternatives) $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$F[1] eq "$C");)')),CSWcswclassutils) $(WORKDIR)/%.depend: $(WORKDIR) @@ -536,6 +539,7 @@ # The texinfo filter has been taken out of the normal filters as TEXINFO has a default. $(WORKDIR)/%.pkginfo: $(WORKDIR)/%.prototype +$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswalternatives")')),cswalternatives) $(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(shell cat $(WORKDIR)/$*.prototype | perl -e 'while(<>){@F=split;$$c{$$F[1]}++};$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$c{$C});)') $(WORKDIR)/%.pkginfo: $(WORKDIR) @@ -672,6 +676,18 @@ reset-merge-checkpkgoverrides: @rm -f $(COOKIEDIR)/merge-checkpkgoverrides $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-checkpkgoverrides-$(SPEC)) +merge-alternatives-%: + @echo "[ Generating alternatives for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/alternatives + $(_DBG)($(foreach A,$(or $(ALTERNATIVES_$*),$(ALTERNATIVES)),echo "$(ALTERNATIVE_$A)";)) \ + > $(PKGROOT)/opt/csw/share/alternatives/$(call catalogname,$*) + @$(MAKECOOKIE) + +merge-alternatives: $(foreach S,$(SPKG_SPECS),$(if $(or $(ALTERNATIVES_$S),$(ALTERNATIVES)),merge-alternatives-$S)) + +reset-merge-alternatives: + @rm -f $(COOKIEDIR)/merge-alternatives $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-alternatives-$(SPEC)) + merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE)) merge-src: fetch $(_DBG)mkdir -p $(_SRCDIR)/files 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 Feb 12 15:16:20 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Feb 2010 14:16:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8521] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 8521 http://gar.svn.sourceforge.net/gar/?rev=8521&view=rev Author: dmichelsen Date: 2010-02-12 14:16:20 +0000 (Fri, 12 Feb 2010) Log Message: ----------- openldap: Fix dependencies and ignore known oddities Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-02-12 13:18:19 UTC (rev 8520) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-02-12 14:16:20 UTC (rev 8521) @@ -44,7 +44,7 @@ SPKG_DESC_CSWoldaprt = OpenLDAP runtime libraries RUNTIME_DEP_PKGS_CSWoldap = CSWbdb47 CSWiconv CSWlibnet CSWlibtoolrt CSWoldaprt -RUNTIME_DEP_PKGS_CSWoldap += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc CSWcswclassutils +RUNTIME_DEP_PKGS_CSWoldap += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc RUNTIME_DEP_PKGS_CSWoldap += CSWkrb5lib CSWlibicu CSWperl RUNTIME_DEP_PKGS_CSWoldapclient = CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWkrb5lib RUNTIME_DEP_PKGS_CSWoldapdevel = CSWoldaprt @@ -116,6 +116,13 @@ INITSMF = /etc/opt/csw/init.d/cswopenldap +# There are plenty of cross-references. Ignore for now, but should be +# investigated later. +CHECKPKG_OVERRIDES = symbol-not-found +CHECKPKG_OVERRIDES_CSWoldapdevel = symbol-not-found +# The devel package depends on rt instead of the full package, that is ok. +CHECKPKG_OVERRIDES_CSWoldapdevel += CSWoldapdevel|missing-dependency|CSWoldap + include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Feb 12 15:23:36 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Feb 2010 14:23:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8522] csw/mgar/pkg/mutt/trunk Message-ID: Revision: 8522 http://gar.svn.sourceforge.net/gar/?rev=8522&view=rev Author: dmichelsen Date: 2010-02-12 14:23:36 +0000 (Fri, 12 Feb 2010) Log Message: ----------- mutt: Add meta-package and notice on alternatives Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile csw/mgar/pkg/mutt/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mutt/trunk/files/CSWmutt.postmsg Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2010-02-12 14:16:20 UTC (rev 8521) +++ csw/mgar/pkg/mutt/trunk/Makefile 2010-02-12 14:23:36 UTC (rev 8522) @@ -17,11 +17,12 @@ VENDOR_URL = http://www.mutt.org MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWmutt.postmsg UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz LICENSE = COPYRIGHT -PACKAGES = CSWmutt-base CSWmutt-ncurses CSWmutt-slang +PACKAGES = CSWmutt CSWmutt-base CSWmutt-ncurses CSWmutt-slang RUNTIME_DEP_PKGS_core = CSWgdbm RUNTIME_DEP_PKGS_core += CSWggettextrt @@ -35,14 +36,17 @@ RUNTIME_DEP_PKGS_CSWmutt-ncurses = $(RUNTIME_DEP_PKGS_core) CSWmutt-base CSWncurses RUNTIME_DEP_PKGS_CSWmutt-slang = $(RUNTIME_DEP_PKGS_core) CSWmutt-base CSWslang RUNTIME_DEP_PKGS_CSWmutt-base = CSWggettextrt CSWiconv CSWlibidn +RUNTIME_DEP_PKGS_CSWmutt = CSWmutt-ncurses CSWmutt-slang CATALOGNAME_CSWmutt-base = mutt_base CATALOGNAME_CSWmutt-ncurses = mutt_ncurses CATALOGNAME_CSWmutt-slang = mutt_slang +CATALOGNAME_CSWmutt = mutt SPKG_DESC_CSWmutt-base = $(DESCRIPTION) SPKG_DESC_CSWmutt-ncurses = Mutt mail client with ncurses interface SPKG_DESC_CSWmutt-slang = Mutt mail client with slang interface +SPKG_DESC_CSWmutt = Metapackage for mutt with ncurses- and slang-interface # Raise optimizer level unless this bug has been fixed: # http://dev.mutt.org/trac/ticket/3347 @@ -81,13 +85,25 @@ EXTRA_PAX_ARGS_slang-yes = -s ",\.$(bindir)/mutt$$,.$(bindir)/mutt-slang,p" -s ",.*,," EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_slang-$(SLANG)) +POSTMSG = $(docdir)/mutt/CSWmutt.postmsg + # CSWmutt-base gets all the rest PKGFILES_CSWmutt-ncurses = $(bindir)/mutt-ncurses PKGFILES_CSWmutt-slang = $(bindir)/mutt-slang +PKGFILES_CSWmutt = $(POSTMSG) ALTERNATIVES_CSWmutt-ncurses = ncurses ALTERNATIVES_CSWmutt-slang = slang ALTERNATIVE_ncurses = $(bindir)/mutt mutt $(bindir)/mutt-ncurses 100 ALTERNATIVE_slang = $(bindir)/mutt mutt $(bindir)/mutt-slang 200 +# This warning from checkpkg is obviously wrong... +CHECKPKG_OVERRIDES_CSWmutt-base = CSWmutt-base|missing-dependency|CSWperl + include gar/category.mk + +post-merge: + ginstall -d $(PKGROOT)$(docdir)/mutt/ + ginstall $(WORKDIR)/CSWmutt.postmsg $(PKGROOT)$(docdir)/mutt/CSWmutt.postmsg + @$(MAKECOOKIE) + Modified: csw/mgar/pkg/mutt/trunk/checksums =================================================================== --- csw/mgar/pkg/mutt/trunk/checksums 2010-02-12 14:16:20 UTC (rev 8521) +++ csw/mgar/pkg/mutt/trunk/checksums 2010-02-12 14:23:36 UTC (rev 8522) @@ -1 +1,2 @@ +f4dc40545ed4a4dd66f18782df282892 CSWmutt.postmsg 027cdd9959203de0c3c64149a7ee351c mutt-1.5.20.tar.gz Added: csw/mgar/pkg/mutt/trunk/files/CSWmutt.postmsg =================================================================== --- csw/mgar/pkg/mutt/trunk/files/CSWmutt.postmsg (rev 0) +++ csw/mgar/pkg/mutt/trunk/files/CSWmutt.postmsg 2010-02-12 14:23:36 UTC (rev 8522) @@ -0,0 +1,12 @@ +There are now two versions of mutt on the system installed: + + * mutt-ncurses with ncurses interface + * mutt-slang with slang interface (per default linked to 'mutt') + +You can easily select between the versions with the alternatives(8) +system by executing + + /opt/csw/sbin/alternatives --config mutt + +See http://wiki.opencsw.org/package-alternatives for details. + 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 Feb 12 15:53:29 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Feb 2010 14:53:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8523] csw/mgar/pkg/mutt/trunk/Makefile Message-ID: Revision: 8523 http://gar.svn.sourceforge.net/gar/?rev=8523&view=rev Author: dmichelsen Date: 2010-02-12 14:53:28 +0000 (Fri, 12 Feb 2010) Log Message: ----------- mutt: Make meta-package ARCHALL Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2010-02-12 14:23:36 UTC (rev 8522) +++ csw/mgar/pkg/mutt/trunk/Makefile 2010-02-12 14:53:28 UTC (rev 8523) @@ -92,6 +92,8 @@ PKGFILES_CSWmutt-slang = $(bindir)/mutt-slang PKGFILES_CSWmutt = $(POSTMSG) +ARCHALL_CSWmutt = 1 + ALTERNATIVES_CSWmutt-ncurses = ncurses ALTERNATIVES_CSWmutt-slang = slang ALTERNATIVE_ncurses = $(bindir)/mutt mutt $(bindir)/mutt-ncurses 100 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 Feb 12 16:07:27 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 12 Feb 2010 15:07:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[8524] csw/mgar/pkg Message-ID: Revision: 8524 http://gar.svn.sourceforge.net/gar/?rev=8524&view=rev Author: skayser Date: 2010-02-12 15:07:26 +0000 (Fri, 12 Feb 2010) Log Message: ----------- scfdot: initial commit Added Paths: ----------- csw/mgar/pkg/scfdot/ csw/mgar/pkg/scfdot/branches/ csw/mgar/pkg/scfdot/tags/ csw/mgar/pkg/scfdot/trunk/ csw/mgar/pkg/scfdot/trunk/Makefile csw/mgar/pkg/scfdot/trunk/checksums csw/mgar/pkg/scfdot/trunk/files/ csw/mgar/pkg/scfdot/trunk/files/README.CSW csw/mgar/pkg/scfdot/trunk/files/smfdepgraph Property changes on: csw/mgar/pkg/scfdot/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/scfdot/trunk/Makefile =================================================================== --- csw/mgar/pkg/scfdot/trunk/Makefile (rev 0) +++ csw/mgar/pkg/scfdot/trunk/Makefile 2010-02-12 15:07:26 UTC (rev 8524) @@ -0,0 +1,61 @@ +# TODO +# ! dot seems to put an extraneous header line in each output file +# -36 3393.7 translate newpath user_shape_0 +# Why is this? Bug? +GARNAME = scfdot +GARVERSION = 1.0 +CATEGORIES = apps + +DESCRIPTION = SMF Dependency Graph Generator +define BLURB + Solaris 10 features the Service Management Facility (SMF), which starts + services in dependency order. Run "man smf" for more information. scfdot + reads the service names and dependencies from the Service Configuration + Facility (SCF) repository and writes a file which the dot program from the + graphviz package can render into a graph. +endef + +VENDOR_URL = http://hub.opensolaris.org/bin/view/Community+Group+smf/scfdot +MASTER_SITES = http://hub.opensolaris.org/bin/download/Community+Group+smf/scfdot/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# Only makes sense on Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +LICENSE = CDDL.LICENSE + +RUNTIME_DEP_PKGS = CSWgraphviz + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +BUILD_TARGETS = scfdot legend.ps + +include gar/category.mk + +build-custom: + $(BUILD_ENV) gmake -C $(WORKSRC) scfdot + $(BUILD_ENV) gmake -C $(WORKSRC) legend.ps + @$(MAKECOOKIE) + +install-custom: DOCS=AUTHORS +install-custom: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +install-custom: + ginstall -d $(DOCDEST)/examples + cp $(WORKSRC)/snv_24_x86.* $(DOCDEST)/examples + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) + cp $(FILEDIR)/README.CSW $(DOCDEST) + + @# We place the scfdot binary in libexec and instead put a + @# readily usable wrapper in bindir + ginstall -d $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(libexecdir) + ginstall -m755 $(FILEDIR)/smfdepgraph $(DESTDIR)$(bindir) + ginstall -m755 $(WORKSRC)/scfdot $(DESTDIR)$(libexecdir) + + @# smfdepgraph includes a legend which we also ship + ginstall -Dm644 $(WORKSRC)/legend.ps \ + $(DESTDIR)$(datadir)/$(GARNAME)/legend.ps + @$(MAKECOOKIE) Added: csw/mgar/pkg/scfdot/trunk/checksums =================================================================== --- csw/mgar/pkg/scfdot/trunk/checksums (rev 0) +++ csw/mgar/pkg/scfdot/trunk/checksums 2010-02-12 15:07:26 UTC (rev 8524) @@ -0,0 +1 @@ +13cdf51e78d0589c3721a684613aa734 scfdot-1.0.tar.gz Added: csw/mgar/pkg/scfdot/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/scfdot/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/scfdot/trunk/files/README.CSW 2010-02-12 15:07:26 UTC (rev 8524) @@ -0,0 +1,39 @@ +This package contains a wrapper around scfdot which should be sufficient +for most use cases: smfdepgraph. Invoke it with + + smfdepgraph + +and it will generate a SMF dependency graph in whichever file format you +specify (determined via the file extension). Default is postscript. The +extension will be passed to dot via -T so dot needs to support it. +Unsupported file extensions will give you a list of supported ones. + +In case you need to invoke scfdot directly, these are the usage instructions. +We operate in two modes: with and without -L. Without -L, we print nodes +for each instance and edges for each dependency. Fortunately dot allows +forward references, so we can do this in one pass. Options are + + -s width,height Size, in inches, that the graph should be limited to. + + -l legend.ps PostScript file which should be used as the legend. + + -x opts Simplify the graph. opts should be a comma-separated + list of + + omit_net_deps + Omit most of the dependencies on + network/loopback and network/physical. + + consolidate_inetd_svcs + Consolidate services which only depend on + network/inetd into a single node. + + consolidate_rpcbind_svcs + Consolidate services which only depend on + network/inetd and rpc/bind into a single node. + +Other hard-coded graph settings (rankdir, nodesep, margin) were intended +for a 42" plotter. -L causes the program to print a dot file for use as +a legend. It currently consists of eight nodes which demonstrate the +color scheme and the dependency types. The nodes are enclosed in a box +which is labeled "legend". Added: csw/mgar/pkg/scfdot/trunk/files/smfdepgraph =================================================================== --- csw/mgar/pkg/scfdot/trunk/files/smfdepgraph (rev 0) +++ csw/mgar/pkg/scfdot/trunk/files/smfdepgraph 2010-02-12 15:07:26 UTC (rev 8524) @@ -0,0 +1,24 @@ +#!/bin/bash +# +# smfdepgraph: +# Wrapper around the scfdot binary. Replaces the upstream shipped Makefile +# which is geared towards build dir usage. + +set -u + +SCFDOT=/opt/csw/libexec/scfdot +LEGEND=/opt/csw/share/scfdot/legend.ps +SCFDOT_OPTS="-s 300,42 -l ${LEGEND} -x consolidate_inetd_svcs" + +[ $# -eq 1 ] || { + echo "Usage: ${0##*/} " + echo "File extensions sets file type, default is postscript." + exit 1 +} + +OUTFILE=${1} +OUTTYPE=${OUTFILE##*.}; OUTTYPE=${OUTTYPE:-ps} + +echo "Generating ${OUTFILE} (with file type ${OUTTYPE})" +# Directly pipe scfdot output into the dot binary +$SCFDOT $SCFDOT_OPTS | dot -T${OUTTYPE} /dev/fd/0 > $OUTFILE 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 Feb 12 16:09:08 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 12 Feb 2010 15:09:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8525] csw/mgar/pkg/scfdot/trunk/Makefile Message-ID: Revision: 8525 http://gar.svn.sourceforge.net/gar/?rev=8525&view=rev Author: skayser Date: 2010-02-12 15:09:08 +0000 (Fri, 12 Feb 2010) Log Message: ----------- scfdot: removed BUILD_TARGETS Modified Paths: -------------- csw/mgar/pkg/scfdot/trunk/Makefile Modified: csw/mgar/pkg/scfdot/trunk/Makefile =================================================================== --- csw/mgar/pkg/scfdot/trunk/Makefile 2010-02-12 15:07:26 UTC (rev 8524) +++ csw/mgar/pkg/scfdot/trunk/Makefile 2010-02-12 15:09:08 UTC (rev 8525) @@ -31,8 +31,6 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -BUILD_TARGETS = scfdot legend.ps - include gar/category.mk build-custom: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Feb 12 16:13:03 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 12 Feb 2010 15:13:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[8526] csw/mgar/pkg/scfdot/trunk/Makefile Message-ID: Revision: 8526 http://gar.svn.sourceforge.net/gar/?rev=8526&view=rev Author: skayser Date: 2010-02-12 15:13:02 +0000 (Fri, 12 Feb 2010) Log Message: ----------- scfdot: removed build-custom in favor of BUILD_ARGS Modified Paths: -------------- csw/mgar/pkg/scfdot/trunk/Makefile Modified: csw/mgar/pkg/scfdot/trunk/Makefile =================================================================== --- csw/mgar/pkg/scfdot/trunk/Makefile 2010-02-12 15:09:08 UTC (rev 8525) +++ csw/mgar/pkg/scfdot/trunk/Makefile 2010-02-12 15:13:02 UTC (rev 8526) @@ -27,17 +27,12 @@ RUNTIME_DEP_PKGS = CSWgraphviz CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = custom +BUILD_ARGS = scfdot legend.ps TEST_SCRIPTS = INSTALL_SCRIPTS = custom include gar/category.mk -build-custom: - $(BUILD_ENV) gmake -C $(WORKSRC) scfdot - $(BUILD_ENV) gmake -C $(WORKSRC) legend.ps - @$(MAKECOOKIE) - install-custom: DOCS=AUTHORS install-custom: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) install-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 Fri Feb 12 16:32:57 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Feb 2010 15:32:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8527] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8527 http://gar.svn.sourceforge.net/gar/?rev=8527&view=rev Author: dmichelsen Date: 2010-02-12 15:32:57 +0000 (Fri, 12 Feb 2010) Log Message: ----------- mGAR v2: Use include on alternatives only when separating packages Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-12 15:13:02 UTC (rev 8526) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-12 15:32:57 UTC (rev 8527) @@ -392,9 +392,16 @@ -n "$(_PKGFILES_EXCLUDE)" -o \ -n "$(ISAEXEC_FILES_$*)" -o \ -n "$(ISAEXEC_FILES)" ]; then \ - (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license -I /etc/opt/csw/pkg/$*/cswmigrateconf) \ - $(if $(or $(ALTERNATIVES_$*),$(ALTERNATIVES)),-I /opt/csw/share/alternatives/$(call catalogname,$*)) \ - $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license -X /etc/opt/csw/pkg/$S/cswmigrateconf -X /opt/csw/share/alternatives/$(call catalogname,$S)) \ + (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),\ + -I $(call licensedir,$*)/license \ + -I /etc/opt/csw/pkg/$*/cswmigrateconf \ + -I /opt/csw/share/alternatives/$(call catalogname,$*) \ + )\ + $(foreach S,$(filter-out $*,$(SPKG_SPECS)),\ + -X $(call licensedir,$S)/license \ + -X /etc/opt/csw/pkg/$S/cswmigrateconf \ + -X /opt/csw/share/alternatives/$(call catalogname,$S) \ + ) \ $(foreach I,$(EXTRA_PKGFILES_INCLUDED) $(EXTRA_PKGFILES_INCLUDED_$*),-i '$I') \ $(foreach X,$(EXTRA_PKGFILES_EXCLUDED) $(EXTRA_PKGFILES_EXCLUDED_$*),-x '$X') \ $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Feb 12 17:08:57 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 12 Feb 2010 16:08:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8528] csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Message-ID: Revision: 8528 http://gar.svn.sourceforge.net/gar/?rev=8528&view=rev Author: bensons Date: 2010-02-12 16:08:57 +0000 (Fri, 12 Feb 2010) Log Message: ----------- postfix-2.6: added postfix-simple build definition Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-12 15:32:57 UTC (rev 8527) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-12 16:08:57 UTC (rev 8528) @@ -47,6 +47,10 @@ INITSMF = $(sysconfdir)/init.d/csw$(GARNAME) USERGROUP = $(sysconfdir)/pkg/CSW$(GARNAME)/cswusergroup +# Type of build. Either 'simple' (just using bdb and ssl) +# or 'full' +BUILDTYPE = simple + # For the sake of simplicity and user choice we dropped the automatic # replacement of the /usr/{lib,bin} sendmail binaries. Ref. # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5313 @@ -146,6 +150,7 @@ BUILD_DEP_PKGS += CSWossldevel RUNTIME_DEP_PKGS += CSWosslrt +ifneq ($(BUILDTYPE),simple) # Activate support for Cyrus SASL (dovecot is incl. automatically) # http://www.postfix.org/SASL_README.html FEATURES += -DUSE_SASL_AUTH -DUSE_CYRUS_SASL @@ -178,8 +183,10 @@ AUXLIBS += -lpq BUILD_DEP_PKGS += CSWlibpq RUNTIME_DEP_PKGS += CSWlibpq +else +PKGNAME = $(GARNAME)-simple +endif - # Make sure to include $(CFLAGS) so that we get sane defaults via GAR CCARGS=$(CPPFLAGS) $(INCLUDES) $(FEATURES) $(DEFAULTS) $(CFLAGS) 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 Feb 12 17:12:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Feb 2010 16:12:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8529] csw/mgar/pkg/tcpwrappers/trunk Message-ID: Revision: 8529 http://gar.svn.sourceforge.net/gar/?rev=8529&view=rev Author: dmichelsen Date: 2010-02-12 16:12:45 +0000 (Fri, 12 Feb 2010) Log Message: ----------- tcpwrappers: Use alternatives Modified Paths: -------------- csw/mgar/pkg/tcpwrappers/trunk/Makefile csw/mgar/pkg/tcpwrappers/trunk/checksums csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch Added Paths: ----------- csw/mgar/pkg/tcpwrappers/trunk/files/CSWtcpwrap.postmsg Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/Makefile 2010-02-12 16:08:57 UTC (rev 8528) +++ csw/mgar/pkg/tcpwrappers/trunk/Makefile 2010-02-12 16:12:45 UTC (rev 8529) @@ -14,6 +14,7 @@ DISTFILES = $(DISTNAME).tar.gz DISTFILES += COPYING DISTFILES += README +DISTFILES += CSWtcpwrap.postmsg PATCHFILES = patch-cflags.diff PATCHFILES += man.patch @@ -35,6 +36,7 @@ BUILD_ARGS = REAL_DAEMON_DIR=/usr/sbin BUILD_ARGS += STYLE=-DPROCESS_OPTIONS BUILD_ARGS += USER_CFLAGS="$(CFLAGS)" +BUILD_ARGS += LIBS="-lsocket -lnsl" BUILD64 = 1 @@ -53,26 +55,32 @@ INSTALL_SCRIPTS = custom -MERGE_SCRIPTS_isa-sparcv8-extended-off = copy-all - MERGE_SCRIPTS_isa-sparcv8-extended-on = copy-relocated-only - MERGE_DIRS_isa-sparcv8-extended-on = $(libdir) +MERGE_SCRIPTS_isa-default-extended-off = copy-all + MERGE_SCRIPTS_isa-default-extended-on = copy-only + MERGE_DIRS_isa-default-extended-on = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-extended-off = copy-relocated-only - MERGE_DIRS_isa-sparcv9-extended-off = $(libdir) - MERGE_SCRIPTS_isa-sparcv9-extended-on = copy-relocated-only - MERGE_DIRS_isa-sparcv9-extended-on = $(libdir) +MERGE_SCRIPTS_isa-default64-extended-off = copy-relocated-only + MERGE_DIRS_isa-default64-extended-off = $(libdir) + MERGE_SCRIPTS_isa-default64-extended-on = copy-relocated-only + MERGE_DIRS_isa-default64-extended-on = $(libdir) - MERGE_SCRIPTS_isa-i386-extended-off = copy-all - MERGE_SCRIPTS_isa-i386-extended-on = copy-relocated-only - MERGE_DIRS_isa-i386-extended-on = $(libdir) +MIGRATE_FILES = hosts.allow hosts.deny - MERGE_SCRIPTS_isa-amd64-extended-off = copy-relocated-only - MERGE_DIRS_isa-amd64-extended-off = $(libdir) - MERGE_SCRIPTS_isa-amd64-extended-on = copy-relocated-only - MERGE_DIRS_isa-amd64-extended-on = $(libdir) +ALTERNATIVES = std ext +ALTERNATIVES_std = $(libdir)/libwrap.so.1 tcpwrappers $(libdir)/libwrap-std.so.1 200 +ALTERNATIVES_std += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-std.so.1 +ALTERNATIVES_ext = $(libdir)/libwrap.so.1 tcpwrappers $(libdir)/libwrap-ext.so.1 100 +ALTERNATIVES_ext += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-ext.so.1 -MIGRATE_FILES = hosts.allow hosts.deny +POSTMSG = $(docdir)/$(CATALOGNAME)/CSWtcpwrap.postmsg +# These binaries link against libwrap.so which will be linked by alternatives +# after package install. Until then they can obviously not link properly. +CHECKPKG_OVERRIDES = CSWtcpwrap|symbol-not-found|tcpdmatch +CHECKPKG_OVERRIDES += CSWtcpwrap|symbol-not-found|tcpd +CHECKPKG_OVERRIDES += CSWtcpwrap|symbol-not-found|try-from +CHECKPKG_OVERRIDES += CSWtcpwrap|symbol-not-found|tcpdchk + include gar/category.mk build-custom: @@ -98,9 +106,9 @@ @$(MAKECOOKIE) post-merge: - ln -s libwrap-std.so.1 $(PKGROOT)$(libdir)/libwrap.so.1 + ginstall -d $(PKGROOT)$(dir $(POSTMSG)) + ginstall $(WORKDIR)/$(notdir $(POSTMSG)) $(PKGROOT)$(POSTMSG) ln -s libwrap.so.1 $(PKGROOT)$(libdir)/libwrap.so - ln -s libwrap-std.so.1 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 ln -s libwrap.so.1 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so @$(MAKECOOKIE) Modified: csw/mgar/pkg/tcpwrappers/trunk/checksums =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/checksums 2010-02-12 16:08:57 UTC (rev 8528) +++ csw/mgar/pkg/tcpwrappers/trunk/checksums 2010-02-12 16:12:45 UTC (rev 8529) @@ -1,6 +1,7 @@ 071bd69cb78b18888ea5e3da5c3127fa COPYING +4976fe1425f77a0d4c494bb9a032c992 CSWtcpwrap.postmsg b268880c14ab6d31140015275c82d6aa README 89e8f9d1ed25d8e809674af9bf3d18e6 man.patch af28873e5c16c4f921237148e2507826 patch-cflags.diff -c82569b24080fc41c8b9bf9b25b831c2 sharedlib.patch +61ef4684e9615e45e4a66d83bdd541d0 sharedlib.patch ccbc2676977c31bbd43783abfbf2fdcf tcp_wrappers_7.6-ipv6.4.tar.gz Copied: csw/mgar/pkg/tcpwrappers/trunk/files/CSWtcpwrap.postmsg (from rev 8522, csw/mgar/pkg/mutt/trunk/files/CSWmutt.postmsg) =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/files/CSWtcpwrap.postmsg (rev 0) +++ csw/mgar/pkg/tcpwrappers/trunk/files/CSWtcpwrap.postmsg 2010-02-12 16:12:45 UTC (rev 8529) @@ -0,0 +1,12 @@ +There are now two versions of tcpwrappers on the system installed: + + * libwrap-std.so.1 The "standard" tcp wrapper library + * libwrap-ext.so.1 The "extended" tcp wrapper library + +You can easily select between the versions with the alternatives(8) +system by executing + + /opt/csw/sbin/alternatives --config tcpwrappers + +See http://wiki.opencsw.org/package-alternatives for details. + Modified: csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch 2010-02-12 16:08:57 UTC (rev 8528) +++ csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch 2010-02-12 16:12:45 UTC (rev 8529) @@ -8,7 +8,7 @@ +sunos5-shared: + @$(MAKE) REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ + LIBS="-lsocket -lnsl" RANLIB=/bin/true \ -+ AR=ld ARFLAGS="-G -h libwrap.so.1 -o " \ ++ AR=ld ARFLAGS="-G -h libwrap.so.1 -lsocket -lnsl -o " \ + LIB=libwrap.so.1 VSYSLOG= \ + NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \ + BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \ @@ -17,7 +17,7 @@ +sunos5-sharedext: + @$(MAKE) REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ + LIBS="-lsocket -lnsl" RANLIB=/bin/true \ -+ AR=ld ARFLAGS="-G -h libwrap.so.1 -o " \ ++ AR=ld ARFLAGS="-G -h libwrap.so.1 -lsocket -lnsl -o " \ + LIB=libwrap.so.1 VSYSLOG= STYLE=-DPROCESS_OPTIONS \ + NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \ + BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \ 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 Feb 12 17:25:48 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 12 Feb 2010 16:25:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8530] csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Message-ID: Revision: 8530 http://gar.svn.sourceforge.net/gar/?rev=8530&view=rev Author: skayser Date: 2010-02-12 16:25:48 +0000 (Fri, 12 Feb 2010) Log Message: ----------- postfix 2.6: documented bare-bones pkg procedure, moved GAR include below BUILD_DEP vars Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-12 16:12:45 UTC (rev 8529) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-12 16:25:48 UTC (rev 8530) @@ -1,5 +1,4 @@ # TODO (release-critical prefixed with !, non release-critical with *) -# ! Update to most recent postfix version (2.6.5 as of 13th Jan 2010) # ! Build, install and test package (works? spool permissions ok?) # WRT to permissions, run "postfix set-permissions" and compare # * Ship simple default configuration @@ -94,8 +93,6 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -include gar/category.mk - # Supporting documentation for building postfix # - Postfix Installation From Source Code # http://www.postfix.org/INSTALL.html @@ -125,6 +122,15 @@ -DDEF_DATA_DIR=\"$(DEF_DATA_DIR)\" \ -DDEF_README_DIR=\"$(DEF_README_DIR)\" +# By setting BUILDTYPE=simple on the command line you can produce a +# bare-bones postfix package without any dependencies to other CSW pkgs. +# This is currently for on demand personal use, as Phil insists on the +# possibility of "pkg-get -i all" and two postfix's would clash. +# Eventually it might be nice two have a bare-bones postfix in the catalog +# as not everyone might want to pull in all the extra deps from CSWpostfix. +ifeq ($(BUILDTYPE),simple) +PKGNAME = $(GARNAME)-simple +else # Make sure libraries in the default location can be found AUXLIBS = -L/opt/csw/lib @@ -150,7 +156,6 @@ BUILD_DEP_PKGS += CSWossldevel RUNTIME_DEP_PKGS += CSWosslrt -ifneq ($(BUILDTYPE),simple) # Activate support for Cyrus SASL (dovecot is incl. automatically) # http://www.postfix.org/SASL_README.html FEATURES += -DUSE_SASL_AUTH -DUSE_CYRUS_SASL @@ -183,10 +188,10 @@ AUXLIBS += -lpq BUILD_DEP_PKGS += CSWlibpq RUNTIME_DEP_PKGS += CSWlibpq -else -PKGNAME = $(GARNAME)-simple endif +include gar/category.mk + # Make sure to include $(CFLAGS) so that we get sane defaults via GAR CCARGS=$(CPPFLAGS) $(INCLUDES) $(FEATURES) $(DEFAULTS) $(CFLAGS) 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 Feb 12 17:30:36 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 12 Feb 2010 16:30:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8531] csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Message-ID: Revision: 8531 http://gar.svn.sourceforge.net/gar/?rev=8531&view=rev Author: skayser Date: 2010-02-12 16:30:36 +0000 (Fri, 12 Feb 2010) Log Message: ----------- postfix 2.6: removed static BUILDTYPE definition Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-12 16:25:48 UTC (rev 8530) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-12 16:30:36 UTC (rev 8531) @@ -46,10 +46,6 @@ INITSMF = $(sysconfdir)/init.d/csw$(GARNAME) USERGROUP = $(sysconfdir)/pkg/CSW$(GARNAME)/cswusergroup -# Type of build. Either 'simple' (just using bdb and ssl) -# or 'full' -BUILDTYPE = simple - # For the sake of simplicity and user choice we dropped the automatic # replacement of the /usr/{lib,bin} sendmail binaries. Ref. # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5313 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Feb 12 18:14:41 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 12 Feb 2010 17:14:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[8532] csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Message-ID: Revision: 8532 http://gar.svn.sourceforge.net/gar/?rev=8532&view=rev Author: bensons Date: 2010-02-12 17:14:41 +0000 (Fri, 12 Feb 2010) Log Message: ----------- postfix: removed /opt/csw from CFLAGS Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-12 16:30:36 UTC (rev 8531) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-12 17:14:41 UTC (rev 8532) @@ -189,7 +189,15 @@ include gar/category.mk # Make sure to include $(CFLAGS) so that we get sane defaults via GAR +ifeq ($(BUILDTYPE),simple) +CCARGS = $(filter-out %/csw/%,$(CPPFLAGS)) +CCARGS += $(filter-out %/csw/%,$(INCLUDES)) +CCARGS += $(FEATURES) +CCARGS += $(DEFAULTS) +CCARGS += $(filter-out %/csw/%,$(CFLAGS)) +else CCARGS=$(CPPFLAGS) $(INCLUDES) $(FEATURES) $(DEFAULTS) $(CFLAGS) +endif # We zero makedef's DEBUG and OPT, the relevant flags are set via GAR & CFLAGS 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 Feb 13 11:29:59 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 13 Feb 2010 10:29:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8533] csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile Message-ID: Revision: 8533 http://gar.svn.sourceforge.net/gar/?rev=8533&view=rev Author: dmichelsen Date: 2010-02-13 10:29:59 +0000 (Sat, 13 Feb 2010) Log Message: ----------- cpan/SOAP-Lite: Add missing dependency after bug report #4269 Modified Paths: -------------- csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile Modified: csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile 2010-02-12 17:14:41 UTC (rev 8532) +++ csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile 2010-02-13 10:29:59 UTC (rev 8533) @@ -10,8 +10,7 @@ client and server side. endef -RUNTIME_DEP_PKGS = CSWpmiocompress CSWpmlibwww CSWpmmimelite CSWpmmimetools CSWpmuri CSWpmxmlparser -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +DEP_PKGS = CSWpmiocompress CSWpmlibwww CSWpmmimelite CSWpmmimetools CSWpmuri CSWpmxmlparser CSWpmversion PACKAGES = CSWpmsoaplite CATALOGNAME = pm_soaplite 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 Feb 13 11:33:59 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 13 Feb 2010 10:33:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8534] csw/mgar/pkg/automake/trunk/Makefile Message-ID: Revision: 8534 http://gar.svn.sourceforge.net/gar/?rev=8534&view=rev Author: dmichelsen Date: 2010-02-13 10:33:59 +0000 (Sat, 13 Feb 2010) Log Message: ----------- automake: Update postmsg Modified Paths: -------------- csw/mgar/pkg/automake/trunk/Makefile Modified: csw/mgar/pkg/automake/trunk/Makefile =================================================================== --- csw/mgar/pkg/automake/trunk/Makefile 2010-02-13 10:29:59 UTC (rev 8533) +++ csw/mgar/pkg/automake/trunk/Makefile 2010-02-13 10:33:59 UTC (rev 8534) @@ -21,8 +21,9 @@ MASTER_SITES = $(GNU_MIRROR) SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tar.gz) DISTFILES = $(SOURCEFILES) -DISTFILES += README.CSW -NOCHECKSUM = README.CSW +POSTMSG = $(docdir)/automake/CSWautomake.postmsg +DISTFILES += $(notdir $(POSTMSG)) +NOCHECKSUM = $(notdir $(POSTMSG)) NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz, $(SOURCEFILES)) RUNTIME_DEP_PKGS = CSWperl @@ -65,16 +66,27 @@ include gar/category.mk -$(DOWNLOADDIR)/README.CSW: - @echo " ==> Generating README.CSW" +$(DOWNLOADDIR)/$(notdir $(POSTMSG)): + @echo " ==> Generating $(notdir $(POSTMSG))" @(exec >$@; \ - echo "This package contains the following automake versions:"; \ - for VERSION in $(MODULATIONS_GARVERSION); do \ - echo " automake-$$VERSION"; \ - done) + echo "There are multiple versions of automake on the system installed:"; \ + echo; \ + for VERSION in $(MODULATIONS_GARVERSION); do \ + echo " * automake-$$VERSION"; \ + done; \ + echo; \ + echo "You can easily select between the versions with the alternatives(8)"; \ + echo "system by executing"; \ + echo; \ + echo " /opt/csw/sbin/alternatives --config automake"; \ + echo; \ + echo "See http://wiki.opencsw.org/package-alternatives for details."; \ + ) + @$(MAKECOOKIE) post-merge: - @rm -f $(PKGROOT)$(bindir)/aclocal - @rm -f $(PKGROOT)$(bindir)/automake - @ginstall $(WORKDIR)/README.CSW $(PKGROOT)$(docdir)/$(GARNAME)/ + rm -f $(PKGROOT)$(bindir)/aclocal + rm -f $(PKGROOT)$(bindir)/automake + ginstall -d $(PKGROOT)$(dir $(POSTMSG)) + ginstall $(WORKDIR)/$(notdir $(POSTMSG)) $(PKGROOT)$(POSTMSG) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Feb 13 13:42:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 13 Feb 2010 12:42:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8535] csw/mgar/pkg/python/branches/python-2.6.4+patch7242/ Makefile Message-ID: Revision: 8535 http://gar.svn.sourceforge.net/gar/?rev=8535&view=rev Author: wahwah Date: 2010-02-13 12:42:13 +0000 (Sat, 13 Feb 2010) Log Message: ----------- python: Submitting changes to overrides. One override is not working, there seems to be problem in GAR integration. Modified Paths: -------------- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile Modified: csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile =================================================================== --- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile 2010-02-13 10:33:59 UTC (rev 8534) +++ csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile 2010-02-13 12:42:13 UTC (rev 8535) @@ -145,15 +145,18 @@ LICENSE = LICENSE -CHECKPKG_OVERRIDES = CSWpython-devel|symbol-not-found|python.o -CHECKPKG_OVERRIDES += CSWpython|symbol-not-found|xxsubtype.so -CHECKPKG_OVERRIDES += CSWpython|symbol-not-found|_cursesmodule.so -CHECKPKG_OVERRIDES += CSWpython|symbol-not-found|_curses_panel.so - # Checkpkg should be able to guess that, perhaps symlink information is # missing? -CHECKPKG_OVERRIDES += CSWpython|missing-dependency|CSWbdb +CHECKPKG_OVERRIDES_CSWpython += CSWpython|missing-dependency|CSWbdb +CHECKPKG_OVERRIDES_CSWpython += CSWpython|symbol-not-found|_curses_panel.so +CHECKPKG_OVERRIDES_CSWpython += CSWpython|symbol-not-found|_cursesmodule.so +CHECKPKG_OVERRIDES_CSWpython += CSWpython|symbol-not-found|xxsubtype.so +CHECKPKG_OVERRIDES_CSWpython-devel = CSWpython-devel|symbol-not-found|python.o +# Dago: This override line doesn't make it to the override file. Can you look +# into it? +CHECKPKG_OVERRIDES_CSWpython-rt = CSWpython-rt|action-class-only-in-pkginfo|cswpycompile + include gar/category.mk post-install-modulated: install-deprecated-libs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Feb 13 17:14:19 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 13 Feb 2010 16:14:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8536] csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Message-ID: Revision: 8536 http://gar.svn.sourceforge.net/gar/?rev=8536&view=rev Author: skayser Date: 2010-02-13 16:14:18 +0000 (Sat, 13 Feb 2010) Log Message: ----------- postfix 2.6: fixed bare-bones build Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-13 12:42:13 UTC (rev 8535) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-13 16:14:18 UTC (rev 8536) @@ -128,7 +128,7 @@ PKGNAME = $(GARNAME)-simple else # Make sure libraries in the default location can be found -AUXLIBS = -L/opt/csw/lib +AUXLIBS = $(LDFLAGS) # Activate support for PCRE # http://www.postfix.org/PCRE_README.html @@ -188,18 +188,25 @@ include gar/category.mk -# Make sure to include $(CFLAGS) so that we get sane defaults via GAR +# Postfix's build system relies on CCARGS, populate it with the defaults from +# GAR. For the bare-bones build don't leak anything located in */csw/* to the +# build (we want to rely on as little additional CSW pkgs as possible). ifeq ($(BUILDTYPE),simple) -CCARGS = $(filter-out %/csw/%,$(CPPFLAGS)) -CCARGS += $(filter-out %/csw/%,$(INCLUDES)) -CCARGS += $(FEATURES) -CCARGS += $(DEFAULTS) -CCARGS += $(filter-out %/csw/%,$(CFLAGS)) +LD_OPTIONS = +CCARGS = $(CFLAGS) +CCARGS += $(filter-out -I/opt/csw/include,$(CPPFLAGS)) +CCARGS += $(filter-out -I/opt/csw/%,$(INCLUDES)) +CCARGS += -DNO_PCRE # on by default, would trigger our pcre-config +CCARGS += $(DEFAULTS) else -CCARGS=$(CPPFLAGS) $(INCLUDES) $(FEATURES) $(DEFAULTS) $(CFLAGS) +CCARGS=$(CFLAGS) $(CPPFLAGS) $(INCLUDES) $(FEATURES) $(DEFAULTS) endif -# We zero makedef's DEBUG and OPT, the relevant flags are set via GAR & CFLAGS +# Postfix doesn't use autoconf, but it's own tool called makedefs. It's +# triggered by "gmake makefiles" in the source root and expects it's options +# via environment variables CC CCARGS AUXLIBS DEBUG OPT. For us there is no +# need to use DEBUG and OPT. The relevant flags are (amongst others) contained +# in GAR's CFLAGS which we already pushed into CCARGS (see above). configure-custom: echo $(MAKE) -C $(WORKSRC) makefiles CC=$(CC) CCARGS='$(CCARGS)' $(MAKE) -C $(WORKSRC) makefiles \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Feb 13 17:24:07 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 13 Feb 2010 16:24:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[8537] csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Message-ID: Revision: 8537 http://gar.svn.sourceforge.net/gar/?rev=8537&view=rev Author: skayser Date: 2010-02-13 16:24:07 +0000 (Sat, 13 Feb 2010) Log Message: ----------- postfix 2.6: fixed bare-bones build Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-13 16:14:18 UTC (rev 8536) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-13 16:24:07 UTC (rev 8537) @@ -125,7 +125,8 @@ # Eventually it might be nice two have a bare-bones postfix in the catalog # as not everyone might want to pull in all the extra deps from CSWpostfix. ifeq ($(BUILDTYPE),simple) -PKGNAME = $(GARNAME)-simple +PACKAGES = CSW$(GARNAME)-simple +CATALOGNAME = $(GARNAME)_simple else # Make sure libraries in the default location can be found AUXLIBS = $(LDFLAGS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Feb 13 17:27:09 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 13 Feb 2010 16:27:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8538] csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Message-ID: Revision: 8538 http://gar.svn.sourceforge.net/gar/?rev=8538&view=rev Author: skayser Date: 2010-02-13 16:27:08 +0000 (Sat, 13 Feb 2010) Log Message: ----------- postfix 2.6: fixed POSTMSG Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-13 16:24:07 UTC (rev 8537) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-13 16:27:08 UTC (rev 8538) @@ -49,7 +49,7 @@ # For the sake of simplicity and user choice we dropped the automatic # replacement of the /usr/{lib,bin} sendmail binaries. Ref. # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5313 -POSTMSG = POSTMSG = $(DOCDIR)/$(GARNAME)/README.upgradefrom.24 +POSTMSG = $(DOCDIR)/$(GARNAME)/README.upgradefrom.24 # Make postdrop setgid so that it can deliver to $(DEF_QUEUE_DIR)/maildrop PROTOTYPE_MODIFIERS = makesgid 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 Feb 13 20:39:42 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 13 Feb 2010 19:39:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[8539] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 8539 http://gar.svn.sourceforge.net/gar/?rev=8539&view=rev Author: rthurner Date: 2010-02-13 19:39:41 +0000 (Sat, 13 Feb 2010) Log Message: ----------- subversion-1.6.9 upgrade 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 2010-02-13 16:27:08 UTC (rev 8538) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-02-13 19:39:41 UTC (rev 8539) @@ -16,7 +16,7 @@ # the lib itself belongs to CSWbdb47, the CSWbdb47 dep is completely fine. # GARNAME = subversion -GARVERSION = 1.6.6 +GARVERSION = 1.6.9 CATEGORIES = utils DESCRIPTION = Version control rethought @@ -25,8 +25,9 @@ that is a compelling replacement for CVS in the open source community. endef -VENDOR_URL = http://subversion.tigris.org/ +VENDOR_URL = http://subversion.apache.org/ MASTER_SITES = http://subversion.tigris.org/downloads/ +#MASTER_SITES = http://orac.ece.utexas.edu/pub/svn/1.6.7/yuletide-eggnog/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2010-02-13 16:27:08 UTC (rev 8538) +++ csw/mgar/pkg/subversion/trunk/checksums 2010-02-13 19:39:41 UTC (rev 8539) @@ -5,10 +5,6 @@ 41ec540885de7c34625768aa1fb9682b fixme.sh f107831ad0c702ff32e51df6a207237b httpd-svn.conf.CSW f0aa58c145ae99f8e4d72499ab826169 javahl_headers_for_nested_classes.diff -e6adf167a1050c3f434b7b60e8d94848 libsvn_fs_base-1.so.0.0.0.i -6f9987b00f66c8347f05fc13efc82322 libsvn_fs_base-1.so.0.0.0.s -1e71a0256e2709cd8f6a0f4870bca255 libsvn_ra_dav-1.so.0.0.0.i -15c92123c517b66956e097caaa56ddfa libsvn_ra_dav-1.so.0.0.0.s -e5109da756d74c7d98f683f004a539af subversion-1.6.6.tar.bz2 +9c30a47b1d48664e7afef68bb4834c53 subversion-1.6.9.tar.bz2 f7d05c59656dcf01fb844295c9912f78 subversion161.diff 1b532d3055708a97771f5cd959983628 svn_access.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Feb 14 20:59:12 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 14 Feb 2010 19:59:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[8540] csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Message-ID: Revision: 8540 http://gar.svn.sourceforge.net/gar/?rev=8540&view=rev Author: skayser Date: 2010-02-14 19:59:12 +0000 (Sun, 14 Feb 2010) Log Message: ----------- postfix 2.6: fix permission on spool dirs Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-13 19:39:41 UTC (rev 8539) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-14 19:59:12 UTC (rev 8540) @@ -51,14 +51,21 @@ # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5313 POSTMSG = $(DOCDIR)/$(GARNAME)/README.upgradefrom.24 +# For file permissions reference and verification purposes, postfix ships +# /opt/csw/libexec/postfix/postfix-files which contains a list of the +# desired settings. "postfix check" can be used to verify the permissions, +# "postfix set-permissions" can be used to adjust them (which shouldn't +# be necessary from a user standpoint, it's our job to ship the right perms). + # Make postdrop setgid so that it can deliver to $(DEF_QUEUE_DIR)/maildrop PROTOTYPE_MODIFIERS = makesgid -PROTOTYPE_FILES_makesgid = $(sbindir)/postdrop +PROTOTYPE_FILES_makesgid = $(sbindir)/postdrop $(sbindir)/postqueue +PROTOTYPE_GROUP_makesgid = postdrop PROTOTYPE_PERMS_makesgid = 2755 # Make $(DEF_QUEUE_DIR) subdirs accessible/writable to postfix only PROTOTYPE_MODIFIERS += spooldir -PROTOTYPE_FILES_spooldir = $(DEF_QUEUE_DIR)/* +PROTOTYPE_FILES_spooldir = $(DEF_QUEUE_DIR)/.* PROTOTYPE_USER_spooldir = postfix PROTOTYPE_PERMS_spooldir = 0700 PROTOTYPE_CLASS_spooldir = ugfiles @@ -70,6 +77,14 @@ PROTOTYPE_PERMS_maildrop = 0730 PROTOTYPE_CLASS_maildrop = ugfiles +# Make $(DEF_QUEUE_DIR)/public accessible by postdrop group, likely +# used for IPC with other processes (public contains sockets). +PROTOTYPE_MODIFIERS += public +PROTOTYPE_FILES_maildrop = $(DEF_QUEUE_DIR)/public +PROTOTYPE_GROUP_maildrop = postdrop +PROTOTYPE_PERMS_maildrop = 2710 +PROTOTYPE_CLASS_maildrop = ugfiles + # IMPORTANT! Make $(DEF_QUEUE_DIR)/pid accessible by root only # http://www.openwall.com/lists/oss-security/2009/09/18/6 PROTOTYPE_MODIFIERS += pid This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Feb 14 21:32:12 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 14 Feb 2010 20:32:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[8541] csw/mgar/gar/v2-checkpkg-stats Message-ID: Revision: 8541 http://gar.svn.sourceforge.net/gar/?rev=8541&view=rev Author: wahwah Date: 2010-02-14 20:32:11 +0000 (Sun, 14 Feb 2010) Log Message: ----------- mGAR v2-checkpkg-stats: First commit, new feature not yet functional. Data collection program works, but is not integrated well into gar/bin/checkpkg. Modified Paths: -------------- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg csw/mgar/gar/v2-checkpkg-stats/bin/update_contents_cache.py csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py Added Paths: ----------- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats_test.py csw/mgar/gar/v2-checkpkg-stats/bin/custom-pkgtrans csw/mgar/gar/v2-checkpkg-stats/lib/sh/ csw/mgar/gar/v2-checkpkg-stats/lib/sh/libcheckpkg.sh Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg 2010-02-14 19:59:12 UTC (rev 8540) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg 2010-02-14 20:32:11 UTC (rev 8541) @@ -21,10 +21,15 @@ # you know you are tracking the most current version. # - PATH=$PATH:/usr/sbin readonly NAME_MAX_LENGTH=${NAME_MAX_LENGTH:-20} +command_basename=`basename $0` +command_basedir="${0%/${command_basename}}" +libshdir="${command_basedir}/../lib/sh" +readonly command_basename command_basedir libshdir +. "${libshdir}/libcheckpkg.sh" + LOCAL_ARCH=`uname -p` if [[ -z "${CHECKPKG_TMPDIR}" ]]; then readonly CHECKPKG_TMPDIR="/var/tmp" @@ -44,9 +49,10 @@ BOLD="" COLOR_RESET="" fi +readonly GREEN RED BOLD COLOR_RESET readonly selfpath="$0" -readonly selfargs="$*" +readonly selfargs="$@" # always print out a warning message. (to stderr) # exit script, if quit_on_warn set @@ -337,38 +343,9 @@ # exit 0 #fi - -# This function exists, because pkgtrans is BROKEN!! -# It leaves a directory in /var/tmp/aaXXXXXXX, even after clean quit -# SO, emulate pkgtrans behaviour, for "pkgtrans src destdir pkgname" -# Except that we ignore pkgname arg, and just do first one we find. -# and we are a bit hacky about how we do things. -pkgtrans(){ - if [[ ! -d $2 ]] ; then - print ERROR: $2 is not a directory >/dev/fd/2 - return 1 - fi - hdrblks=`(dd if=$1 skip=1 2>/dev/null| cpio -i -t >/dev/null) 2>&1 | - nawk '{print $1; exit;}'` - - ## print initial hdrblks=$hdrblks - - hdrblks=$(($hdrblks + 1)) - mkdir $2/$3 || return 1 - - dd if=$1 skip=$hdrblks 2>/dev/null | (cd $2/$3 ; cpio -ivdm) - # on fail, SOMETIMES cpio returns 1, but sometimes it returns 0!! - if [[ ! -d $2/$3/install ]] ; then - print retrying extract with different archive offset... - # no, I cant tell in advance why/when the prev fails - hdrblks=$(($hdrblks + 1)) - dd if=$1 skip=$hdrblks 2>/dev/null| (cd $2/$3 ; cpio -ivdm) - fi -} - print "" print Extracing pkg for examination of files... -pkgtrans $f $EXTRACTDIR $pkgname +custom_pkgtrans $f $EXTRACTDIR $pkgname ############################################################# # We now have the package expanded, in "directory" form, in @@ -566,9 +543,7 @@ set_variables_for_individual_package_check "$f" test_suite_ok=1 -checkpkg_scriptname=`basename $0` -checkpkg_basedir=${0%/${checkpkg_scriptname}} -plugindir=${checkpkg_basedir}/checkpkg.d +plugindir=${command_basedir}/checkpkg.d checkpkg_module_tag="checkpkg-" # Cleaning up old *.pyc files which can cause grief. This is because of the @@ -582,7 +557,9 @@ done # /var/sadm/install/contents cache update -${checkpkg_basedir}/update_contents_cache.py +${command_basedir}/update_contents_cache.py +# Collects package stats to be later analyzed +${command_basedir}/checkpkg_collect_stats.py "$@" if [[ "${DEBUG}" != "" ]]; then extra_options="--debug" @@ -651,7 +628,7 @@ done # Collecting errors and applying the overrides. -${checkpkg_basedir}/analyze_module_results.py \ +${command_basedir}/analyze_module_results.py \ -e "${EXTRACTDIR}" \ ${pkgnames} if [[ "$?" -ne 0 ]]; then Added: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py (rev 0) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py 2010-02-14 20:32:11 UTC (rev 8541) @@ -0,0 +1,138 @@ +#!/opt/csw/bin/python2.6 +# +# $Id$ +# +# Collects statistics about a package and saves to a directory, for later use +# by checkpkg modules. + +import errno +import os +import os.path +import sys +import logging +import optparse +import yaml + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + + +STATS_VERSION = 1L + + +class PackageStats(object): + """Collects stats about a package and saves it. + + base-stats.yml + binaries.yml + """ + + def __init__(self, srv4_pkg): + self.srv4_pkg = srv4_pkg + self.md5sum = None + self.dir_format_pkg = None + self.stats_path = None + + def GetMd5sum(self): + if not self.md5sum: + self.md5sum = self.srv4_pkg.GetMd5sum() + return self.md5sum + + def GetStatsPath(self, home=None): + if not self.stats_path: + if not home: + home = os.environ["HOME"] + md5sum = self.GetMd5sum() + two_chars = md5sum[0:2] + parts = [home, ".checkpkg", "stats", two_chars, md5sum] + self.stats_path = os.path.join(*parts) + return self.stats_path + + def StatsExist(self): + """Checks if statistics of a package exist. + + Returns: + bool + """ + if not self.StatsDirExists(): + return False + # More checks can be added in the future. + return True + + def StatsDirExists(self): + return os.path.isdir(self.GetStatsPath()) + + def GetDirFormatPkg(self): + if not self.dir_format_pkg: + self.dir_format_pkg = self.srv4_pkg.GetDirFormatPkg() + return self.dir_format_pkg + + def MakeStatsDir(self): + """mkdir -p equivalent. + + http://stackoverflow.com/questions/600268/mkdir-p-functionality-in-python + """ + stats_path = self.GetStatsPath() + try: + os.makedirs(stats_path) + except OSError, e: + if e.errno == errno.EEXIST: + pass + else: + raise + + def CollectStats(self): + stats_path = self.GetStatsPath() + self.MakeStatsDir() + dir_pkg = self.GetDirFormatPkg() + self.DumpObject(dir_pkg.GetParsedPkginfo(), "pkginfo") + self.DumpObject(dir_pkg.GetPkgmap().entries, "pkgmap") + self.DumpObject(dir_pkg.ListBinaries(), "binaries") + self.DumpObject(dir_pkg.GetDependencies(), "depends") + self.DumpObject(dir_pkg.GetAllFilenames(), "all_filenames") + overrides = dir_pkg.GetOverrides() + def OverrideToDict(override): + d = {} + d["pkgname"] = override.pkgname + d["tag_name"] = override.tag_name + d["tag_info"] = override.tag_info + return d + overrides_simple = [OverrideToDict(x) for x in overrides] + self.DumpObject(overrides_simple, "overrides") + basic_stats = {} + basic_stats["stats_version"] = STATS_VERSION + basic_stats["pkg_path"] = self.srv4_pkg.pkg_path + basic_stats["pkg_basename"] = os.path.basename(self.srv4_pkg.pkg_path) + basic_stats["parsed_basename"] = opencsw.ParsePackageFileName(basic_stats["pkg_basename"]) + basic_stats["pkgname"] = dir_pkg.pkgname + basic_stats["catalogname"] = dir_pkg.GetCatalogname() + self.DumpObject(basic_stats, "basic_stats") + + def DumpObject(self, obj, name): + stats_path = self.GetStatsPath() + out_file_name = os.path.join(self.GetStatsPath(), "%s.yml" % name) + logging.debug("DumpObject(): writing %s", repr(out_file_name)) + f = open(out_file_name, "w") + f.write(yaml.safe_dump(obj)) + f.close() + + +def main(): + logging.basicConfig(level=logging.DEBUG) + parser = optparse.OptionParser() + options, args = parser.parse_args() + logging.basicConfig(level=logging.INFO) + logging.info("Collecting statistics about given package files.") + logging.debug("args: %s", args) + packages = [opencsw.CswSrv4File(x) for x in args] + stats_list = [PackageStats(pkg) for pkg in packages] + for pkg_stats in stats_list: + pkg_stats.CollectStats() + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id Added: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats_test.py (rev 0) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats_test.py 2010-02-14 20:32:11 UTC (rev 8541) @@ -0,0 +1,34 @@ +#!/opt/csw/bin/python2.6 + +import os +import sys +import unittest +import mox +import checkpkg_collect_stats as ccs + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + + +class PackageStatsUnitTest(unittest.TestCase): + + def setUp(self): + self.mocker = mox.Mox() + + def testGetStatsPath(self): + mock_pkg = self.mocker.CreateMock(opencsw.CswSrv4File) + mock_pkg.GetMd5sum().AndReturn("abcdef") + self.mocker.ReplayAll() + sc = ccs.PackageStats(mock_pkg) + expected = "/home/joe/.checkpkg/stats/ab/abcdef" + self.assertEqual(expected, sc.GetStatsPath("/home/joe")) + self.mocker.VerifyAll() + + +if __name__ == '__main__': + unittest.main() Property changes on: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats_test.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id Added: csw/mgar/gar/v2-checkpkg-stats/bin/custom-pkgtrans =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/custom-pkgtrans (rev 0) +++ csw/mgar/gar/v2-checkpkg-stats/bin/custom-pkgtrans 2010-02-14 20:32:11 UTC (rev 8541) @@ -0,0 +1,18 @@ +#!/bin/ksh -p +# +# $Id$ +# +# This file exists in order to avoid implementing pipelines in Python. It +# could be integrated into the package stats collection program. + +command_basename=`basename $0` +command_basedir="${0%/${command_basename}}" +libshdir="${command_basedir}/../lib/sh" +readonly command_basename command_basedir libshdir +. "${libshdir}/libcheckpkg.sh" + +if [[ -z "$1" || -z "$2" || -z "$3" ]]; then + print "usage: $0 " + exit 1 +fi +custom_pkgtrans "$1" "$2" "$3" Property changes on: csw/mgar/gar/v2-checkpkg-stats/bin/custom-pkgtrans ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id Modified: csw/mgar/gar/v2-checkpkg-stats/bin/update_contents_cache.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/update_contents_cache.py 2010-02-14 19:59:12 UTC (rev 8540) +++ csw/mgar/gar/v2-checkpkg-stats/bin/update_contents_cache.py 2010-02-14 20:32:11 UTC (rev 8541) @@ -12,8 +12,7 @@ # The following bit of code sets the correct path to Python libraries # distributed with GAR. -path_list = [os.getcwd(), - os.path.split(sys.argv[0])[0], +path_list = [os.path.dirname(__file__), "..", "lib", "python"] sys.path.append(os.path.join(*path_list)) import checkpkg Modified: csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py 2010-02-14 19:59:12 UTC (rev 8540) +++ csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py 2010-02-14 20:32:11 UTC (rev 8541) @@ -15,6 +15,7 @@ import copy import datetime import difflib +import hashlib import logging import os import os.path @@ -366,6 +367,9 @@ self.transformed = False self.dir_format_pkg = None + def __repr__(self): + return u"CswSrv4File(%s)" % repr(self.pkg_path) + def GetWorkDir(self): if not self.workdir: self.workdir = tempfile.mkdtemp(prefix="pkg_") @@ -395,7 +399,27 @@ "%s or %s." % (gzip_suffix, pkg_suffix)) return self.gunzipped_path + def Pkgtrans(self, src_file, destdir, pkgname): + """A proxy for the pkgtrans command. + + This requires custom-pkgtrans to be available. + """ + if not os.path.isdir(destdir): + raise PackageError("%s doesn't exist or is not a directory" % destdir) + args = [os.path.join(os.path.dirname(__file__), "custom-pkgtrans"), + src_file, destdir, pkgname ] + pkgtrans_proc = subprocess.Popen(args) + pkgtrans_proc.communicate() + ret = pkgtrans_proc.wait() + if ret: + logging.error("% has failed" % args) + def TransformToDir(self): + """Transforms the file to the directory format. + + This could use the Pkgtrans command at the top, because pkgtrans supposedly + leaves temporary files behind. + """ if not self.transformed: args = ["pkgtrans", "-a", self.GetAdminFilePath(), self.GetGunzippedPath(), self.GetWorkDir(), "all"] @@ -424,6 +448,13 @@ dir_format_pkg = self.GetDirFormatPkg() return dir_format_pkg.GetPkgmap(analyze_permissions, strip) + def GetMd5sum(self): + fp = open(self.pkg_path) + hash = hashlib.md5() + hash.update(fp.read()) + fp.close() + return hash.hexdigest() + def __del__(self): if self.workdir: logging.debug("Removing %s", repr(self.workdir)) @@ -789,7 +820,7 @@ if line_to_add: self.paths.add(line_to_add) entry = { - "line": line, + "line": line.strip(), "type": line_type, } entry["path"] = installed_path @@ -879,6 +910,7 @@ else: logging.warn("%s is not a directory.", pkg_path) + def Srv4Exists(self, pkg_dir): pkg = DirectoryFormatPackage(pkg_dir) srv4_name = pkg.GetSrv4FileName() Added: csw/mgar/gar/v2-checkpkg-stats/lib/sh/libcheckpkg.sh =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/lib/sh/libcheckpkg.sh (rev 0) +++ csw/mgar/gar/v2-checkpkg-stats/lib/sh/libcheckpkg.sh 2010-02-14 20:32:11 UTC (rev 8541) @@ -0,0 +1,30 @@ +#!/bin/ksh -p +# +# $Id$ + +# pkgtrans leaves a directory in /var/tmp/aaXXXXXXX even after clean quit. +# Emulating pkgtrans behaviour, for "pkgtrans src destdir pkgname". Except +# that the pkgname arg is ignored, and only the first pkg is processed. + +custom_pkgtrans(){ + if [[ ! -d $2 ]] ; then + print ERROR: $2 is not a directory >/dev/fd/2 + return 1 + fi + hdrblks=`(dd if=$1 skip=1 2>/dev/null| cpio -i -t >/dev/null) 2>&1 | + nawk '{print $1; exit;}'` + + ## print initial hdrblks=$hdrblks + + hdrblks=$(($hdrblks + 1)) + mkdir $2/$3 || return 1 + + dd if=$1 skip=$hdrblks 2>/dev/null | (cd $2/$3 ; cpio -ivdm) + # on fail, SOMETIMES cpio returns 1, but sometimes it returns 0!! + if [[ ! -d $2/$3/install ]] ; then + print retrying extract with different archive offset... + # no, I can't tell in advance why/when the prev fails + hdrblks=$(($hdrblks + 1)) + dd if=$1 skip=$hdrblks 2>/dev/null| (cd $2/$3 ; cpio -ivdm) + fi +} Property changes on: csw/mgar/gar/v2-checkpkg-stats/lib/sh/libcheckpkg.sh ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Feb 14 21:34:13 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 14 Feb 2010 20:34:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8542] csw/mgar/pkg/postfix/branches/postfix-2.6/files/ changelog.CSW Message-ID: Revision: 8542 http://gar.svn.sourceforge.net/gar/?rev=8542&view=rev Author: skayser Date: 2010-02-14 20:34:13 +0000 (Sun, 14 Feb 2010) Log Message: ----------- postfix 2.6: updated changelog Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW 2010-02-14 20:32:11 UTC (rev 8541) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW 2010-02-14 20:34:13 UTC (rev 8542) @@ -1,6 +1,6 @@ -postfix (2.6.2,REV=2010.01.13) +postfix (2.6.5,REV=2010.02.14) - * Adopted and updated to 2.6.2. (Closes #3580, #3700, #3970) + * Adopted and updated to 2.6.5. (Closes #3580, #3700, #3970) * Moved spool directory to /var/opt/csw/spool/postfix. (Closes #3946) * Added Cyrus SASL support. (Closes #2843) * Added hash table support via bdb. (Closes #2097) @@ -10,4 +10,4 @@ * Doesn't automatically substitute system sendmail binaries any more. Please refer to README.CSW instead. (Closes #1943, #2964, #3060) - -- Sebastian Kayser Wed, 13 Jan 2010 22:01:36 +0100 + -- Sebastian Kayser Sun, 14 Feb 2010 21:25:21 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Feb 14 23:35:08 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 14 Feb 2010 22:35:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8543] csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Message-ID: Revision: 8543 http://gar.svn.sourceforge.net/gar/?rev=8543&view=rev Author: skayser Date: 2010-02-14 22:35:08 +0000 (Sun, 14 Feb 2010) Log Message: ----------- postfix 2.6: fix spool permission for good Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-14 20:34:13 UTC (rev 8542) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-14 22:35:08 UTC (rev 8543) @@ -80,10 +80,10 @@ # Make $(DEF_QUEUE_DIR)/public accessible by postdrop group, likely # used for IPC with other processes (public contains sockets). PROTOTYPE_MODIFIERS += public -PROTOTYPE_FILES_maildrop = $(DEF_QUEUE_DIR)/public -PROTOTYPE_GROUP_maildrop = postdrop -PROTOTYPE_PERMS_maildrop = 2710 -PROTOTYPE_CLASS_maildrop = ugfiles +PROTOTYPE_FILES_public = $(DEF_QUEUE_DIR)/public +PROTOTYPE_GROUP_public = postdrop +PROTOTYPE_PERMS_public = 2710 +PROTOTYPE_CLASS_public = ugfiles # IMPORTANT! Make $(DEF_QUEUE_DIR)/pid accessible by root only # http://www.openwall.com/lists/oss-security/2009/09/18/6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Feb 15 00:18:35 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 14 Feb 2010 23:18:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[8544] csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Message-ID: Revision: 8544 http://gar.svn.sourceforge.net/gar/?rev=8544&view=rev Author: skayser Date: 2010-02-14 23:18:35 +0000 (Sun, 14 Feb 2010) Log Message: ----------- postfix 2.6: another file permission fix Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-14 22:35:08 UTC (rev 8543) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-02-14 23:18:35 UTC (rev 8544) @@ -59,7 +59,7 @@ # Make postdrop setgid so that it can deliver to $(DEF_QUEUE_DIR)/maildrop PROTOTYPE_MODIFIERS = makesgid -PROTOTYPE_FILES_makesgid = $(sbindir)/postdrop $(sbindir)/postqueue +PROTOTYPE_FILES_makesgid = $(sbindir)/post(drop|queue) PROTOTYPE_GROUP_makesgid = postdrop PROTOTYPE_PERMS_makesgid = 2755 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Feb 15 00:24:27 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 14 Feb 2010 23:24:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[8545] csw/mgar/pkg/postfix/branches/postfix-2.6/files/ changelog.CSW Message-ID: Revision: 8545 http://gar.svn.sourceforge.net/gar/?rev=8545&view=rev Author: skayser Date: 2010-02-14 23:24:26 +0000 (Sun, 14 Feb 2010) Log Message: ----------- postfix 2.6: updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW 2010-02-14 23:18:35 UTC (rev 8544) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW 2010-02-14 23:24:26 UTC (rev 8545) @@ -1,4 +1,4 @@ -postfix (2.6.5,REV=2010.02.14) +postfix (2.6.5,REV=2010.02.15) * Adopted and updated to 2.6.5. (Closes #3580, #3700, #3970) * Moved spool directory to /var/opt/csw/spool/postfix. (Closes #3946) @@ -10,4 +10,4 @@ * Doesn't automatically substitute system sendmail binaries any more. Please refer to README.CSW instead. (Closes #1943, #2964, #3060) - -- Sebastian Kayser Sun, 14 Feb 2010 21:25:21 +0100 + -- Sebastian Kayser Mon, 15 Feb 2010 00:23:59 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Feb 15 01:02:41 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 15 Feb 2010 00:02:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[8546] csw/mgar/gar/v2-checkpkg-stats Message-ID: Revision: 8546 http://gar.svn.sourceforge.net/gar/?rev=8546&view=rev Author: wahwah Date: 2010-02-15 00:02:41 +0000 (Mon, 15 Feb 2010) Log Message: ----------- mGAR v2-checkpkg-stats: Using own pkgtrans code, it works now. Next thing to do: port existing checks to use the yaml data. Modified Paths: -------------- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py 2010-02-14 23:24:26 UTC (rev 8545) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py 2010-02-15 00:02:41 UTC (rev 8546) @@ -123,13 +123,14 @@ def main(): + debug = True logging.basicConfig(level=logging.DEBUG) parser = optparse.OptionParser() options, args = parser.parse_args() logging.basicConfig(level=logging.INFO) logging.info("Collecting statistics about given package files.") logging.debug("args: %s", args) - packages = [opencsw.CswSrv4File(x) for x in args] + packages = [opencsw.CswSrv4File(x, debug) for x in args] stats_list = [PackageStats(pkg) for pkg in packages] for pkg_stats in stats_list: pkg_stats.CollectStats() Modified: csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py 2010-02-14 23:24:26 UTC (rev 8545) +++ csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py 2010-02-15 00:02:41 UTC (rev 8546) @@ -360,12 +360,13 @@ class CswSrv4File(ShellMixin, object): """Represents a package in the srv4 format (pkg).""" - def __init__(self, pkg_path): + def __init__(self, pkg_path, debug=False): self.pkg_path = pkg_path self.workdir = None self.gunzipped_path = None self.transformed = False self.dir_format_pkg = None + self.debug = debug def __repr__(self): return u"CswSrv4File(%s)" % repr(self.pkg_path) @@ -417,13 +418,16 @@ def TransformToDir(self): """Transforms the file to the directory format. - This could use the Pkgtrans command at the top, because pkgtrans supposedly - leaves temporary files behind. + This uses the Pkgtrans function at the top, because pkgtrans behaves + differently on Solaris 8 and 10. Having our own implementation helps + achieve consistent behavior. """ if not self.transformed: - args = ["pkgtrans", "-a", self.GetAdminFilePath(), + args = [os.path.join(os.path.dirname(__file__), + "..", "..", "bin", "custom-pkgtrans"), self.GetGunzippedPath(), self.GetWorkDir(), "all"] - unused_retcode = self.ShellCommand(args, quiet=True) + print "args", args + unused_retcode = self.ShellCommand(args, quiet=(not self.debug)) dirs = self.GetDirs() if len(dirs) != 1: raise Error("Need exactly one package in the package stream: " 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 Feb 15 09:54:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Feb 2010 08:54:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8547] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswtexinfo Message-ID: Revision: 8547 http://gar.svn.sourceforge.net/gar/?rev=8547&view=rev Author: dmichelsen Date: 2010-02-15 08:54:00 +0000 (Mon, 15 Feb 2010) Log Message: ----------- cswclassutils: cswtexinfo clarification on error message, this fixed #4272 Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexinfo Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexinfo =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexinfo 2010-02-15 00:02:41 UTC (rev 8546) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexinfo 2010-02-15 08:54:00 UTC (rev 8547) @@ -11,13 +11,13 @@ while read src dest; do - echo $dest /usr/bin/cp $src $dest || exit 2 if [ -x ${PKG_INSTALL_ROOT}/opt/csw/bin/install-info ]; then - ${PKG_INSTALL_ROOT}/opt/csw/bin/install-info $dest ${PKG_INSTALL_ROOT}/opt/csw/info/dir + echo "Registering texinfo entry for $dest" + ${PKG_INSTALL_ROOT}/opt/csw/bin/install-info $dest ${PKG_INSTALL_ROOT}/opt/csw/info/dir 2>/dev/null else - echo "CSWtexinfo couldn't be found." + echo "$dest (texinfo will be registered when CSWtexinfo is installed)" fi done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Feb 15 10:45:53 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 15 Feb 2010 09:45:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8548] csw/mgar/pkg/spamassassin/trunk/Makefile Message-ID: Revision: 8548 http://gar.svn.sourceforge.net/gar/?rev=8548&view=rev Author: bonivart Date: 2010-02-15 09:45:52 +0000 (Mon, 15 Feb 2010) Log Message: ----------- spamassassin: move init script, clean up Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2010-02-15 08:54:00 UTC (rev 8547) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2010-02-15 09:45:52 UTC (rev 8548) @@ -24,13 +24,11 @@ UFILES_REGEX = $(SPKG_NAME)-(\d+(?:\.\d+)*).tar.gz -#SAMPLECONF = /opt/csw/etc/spamassassin/.+\.pre\.CSW -#SAMPLECONF += /opt/csw/etc/spamassassin/local\.cf\.CSW SAMPLECONF = /etc/opt/csw/spamassassin/.+\.pre\.CSW SAMPLECONF += /etc/opt/csw/spamassassin/local\.cf\.CSW SAMPLECONF += /etc/opt/csw/spamassassin/spamd\.CSW USERGROUP = /etc/opt/csw/pkg/CSWspamassassin/cswusergroup -INITSMF = /etc/opt/csw/init.d/cswspamd +INITSMF = /opt/csw/etc/init.d/cswspamd POSTMSG = /opt/csw/share/doc/spamassassin/README.upgrade MIGRATE_FILES = init.pre local.cf v310.pre v312.pre v320.pre @@ -82,18 +80,17 @@ install-custom: @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) - @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME) -# @ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/CSWspamassassin - @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/spamassassin + @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/init.d + @ginstall -m 755 $(FILEDIR)/CSWspamassassin.cswspamd $(DESTDIR)/opt/csw/etc/init.d/cswspamd @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWspamassassin - @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall -m 755 $(FILEDIR)/CSWspamassassin.cswspamd $(DESTDIR)/etc/opt/csw/init.d/cswspamd @ginstall -m 644 $(FILEDIR)/CSWspamassassin.cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWspamassassin/cswusergroup + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/spamassassin @ginstall -m 644 $(FILEDIR)/CSWspamassassin.spamd.CSW $(DESTDIR)/etc/opt/csw/spamassassin/spamd.CSW + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) @cp $(FILEDIR)/CSWspamassassin.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW @cp $(FILEDIR)/CSWspamassassin.README.spamd $(DESTDIR)$(docdir)/$(GARNAME)/README.spamd @cp $(FILEDIR)/CSWspamassassin.postmsg $(DESTDIR)$(docdir)/$(GARNAME)/README.upgrade + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME) echo "WORKSRC: $(WORKSRC)" @( cd $(WORKSRC) ; \ gmake DESTDIR=$(DESTDIR) install ) 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 Feb 15 11:17:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Feb 2010 10:17:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8549] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 8549 http://gar.svn.sourceforge.net/gar/?rev=8549&view=rev Author: dmichelsen Date: 2010-02-15 10:17:22 +0000 (Mon, 15 Feb 2010) Log Message: ----------- curl: Depend on libcares Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2010-02-15 09:45:52 UTC (rev 8548) +++ csw/mgar/pkg/curl/trunk/Makefile 2010-02-15 10:17:22 UTC (rev 8549) @@ -34,20 +34,29 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -EXTRA_CONFIGURE_ARGS_isa-amd64 = --disable-ldap -CONFIGURE_ARGS = $(DIRPATHS) --with-ssl +# amd64 is built without openldap because there are no libs available right now (Mantis 3028) +EXTRA_CONFIGURE_ARGS_isa-sparcv8 = --enable-ldap --enable-ldaps +EXTRA_CONFIGURE_ARGS_isa-sparcv9 = --enable-ldap --enable-ldaps +EXTRA_CONFIGURE_ARGS_isa-i386 = --enable-ldap --enable-ldaps +EXTRA_CONFIGURE_ARGS_isa-amd64 = --disable-ldap + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-ssl +CONFIGURE_ARGS += --enable-ares CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_isa-$(ISA)) -# amd64 is built without openldap because there are no libs available right now (Mantis 3028) BUILD64 = 1 # We are doing 64 bit only for the libs NOISAEXEC = 1 -RUNTIME_DEP_PKGS_CSWcurl = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl CSWcurlrt -RUNTIME_DEP_PKGS_CSWcurlrt = CSWlibidn CSWoldaprt CSWosslrt CSWzlib +RUNTIME_DEP_PKGS_CSWcurl = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl CSWcurlrt CSWlibcares +RUNTIME_DEP_PKGS_CSWcurlrt = CSWlibidn CSWoldaprt CSWosslrt CSWzlib CSWlibcares RUNTIME_DEP_PKGS_CSWcurldevel = CSWcurl +BUILD_DEP_PKGS = $(filter-out CSWcurl CSWcurlrt,$(RUNTIME_DEP_PKGS_CSWcurl) $(RUNTIME_DEP_PKGS_CSWcurlrt) $(RUNTIME_DEP_PKGS_CSWcurldevel)) +BUILD_DEP_PKGS += CSWoldapdevel CSWossldevel CSWlibcaresdevel + SKIPTEST = 1 # The 64 bit binary just takes space 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 Feb 15 11:53:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Feb 2010 10:53:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8550] csw/mgar/pkg/pigz/trunk/Makefile Message-ID: Revision: 8550 http://gar.svn.sourceforge.net/gar/?rev=8550&view=rev Author: dmichelsen Date: 2010-02-15 10:53:06 +0000 (Mon, 15 Feb 2010) Log Message: ----------- pigz: Add explicit CPPFLAGS after r7514 Modified Paths: -------------- csw/mgar/pkg/pigz/trunk/Makefile Modified: csw/mgar/pkg/pigz/trunk/Makefile =================================================================== --- csw/mgar/pkg/pigz/trunk/Makefile 2010-02-15 10:17:22 UTC (rev 8549) +++ csw/mgar/pkg/pigz/trunk/Makefile 2010-02-15 10:53:06 UTC (rev 8550) @@ -40,8 +40,8 @@ include gar/category.mk build-custom: - cd $(WORKSRC) && $(CC) $(CFLAGS) -c yarn.c - cd $(WORKSRC) && $(CC) $(CFLAGS) -c pigz.c + cd $(WORKSRC) && $(CC) $(CPPFLAGS) $(CFLAGS) -c yarn.c + cd $(WORKSRC) && $(CC) $(CPPFLAGS) $(CFLAGS) -c pigz.c cd $(WORKSRC) && LD_OPTIONS="$(LD_OPTIONS)" $(CC) $(LDFLAGS) -o pigz yarn.o pigz.o -lpthread -lz @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Feb 15 12:03:37 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Feb 2010 11:03:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8551] csw/mgar/pkg/pigz/trunk Message-ID: Revision: 8551 http://gar.svn.sourceforge.net/gar/?rev=8551&view=rev Author: dmichelsen Date: 2010-02-15 11:03:37 +0000 (Mon, 15 Feb 2010) Log Message: ----------- pigz: Modify wrapper to fix #4268 Modified Paths: -------------- csw/mgar/pkg/pigz/trunk/checksums csw/mgar/pkg/pigz/trunk/files/pigz-wrapper Modified: csw/mgar/pkg/pigz/trunk/checksums =================================================================== --- csw/mgar/pkg/pigz/trunk/checksums 2010-02-15 10:53:06 UTC (rev 8550) +++ csw/mgar/pkg/pigz/trunk/checksums 2010-02-15 11:03:37 UTC (rev 8551) @@ -1,2 +1,2 @@ -580873165ef3a369674f0c0af4c96d67 download/pigz-2.1.5.tar.gz -2c89ba7ba8b26b2b91a7a061f39fd7e8 download/pigz-wrapper +580873165ef3a369674f0c0af4c96d67 pigz-2.1.5.tar.gz +4d4408526f9292db8e3c7aeac6e04f53 pigz-wrapper Modified: csw/mgar/pkg/pigz/trunk/files/pigz-wrapper =================================================================== --- csw/mgar/pkg/pigz/trunk/files/pigz-wrapper 2010-02-15 10:53:06 UTC (rev 8550) +++ csw/mgar/pkg/pigz/trunk/files/pigz-wrapper 2010-02-15 11:03:37 UTC (rev 8551) @@ -5,4 +5,4 @@ # and http://developers.sun.com/solaris/articles/alt_thread_lib.html LD_LIBRARY_PATH=/usr/lib/lwp export LD_LIBRARY_PATH -exec `/usr/bin/dirname $0`/../libexec/`/usr/bin/basename $0` "$@" +exec /opt/csw/libexec/`/usr/bin/basename $0` "$@" 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 Feb 15 12:10:44 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Feb 2010 11:10:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8552] csw/mgar/pkg/pigz/trunk Message-ID: Revision: 8552 http://gar.svn.sourceforge.net/gar/?rev=8552&view=rev Author: dmichelsen Date: 2010-02-15 11:10:44 +0000 (Mon, 15 Feb 2010) Log Message: ----------- pigz: Separate wrappers to fully accomodate for #4268 Modified Paths: -------------- csw/mgar/pkg/pigz/trunk/Makefile csw/mgar/pkg/pigz/trunk/checksums csw/mgar/pkg/pigz/trunk/files/pigz-wrapper Added Paths: ----------- csw/mgar/pkg/pigz/trunk/files/unpigz-wrapper Modified: csw/mgar/pkg/pigz/trunk/Makefile =================================================================== --- csw/mgar/pkg/pigz/trunk/Makefile 2010-02-15 11:03:37 UTC (rev 8551) +++ csw/mgar/pkg/pigz/trunk/Makefile 2010-02-15 11:10:44 UTC (rev 8552) @@ -13,6 +13,7 @@ MASTER_SITES = http://www.zlib.net/pigz/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += pigz-wrapper +DISTFILES += unpigz-wrapper # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -48,7 +49,7 @@ install-custom: ginstall -d $(DESTDIR)$(bindir) ginstall $(WORKDIR)/pigz-wrapper $(DESTDIR)$(bindir)/pigz - cd $(DESTDIR)$(bindir) && gln pigz unpigz + ginstall $(WORKDIR)/unpigz-wrapper $(DESTDIR)$(bindir)/unpigz ginstall -d $(DESTDIR)$(libexecdir) ginstall $(WORKSRC)/pigz $(DESTDIR)$(libexecdir) cd $(DESTDIR)$(libexecdir) && gln pigz unpigz Modified: csw/mgar/pkg/pigz/trunk/checksums =================================================================== --- csw/mgar/pkg/pigz/trunk/checksums 2010-02-15 11:03:37 UTC (rev 8551) +++ csw/mgar/pkg/pigz/trunk/checksums 2010-02-15 11:10:44 UTC (rev 8552) @@ -1,2 +1,3 @@ 580873165ef3a369674f0c0af4c96d67 pigz-2.1.5.tar.gz -4d4408526f9292db8e3c7aeac6e04f53 pigz-wrapper +58c123caae9ea93973c815d175e43dbf pigz-wrapper +13ba5dde0a6279f3394947a587f1c027 unpigz-wrapper Modified: csw/mgar/pkg/pigz/trunk/files/pigz-wrapper =================================================================== --- csw/mgar/pkg/pigz/trunk/files/pigz-wrapper 2010-02-15 11:03:37 UTC (rev 8551) +++ csw/mgar/pkg/pigz/trunk/files/pigz-wrapper 2010-02-15 11:10:44 UTC (rev 8552) @@ -3,6 +3,9 @@ # Needed on native Solaris 8 # See http://www.opencsw.org/bugtrack/view.php?id=3879 # and http://developers.sun.com/solaris/articles/alt_thread_lib.html +# Unfortunately the path can not be compiled an as libthread.so.1 +# gets pulled in from the pthread library which brings in his own +# ideas of link path ordering. LD_LIBRARY_PATH=/usr/lib/lwp export LD_LIBRARY_PATH -exec /opt/csw/libexec/`/usr/bin/basename $0` "$@" +exec /opt/csw/libexec/pigz "$@" Copied: csw/mgar/pkg/pigz/trunk/files/unpigz-wrapper (from rev 8551, csw/mgar/pkg/pigz/trunk/files/pigz-wrapper) =================================================================== --- csw/mgar/pkg/pigz/trunk/files/unpigz-wrapper (rev 0) +++ csw/mgar/pkg/pigz/trunk/files/unpigz-wrapper 2010-02-15 11:10:44 UTC (rev 8552) @@ -0,0 +1,11 @@ +#!/bin/sh + +# Needed on native Solaris 8 +# See http://www.opencsw.org/bugtrack/view.php?id=3879 +# and http://developers.sun.com/solaris/articles/alt_thread_lib.html +# Unfortunately the path can not be compiled an as libthread.so.1 +# gets pulled in from the pthread library which brings in his own +# ideas of link path ordering. +LD_LIBRARY_PATH=/usr/lib/lwp +export LD_LIBRARY_PATH +exec /opt/csw/libexec/unpigz "$@" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Feb 15 12:49:43 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 15 Feb 2010 11:49:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8553] csw/mgar/pkg/scfdot/trunk Message-ID: Revision: 8553 http://gar.svn.sourceforge.net/gar/?rev=8553&view=rev Author: skayser Date: 2010-02-15 11:49:43 +0000 (Mon, 15 Feb 2010) Log Message: ----------- scfdot: tweak README.CSW, add changelog.CSW Modified Paths: -------------- csw/mgar/pkg/scfdot/trunk/Makefile csw/mgar/pkg/scfdot/trunk/files/README.CSW Added Paths: ----------- csw/mgar/pkg/scfdot/trunk/files/changelog.CSW Modified: csw/mgar/pkg/scfdot/trunk/Makefile =================================================================== --- csw/mgar/pkg/scfdot/trunk/Makefile 2010-02-15 11:10:44 UTC (rev 8552) +++ csw/mgar/pkg/scfdot/trunk/Makefile 2010-02-15 11:49:43 UTC (rev 8553) @@ -52,3 +52,10 @@ ginstall -Dm644 $(WORKSRC)/legend.ps \ $(DESTDIR)$(datadir)/$(GARNAME)/legend.ps @$(MAKECOOKIE) + +post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) + +install-changelog-%: + ginstall -D $(FILEDIR)/changelog.CSW \ + $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW + @$(MAKECOOKIE) Modified: csw/mgar/pkg/scfdot/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/scfdot/trunk/files/README.CSW 2010-02-15 11:10:44 UTC (rev 8552) +++ csw/mgar/pkg/scfdot/trunk/files/README.CSW 2010-02-15 11:49:43 UTC (rev 8553) @@ -1,18 +1,28 @@ +smfdepgraph wrapper around scfdot +--------------------------------- + This package contains a wrapper around scfdot which should be sufficient -for most use cases: smfdepgraph. Invoke it with +for most use cases. Invoke it with smfdepgraph -and it will generate a SMF dependency graph in whichever file format you -specify (determined via the file extension). Default is postscript. The -extension will be passed to dot via -T so dot needs to support it. -Unsupported file extensions will give you a list of supported ones. +and it will generate a SMF services dependency graph in whichever file format +you specify (determined via the file extension). Default is postscript. The +extension will be passed to graphviz's dot via -T so dot needs to support +it. When you pass an unsupported file extension to smfdepgraph, it will give +you a list of supported ones. -In case you need to invoke scfdot directly, these are the usage instructions. -We operate in two modes: with and without -L. Without -L, we print nodes -for each instance and edges for each dependency. Fortunately dot allows -forward references, so we can do this in one pass. Options are +In case you need to invoke scfdot directly, you can find it in +/opt/csw/libexec/scfdot. + +scfdot usage instructions +------------------------- + +We operate in two modes: with and without -L. Without -L, we print nodes for +each instance and edges for each dependency. Fortunately dot allows forward +references, so we can do this in one pass. Options are + -s width,height Size, in inches, that the graph should be limited to. -l legend.ps PostScript file which should be used as the legend. Added: csw/mgar/pkg/scfdot/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/scfdot/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/scfdot/trunk/files/changelog.CSW 2010-02-15 11:49:43 UTC (rev 8553) @@ -0,0 +1,5 @@ +scfdot (1.0,REV=2010.02.15) + + * Initial release. + + -- Sebastian Kayser Mon, 15 Feb 2010 12:45:42 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Feb 15 13:27:40 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 15 Feb 2010 12:27:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[8554] csw/mgar/pkg/scfdot/trunk/Makefile Message-ID: Revision: 8554 http://gar.svn.sourceforge.net/gar/?rev=8554&view=rev Author: skayser Date: 2010-02-15 12:27:39 +0000 (Mon, 15 Feb 2010) Log Message: ----------- scfdot: adjust path to legend.ps in example .dot file Modified Paths: -------------- csw/mgar/pkg/scfdot/trunk/Makefile Modified: csw/mgar/pkg/scfdot/trunk/Makefile =================================================================== --- csw/mgar/pkg/scfdot/trunk/Makefile 2010-02-15 11:49:43 UTC (rev 8553) +++ csw/mgar/pkg/scfdot/trunk/Makefile 2010-02-15 12:27:39 UTC (rev 8554) @@ -51,6 +51,8 @@ @# smfdepgraph includes a legend which we also ship ginstall -Dm644 $(WORKSRC)/legend.ps \ $(DESTDIR)$(datadir)/$(GARNAME)/legend.ps + gsed -i -e 's,legend.ps,$(datadir)/$(GARNAME)/legend.ps,' \ + $(DOCDEST)/examples/snv_24_x86.dot @$(MAKECOOKIE) post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) 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 Feb 15 14:05:30 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Feb 2010 13:05:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8555] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 8555 http://gar.svn.sourceforge.net/gar/?rev=8555&view=rev Author: bdwalton Date: 2010-02-15 13:05:30 +0000 (Mon, 15 Feb 2010) Log Message: ----------- git: use --without python after configure.ac patches accepted Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-02-15 12:27:39 UTC (rev 8554) +++ csw/mgar/pkg/git/trunk/Makefile 2010-02-15 13:05:30 UTC (rev 8555) @@ -123,7 +123,7 @@ CONFIGURE_ARGS += --enable-pthreads="-D_REENTRANT -lpthread" CONFIGURE_ARGS += --with-gitconfig=$(sysconfdir)/gitconfig CONFIGURE_ARGS += --with-pager=/opt/csw/bin/less -CONFIGURE_ARGS += --with-python=/opt/csw/bin/python +CONFIGURE_ARGS += --without-python BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ ASCIIDOC_NO_ROFF=YesPlease \ @@ -186,6 +186,4 @@ ginstall -c -m 0755 -d $(BD); \ cp contrib/completion/* \ $(BD)/ ) - @echo TEMP UNTIL USED: Purging Remote Helper Python Stuff - @( cd $(DESTDIR)/opt/csw/lib; rm -rf python ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Feb 15 14:06:00 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 15 Feb 2010 13:06:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8556] csw/mgar/pkg/scfdot/trunk/Makefile Message-ID: Revision: 8556 http://gar.svn.sourceforge.net/gar/?rev=8556&view=rev Author: skayser Date: 2010-02-15 13:06:00 +0000 (Mon, 15 Feb 2010) Log Message: ----------- scfdot: documented bug for corrupted .png files Modified Paths: -------------- csw/mgar/pkg/scfdot/trunk/Makefile Modified: csw/mgar/pkg/scfdot/trunk/Makefile =================================================================== --- csw/mgar/pkg/scfdot/trunk/Makefile 2010-02-15 13:05:30 UTC (rev 8555) +++ csw/mgar/pkg/scfdot/trunk/Makefile 2010-02-15 13:06:00 UTC (rev 8556) @@ -1,7 +1,7 @@ -# TODO -# ! dot seems to put an extraneous header line in each output file +# TODO (release-critical prefixed with !, non release-critical with *) +# * dot seems to put an extraneous header line in png output files # -36 3393.7 translate newpath user_shape_0 -# Why is this? Bug? +# Filed as http://www.opencsw.org/mantis/view.php?id=4276 GARNAME = scfdot GARVERSION = 1.0 CATEGORIES = apps 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 Feb 15 14:34:47 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Feb 2010 13:34:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[8557] csw/mgar Message-ID: Revision: 8557 http://gar.svn.sourceforge.net/gar/?rev=8557&view=rev Author: dmichelsen Date: 2010-02-15 13:34:03 +0000 (Mon, 15 Feb 2010) Log Message: ----------- mGAR v2: Make package name on CHECKPKG_OVERRIDE implicit Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk csw/mgar/pkg/gkrellm/trunk/Makefile csw/mgar/pkg/libsoup/trunk/Makefile csw/mgar/pkg/libxslt/trunk/Makefile csw/mgar/pkg/mutt/trunk/Makefile csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/setoolkit/trunk/Makefile csw/mgar/pkg/tcpwrappers/trunk/Makefile Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-15 13:06:00 UTC (rev 8556) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-15 13:34:03 UTC (rev 8557) @@ -674,7 +674,7 @@ @echo "[ Generating checkpkg override for package $* ]" $(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/checkpkg/overrides $(_DBG)($(foreach O,$(or $(CHECKPKG_OVERRIDES_$*),$(CHECKPKG_OVERRIDES)),echo "$O";)) | \ - perl -F'\|' -ane 'unshift @F,"$*" if(@F<2); $$F[0].=":"; print join(" ", at F );' \ + perl -F'\|' -ane 'unshift @F,"$*"; $$F[0].=":"; print join(" ", at F );' \ > $(PKGROOT)/opt/csw/share/checkpkg/overrides/$(call catalogname,$*) @$(MAKECOOKIE) Modified: csw/mgar/pkg/gkrellm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gkrellm/trunk/Makefile 2010-02-15 13:06:00 UTC (rev 8556) +++ csw/mgar/pkg/gkrellm/trunk/Makefile 2010-02-15 13:34:03 UTC (rev 8557) @@ -65,7 +65,7 @@ # This is for the missing X11 symbol XSolarisIASetProcessInfo. # It does no harm, though. -CHECKPKG_OVERRIDES = CSWgkrellm|symbol-not-found|gkrellm +CHECKPKG_OVERRIDES = symbol-not-found|gkrellm include gar/category.mk Modified: csw/mgar/pkg/libsoup/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsoup/trunk/Makefile 2010-02-15 13:06:00 UTC (rev 8556) +++ csw/mgar/pkg/libsoup/trunk/Makefile 2010-02-15 13:34:03 UTC (rev 8557) @@ -45,10 +45,10 @@ # libgnutls.so.11 no longer exists, but in case someone still use libsoup-2.0.so # and still have libgnutls.so.11 we override checkpkg -CHECKPKG_OVERRIDES += CSWlibsoup|orphan-soname|libgnutls.so.11 -CHECKPKG_OVERRIDES += CSWlibsoup|symbol-not-found|libsoup-2.0.so.0.0.0 +CHECKPKG_OVERRIDES += orphan-soname|libgnutls.so.11 +CHECKPKG_OVERRIDES += symbol-not-found|libsoup-2.0.so.0.0.0 # Possible bug in checkpkg -CHECKPKG_OVERRIDES += CSWlibsoup|symbol-not-found|libsoup-gnome-2.4.so.1.2.0 +CHECKPKG_OVERRIDES += symbol-not-found|libsoup-gnome-2.4.so.1.2.0 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2010-02-15 13:06:00 UTC (rev 8556) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2010-02-15 13:34:03 UTC (rev 8557) @@ -53,6 +53,6 @@ PKGFILES_CSWpylibxslt = $(libdir)/python.* PKGFILES_CSWpylibxslt += $(docdir)/libxslt-python-$(GARVERSION)/.* -CHECKPKG_OVERRIDES = CSWpylibxslt|symbol-not-found|libxsltmod.so +CHECKPKG_OVERRIDES = symbol-not-found|libxsltmod.so include gar/category.mk Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2010-02-15 13:06:00 UTC (rev 8556) +++ csw/mgar/pkg/mutt/trunk/Makefile 2010-02-15 13:34:03 UTC (rev 8557) @@ -100,7 +100,7 @@ ALTERNATIVE_slang = $(bindir)/mutt mutt $(bindir)/mutt-slang 200 # This warning from checkpkg is obviously wrong... -CHECKPKG_OVERRIDES_CSWmutt-base = CSWmutt-base|missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWmutt-base = missing-dependency|CSWperl include gar/category.mk Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-02-15 13:06:00 UTC (rev 8556) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-02-15 13:34:03 UTC (rev 8557) @@ -121,7 +121,7 @@ CHECKPKG_OVERRIDES = symbol-not-found CHECKPKG_OVERRIDES_CSWoldapdevel = symbol-not-found # The devel package depends on rt instead of the full package, that is ok. -CHECKPKG_OVERRIDES_CSWoldapdevel += CSWoldapdevel|missing-dependency|CSWoldap +CHECKPKG_OVERRIDES_CSWoldapdevel += missing-dependency|CSWoldap include gar/category.mk Modified: csw/mgar/pkg/setoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/setoolkit/trunk/Makefile 2010-02-15 13:06:00 UTC (rev 8556) +++ csw/mgar/pkg/setoolkit/trunk/Makefile 2010-02-15 13:34:03 UTC (rev 8557) @@ -41,7 +41,7 @@ # This is intended behaviour as the missing symbols are provided by the "se" binary # and the libs are to be used only by "se". -CHECKPKG_OVERRIDES = CSWsetoolkit|symbol-not-found|libsegui.so -CHECKPKG_OVERRIDES += CSWsetoolkit|symbol-not-found|libsenet.so +CHECKPKG_OVERRIDES = symbol-not-found|libsegui.so +CHECKPKG_OVERRIDES += symbol-not-found|libsenet.so include gar/category.mk Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/Makefile 2010-02-15 13:06:00 UTC (rev 8556) +++ csw/mgar/pkg/tcpwrappers/trunk/Makefile 2010-02-15 13:34:03 UTC (rev 8557) @@ -76,10 +76,10 @@ # These binaries link against libwrap.so which will be linked by alternatives # after package install. Until then they can obviously not link properly. -CHECKPKG_OVERRIDES = CSWtcpwrap|symbol-not-found|tcpdmatch -CHECKPKG_OVERRIDES += CSWtcpwrap|symbol-not-found|tcpd -CHECKPKG_OVERRIDES += CSWtcpwrap|symbol-not-found|try-from -CHECKPKG_OVERRIDES += CSWtcpwrap|symbol-not-found|tcpdchk +CHECKPKG_OVERRIDES = symbol-not-found|tcpdmatch +CHECKPKG_OVERRIDES += symbol-not-found|tcpd +CHECKPKG_OVERRIDES += symbol-not-found|try-from +CHECKPKG_OVERRIDES += symbol-not-found|tcpdchk 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 Feb 15 14:34:59 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Feb 2010 13:34:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8558] csw/mgar/pkg/python/branches/python-2.6.4+patch7242/ Makefile Message-ID: Revision: 8558 http://gar.svn.sourceforge.net/gar/?rev=8558&view=rev Author: dmichelsen Date: 2010-02-15 13:34:50 +0000 (Mon, 15 Feb 2010) Log Message: ----------- python 2.6.4+patch7242: Update for latest GAR features (LD_OPTIONS, PYCOMPILE, checkpkg) Modified Paths: -------------- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile Modified: csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile =================================================================== --- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile 2010-02-15 13:34:03 UTC (rev 8557) +++ csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile 2010-02-15 13:34:50 UTC (rev 8558) @@ -53,26 +53,10 @@ # Test for sunaudiodev fails. SKIPTEST = 1 -DEPENDS += lib/expat -DEPENDS += lib/openssl -DEPENDS += lib/db -DEPENDS += lib/gdbm +BASECFLAGS = $(CFLAGS) +EXTRA_COMMON_EXPORTS = BASECFLAGS -ifeq ($(shell uname -p), i386) - BASECFLAGS = -xO3 -xarch=386 -else - BASECFLAGS = -xO3 -xarch=v8 -endif - -COMPILER_EXPORTS += BASECFLAGS - -ifneq ($(shell uname -r), 5.8) - GARCOMPILER = SOS12 -endif - NOISALIST = 1 -LD_OPTIONS = -R/opt/csw/lib -export LD_OPTIONS CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --enable-ipv6 @@ -81,11 +65,8 @@ CONFIGURE_ARGS += --with-signal-module CONFIGURE_ARGS += --with-fpectl CONFIGURE_ARGS += --with-system-ffi -CONFIGURE_ARGS += LDFLAGS='-R/opt/csw/lib -L/opt/csw/lib' -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc -# use prototype filters to set the class -PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' +PYCOMPILE = 1 PACKAGES = CSWidle PACKAGES += CSWpython @@ -147,15 +128,15 @@ # Checkpkg should be able to guess that, perhaps symlink information is # missing? -CHECKPKG_OVERRIDES_CSWpython += CSWpython|missing-dependency|CSWbdb -CHECKPKG_OVERRIDES_CSWpython += CSWpython|symbol-not-found|_curses_panel.so -CHECKPKG_OVERRIDES_CSWpython += CSWpython|symbol-not-found|_cursesmodule.so -CHECKPKG_OVERRIDES_CSWpython += CSWpython|symbol-not-found|xxsubtype.so -CHECKPKG_OVERRIDES_CSWpython-devel = CSWpython-devel|symbol-not-found|python.o +CHECKPKG_OVERRIDES_CSWpython += missing-dependency|CSWbdb +CHECKPKG_OVERRIDES_CSWpython += symbol-not-found|_curses_panel.so +CHECKPKG_OVERRIDES_CSWpython += symbol-not-found|_cursesmodule.so +CHECKPKG_OVERRIDES_CSWpython += symbol-not-found|xxsubtype.so +CHECKPKG_OVERRIDES_CSWpython-devel = symbol-not-found|python.o # Dago: This override line doesn't make it to the override file. Can you look # into it? -CHECKPKG_OVERRIDES_CSWpython-rt = CSWpython-rt|action-class-only-in-pkginfo|cswpycompile +CHECKPKG_OVERRIDES_CSWpython-rt = action-class-only-in-pkginfo|cswpycompile 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 Feb 15 15:28:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Feb 2010 14:28:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[8559] csw/mgar/pkg/python/branches/python-2.6.4+patch7242/ Makefile Message-ID: Revision: 8559 http://gar.svn.sourceforge.net/gar/?rev=8559&view=rev Author: dmichelsen Date: 2010-02-15 14:28:12 +0000 (Mon, 15 Feb 2010) Log Message: ----------- python 2.6.4+patch7242: Fix pycompile Modified Paths: -------------- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile Modified: csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile =================================================================== --- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile 2010-02-15 13:34:50 UTC (rev 8558) +++ csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile 2010-02-15 14:28:12 UTC (rev 8559) @@ -9,7 +9,6 @@ # - http://forums.sun.com/thread.jspa?threadID=5148204 SPKG_SOURCEURL = http://python.org/download/releases/$(GARVERSION) -SPKG_CLASSES = none cswpycompile DESCRIPTION = A high-level scripting language. define BLURB @@ -66,7 +65,11 @@ CONFIGURE_ARGS += --with-fpectl CONFIGURE_ARGS += --with-system-ffi -PYCOMPILE = 1 +# This doesn't work here, as _PYCOMPILE_FILES is not the directory Python uses. +# PYCOMPILE = 1 +EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc +# use prototype filters to set the class +PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' PACKAGES = CSWidle PACKAGES += CSWpython 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 Feb 15 16:53:36 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Feb 2010 15:53:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8560] csw/mgar/pkg Message-ID: Revision: 8560 http://gar.svn.sourceforge.net/gar/?rev=8560&view=rev Author: dmichelsen Date: 2010-02-15 15:53:23 +0000 (Mon, 15 Feb 2010) Log Message: ----------- plib: Initial commit Added Paths: ----------- csw/mgar/pkg/plib/ csw/mgar/pkg/plib/branches/ csw/mgar/pkg/plib/tags/ csw/mgar/pkg/plib/trunk/ csw/mgar/pkg/plib/trunk/Makefile csw/mgar/pkg/plib/trunk/checksums csw/mgar/pkg/plib/trunk/files/ Property changes on: csw/mgar/pkg/plib/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/plib/trunk/Makefile =================================================================== --- csw/mgar/pkg/plib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/plib/trunk/Makefile 2010-02-15 15:53:23 UTC (rev 8560) @@ -0,0 +1,25 @@ +GARNAME = plib +GARVERSION = 1.8.5 +CATEGORIES = lib + +DESCRIPTION = A Suite of Portable Game Libraries +define BLURB +endef + +MASTER_SITES = http://plib.sourceforge.net/dist/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://plib.sourceforge.net + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +# This library contains only static libs, so it is more like a developer library +MERGE_EXCLUDE_STATICLIBS = + +include gar/category.mk Added: csw/mgar/pkg/plib/trunk/checksums =================================================================== --- csw/mgar/pkg/plib/trunk/checksums (rev 0) +++ csw/mgar/pkg/plib/trunk/checksums 2010-02-15 15:53:23 UTC (rev 8560) @@ -0,0 +1 @@ +47a6fbf63668c1eed631024038b2ea90 plib-1.8.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 Mon Feb 15 17:19:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Feb 2010 16:19:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8561] csw/mgar/pkg/libssh2/trunk Message-ID: Revision: 8561 http://gar.svn.sourceforge.net/gar/?rev=8561&view=rev Author: dmichelsen Date: 2010-02-15 16:19:39 +0000 (Mon, 15 Feb 2010) Log Message: ----------- libssh2: Update to 1.2.4 Modified Paths: -------------- csw/mgar/pkg/libssh2/trunk/Makefile csw/mgar/pkg/libssh2/trunk/checksums Modified: csw/mgar/pkg/libssh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libssh2/trunk/Makefile 2010-02-15 15:53:23 UTC (rev 8560) +++ csw/mgar/pkg/libssh2/trunk/Makefile 2010-02-15 16:19:39 UTC (rev 8561) @@ -1,5 +1,5 @@ GARNAME = libssh2 -GARVERSION = 1.2.2 +GARVERSION = 1.2.4 CATEGORIES = lib DESCRIPTION = A Library Implementing the SSH2 Protocol @@ -28,7 +28,11 @@ CONFIGURE_ARGS += --with-libz CONFIGURE_ARGS += --with-openssl=/opt/csw -# TEST_SCRIPTS = TEST_TARGET = check +# The second test "ssh2" sometimes hangs. Disable tests for now until +# http://sourceforge.net/tracker/?func=detail&aid=2952151&group_id=125852&atid=703942 +# has been resolved. +SKIPTEST ?= 1 + include gar/category.mk Modified: csw/mgar/pkg/libssh2/trunk/checksums =================================================================== --- csw/mgar/pkg/libssh2/trunk/checksums 2010-02-15 15:53:23 UTC (rev 8560) +++ csw/mgar/pkg/libssh2/trunk/checksums 2010-02-15 16:19:39 UTC (rev 8561) @@ -1 +1 @@ -fa8d9cd425bdd62f57244fc61fb54da7 libssh2-1.2.2.tar.gz +4d65a66d5f232e5bb1d05b311e43d46d libssh2-1.2.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Feb 15 17:30:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Feb 2010 16:30:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[8562] csw/mgar/pkg/libssh2/trunk/Makefile Message-ID: Revision: 8562 http://gar.svn.sourceforge.net/gar/?rev=8562&view=rev Author: dmichelsen Date: 2010-02-15 16:30:31 +0000 (Mon, 15 Feb 2010) Log Message: ----------- libssh2: Split off devel package Modified Paths: -------------- csw/mgar/pkg/libssh2/trunk/Makefile Modified: csw/mgar/pkg/libssh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libssh2/trunk/Makefile 2010-02-15 16:19:39 UTC (rev 8561) +++ csw/mgar/pkg/libssh2/trunk/Makefile 2010-02-15 16:30:31 UTC (rev 8562) @@ -21,6 +21,14 @@ RUNTIME_DEP_PKGS = CSWosslrt CSWzlib BUILD_DEP_PKGS = CSWossldevel CSWzlib +PACKAGES = CSWlibssh2 CSWlibssh2devel + +CATALOGNAME_CSWlibssh2 = libssh2 +CATALOGNAME_CSWlibssh2devel = libssh2_devel + +SPKG_DESC_CSWlibssh2 = $(DESCRIPTION) +SPKG_DESC_CSWlibssh2devel = libssh2 developer files + BUILD64 = 1 NOISAEXEC = 1 @@ -35,4 +43,6 @@ # has been resolved. SKIPTEST ?= 1 +PKGFILES_CSWlibssh2devel = $(PKGFILES_DEVEL) + 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 Feb 15 17:32:50 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Feb 2010 16:32:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8563] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8563 http://gar.svn.sourceforge.net/gar/?rev=8563&view=rev Author: dmichelsen Date: 2010-02-15 16:32:50 +0000 (Mon, 15 Feb 2010) Log Message: ----------- mGAR v2: Associate checkpkg override with specific package. This fixes GAR Bug #17 Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-15 16:30:31 UTC (rev 8562) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-15 16:32:50 UTC (rev 8563) @@ -396,11 +396,13 @@ -I $(call licensedir,$*)/license \ -I /etc/opt/csw/pkg/$*/cswmigrateconf \ -I /opt/csw/share/alternatives/$(call catalogname,$*) \ + -I /opt/csw/share/checkpkg/overrides/$(call catalogname,$*) \ )\ $(foreach S,$(filter-out $*,$(SPKG_SPECS)),\ -X $(call licensedir,$S)/license \ -X /etc/opt/csw/pkg/$S/cswmigrateconf \ -X /opt/csw/share/alternatives/$(call catalogname,$S) \ + -X /opt/csw/share/checkpkg/overrides/$(call catalogname,$S) \ ) \ $(foreach I,$(EXTRA_PKGFILES_INCLUDED) $(EXTRA_PKGFILES_INCLUDED_$*),-i '$I') \ $(foreach X,$(EXTRA_PKGFILES_EXCLUDED) $(EXTRA_PKGFILES_EXCLUDED_$*),-x '$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 Mon Feb 15 17:35:49 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Feb 2010 16:35:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[8564] csw/mgar/pkg/libssh2/trunk/Makefile Message-ID: Revision: 8564 http://gar.svn.sourceforge.net/gar/?rev=8564&view=rev Author: dmichelsen Date: 2010-02-15 16:35:49 +0000 (Mon, 15 Feb 2010) Log Message: ----------- libssh2: Add missing dependency Modified Paths: -------------- csw/mgar/pkg/libssh2/trunk/Makefile Modified: csw/mgar/pkg/libssh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libssh2/trunk/Makefile 2010-02-15 16:32:50 UTC (rev 8563) +++ csw/mgar/pkg/libssh2/trunk/Makefile 2010-02-15 16:35:49 UTC (rev 8564) @@ -18,7 +18,8 @@ # new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS = CSWosslrt CSWzlib +RUNTIME_DEP_PKGS_CSWlibssh2 = CSWosslrt CSWzlib +RUNTIME_DEP_PKGS_CSWlibssh2devel = CSWlibssh2 BUILD_DEP_PKGS = CSWossldevel CSWzlib PACKAGES = CSWlibssh2 CSWlibssh2devel 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 Feb 15 20:38:16 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 15 Feb 2010 19:38:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8565] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 8565 http://gar.svn.sourceforge.net/gar/?rev=8565&view=rev Author: rthurner Date: 2010-02-15 19:38:00 +0000 (Mon, 15 Feb 2010) Log Message: ----------- subversion - upgrade to new bdb dependency, and include libserf as dependency as well. Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-02-15 16:35:49 UTC (rev 8564) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-02-15 19:38:00 UTC (rev 8565) @@ -37,13 +37,14 @@ SPKG_DESC_CSWsvn = Version control rethought CATALOGNAME_CSWsvn = subversion RUNTIME_DEP_PKGS_CSWsvn = CSWapache2rt -RUNTIME_DEP_PKGS_CSWsvn += CSWbdb47 +RUNTIME_DEP_PKGS_CSWsvn += CSWbdb48 RUNTIME_DEP_PKGS_CSWsvn += CSWexpat RUNTIME_DEP_PKGS_CSWsvn += CSWggettextrt RUNTIME_DEP_PKGS_CSWsvn += CSWiconv RUNTIME_DEP_PKGS_CSWsvn += CSWneon RUNTIME_DEP_PKGS_CSWsvn += CSWoldaprt RUNTIME_DEP_PKGS_CSWsvn += CSWsasl +RUNTIME_DEP_PKGS_CSWsvn += CSWlibserf RUNTIME_DEP_PKGS_CSWsvn += CSWsqlite3rt RUNTIME_DEP_PKGS_CSWsvn += CSWzlib # There are additional requirements for $(docdir)/subversion/tools/ which 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 Feb 15 21:06:58 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Feb 2010 20:06:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8566] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 8566 http://gar.svn.sourceforge.net/gar/?rev=8566&view=rev Author: bdwalton Date: 2010-02-15 20:06:53 +0000 (Mon, 15 Feb 2010) Log Message: ----------- git: 1.7.0 is out, drop the rcX from our version Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-02-15 19:38:00 UTC (rev 8565) +++ csw/mgar/pkg/git/trunk/Makefile 2010-02-15 20:06:53 UTC (rev 8566) @@ -1,6 +1,6 @@ GARNAME = git GARVERSION = 1.7.0 -PATCHLEVEL = rc1 +# PATCHLEVEL = rc1 CATEGORIES = devel VENDOR_URL = http://git-scm.org/ 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 Feb 15 21:09:25 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Feb 2010 20:09:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8567] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 8567 http://gar.svn.sourceforge.net/gar/?rev=8567&view=rev Author: bdwalton Date: 2010-02-15 20:09:19 +0000 (Mon, 15 Feb 2010) Log Message: ----------- git: test suite passes on both arches. disable until next uprev Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-02-15 20:06:53 UTC (rev 8566) +++ csw/mgar/pkg/git/trunk/Makefile 2010-02-15 20:09:19 UTC (rev 8567) @@ -6,7 +6,7 @@ VENDOR_URL = http://git-scm.org/ # disable tests until next version bump (at the top so it stands out) -# TEST_SCRIPTS = +TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc PACKAGES += CSWgitcompletion CSWgitdevel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Feb 15 21:29:04 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Feb 2010 20:29:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[8568] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 8568 http://gar.svn.sourceforge.net/gar/?rev=8568&view=rev Author: bdwalton Date: 2010-02-15 20:29:01 +0000 (Mon, 15 Feb 2010) Log Message: ----------- git: simplify license handling Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-02-15 20:09:19 UTC (rev 8567) +++ csw/mgar/pkg/git/trunk/Makefile 2010-02-15 20:29:01 UTC (rev 8568) @@ -56,15 +56,7 @@ # git could use any other POSIX compliant shell and drop the dependency... RUNTIME_DEP_PKGS_CSWgitcompletion = CSWgit CSWbash CSWbashcmplt -LICENSE_CSWgit = COPYING -LICENSE_CSWgitk = COPYING -LICENSE_CSWgitgui = COPYING -LICENSE_CSWgitsvn = COPYING -LICENSE_CSWgitcvs = COPYING -LICENSE_CSWgitemacs = COPYING -LICENSE_CSWgitdoc = COPYING -LICENSE_CSWgitcompletion = COPYING -LICENSE_CSWgitdevel = COPYING +LICENSE = COPYING DESCRIPTION = Fast Version Control System define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Feb 16 04:36:57 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 16 Feb 2010 03:36:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8569] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 8569 http://gar.svn.sourceforge.net/gar/?rev=8569&view=rev Author: bdwalton Date: 2010-02-16 03:36:57 +0000 (Tue, 16 Feb 2010) Log Message: ----------- ruby19: no really, disable tests for now Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-02-15 20:29:01 UTC (rev 8568) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-02-16 03:36:57 UTC (rev 8569) @@ -4,7 +4,7 @@ CATEGORIES = lang # TEST_TARGET = check -TEST_SCRIPT = +TEST_SCRIPTS = DISTNAME = ruby-$(GARVERSION)-$(PATCHLEVEL) 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 Feb 16 06:46:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 16 Feb 2010 05:46:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8570] csw/mgar/gar/v2-checkpkg-stats Message-ID: Revision: 8570 http://gar.svn.sourceforge.net/gar/?rev=8570&view=rev Author: wahwah Date: 2010-02-16 05:46:13 +0000 (Tue, 16 Feb 2010) Log Message: ----------- mGAR v2-checkpkg-stats: Collecting /usr/ccs/bin/dump info Modified Paths: -------------- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-libs.py 2010-02-16 03:36:57 UTC (rev 8569) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-libs.py 2010-02-16 05:46:13 UTC (rev 8570) @@ -28,19 +28,6 @@ import checkpkg import opencsw -DUMP_BIN = "/usr/ccs/bin/dump" - -def GetIsalist(): - args = ["isalist"] - isalist_proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = isalist_proc.communicate() - ret = isalist_proc.wait() - if ret: - logging.error("Calling isalist has failed.") - isalist = re.split(r"\s+", stdout.strip()) - return isalist - - def CheckSharedLibraryConsistency(pkgs, debug): result_ok = True errors = [] @@ -48,9 +35,11 @@ binaries_by_pkgname = {} sonames_by_pkgname = {} pkg_by_any_filename = {} + def MakeBinPathAbsolute(x): + return os.path.join(checker.directory, "root", x) for checker in pkgs: - pkg_binary_paths = checker.ListBinaries() - binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] + pkg_binary_paths = [MakeBinPathAbsolute(x) for x in checker.ListBinaries()] + binaries_base = [os.path.basename(x) for x in checker.ListBinaries()] binaries_by_pkgname[checker.pkgname] = binaries_base binaries.extend(pkg_binary_paths) for filename in checker.GetAllFilenames(): @@ -72,9 +61,11 @@ # ... # } # + # This bit to be replaced. for binary in binaries: - binary_base_name = binary.split("/")[-1] - args = [DUMP_BIN, "-Lv", binary] + # binary_base_name = binary.split("/")[-1] + binary_base_name = os.path.basename(binary) + args = [checkpkg.DUMP_BIN, "-Lv", binary] dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) stdout, stderr = dump_proc.communicate() ret = dump_proc.wait() @@ -89,7 +80,7 @@ binary_data[checkpkg.SONAME] = binary_base_name filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name - isalist = GetIsalist() + isalist = checkpkg.GetIsalist() # Building indexes by soname to simplify further processing # These are indexes "by soname". Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py 2010-02-16 03:36:57 UTC (rev 8569) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py 2010-02-16 05:46:13 UTC (rev 8570) @@ -5,12 +5,14 @@ # Collects statistics about a package and saves to a directory, for later use # by checkpkg modules. +import copy import errno +import logging +import optparse import os import os.path +import subprocess import sys -import logging -import optparse import yaml # The following bit of code sets the correct path to Python libraries @@ -86,15 +88,48 @@ else: raise - def CollectStats(self): - stats_path = self.GetStatsPath() - self.MakeStatsDir() + def GetBinaryDumpInfo(self): dir_pkg = self.GetDirFormatPkg() - self.DumpObject(dir_pkg.GetParsedPkginfo(), "pkginfo") - self.DumpObject(dir_pkg.GetPkgmap().entries, "pkgmap") - self.DumpObject(dir_pkg.ListBinaries(), "binaries") - self.DumpObject(dir_pkg.GetDependencies(), "depends") - self.DumpObject(dir_pkg.GetAllFilenames(), "all_filenames") + # Binaries. This could be split off to a separate function. + # man ld.so.1 for more info on this hack + env = copy.copy(os.environ) + env["LD_NOAUXFLTR"] = "1" + binaries_dump_info = [] + for binary in dir_pkg.ListBinaries(): + binary_abs_path = os.path.join(dir_pkg.directory, "root", binary) + binary_base_name = os.path.basename(binary) + args = [checkpkg.DUMP_BIN, "-Lv", binary_abs_path] + dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) + stdout, stderr = dump_proc.communicate() + ret = dump_proc.wait() + binary_data = checkpkg.ParseDumpOutput(stdout) + binary_data["path"] = binary + binary_data["soname_guessed"] = False + binary_data["base_name"] = binary_base_name + if checkpkg.SONAME not in binary_data: + logging.debug("The %s binary doesn't provide a SONAME. " + "(It might be an executable)", + binary_base_name) + # The binary doesn't tell its SONAME. We're guessing it's the + # same as the base file name. + binary_data[checkpkg.SONAME] = binary_base_name + binary_data["soname_guessed"] = True + binaries_dump_info.append(binary_data) + return binaries_dump_info + + def GetBasicStats(self): + dir_pkg = self.GetDirFormatPkg() + basic_stats = {} + basic_stats["stats_version"] = STATS_VERSION + basic_stats["pkg_path"] = self.srv4_pkg.pkg_path + basic_stats["pkg_basename"] = os.path.basename(self.srv4_pkg.pkg_path) + basic_stats["parsed_basename"] = opencsw.ParsePackageFileName(basic_stats["pkg_basename"]) + basic_stats["pkgname"] = dir_pkg.pkgname + basic_stats["catalogname"] = dir_pkg.GetCatalogname() + return basic_stats + + def GetOverrides(self): + dir_pkg = self.GetDirFormatPkg() overrides = dir_pkg.GetOverrides() def OverrideToDict(override): d = {} @@ -103,16 +138,22 @@ d["tag_info"] = override.tag_info return d overrides_simple = [OverrideToDict(x) for x in overrides] - self.DumpObject(overrides_simple, "overrides") - basic_stats = {} - basic_stats["stats_version"] = STATS_VERSION - basic_stats["pkg_path"] = self.srv4_pkg.pkg_path - basic_stats["pkg_basename"] = os.path.basename(self.srv4_pkg.pkg_path) - basic_stats["parsed_basename"] = opencsw.ParsePackageFileName(basic_stats["pkg_basename"]) - basic_stats["pkgname"] = dir_pkg.pkgname - basic_stats["catalogname"] = dir_pkg.GetCatalogname() - self.DumpObject(basic_stats, "basic_stats") + return overrides_simple + def CollectStats(self): + stats_path = self.GetStatsPath() + self.MakeStatsDir() + dir_pkg = self.GetDirFormatPkg() + self.DumpObject(dir_pkg.GetParsedPkginfo(), "pkginfo") + self.DumpObject(dir_pkg.GetPkgmap().entries, "pkgmap") + self.DumpObject(dir_pkg.ListBinaries(), "binaries") + self.DumpObject(dir_pkg.GetDependencies(), "depends") + self.DumpObject(dir_pkg.GetAllFilenames(), "all_filenames") + self.DumpObject(checkpkg.GetIsalist(), "isalist") + self.DumpObject(self.GetOverrides, "overrides") + self.DumpObject(self.GetBasicStats(), "basic_stats") + self.DumpObject(self.GetBinaryDumpInfo(), "binaries_dump_info") + def DumpObject(self, obj, name): stats_path = self.GetStatsPath() out_file_name = os.path.join(self.GetStatsPath(), "%s.yml" % name) Modified: csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py 2010-02-16 03:36:57 UTC (rev 8569) +++ csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py 2010-02-16 05:46:13 UTC (rev 8570) @@ -24,6 +24,7 @@ DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) DO_NOT_REPORT_MISSING = set([]) DO_NOT_REPORT_MISSING_RE = [r"SUNW.*", r"\*SUNW.*"] +DUMP_BIN = "/usr/ccs/bin/dump" SYSTEM_SYMLINKS = ( ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), @@ -714,3 +715,14 @@ if not override_applies: tags_after_overrides.append(tag) return tags_after_overrides + + +def GetIsalist(): + args = ["isalist"] + isalist_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = isalist_proc.communicate() + ret = isalist_proc.wait() + if ret: + logging.error("Calling isalist has failed.") + isalist = re.split(r"\s+", stdout.strip()) + return isalist Modified: csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py 2010-02-16 03:36:57 UTC (rev 8569) +++ csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py 2010-02-16 05:46:13 UTC (rev 8570) @@ -574,6 +574,7 @@ self.pkgname = os.path.split(directory)[1] self.pkgpath = self.directory self.pkginfo_dict = None + self.binaries = None def GetCatalogname(self): """Returns the catalog name of the package. @@ -713,16 +714,23 @@ Returns a list of absolute paths. """ - self.CheckPkgpathExists() - find_tmpl = "find '%s' -print | xargs file | grep ELF | nawk -F: '{print $1}'" - find_proc = subprocess.Popen(find_tmpl % self.directory, - shell=True, - stdout=subprocess.PIPE) - stdout, stderr = find_proc.communicate() - ret = find_proc.wait() - if ret: - logging.error("The find command returned an error.") - return stdout.splitlines() + if not self.binaries: + self.CheckPkgpathExists() + files_root = os.path.join(self.directory, "root") + find_tmpl = "find '%s' -print | xargs file | grep ELF | nawk -F: '{print $1}'" + find_proc = subprocess.Popen(find_tmpl % ".", + shell=True, + stdout=subprocess.PIPE, + cwd=files_root) + stdout, stderr = find_proc.communicate() + ret = find_proc.wait() + if ret: + logging.error("The find command returned an error.") + dotslash_re = re.compile(r"^./") + def StripRe(x, strip_re): + return re.sub(strip_re, "", x) + self.binaries = [StripRe(x, dotslash_re) for x in stdout.splitlines()] + return self.binaries def GetAllFilenames(self): self.CheckPkgpathExists() 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 Feb 16 10:05:51 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 16 Feb 2010 09:05:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[8571] csw/mgar/gar/v2-checkpkg-stats Message-ID: Revision: 8571 http://gar.svn.sourceforge.net/gar/?rev=8571&view=rev Author: wahwah Date: 2010-02-16 09:05:51 +0000 (Tue, 16 Feb 2010) Log Message: ----------- mGAR v2-checkpkg-stats: Using yaml data for checks, all modules work except the library module, which is big and needs more work. Modified Paths: -------------- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-actionclasses.py csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-archall.py csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-license.py csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-missing-symbols.py csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-you-can-write-your-own.py csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg 2010-02-16 05:46:13 UTC (rev 8570) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg 2010-02-16 09:05:51 UTC (rev 8571) @@ -130,8 +130,9 @@ shift fi if [[ "$1" == "-h" ]] ; then - print 'Usage: checkpkg [-e] pkg1 [pkg2 ....]' - print ' -e = "exit on warnings"' + print 'Usage: checkpkg [-d] [-e] pkg1 [pkg2 ....]' + print ' -d display debug messages' + print ' -e exit on warnings (soon to be obsolete)' shift fi @@ -543,13 +544,14 @@ set_variables_for_individual_package_check "$f" test_suite_ok=1 -plugindir=${command_basedir}/checkpkg.d +checkpkg_module_dir=${command_basedir}/checkpkg.d checkpkg_module_tag="checkpkg-" +checkpkg_stats_basedir="${HOME}/.checkpkg/stats" # Cleaning up old *.pyc files which can cause grief. This is because of the # move of Python libraries. -for pyc_file in ${plugindir}/opencsw.pyc \ - ${plugindir}/checkpkg.pyc; do +for pyc_file in ${checkpkg_module_dir}/opencsw.pyc \ + ${checkpkg_module_dir}/checkpkg.pyc; do if [ -f "${pyc_file}" ]; then echo "Removing old pyc file: '${pyc_file}'" rm "${pyc_file}" @@ -564,12 +566,13 @@ if [[ "${DEBUG}" != "" ]]; then extra_options="--debug" fi -debugmsg "plugindir: '$plugindir'" +debugmsg "checkpkg_module_dir: '$checkpkg_module_dir'" log_files="" module_name_format="%-40s" -if [[ -d "$plugindir" ]]; then - echo "Running modular tests" - for plugin in "${plugindir}/${checkpkg_module_tag}"*; do +md5sums=`gmd5sum "$@" | awk '{print $1}'` +if [[ -d "${checkpkg_module_dir}" ]]; then + echo "Running modular tests in ${checkpkg_module_dir}" + for plugin in "${checkpkg_module_dir}/${checkpkg_module_tag}"*; do if [[ -x "${plugin}" ]]; then plugin_base_name=`basename ${plugin}` plugin_log="${EXTRACTDIR}/${plugin_base_name}.log" @@ -577,12 +580,12 @@ plugin_name="`echo ${plugin} | sed -e 's+.*/checkpkg-++' | sed -e 's+\.py$++'`" error_tag_file="tags.${plugin_name}" printf "${BOLD}${module_name_format}${COLOR_RESET} running..." "${plugin_name}" - debugmsg "Executing: ${plugin} $extra_options -e \"${EXTRACTDIR}\" ${pkgnames}" + debugmsg "Executing: ${plugin} $extra_options -b \"${checkpkg_stats_basedir}\" -o \"${EXTRACTDIR}/${error_tag_file}\" ${md5sums}" ${plugin} \ $extra_options \ - -e "${EXTRACTDIR}" \ + -b "${checkpkg_stats_basedir}" \ -o "${EXTRACTDIR}/${error_tag_file}" \ - ${pkgnames} \ + ${md5sums} \ > "${plugin_log}" 2>&1 if [[ "$?" -ne 0 ]]; then printf "\r${module_name_format} ${RED}[ERROR]${COLOR_RESET} \\n" "${plugin_name}" @@ -595,7 +598,7 @@ fi done else - debugmsg "plugin dir ${plugindir} does not exist" + debugmsg "module dir ${checkpkg_module_dir} does not exist" fi for log_file in ${log_files}; do Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-actionclasses.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-actionclasses.py 2010-02-16 05:46:13 UTC (rev 8570) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-actionclasses.py 2010-02-16 09:05:51 UTC (rev 8571) @@ -22,13 +22,16 @@ import opencsw -def CheckActionClasses(pkg, debug): +def CheckActionClasses(pkg_data, debug): """Checks the consistency between classes in the prototype and pkginfo.""" errors = [] - pkginfo = pkg.GetParsedPkginfo() - pkgmap = pkg.GetPkgmap() + pkginfo = pkg_data["pkginfo"] + pkgmap = pkg_data["pkgmap"] pkginfo_classes = set(re.split(opencsw.WS_RE, pkginfo["CLASSES"])) - pkgmap_classes = pkgmap.GetClasses() + pkgmap_classes = set() + for entry in pkgmap: + if entry["class"]: # might be None + pkgmap_classes.add(entry["class"]) only_in_pkginfo = pkginfo_classes.difference(pkgmap_classes) only_in_pkgmap = pkgmap_classes.difference(pkginfo_classes) for action_class in only_in_pkginfo: @@ -46,10 +49,12 @@ def main(): options, args = checkpkg.GetOptions() - pkgnames = args + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.extractdir, - pkgnames, + options.stats_basedir, + md5sums, options.debug) # Registering functions defined above. check_manager.RegisterIndividualCheck(CheckActionClasses) Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-archall.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-archall.py 2010-02-16 05:46:13 UTC (rev 8570) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-archall.py 2010-02-16 09:05:51 UTC (rev 8571) @@ -16,11 +16,11 @@ sys.path.append(os.path.join(*path_list)) import checkpkg -def CheckArchitectureVsContents(pkg, debug): +def CheckArchitectureVsContents(pkg_data, debug): """Verifies the relationship between package contents and architecture.""" errors = [] - binaries = pkg.ListBinaries() - pkginfo = pkg.GetParsedPkginfo() + binaries = pkg_data["binaries"] + pkginfo = pkg_data["pkginfo"] arch = pkginfo["ARCH"] if binaries and arch == "all": for binary in binaries: @@ -38,10 +38,12 @@ def main(): options, args = checkpkg.GetOptions() - pkgnames = args + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.extractdir, - pkgnames, + options.stats_basedir, + md5sums, options.debug) check_manager.RegisterIndividualCheck(CheckArchitectureVsContents) Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-license.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-license.py 2010-02-16 05:46:13 UTC (rev 8570) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-license.py 2010-02-16 09:05:51 UTC (rev 8571) @@ -19,16 +19,17 @@ LICENSE_TMPL = "/opt/csw/share/doc/%s/license" -def CheckLicenseFile(pkg, debug): +def CheckLicenseFile(pkg_data, debug): """Checks for the presence of the license file.""" errors = [] - pkgmap = pkg.GetPkgmap() - catalogname = pkg.GetCatalogname() + pkgmap = pkg_data["pkgmap"] + catalogname = pkg_data["basic_stats"]["catalogname"] license_path = LICENSE_TMPL % catalogname - if license_path not in pkgmap.entries_by_path: + pkgmap_paths = [x["path"] for x in pkgmap] + if license_path not in pkgmap_paths: errors.append( checkpkg.CheckpkgTag( - pkg.pkgname, + pkg_data["basic_stats"]["pkgname"], "license-missing", msg="See http://sourceforge.net/apps/trac/gar/wiki/CopyRight")) return errors @@ -36,10 +37,12 @@ def main(): options, args = checkpkg.GetOptions() - pkgnames = args + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.extractdir, - pkgnames, + options.stats_basedir, + md5sums, options.debug) # Registering functions defined above. check_manager.RegisterIndividualCheck(CheckLicenseFile) Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-missing-symbols.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-missing-symbols.py 2010-02-16 05:46:13 UTC (rev 8570) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-missing-symbols.py 2010-02-16 09:05:51 UTC (rev 8571) @@ -22,21 +22,13 @@ # Defining checking functions. -def CheckForMissingSymbols(pkg, debug): +def CheckForMissingSymbols(pkg_data, debug): """Looks for "symbol not found" in ldd -r output.""" errors = [] - binaries = pkg.ListBinaries() + binaries = pkg_data["binaries"] symbol_re = re.compile(r"symbol not found:") for binary in binaries: - # this could be potentially moved into the DirectoryFormatPackage class. - args = ["ldd", "-r", binary] - ldd_proc = subprocess.Popen( - args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = ldd_proc.communicate() - retcode = ldd_proc.wait() - lines = stdout.splitlines() + lines = pkg_data["ldd_dash_r"][binary] missing_symbols = False for line in lines: if re.search(symbol_re, line): @@ -49,12 +41,12 @@ def main(): options, args = checkpkg.GetOptions() - pkgnames = args + md5sums = args # CheckpkgManager class abstracts away things such as the collection of # results. check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.extractdir, - pkgnames, + options.stats_basedir, + md5sums, options.debug) # Registering functions defined above. check_manager.RegisterIndividualCheck(CheckForMissingSymbols) Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-02-16 05:46:13 UTC (rev 8570) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-02-16 09:05:51 UTC (rev 8571) @@ -8,6 +8,8 @@ import os.path import sys +CHECKPKG_MODULE_NAME = "obsolete dependencies" + # The following bit of code sets the correct path to Python libraries # distributed with GAR. path_list = [os.path.dirname(__file__), @@ -26,10 +28,10 @@ }, } -def CheckObsoleteDeps(pkg, debug): +def CheckObsoleteDeps(pkg_data, debug): """Checks for obsolete dependencies.""" errors = [] - deps = set(pkg.GetDependencies()) + deps = set(pkg_data["depends"]) obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) if obsolete_pkg_deps: for obsolete_pkg in obsolete_pkg_deps: @@ -50,10 +52,12 @@ def main(): options, args = checkpkg.GetOptions() - pkgnames = args - check_manager = checkpkg.CheckpkgManager("obsolete dependencies", - options.extractdir, - pkgnames, + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, options.debug) check_manager.RegisterIndividualCheck(CheckObsoleteDeps) # Running the checks, reporting and exiting. Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-you-can-write-your-own.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-02-16 05:46:13 UTC (rev 8570) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-02-16 09:05:51 UTC (rev 8571) @@ -21,7 +21,7 @@ # Defining the checking functions. They come in two flavors: individual # package checks and set checks. -def MyCheckForAsinglePackage(pkg, debug): +def MyCheckForAsinglePackage(pkg_data, debug): """Checks an individual package. Gets a DirctoryFormatPackage as an argument, and returns a list of errors. @@ -40,11 +40,13 @@ # Here's how to report an error: something_is_wrong = False if something_is_wrong: - errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "example-problem", "thing")) + errors.append(checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "example-problem", "thing")) return errors -def MyCheckForAsetOfPackages(pkgs, debug): +def MyCheckForAsetOfPackages(pkgs_data, debug): """Checks a set of packages. Sometimes individual checks aren't enough. If you need to write code which @@ -59,12 +61,12 @@ def main(): options, args = checkpkg.GetOptions() - pkgnames = args + md5sums = args # CheckpkgManager class abstracts away things such as the collection of # results. check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.extractdir, - pkgnames, + options.stats_basedir, + md5sums, options.debug) # Registering functions defined above. check_manager.RegisterIndividualCheck(MyCheckForAsinglePackage) Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py 2010-02-16 05:46:13 UTC (rev 8570) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py 2010-02-16 09:05:51 UTC (rev 8571) @@ -5,15 +5,12 @@ # Collects statistics about a package and saves to a directory, for later use # by checkpkg modules. -import copy -import errno import logging import optparse import os import os.path import subprocess import sys -import yaml # The following bit of code sets the correct path to Python libraries # distributed with GAR. @@ -24,145 +21,6 @@ import opencsw -STATS_VERSION = 1L - - -class PackageStats(object): - """Collects stats about a package and saves it. - - base-stats.yml - binaries.yml - """ - - def __init__(self, srv4_pkg): - self.srv4_pkg = srv4_pkg - self.md5sum = None - self.dir_format_pkg = None - self.stats_path = None - - def GetMd5sum(self): - if not self.md5sum: - self.md5sum = self.srv4_pkg.GetMd5sum() - return self.md5sum - - def GetStatsPath(self, home=None): - if not self.stats_path: - if not home: - home = os.environ["HOME"] - md5sum = self.GetMd5sum() - two_chars = md5sum[0:2] - parts = [home, ".checkpkg", "stats", two_chars, md5sum] - self.stats_path = os.path.join(*parts) - return self.stats_path - - def StatsExist(self): - """Checks if statistics of a package exist. - - Returns: - bool - """ - if not self.StatsDirExists(): - return False - # More checks can be added in the future. - return True - - def StatsDirExists(self): - return os.path.isdir(self.GetStatsPath()) - - def GetDirFormatPkg(self): - if not self.dir_format_pkg: - self.dir_format_pkg = self.srv4_pkg.GetDirFormatPkg() - return self.dir_format_pkg - - def MakeStatsDir(self): - """mkdir -p equivalent. - - http://stackoverflow.com/questions/600268/mkdir-p-functionality-in-python - """ - stats_path = self.GetStatsPath() - try: - os.makedirs(stats_path) - except OSError, e: - if e.errno == errno.EEXIST: - pass - else: - raise - - def GetBinaryDumpInfo(self): - dir_pkg = self.GetDirFormatPkg() - # Binaries. This could be split off to a separate function. - # man ld.so.1 for more info on this hack - env = copy.copy(os.environ) - env["LD_NOAUXFLTR"] = "1" - binaries_dump_info = [] - for binary in dir_pkg.ListBinaries(): - binary_abs_path = os.path.join(dir_pkg.directory, "root", binary) - binary_base_name = os.path.basename(binary) - args = [checkpkg.DUMP_BIN, "-Lv", binary_abs_path] - dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) - stdout, stderr = dump_proc.communicate() - ret = dump_proc.wait() - binary_data = checkpkg.ParseDumpOutput(stdout) - binary_data["path"] = binary - binary_data["soname_guessed"] = False - binary_data["base_name"] = binary_base_name - if checkpkg.SONAME not in binary_data: - logging.debug("The %s binary doesn't provide a SONAME. " - "(It might be an executable)", - binary_base_name) - # The binary doesn't tell its SONAME. We're guessing it's the - # same as the base file name. - binary_data[checkpkg.SONAME] = binary_base_name - binary_data["soname_guessed"] = True - binaries_dump_info.append(binary_data) - return binaries_dump_info - - def GetBasicStats(self): - dir_pkg = self.GetDirFormatPkg() - basic_stats = {} - basic_stats["stats_version"] = STATS_VERSION - basic_stats["pkg_path"] = self.srv4_pkg.pkg_path - basic_stats["pkg_basename"] = os.path.basename(self.srv4_pkg.pkg_path) - basic_stats["parsed_basename"] = opencsw.ParsePackageFileName(basic_stats["pkg_basename"]) - basic_stats["pkgname"] = dir_pkg.pkgname - basic_stats["catalogname"] = dir_pkg.GetCatalogname() - return basic_stats - - def GetOverrides(self): - dir_pkg = self.GetDirFormatPkg() - overrides = dir_pkg.GetOverrides() - def OverrideToDict(override): - d = {} - d["pkgname"] = override.pkgname - d["tag_name"] = override.tag_name - d["tag_info"] = override.tag_info - return d - overrides_simple = [OverrideToDict(x) for x in overrides] - return overrides_simple - - def CollectStats(self): - stats_path = self.GetStatsPath() - self.MakeStatsDir() - dir_pkg = self.GetDirFormatPkg() - self.DumpObject(dir_pkg.GetParsedPkginfo(), "pkginfo") - self.DumpObject(dir_pkg.GetPkgmap().entries, "pkgmap") - self.DumpObject(dir_pkg.ListBinaries(), "binaries") - self.DumpObject(dir_pkg.GetDependencies(), "depends") - self.DumpObject(dir_pkg.GetAllFilenames(), "all_filenames") - self.DumpObject(checkpkg.GetIsalist(), "isalist") - self.DumpObject(self.GetOverrides, "overrides") - self.DumpObject(self.GetBasicStats(), "basic_stats") - self.DumpObject(self.GetBinaryDumpInfo(), "binaries_dump_info") - - def DumpObject(self, obj, name): - stats_path = self.GetStatsPath() - out_file_name = os.path.join(self.GetStatsPath(), "%s.yml" % name) - logging.debug("DumpObject(): writing %s", repr(out_file_name)) - f = open(out_file_name, "w") - f.write(yaml.safe_dump(obj)) - f.close() - - def main(): debug = True logging.basicConfig(level=logging.DEBUG) @@ -172,7 +30,7 @@ logging.info("Collecting statistics about given package files.") logging.debug("args: %s", args) packages = [opencsw.CswSrv4File(x, debug) for x in args] - stats_list = [PackageStats(pkg) for pkg in packages] + stats_list = [checkpkg.PackageStats(pkg) for pkg in packages] for pkg_stats in stats_list: pkg_stats.CollectStats() Modified: csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py 2010-02-16 05:46:13 UTC (rev 8570) +++ csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py 2010-02-16 09:05:51 UTC (rev 8571) @@ -3,6 +3,8 @@ # This is the checkpkg library, common for all checkpkg tests written in # Python. +import copy +import errno import itertools import logging import optparse @@ -12,6 +14,7 @@ import socket import sqlite3 import subprocess +import yaml from Cheetah import Template import opencsw @@ -27,8 +30,8 @@ DUMP_BIN = "/usr/ccs/bin/dump" SYSTEM_SYMLINKS = ( - ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), - ("/64", ["/amd64", "/sparcv9"]), + ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), + ("/64", ["/amd64", "/sparcv9"]), ("/opt/csw/lib/i386", ["/opt/csw/lib"]), ) @@ -36,10 +39,10 @@ # Solaris 8 on i386. It's okay if it's missing. ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) DEPENDENCY_FILENAME_REGEXES = ( - (r".*\.pl", u"CSWperl"), - (r".*\.pm", u"CSWperl"), - (r".*\.py", u"CSWpython"), - (r".*\.rb", u"CSWruby"), + (r".*\.pl$", u"CSWperl"), + (r".*\.pm$", u"CSWperl"), + (r".*\.py$", u"CSWpython"), + (r".*\.rb$", u"CSWruby"), ) REPORT_TMPL = u"""#if $missing_deps or $surplus_deps or $orphan_sonames @@ -76,7 +79,7 @@ #end for #else #if $debug -OK: $name found no problems. +OK: $repr($name) module found no problems. #end if #end if """ @@ -107,16 +110,19 @@ def GetOptions(): parser = optparse.OptionParser() - parser.add_option("-e", dest="extractdir", - help="The directory into which the package has been extracted") + parser.add_option("-b", dest="stats_basedir", + help=("The base directory with package statistics " + "in yaml format")) parser.add_option("-d", "--debug", dest="debug", default=False, action="store_true", help="Turn on debugging messages") parser.add_option("-o", "--output", dest="output", help="Output error tag file") (options, args) = parser.parse_args() - if not options.extractdir: - raise ConfigurationError("ERROR: -e option is missing.") + if not options.stats_basedir: + raise ConfigurationError("ERROR: the -b option is missing.") + if not options.output: + raise ConfigurationError("ERROR: the -o option is missing.") # Using set() to make the arguments unique. return options, set(args) @@ -561,11 +567,11 @@ class CheckpkgManager(object): """Takes care of calling checking functions""" - def __init__(self, name, extractdir, pkgname_list, debug=False): + def __init__(self, name, stats_basedir, md5sum_list, debug=False): self.debug = debug self.name = name - self.extractdir = extractdir - self.pkgname_list = pkgname_list + self.md5sum_list = md5sum_list + self.stats_basedir = stats_basedir self.errors = [] self.individual_checks = [] self.set_checks = [] @@ -577,23 +583,24 @@ def RegisterSetCheck(self, function): self.set_checks.append(function) - def GetDirectoryFormatPackages(self): - packages = [] - for pkgname in self.pkgname_list: - pkg_path = os.path.join(self.extractdir, pkgname) - packages.append(opencsw.DirectoryFormatPackage(pkg_path)) - return packages + def GetPackageStatsList(self): + stats_list = [] + for md5sum in self.md5sum_list: + stats_list.append(PackageStats(None, self.stats_basedir, md5sum)) + return stats_list - def GetAllTags(self, packages): + def GetAllTags(self, packages_data): errors = {} - for pkg in packages: + for pkg_data in packages_data: for function in self.individual_checks: - errors_for_pkg = function(pkg, debug=self.debug) + all_stats = pkg_data.GetAllStats() + errors_for_pkg = function(all_stats, debug=self.debug) if errors_for_pkg: - errors[pkg.pkgname] = errors_for_pkg + errors[all_stats["basic_stats"]["pkgname"]] = errors_for_pkg # Set checks for function in self.set_checks: - set_errors = function(packages, debug=self.debug) + set_errors = function([x.GetAllStats() for x in packages_data], + debug=self.debug) if set_errors: # These were generated by a set, but are likely to be bound to specific # packages. We'll try to preserve the package assignments. @@ -625,8 +632,8 @@ Returns a tuple of an exit code and a report. """ - packages = self.GetDirectoryFormatPackages() - errors = self.GetAllTags(packages) + packages_data = self.GetPackageStatsList() + errors = self.GetAllTags(packages_data) screen_report, tags_report = self.FormatReports(errors) exit_code = 0 return (exit_code, screen_report, tags_report) @@ -726,3 +733,201 @@ logging.error("Calling isalist has failed.") isalist = re.split(r"\s+", stdout.strip()) return isalist + + +class PackageStats(object): + """Collects stats about a package and saves it.""" + STATS_VERSION = 1L + # This list needs to be synchronized with the CollectStats() method. + STAT_FILES = [ + "all_filenames", + "basic_stats", + "binaries", + "binaries_dump_info", + "depends", + "isalist", + "ldd_dash_r", + "overrides", + "pkginfo", + "pkgmap", + ] + + def __init__(self, srv4_pkg, stats_basedir=None, md5sum=None): + self.srv4_pkg = srv4_pkg + self.md5sum = md5sum + self.dir_format_pkg = None + self.stats_path = None + self.all_stats = {} + self.stats_basedir = stats_basedir + if not self.stats_basedir: + home = os.environ["HOME"] + parts = [home, ".checkpkg", "stats"] + self.stats_basedir = os.path.join(*parts) + + def GetMd5sum(self): + if not self.md5sum: + self.md5sum = self.srv4_pkg.GetMd5sum() + return self.md5sum + + def GetStatsPath(self): + if not self.stats_path: + md5sum = self.GetMd5sum() + two_chars = md5sum[0:2] + parts = [self.stats_basedir, two_chars, md5sum] + self.stats_path = os.path.join(*parts) + return self.stats_path + + def StatsExist(self): + """Checks if statistics of a package exist. + + Returns: + bool + """ + if not self.StatsDirExists(): + return False + # More checks can be added in the future. + return True + + def StatsDirExists(self): + return os.path.isdir(self.GetStatsPath()) + + def GetDirFormatPkg(self): + if not self.dir_format_pkg: + self.dir_format_pkg = self.srv4_pkg.GetDirFormatPkg() + return self.dir_format_pkg + + def MakeStatsDir(self): + """mkdir -p equivalent. + + http://stackoverflow.com/questions/600268/mkdir-p-functionality-in-python + """ + stats_path = self.GetStatsPath() + try: + os.makedirs(stats_path) + except OSError, e: + if e.errno == errno.EEXIST: + pass + else: + raise + + def GetBinaryDumpInfo(self): + dir_pkg = self.GetDirFormatPkg() + # Binaries. This could be split off to a separate function. + # man ld.so.1 for more info on this hack + env = copy.copy(os.environ) + env["LD_NOAUXFLTR"] = "1" + binaries_dump_info = [] + for binary in dir_pkg.ListBinaries(): + binary_abs_path = os.path.join(dir_pkg.directory, "root", binary) + binary_base_name = os.path.basename(binary) + args = [DUMP_BIN, "-Lv", binary_abs_path] + dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) + stdout, stderr = dump_proc.communicate() + ret = dump_proc.wait() + binary_data = ParseDumpOutput(stdout) + binary_data["path"] = binary + binary_data["soname_guessed"] = False + binary_data["base_name"] = binary_base_name + if SONAME not in binary_data: + logging.debug("The %s binary doesn't provide a SONAME. " + "(It might be an executable)", + binary_base_name) + # The binary doesn't tell its SONAME. We're guessing it's the + # same as the base file name. + binary_data[SONAME] = binary_base_name + binary_data["soname_guessed"] = True + binaries_dump_info.append(binary_data) + return binaries_dump_info + + def GetBasicStats(self): + dir_pkg = self.GetDirFormatPkg() + basic_stats = {} + basic_stats["stats_version"] = self.STATS_VERSION + basic_stats["pkg_path"] = self.srv4_pkg.pkg_path + basic_stats["pkg_basename"] = os.path.basename(self.srv4_pkg.pkg_path) + basic_stats["parsed_basename"] = opencsw.ParsePackageFileName(basic_stats["pkg_basename"]) + basic_stats["pkgname"] = dir_pkg.pkgname + basic_stats["catalogname"] = dir_pkg.GetCatalogname() + return basic_stats + + def GetOverrides(self): + dir_pkg = self.GetDirFormatPkg() + overrides = dir_pkg.GetOverrides() + def OverrideToDict(override): + d = {} + d["pkgname"] = override.pkgname + d["tag_name"] = override.tag_name + d["tag_info"] = override.tag_info + return d + overrides_simple = [OverrideToDict(x) for x in overrides] + return overrides_simple + + def GetLddMinusRlines(self): + """Returns ldd -r output.""" + dir_pkg = self.GetDirFormatPkg() + binaries = dir_pkg.ListBinaries() + ldd_output = {} + for binary in binaries: + binary_abspath = os.path.join(dir_pkg.directory, "root", binary) + # this could be potentially moved into the DirectoryFormatPackage class. + # ldd needs the binary to be executable + os.chmod(binary_abspath, 0755) + args = ["ldd", "-r", binary_abspath] + ldd_proc = subprocess.Popen( + args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = ldd_proc.communicate() + retcode = ldd_proc.wait() + if retcode: + logging.error("%s returned an error: %s", args, stderr) + lines = stdout.splitlines() + ldd_output[binary] = lines + return ldd_output + + + def CollectStats(self): + stats_path = self.GetStatsPath() + self.MakeStatsDir() + dir_pkg = self.GetDirFormatPkg() + self.DumpObject(dir_pkg.GetAllFilenames(), "all_filenames") + self.DumpObject(self.GetBasicStats(), "basic_stats") + self.DumpObject(dir_pkg.ListBinaries(), "binaries") + self.DumpObject(self.GetBinaryDumpInfo(), "binaries_dump_info") + self.DumpObject(dir_pkg.GetDependencies(), "depends") + self.DumpObject(GetIsalist(), "isalist") + self.DumpObject(self.GetOverrides(), "overrides") + self.DumpObject(dir_pkg.GetParsedPkginfo(), "pkginfo") + self.DumpObject(dir_pkg.GetPkgmap().entries, "pkgmap") + self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") + + def DumpObject(self, obj, name): + stats_path = self.GetStatsPath() + out_file_name = os.path.join(stats_path, "%s.yml" % name) + logging.debug("DumpObject(): writing %s", repr(out_file_name)) + f = open(out_file_name, "w") + f.write(yaml.safe_dump(obj)) + f.close() + self.all_stats[name] = obj + + def GetAllStats(self): + if self.StatsExist(): + self.all_stats = self.ReadSavedStats() + else: + self.CollectStats() + return self.all_stats + + def ReadObject(self, name): + stats_path = self.GetStatsPath() + in_file_name = os.path.join(stats_path, "%s.yml" % name) + logging.debug("ReadObject(): reading %s", repr(in_file_name)) + f = open(in_file_name, "r") + obj = yaml.safe_load(f) + f.close() + return obj + + def ReadSavedStats(self): + all_stats = {} + for name in self.STAT_FILES: + all_stats[name] = self.ReadObject(name) + return all_stats Modified: csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py 2010-02-16 05:46:13 UTC (rev 8570) +++ csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py 2010-02-16 09:05:51 UTC (rev 8571) @@ -568,10 +568,14 @@ class DirectoryFormatPackage(ShellMixin, object): + """Represents a package in the directory format. + Allows some read-write operations. + """ + def __init__(self, directory): self.directory = directory - self.pkgname = os.path.split(directory)[1] + self.pkgname = os.path.basename(directory) self.pkgpath = self.directory self.pkginfo_dict = None self.binaries = None 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 Feb 16 10:26:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 09:26:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8572] csw/mgar/pkg/libidn/trunk Message-ID: Revision: 8572 http://gar.svn.sourceforge.net/gar/?rev=8572&view=rev Author: dmichelsen Date: 2010-02-16 09:26:33 +0000 (Tue, 16 Feb 2010) Log Message: ----------- libidn: Update to 1.18 Modified Paths: -------------- csw/mgar/pkg/libidn/trunk/Makefile csw/mgar/pkg/libidn/trunk/checksums Modified: csw/mgar/pkg/libidn/trunk/Makefile =================================================================== --- csw/mgar/pkg/libidn/trunk/Makefile 2010-02-16 09:05:51 UTC (rev 8571) +++ csw/mgar/pkg/libidn/trunk/Makefile 2010-02-16 09:26:33 UTC (rev 8572) @@ -1,5 +1,5 @@ GARNAME = libidn -GARVERSION = 1.16 +GARVERSION = 1.18 CATEGORIES = lib DESCRIPTION = GNU IDN Library Modified: csw/mgar/pkg/libidn/trunk/checksums =================================================================== --- csw/mgar/pkg/libidn/trunk/checksums 2010-02-16 09:05:51 UTC (rev 8571) +++ csw/mgar/pkg/libidn/trunk/checksums 2010-02-16 09:26:33 UTC (rev 8572) @@ -1 +1 @@ -a6af62602fa71bc1b90ce246dd208bd6 libidn-1.16.tar.gz +66f115347439f56386f37a3ad92c1da2 libidn-1.18.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 Feb 16 10:56:04 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 09:56:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[8573] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 8573 http://gar.svn.sourceforge.net/gar/?rev=8573&view=rev Author: dmichelsen Date: 2010-02-16 09:56:04 +0000 (Tue, 16 Feb 2010) Log Message: ----------- curl: Add dependency for libssh2 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2010-02-16 09:26:33 UTC (rev 8572) +++ csw/mgar/pkg/curl/trunk/Makefile 2010-02-16 09:56:04 UTC (rev 8573) @@ -50,12 +50,12 @@ # We are doing 64 bit only for the libs NOISAEXEC = 1 -RUNTIME_DEP_PKGS_CSWcurl = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl CSWcurlrt CSWlibcares -RUNTIME_DEP_PKGS_CSWcurlrt = CSWlibidn CSWoldaprt CSWosslrt CSWzlib CSWlibcares +RUNTIME_DEP_PKGS_CSWcurl = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl CSWcurlrt CSWlibcares CSWlibssh2 +RUNTIME_DEP_PKGS_CSWcurlrt = CSWlibidn CSWoldaprt CSWosslrt CSWzlib CSWlibcares CSWlibssh2 RUNTIME_DEP_PKGS_CSWcurldevel = CSWcurl BUILD_DEP_PKGS = $(filter-out CSWcurl CSWcurlrt,$(RUNTIME_DEP_PKGS_CSWcurl) $(RUNTIME_DEP_PKGS_CSWcurlrt) $(RUNTIME_DEP_PKGS_CSWcurldevel)) -BUILD_DEP_PKGS += CSWoldapdevel CSWossldevel CSWlibcaresdevel +BUILD_DEP_PKGS += CSWoldapdevel CSWossldevel CSWlibcaresdevel CSWlibssh2devel SKIPTEST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Feb 16 11:46:33 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 16 Feb 2010 10:46:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8574] csw/mgar/gar/v2-checkpkg-stats Message-ID: Revision: 8574 http://gar.svn.sourceforge.net/gar/?rev=8574&view=rev Author: wahwah Date: 2010-02-16 10:46:33 +0000 (Tue, 16 Feb 2010) Log Message: ----------- mGAR v2-checkpkg-stats: checkpkg-libs.py seems to be working again! \o/ Modified Paths: -------------- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-actionclasses.py csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-archall.py csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-missing-symbols.py csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-actionclasses.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-actionclasses.py 2010-02-16 09:56:04 UTC (rev 8573) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-actionclasses.py 2010-02-16 10:46:33 UTC (rev 8574) @@ -36,7 +36,7 @@ only_in_pkgmap = pkgmap_classes.difference(pkginfo_classes) for action_class in only_in_pkginfo: error = checkpkg.CheckpkgTag( - pkg.pkgname, + pkg_data["basic_stats"]["pkgname"], "action-class-only-in-pkginfo", action_class, msg="This shouldn't cause any problems, but it might be not necessary.") Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-archall.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-archall.py 2010-02-16 09:56:04 UTC (rev 8573) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-archall.py 2010-02-16 10:46:33 UTC (rev 8574) @@ -24,7 +24,10 @@ arch = pkginfo["ARCH"] if binaries and arch == "all": for binary in binaries: - errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "archall-with-binaries"), binary) + errors.append(checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "archall-with-binaries"), + binary) elif not binaries and arch != "all": # This is not a clean way of handling messages for the user, but there's # not better way at the moment. Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-libs.py 2010-02-16 09:56:04 UTC (rev 8573) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-libs.py 2010-02-16 10:46:33 UTC (rev 8574) @@ -28,60 +28,32 @@ import checkpkg import opencsw -def CheckSharedLibraryConsistency(pkgs, debug): +def CheckSharedLibraryConsistency(pkgs_data, debug): + ws_re = re.compile(r"\s+") result_ok = True errors = [] binaries = [] binaries_by_pkgname = {} sonames_by_pkgname = {} pkg_by_any_filename = {} - def MakeBinPathAbsolute(x): - return os.path.join(checker.directory, "root", x) - for checker in pkgs: - pkg_binary_paths = [MakeBinPathAbsolute(x) for x in checker.ListBinaries()] - binaries_base = [os.path.basename(x) for x in checker.ListBinaries()] - binaries_by_pkgname[checker.pkgname] = binaries_base - binaries.extend(pkg_binary_paths) - for filename in checker.GetAllFilenames(): - pkg_by_any_filename[filename] = checker.pkgname + needed_sonames_by_binary = {} + filenames_by_soname = {} + for pkg_data in pkgs_data: + binaries_base = [os.path.basename(x) for x in pkg_data["binaries"]] + pkgname = pkg_data["basic_stats"]["pkgname"] + binaries_by_pkgname[pkgname] = binaries_base + binaries.extend(pkg_data["binaries"]) + for filename in pkg_data["all_filenames"]: + pkg_by_any_filename[filename] = pkgname + for binary_data in pkg_data["binaries_dump_info"]: + binary_base_name = os.path.basename(binary_data["base_name"]) + needed_sonames_by_binary[binary_base_name] = binary_data + filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name + # Making the binaries unique binaries = set(binaries) - ws_re = re.compile(r"\s+") + isalist = pkg_data["isalist"] - # man ld.so.1 for more info on this hack - env = copy.copy(os.environ) - env["LD_NOAUXFLTR"] = "1" - needed_sonames_by_binary = {} - filenames_by_soname = {} - # Assembling a data structure with the data about binaries. - # { - # : { checkpkg.NEEDED_SONAMES: [...], - # checkpkg.RUNPATH: [...]}, - # : ..., - # ... - # } - # - # This bit to be replaced. - for binary in binaries: - # binary_base_name = binary.split("/")[-1] - binary_base_name = os.path.basename(binary) - args = [checkpkg.DUMP_BIN, "-Lv", binary] - dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) - stdout, stderr = dump_proc.communicate() - ret = dump_proc.wait() - binary_data = checkpkg.ParseDumpOutput(stdout) - needed_sonames_by_binary[binary_base_name] = binary_data - if checkpkg.SONAME not in binary_data: - logging.debug("The %s binary doesn't provide a SONAME. " - "(It might be an executable)", - binary_base_name) - # The shared library doesn't tell its SONAME. We're guessing it's the - # same as the base file name. - binary_data[checkpkg.SONAME] = binary_base_name - filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name - - isalist = checkpkg.GetIsalist() - # Building indexes by soname to simplify further processing # These are indexes "by soname". (needed_sonames, @@ -149,10 +121,9 @@ print dependent_pkgs = {} - for checker in pkgs: - pkgname = checker.pkgname - dir_format_pkg = opencsw.DirectoryFormatPackage(checker.pkgpath) - declared_dependencies = dir_format_pkg.GetDependencies() + for checker in pkgs_data: + pkgname = checker["basic_stats"]["pkgname"] + declared_dependencies = checker["depends"] if debug: sanitized_pkgname = pkgname.replace("-", "_") data_file_name = "/var/tmp/checkpkg_test_data_%s.py" % sanitized_pkgname @@ -182,7 +153,7 @@ filenames_by_soname, pkg_by_any_filename) namespace = { - "pkgname": checker.pkgname, + "pkgname": pkgname, "missing_deps": missing_deps, "surplus_deps": surplus_deps, "orphan_sonames": orphan_sonames, @@ -197,20 +168,22 @@ "orphan-soname", soname)) for missing_dep in missing_deps: - errors.append( - checkpkg.CheckpkgTag( - pkgname, - "missing-dependency", - missing_dep)) + errors.append( + checkpkg.CheckpkgTag( + pkgname, + "missing-dependency", + missing_dep)) return errors def main(): options, args = checkpkg.GetOptions() - pkgnames = args + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.extractdir, - pkgnames, + options.stats_basedir, + md5sums, options.debug) check_manager.RegisterSetCheck(CheckSharedLibraryConsistency) Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-missing-symbols.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-missing-symbols.py 2010-02-16 09:56:04 UTC (rev 8573) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-missing-symbols.py 2010-02-16 10:46:33 UTC (rev 8574) @@ -35,7 +35,9 @@ missing_symbols = True binary_base = os.path.basename(binary) if missing_symbols: - errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "symbol-not-found", binary_base)) + errors.append(checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "symbol-not-found", binary_base)) return errors Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-02-16 09:56:04 UTC (rev 8573) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-02-16 10:46:33 UTC (rev 8574) @@ -45,8 +45,9 @@ if not msg: msg = None errors.append( - checkpkg.CheckpkgTag(pkg.pkgname, "obsolete-dependency", - obsolete_pkg, msg=msg)) + checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "obsolete-dependency", obsolete_pkg, msg=msg)) return errors Modified: csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py 2010-02-16 09:56:04 UTC (rev 8573) +++ csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py 2010-02-16 10:46:33 UTC (rev 8574) @@ -112,7 +112,7 @@ parser = optparse.OptionParser() parser.add_option("-b", dest="stats_basedir", help=("The base directory with package statistics " - "in yaml format")) + "in yaml format, e.g. ~/.checkpkg/stats")) parser.add_option("-d", "--debug", dest="debug", default=False, action="store_true", help="Turn on debugging messages") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Feb 16 12:07:57 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 16 Feb 2010 11:07:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8575] csw/mgar/pkg/cpan/mod_perl/trunk/Makefile Message-ID: Revision: 8575 http://gar.svn.sourceforge.net/gar/?rev=8575&view=rev Author: bensons Date: 2010-02-16 11:07:57 +0000 (Tue, 16 Feb 2010) Log Message: ----------- cpan mod_perl: relocate perl modules to perlcswlib Modified Paths: -------------- csw/mgar/pkg/cpan/mod_perl/trunk/Makefile Modified: csw/mgar/pkg/cpan/mod_perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/mod_perl/trunk/Makefile 2010-02-16 10:46:33 UTC (rev 8574) +++ csw/mgar/pkg/cpan/mod_perl/trunk/Makefile 2010-02-16 11:07:57 UTC (rev 8575) @@ -25,8 +25,8 @@ CONFIGURE_ARGS += PREFIX=$(prefix) CONFIGURE_ARGS += EVERYTHING=1 -PERL_CONFIGURE_ARGS = INSTALLSITEARCH=$(prefix)/apache/lib/perl -PERL_CONFIGURE_ARGS += INSTALLSITEMAN3DIR=$(prefix)/apache/man/man3 +PERL_CONFIGURE_ARGS = INSTALLSITEARCH=$(perlcswlib)/csw +PERL_CONFIGURE_ARGS += INSTALLSITEMAN3DIR=$(mandir)/man3 # PERL_CONFIGURE_ARGS += LIBS=-lpthread INSTALL_SCRIPTS = custom This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Feb 16 12:26:23 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 16 Feb 2010 11:26:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8576] csw/mgar/pkg/cpan/mod_perl/trunk/Makefile Message-ID: Revision: 8576 http://gar.svn.sourceforge.net/gar/?rev=8576&view=rev Author: bensons Date: 2010-02-16 11:26:23 +0000 (Tue, 16 Feb 2010) Log Message: ----------- cpan mod_perl: fixed perl module install path Modified Paths: -------------- csw/mgar/pkg/cpan/mod_perl/trunk/Makefile Modified: csw/mgar/pkg/cpan/mod_perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/mod_perl/trunk/Makefile 2010-02-16 11:07:57 UTC (rev 8575) +++ csw/mgar/pkg/cpan/mod_perl/trunk/Makefile 2010-02-16 11:26:23 UTC (rev 8576) @@ -25,7 +25,7 @@ CONFIGURE_ARGS += PREFIX=$(prefix) CONFIGURE_ARGS += EVERYTHING=1 -PERL_CONFIGURE_ARGS = INSTALLSITEARCH=$(perlcswlib)/csw +PERL_CONFIGURE_ARGS = INSTALLSITEARCH=$(perlcswlib) PERL_CONFIGURE_ARGS += INSTALLSITEMAN3DIR=$(mandir)/man3 # PERL_CONFIGURE_ARGS += LIBS=-lpthread This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Feb 16 12:28:45 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 16 Feb 2010 11:28:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8577] csw/mgar/pkg/xpdf/trunk/Makefile Message-ID: Revision: 8577 http://gar.svn.sourceforge.net/gar/?rev=8577&view=rev Author: bensons Date: 2010-02-16 11:28:45 +0000 (Tue, 16 Feb 2010) Log Message: ----------- xpdf: removing xpm dependency Modified Paths: -------------- csw/mgar/pkg/xpdf/trunk/Makefile Modified: csw/mgar/pkg/xpdf/trunk/Makefile =================================================================== --- csw/mgar/pkg/xpdf/trunk/Makefile 2010-02-16 11:26:23 UTC (rev 8576) +++ csw/mgar/pkg/xpdf/trunk/Makefile 2010-02-16 11:28:45 UTC (rev 8577) @@ -20,13 +20,9 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # we require -RUNTIME_DEP_PKGS = CSWftype2 CSWt1lib CSWxpm CSWgsfonts +RUNTIME_DEP_PKGS = CSWftype2 CSWt1lib CSWgsfonts CONFIGURE_ARGS = $(DIRPATHS) -#CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include -#CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib -#CONFIGURE_ARGS += --with-Xpm-library=$(libdir) -#CONFIGURE_ARGS += --with-Xpm-includes=$(includedir) CONFIGURE_ARGS += --with-t1-library=$(libdir) CONFIGURE_ARGS += --with-t1-includes=$(includedir) CONFIGURE_ARGS += --with-freetype2-library=$(libdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Feb 16 12:50:58 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 16 Feb 2010 11:50:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8578] csw/mgar/pkg/cpan Message-ID: Revision: 8578 http://gar.svn.sourceforge.net/gar/?rev=8578&view=rev Author: bensons Date: 2010-02-16 11:50:57 +0000 (Tue, 16 Feb 2010) Log Message: ----------- cpan libapreq: initial GAR submit Added Paths: ----------- csw/mgar/pkg/cpan/libapreq/ csw/mgar/pkg/cpan/libapreq/branches/ csw/mgar/pkg/cpan/libapreq/tags/ csw/mgar/pkg/cpan/libapreq/trunk/ csw/mgar/pkg/cpan/libapreq/trunk/Makefile csw/mgar/pkg/cpan/libapreq/trunk/checksums csw/mgar/pkg/cpan/libapreq/trunk/files/ Property changes on: csw/mgar/pkg/cpan/libapreq/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/libapreq/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/libapreq/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/libapreq/trunk/Makefile 2010-02-16 11:50:57 UTC (rev 8578) @@ -0,0 +1,23 @@ +GARNAME = libapreq +GARVERSION = 1.34 +CATEGORIES = cpan +AUTHOR = ISAAC + +DESCRIPTION = Apache Request C Library +define BLURB + Apache::Request is a subclass of the Apache class, which adds methods for + parsing GET requests and POST requests where Content-type is one of + application/x-www-form-urlencoded or multipart/form-data. See the libapreq(3) + manpage for more details. +endef + +PACKAGES = CSWpmapachereq +CATALOGNAME = pm_apachereq + +RUNTIME_DEP_PKGS = CSWpmapachetst CSWmodperl +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) + +CONFIGURE_ARGS = -httpd /opt/csw/apache/bin/httpd +CONFIGURE_ARGS += -apxs /opt/csw/apache/bin/apxs + +include gar/category.mk Added: csw/mgar/pkg/cpan/libapreq/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/libapreq/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/libapreq/trunk/checksums 2010-02-16 11:50:57 UTC (rev 8578) @@ -0,0 +1 @@ +2bee94cf9f36fb156b794bd469fcc550 libapreq-1.34.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 Feb 16 14:20:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 13:20:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8579] csw/mgar/pkg Message-ID: Revision: 8579 http://gar.svn.sourceforge.net/gar/?rev=8579&view=rev Author: dmichelsen Date: 2010-02-16 13:20:17 +0000 (Tue, 16 Feb 2010) Log Message: ----------- fbopenssl: Initial commit Added Paths: ----------- csw/mgar/pkg/fbopenssl/ csw/mgar/pkg/fbopenssl/branches/ csw/mgar/pkg/fbopenssl/tags/ csw/mgar/pkg/fbopenssl/trunk/ csw/mgar/pkg/fbopenssl/trunk/Makefile csw/mgar/pkg/fbopenssl/trunk/checksums csw/mgar/pkg/fbopenssl/trunk/files/ csw/mgar/pkg/fbopenssl/trunk/files/COPYING Property changes on: csw/mgar/pkg/fbopenssl/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/fbopenssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/fbopenssl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/fbopenssl/trunk/Makefile 2010-02-16 13:20:17 UTC (rev 8579) @@ -0,0 +1,59 @@ +GARNAME = fbopenssl +GARVERSION = 0.0.4 +CATEGORIES = lib + +DESCRIPTION = SPNEGO API +define BLURB +endef + +SF_PROJ = modgssapache +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += COPYING + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://sourceforge.net/projects/modgssapache + +BUILD_DEP_PKGS = CSWossldevel +RUNTIME_DEP_PKGS = CSWosslrt + +BUILD64 = 1 +WORKSRC = $(WORKDIR)/$(GARNAME) +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 + +.c.o: + $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $< + +include gar/category.mk + +# The Makefile is hardcoded to gcc. Patching it is more complicated than +# 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 + @$(MAKECOOKIE) + +test-custom: + # makespnego + (cd $(WORKSRC)/test/makespnego; $(BUILD_ENV) $(CC) $(CPPFLAGS) $(CFLAGS) makespnego.c -L../.. -R../.. -lfbopenssl $(LDFLAGS) -lcrypto -o makespnego) + (cd $(WORKSRC)/test/parsespnego; $(BUILD_ENV) $(CC) $(CPPFLAGS) $(CFLAGS) parsespnego.c -L../.. -R../.. -lfbopenssl $(LDFLAGS) -lcrypto -o parsespnego) + ginstall -d $(WORKSRC)/test/temp + -(cd $(WORKSRC)/test/makespnego; ./makespnego init 1.2.840.113554.1.2.2 ../tokens/kerberos-req.der ../temp/spnego-req.der) + -(cd $(WORKSRC)/test/makespnego; ./makespnego targ 0 1.2.840.113554.1.2.2 ../tokens/kerberos-rep.der ../temp/spnego-rep.der) + -(cd $(WORKSRC)/test/parsespnego; ./parsespnego init ../tokens/spnego-req.der 1.2.840.113554.1.2.2 ../temp/kerberos-req.der) + -(cd $(WORKSRC)/test/parsespnego; ./parsespnego targ ../tokens/spnego-rep.der ../temp/kerberos-rep.der) + @$(MAKECOOKIE) + +install-custom: + ginstall -d $(DESTDIR)$(libdir) + ginstall $(WORKSRC)/libfbopenssl.so $(DESTDIR)$(libdir) + ginstall -d $(DESTDIR)$(docdir)/$(CATALOGNAME) + ginstall $(WORKSRC)/readme.txt $(DESTDIR)$(docdir)/$(CATALOGNAME)/ Added: csw/mgar/pkg/fbopenssl/trunk/checksums =================================================================== --- csw/mgar/pkg/fbopenssl/trunk/checksums (rev 0) +++ csw/mgar/pkg/fbopenssl/trunk/checksums 2010-02-16 13:20:17 UTC (rev 8579) @@ -0,0 +1,2 @@ +6a7dea6e15407a7cc85cdbdaf2c5deb5 COPYING +9f1bea431c537c299f5ce827932275b4 fbopenssl-0.0.4.tar.gz Added: csw/mgar/pkg/fbopenssl/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/fbopenssl/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/fbopenssl/trunk/files/COPYING 2010-02-16 13:20:17 UTC (rev 8579) @@ -0,0 +1,2 @@ +GNU General Public License (GPL) +(From the SourceForge Page) 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 Feb 16 14:26:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 13:26:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8580] csw/mgar/pkg/fbopenssl/trunk/Makefile Message-ID: Revision: 8580 http://gar.svn.sourceforge.net/gar/?rev=8580&view=rev Author: dmichelsen Date: 2010-02-16 13:26:48 +0000 (Tue, 16 Feb 2010) Log Message: ----------- fbopenssl: Adjust package name Modified Paths: -------------- csw/mgar/pkg/fbopenssl/trunk/Makefile Modified: csw/mgar/pkg/fbopenssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/fbopenssl/trunk/Makefile 2010-02-16 13:20:17 UTC (rev 8579) +++ csw/mgar/pkg/fbopenssl/trunk/Makefile 2010-02-16 13:26:48 UTC (rev 8580) @@ -4,6 +4,9 @@ DESCRIPTION = SPNEGO API define BLURB + fbopenssl is a library containing extensions to OpenSSL, including support for: + - GSS-API (RFC 2743) + - SPNEGO (RFC 2478) endef SF_PROJ = modgssapache @@ -19,6 +22,9 @@ BUILD_DEP_PKGS = CSWossldevel RUNTIME_DEP_PKGS = CSWosslrt +PACKAGES = CSWlibfbopenssl +CATALOGNAME = libfbopenssl + BUILD64 = 1 WORKSRC = $(WORKDIR)/$(GARNAME) CONFIGURE_SCRIPTS = 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 Feb 16 14:31:20 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 13:31:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8581] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 8581 http://gar.svn.sourceforge.net/gar/?rev=8581&view=rev Author: dmichelsen Date: 2010-02-16 13:31:20 +0000 (Tue, 16 Feb 2010) Log Message: ----------- curl: Add CA and SPNEGO support Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2010-02-16 13:26:48 UTC (rev 8580) +++ csw/mgar/pkg/curl/trunk/Makefile 2010-02-16 13:31:20 UTC (rev 8581) @@ -41,8 +41,10 @@ EXTRA_CONFIGURE_ARGS_isa-amd64 = --disable-ldap CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-ssl +CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl CONFIGURE_ARGS += --enable-ares +CONFIGURE_ARGS += --with-spnego=$(libdir) +CONFIGURE_ARGS += --with-ca-path=/opt/csw/ssl/certs CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_isa-$(ISA)) BUILD64 = 1 @@ -51,7 +53,7 @@ NOISAEXEC = 1 RUNTIME_DEP_PKGS_CSWcurl = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl CSWcurlrt CSWlibcares CSWlibssh2 -RUNTIME_DEP_PKGS_CSWcurlrt = CSWlibidn CSWoldaprt CSWosslrt CSWzlib CSWlibcares CSWlibssh2 +RUNTIME_DEP_PKGS_CSWcurlrt = CSWlibidn CSWoldaprt CSWosslrt CSWzlib CSWlibcares CSWlibssh2 CSWlibfbopenssl RUNTIME_DEP_PKGS_CSWcurldevel = CSWcurl BUILD_DEP_PKGS = $(filter-out CSWcurl CSWcurlrt,$(RUNTIME_DEP_PKGS_CSWcurl) $(RUNTIME_DEP_PKGS_CSWcurlrt) $(RUNTIME_DEP_PKGS_CSWcurldevel)) 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 Feb 16 14:53:13 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 13:53:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8582] csw/mgar/pkg/oracle-instantclient/trunk Message-ID: Revision: 8582 http://gar.svn.sourceforge.net/gar/?rev=8582&view=rev Author: dmichelsen Date: 2010-02-16 13:53:13 +0000 (Tue, 16 Feb 2010) Log Message: ----------- oracle-instantclient: Add sqlplus Modified Paths: -------------- csw/mgar/pkg/oracle-instantclient/trunk/Makefile csw/mgar/pkg/oracle-instantclient/trunk/checksums Modified: csw/mgar/pkg/oracle-instantclient/trunk/Makefile =================================================================== --- csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-02-16 13:31:20 UTC (rev 8581) +++ csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-02-16 13:53:13 UTC (rev 8582) @@ -11,16 +11,20 @@ MASTER_SITES = manual:// DISTFILES_sparc-32-instantclient = basic-10.2.0.4.0-solaris-sparc32.zip -DISTFILES_sparc-32-sdk = sdk-10.2.0.4.0-solaris-sparc32.zip +DISTFILES_sparc-32-sdk = sdk-10.2.0.4.0-solaris-sparc32.zip +DISTFILES_sparc-32-sqlplus = sqlplus-10.2.0.4.0-solaris-sparc32.zip DISTFILES_sparc-64-instantclient = basic-10.2.0.4.0-solaris-sparc64.zip -DISTFILES_sparc-64-sdk = sdk-10.2.0.4.0-solaris-sparc64.zip -DISTFILES_i386-32-instantclient = instantclient-basic-solaris-x86-6432-10.2.0.2-20060526.zip -DISTFILES_i386-32-sdk = instantclient-sdk-solaris-x86-6432-10.2.0.2-20060526.zip -DISTFILES_i386-64-instantclient = instantclient-basic-solaris-x86-64-10.2.0.2-2006-05-26.zip -DISTFILES_i386-64-sdk = instantclient-sdk-solaris-x86-64-10.2.0.2-2006-05-26.zip +DISTFILES_sparc-64-sdk = sdk-10.2.0.4.0-solaris-sparc64.zip +DISTFILES_sparc-64-sqlplus = sqlplus-10.2.0.4.0-solaris-sparc64.zip +DISTFILES_i386-32-instantclient = instantclient-basic-solaris-x86-6432-10.2.0.2-20060526.zip +DISTFILES_i386-32-sdk = instantclient-sdk-solaris-x86-6432-10.2.0.2-20060526.zip +DISTFILES_i386-32-sqlplus = sqlplus-10.2.0.4.0-solaris-x86.zip +DISTFILES_i386-64-instantclient = instantclient-basic-solaris-x86-64-10.2.0.2-2006-05-26.zip +DISTFILES_i386-64-sdk = instantclient-sdk-solaris-x86-64-10.2.0.2-2006-05-26.zip +DISTFILES_i386-64-sqlplus = sqlplus-10.2.0.4.0-solaris-x86-64.zip -DISTFILES = $(foreach A,sparc i386,$(foreach S,32 64,$(foreach T,instantclient sdk,$(DISTFILES_$A-$S-$T)))) -NOEXTRACT = $(filter-out $(foreach S,32 64,$(foreach T,instantclient sdk,$(DISTFILES_$(GARCH)-$S-$T))),$(DISTFILES)) +DISTFILES = $(foreach A,sparc i386,$(foreach S,32 64,$(foreach T,instantclient sdk sqlplus,$(DISTFILES_$A-$S-$T)))) +NOEXTRACT = $(filter-out $(foreach S,32 64,$(foreach T,instantclient sdk sqlplus,$(DISTFILES_$(GARCH)-$S-$T))),$(DISTFILES)) BUILD_DEP_PKGS = CSWchrpath @@ -65,7 +69,7 @@ include gar/category.mk -$(foreach A,sparc i386,$(foreach S,32 64,$(foreach T,instantclient sdk,$(foreach F,$(DISTFILES_$A-$S-$T),$(eval $(call custom-zip-extract,$F,$A-$S)))))) +$(foreach A,sparc i386,$(foreach S,32 64,$(foreach T,instantclient sdk sqlplus,$(foreach F,$(DISTFILES_$A-$S-$T),$(eval $(call custom-zip-extract,$F,$A-$S)))))) install-custom: @echo " ==> Installing $(GARNAME)" Modified: csw/mgar/pkg/oracle-instantclient/trunk/checksums =================================================================== --- csw/mgar/pkg/oracle-instantclient/trunk/checksums 2010-02-16 13:31:20 UTC (rev 8581) +++ csw/mgar/pkg/oracle-instantclient/trunk/checksums 2010-02-16 13:53:13 UTC (rev 8582) @@ -6,3 +6,7 @@ 6f2fbc94d1125c0dc9abb730abb2c961 instantclient-sdk-solaris-x86-6432-10.2.0.2-20060526.zip 14bce0a857876f3414c55d0e298ce2dc sdk-10.2.0.4.0-solaris-sparc32.zip c76102374ee8c6e27caa334194e3065a sdk-10.2.0.4.0-solaris-sparc64.zip +d246fc3670f46e83d366a0ce3e23db23 sqlplus-10.2.0.4.0-solaris-sparc32.zip +d0650cc7d31de959e03069560facc61a sqlplus-10.2.0.4.0-solaris-sparc64.zip +bee93898707c957a5e1a1c86eabd980b sqlplus-10.2.0.4.0-solaris-x86-64.zip +afeca5286d9fed00dbd6ba5a09472bb1 sqlplus-10.2.0.4.0-solaris-x86.zip 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 Feb 16 15:13:21 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 14:13:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8583] csw/mgar/pkg/cpan Message-ID: Revision: 8583 http://gar.svn.sourceforge.net/gar/?rev=8583&view=rev Author: dmichelsen Date: 2010-02-16 14:13:17 +0000 (Tue, 16 Feb 2010) Log Message: ----------- cpan/Text-Format: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Text-Format/ csw/mgar/pkg/cpan/Text-Format/branches/ csw/mgar/pkg/cpan/Text-Format/tags/ csw/mgar/pkg/cpan/Text-Format/trunk/ csw/mgar/pkg/cpan/Text-Format/trunk/Makefile csw/mgar/pkg/cpan/Text-Format/trunk/checksums csw/mgar/pkg/cpan/Text-Format/trunk/files/ csw/mgar/pkg/cpan/Text-Format/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Text-Format/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Text-Format/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-Format/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Text-Format/trunk/Makefile 2010-02-16 14:13:17 UTC (rev 8583) @@ -0,0 +1,19 @@ +GARNAME = Text-Format +GARVERSION = 0.52 +CATEGORIES = cpan +AUTHOR = GABOR + +DESCRIPTION = Various subroutines to format text +define BLURB +endef + +DISTFILES = COPYING +DISTNAME = $(GARNAME)$(GARVERSION) +MODDIST = $(DISTNAME).tar.gz + +PACKAGES = CSWpmtextformat +CATALOGNAME = pm_textformat + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Text-Format/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-Format/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Text-Format/trunk/checksums 2010-02-16 14:13:17 UTC (rev 8583) @@ -0,0 +1,2 @@ +9b09847194374292f0139e61176f7057 COPYING +9b1936e65ee05d904bb329e32259814f Text-Format0.52.tar.gz Added: csw/mgar/pkg/cpan/Text-Format/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Text-Format/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Text-Format/trunk/files/COPYING 2010-02-16 14:13:17 UTC (rev 8583) @@ -0,0 +1,4 @@ +Copyright (c) 1998 Gabor Egressy . +All rights reserved. All wrongs reversed. This program is free +software; you can redistribute and/or modify it under the same terms as +Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Feb 16 15:25:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 14:25:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[8584] csw/mgar/pkg/cpan/HTML-Tagset/trunk Message-ID: Revision: 8584 http://gar.svn.sourceforge.net/gar/?rev=8584&view=rev Author: dmichelsen Date: 2010-02-16 14:25:24 +0000 (Tue, 16 Feb 2010) Log Message: ----------- cpan/HTML-Tagset: Update to 3.20 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile csw/mgar/pkg/cpan/HTML-Tagset/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/HTML-Tagset/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/HTML-Tagset/trunk/files/CSWpmhtmltagset.depend csw/mgar/pkg/cpan/HTML-Tagset/trunk/files/CSWpmhtmltagset.gspec csw/mgar/pkg/cpan/HTML-Tagset/trunk/files/CSWpmhtmltagset.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/HTML-Tagset/trunk/ Property changes on: csw/mgar/pkg/cpan/HTML-Tagset/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile 2010-02-16 14:13:17 UTC (rev 8583) +++ csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile 2010-02-16 14:25:24 UTC (rev 8584) @@ -1,16 +1,21 @@ GARNAME = HTML-Tagset -GARVERSION = 3.04 +GARVERSION = 3.20 CATEGORIES = cpan -AUTHOR = SBURKE +AUTHOR = PETDANCE -DESCRIPTION = data tables useful in parsing HTML +DESCRIPTION = Data tables useful in parsing HTML define BLURB This module contains several data tables useful in various kinds of HTML parsing operations. endef -DISTFILES = $(call admfiles,CSWpmhtmltagset,depend prototype) +DISTFILES = COPYING -CONFIGURE_ARGS = -n +PACKAGES = CSWpmhtmltagset +CATALOGNAME = pm_htmltagset +# CONFIGURE_ARGS = -n + +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/HTML-Tagset/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/HTML-Tagset/trunk/checksums 2010-02-16 14:13:17 UTC (rev 8583) +++ csw/mgar/pkg/cpan/HTML-Tagset/trunk/checksums 2010-02-16 14:25:24 UTC (rev 8584) @@ -1,4 +1,2 @@ -8e29433fa01d5542f354f844406aa24f download/CSWpmhtmltagset.gspec -6e0d583c86d7f74b43769810714242aa download/CSWpmhtmltagset.depend -f45d8614ce02299777a97087bb48d073 download/CSWpmhtmltagset.prototype -b82e0f08c1ececefe98b891f30dd56a6 download/HTML-Tagset-3.04.tar.gz +aa91eed6adfe182d2af676954f06a7c9 COPYING +d2bfa18fe1904df7f683e96611e87437 HTML-Tagset-3.20.tar.gz Copied: csw/mgar/pkg/cpan/HTML-Tagset/trunk/files/COPYING (from rev 8558, csw/mgar/pkg/cpan/HTML-Tagset/trunk/files/CSWpmhtmltagset.gspec) =================================================================== --- csw/mgar/pkg/cpan/HTML-Tagset/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/HTML-Tagset/trunk/files/COPYING 2010-02-16 14:25:24 UTC (rev 8584) @@ -0,0 +1,5 @@ +Copyright 1999,2000 Sean M. Burke ; Copyright +1995-2000 Gisle Aas; all rights reserved. + +This library is free software; you can redistribute it and/or +modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/HTML-Tagset/trunk/files/CSWpmhtmltagset.depend =================================================================== Deleted: csw/mgar/pkg/cpan/HTML-Tagset/trunk/files/CSWpmhtmltagset.gspec =================================================================== --- csw/mgar/pkg/cpan/HTML-Tagset/trunk/files/CSWpmhtmltagset.gspec 2010-02-16 14:13:17 UTC (rev 8583) +++ csw/mgar/pkg/cpan/HTML-Tagset/trunk/files/CSWpmhtmltagset.gspec 2010-02-16 14:25:24 UTC (rev 8584) @@ -1,10 +0,0 @@ -%var bitname pm_htmltagset -%var pkgname CSWpmhtmltagset -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 1999,2000 Sean M. Burke ; Copyright -1995-2000 Gisle Aas; all rights reserved. - -This library is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/HTML-Tagset/trunk/files/CSWpmhtmltagset.prototype =================================================================== --- csw/mgar/pkg/cpan/HTML-Tagset/trunk/files/CSWpmhtmltagset.prototype 2010-02-16 14:13:17 UTC (rev 8583) +++ csw/mgar/pkg/cpan/HTML-Tagset/trunk/files/CSWpmhtmltagset.prototype 2010-02-16 14:25:24 UTC (rev 8584) @@ -1,15 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/HTML 0755 root bin -d none /opt/csw/lib/perl/csw/auto/HTML/Tagset 0755 root bin -f none /opt/csw/lib/perl/csw/auto/HTML/Tagset/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/HTML::Tagset.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/HTML 0755 root bin -f none /opt/csw/share/perl/csw/HTML/Tagset.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Feb 16 15:26:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 14:26:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8585] csw/mgar/pkg/cpan/HTML-Tree/trunk Message-ID: Revision: 8585 http://gar.svn.sourceforge.net/gar/?rev=8585&view=rev Author: dmichelsen Date: 2010-02-16 14:26:50 +0000 (Tue, 16 Feb 2010) Log Message: ----------- cpan/HTML-Tree: Update to 3.23 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/HTML-Tree/trunk/Makefile csw/mgar/pkg/cpan/HTML-Tree/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/HTML-Tree/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/HTML-Tree/trunk/files/CSWpmhtmltree.depend csw/mgar/pkg/cpan/HTML-Tree/trunk/files/CSWpmhtmltree.gspec csw/mgar/pkg/cpan/HTML-Tree/trunk/files/CSWpmhtmltree.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/HTML-Tree/trunk/ Property changes on: csw/mgar/pkg/cpan/HTML-Tree/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/HTML-Tree/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Tree/trunk/Makefile 2010-02-16 14:25:24 UTC (rev 8584) +++ csw/mgar/pkg/cpan/HTML-Tree/trunk/Makefile 2010-02-16 14:26:50 UTC (rev 8585) @@ -1,7 +1,7 @@ GARNAME = HTML-Tree -GARVERSION = 3.18 +GARVERSION = 3.23 CATEGORIES = cpan -AUTHOR = SBURKE +AUTHOR = PETEK DESCRIPTION = modules for making parse trees from HTML source. define BLURB @@ -10,8 +10,13 @@ refer to: HTML::TreeBuilder and HTML::Element. endef -DISTFILES = $(call admfiles,CSWpmhtmltree,depend prototype) +DISTFILES = COPYING -DEPENDS += cpan/HTML-Parser +PACKAGES = CSWpmhtmltree +CATALOGNAME = pm_htmltree +DEP_PKGS = CSWpmhtmlparser CSWpmhtmltagset + +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/HTML-Tree/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/HTML-Tree/trunk/checksums 2010-02-16 14:25:24 UTC (rev 8584) +++ csw/mgar/pkg/cpan/HTML-Tree/trunk/checksums 2010-02-16 14:26:50 UTC (rev 8585) @@ -1,4 +1,2 @@ -2fca210557626eb5cecdd957c43a0412 download/CSWpmhtmltree.gspec -0bf3ff321e09803f0eaf63a1a3104a12 download/CSWpmhtmltree.depend -085a4ea998281be7bfabc029f1b4e2a0 download/CSWpmhtmltree.prototype -6a9e4e565648c9772e7d8ec6d4392497 download/HTML-Tree-3.18.tar.gz +d8d35396eb93dc8329340447517ce8b7 COPYING +6352f50be402301f79b580dd235d7762 HTML-Tree-3.23.tar.gz Copied: csw/mgar/pkg/cpan/HTML-Tree/trunk/files/COPYING (from rev 8558, csw/mgar/pkg/cpan/HTML-Tree/trunk/files/CSWpmhtmltree.gspec) =================================================================== --- csw/mgar/pkg/cpan/HTML-Tree/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/HTML-Tree/trunk/files/COPYING 2010-02-16 14:26:50 UTC (rev 8585) @@ -0,0 +1,15 @@ +Copyright 1995-1998 Gisle Aas; copyright 1999-2002 Sean M. Burke. +(Except the articles contained in HTML::Tree::AboutObjects, +HTML::Tree::AboutTrees, and HTML::Tree::Scanning, which are all +copyright 2000 The Perl Journal.) + +Except for those three TPJ articles, the whole HTML-Tree distribution, +of which this file is a part, is free software; you can redistribute +it and/or modify it under the same terms as Perl itself. + +Those three TPJ articles may be distributed under the same terms as +Perl itself. + +The programs in this library are distributed in the hope that they +will be useful, but without any warranty; without even the implied +warranty of merchantability or fitness for a particular purpose. Deleted: csw/mgar/pkg/cpan/HTML-Tree/trunk/files/CSWpmhtmltree.depend =================================================================== --- csw/mgar/pkg/cpan/HTML-Tree/trunk/files/CSWpmhtmltree.depend 2010-02-16 14:25:24 UTC (rev 8584) +++ csw/mgar/pkg/cpan/HTML-Tree/trunk/files/CSWpmhtmltree.depend 2010-02-16 14:26:50 UTC (rev 8585) @@ -1 +0,0 @@ -P CSWpmhtmlparser pm_htmlparser - HTML parser class Deleted: csw/mgar/pkg/cpan/HTML-Tree/trunk/files/CSWpmhtmltree.gspec =================================================================== --- csw/mgar/pkg/cpan/HTML-Tree/trunk/files/CSWpmhtmltree.gspec 2010-02-16 14:25:24 UTC (rev 8584) +++ csw/mgar/pkg/cpan/HTML-Tree/trunk/files/CSWpmhtmltree.gspec 2010-02-16 14:26:50 UTC (rev 8585) @@ -1,20 +0,0 @@ -%var bitname pm_htmltree -%var pkgname CSWpmhtmltree -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 1995-1998 Gisle Aas; copyright 1999-2002 Sean M. Burke. -(Except the articles contained in HTML::Tree::AboutObjects, -HTML::Tree::AboutTrees, and HTML::Tree::Scanning, which are all -copyright 2000 The Perl Journal.) - -Except for those three TPJ articles, the whole HTML-Tree distribution, -of which this file is a part, is free software; you can redistribute -it and/or modify it under the same terms as Perl itself. - -Those three TPJ articles may be distributed under the same terms as -Perl itself. - -The programs in this library are distributed in the hope that they -will be useful, but without any warranty; without even the implied -warranty of merchantability or fitness for a particular purpose. Deleted: csw/mgar/pkg/cpan/HTML-Tree/trunk/files/CSWpmhtmltree.prototype =================================================================== --- csw/mgar/pkg/cpan/HTML-Tree/trunk/files/CSWpmhtmltree.prototype 2010-02-16 14:25:24 UTC (rev 8584) +++ csw/mgar/pkg/cpan/HTML-Tree/trunk/files/CSWpmhtmltree.prototype 2010-02-16 14:26:50 UTC (rev 8585) @@ -1,33 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/HTML 0755 root bin -d none /opt/csw/lib/perl/csw/auto/HTML-Tree 0755 root bin -f none /opt/csw/lib/perl/csw/auto/HTML-Tree/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/HTML::AsSubs.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTML::Element.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTML::Element::traverse.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTML::Parse.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTML::Tree.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTML::Tree::AboutObjects.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTML::Tree::AboutTrees.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTML::Tree::Scanning.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTML::TreeBuilder.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/HTML 0755 root bin -f none /opt/csw/share/perl/csw/HTML/AsSubs.pm 0444 root bin -d none /opt/csw/share/perl/csw/HTML/Element 0755 root bin -f none /opt/csw/share/perl/csw/HTML/Element.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTML/Element/traverse.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTML/Parse.pm 0444 root bin -d none /opt/csw/share/perl/csw/HTML/Tree 0755 root bin -f none /opt/csw/share/perl/csw/HTML/Tree.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTML/Tree/AboutObjects.pod 0444 root bin -f none /opt/csw/share/perl/csw/HTML/Tree/AboutTrees.pod 0444 root bin -f none /opt/csw/share/perl/csw/HTML/Tree/Scanning.pod 0444 root bin -f none /opt/csw/share/perl/csw/HTML/TreeBuilder.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Feb 16 15:32:14 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 14:32:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8586] csw/mgar/pkg/cpan Message-ID: Revision: 8586 http://gar.svn.sourceforge.net/gar/?rev=8586&view=rev Author: dmichelsen Date: 2010-02-16 14:32:09 +0000 (Tue, 16 Feb 2010) Log Message: ----------- cpan/html2text: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/html2text/ csw/mgar/pkg/cpan/html2text/branches/ csw/mgar/pkg/cpan/html2text/tags/ csw/mgar/pkg/cpan/html2text/trunk/ csw/mgar/pkg/cpan/html2text/trunk/Makefile csw/mgar/pkg/cpan/html2text/trunk/checksums csw/mgar/pkg/cpan/html2text/trunk/files/ Property changes on: csw/mgar/pkg/cpan/html2text/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/html2text/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/html2text/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/html2text/trunk/Makefile 2010-02-16 14:32:09 UTC (rev 8586) @@ -0,0 +1,20 @@ +GARNAME = html2text +GARVERSION = 0.003 +CATEGORIES = cpan +AUTHOR = AWRIGLEY + +DESCRIPTION = Script for generating formatted text from HTML +define BLURB + html2text.pl generates simple formatted text from HTML. It uses + HTML::Element to traverse an HTML tree built by HTML::TreeBuilder, and formats + the output text using Text::Format. It is _very_ simple at the moment. +endef + +PACKAGES = CSWpmhtml2text +CATALOGNAME = pm_html2text + +DEP_PKGS = CSWpmtextformat CSWpmhtmltree + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/html2text/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/html2text/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/html2text/trunk/checksums 2010-02-16 14:32:09 UTC (rev 8586) @@ -0,0 +1 @@ +3597ea1dab4b398296313a8ed6190538 html2text-0.003.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Tue Feb 16 15:46:21 2010 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Tue, 16 Feb 2010 14:46:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8587] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: Revision: 8587 http://gar.svn.sourceforge.net/gar/?rev=8587&view=rev Author: ellson Date: 2010-02-16 14:46:20 +0000 (Tue, 16 Feb 2010) Log Message: ----------- package the ghostscript plugin Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2010-02-16 14:32:09 UTC (rev 8586) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2010-02-16 14:46:20 UTC (rev 8587) @@ -117,11 +117,12 @@ PKGFILES_CSWgraphviz = $(bindir)/(?!(diffimg|dot_static)).* PKGFILES_CSWgraphviz += $(libdir)/lib.*\.so\..* PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_core\.so\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gdk_pixbuf\.so\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gs\.so\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gtk\.so\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_lasi\.so\..* PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_pango\.so\..* PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_rsvg\.so\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_lasi\.so\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gtk\.so\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gdk_pixbuf\.so\..* PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_xlib\.so\..* PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_.*layout\.so\..* PKGFILES_CSWgraphviz += $(sharedstatedir)/graphviz/lefty/.* 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 Feb 16 15:55:23 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 14:55:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8588] csw/mgar/pkg/cpan/html2text/trunk Message-ID: Revision: 8588 http://gar.svn.sourceforge.net/gar/?rev=8588&view=rev Author: dmichelsen Date: 2010-02-16 14:55:23 +0000 (Tue, 16 Feb 2010) Log Message: ----------- cpan/html2text: Add copyright Modified Paths: -------------- csw/mgar/pkg/cpan/html2text/trunk/Makefile csw/mgar/pkg/cpan/html2text/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/html2text/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/html2text/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/html2text/trunk/Makefile 2010-02-16 14:46:20 UTC (rev 8587) +++ csw/mgar/pkg/cpan/html2text/trunk/Makefile 2010-02-16 14:55:23 UTC (rev 8588) @@ -10,6 +10,8 @@ the output text using Text::Format. It is _very_ simple at the moment. endef +DISTFILES = COPYING + PACKAGES = CSWpmhtml2text CATALOGNAME = pm_html2text Modified: csw/mgar/pkg/cpan/html2text/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/html2text/trunk/checksums 2010-02-16 14:46:20 UTC (rev 8587) +++ csw/mgar/pkg/cpan/html2text/trunk/checksums 2010-02-16 14:55:23 UTC (rev 8588) @@ -1 +1,2 @@ +587f7f928150749520de33f0cdc62e6b COPYING 3597ea1dab4b398296313a8ed6190538 html2text-0.003.tar.gz Added: csw/mgar/pkg/cpan/html2text/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/html2text/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/html2text/trunk/files/COPYING 2010-02-16 14:55:23 UTC (rev 8588) @@ -0,0 +1,2 @@ +This script is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Tue Feb 16 15:57:11 2010 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Tue, 16 Feb 2010 14:57:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8589] csw/mgar/pkg/graphviz/trunk/checksums Message-ID: Revision: 8589 http://gar.svn.sourceforge.net/gar/?rev=8589&view=rev Author: ellson Date: 2010-02-16 14:57:00 +0000 (Tue, 16 Feb 2010) Log Message: ----------- update checksums to include configure.patch that someone added Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/checksums Modified: csw/mgar/pkg/graphviz/trunk/checksums =================================================================== --- csw/mgar/pkg/graphviz/trunk/checksums 2010-02-16 14:55:23 UTC (rev 8588) +++ csw/mgar/pkg/graphviz/trunk/checksums 2010-02-16 14:57:00 UTC (rev 8589) @@ -4,4 +4,5 @@ b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postinstall b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postuninstall 440058cc9beafc050b858fbf93242eee Draw.c.diff +bb58d5086e1aaa2519a7184b9ef1748f configure.patch 6f45946fa622770c45609778c0a982ee graphviz-2.26.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Feb 16 16:04:28 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 15:04:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[8590] csw/mgar/pkg/cpan/html2text/trunk/Makefile Message-ID: Revision: 8590 http://gar.svn.sourceforge.net/gar/?rev=8590&view=rev Author: dmichelsen Date: 2010-02-16 15:04:28 +0000 (Tue, 16 Feb 2010) Log Message: ----------- cpan/html2text: Force CSW Perl Modified Paths: -------------- csw/mgar/pkg/cpan/html2text/trunk/Makefile Modified: csw/mgar/pkg/cpan/html2text/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/html2text/trunk/Makefile 2010-02-16 14:57:00 UTC (rev 8589) +++ csw/mgar/pkg/cpan/html2text/trunk/Makefile 2010-02-16 15:04:28 UTC (rev 8590) @@ -20,3 +20,7 @@ ARCHALL = 1 include gar/category.mk + +post-extract-modulated: + -perl -pi -e 's,^#!.*,#!/opt/csw/bin/perl -w,' $(WORKSRC)/html2text.pl + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Feb 16 16:14:34 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 16 Feb 2010 15:14:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8592] csw/mgar/pkg/cpan/DBD-Pg/trunk/Makefile Message-ID: Revision: 8592 http://gar.svn.sourceforge.net/gar/?rev=8592&view=rev Author: bensons Date: 2010-02-16 15:14:34 +0000 (Tue, 16 Feb 2010) Log Message: ----------- cpan DBD-Pg: fixed link error Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-Pg/trunk/Makefile Modified: csw/mgar/pkg/cpan/DBD-Pg/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-Pg/trunk/Makefile 2010-02-16 15:14:08 UTC (rev 8591) +++ csw/mgar/pkg/cpan/DBD-Pg/trunk/Makefile 2010-02-16 15:14:34 UTC (rev 8592) @@ -12,6 +12,16 @@ PACKAGES = CSWpmdbdpg CATALOGNAME = pm_dbdpg +PG_HOME = /opt/csw/postgresql +RUNTIME_DEP_PKGS = CSWlibpq +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) + LICENSE = README +# we need to override pg_config, because the RPATH is missing +PERL_CONFIGURE_ARGS += LIBS="-L$(PG_HOME)/lib -R$(PG_HOME)/lib -lpq" + include gar/category.mk + +# set postgres home +CONFIGURE_ENV += POSTGRES_HOME=$(PG_HOME) 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 Feb 16 16:14:08 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 15:14:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8591] csw/mgar/pkg/oracle-instantclient/trunk Message-ID: Revision: 8591 http://gar.svn.sourceforge.net/gar/?rev=8591&view=rev Author: dmichelsen Date: 2010-02-16 15:14:08 +0000 (Tue, 16 Feb 2010) Log Message: ----------- oracle-instantclient: Add copyright notices Modified Paths: -------------- csw/mgar/pkg/oracle-instantclient/trunk/Makefile csw/mgar/pkg/oracle-instantclient/trunk/checksums Added Paths: ----------- csw/mgar/pkg/oracle-instantclient/trunk/files/COPYING csw/mgar/pkg/oracle-instantclient/trunk/files/instant_client_lic.html Modified: csw/mgar/pkg/oracle-instantclient/trunk/Makefile =================================================================== --- csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-02-16 15:04:28 UTC (rev 8590) +++ csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-02-16 15:14:08 UTC (rev 8591) @@ -26,6 +26,11 @@ DISTFILES = $(foreach A,sparc i386,$(foreach S,32 64,$(foreach T,instantclient sdk sqlplus,$(DISTFILES_$A-$S-$T)))) NOEXTRACT = $(filter-out $(foreach S,32 64,$(foreach T,instantclient sdk sqlplus,$(DISTFILES_$(GARCH)-$S-$T))),$(DISTFILES)) +# From http://www.oracle.com/technology/software/popup-license/instant_client_lic.html +DISTFILES += instant_client_lic.html +# This is done with html2text.pl and some manual aditing from the above +DISTFILES += COPYING + BUILD_DEP_PKGS = CSWchrpath SPKG_SOURCEURL = http://www.oracle.com/technology/software/tech/oci/instantclient/index.html Modified: csw/mgar/pkg/oracle-instantclient/trunk/checksums =================================================================== --- csw/mgar/pkg/oracle-instantclient/trunk/checksums 2010-02-16 15:04:28 UTC (rev 8590) +++ csw/mgar/pkg/oracle-instantclient/trunk/checksums 2010-02-16 15:14:08 UTC (rev 8591) @@ -1,5 +1,7 @@ +7467d88bfbc4b24306365b37250f8428 COPYING 39bb3fa3621ba2050a4d1f764f844913 basic-10.2.0.4.0-solaris-sparc32.zip 27224a32a71872d86e82db6119dc01db basic-10.2.0.4.0-solaris-sparc64.zip +3839d9050edc8f39d6f42bbdc447ed41 instant_client_lic.html 77e4ccd5b2fb07d369175816d43d53db instantclient-basic-solaris-x86-64-10.2.0.2-2006-05-26.zip f69498645ed1e3b37535b579af35e323 instantclient-basic-solaris-x86-6432-10.2.0.2-20060526.zip 9176c1d2926e0fb249e9a272a37c83f7 instantclient-sdk-solaris-x86-64-10.2.0.2-2006-05-26.zip Added: csw/mgar/pkg/oracle-instantclient/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/oracle-instantclient/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/oracle-instantclient/trunk/files/COPYING 2010-02-16 15:14:08 UTC (rev 8591) @@ -0,0 +1,268 @@ +Oracle Technology Network Development and Distribution License Terms for Instant Client +--------------------------------------------------------------------------------------- + + + +Export Controls on the Programs +Selecting the "Accept License Agreement" button is a confirmation of +your agreement that you comply, now and during the trial term, with each +of the following statements: + +-You are not a citizen, national, or resident of, and are not under +control of, the government of Cuba, Iran, Sudan, Libya, North Korea, +Syria, nor any country to which the United States has prohibited export. +-You will not download or otherwise export or re-export the Programs, +directly or indirectly, to the above mentioned countries nor to +citizens, nationals or residents of those countries. +-You are not listed on the United States Department of Treasury lists of +Specially Designated Nationals, Specially Designated Terrorists, and +Specially Designated Narcotic Traffickers, nor are you listed on the +United States Department of Commerce Table of Denial Orders. + +You will not download or otherwise export or re-export the Programs, +directly or indirectly, to persons on the above mentioned lists. + +You will not use the Programs for, and will not allow the Programs to be +used for, any purposes prohibited by United States law, including, +without limitation, for the development, design, manufacture or +production of nuclear, chemical or biological weapons of mass +destruction. + +EXPORT RESTRICTIONS +You agree that U.S. export control laws and other applicable export and +import laws govern your use of the programs, including technical data; +additional information can be found on Oracle\xAE's Global Trade Compliance +web site (http://www.oracle.com/products/export). + +You agree that neither the programs nor any direct product thereof will +be exported, directly, or indirectly, in violation of these laws, or +will be used for any purpose prohibited by these laws including, without +limitation, nuclear, chemical, or biological weapons proliferation. + +Oracle Employees: Under no circumstances are Oracle Employees authorized +to download software for the purpose of distributing it to customers. +Oracle products are available to employees for internal use or +demonstration purposes only. In keeping with Oracle's trade compliance +obligations under U.S. and applicable multilateral law, failure to +comply with this policy could result in disciplinary action up to and +including termination. + +Note: +You are bound by the Oracle Technology Network ("OTN") License Agreement +terms. The OTN License Agreement terms also apply to all updates you +receive under your Technology Track subscription. + +The OTN License Agreement terms below supercede any shrinkwrap license +on the OTN Technology Track software CDs and previous OTN License terms +(including the Oracle Program License as modified by the OTN Program Use +Certificate). + +Oracle Technology Network Development and Distribution License Agreement +for Instant Client +"We," "us," and "our" refers to Oracle America, Inc. "You" and "your" +refers to the individual or entity that wishes to use the Programs from +Oracle under this Agreement. "Programs" refers to the Software Products +referenced below that you wish to download and use and Program +documentation. "License" refers to your right to use the Programs and +Program documentation under the terms of this Agreement. The substantive +and procedural laws of California govern this Agreement. You and Oracle +agree to submit to the exclusive jurisdiction of, and venue in, the +courts of San Francisco, San Mateo, or Santa Clara counties in +California in any dispute arising out of or relating to this Agreement. +We are willing to license the Programs to you only upon the condition +that you accept all of the terms contained in this Agreement. Read the +terms carefully and select the "Accept" button at the bottom of the page +to confirm your acceptance. If you are not willing to be bound by these +terms, select the "Do Not Accept" button and the registration process +will not continue. + +Software Product - Instant Client + +License Rights + +License. We grant you a non-exclusive right and license to use the +Programs solely for your business purposes and development and testing +purposes, subject to the terms of this Agreement. You may allow third +parties to use the Programs, subject to the terms of this Agreement, +provided such third party use is for your business operations only. + +Distribution License We grant you a non-exclusive right and license to +distribute the Programs, provided that you do not charge your end users +for use of the Programs. Your distribution of such Programs shall at a +minimum include the following terms in an executed license agreement +between you and the end user that: (1) restrict the use of the Programs +to the business operations of the end user; (2) prohibit (a) the end +user from assigning, giving, or transferring the Programs or an interest +in them to another individual or entity (and if your end user grants a +security interest in the Programs, the secured party has no right to use +or transfer the Programs); (b) make the Programs available in any manner +to any third party for use in the third party's business operations +(unless such access is expressly permitted for the specific program +license or materials from the services you have acquired); and (c) title +to the Programs from passing to the end user or any other party; (3) +prohibit the reverse engineering (unless required by law for +interoperability), disassembly or decompilation of the Programs and +prohibit duplication of the Programs except for a sufficient number of +copies of each Program for the end user's licensed use and one copy of +each Program media; (4) disclaim, to the extent permitted by applicable +law, our liability for any damages, whether direct, indirect, +incidental, or consequential, arising from the use of the Programs; (5) +require the end user at the termination of the Agreement, to discontinue +use and destroy or return to you all copies of the Programs and +documentation; (6) prohibit publication of any results of benchmark +tests run on the Programs; (7) require the end user to comply fully with +all relevant export laws and regulations of the United States and other +applicable export and import laws to assure that neither the Programs, +nor any direct product thereof, are exported, directly or indirectly, in +violation of applicable laws; (8) do not require us to perform any +obligations or incur any liability not previously agreed to between you +and us; (9) permit you to audit your end user's use of the Programs or +to assign your right to audit the end user's use of the Programs to us; +(10) designate us as a third party beneficiary of the end user license +agreement; (11) include terms consistent with those contained in the +sections of this Agreement entitled "Disclaimer of Warranties and +Exclusive Remedies," "No Technical Support," "End of Agreement," +"Relationship Between the Parties," and "Open Source"; and (11) exclude +the application of the Uniform Computer Information Transactions Act. + +You may allow your end users to permit third parties to use the Programs +on such end user's behalf for the purposes set forth in the end user +license agreement, subject to the terms of such agreement. You shall be +financially responsible for all claims and damages to us caused by your +failure to include the required contractual terms set forth above in +each end user license agreement between you and an end user. We are a +third party beneficiary of any end user license agreement between you +and the end user, but do not assume any of your obligations thereunder, +and you agree that you will not enter into any end user license +agreement that excludes us as a third party beneficiary and will inform +your end users of our rights. + +If you want to use the Programs for any purpose other than as expressly +permitted under this Agreement you must contact us to obtain the +appropriate license. We may audit your use of the Programs. Program +documentation is either shipped with the Programs, or documentation may +be accessed online at http://otn.oracle.com/docs. + +You agree to: (a) defend and indemnify us against all claims and damages +caused by your distribution of the Programs in breach of this Agreement +and/or failure to include the required contractual provisions in your +end user agreement as stated above; (b) keep executed end user +agreements and records of end user information including name, address, +date of distribution and identity of Programs distributed; (c) allow us +to inspect your end user agreements and records upon request; and, (d) +enforce the terms of your end user agreements so as to effect a timely +cure of any end user breach, and to notify us of any breach of the +terms. + +Ownership and Restrictions We retain all ownership and intellectual +property rights in the Programs. You may make a sufficient number of +copies of the Programs for the licensed use and one copy of the Programs +for backup purposes. + +You may not: -use the Programs for any purpose other than as provided +above; -charge your end users for use of the Programs; -remove or modify +any Program markings or any notice of our proprietary rights; -assign +this agreement or give the Programs, Program access or an interest in +the Programs to any individual or entity except as provided under this +agreement; -cause or permit reverse engineering (unless required by law +for interoperability), disassembly or decompilation of the Programs; +-disclose results of any Program benchmark tests without our prior +consent. + +Export You agree that U.S. export control laws and other applicable +export and import laws govern your use of the Programs, including +technical data; additional information can be found on Oracle's Global +Trade Compliance web site located at +http://www.oracle.com/products/export/index.html. You agree that neither +the Programs nor any direct product thereof will be exported, directly, +or indirectly, in violation of these laws, or will be used for any +purpose prohibited by these laws including, without limitation, nuclear, +chemical, or biological weapons proliferation. + +Disclaimer of Warranty and Exclusive Remedies + +THE PROGRAMS ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. WE +FURTHER DISCLAIM ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING WITHOUT +LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE OR NONINFRINGEMENT. + +IN NO EVENT SHALL WE BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, +PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS, +REVENUE, DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER +IN AN ACTION IN CONTRACT OR TORT, EVEN IF WE HAVE BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. OUR ENTIRE LIABILITY FOR DAMAGES HEREUNDER +SHALL IN NO EVENT EXCEED ONE THOUSAND DOLLARS (U.S. $1,000). + +No Technical Support Our technical support organization will not provide +technical support, phone support, or updates to you or end users for the +Programs licensed under this agreement. + +Restricted Rights If you distribute a license to the United States +government, the Programs, including documentation, shall be considered +commercial computer software and you will place a legend, in addition to +applicable copyright notices, on the documentation, and on the media +label, substantially similar to the following: NOTICE OF RESTRICTED +RIGHTS "Programs delivered subject to the DOD FAR Supplement are +'commercial computer software' and use, duplication, and disclosure of +the programs, including documentation, shall be subject to the licensing +restrictions set forth in the applicable Oracle license agreement. +Otherwise, programs delivered subject to the Federal Acquisition +Regulations are 'restricted computer software' and use, duplication, and +disclosure of the programs, including documentation, shall be subject to +the restrictions in FAR 52.227-19, Commercial Computer +Software-Restricted Rights (June 1987). Oracle Corporation, 500 Oracle +Parkway, Redwood City, CA 94065." + +End of Agreement You may terminate this Agreement by destroying all +copies of the Programs. We have the right to terminate your right to use +the Programs if you fail to comply with any of the terms of this +Agreement, in which case you shall destroy all copies of the Programs. + +Relationship Between the Parties The relationship between you and us is +that of licensee/licensor. Neither party will represent that it has any +authority to assume or create any obligation, express or implied, on +behalf of the other party, nor to represent the other party as agent, +employee, franchisee, or in any other capacity. Nothing in this +Agreement shall be construed to limit either party's right to +independently develop or distribute software that is functionally +similar to the other party's products, so long as proprietary +information of the other party is not included in such software. + +Open Source "Open Source" software - software available without charge +for use, modification and distribution - is often licensed under terms +that require the user to make the user's modifications to the Open +Source software or any software that the user 'combines' with the Open +Source software freely available in source code form. If you use Open +Source software in conjunction with the Programs, you must ensure that +your use does not: (i) create, or purport to create, obligations of us +with respect to the Oracle Programs; or (ii) grant, or purport to grant, +to any third party any rights to or immunities under our intellectual +property or proprietary rights in the Oracle Programs. For example, you +may not develop a software program using an Oracle Program and an Open +Source program where such use results in a program file(s) that contains +code from both the Oracle Program and the Open Source program (including +without limitation libraries) if the Open Source program is licensed +under a license that requires any "modifications" be made freely +available. You also may not combine the Oracle Program with programs +licensed under the GNU General Public License ("GPL") in any manner that +could cause, or could be interpreted or asserted to cause, the Oracle +Program or any modifications thereto to become subject to the terms of +the GPL. + +Entire Agreement You agree that this Agreement is the complete agreement +for the Programs and licenses, and this Agreement supersedes all prior +or contemporaneous Agreements or representations. If any term of this +Agreement is found to be invalid or unenforceable, the remaining +provisions will remain effective. + +Last updated: 01/24/08 + + +Should you have any questions concerning this License Agreement, or if +you desire to contact Oracle for any reason, please write: +Oracle America, Inc. +500 Oracle Parkway, +Redwood City, CA 94065 + +Oracle may contact you to ask if you had a satisfactory experience +installing and using this OTN software download. Added: csw/mgar/pkg/oracle-instantclient/trunk/files/instant_client_lic.html =================================================================== --- csw/mgar/pkg/oracle-instantclient/trunk/files/instant_client_lic.html (rev 0) +++ csw/mgar/pkg/oracle-instantclient/trunk/files/instant_client_lic.html 2010-02-16 15:14:08 UTC (rev 8591) @@ -0,0 +1,495 @@ + + + +Oracle Technology Network Development and Distribution License Terms for Instant Client + + + + + + + + + + + + + + + +
+ + + + +
+

Oracle Technology Network Development and Distribution License Terms + for Instant Client

+

+ +Export Controls on the Programs
+Selecting the "Accept License Agreement" button is a confirmation of your agreement that you comply, +now and during the trial term, with each of the following statements: +

+-You are not a citizen, national, or resident of, and are not under control of, the government of Cuba, + Iran, Sudan, Libya, North Korea, Syria, nor any country to which the United States has prohibited export.
+-You will not download or otherwise export or re-export the Programs, directly or indirectly, + to the above mentioned countries nor to citizens, nationals or residents of those countries.
+-You are not listed on the United States Department of Treasury lists of Specially Designated Nationals, + Specially Designated Terrorists, and Specially Designated Narcotic Traffickers, nor are you listed on the + United States Department of Commerce Table of Denial Orders. +

+You will not download or otherwise export or re-export the Programs, directly or indirectly, to persons +on the above mentioned lists. +

+You will not use the Programs for, and will not allow the Programs to be used for, any purposes prohibited +by United States law, including, without limitation, for the development, design, manufacture or production +of nuclear, chemical or biological weapons of mass destruction. +

+ +EXPORT RESTRICTIONS
+You agree that U.S. export control laws and other applicable export and import laws govern your use +of the programs, including technical data; additional information can be found on Oracle®'s Global Trade Compliance +web site (http://www.oracle.com/products/export). +

+You agree that neither the programs nor any direct product thereof will be exported, directly, or indirectly, +in violation of these laws, or will be used for any purpose prohibited by these laws including, without limitation, +nuclear, chemical, or biological weapons proliferation. +

+Oracle Employees: Under no circumstances are Oracle Employees authorized to download software for the purpose +of distributing it to customers. Oracle products are available to employees for internal use or demonstration +purposes only. In keeping with Oracle's trade compliance obligations under U.S. and applicable multilateral law, +failure to comply with this policy could result in disciplinary action +up to and including termination. +

+Note: You are bound by the Oracle Technology Network ("OTN") License Agreement terms. The OTN License Agreement +terms also apply to all updates you receive under your Technology Track subscription. +

+The OTN License Agreement terms below supercede any shrinkwrap license on the OTN Technology Track software CDs +and previous OTN License terms (including the Oracle Program License as modified by the OTN Program Use Certificate). +

+ Oracle Technology Network Development and Distribution License Agreement + for Instant Client
+
+ "We," "us," and "our" refers to Oracle America, Inc. "You" and "your" refers to the individual or entity + that wishes to use the Programs from Oracle under this Agreement. "Programs" + refers to the Software Products referenced below that you wish to download + and use and Program documentation. "License" refers to your right + to use the Programs and Program documentation under the terms of this Agreement. + The substantive and procedural laws of California govern this Agreement. + You and Oracle agree to submit to the exclusive jurisdiction of, and venue + in, the courts of San Francisco, San Mateo, or Santa Clara counties in California + in any dispute arising out of or relating to this Agreement. +

We are willing to license the Programs to you only upon the condition + that you accept all of the terms contained in this Agreement. Read the + terms carefully and select the "Accept" button at the bottom + of the page to confirm your acceptance. If you are not willing to be bound + by these terms, select the "Do Not Accept" button and the registration + process will not continue.

+

Software Product
+ - Instant Client

+

License Rights

+

License.
+ We grant you a non-exclusive right and license to use the Programs solely + for your business purposes and development and testing purposes, subject + to the terms of this Agreement. You may allow third parties to use the + Programs, subject to the terms of this Agreement, provided such third + party use is for your business operations only.

+

Distribution License
+ We grant you a non-exclusive right and license to distribute the Programs, + provided that you do not charge your end users for use of the Programs. + Your distribution of such Programs shall at a minimum include the following + terms in an executed license agreement between you and the end user that: + (1) restrict the use of the Programs to the business operations of the + end user; (2) prohibit (a) the end user from assigning, giving, or transferring + the Programs or an interest in them to another individual or entity (and + if your end user grants a security interest in the Programs, the secured + party has no right to use or transfer the Programs); (b) make the Programs + available in any manner to any third party for use in the third party's + business operations (unless such access is expressly permitted for the + specific program license or materials from the services you have acquired); + and (c) title to the Programs from passing to the end user or any other + party; (3) prohibit the reverse engineering (unless required by law for + interoperability), disassembly or decompilation of the Programs and prohibit + duplication of the Programs except for a sufficient number of copies of + each Program for the end user's licensed use and one copy of each Program + media; (4) disclaim, to the extent permitted by applicable law, our liability + for any damages, whether direct, indirect, incidental, or consequential, + arising from the use of the Programs; (5) require the end user at the + termination of the Agreement, to discontinue use and destroy or return + to you all copies of the Programs and documentation; (6) prohibit publication + of any results of benchmark tests run on the Programs; (7) require the + end user to comply fully with all relevant export laws and regulations + of the United States and other applicable export and import laws to assure + that neither the Programs, nor any direct product thereof, are exported, + directly or indirectly, in violation of applicable laws; (8) do not require + us to perform any obligations or incur any liability not previously agreed + to between you and us; (9) permit you to audit your end user's use of + the Programs or to assign your right to audit the end user's use of the + Programs to us; (10) designate us as a third party beneficiary of the + end user license agreement; (11) include terms consistent with those contained + in the sections of this Agreement entitled "Disclaimer of Warranties + and Exclusive Remedies," "No Technical Support," "End + of Agreement," "Relationship Between the Parties," and + "Open Source"; and (11) exclude the application of the Uniform + Computer Information Transactions Act.

+

You may allow your end users to permit third parties to use the Programs + on such end user's behalf for the purposes set forth in the end user license + agreement, subject to the terms of such agreement. You shall be financially + responsible for all claims and damages to us caused by your failure to + include the required contractual terms set forth above in each end user + license agreement between you and an end user. We are a third party beneficiary + of any end user license agreement between you and the end user, but do + not assume any of your obligations thereunder, and you agree that you + will not enter into any end user license agreement that excludes us as + a third party beneficiary and will inform your end users of our rights.

+

If you want to use the Programs for any purpose other than as expressly + permitted under this Agreement you must contact us to obtain the appropriate + license. We may audit your use of the Programs. Program documentation + is either shipped with the Programs, or documentation may be accessed + online at http://otn.oracle.com/docs.

+

You agree to: (a) defend and indemnify us against all claims and damages + caused by your distribution of the Programs in breach of this Agreement + and/or failure to include the required contractual provisions in your + end user agreement as stated above; (b) keep executed end user agreements + and records of end user information including name, address, date of distribution + and identity of Programs distributed; (c) allow us to inspect your end + user agreements and records upon request; and, (d) enforce the terms of + your end user agreements so as to effect a timely cure of any end user + breach, and to notify us of any breach of the terms.

+

Ownership and Restrictions
+ We retain all ownership and intellectual property rights in the Programs. + You may make a sufficient number of copies of the Programs for the licensed + use and one copy of the Programs for backup purposes.

+

You may not:
+ -use the Programs for any purpose other than as provided above;
+ -charge your end users for use of the Programs;
+ -remove or modify any Program markings or any notice of our proprietary + rights;
+ -assign this agreement or give the Programs, Program access or an interest + in the Programs to any individual or entity except as provided under this + agreement;
+ -cause or permit reverse engineering (unless required by law for interoperability), + disassembly or decompilation of the Programs;
+ -disclose results of any Program benchmark tests without our prior consent.

+

Export
+ You agree that U.S. export control laws and other applicable export and + import laws govern your use of the Programs, including technical data; + additional information can be found on Oracle's Global Trade Compliance + web site located at http://www.oracle.com/products/export/index.html. + You agree that neither the Programs nor any direct product thereof will + be exported, directly, or indirectly, in violation of these laws, or will + be used for any purpose prohibited by these laws including, without limitation, + nuclear, chemical, or biological weapons proliferation.

+

Disclaimer of Warranty and Exclusive Remedies

+

THE PROGRAMS ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. + WE FURTHER DISCLAIM ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING WITHOUT + LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE OR NONINFRINGEMENT.

+

IN NO EVENT SHALL WE BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, + PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS, REVENUE, + DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN ACTION + IN CONTRACT OR TORT, EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY OF + SUCH DAMAGES. OUR ENTIRE LIABILITY FOR DAMAGES HEREUNDER SHALL IN NO EVENT + EXCEED ONE THOUSAND DOLLARS (U.S. $1,000).

+

No Technical Support
+ Our technical support organization will not provide technical support, + phone support, or updates to you or end users for the Programs licensed + under this agreement.

+

Restricted Rights
+ If you distribute a license to the United States government, the Programs, + including documentation, shall be considered commercial computer software + and you will place a legend, in addition to applicable copyright notices, + on the documentation, and on the media label, substantially similar to + the following:
+ NOTICE OF RESTRICTED RIGHTS
+ "Programs delivered subject to the DOD FAR Supplement are 'commercial + computer software' and use, duplication, and disclosure of the programs, + including documentation, shall be subject to the licensing restrictions + set forth in the applicable Oracle license agreement. Otherwise, programs + delivered subject to the Federal Acquisition Regulations are 'restricted + computer software' and use, duplication, and disclosure of the programs, + including documentation, shall be subject to the restrictions in FAR 52.227-19, + Commercial Computer Software-Restricted Rights (June 1987). Oracle Corporation, + 500 Oracle Parkway, Redwood City, CA 94065."

+

End of Agreement
+ You may terminate this Agreement by destroying all copies of the Programs. + We have the right to terminate your right to use the Programs if you fail + to comply with any of the terms of this Agreement, in which case you shall + destroy all copies of the Programs.

+

Relationship Between the Parties
+ The relationship between you and us is that of licensee/licensor. Neither + party will represent that it has any authority to assume or create any + obligation, express or implied, on behalf of the other party, nor to represent + the other party as agent, employee, franchisee, or in any other capacity. + Nothing in this Agreement shall be construed to limit either party's right + to independently develop or distribute software that is functionally similar + to the other party's products, so long as proprietary information of the + other party is not included in such software.

+

Open Source
+ "Open Source" software - software available without charge for + use, modification and distribution - is often licensed under terms that + require the user to make the user's modifications to the Open Source software + or any software that the user 'combines' with the Open Source software + freely available in source code form. If you use Open Source software + in conjunction with the Programs, you must ensure that your use does not: + (i) create, or purport to create, obligations of us with respect to the + Oracle Programs; or (ii) grant, or purport to grant, to any third party + any rights to or immunities under our intellectual property or proprietary + rights in the Oracle Programs. For example, you may not develop a software + program using an Oracle Program and an Open Source program where such + use results in a program file(s) that contains code from both the Oracle + Program and the Open Source program (including without limitation libraries) + if the Open Source program is licensed under a license that requires any + "modifications" be made freely available. You also may not combine + the Oracle Program with programs licensed under the GNU General Public + License ("GPL") in any manner that could cause, or could be + interpreted or asserted to cause, the Oracle Program or any modifications + thereto to become subject to the terms of the GPL.

+

Entire Agreement
+ You agree that this Agreement is the complete agreement for the Programs + and licenses, and this Agreement supersedes all prior or contemporaneous + Agreements or representations. If any term of this Agreement is found + to be invalid or unenforceable, the remaining provisions will remain effective.

+

Last updated: 01/24/08

+

+ +Should you have any questions concerning this License Agreement, or if you + desire to contact Oracle for any reason, please write:
+ Oracle America, Inc.
+ + 500 Oracle Parkway,
+ Redwood City, CA 94065 +

+

+Oracle may contact you to ask if you had a satisfactory experience installing + and using this OTN software download. +
+ +
+ +
+ + +
+ + + + + +
+
+
+ + 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 Feb 16 16:29:29 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 15:29:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8593] csw/mgar/pkg/oracle-instantclient/trunk/Makefile Message-ID: Revision: 8593 http://gar.svn.sourceforge.net/gar/?rev=8593&view=rev Author: dmichelsen Date: 2010-02-16 15:29:28 +0000 (Tue, 16 Feb 2010) Log Message: ----------- oracle-instantcient: Fix copying Modified Paths: -------------- csw/mgar/pkg/oracle-instantclient/trunk/Makefile Modified: csw/mgar/pkg/oracle-instantclient/trunk/Makefile =================================================================== --- csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-02-16 15:14:34 UTC (rev 8592) +++ csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-02-16 15:29:28 UTC (rev 8593) @@ -24,7 +24,7 @@ DISTFILES_i386-64-sqlplus = sqlplus-10.2.0.4.0-solaris-x86-64.zip DISTFILES = $(foreach A,sparc i386,$(foreach S,32 64,$(foreach T,instantclient sdk sqlplus,$(DISTFILES_$A-$S-$T)))) -NOEXTRACT = $(filter-out $(foreach S,32 64,$(foreach T,instantclient sdk sqlplus,$(DISTFILES_$(GARCH)-$S-$T))),$(DISTFILES)) +NOEXTRACT = $(filter-out $(foreach S,32 64,$(foreach T,instantclient sdk sqlplus,$(DISTFILES_$(GARCH)-$S-$T)) COPYING),$(DISTFILES)) # From http://www.oracle.com/technology/software/popup-license/instant_client_lic.html DISTFILES += instant_client_lic.html @@ -72,6 +72,10 @@ MERGE_SCRIPTS_isa-default = copy-all MERGE_SCRIPTS_isa-default64 = copy-all +# The libraries are relocated. It is expected from the client to set +# LD_LIBRARY_PATH as described by Oracle. +CHECKPKG_OVERRIDES = symbol-not-found + include gar/category.mk $(foreach A,sparc i386,$(foreach S,32 64,$(foreach T,instantclient sdk sqlplus,$(foreach F,$(DISTFILES_$A-$S-$T),$(eval $(call custom-zip-extract,$F,$A-$S)))))) 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 Feb 16 16:47:49 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 15:47:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[8594] csw/mgar/pkg/oracle-instantclient/trunk/Makefile Message-ID: Revision: 8594 http://gar.svn.sourceforge.net/gar/?rev=8594&view=rev Author: dmichelsen Date: 2010-02-16 15:47:49 +0000 (Tue, 16 Feb 2010) Log Message: ----------- oracle-instantclient: Include symlink for unversioned soname Modified Paths: -------------- csw/mgar/pkg/oracle-instantclient/trunk/Makefile Modified: csw/mgar/pkg/oracle-instantclient/trunk/Makefile =================================================================== --- csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-02-16 15:29:28 UTC (rev 8593) +++ csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-02-16 15:47:49 UTC (rev 8594) @@ -92,4 +92,6 @@ #ginstall $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/sdk/include/* $(DESTDIR)$(includedir)/oracle/10.2/ ginstall -d $(DESTDIR)$(prefix)/instantclient_10_2/$(TARGETDIR_$(MEMORYMODEL)) cp -r $(WORKDIR)/$(GARCH)-$(MEMORYMODEL)/instantclient_10_2/* $(DESTDIR)$(prefix)/instantclient_10_2/$(TARGETDIR_$(MEMORYMODEL))/ + gln -s libclntsh.so.10.1 $(DESTDIR)$(prefix)/instantclient_10_2/$(TARGETDIR_$(MEMORYMODEL))/libclntsh.so + gln -s libocci.so.10.1 $(DESTDIR)$(prefix)/instantclient_10_2/$(TARGETDIR_$(MEMORYMODEL))/libocci.so @$(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 Tue Feb 16 17:50:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 16:50:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8595] csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile Message-ID: Revision: 8595 http://gar.svn.sourceforge.net/gar/?rev=8595&view=rev Author: dmichelsen Date: 2010-02-16 16:50:11 +0000 (Tue, 16 Feb 2010) Log Message: ----------- cpan/DBD-Oracle: Fix linker settings Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile Modified: csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile 2010-02-16 15:47:49 UTC (rev 8594) +++ csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile 2010-02-16 16:50:11 UTC (rev 8595) @@ -11,10 +11,12 @@ CATALOGNAME = pm_dbdoracle ORACLE_HOME = /opt/csw/instantclient_10_2/$(MM_LIBDIR) -EXTRA_CONFIGURE_EXPORTS = ORACLE_HOME +LD_LIBRARY_PATH=$(ORACLE_HOME) +EXTRA_CONFIGURE_EXPORTS = ORACLE_HOME LD_LIBRARY_PATH +EXTRA_TEST_EXPORTS = LD_LIBRARY_PATH NOISALIST = 1 -# EXTRA_LIB = /opt/csw/oracle/product/10.2.0/client/lib +EXTRA_LIB = /opt/csw/instantclient_10_2 # EXTRA_INC = $(includedir)/oracle/10.2 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Feb 16 18:05:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 17:05:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[8596] csw/mgar/pkg/cpan/DBD-Oracle/trunk Message-ID: Revision: 8596 http://gar.svn.sourceforge.net/gar/?rev=8596&view=rev Author: dmichelsen Date: 2010-02-16 17:05:12 +0000 (Tue, 16 Feb 2010) Log Message: ----------- cpan/DBD-Oracle: Quiesce checkpkg Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile csw/mgar/pkg/cpan/DBD-Oracle/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/DBD-Oracle/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile 2010-02-16 16:50:11 UTC (rev 8595) +++ csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile 2010-02-16 17:05:12 UTC (rev 8596) @@ -7,6 +7,8 @@ define BLURB endef +DISTFILES = COPYING + PACKAGES = CSWpmdbdoracle CATALOGNAME = pm_dbdoracle @@ -17,6 +19,13 @@ NOISALIST = 1 EXTRA_LIB = /opt/csw/instantclient_10_2 -# EXTRA_INC = $(includedir)/oracle/10.2 +# The oracle client is not shipped. +CHECKPKG_OVERRIDES = symbol-not-found|Oracle.so + +# This is an internal-only sourcepackage. Users are expected to +# install the Oracle client manually and set LD_LIBRARY_PATH on +# their own according to Oracle policies. +CHECKPKG_OVERRIDES += missing-dependency|CSWorainstclient102 + include gar/category.mk Modified: csw/mgar/pkg/cpan/DBD-Oracle/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DBD-Oracle/trunk/checksums 2010-02-16 16:50:11 UTC (rev 8595) +++ csw/mgar/pkg/cpan/DBD-Oracle/trunk/checksums 2010-02-16 17:05:12 UTC (rev 8596) @@ -1 +1,2 @@ +113201f26336acc49fc5566a6c0ffdef COPYING 9dc45c29a0e17ac1c2ec424e6ce26720 DBD-Oracle-1.23.tar.gz Added: csw/mgar/pkg/cpan/DBD-Oracle/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/DBD-Oracle/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/DBD-Oracle/trunk/files/COPYING 2010-02-16 17:05:12 UTC (rev 8596) @@ -0,0 +1,5 @@ +The Copyright terms for DBD::Oracle have changed and now read as follows: +You may distribute under the terms of either the GNU General Public +License or the Artistic License, as specified in the Perl README file, +with the exception that it cannot be placed on a CD-ROM or similar media +for commercial distribution without the prior approval of the author. 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 Feb 16 18:20:18 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2010 17:20:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8597] csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile Message-ID: Revision: 8597 http://gar.svn.sourceforge.net/gar/?rev=8597&view=rev Author: dmichelsen Date: 2010-02-16 17:20:18 +0000 (Tue, 16 Feb 2010) Log Message: ----------- cpan/DBD-Oraacle: Split off ora_explain Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile Modified: csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile 2010-02-16 17:05:12 UTC (rev 8596) +++ csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile 2010-02-16 17:20:18 UTC (rev 8597) @@ -9,9 +9,15 @@ DISTFILES = COPYING -PACKAGES = CSWpmdbdoracle -CATALOGNAME = pm_dbdoracle +PACKAGES = CSWpmdbdoracle CSWpmdbdoraexplain +CATALOGNAME_CSWpmdbdoracle = pm_dbdoracle +CATALOGNAME_CSWpmdbdoraexplain = pm_dbdoraexplain +SPKG_DESC_CSWpmdbdoracle = $(DESCRIPTION) +SPKG_DESC_CSWpmdbdoraexplain = Tk application ora_explain for DBD::Oracle + +RUNTIME_DEP_PKGS_CSWpmdbdoraexplain = CSWpmdbdoracle CSWpmtk + ORACLE_HOME = /opt/csw/instantclient_10_2/$(MM_LIBDIR) LD_LIBRARY_PATH=$(ORACLE_HOME) EXTRA_CONFIGURE_EXPORTS = ORACLE_HOME LD_LIBRARY_PATH @@ -20,12 +26,18 @@ NOISALIST = 1 EXTRA_LIB = /opt/csw/instantclient_10_2 +# Testing requires a running Oracle database which may not be present. +# Just clean if you have one at hand. +SKIPTEST ?= 1 + +PKGFILES_CSWpmdbdoraexplain = .*ora_explain.* + # The oracle client is not shipped. -CHECKPKG_OVERRIDES = symbol-not-found|Oracle.so +CHECKPKG_OVERRIDES_CSWpmdbdoracle = symbol-not-found|Oracle.so # This is an internal-only sourcepackage. Users are expected to # install the Oracle client manually and set LD_LIBRARY_PATH on # their own according to Oracle policies. -CHECKPKG_OVERRIDES += missing-dependency|CSWorainstclient102 +CHECKPKG_OVERRIDES_CSWpmdbdoracle += missing-dependency|CSWorainstclient102 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Feb 16 19:48:54 2010 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 16 Feb 2010 18:48:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8598] csw/mgar/pkg/gkrellm/trunk Message-ID: Revision: 8598 http://gar.svn.sourceforge.net/gar/?rev=8598&view=rev Author: jake_goerzen Date: 2010-02-16 18:48:54 +0000 (Tue, 16 Feb 2010) Log Message: ----------- build split pkgs; SMF integration; work in progress Modified Paths: -------------- csw/mgar/pkg/gkrellm/trunk/Makefile csw/mgar/pkg/gkrellm/trunk/checksums csw/mgar/pkg/gkrellm/trunk/files/Makefile csw/mgar/pkg/gkrellm/trunk/files/server.Makefile csw/mgar/pkg/gkrellm/trunk/files/src.Makefile Added Paths: ----------- csw/mgar/pkg/gkrellm/trunk/files/cswgkrellmd Modified: csw/mgar/pkg/gkrellm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gkrellm/trunk/Makefile 2010-02-16 17:20:18 UTC (rev 8597) +++ csw/mgar/pkg/gkrellm/trunk/Makefile 2010-02-16 18:48:54 UTC (rev 8598) @@ -17,32 +17,36 @@ MASTER_SITES = http://members.dslextreme.com/users/billw/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += Makefile server.Makefile src.Makefile +DISTFILES += Makefile server.Makefile src.Makefile cswgkrellmd PATCHFILES = 0001-Add-LOG_MAKEPRI.patch -PATCHFILES += 0002-Do-not-tingle-with-file-owner.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -DEP_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 CSWlibatk CSWlibcairo CSWpango +PACKAGES = CSWgkrellm CSWgkrellmd +PKGFILES_CSWgkrellmd = /opt/csw/sbin/gkrellmd /opt/csw/share/man/gkrellmd.1 /opt/csw/include/gkrellm2/gkrellmd.h /opt/csw/etc/init.d/cswgkrellmd +SPKG_DESC_CSWgkrellmd = System monitor package daemon + +RUNTIME_DEP_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 CSWlibatk CSWlibcairo CSWpango +RUNTIME_DEP_PKGS_CSWgkrellmd = CSWggettextrt CSWglib2 + # Make sure to remove this after the X11 issues have all been settled EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so # Disable configure scripts step CONFIGURE_SCRIPTS = +#Disable build64 until fix linking: +#ld: fatal: file main.o: wrong ELF class: ELFCLASS64 +#BUILD64 = 1 + BUILD_ARGS = INSTALLROOT=$(prefix) -BUILD_ARGS += INSTALLDIR=$(bindir) -BUILD_ARGS += MANDIR=$(mandir) -BUILD_ARGS += INCLUDEDIR=$(includedir) BUILD_ARGS += LOCALEDIR=$(sharedstatedir)/locale BUILD_ARGS += enable_nls=1 solaris -INSTALL_ARGS = INSTALLROOT=$(DESTDIR) -INSTALL_ARGS += INSTALLDIR=$(DESTDIR)$(bindir) -INSTALL_ARGS += MANDIR=$(DESTDIR)$(mandir) -INSTALL_ARGS += INCLUDEDIR=$(DESTDIR)$(includedir) +INSTALL_ARGS = INSTALLROOT=$(DESTDIR)$(prefix) +INSTALL_ARGS += SINSTALLDIR=$(DESTDIR)$(sbindir) INSTALL_ARGS += LOCALEDIR=$(DESTDIR)$(sharedstatedir)/locale INSTALL_ARGS += enable_nls=1 install_solaris @@ -56,10 +60,10 @@ # chgrp sys $(INSTALLDIR)/$(PACKAGE) # chmod g+s $(INSTALLDIR)/$(PACKAGE) # chgrp sys $(SINSTALLDIR)/$(PACKAGE_D) -# chmod g+s $(SINSTALLDIR)/$(PACKAGE_D) +# chmod g+s $(SINSTALLDIR)/$(PACKAGE_D) PROTOTYPE_MODIFIERS = sgid -PROTOTYPE_FILES_sgid = $(bindir)/gkrellmd? +PROTOTYPE_FILES_sgid = $(bindir)/gkrellm? $(sbindir)/gkrellmd? PROTOTYPE_PERMS_sgid = 2755 PROTOTYPE_GROUP_sgid = sys @@ -67,6 +71,10 @@ # It does no harm, though. CHECKPKG_OVERRIDES = symbol-not-found|gkrellm +PROTOTYPE_FILTER = awk '$$$$3 ~/\/init.d\/cswgkrellmd$$$$/ { $$$$2 = "cswinitsmf" } { print }' + +INITSMF = /opt/csw/etc/init.d/cswgkrellmd + include gar/category.mk post-extract-modulated: @@ -74,3 +82,9 @@ -cp $(WORKDIR)/src.Makefile $(WORKSRC)/src/Makefile -cp $(WORKDIR)/server.Makefile $(WORKSRC)/server/Makefile @$(MAKECOOKIE) + +post-install-modulated: + -ginstall -d $(DESTDIR)/opt/csw/etc/init.d + -cp $(WORKDIR)/cswgkrellmd $(DESTDIR)/opt/csw/etc/init.d/ + -chmod 0755 $(DESTDIR)/opt/csw/etc/init.d/cswgkrellmd + @$(MAKECOOKIE) Modified: csw/mgar/pkg/gkrellm/trunk/checksums =================================================================== --- csw/mgar/pkg/gkrellm/trunk/checksums 2010-02-16 17:20:18 UTC (rev 8597) +++ csw/mgar/pkg/gkrellm/trunk/checksums 2010-02-16 18:48:54 UTC (rev 8598) @@ -1,6 +1,6 @@ 87043d318f1fecd878671a63b8446b24 0001-Add-LOG_MAKEPRI.patch -8a1b298516f7d1e18e34080902353aae 0002-Do-not-tingle-with-file-owner.patch -955c4ffeb0a0223e3120ac5b66134617 Makefile +6a34a1bc0d7b7af7882b612af3300535 Makefile +0b90e7e6e08187a73641d84868a1c805 cswgkrellmd 270917784da6bf1292aba0c82af726d6 gkrellm-2.3.4.tar.bz2 -ff576ffe06797d2e7f7997cc934e210d server.Makefile -cce3ee260271f8886a76cbb6ae70d0af src.Makefile +6c5b47a9c7e2109ae41aa2eba264b94c server.Makefile +6701c6a8214d9cd7f0a2e1726f842eb9 src.Makefile Modified: csw/mgar/pkg/gkrellm/trunk/files/Makefile =================================================================== --- csw/mgar/pkg/gkrellm/trunk/files/Makefile 2010-02-16 17:20:18 UTC (rev 8597) +++ csw/mgar/pkg/gkrellm/trunk/files/Makefile 2010-02-16 18:48:54 UTC (rev 8598) @@ -104,7 +104,7 @@ INCLUDEDIR = $(INSTALLROOT)/include INCLUDEMODE = 644 INCLUDEDIRMODE = 755 -INSTALL ?= install +INSTALL ?= /opt/csw/bin/ginstall PKGCONFIGDIR ?= $(INSTALLROOT)/lib/pkgconfig LOCALEDIR ?= $(INSTALLROOT)/share/locale Added: csw/mgar/pkg/gkrellm/trunk/files/cswgkrellmd =================================================================== --- csw/mgar/pkg/gkrellm/trunk/files/cswgkrellmd (rev 0) +++ csw/mgar/pkg/gkrellm/trunk/files/cswgkrellmd 2010-02-16 18:48:54 UTC (rev 8598) @@ -0,0 +1,32 @@ +#!/bin/sh +# +# CSWgkrellmd start/stop script +# Jake Goerzen (jgoerzen at opencsw.org) + +PROGRAM="/opt/csw/sbin/gkrellmd" +OPTIONS="--user nobody --group sys --max-clients 3 --io-timeout 30 --reconnect-timeout 9 --detach" + +start() +{ + $PROGRAM $OPTIONS +} + +stop() +{ + /usr/bin/pkill -x -u nobody gkrellmd +} + +case "$1" in +start) + start + ;; +stop) + stop + ;; +*) + printf 'Usage: %s {start|stop}\n' $0 + exit 1 +esac + +exit $? + Modified: csw/mgar/pkg/gkrellm/trunk/files/server.Makefile =================================================================== --- csw/mgar/pkg/gkrellm/trunk/files/server.Makefile 2010-02-16 17:20:18 UTC (rev 8597) +++ csw/mgar/pkg/gkrellm/trunk/files/server.Makefile 2010-02-16 18:48:54 UTC (rev 8598) @@ -8,7 +8,7 @@ INSTALLROOT = /usr/local endif -SINSTALLDIR ?= $(INSTALLROOT)/bin +SINSTALLDIR ?= $(INSTALLROOT)/sbin INSTALLDIRMODE ?= 755 INCLUDEDIR ?= $(INSTALLROOT)/include @@ -213,9 +213,9 @@ chmod g+sx $(SINSTALLDIR)/$(PACKAGE_D) install_solaris: - $(MAKE) install INSTALL=/usr/ucb/install - chgrp sys $(SINSTALLDIR)/$(PACKAGE_D) - chmod g+s $(SINSTALLDIR)/$(PACKAGE_D) + $(MAKE) install INSTALL=/opt/csw/bin/ginstall + fakeroot chgrp sys $(SINSTALLDIR)/$(PACKAGE_D) + fakeroot chmod g+s $(SINSTALLDIR)/$(PACKAGE_D) install_windows: install_inc install_cfg $(MAKE) BINEXT=".exe" install_bin Modified: csw/mgar/pkg/gkrellm/trunk/files/src.Makefile =================================================================== --- csw/mgar/pkg/gkrellm/trunk/files/src.Makefile 2010-02-16 17:20:18 UTC (rev 8597) +++ csw/mgar/pkg/gkrellm/trunk/files/src.Makefile 2010-02-16 18:48:54 UTC (rev 8598) @@ -248,9 +248,9 @@ chmod g+sx $(INSTALLDIR)/$(PACKAGE) install_solaris: - $(MAKE) install INSTALL=/usr/ucb/install - chgrp sys $(INSTALLDIR)/$(PACKAGE) - chmod g+s $(INSTALLDIR)/$(PACKAGE) + $(MAKE) install INSTALL=/opt/csw/bin/ginstall + fakeroot chgrp sys $(INSTALLDIR)/$(PACKAGE) + fakeroot chmod g+s $(INSTALLDIR)/$(PACKAGE) install_windows: $(MAKE) BINEXT=".exe" install_bin install_inc 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 Feb 16 20:51:21 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 16 Feb 2010 19:51:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8599] csw/mgar/gar/v2-checkpkg-stats Message-ID: Revision: 8599 http://gar.svn.sourceforge.net/gar/?rev=8599&view=rev Author: wahwah Date: 2010-02-16 19:51:20 +0000 (Tue, 16 Feb 2010) Log Message: ----------- mGAR v2-checkpkg-stats: prettified output, added cache database update progress estimation information Modified Paths: -------------- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg 2010-02-16 18:48:54 UTC (rev 8598) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg 2010-02-16 19:51:20 UTC (rev 8599) @@ -558,14 +558,15 @@ fi done +if [[ "${DEBUG}" != "" ]]; then + extra_options="--debug" +fi + # /var/sadm/install/contents cache update ${command_basedir}/update_contents_cache.py # Collects package stats to be later analyzed -${command_basedir}/checkpkg_collect_stats.py "$@" +${command_basedir}/checkpkg_collect_stats.py ${extra_options} "$@" -if [[ "${DEBUG}" != "" ]]; then - extra_options="--debug" -fi debugmsg "checkpkg_module_dir: '$checkpkg_module_dir'" log_files="" module_name_format="%-40s" Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py 2010-02-16 18:48:54 UTC (rev 8598) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py 2010-02-16 19:51:20 UTC (rev 8599) @@ -22,14 +22,18 @@ def main(): - debug = True - logging.basicConfig(level=logging.DEBUG) parser = optparse.OptionParser() + parser.add_option("-d", "--debug", dest="debug", + default=False, action="store_true", + help="Turn on debugging messages") options, args = parser.parse_args() - logging.basicConfig(level=logging.INFO) + if options.debug: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.INFO) logging.info("Collecting statistics about given package files.") logging.debug("args: %s", args) - packages = [opencsw.CswSrv4File(x, debug) for x in args] + packages = [opencsw.CswSrv4File(x, options.debug) for x in args] stats_list = [checkpkg.PackageStats(pkg) for pkg in packages] for pkg_stats in stats_list: pkg_stats.CollectStats() Modified: csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py 2010-02-16 18:48:54 UTC (rev 8598) +++ csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py 2010-02-16 19:51:20 UTC (rev 8599) @@ -34,6 +34,7 @@ ("/64", ["/amd64", "/sparcv9"]), ("/opt/csw/lib/i386", ["/opt/csw/lib"]), ) +INSTALL_CONTENTS_AVG_LINE_LENGTH = 102.09710677919261 # This shared library is present on Solaris 10 on amd64, but it's missing on # Solaris 8 on i386. It's okay if it's missing. @@ -206,18 +207,21 @@ fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog """ + contents_length = os.stat(SYSTEM_PKGMAP).st_size + estimated_lines = contents_length / INSTALL_CONTENTS_AVG_LINE_LENGTH system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) # Creating a data structure: # soname - {: , : , ...} logging.debug("Building sqlite3 cache db of the %s file", SYSTEM_PKGMAP) + print "Processing %s" % SYSTEM_PKGMAP c = self.conn.cursor() count = itertools.count() for line in system_pkgmap_fd: i = count.next() if not i % 1000: - print "\r%s" % i, + print "\r~%3.1f%%" % (100.0 * i / estimated_lines,), if stop_re.search(line): continue fields = re.split(WS_RE, line) @@ -225,7 +229,7 @@ pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) - print + print "\rAll lines of %s were processed." % SYSTEM_PKGMAP print "Creating the main database index." sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" c.execute(sql) @@ -287,17 +291,18 @@ return self.GetFileMtime() <= self.GetDatabaseMtime() def PurgeDatabase(self): - logging.info("Purging the cache database") + logging.info("Dropping the index.") + sql = "DROP INDEX basename_idx;" + try: + c.execute(sql) + except sqlite3.OperationalError, e: + logging.warn(e) + logging.info("Removing all rows from the cache database") c = self.conn.cursor() sql = "DELETE FROM config;" c.execute(sql) sql = "DELETE FROM systempkgmap;" c.execute(sql) - sql = "DROP INDEX basename_idx;" - try: - c.execute(sql) - except sqlite3.OperationalError, e: - logging.warn(e) def SharedObjectDependencies(pkgname, binaries_by_pkgname, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Feb 16 21:38:52 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 16 Feb 2010 20:38:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8600] csw/mgar/pkg/gd/trunk/Makefile Message-ID: Revision: 8600 http://gar.svn.sourceforge.net/gar/?rev=8600&view=rev Author: hson Date: 2010-02-16 20:38:52 +0000 (Tue, 16 Feb 2010) Log Message: ----------- gd: Add missing dependency found with new checkpkg Modified Paths: -------------- csw/mgar/pkg/gd/trunk/Makefile Modified: csw/mgar/pkg/gd/trunk/Makefile =================================================================== --- csw/mgar/pkg/gd/trunk/Makefile 2010-02-16 19:51:20 UTC (rev 8599) +++ csw/mgar/pkg/gd/trunk/Makefile 2010-02-16 20:38:52 UTC (rev 8600) @@ -23,6 +23,7 @@ RUNTIME_DEP_PKGS_CSWgd = CSWexpat CSWfconfig CSWftype2 CSWiconv RUNTIME_DEP_PKGS_CSWgd += CSWjpeg CSWpng CSWxpm CSWzlib CSWlibx11 +RUNTIME_DEP_PKGS_CSWgd += CSWlibxpm UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Feb 16 23:36:37 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 16 Feb 2010 22:36:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8602] csw/mgar/pkg/gengetopt/trunk/Makefile Message-ID: Revision: 8602 http://gar.svn.sourceforge.net/gar/?rev=8602&view=rev Author: hson Date: 2010-02-16 22:36:37 +0000 (Tue, 16 Feb 2010) Log Message: ----------- gengetopt: Add 64-bit build Modified Paths: -------------- csw/mgar/pkg/gengetopt/trunk/Makefile Modified: csw/mgar/pkg/gengetopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/gengetopt/trunk/Makefile 2010-02-16 22:31:33 UTC (rev 8601) +++ csw/mgar/pkg/gengetopt/trunk/Makefile 2010-02-16 22:36:37 UTC (rev 8602) @@ -19,6 +19,8 @@ SPKG_SOURCEURL = http://www.gnu.org/software/gengetopt/ +BUILD64 = 1 + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Feb 16 23:31:35 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 16 Feb 2010 22:31:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[8601] csw/mgar/pkg/htmldoc/trunk/checksums Message-ID: Revision: 8601 http://gar.svn.sourceforge.net/gar/?rev=8601&view=rev Author: hson Date: 2010-02-16 22:31:33 +0000 (Tue, 16 Feb 2010) Log Message: ----------- htmldoc: checksump file update Modified Paths: -------------- csw/mgar/pkg/htmldoc/trunk/checksums Modified: csw/mgar/pkg/htmldoc/trunk/checksums =================================================================== --- csw/mgar/pkg/htmldoc/trunk/checksums 2010-02-16 20:38:52 UTC (rev 8600) +++ csw/mgar/pkg/htmldoc/trunk/checksums 2010-02-16 22:31:33 UTC (rev 8601) @@ -1,2 +1,2 @@ -35589e7b8fe9c54e11be87cd5aec4dcc download/htmldoc-1.8.27-source.tar.bz2 -b44e823414126306dd5c8d222065e00c download/mainpatch +35589e7b8fe9c54e11be87cd5aec4dcc htmldoc-1.8.27-source.tar.bz2 +b44e823414126306dd5c8d222065e00c mainpatch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Feb 16 23:44:45 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 16 Feb 2010 22:44:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8603] csw/mgar/pkg/ilmbase/trunk/Makefile Message-ID: Revision: 8603 http://gar.svn.sourceforge.net/gar/?rev=8603&view=rev Author: hson Date: 2010-02-16 22:44:44 +0000 (Tue, 16 Feb 2010) Log Message: ----------- ilmbase: Add some checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/ilmbase/trunk/Makefile Modified: csw/mgar/pkg/ilmbase/trunk/Makefile =================================================================== --- csw/mgar/pkg/ilmbase/trunk/Makefile 2010-02-16 22:36:37 UTC (rev 8602) +++ csw/mgar/pkg/ilmbase/trunk/Makefile 2010-02-16 22:44:44 UTC (rev 8603) @@ -41,6 +41,12 @@ RUNTIME_DEP_PKGS_CSWilmbase += RUNTIME_DEP_PKGS_CSWilmbasedevel += CSWilmbase +CHECKPKG_OVERRIDES += CSWilmbase|symbol-not-found|libIex.so.2.0.2 +CHECKPKG_OVERRIDES += CSWilmbase|symbol-not-found|libHalf.so.2.0.2 +CHECKPKG_OVERRIDES += CSWilmbase|symbol-not-found|libImath.so.2.0.2 +CHECKPKG_OVERRIDES += CSWilmbase|symbol-not-found|libIlmThread.so.6.0.0 +CHECKPKG_OVERRIDES += CSWilmbase|symbol-not-found|libImath.so.6.0.0 + SPKG_SOURCEURL = http://www.openexr.com LICENSE = LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Feb 16 23:51:41 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 16 Feb 2010 22:51:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[8604] csw/mgar/pkg/wmf/trunk/Makefile Message-ID: Revision: 8604 http://gar.svn.sourceforge.net/gar/?rev=8604&view=rev Author: hson Date: 2010-02-16 22:51:41 +0000 (Tue, 16 Feb 2010) Log Message: ----------- wmf: Add checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2010-02-16 22:44:44 UTC (rev 8603) +++ csw/mgar/pkg/wmf/trunk/Makefile 2010-02-16 22:51:41 UTC (rev 8604) @@ -54,6 +54,14 @@ ARCHALL_CSWwmfdoc = 1 ARCHALL_CSWwmffonts = 1 +CHECKPKG_OVERRIDES += CSWlibwmf|symbol-not-found|libwmf-0.2.so.7.1.0 +CHECKPKG_OVERRIDES += CSWwmf|symbol-not-found|io-wmf.so +CHECKPKG_OVERRIDES += CSWwmf|symbol-not-found|wmf2gd +CHECKPKG_OVERRIDES += CSWwmf|symbol-not-found|wmf2x +CHECKPKG_OVERRIDES += CSWwmf|symbol-not-found|wmf2fig +CHECKPKG_OVERRIDES += CSWwmf|symbol-not-found|wmf2svg +CHECKPKG_OVERRIDES += CSWwmf|symbol-not-found|wmf2eps + BUILD64 = 1 EXTRA_INC = $(prefix)/X11/include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Feb 17 00:03:40 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 16 Feb 2010 23:03:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[8605] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 8605 http://gar.svn.sourceforge.net/gar/?rev=8605&view=rev Author: hson Date: 2010-02-16 23:03:39 +0000 (Tue, 16 Feb 2010) Log Message: ----------- Update to 6.5.9-5 Change syntax of runtime_dep_pkgs Add a ton of checkpkg overrides 6.5.9 requires a new configure parameter, --with-module=yes Disable 64-bit until deps are released Add some extra ld_flags Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-02-16 22:51:41 UTC (rev 8604) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-02-16 23:03:39 UTC (rev 8605) @@ -1,6 +1,6 @@ GARNAME = imagemagick GARVERSION = 6.5.9 -GARSUBREV = 0 +GARSUBREV = 5 CATEGORIES = lib DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -20,13 +20,262 @@ LICENSE = LICENSE -RUNTIME_DEP_PKGS += CSWbzip2 CSWdjvulibrert CSWfconfig CSWftype2 CSWggettextrt -RUNTIME_DEP_PKGS += CSWglib2 CSWgs CSWgtk2 CSWilmbase CSWjasper CSWjbigkit -RUNTIME_DEP_PKGS += CSWjpeg CSWlcms CSWlibcairo CSWlibfpx CSWlibrsvg CSWlibxml2 -RUNTIME_DEP_PKGS += CSWopenexr CSWperl CSWpng CSWsunmath CSWtiff CSWwmf CSWzlib -RUNTIME_DEP_PKGS += CSWlibtoolrt CSWlibice CSWlibsm CSWlibxext CSWgraphviz -RUNTIME_DEP_PKGS += CSWlibx11 CSWlibxt +RUNTIME_DEP_PKGS_CSWimagemagick += CSWbzip2 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWdjvulibrert +RUNTIME_DEP_PKGS_CSWimagemagick += CSWfconfig +RUNTIME_DEP_PKGS_CSWimagemagick += CSWftype2 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWggettextrt +RUNTIME_DEP_PKGS_CSWimagemagick += CSWglib2 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWgraphviz +RUNTIME_DEP_PKGS_CSWimagemagick += CSWgs +RUNTIME_DEP_PKGS_CSWimagemagick += CSWgtk2 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWilmbase +RUNTIME_DEP_PKGS_CSWimagemagick += CSWjasper +RUNTIME_DEP_PKGS_CSWimagemagick += CSWjbigkit +RUNTIME_DEP_PKGS_CSWimagemagick += CSWjpeg +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcairo +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfpx +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibice +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibsm +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibtoolrt +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmf +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibx11 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxext +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxt +RUNTIME_DEP_PKGS_CSWimagemagick += CSWopenexr +RUNTIME_DEP_PKGS_CSWimagemagick += CSWperl +RUNTIME_DEP_PKGS_CSWimagemagick += CSWpng +RUNTIME_DEP_PKGS_CSWimagemagick += CSWsunmath +RUNTIME_DEP_PKGS_CSWimagemagick += CSWtiffrt +RUNTIME_DEP_PKGS_CSWimagemagick += CSWzlib +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|libMagick++.so.10.0.4 +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ept.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cip.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|otb.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|gif.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|vid.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pix.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mvg.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|palm.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pdf.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|avs.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pcd.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|icon.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|magick.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|tim.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xc.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ps2.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|raw.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xcf.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dps.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ps3.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ps.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mpc.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|fpx.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pnm.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mpeg.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xwd.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|url.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|gray.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ycbcr.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|rgb.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|tile.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|uil.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pwp.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|sfw.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|stegano.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pattern.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|txt.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mpr.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|html.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|info.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pdb.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cut.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|msl.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|jp2.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|fits.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|vicar.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cmyk.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|histogram.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|scr.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|avi.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|label.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|bmp.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|psd.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|jbig.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|null.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dcm.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|tiff.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dot.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|sun.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|wmf.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|x.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ttf.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|miff.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xbm.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|jpeg.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|map.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|rle.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|art.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xpm.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|svg.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|uyvy.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|tga.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dib.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|wbmp.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|fax.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|clip.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|sct.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pcl.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mono.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|rla.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|matte.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mat.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pict.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|preview.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|viff.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|meta.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|gradient.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|sgi.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|yuv.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cin.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|plasma.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|png.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mtv.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pcx.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|caption.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|wpg.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dpx.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|analyze.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|inline.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pcd.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|jpeg.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ps2.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|miff.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|tim.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mpc.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xcf.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ps3.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|raw.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|uyvy.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pnm.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|fpx.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|jbig.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cip.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ept.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|label.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|otb.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cmyk.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|thumbnail.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|tiff.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|gif.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|braille.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|avs.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pdf.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|null.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pix.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mvg.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|exr.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|vid.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|txt.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mpr.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|x.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|msl.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pdb.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cut.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|plasma.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|jp2.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dds.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|hald.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|caption.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xwd.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|hrz.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|clip.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|wbmp.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|rgb.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|url.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|sfw.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|meta.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|uil.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|viff.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pwp.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|matte.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pict.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|preview.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xps.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mono.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xbm.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ttf.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|sun.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|magick.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|wmf.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|art.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|rle.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|map.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|icon.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dng.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|svg.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xpm.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|tga.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xc.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|bmp.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cals.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|scr.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|psd.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dcm.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|palm.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dot.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ipl.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ps.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|sgi.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|gradient.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|info.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|html.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|png.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|stegano.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|djvu.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cin.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pattern.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|yuv.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pcx.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mtv.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|vicar.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|fits.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dpx.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|wpg.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ycbcr.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dib.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|gray.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|sct.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pcl.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mpeg.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|histogram.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|fax.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mat.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|tile.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|rla.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|convolve.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|analyze.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|libMagick++.so.2.0.1 +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|libWand.so.10.0.4 +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|libMagickWand.so.2.0.1 +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|Magick.so +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|conjure +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|montage +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|animate +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|import +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|display +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mogrify +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|identify +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|convert +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|compare2 +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|composite +CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|stream + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 @@ -36,16 +285,18 @@ CONFIGURE_ARGS_COMMON += --with-dps=yes --with-gslib=yes CONFIGURE_ARGS_COMMON += --x-includes=/opt/csw/X11/include CONFIGURE_ARGS_COMMON += --x-libraries=/opt/csw/X11/lib +CONFIGURE_ARGS_COMMON += --with-modules=yes CONFIGURE_ARGS_COMMON += --disable-openmp CONFIGURE_ARGS_COMMON += --disable-silent-rules -CONFIGURE_ARGS_isa-amd64 += --without-gvc -CONFIGURE_ARGS_isa-amd64 += --without-rsvg -CONFIGURE_ARGS_isa-amd64 += --without-perl -CONFIGURE_ARGS_isa-sparcv9 += --without-gvc -CONFIGURE_ARGS_isa-sparcv9 += --without-rsvg -CONFIGURE_ARGS_isa-sparcv9 += --without-perl +# Until librsvg,graphviz and perl is 64bit +#CONFIGURE_ARGS_isa-amd64 += --without-gvc +#CONFIGURE_ARGS_isa-amd64 += --without-rsvg +#CONFIGURE_ARGS_isa-amd64 += --without-perl +#CONFIGURE_ARGS_isa-sparcv9 += --without-gvc +#CONFIGURE_ARGS_isa-sparcv9 += --without-rsvg +#CONFIGURE_ARGS_isa-sparcv9 += --without-perl -CONFIGURE_ARGS ?= $(CONFIGURE_ARGS_COMMON) $(foreach M,$(MODULATIONS),$(CONFIGURE_ARGS_$M)) +CONFIGURE_ARGS = $(CONFIGURE_ARGS_COMMON) $(foreach M,$(MODULATIONS),$(CONFIGURE_ARGS_$M)) PATCHFILES += Makefile.patch # Temporary patch until upstream make a more permenent fix @@ -55,17 +306,20 @@ #TEST_TARGET = check TEST_TARGET = -BUILD64 = 1 +#Dependencies not 64-bit yet +#BUILD64 = 1 EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib #EXTRA_LDFLAGS = -L./magick/.libs #EXTRA_LD_OPTIONS = -L./magick/.libs +# +EXTRA_SOS_LD_FLAGS += -L$(shell pwd)/$(WORKSRC)/magick/.libs +EXTRA_SOS_LD_FLAGS += -L$(shell pwd)/$(WORKSRC)/wand/.libs # We want to be link with Xrender from $(prefix)/X11/lib not $(prefix)/lib # since the latter is linked to /usr/openwin/lib/libX11.so.4 -EXTRA_SOS_LD_FLAGS = -L./magick/.libs -EXTRA_SOS_LD_FLAGS +=-L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_SOS_LD_FLAGS += -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/lib.*\.la EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2010-02-16 22:51:41 UTC (rev 8604) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2010-02-16 23:03:39 UTC (rev 8605) @@ -1,2 +1,2 @@ -58130d17863449ad1b7c6d04cee95943 ImageMagick-6.5.9-0.tar.bz2 +ee8f6c42f982fe785c5df8f89e6deb91 ImageMagick-6.5.9-5.tar.bz2 6bd361fe352c7d497d60d8d2cbe7cfd4 Makefile.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Feb 17 00:08:53 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 16 Feb 2010 23:08:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8606] csw/mgar/pkg/tiff/trunk/Makefile Message-ID: Revision: 8606 http://gar.svn.sourceforge.net/gar/?rev=8606&view=rev Author: hson Date: 2010-02-16 23:08:53 +0000 (Tue, 16 Feb 2010) Log Message: ----------- Change catalogname Add checkpkg override Modified Paths: -------------- csw/mgar/pkg/tiff/trunk/Makefile Modified: csw/mgar/pkg/tiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tiff/trunk/Makefile 2010-02-16 23:03:39 UTC (rev 8605) +++ csw/mgar/pkg/tiff/trunk/Makefile 2010-02-16 23:08:53 UTC (rev 8606) @@ -12,7 +12,7 @@ PACKAGES = CSWtiff CSWtiffrt CSWtiffdevel CSWtiffdoc CATALOGNAME_CSWtiff = tiff -CATALOGNAME_CSWtiffrt = tiffrt +CATALOGNAME_CSWtiffrt = tiff_rt CATALOGNAME_CSWtiffdevel = tiff_devel CATALOGNAME_CSWtiffdoc = tiff_doc @@ -32,6 +32,7 @@ ARCHALL_CSWtiffdoc = 1 +CHECKPKG_OVERRIDES += CSWtiffdevel|missing-dependency|CSWtiff LICENSE = COPYRIGHT UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Feb 17 00:10:13 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 16 Feb 2010 23:10:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8607] csw/mgar/pkg/ghostscript/trunk/Makefile Message-ID: Revision: 8607 http://gar.svn.sourceforge.net/gar/?rev=8607&view=rev Author: hson Date: 2010-02-16 23:10:13 +0000 (Tue, 16 Feb 2010) Log Message: ----------- Add missing dependency Add checkpkg overrides Add license file Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2010-02-16 23:08:53 UTC (rev 8606) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2010-02-16 23:10:13 UTC (rev 8607) @@ -16,11 +16,17 @@ RUNTIME_DEP_PKGS_CSWgs += CSWfconfig CSWjpeg CSWlibcairo CSWgsfonts RUNTIME_DEP_PKGS_CSWgs += CSWftype2 CSWggettextrt CSWglib2 CSWgnutls CSWgtk2 RUNTIME_DEP_PKGS_CSWgs += CSWkrb5lib CSWlibatk CSWlibcups CSWpango CSWperl CSWzlib +RUNTIME_DEP_PKGS_CSWgs += CSWjbig2dec # Pending release of libpaper #RUNTIME_DEP_PKGS_CSWgs += CSWlibpaper +CHECKPKG_OVERRIDES += CSWgs|symbol-not-found|gsc +CHECKPKG_OVERRIDES += CSWgs|symbol-not-found|gsx + SPKG_SOURCEURL = http://www.ghostscript.com +LICENSE = LICENSE + UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)= UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Feb 17 01:16:18 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 17 Feb 2010 00:16:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8608] csw/mgar/gar/v2-checkpkg-stats Message-ID: Revision: 8608 http://gar.svn.sourceforge.net/gar/?rev=8608&view=rev Author: wahwah Date: 2010-02-17 00:16:14 +0000 (Wed, 17 Feb 2010) Log Message: ----------- mGAR v2-checkpkg-stats: Fixed a problem with custom-pkgtrans Modified Paths: -------------- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-actionclasses.py csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py csw/mgar/gar/v2-checkpkg-stats/gar.conf.mk csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-actionclasses.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-actionclasses.py 2010-02-16 23:10:13 UTC (rev 8607) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-actionclasses.py 2010-02-17 00:16:14 UTC (rev 8608) @@ -49,6 +49,10 @@ def main(): options, args = checkpkg.GetOptions() + if options.debug: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.INFO) md5sums = args # CheckpkgManager class abstracts away things such as the collection of # results. Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py 2010-02-16 23:10:13 UTC (rev 8607) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py 2010-02-17 00:16:14 UTC (rev 8608) @@ -32,7 +32,7 @@ else: logging.basicConfig(level=logging.INFO) logging.info("Collecting statistics about given package files.") - logging.debug("args: %s", args) + logging.debug("calling: %s, please be patient", args) packages = [opencsw.CswSrv4File(x, options.debug) for x in args] stats_list = [checkpkg.PackageStats(pkg) for pkg in packages] for pkg_stats in stats_list: Modified: csw/mgar/gar/v2-checkpkg-stats/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/gar.conf.mk 2010-02-16 23:10:13 UTC (rev 8607) +++ csw/mgar/gar/v2-checkpkg-stats/gar.conf.mk 2010-02-17 00:16:14 UTC (rev 8608) @@ -179,6 +179,7 @@ DEF_BASE_PKGS += CSWgsed DEF_BASE_PKGS += CSWgtar DEF_BASE_PKGS += CSWpy-cheetah +DEF_BASE_PKGS += CSWpy-yaml DEF_BASE_PKGS += CSWpython DEF_BASE_PKGS += CSWtextutils DEF_BASE_PKGS += CSWwget Modified: csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py 2010-02-16 23:10:13 UTC (rev 8607) +++ csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py 2010-02-17 00:16:14 UTC (rev 8608) @@ -291,14 +291,14 @@ return self.GetFileMtime() <= self.GetDatabaseMtime() def PurgeDatabase(self): + c = self.conn.cursor() logging.info("Dropping the index.") sql = "DROP INDEX basename_idx;" try: c.execute(sql) except sqlite3.OperationalError, e: logging.warn(e) - logging.info("Removing all rows from the cache database") - c = self.conn.cursor() + logging.info("Deleting all rows from the cache database") sql = "DELETE FROM config;" c.execute(sql) sql = "DELETE FROM systempkgmap;" @@ -692,7 +692,6 @@ basket_b["tag_info"] = tag.tag_info basket_a["tag_name"] = self.tag_name basket_b["tag_name"] = tag.tag_name - # print "comparing", basket_a, basket_b return basket_a == basket_b def ParseOverrideLine(line): @@ -929,6 +928,7 @@ f = open(in_file_name, "r") obj = yaml.safe_load(f) f.close() + logging.debug("ReadObject(): finished reading %s", repr(in_file_name)) return obj def ReadSavedStats(self): Modified: csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py 2010-02-16 23:10:13 UTC (rev 8607) +++ csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py 2010-02-17 00:16:14 UTC (rev 8608) @@ -344,14 +344,13 @@ def ShellCommand(self, args, quiet=False): logging.debug("Calling: %s", repr(args)) if quiet: - sub_stdout = subprocess.PIPE - sub_stderr = subprocess.PIPE + process = subprocess.Popen(args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = process.communicate() + retcode = process.wait() else: - sub_stdout = None - sub_stderr = None - retcode = subprocess.call(args, - stdout=sub_stdout, - stderr=sub_stderr) + retcode = subprocess.call(args) if retcode: raise Error("Running %s has failed." % repr(args)) return retcode @@ -406,15 +405,28 @@ This requires custom-pkgtrans to be available. """ if not os.path.isdir(destdir): - raise PackageError("%s doesn't exist or is not a directory" % destdir) + raise PackageError("%s doesn't exist or is not a directory" % destdir) args = [os.path.join(os.path.dirname(__file__), "custom-pkgtrans"), src_file, destdir, pkgname ] pkgtrans_proc = subprocess.Popen(args) pkgtrans_proc.communicate() ret = pkgtrans_proc.wait() if ret: - logging.error("% has failed" % args) + logging.error("% has failed" % args) + def GetPkgname(self): + """It's necessary to figure out the pkgname from the .pkg file. + # nawk 'NR == 2 {print $1; exit;} $f + """ + gunzipped_path = self.GetGunzippedPath() + args = ["nawk", "NR == 2 {print $1; exit;}", gunzipped_path] + nawk_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = nawk_proc.communicate() + ret_code = nawk_proc.wait() + pkgname = stdout.strip() + logging.debug("GetPkgname(): %s", repr(pkgname)) + return pkgname + def TransformToDir(self): """Transforms the file to the directory format. @@ -423,10 +435,12 @@ achieve consistent behavior. """ if not self.transformed: + gunzipped_path = self.GetGunzippedPath() + pkgname = self.GetPkgname() args = [os.path.join(os.path.dirname(__file__), "..", "..", "bin", "custom-pkgtrans"), - self.GetGunzippedPath(), self.GetWorkDir(), "all"] - print "args", args + gunzipped_path, self.GetWorkDir(), pkgname] + print "transforming", args unused_retcode = self.ShellCommand(args, quiet=(not self.debug)) dirs = self.GetDirs() if len(dirs) != 1: @@ -753,15 +767,15 @@ # worry about that at this stage. logging.debug("Trying to open %s", repr(file_path)) if os.path.isfile(file_path): - return open(file_path, "r") + return open(file_path, "r") else: - return None + return None def _ParseOverridesStream(self, stream): overrides = [] for line in stream: if line.startswith("#"): - continue + continue overrides.append(checkpkg.ParseOverrideLine(line)) return overrides @@ -769,9 +783,9 @@ """Returns overrides, a list of checkpkg.Override instances.""" stream = self._GetOverridesStream() if stream: - return self._ParseOverridesStream(stream) + return self._ParseOverridesStream(stream) else: - return list() + return list() class Pkgmap(object): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Feb 17 01:26:19 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 17 Feb 2010 00:26:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8609] csw/mgar/pkg/pyyaml/trunk/Makefile Message-ID: Revision: 8609 http://gar.svn.sourceforge.net/gar/?rev=8609&view=rev Author: wahwah Date: 2010-02-17 00:26:11 +0000 (Wed, 17 Feb 2010) Log Message: ----------- pyyaml: Making CSWpy-yaml depend on CSWpy-yaml-rt, adding the license Modified Paths: -------------- csw/mgar/pkg/pyyaml/trunk/Makefile Modified: csw/mgar/pkg/pyyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyyaml/trunk/Makefile 2010-02-17 00:16:14 UTC (rev 8608) +++ csw/mgar/pkg/pyyaml/trunk/Makefile 2010-02-17 00:26:11 UTC (rev 8609) @@ -30,16 +30,17 @@ MASTER_SITES = http://pyyaml.org/download/pyyaml/ DISTFILES = $(PROJ_NAME)-$(GARVERSION).tar.gz -WORKSRC = $(WORKDIR)/$(PROJ_NAME)-$(GARVERSION) +DISTNAME = $(PROJ_NAME)-$(GARVERSION) SPKG_SOURCEURL = http://pyyaml.org/wiki/PyYAML +LICENSE = LICENSE PACKAGES = CSWpy-yaml CSWpy-yaml-rt CATALOGNAME_CSWpy-yaml = py_yaml CATALOGNAME_CSWpy-yaml-rt = py_yaml_rt -RUNTIME_DEP_PKGS_CSWpy-yaml = +RUNTIME_DEP_PKGS_CSWpy-yaml = CSWpy-yaml-rt RUNTIME_DEP_PKGS_CSWpy-yaml-rt = CSWlibyaml -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWpy-yaml) $(RUNTIME_DEP_PKGS_CSWpy-yaml-rt) +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWpy-yaml-rt) SPKG_DESC_CSWpy-yaml = YAML parser and emitter for Python SPKG_DESC_CSWpy-yaml-rt = Runtime libraries for YAML parser and emitter This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Feb 17 08:55:58 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 17 Feb 2010 07:55:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8610] csw/mgar/gar/v2-checkpkg-stats/bin/custom-pkgtrans Message-ID: Revision: 8610 http://gar.svn.sourceforge.net/gar/?rev=8610&view=rev Author: wahwah Date: 2010-02-17 07:55:58 +0000 (Wed, 17 Feb 2010) Log Message: ----------- mGAR v2-checkpkg-stats: custom-pkgtrans can't handle 'all' Modified Paths: -------------- csw/mgar/gar/v2-checkpkg-stats/bin/custom-pkgtrans Modified: csw/mgar/gar/v2-checkpkg-stats/bin/custom-pkgtrans =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/custom-pkgtrans 2010-02-17 00:26:11 UTC (rev 8609) +++ csw/mgar/gar/v2-checkpkg-stats/bin/custom-pkgtrans 2010-02-17 07:55:58 UTC (rev 8610) @@ -12,7 +12,11 @@ . "${libshdir}/libcheckpkg.sh" if [[ -z "$1" || -z "$2" || -z "$3" ]]; then - print "usage: $0 " + print >&2 "usage: $0 " exit 1 fi +if [[ "$3" == "all" ]]; then + print >&2 "This script can't handle 'all' as the third argument" + exit 1 +fi custom_pkgtrans "$1" "$2" "$3" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Feb 17 09:45:22 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 17 Feb 2010 08:45:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8611] csw/mgar/pkg Message-ID: Revision: 8611 http://gar.svn.sourceforge.net/gar/?rev=8611&view=rev Author: wahwah Date: 2010-02-17 08:45:22 +0000 (Wed, 17 Feb 2010) Log Message: ----------- rsync: Initial commit, version 3.0.7 Modified Paths: -------------- csw/mgar/pkg/rsync/trunk/Makefile csw/mgar/pkg/rsync/trunk/checksums Added Paths: ----------- csw/mgar/pkg/rsync/ Modified: csw/mgar/pkg/rsync/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-02-13 12:42:13 UTC (rev 8535) +++ csw/mgar/pkg/rsync/trunk/Makefile 2010-02-17 08:45:22 UTC (rev 8611) @@ -11,8 +11,8 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = rsync +GARVERSION = 3.0.7 ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -22,24 +22,26 @@ ## Possible settings are: ## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, ## utils, x11, xfce, xorg, xtra -CATEGORIES = lib +CATEGORIES = utils ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = utility which provides fast incremental file transfer ## ## A longer description of the package. This is only for descriptive purposes ## inside the Makefile and is not used elsewhere. define BLURB - + rsync is an open source utility that provides fast incremental file transfer. + rsync is freely available under the GNU General Public License and is + currently being maintained by Wayne Davison. endef ## ## Upstream URL that should show up in the VENDOR field as well as on ## http://opencsw.org/packages/. -SPKG_SOURCEURL = +SPKG_SOURCEURL = http://rsync.samba.org/ ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = +MASTER_SITES = http://samba.anu.edu.au/ftp/rsync/ ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -56,7 +58,6 @@ ## $(MASTER_SITES). DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz ## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz ## ## Catalog name is the name to be used with pkg{-get,util} -i . @@ -162,7 +163,7 @@ ## Arguments passed to the ./configure script. CONFIGURE_ARGS = $(DIRPATHS) ## -## BUILD64 = +BUILD64 = 1 ## CONFIGURE_ENV = ## EXTRA_CFLAGS = ## EXTRA_LDFLAGS = @@ -176,10 +177,6 @@ ## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. ## GARCOMPILER = SOS11 ## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +RUNTIME_DEP_PKGS_CSWrsync = CSWiconv +RUNTIME_DEP_PKGS_CSWrsync += CSWlibpopt +include gar/category.mk Modified: csw/mgar/pkg/rsync/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-02-13 12:42:13 UTC (rev 8535) +++ csw/mgar/pkg/rsync/trunk/checksums 2010-02-17 08:45:22 UTC (rev 8611) @@ -0,0 +1 @@ +b53525900817cf1ba7ad3a516ab5bfe9 rsync-3.0.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Feb 17 10:31:22 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 17 Feb 2010 09:31:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8612] csw/mgar/pkg/ilmbase/trunk/Makefile Message-ID: Revision: 8612 http://gar.svn.sourceforge.net/gar/?rev=8612&view=rev Author: hson Date: 2010-02-17 09:31:22 +0000 (Wed, 17 Feb 2010) Log Message: ----------- ilmbase: Change checkpkg override syntax Modified Paths: -------------- csw/mgar/pkg/ilmbase/trunk/Makefile Modified: csw/mgar/pkg/ilmbase/trunk/Makefile =================================================================== --- csw/mgar/pkg/ilmbase/trunk/Makefile 2010-02-17 08:45:22 UTC (rev 8611) +++ csw/mgar/pkg/ilmbase/trunk/Makefile 2010-02-17 09:31:22 UTC (rev 8612) @@ -41,12 +41,13 @@ RUNTIME_DEP_PKGS_CSWilmbase += RUNTIME_DEP_PKGS_CSWilmbasedevel += CSWilmbase -CHECKPKG_OVERRIDES += CSWilmbase|symbol-not-found|libIex.so.2.0.2 -CHECKPKG_OVERRIDES += CSWilmbase|symbol-not-found|libHalf.so.2.0.2 -CHECKPKG_OVERRIDES += CSWilmbase|symbol-not-found|libImath.so.2.0.2 -CHECKPKG_OVERRIDES += CSWilmbase|symbol-not-found|libIlmThread.so.6.0.0 -CHECKPKG_OVERRIDES += CSWilmbase|symbol-not-found|libImath.so.6.0.0 +CHECKPKG_OVERRIDES_CSWilmbase += symbol-not-found|libIex.so.2.0.2 +CHECKPKG_OVERRIDES_CSWilmbase += symbol-not-found|libHalf.so.2.0.2 +CHECKPKG_OVERRIDES_CSWilmbase += symbol-not-found|libImath.so.2.0.2 +CHECKPKG_OVERRIDES_CSWilmbase += symbol-not-found|libIlmThread.so.6.0.0 +CHECKPKG_OVERRIDES_CSWilmbase += symbol-not-found|libImath.so.6.0.0 + SPKG_SOURCEURL = http://www.openexr.com LICENSE = LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Feb 17 10:39:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Feb 2010 09:39:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8613] csw/mgar/pkg/diffutils/trunk Message-ID: Revision: 8613 http://gar.svn.sourceforge.net/gar/?rev=8613&view=rev Author: dmichelsen Date: 2010-02-17 09:39:52 +0000 (Wed, 17 Feb 2010) Log Message: ----------- diffutils: Update to 2.9 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/diffutils/trunk/Makefile csw/mgar/pkg/diffutils/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/diffutils/trunk/ Property changes on: csw/mgar/pkg/diffutils/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/diffutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/diffutils/trunk/Makefile 2010-02-17 09:31:22 UTC (rev 8612) +++ csw/mgar/pkg/diffutils/trunk/Makefile 2010-02-17 09:39:52 UTC (rev 8613) @@ -1,5 +1,5 @@ GARNAME = diffutils -GARVERSION = 2.8.1 +GARVERSION = 2.9 CATEGORIES = utils DESCRIPTION = Diff utilities @@ -13,8 +13,13 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +DEP_PKGS = CSWggettextrt CSWiconv CSWlibsigsegv + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --program-prefix=g TEST_TARGET = check +EXTRA_MERGE_EXCLUDE_FILES = /opt/csw/lib/charset.alias + include gar/category.mk Modified: csw/mgar/pkg/diffutils/trunk/checksums =================================================================== --- csw/mgar/pkg/diffutils/trunk/checksums 2010-02-17 09:31:22 UTC (rev 8612) +++ csw/mgar/pkg/diffutils/trunk/checksums 2010-02-17 09:39:52 UTC (rev 8613) @@ -1 +1 @@ -71f9c5ae19b60608f6c7f162da86a428 download/diffutils-2.8.1.tar.gz +d6bc1bdc874ddb14cfed4d1655a0dbbe diffutils-2.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 Wed Feb 17 11:00:50 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Feb 2010 10:00:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8614] csw/mgar/pkg Message-ID: Revision: 8614 http://gar.svn.sourceforge.net/gar/?rev=8614&view=rev Author: dmichelsen Date: 2010-02-17 10:00:50 +0000 (Wed, 17 Feb 2010) Log Message: ----------- libsigsegv: Initial commit Added Paths: ----------- csw/mgar/pkg/libsigsegv/ csw/mgar/pkg/libsigsegv/branches/ csw/mgar/pkg/libsigsegv/tags/ csw/mgar/pkg/libsigsegv/trunk/ csw/mgar/pkg/libsigsegv/trunk/Makefile csw/mgar/pkg/libsigsegv/trunk/checksums csw/mgar/pkg/libsigsegv/trunk/files/ Property changes on: csw/mgar/pkg/libsigsegv/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/libsigsegv/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsigsegv/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libsigsegv/trunk/Makefile 2010-02-17 10:00:50 UTC (rev 8614) @@ -0,0 +1,25 @@ +GARNAME = libsigsegv +GARVERSION = 2.8 +CATEGORIES = lib + +DESCRIPTION = A library for catching and handling segmentation faults +define BLURB + This is a library for handling page faults in user mode. A page fault occurs + when a program tries to access to a region of memory that is currently not available. +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.gnu.org/software/libsigsegv/ + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared --disable-static + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/libsigsegv/trunk/checksums =================================================================== --- csw/mgar/pkg/libsigsegv/trunk/checksums (rev 0) +++ csw/mgar/pkg/libsigsegv/trunk/checksums 2010-02-17 10:00:50 UTC (rev 8614) @@ -0,0 +1 @@ +ebe554e26870d8bc200ef3e3539ffd7c libsigsegv-2.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Feb 17 12:14:39 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 17 Feb 2010 11:14:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8615] csw/mgar/gar/v2-checkpkg-stats/lib/python Message-ID: Revision: 8615 http://gar.svn.sourceforge.net/gar/?rev=8615&view=rev Author: wahwah Date: 2010-02-17 11:14:39 +0000 (Wed, 17 Feb 2010) Log Message: ----------- mGAR v2-checkpkg-stats: cPickle serialization is much faster than yaml Modified Paths: -------------- csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py Modified: csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py 2010-02-17 10:00:50 UTC (rev 8614) +++ csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py 2010-02-17 11:14:39 UTC (rev 8615) @@ -4,6 +4,7 @@ # Python. import copy +import cPickle import errno import itertools import logging @@ -894,6 +895,7 @@ stats_path = self.GetStatsPath() self.MakeStatsDir() dir_pkg = self.GetDirFormatPkg() + logging.info("Collecting package statistics.") self.DumpObject(dir_pkg.GetAllFilenames(), "all_filenames") self.DumpObject(self.GetBasicStats(), "basic_stats") self.DumpObject(dir_pkg.ListBinaries(), "binaries") @@ -904,31 +906,51 @@ self.DumpObject(dir_pkg.GetParsedPkginfo(), "pkginfo") self.DumpObject(dir_pkg.GetPkgmap().entries, "pkgmap") self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") + logging.debug("Statistics collected.") + def GetAllStats(self): + if self.StatsExist(): + self.all_stats = self.ReadSavedStats() + else: + self.CollectStats() + return self.all_stats + def DumpObject(self, obj, name): + """Saves an object. + + TODO(maciej): Implement pickling with cPickle. + """ stats_path = self.GetStatsPath() + # yaml out_file_name = os.path.join(stats_path, "%s.yml" % name) logging.debug("DumpObject(): writing %s", repr(out_file_name)) f = open(out_file_name, "w") f.write(yaml.safe_dump(obj)) f.close() + # pickle + out_file_name_pickle = os.path.join(stats_path, "%s.pickle" % name) + f = open(out_file_name_pickle, "wb") + cPickle.dump(obj, f) + f.close() self.all_stats[name] = obj - def GetAllStats(self): - if self.StatsExist(): - self.all_stats = self.ReadSavedStats() - else: - self.CollectStats() - return self.all_stats - def ReadObject(self, name): + """Reads an object.""" stats_path = self.GetStatsPath() in_file_name = os.path.join(stats_path, "%s.yml" % name) - logging.debug("ReadObject(): reading %s", repr(in_file_name)) - f = open(in_file_name, "r") - obj = yaml.safe_load(f) - f.close() - logging.debug("ReadObject(): finished reading %s", repr(in_file_name)) + in_file_name_pickle = os.path.join(stats_path, "%s.pickle" % name) + if os.path.exists(in_file_name_pickle): + logging.debug("ReadObject(): reading %s", repr(in_file_name_pickle)) + f = open(in_file_name_pickle, "r") + obj = cPickle.load(f) + f.close() + logging.debug("ReadObject(): finished reading %s", repr(in_file_name_pickle)) + else: + logging.debug("ReadObject(): reading %s", repr(in_file_name)) + f = open(in_file_name, "r") + obj = yaml.safe_load(f) + f.close() + logging.debug("ReadObject(): finished reading %s", repr(in_file_name)) return obj def ReadSavedStats(self): Modified: csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py 2010-02-17 10:00:50 UTC (rev 8614) +++ csw/mgar/gar/v2-checkpkg-stats/lib/python/opencsw.py 2010-02-17 11:14:39 UTC (rev 8615) @@ -440,7 +440,7 @@ args = [os.path.join(os.path.dirname(__file__), "..", "..", "bin", "custom-pkgtrans"), gunzipped_path, self.GetWorkDir(), pkgname] - print "transforming", args + logging.info("transforming: %s", args) unused_retcode = self.ShellCommand(args, quiet=(not self.debug)) dirs = self.GetDirs() if len(dirs) != 1: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Feb 17 13:06:37 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Feb 2010 12:06:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8616] csw/mgar/pkg/phpldapadmin/tags/phpldapadmin-1.2.0.4, REV=2009.09.23/ Message-ID: Revision: 8616 http://gar.svn.sourceforge.net/gar/?rev=8616&view=rev Author: dmichelsen Date: 2010-02-17 12:06:24 +0000 (Wed, 17 Feb 2010) Log Message: ----------- phpldapadmin: Tag 1.2.0.4,REV=2009.09.23 Added Paths: ----------- csw/mgar/pkg/phpldapadmin/tags/phpldapadmin-1.2.0.4,REV=2009.09.23/ 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 Feb 17 13:55:18 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Feb 2010 12:55:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8617] csw/mgar/pkg/phpldapadmin/trunk Message-ID: Revision: 8617 http://gar.svn.sourceforge.net/gar/?rev=8617&view=rev Author: dmichelsen Date: 2010-02-17 12:55:18 +0000 (Wed, 17 Feb 2010) Log Message: ----------- phpldapadmin: Update to 1.2.0.5 and fix #4283 Modified Paths: -------------- csw/mgar/pkg/phpldapadmin/trunk/Makefile csw/mgar/pkg/phpldapadmin/trunk/checksums csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall Modified: csw/mgar/pkg/phpldapadmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpldapadmin/trunk/Makefile 2010-02-17 12:06:24 UTC (rev 8616) +++ csw/mgar/pkg/phpldapadmin/trunk/Makefile 2010-02-17 12:55:18 UTC (rev 8617) @@ -1,5 +1,5 @@ GARNAME = phpldapadmin -GARVERSION = 1.2.0.4 +GARVERSION = 1.2.0.5 CATEGORIES = apps DESCRIPTION = Web-based LDAP browser to manage your LDAP server Modified: csw/mgar/pkg/phpldapadmin/trunk/checksums =================================================================== --- csw/mgar/pkg/phpldapadmin/trunk/checksums 2010-02-17 12:06:24 UTC (rev 8616) +++ csw/mgar/pkg/phpldapadmin/trunk/checksums 2010-02-17 12:55:18 UTC (rev 8617) @@ -1,2 +1,2 @@ -87983d70476a8a80332f0c3c188d9c2d download/CSWphpldapadmin.preinstall -a2d914e22c1b114738eca91c80c0d09c download/phpldapadmin-1.2.0.4.tgz +e0065aa1e6f36ccd29f73e691903d436 CSWphpldapadmin.preinstall +d75f043686da4c1e333ca160b0d26c01 phpldapadmin-1.2.0.5.tgz Modified: csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall =================================================================== --- csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall 2010-02-17 12:06:24 UTC (rev 8616) +++ csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall 2010-02-17 12:55:18 UTC (rev 8617) @@ -1,14 +1,17 @@ #!/bin/sh CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -if [ -d ${CSW_PREFIX}/apache2/share/htdocs/phpldapadmin ]; then +SOURCE=${CSW_PREFIX}/apache2/share/htdocs/phpldapadmin +TARGET=${CSW_PREFIX}/share/www/phpldapadmin + +if [ -d ${SOURCE} -a \! -h ${SOURCE} ]; then /usr/bin/cat < Revision: 8618 http://gar.svn.sourceforge.net/gar/?rev=8618&view=rev Author: bensons Date: 2010-02-17 13:31:48 +0000 (Wed, 17 Feb 2010) Log Message: ----------- cpan Net-ext: added patch for perl 5.10, see cpan bug #43071 Modified Paths: -------------- csw/mgar/pkg/cpan/Net-ext/trunk/Makefile csw/mgar/pkg/cpan/Net-ext/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Net-ext/trunk/files/patch-Gen.xs Modified: csw/mgar/pkg/cpan/Net-ext/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-ext/trunk/Makefile 2010-02-17 12:55:18 UTC (rev 8617) +++ csw/mgar/pkg/cpan/Net-ext/trunk/Makefile 2010-02-17 13:31:48 UTC (rev 8618) @@ -12,4 +12,6 @@ PACKAGES = CSWpmnetinet CATALOGNAME = pm_netinet +PATCHFILES = patch-Gen.xs + include gar/category.mk Modified: csw/mgar/pkg/cpan/Net-ext/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-ext/trunk/checksums 2010-02-17 12:55:18 UTC (rev 8617) +++ csw/mgar/pkg/cpan/Net-ext/trunk/checksums 2010-02-17 13:31:48 UTC (rev 8618) @@ -1 +1,2 @@ 8be68650bef6769212127d2118b44736 Net-ext-1.011.tar.gz +fb515efae85b8560433b7914f79f5932 patch-Gen.xs Added: csw/mgar/pkg/cpan/Net-ext/trunk/files/patch-Gen.xs =================================================================== --- csw/mgar/pkg/cpan/Net-ext/trunk/files/patch-Gen.xs (rev 0) +++ csw/mgar/pkg/cpan/Net-ext/trunk/files/patch-Gen.xs 2010-02-17 13:31:48 UTC (rev 8618) @@ -0,0 +1,11 @@ +--- Net-ext-1.011.orig/Gen.xs 2002-04-10 13:05:58.000000000 +0200 ++++ Net-ext-1.011/Gen.xs 2010-02-17 14:28:53.354298154 +0100 +@@ -146,7 +146,7 @@ + CV *cv; + klen = strlen(name); + (void) hv_fetch(missing, name, klen, TRUE); +- cv = newXS(name, NULL, file); /* newSUB with no block */ ++ cv = newXS(name, Perl_cv_undef, file); /* newSUB with no block */ + sv_setsv((SV*)cv, &PL_sv_no); /* prototype it as "()" */ + } + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Feb 17 15:07:57 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 17 Feb 2010 14:07:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8620] csw/mgar/gar/v2-checkpkg-stats Message-ID: Revision: 8620 http://gar.svn.sourceforge.net/gar/?rev=8620&view=rev Author: wahwah Date: 2010-02-17 14:07:57 +0000 (Wed, 17 Feb 2010) Log Message: ----------- mGAR v2: Started implementing base checks. Moving check functions to a common module. Started a file with unit tests for the checks. Modified Paths: -------------- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py csw/mgar/gar/v2-checkpkg-stats/tests/run_tests.py Added Paths: ----------- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-basic.py csw/mgar/gar/v2-checkpkg-stats/lib/python/package_checks.py csw/mgar/gar/v2-checkpkg-stats/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg 2010-02-17 14:07:48 UTC (rev 8619) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg 2010-02-17 14:07:57 UTC (rev 8620) @@ -216,12 +216,6 @@ basedir=`sed -n 's/^BASEDIR=//p' $TMPFILE` pkgarch=`sed -n 's/^ARCH=//p' $TMPFILE|head -1` -case $software in - *[A-Z]*) - errmsg "$software must be all lowercase" - ;; -esac - case `basename $f` in ${software}-${version}-*) # file name looks okay Added: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-basic.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-basic.py (rev 0) +++ csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-basic.py 2010-02-17 14:07:57 UTC (rev 8620) @@ -0,0 +1,44 @@ +#!/opt/csw/bin/python2.6 +# $Id: checkpkg-you-can-write-your-own.py 8571 2010-02-16 09:05:51Z wahwah $ + +"""This is a dummy module. You can use it as a boilerplate for your own modules. + +Copy it and modify. +""" + +import os.path +import sys + +CHECKPKG_MODULE_NAME = "basic checks ported from Korn shell" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import package_checks + +def main(): + options, args = checkpkg.GetOptions() + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + # Registering functions defined above. + check_manager.RegisterIndividualCheck(package_checks.CatalognameLowercase) + check_manager.RegisterIndividualCheck(package_checks.FileNameSanity) + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-basic.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keyword + Id Modified: csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py 2010-02-17 14:07:48 UTC (rev 8619) +++ csw/mgar/gar/v2-checkpkg-stats/lib/python/checkpkg.py 2010-02-17 14:07:57 UTC (rev 8620) @@ -895,7 +895,7 @@ stats_path = self.GetStatsPath() self.MakeStatsDir() dir_pkg = self.GetDirFormatPkg() - logging.info("Collecting package statistics.") + logging.info("Collecting %s package statistics.", repr(dir_pkg.pkgname)) self.DumpObject(dir_pkg.GetAllFilenames(), "all_filenames") self.DumpObject(self.GetBasicStats(), "basic_stats") self.DumpObject(dir_pkg.ListBinaries(), "binaries") Added: csw/mgar/gar/v2-checkpkg-stats/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/lib/python/package_checks.py (rev 0) +++ csw/mgar/gar/v2-checkpkg-stats/lib/python/package_checks.py 2010-02-17 14:07:57 UTC (rev 8620) @@ -0,0 +1,32 @@ +# Defining the checking functions. They come in two flavors: individual +# package checks and set checks. + +import checkpkg +import re + +def CatalognameLowercase(pkg_data, debug): + errors = [] + # Here's how to report an error: + catalogname = pkg_data["basic_stats"]["catalogname"] + if catalogname != catalogname.lower(): + errors.append(checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "catalogname-not-lowercase")) + if not re.match(r"^\w+$", catalogname): + errors.append(checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "catalogname-is-not-a-simple-word")) + return errors + + +def FileNameSanity(pkg_data, debug): + errors = [] + # Here's how to report an error: + basic_stats = pkg_data["basic_stats"] + revision_info = basic_stats["parsed_basename"]["revision_info"] + catalogname = pkg_data["basic_stats"]["catalogname"] + if "REV" not in revision_info: + errors.append(checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "rev-tag-missing-in-filename")) + return errors Property changes on: csw/mgar/gar/v2-checkpkg-stats/lib/python/package_checks.py ___________________________________________________________________ Added: svn:keyword + Id Added: csw/mgar/gar/v2-checkpkg-stats/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/lib/python/package_checks_test.py (rev 0) +++ csw/mgar/gar/v2-checkpkg-stats/lib/python/package_checks_test.py 2010-02-17 14:07:57 UTC (rev 8620) @@ -0,0 +1,55 @@ +#!/opt/csw/bin/python2.6 +# coding=utf-8 +# $Id$ + +import unittest +import package_checks as pc + +class PackageChecksUnitTest(unittest.TestCase): + + def setUp(self): + self.pkg_data_1 = { + "basic_stats": { + "pkgname": "CSWfoo" + } + } + self.pkg_data_2 = { + 'basic_stats': { + 'parsed_basename': + {'revision_info': {'REV': '2010.02.15'}, + 'catalogname': 'python_tk', + 'full_version_string': '2.6.4,REV=2010.02.15', + 'version': '2.6.4', + 'version_info': { + 'minor version': '6', + 'major version': '2', + 'patchlevel': '4'}}, + 'pkgname': 'CSWpython-tk', + 'stats_version': 1, + 'pkg_basename': 'python_tk-2.6.4,REV=2010.02.15-SunOS5.8-sparc-CSW.pkg.gz', + 'pkg_path': '/tmp/pkg_lL0HDH/python_tk-2.6.4,REV=2010.02.15-SunOS5.8-sparc-CSW.pkg.gz', + 'catalogname': 'python_tk'}} + + def testCatalogName_1(self): + self.pkg_data_1["basic_stats"]["catalogname"] = "Foo" + errors = pc.CatalognameLowercase(self.pkg_data_1, False) + self.failUnless(errors) + + def testCatalogName_2(self): + self.pkg_data_1["basic_stats"]["catalogname"] = "foo" + errors = pc.CatalognameLowercase(self.pkg_data_1, False) + self.failIf(errors) + + def testCatalogNameSpecialCharacters(self): + self.pkg_data_1["basic_stats"]["catalogname"] = "foo+abc&123" + errors = pc.CatalognameLowercase(self.pkg_data_1, False) + self.failUnless(errors) + + def testFileNameSanity(self): + del(self.pkg_data_2["basic_stats"]["parsed_basename"]["revision_info"]["REV"]) + errors = pc.FileNameSanity(self.pkg_data_2, False) + self.failUnless(errors) + + +if __name__ == '__main__': + unittest.main() Property changes on: csw/mgar/gar/v2-checkpkg-stats/lib/python/package_checks_test.py ___________________________________________________________________ Added: svn:keyword + Id Modified: csw/mgar/gar/v2-checkpkg-stats/tests/run_tests.py =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/tests/run_tests.py 2010-02-17 14:07:48 UTC (rev 8619) +++ csw/mgar/gar/v2-checkpkg-stats/tests/run_tests.py 2010-02-17 14:07:57 UTC (rev 8620) @@ -10,9 +10,10 @@ # To add more test files, create .py file and add a corresponding line # here: -from opencsw_test import * -from checkpkg_test import * -from example_test import * +from opencsw_test import * +from checkpkg_test import * +from example_test import * +from package_checks_test import * if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Feb 17 15:07:48 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 17 Feb 2010 14:07:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8619] csw/mgar/pkg Message-ID: Revision: 8619 http://gar.svn.sourceforge.net/gar/?rev=8619&view=rev Author: bonivart Date: 2010-02-17 14:07:48 +0000 (Wed, 17 Feb 2010) Log Message: ----------- pcp: initial commit Added Paths: ----------- csw/mgar/pkg/pcp/ csw/mgar/pkg/pcp/branches/ csw/mgar/pkg/pcp/tags/ csw/mgar/pkg/pcp/trunk/ csw/mgar/pkg/pcp/trunk/Makefile csw/mgar/pkg/pcp/trunk/checksums csw/mgar/pkg/pcp/trunk/files/ Property changes on: csw/mgar/pkg/pcp/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/pcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pcp/trunk/Makefile 2010-02-17 14:07:48 UTC (rev 8619) @@ -0,0 +1,28 @@ +GARNAME = pcp +GARVERSION = 1.09 +CATEGORIES = net + +DESCRIPTION = Maps ports to PIDs and vice versa +define BLURB + Maps ports to PIDs and vice versa +endef + +MASTER_SITES = http://www.unix.ms/pcp/ +DISTFILES = pcp.txt + +ARCHALL = 1 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +CHECKPKG_OVERRIDES = license-missing + +include gar/category.mk + +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" + @ginstall -m 755 -d $(DESTDIR)$(bindir) + @ginstall -m 755 $(WORKDIR)/pcp.txt $(DESTDIR)$(bindir)/pcp + @$(MAKECOOKIE) Added: csw/mgar/pkg/pcp/trunk/checksums =================================================================== --- csw/mgar/pkg/pcp/trunk/checksums (rev 0) +++ csw/mgar/pkg/pcp/trunk/checksums 2010-02-17 14:07:48 UTC (rev 8619) @@ -0,0 +1 @@ +380ab508bcee1bc34436e987f07dbf39 pcp.txt 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 Feb 17 15:15:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Feb 2010 14:15:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8621] csw/mgar/pkg/cpan Message-ID: Revision: 8621 http://gar.svn.sourceforge.net/gar/?rev=8621&view=rev Author: dmichelsen Date: 2010-02-17 14:15:54 +0000 (Wed, 17 Feb 2010) Log Message: ----------- cpan/Task-Weaken: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Task-Weaken/ csw/mgar/pkg/cpan/Task-Weaken/branches/ csw/mgar/pkg/cpan/Task-Weaken/tags/ csw/mgar/pkg/cpan/Task-Weaken/trunk/ csw/mgar/pkg/cpan/Task-Weaken/trunk/Makefile csw/mgar/pkg/cpan/Task-Weaken/trunk/checksums csw/mgar/pkg/cpan/Task-Weaken/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Task-Weaken/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Task-Weaken/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Task-Weaken/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Task-Weaken/trunk/Makefile 2010-02-17 14:15:54 UTC (rev 8621) @@ -0,0 +1,17 @@ +GARNAME = Task-Weaken +GARVERSION = 1.03 +CATEGORIES = cpan +AUTHOR = ADAMK + +DESCRIPTION = Ensure that a platform has weaken support +define BLURB +endef + +PACKAGES = CSWpmtaskweaken +CATALOGNAME = pm_taskweaken + +LICENSE = LICENSE + +ACHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Task-Weaken/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Task-Weaken/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Task-Weaken/trunk/checksums 2010-02-17 14:15:54 UTC (rev 8621) @@ -0,0 +1 @@ +056ce36c576450d22e6b23b4dbfacd02 Task-Weaken-1.03.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 Feb 17 15:36:50 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Feb 2010 14:36:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8622] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 8622 http://gar.svn.sourceforge.net/gar/?rev=8622&view=rev Author: dmichelsen Date: 2010-02-17 14:36:50 +0000 (Wed, 17 Feb 2010) Log Message: ----------- gcc4: Update to 4.4.3, build doesn't work yet Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile csw/mgar/pkg/gcc4/trunk/checksums csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2010-02-17 14:15:54 UTC (rev 8621) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2010-02-17 14:36:50 UTC (rev 8622) @@ -1,5 +1,5 @@ GARNAME = gcc -GARVERSION = 4.4.1 +GARVERSION = 4.4.3 CATEGORIES = lang DESCRIPTION = The GNU Compiler Collection @@ -16,6 +16,9 @@ # of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + ## build options CONFIGURE_ARGS = --prefix=$(BUILD_PREFIX)/gcc4 CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4 @@ -44,3 +47,6 @@ include files/package_files.mk include files/amd_merge.mk include gar/category.mk + +# We need GNU find as find +PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/gcc4/trunk/checksums =================================================================== --- csw/mgar/pkg/gcc4/trunk/checksums 2010-02-17 14:15:54 UTC (rev 8621) +++ csw/mgar/pkg/gcc4/trunk/checksums 2010-02-17 14:36:50 UTC (rev 8622) @@ -1,2 +1,2 @@ -cc3c5565fdb9ab87a05ddb106ba0bd1f download/gcc-4.3.3.tar.bz2 -9883bd7887c22e1180b9dae4f2acd8ec download/CSWgcc4core.space +9883bd7887c22e1180b9dae4f2acd8ec CSWgcc4core.space +fe1ca818fc6d2caeffc9051fe67ff103 gcc-4.4.3.tar.bz2 Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2010-02-17 14:15:54 UTC (rev 8621) +++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2010-02-17 14:36:50 UTC (rev 8622) @@ -30,8 +30,8 @@ @echo "[===== Merging Fixing Hard Links =====]" $(_DBG)(cd $(IPREFIX)/bin; grm -f *gcc *c++ g++ gcj gfortran) $(_DBG)(cd $(IPREFIX)/bin; \ - gcp i386-pc-solaris2.8-gcc-4.3.3 i386-pc-solaris2.8-gcc) - $(_DBG)(cd $(IPREFIX)/bin; gcp i386-pc-solaris2.8-gcc-4.3.3 gcc) + gcp i386-pc-solaris2.8-gcc-4.4.3 i386-pc-solaris2.8-gcc) + $(_DBG)(cd $(IPREFIX)/bin; gcp i386-pc-solaris2.8-gcc-4.4.3 gcc) $(_DBG)(cd $(IPREFIX)/bin; \ gcp i386-pc-solaris2.8-g++ i386-pc-solaris2.8-c++) $(_DBG)(cd $(IPREFIX)/bin; gcp i386-pc-solaris2.8-g++ g++) @@ -40,8 +40,8 @@ $(_DBG)(cd $(IPREFIX)/bin; gcp i386-pc-solaris2.8-gfortran gfortran) $(_DBG)(cd $(APREFIX)/bin; grm -f *gcc *c++ g++ gcj gfortran) $(_DBG)(cd $(APREFIX)/bin; \ - gcp i386-pc-solaris2.10-gcc-4.3.3 i386-pc-solaris2.10-gcc) - $(_DBG)(cd $(APREFIX)/bin; gcp i386-pc-solaris2.10-gcc-4.3.3 gcc) + gcp i386-pc-solaris2.10-gcc-4.4.3 i386-pc-solaris2.10-gcc) + $(_DBG)(cd $(APREFIX)/bin; gcp i386-pc-solaris2.10-gcc-4.4.3 gcc) $(_DBG)(cd $(APREFIX)/bin; \ gcp i386-pc-solaris2.10-g++ i386-pc-solaris2.10-c++) $(_DBG)(cd $(APREFIX)/bin; gcp i386-pc-solaris2.10-g++ g++) 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 Feb 17 15:56:30 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 17 Feb 2010 14:56:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8623] csw/mgar/pkg/bind/trunk Message-ID: Revision: 8623 http://gar.svn.sourceforge.net/gar/?rev=8623&view=rev Author: bonivart Date: 2010-02-17 14:56:30 +0000 (Wed, 17 Feb 2010) Log Message: ----------- bind: update to 9.7.0 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2010-02-17 14:36:50 UTC (rev 8622) +++ csw/mgar/pkg/bind/trunk/Makefile 2010-02-17 14:56:30 UTC (rev 8623) @@ -2,12 +2,12 @@ # owner/group for device files? (root:sys) GARNAME = bind -GARVERSION = 9.6.1 -RELEASE = P3 -DISTVERSION = $(GARVERSION)-$(RELEASE) -SPKG_VERSION = $(GARVERSION)$(RELEASE) -DISTNAME = $(GARNAME)-$(GARVERSION)-$(RELEASE) -WORKSRC = $(WORKDIR)/$(DISTNAME) +GARVERSION = 9.7.0 +#RELEASE = P3 +#DISTVERSION = $(GARVERSION)-$(RELEASE) +#SPKG_VERSION = $(GARVERSION)$(RELEASE) +#DISTNAME = $(GARNAME)-$(GARVERSION)-$(RELEASE) +#WORKSRC = $(WORKDIR)/$(DISTNAME) CATEGORIES = net DESCRIPTION = ISC BIND DNS reference implementation @@ -18,10 +18,10 @@ high-volume and high-reliability applications. endef -MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/ -DISTFILES = $(DISTNAME).tar.gz -#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)/ -#DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/ +#DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWbindchroot.postinstall PACKAGES = CSWbind CSWbinddevel CSWlibbind CSWbindutils CSWbindchroot @@ -58,6 +58,8 @@ CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw CONFIGURE_ARGS += --localstatedir=/var/opt/csw/named +CHECKPKG_OVERRIDES = symbol-not-found + EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la PKGFILES_CSWbinddevel = $(PKGFILES_DEVEL) @@ -71,8 +73,10 @@ $$$$3 ~ /\/var\/opt\/csw\/named/ { $$$$2 = "ugfiles" ; $$$$5 = "named" ; $$$$6 = "named" } \ { print }' -INITSMF = /etc/opt/csw/init.d/cswnamed -SAMPLECONF = /etc/opt/csw/named.conf /etc/opt/csw/pkg/CSWbind/bind +INITSMF = /opt/csw/etc/init.d/cswnamed +SAMPLECONF = /etc/opt/csw/named.conf +SAMPLECONF += /etc/opt/csw/bind.keys +SAMPLECONF += /etc/opt/csw/pkg/CSWbind/bind USERGROUP = /etc/opt/csw/pkg/CSWbind/cswusergroup SPKG_SOURCEURL = http://www.isc.org/software/bind @@ -87,8 +91,9 @@ install-custom: @echo " ==> Installing $(GARNAME) (custom)" - @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall -m 755 $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/opt/csw/init.d/cswnamed + @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/init.d + @ginstall -m 755 $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/opt/csw/etc/init.d/cswnamed + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw @ginstall -m 644 $(FILEDIR)/CSWbind.named.conf.CSW $(DESTDIR)/etc/opt/csw/named.conf @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWbind @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWbind/ Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2010-02-17 14:36:50 UTC (rev 8622) +++ csw/mgar/pkg/bind/trunk/checksums 2010-02-17 14:56:30 UTC (rev 8623) @@ -1,2 +1,2 @@ dbbc839888d11d22aad3ccb65942d2e5 CSWbindchroot.postinstall -a0952d589b3051538033387be4c983f9 bind-9.6.1-P3.tar.gz +c245b5d1aa0a4f53d9538faa1efe2c3f bind-9.7.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Feb 17 16:35:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Feb 2010 15:35:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8624] csw/mgar/pkg/cpan/Inline/trunk/Makefile Message-ID: Revision: 8624 http://gar.svn.sourceforge.net/gar/?rev=8624&view=rev Author: dmichelsen Date: 2010-02-17 15:35:53 +0000 (Wed, 17 Feb 2010) Log Message: ----------- cpan/Inline: Do not make it ARCHALL Modified Paths: -------------- csw/mgar/pkg/cpan/Inline/trunk/Makefile Modified: csw/mgar/pkg/cpan/Inline/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Inline/trunk/Makefile 2010-02-17 14:56:30 UTC (rev 8623) +++ csw/mgar/pkg/cpan/Inline/trunk/Makefile 2010-02-17 15:35:53 UTC (rev 8624) @@ -16,8 +16,6 @@ PACKAGES = CSWpminline CATALOGNAME = pm_inline -ARCHALL = 1 - # The current licensing is unknown as is stated on CPAN CHECKPKG_OVERRIDES = license-missing 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 Feb 17 16:55:22 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 17 Feb 2010 15:55:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8625] csw/mgar/pkg/dnstop/trunk Message-ID: Revision: 8625 http://gar.svn.sourceforge.net/gar/?rev=8625&view=rev Author: bonivart Date: 2010-02-17 15:55:22 +0000 (Wed, 17 Feb 2010) Log Message: ----------- dnstop: fix man page #4279 Modified Paths: -------------- csw/mgar/pkg/dnstop/trunk/Makefile csw/mgar/pkg/dnstop/trunk/checksums Added Paths: ----------- csw/mgar/pkg/dnstop/trunk/files/dnstop.8 csw/mgar/pkg/dnstop/trunk/files/dnstop.pod Modified: csw/mgar/pkg/dnstop/trunk/Makefile =================================================================== --- csw/mgar/pkg/dnstop/trunk/Makefile 2010-02-17 15:35:53 UTC (rev 8624) +++ csw/mgar/pkg/dnstop/trunk/Makefile 2010-02-17 15:55:22 UTC (rev 8625) @@ -9,6 +9,8 @@ MASTER_SITES = http://dns.measurement-factory.com/tools/dnstop/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += dnstop.pod +DISTFILES += dnstop.8 LICENSE = LICENSE @@ -40,7 +42,7 @@ @ginstall -m 755 -d $(DESTDIR)$(bindir) @ginstall -m 755 $(WORKSRC)/dnstop $(DESTDIR)$(bindir) @ginstall -m 755 -d $(DESTDIR)$(mandir)/man8 - @ginstall -m 444 $(WORKSRC)/dnstop.8 $(DESTDIR)$(mandir)/man8 + @ginstall -m 444 $(FILEDIR)/dnstop.8 $(DESTDIR)$(mandir)/man8 @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) @ginstall -m 444 $(WORKSRC)/CHANGES $(DESTDIR)$(docdir)/$(GARNAME) @$(MAKECOOKIE) Modified: csw/mgar/pkg/dnstop/trunk/checksums =================================================================== --- csw/mgar/pkg/dnstop/trunk/checksums 2010-02-17 15:35:53 UTC (rev 8624) +++ csw/mgar/pkg/dnstop/trunk/checksums 2010-02-17 15:55:22 UTC (rev 8625) @@ -1,2 +1,3 @@ -c3b095c7ed3f2d43624d3278a697d89d Makefile.p 827a0d2020b157b925411dd30b6feff3 dnstop-20090128.tar.gz +70ffba84342497ab9d5da57ab0b4e0d5 dnstop.8 +fdfa026782a0fdc5b24b934ef5782ebd dnstop.pod Added: csw/mgar/pkg/dnstop/trunk/files/dnstop.8 =================================================================== --- csw/mgar/pkg/dnstop/trunk/files/dnstop.8 (rev 0) +++ csw/mgar/pkg/dnstop/trunk/files/dnstop.8 2010-02-17 15:55:22 UTC (rev 8625) @@ -0,0 +1,347 @@ +.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32 +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sh \" Subsection heading +.br +.if t .Sp +.ne 5 +.PP +\fB\\$1\fR +.PP +.. +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Vb \" Begin verbatim text +.ft CW +.nf +.ne \\$1 +.. +.de Ve \" End verbatim text +.ft R +.fi +.. +.\" Set up some character translations and predefined strings. \*(-- will +.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left +.\" double quote, and \*(R" will give a right double quote. | will give a +.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to +.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' +.\" expand to `' in nroff, nothing in troff, for use with C<>. +.tr \(*W-|\(bv\*(Tr +.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.ie n \{\ +. ds -- \(*W- +. ds PI pi +. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch +. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch +. ds L" "" +. ds R" "" +. ds C` "" +. ds C' "" +'br\} +.el\{\ +. ds -- \|\(em\| +. ds PI \(*p +. ds L" `` +. ds R" '' +'br\} +.\" +.\" If the F register is turned on, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.if \nF \{\ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" +.. +. nr % 0 +. rr F +.\} +.\" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.hy 0 +.if n .na +.\" +.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). +.\" Fear. Run. Save yourself. No user-serviceable parts. +. \" fudge factors for nroff and troff +.if n \{\ +. ds #H 0 +. ds #V .8m +. ds #F .3m +. ds #[ \f1 +. ds #] \fP +.\} +.if t \{\ +. ds #H ((1u-(\\\\n(.fu%2u))*.13m) +. ds #V .6m +. ds #F 0 +. ds #[ \& +. ds #] \& +.\} +. \" simple accents for nroff and troff +.if n \{\ +. ds ' \& +. ds ` \& +. ds ^ \& +. ds , \& +. ds ~ ~ +. ds / +.\} +.if t \{\ +. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" +. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' +. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' +. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' +. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' +. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' +.\} +. \" troff and (daisy-wheel) nroff accents +.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' +.ds 8 \h'\*(#H'\(*b\h'-\*(#H' +.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] +.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' +.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' +.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] +.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] +.ds ae a\h'-(\w'a'u*4/10)'e +.ds Ae A\h'-(\w'A'u*4/10)'E +. \" corrections for vroff +.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' +.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' +. \" for low resolution devices (crt and lpr) +.if \n(.H>23 .if \n(.V>19 \ +\{\ +. ds : e +. ds 8 ss +. ds o a +. ds d- d\h'-1'\(ga +. ds D- D\h'-1'\(hy +. ds th \o'bp' +. ds Th \o'LP' +. ds ae ae +. ds Ae AE +.\} +.rm #[ #] #H #V #F C +.\" ======================================================================== +.\" +.IX Title "DNSTOP 8" +.TH DNSTOP 8 "2010-02-16" "perl v5.8.8" "User Contributed Perl Documentation" +.SH "NAME" +dnstop \- displays various tables of DNS traffic on your network. +.SH "SYNOPSIS" +.IX Header "SYNOPSIS" +dnstop [\-46apsQR] [\-b expression] [\-i address] [\-f filter] [\-r interval] [device] [savefile] +.SH "DESCRIPTION" +.IX Header "DESCRIPTION" +dnstop is a small tool to listen on device or to parse the file savefile and collect and print statistics on the local network's \s-1DNS\s0 traffic. You must have read access to /dev/bpf*. +.SH "COMMAND LINE OPTIONS" +.IX Header "COMMAND LINE OPTIONS" +The options are as follows: +.RE +.IP "\fB\-4\fR" +.IX Item "-4" +Count only messages with IPv4 addresses. +.RE +.IP "\fB\-6\fR" +.IX Item "-6" +Count only messages with IPv6 addresses. +.RE +.IP "\fB\-a\fR" +.IX Item "-a" +Anonymize addresses. +.RE +.IP "\fB\-b expression\fR" +.IX Item "-b expression" +\&\s-1BPF\s0 filter expression (default: udp port 53). +.RE +.IP "\fB\-i address\fR" +.IX Item "-i address" +Ignore select addresses. +.RE +.IP "\fB\-p\fR" +.IX Item "-p" +Do not put the interface into promiscuous mode. +.RE +.IP "\fB\-r\fR" +.IX Item "-r" +Redraw interval (seconds). +.RE +.IP "\fB\-l level\fR" +.IX Item "-l level" +Keep counts on names up to level domain name levels. +.PP +For example, with \-l 2 (the default), dnstop will keep two tables: one with top-level domain names, and another with second-level domain names. Increasing the level provides more details, but also requires more memory and \s-1CPU\s0. +.RE +.IP "\fB\-f\fR" +.IX Item "-f" +Input filter name +.PP +The \*(L"unknown\-tlds\*(R" filter includes only queries for TLDs that are bogus. Useful for identifying hosts/servers that leak queries for things like \*(L"localhost\*(R" or \*(L"workgroup.\*(R" +.PP +The \*(L"A\-for\-A\*(R" filter includes only A queries for names that are already \s-1IP\s0 addresses. Certain Microsoft Windows \s-1DNS\s0 servers have a known bug that forward these queries. +.PP +The \*(L"rfc1918\-ptr\*(R" filter includes only \s-1PTR\s0 queries for addresses in \s-1RFC1918\s0 space. These should never leak from inside an organization. +.RE +.IP "\fB\-Q\fR" +.IX Item "-Q" +Count only \s-1DNS\s0 query messages. +.RE +.IP "\fB\-R\fR" +.IX Item "-R" +Count only \s-1DNS\s0 reply messages. +.RE +.IP "\fBsavefile\fR" +.IX Item "savefile" +A captured network trace in pcap format. +.RE +.IP "\fBdevice\fR" +.IX Item "device" +Ethernet device (ie fxp0). +.SH "RUN TIME OPTIONS" +.IX Header "RUN TIME OPTIONS" +While running, the following options are available to alter the display: +.RE +.IP "\fBs\fR" +.IX Item "s" +Display the source address table. +.RE +.IP "\fBd\fR" +.IX Item "d" +Display the destination address table. +.RE +.IP "\fBt\fR" +.IX Item "t" +Display the breakdown of query types seen. +.RE +.IP "\fBo\fR" +.IX Item "o" +Display the breakdown of opcodes seen. +.RE +.IP "\fB1\fR" +.IX Item "1" +Show 1st level query names. +.RE +.IP "\fB2\fR" +.IX Item "2" +Show 2nd level query names. +.RE +.IP "\fB3\fR" +.IX Item "3" +Show 3rd level query names. +.RE +.IP "\fB4\fR" +.IX Item "4" +Show 4th level query names. +.RE +.IP "\fB5\fR" +.IX Item "5" +Show 5th level query names. +.RE +.IP "\fB6\fR" +.IX Item "6" +Show 6th level query names. +.RE +.IP "\fB7\fR" +.IX Item "7" +Show 7th level query names. +.RE +.IP "\fB8\fR" +.IX Item "8" +Show 8th level query names. +.RE +.IP "\fB9\fR" +.IX Item "9" +Show 9th level query names. +.RE +.IP "\fB!\fR" +.IX Item "!" +Show sources + 1st level query names. +.RE +.IP "\fB@\fR" +.IX Item "@" +Show sources + 2nd level query names. +.RE +.IP "\fB#\fR" +.IX Item "#" +Show sources + 3rd level query names. +.RE +.IP "\fB$\fR" +.IX Item "$" +Show sources + 4th level query names. +.RE +.IP "\fB%\fR" +.IX Item "%" +Show sources + 5th level query names. +.RE +.IP "\fB^\fR" +.IX Item "^" +Show sources + 6th level query names. +.RE +.IP "\fB&\fR" +.IX Item "&" +Show sources + 7th level query names. +.RE +.IP "\fB*\fR" +.IX Item "*" +Show sources + 8th level query names. +.RE +.IP "\fB(\fR" +.IX Item "(" +Show sources + 9th level query names. +.RE +.IP "\fB^R\fR" +.IX Item "^R" +Reset the counters. +.RE +.IP "\fB^X\fR" +.IX Item "^X" +Exit the program. +.RE +.IP "\fBspace\fR" +.IX Item "space" +Redraw. +.RE +.IP "\fB?\fR" +.IX Item "?" +Help. +.SH "NON-INTERACTIVE MODE" +.IX Header "NON-INTERACTIVE MODE" +If stdout is not a tty, dnstop runs in non-interactive mode. In this case, you must supply a savefile for reading, instead of capturing live packets. After reading the entire savefile, dnstop prints the top 50 entries for each table. +.SH "AUTHORS" +.IX Header "AUTHORS" +.RE +.IP "\fBDuane Wessels (wessels at measurement\-factory.com)\fR" +.IX Item "Duane Wessels (wessels at measurement-factory.com)" +.RE +.PD 0 +.IP "\fBMark Foster (mark at foster.cc)\fR" +.IX Item "Mark Foster (mark at foster.cc)" +.RE +.IP "\fBJose Nazario (jose at monkey.org)\fR" +.IX Item "Jose Nazario (jose at monkey.org)" +.RE +.IP "\fBSam Norris <@ChangeIP.com>\fR" +.IX Item "Sam Norris <@ChangeIP.com>" +.RE +.IP "\fBMax Horn <@quendi.de>\fR" +.IX Item "Max Horn <@quendi.de>" +.RE +.IP "\fBJohn Morrissey \fR" +.IX Item "John Morrissey " +.RE +.IP "\fBFlorian Forster \fR" +.IX Item "Florian Forster " +.RE +.IP "\fBDave Plonka \fR" +.IX Item "Dave Plonka " +.RE +.IP "\fBhttp://dnstop.measurement\-factory.com/\fR" +.IX Item "http://dnstop.measurement-factory.com/" +.PD +.SH "BUGS" +.IX Header "BUGS" +Does not support \s-1TCP\s0 at this time. Added: csw/mgar/pkg/dnstop/trunk/files/dnstop.pod =================================================================== --- csw/mgar/pkg/dnstop/trunk/files/dnstop.pod (rev 0) +++ csw/mgar/pkg/dnstop/trunk/files/dnstop.pod 2010-02-17 15:55:22 UTC (rev 8625) @@ -0,0 +1,211 @@ +=head1 NAME + +dnstop - displays various tables of DNS traffic on your network. + +=head1 SYNOPSIS + +dnstop [-46apsQR] [-b expression] [-i address] [-f filter] [-r interval] [device] [savefile] + +=head1 DESCRIPTION + +dnstop is a small tool to listen on device or to parse the file savefile and collect and print statistics on the local network's DNS traffic. You must have read access to /dev/bpf*. + +=head1 COMMAND LINE OPTIONS + +The options are as follows: + +=item B<-4> + +Count only messages with IPv4 addresses. + +=item B<-6> + +Count only messages with IPv6 addresses. + +=item B<-a> + +Anonymize addresses. + +=item B<-b expression> + +BPF filter expression (default: udp port 53). + +=item B<-i address> + +Ignore select addresses. + +=item B<-p> + +Do not put the interface into promiscuous mode. + +=item B<-r> + +Redraw interval (seconds). + +=item B<-l level> + +Keep counts on names up to level domain name levels. + +For example, with -l 2 (the default), dnstop will keep two tables: one with top-level domain names, and another with second-level domain names. Increasing the level provides more details, but also requires more memory and CPU. + +=item B<-f> + +Input filter name + +The "unknown-tlds" filter includes only queries for TLDs that are bogus. Useful for identifying hosts/servers that leak queries for things like "localhost" or "workgroup." + +The "A-for-A" filter includes only A queries for names that are already IP addresses. Certain Microsoft Windows DNS servers have a known bug that forward these queries. + +The "rfc1918-ptr" filter includes only PTR queries for addresses in RFC1918 space. These should never leak from inside an organization. + +=item B<-Q> + +Count only DNS query messages. + +=item B<-R> + +Count only DNS reply messages. + +=item B + +A captured network trace in pcap format. + +=item B + +Ethernet device (ie fxp0). + +=head1 RUN TIME OPTIONS + +While running, the following options are available to alter the display: + +=item B + +Display the source address table. + +=item B + +Display the destination address table. + +=item B + +Display the breakdown of query types seen. + +=item B + +Display the breakdown of opcodes seen. + +=item B<1> + +Show 1st level query names. + +=item B<2> + +Show 2nd level query names. + +=item B<3> + +Show 3rd level query names. + +=item B<4> + +Show 4th level query names. + +=item B<5> + +Show 5th level query names. + +=item B<6> + +Show 6th level query names. + +=item B<7> + +Show 7th level query names. + +=item B<8> + +Show 8th level query names. + +=item B<9> + +Show 9th level query names. + +=item B + +Show sources + 1st level query names. + +=item B<@> + +Show sources + 2nd level query names. + +=item B<#> + +Show sources + 3rd level query names. + +=item B<$> + +Show sources + 4th level query names. + +=item B<%> + +Show sources + 5th level query names. + +=item B<^> + +Show sources + 6th level query names. + +=item B<&> + +Show sources + 7th level query names. + +=item B<*> + +Show sources + 8th level query names. + +=item B<(> + +Show sources + 9th level query names. + +=item B<^R> + +Reset the counters. + +=item B<^X> + +Exit the program. + +=item B + +Redraw. + +=item B + +Help. + +=head1 NON-INTERACTIVE MODE + +If stdout is not a tty, dnstop runs in non-interactive mode. In this case, you must supply a savefile for reading, instead of capturing live packets. After reading the entire savefile, dnstop prints the top 50 entries for each table. + +=head1 AUTHORS + +=item B + +=item B + +=item B + +=item B@ChangeIP.comE> + +=item B@quendi.deE> + +=item Bjwm at horde.netE> + +=item Bocto at verplant.orgE> + +=item Bplonka at cs.wisc.eduE> + +=item B + +=head1 BUGS + +Does not support TCP at this time. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Feb 17 17:26:23 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 17 Feb 2010 16:26:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8626] csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk Message-ID: Revision: 8626 http://gar.svn.sourceforge.net/gar/?rev=8626&view=rev Author: bensons Date: 2010-02-17 16:26:23 +0000 (Wed, 17 Feb 2010) Log Message: ----------- cpan Term-ReadLine-Gnu: added patch so our readline tests will no longer fail Modified Paths: -------------- csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/Makefile csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/patch-readline.t Removed Paths: ------------- csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/CSWpmtermreadlinegnu.depend csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/CSWpmtermreadlinegnu.gspec Modified: csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/Makefile 2010-02-17 15:55:22 UTC (rev 8625) +++ csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/Makefile 2010-02-17 16:26:23 UTC (rev 8626) @@ -14,10 +14,14 @@ RUNTIME_DEP_PKGS = CSWreadline +# readline.h (CSWreadline) is inconsistent and breaks our test, therefor we +# will patch that test for the time beeing +PATCHFILES = patch-readline.t + include gar/category.mk post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: - @ginstall -d $(DOCDEST) - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) - @$(MAKECOOKIE) + @ginstall -d $(DOCDEST) + @cp $(FILEDIR)/changelog.CSW $(DOCDEST) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/checksums 2010-02-17 15:55:22 UTC (rev 8625) +++ csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/checksums 2010-02-17 16:26:23 UTC (rev 8626) @@ -1 +1,2 @@ -e591287af62e000256893c84d01abebe download/Term-ReadLine-Gnu-1.19.tar.gz +e591287af62e000256893c84d01abebe Term-ReadLine-Gnu-1.19.tar.gz +b264dd3244ea25cc8bf2474de7054c31 patch-readline.t Deleted: csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/CSWpmtermreadlinegnu.depend =================================================================== Deleted: csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/CSWpmtermreadlinegnu.gspec =================================================================== --- csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/CSWpmtermreadlinegnu.gspec 2010-02-17 15:55:22 UTC (rev 8625) +++ csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/CSWpmtermreadlinegnu.gspec 2010-02-17 16:26:23 UTC (rev 8626) @@ -1,8 +0,0 @@ -%var bitname pm_termreadlinegnu -%var pkgname CSWpmtermreadlinegnu -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2001 Hiroo Hayashi. All rights reserved. - -This program is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. Added: csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/patch-readline.t =================================================================== --- csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/patch-readline.t (rev 0) +++ csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/patch-readline.t 2010-02-17 16:26:23 UTC (rev 8626) @@ -0,0 +1,11 @@ +--- Term-ReadLine-Gnu-1.19.orig/t/readline.t 2010-02-17 17:20:01.298647840 +0100 ++++ Term-ReadLine-Gnu-1.19/t/readline.t 2010-02-17 17:18:59.672212090 +0100 +@@ -90,7 +90,7 @@ + # 2.3 Readline Variables + + my ($maj, $min) = $a->{library_version} =~ /(\d+)\.(\d+)/; +-my $version = $a->{readline_version}; ++my $version = $a->{readline_version} + 1; + $res = ($version == 0x100 * $maj + $min); ok('readline_version'); + + # Version 2.0 is NOT supported. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Feb 17 17:27:28 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 17 Feb 2010 16:27:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[8627] csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/Makefile Message-ID: Revision: 8627 http://gar.svn.sourceforge.net/gar/?rev=8627&view=rev Author: bensons Date: 2010-02-17 16:27:26 +0000 (Wed, 17 Feb 2010) Log Message: ----------- cpan Term-ReadLine-Gnu: fixed Makefile Modified Paths: -------------- csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/Makefile Modified: csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/Makefile 2010-02-17 16:26:23 UTC (rev 8626) +++ csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/Makefile 2010-02-17 16:27:26 UTC (rev 8627) @@ -22,6 +22,6 @@ post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: - @ginstall -d $(DOCDEST) - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) - @$(MAKECOOKIE) + @ginstall -d $(DOCDEST) + @cp $(FILEDIR)/changelog.CSW $(DOCDEST) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Feb 17 21:24:34 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Feb 2010 20:24:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8628] csw/mgar/pkg/pixman/trunk Message-ID: Revision: 8628 http://gar.svn.sourceforge.net/gar/?rev=8628&view=rev Author: wbonnet Date: 2010-02-17 20:24:32 +0000 (Wed, 17 Feb 2010) Log Message: ----------- Upgrade to version 0.17.6 Modified Paths: -------------- csw/mgar/pkg/pixman/trunk/Makefile csw/mgar/pkg/pixman/trunk/checksums Modified: csw/mgar/pkg/pixman/trunk/Makefile =================================================================== --- csw/mgar/pkg/pixman/trunk/Makefile 2010-02-17 16:27:26 UTC (rev 8627) +++ csw/mgar/pkg/pixman/trunk/Makefile 2010-02-17 20:24:32 UTC (rev 8628) @@ -1,5 +1,5 @@ GARNAME = pixman -GARVERSION = 0.15.14 +GARVERSION = 0.17.6 CATEGORIES = lib DESCRIPTION = The pixel-manipulation library for X and cairo Modified: csw/mgar/pkg/pixman/trunk/checksums =================================================================== --- csw/mgar/pkg/pixman/trunk/checksums 2010-02-17 16:27:26 UTC (rev 8627) +++ csw/mgar/pkg/pixman/trunk/checksums 2010-02-17 20:24:32 UTC (rev 8628) @@ -1,2 +1,2 @@ -bfbb075dd60402e86528add13f8e27ad download/pixman-0.15.14.tar.gz -f78d71433a7d574ff66b7d2bf3ea2a49 download/pixman-private.h.diff +32cbdf7a1ac1c275ee56230e26701456 pixman-0.17.6.tar.gz +f78d71433a7d574ff66b7d2bf3ea2a49 pixman-private.h.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Feb 17 21:43:21 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Feb 2010 20:43:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8629] csw/mgar/pkg/dbus-glib/trunk/Makefile Message-ID: Revision: 8629 http://gar.svn.sourceforge.net/gar/?rev=8629&view=rev Author: wbonnet Date: 2010-02-17 20:43:19 +0000 (Wed, 17 Feb 2010) Log Message: ----------- Upgrade to 0.84 Modified Paths: -------------- csw/mgar/pkg/dbus-glib/trunk/Makefile Modified: csw/mgar/pkg/dbus-glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus-glib/trunk/Makefile 2010-02-17 20:24:32 UTC (rev 8628) +++ csw/mgar/pkg/dbus-glib/trunk/Makefile 2010-02-17 20:43:19 UTC (rev 8629) @@ -1,5 +1,5 @@ GARNAME = dbus-glib -GARVERSION = 0.80 +GARVERSION = 0.84 CATEGORIES = lib DESCRIPTION = DBus GLib Bindings This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Feb 17 22:18:57 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 17 Feb 2010 21:18:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8631] csw/mgar/pkg/cpan/Inline/trunk Message-ID: Revision: 8631 http://gar.svn.sourceforge.net/gar/?rev=8631&view=rev Author: bensons Date: 2010-02-17 21:18:57 +0000 (Wed, 17 Feb 2010) Log Message: ----------- cpan Inline: bumped to version 0.46 Modified Paths: -------------- csw/mgar/pkg/cpan/Inline/trunk/Makefile csw/mgar/pkg/cpan/Inline/trunk/checksums csw/mgar/pkg/cpan/Inline/trunk/files/0001-Skip-question-on-install.patch Modified: csw/mgar/pkg/cpan/Inline/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Inline/trunk/Makefile 2010-02-17 21:14:19 UTC (rev 8630) +++ csw/mgar/pkg/cpan/Inline/trunk/Makefile 2010-02-17 21:18:57 UTC (rev 8631) @@ -1,5 +1,5 @@ GARNAME = Inline -GARVERSION = 0.45 +GARVERSION = 0.46 CATEGORIES = cpan AUTHOR = SISYPHUS Modified: csw/mgar/pkg/cpan/Inline/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Inline/trunk/checksums 2010-02-17 21:14:19 UTC (rev 8630) +++ csw/mgar/pkg/cpan/Inline/trunk/checksums 2010-02-17 21:18:57 UTC (rev 8631) @@ -1,2 +1,2 @@ -15c2202c3ee504e73158850a006f16ed 0001-Skip-question-on-install.patch -63140a6c911f1576fdee71ba4457610f Inline-0.45.tar.gz +dff49e669277ead83e6e855394578c99 0001-Skip-question-on-install.patch +4c2f14829fbe83cb456e9c5c0dac06b3 Inline-0.46.tar.gz Modified: csw/mgar/pkg/cpan/Inline/trunk/files/0001-Skip-question-on-install.patch =================================================================== --- csw/mgar/pkg/cpan/Inline/trunk/files/0001-Skip-question-on-install.patch 2010-02-17 21:14:19 UTC (rev 8630) +++ csw/mgar/pkg/cpan/Inline/trunk/files/0001-Skip-question-on-install.patch 2010-02-17 21:18:57 UTC (rev 8631) @@ -1,34 +1,17 @@ -From 1f06fd58ce8ec425d21138e3b36a7b66eb555db8 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 10 Feb 2010 13:52:02 +0100 -Subject: [PATCH] Skip question on install - ---- - C/Makefile.PL | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/C/Makefile.PL b/C/Makefile.PL -index 294846b..a290a62 100644 ---- a/C/Makefile.PL -+++ b/C/Makefile.PL -@@ -58,12 +58,12 @@ END - # ' - } - --my $answer = ''; - my $default = $found ? "y" : "n"; --while (1) { -- $answer = prompt ('Do you want to install Inline::C?', $default); -- last if $answer =~ /^(y|yes|n|no)$/i; --} -+my $answer = $default; -+#while (1) { -+# $answer = prompt ('Do you want to install Inline::C?', $default); -+# last if $answer =~ /^(y|yes|n|no)$/i; -+#} - - if ($answer =~ /^(y|yes)$/i) { - WriteMakefile( --- -1.6.6 - +--- Inline-0.46.orig/C/Makefile.PL 2010-02-17 22:12:18.040826000 +0100 ++++ Inline-0.46/C/Makefile.PL 2010-02-17 22:15:07.194173580 +0100 +@@ -73,10 +73,10 @@ + + my $answer = ''; + my $default = $found ? "y" : "n"; +-while (1) { +- $answer = prompt ('Do you want to install Inline::C?', $default); +- last if $answer =~ /^(y|yes|n|no)$/i; +-} ++#while (1) { ++ #$answer = prompt ('Do you want to install Inline::C?', $default); ++ #last if $answer =~ /^(y|yes|n|no)$/i; ++#} + + if ($answer =~ /^(y|yes)$/i) { + WriteMakefile( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Feb 17 22:14:19 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Feb 2010 21:14:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8630] csw/mgar/pkg/dbus-glib/trunk Message-ID: Revision: 8630 http://gar.svn.sourceforge.net/gar/?rev=8630&view=rev Author: wbonnet Date: 2010-02-17 21:14:19 +0000 (Wed, 17 Feb 2010) Log Message: ----------- Update to 0.84. Fix issue 3377. Move to dynamic prototypes Modified Paths: -------------- csw/mgar/pkg/dbus-glib/trunk/Makefile csw/mgar/pkg/dbus-glib/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/dbus-glib/trunk/files/CSWdbusglib.gspec csw/mgar/pkg/dbus-glib/trunk/files/CSWdbusglibdev.gspec Modified: csw/mgar/pkg/dbus-glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus-glib/trunk/Makefile 2010-02-17 20:43:19 UTC (rev 8629) +++ csw/mgar/pkg/dbus-glib/trunk/Makefile 2010-02-17 21:14:19 UTC (rev 8630) @@ -19,11 +19,13 @@ SPKG_DESC_CSWdbusglib = $(DESCRIPTION) SPKG_DESC_CSWdbusglibdevel = $(DESCRIPTION) development package -DISTFILES += $(call admfiles,CSWdbusglib, ) -DISTFILES += $(call admfiles,CSWdbusglibdev, ) +PACKAGES = CSWdbusglib CSWdbusglibdev +CATALOGNAME_CSWdbusglib = dbus_glib +CATALOGNAME_CSWdbusglibdevel = dbus_glibdev + RUNTIME_DEP_PKGS_CSWdbusglibdev = CSWdbusglib -RUNTIME_DEP_PKGS_CSWdbusglib = CSWexpat CSWggettextrt CSWglib2 CSWiconv CSWsunmath CSWlibdbus +RUNTIME_DEP_PKGS_CSWdbusglib = CSWexpat CSWggettextrt CSWglib2 CSWiconv CSWsunmath CSWlibdbus PKGFILES_CSWdbusglibdev = $(PKGFILES_DEVEL) # PKGFILES_CSWdbusglibdev += $(prefix)/include/.* @@ -36,7 +38,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-tests -BUILD64 = 1 +# BUILD64 = 1 include gar/category.mk Modified: csw/mgar/pkg/dbus-glib/trunk/checksums =================================================================== --- csw/mgar/pkg/dbus-glib/trunk/checksums 2010-02-17 20:43:19 UTC (rev 8629) +++ csw/mgar/pkg/dbus-glib/trunk/checksums 2010-02-17 21:14:19 UTC (rev 8630) @@ -1,3 +1 @@ -86ea60ba2118a1b9deafe8257f6a6a1a download/dbus-glib-0.80.tar.gz -a5b394c2ed12ae94e9bba419f898a873 download/CSWdbusglib.gspec -169d27fcdd5d1ea79adc81ebab670011 download/CSWdbusglibdev.gspec +69fbe31fb3ee778715dff44cdd5178bf dbus-glib-0.84.tar.gz Deleted: csw/mgar/pkg/dbus-glib/trunk/files/CSWdbusglib.gspec =================================================================== --- csw/mgar/pkg/dbus-glib/trunk/files/CSWdbusglib.gspec 2010-02-17 20:43:19 UTC (rev 8629) +++ csw/mgar/pkg/dbus-glib/trunk/files/CSWdbusglib.gspec 2010-02-17 21:14:19 UTC (rev 8630) @@ -1,6 +0,0 @@ -%var bitname dbus_glib -%var pkgname CSWdbusglib -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/%{GARNAME}/license for license information Deleted: csw/mgar/pkg/dbus-glib/trunk/files/CSWdbusglibdev.gspec =================================================================== --- csw/mgar/pkg/dbus-glib/trunk/files/CSWdbusglibdev.gspec 2010-02-17 20:43:19 UTC (rev 8629) +++ csw/mgar/pkg/dbus-glib/trunk/files/CSWdbusglibdev.gspec 2010-02-17 21:14:19 UTC (rev 8630) @@ -1,6 +0,0 @@ -%var bitname dbus_glibdev -%var pkgname CSWdbusglibdev -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/%{GARNAME}dev/license for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Feb 17 22:21:24 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 17 Feb 2010 21:21:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8632] csw/mgar/pkg/cpan/Inline/trunk/Makefile Message-ID: Revision: 8632 http://gar.svn.sourceforge.net/gar/?rev=8632&view=rev Author: bensons Date: 2010-02-17 21:21:24 +0000 (Wed, 17 Feb 2010) Log Message: ----------- cpan Inline: set ARCHALL Modified Paths: -------------- csw/mgar/pkg/cpan/Inline/trunk/Makefile Modified: csw/mgar/pkg/cpan/Inline/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Inline/trunk/Makefile 2010-02-17 21:18:57 UTC (rev 8631) +++ csw/mgar/pkg/cpan/Inline/trunk/Makefile 2010-02-17 21:21:24 UTC (rev 8632) @@ -13,6 +13,8 @@ PATCHFILES = 0001-Skip-question-on-install.patch +ARCHALL_CSWpminline = 1 + PACKAGES = CSWpminline CATALOGNAME = pm_inline This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Feb 17 22:21:45 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Feb 2010 21:21:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8633] csw/mgar/pkg/dbus-glib/trunk/Makefile Message-ID: Revision: 8633 http://gar.svn.sourceforge.net/gar/?rev=8633&view=rev Author: wbonnet Date: 2010-02-17 21:21:45 +0000 (Wed, 17 Feb 2010) Log Message: ----------- Update to 0.84. Fix issue 3377. Move to dynamic prototypes Modified Paths: -------------- csw/mgar/pkg/dbus-glib/trunk/Makefile Modified: csw/mgar/pkg/dbus-glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus-glib/trunk/Makefile 2010-02-17 21:21:24 UTC (rev 8632) +++ csw/mgar/pkg/dbus-glib/trunk/Makefile 2010-02-17 21:21:45 UTC (rev 8633) @@ -16,13 +16,13 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_DESC_CSWdbusglib = $(DESCRIPTION) -SPKG_DESC_CSWdbusglibdevel = $(DESCRIPTION) development package +SPKG_DESC_CSWdbusglib = $(DESCRIPTION) +SPKG_DESC_CSWdbusglibdev = $(DESCRIPTION) development package PACKAGES = CSWdbusglib CSWdbusglibdev -CATALOGNAME_CSWdbusglib = dbus_glib -CATALOGNAME_CSWdbusglibdevel = dbus_glibdev +CATALOGNAME_CSWdbusglib = dbus_glib +CATALOGNAME_CSWdbusglibdev = dbus_glibdev RUNTIME_DEP_PKGS_CSWdbusglibdev = CSWdbusglib RUNTIME_DEP_PKGS_CSWdbusglib = CSWexpat CSWggettextrt CSWglib2 CSWiconv CSWsunmath CSWlibdbus This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Feb 17 22:22:24 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Feb 2010 21:22:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8634] csw/mgar/pkg/pixman/trunk/Makefile Message-ID: Revision: 8634 http://gar.svn.sourceforge.net/gar/?rev=8634&view=rev Author: wbonnet Date: 2010-02-17 21:22:24 +0000 (Wed, 17 Feb 2010) Log Message: ----------- Add 64 bits support Modified Paths: -------------- csw/mgar/pkg/pixman/trunk/Makefile Modified: csw/mgar/pkg/pixman/trunk/Makefile =================================================================== --- csw/mgar/pkg/pixman/trunk/Makefile 2010-02-17 21:21:45 UTC (rev 8633) +++ csw/mgar/pkg/pixman/trunk/Makefile 2010-02-17 21:22:24 UTC (rev 8634) @@ -16,8 +16,8 @@ EXTRA_CFLAGS = -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION EXTRA_CXXFLAGS = -xlibmil -xlibmopt -features=tmplife -norunpath -# BUILD64 = 1 -# NOISALIST = 1 +BUILD64 = 1 +NOISALIST = 1 PATCHFILES = pixman-private.h.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Feb 17 23:53:24 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Feb 2010 22:53:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8635] csw/mgar/pkg/cpan/RPC-XML/trunk Message-ID: Revision: 8635 http://gar.svn.sourceforge.net/gar/?rev=8635&view=rev Author: wbonnet Date: 2010-02-17 22:53:24 +0000 (Wed, 17 Feb 2010) Log Message: ----------- Upgrade to 0.69 Modified Paths: -------------- csw/mgar/pkg/cpan/RPC-XML/trunk/Makefile csw/mgar/pkg/cpan/RPC-XML/trunk/checksums Modified: csw/mgar/pkg/cpan/RPC-XML/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/RPC-XML/trunk/Makefile 2010-02-17 21:22:24 UTC (rev 8634) +++ csw/mgar/pkg/cpan/RPC-XML/trunk/Makefile 2010-02-17 22:53:24 UTC (rev 8635) @@ -1,5 +1,5 @@ GARNAME = RPC-XML -GARVERSION = 0.65 +GARVERSION = 0.69 CATEGORIES = cpan AUTHOR = RJRAY Modified: csw/mgar/pkg/cpan/RPC-XML/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/RPC-XML/trunk/checksums 2010-02-17 21:22:24 UTC (rev 8634) +++ csw/mgar/pkg/cpan/RPC-XML/trunk/checksums 2010-02-17 22:53:24 UTC (rev 8635) @@ -1 +1 @@ -18778d7f12cc8f075193e900dedbd6a9 download/RPC-XML-0.65.tar.gz +98fa74810c72f3b05c987e6c8d5d83fb RPC-XML-0.69.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Feb 18 00:32:14 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Feb 2010 23:32:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8636] csw/mgar/pkg/seamonkey/trunk/Makefile Message-ID: Revision: 8636 http://gar.svn.sourceforge.net/gar/?rev=8636&view=rev Author: wbonnet Date: 2010-02-17 23:32:14 +0000 (Wed, 17 Feb 2010) Log Message: ----------- Fix Makefile Modified Paths: -------------- csw/mgar/pkg/seamonkey/trunk/Makefile Modified: csw/mgar/pkg/seamonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/seamonkey/trunk/Makefile 2010-02-17 22:53:24 UTC (rev 8635) +++ csw/mgar/pkg/seamonkey/trunk/Makefile 2010-02-17 23:32:14 UTC (rev 8636) @@ -16,7 +16,7 @@ MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$(GARVERSION)/ UPSTREAM_MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/ -PACKAGES = CSWseamonkey +PACKAGES = CSWseamonkey CATALOGNAME_CSWseamonkey = $(GARNAME) SPKG_DESC_CSWseamonkey = $(DESCRIPTION) @@ -87,18 +87,18 @@ WORK_BUILD = $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME) WORK_INSTALL = $(WORKROOTDIR)/install-$(firstword $(MODULATIONS)) -post-extract: +post-extract-modulated: @mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORK_BUILD) @$(MAKECOOKIE) -pre-configure: +pre-configure-modulated:: @cp $(FILEDIR)/.mozconfig $(WORK_BUILD)/.mozconfig -pre-install: +pre-install-modulated:: ( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi ) ( cd $(WORK_INSTALL)/opt/csw/bin ; rm -f seamonkey ; ln -sf ../mozilla/seamonkey/bin/seamonkey . ) -post-install: +post-install-modulated:: ( gfind $(WORK_INSTALL)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) ( gfind $(WORK_INSTALL)/opt/csw -name chromelist.txt -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORK_BUILD)/\_\_g {}.temp > {} && rm {}.temp" \; ) ( gfind $(WORK_INSTALL)/opt/csw/mozilla/seamonkey -name "*.js" -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORK_BUILD)/\_\_g {}.temp > {} && rm {}.temp" \; ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Feb 18 00:39:59 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Feb 2010 23:39:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8637] csw/mgar/pkg/seamonkey/trunk/Makefile Message-ID: Revision: 8637 http://gar.svn.sourceforge.net/gar/?rev=8637&view=rev Author: wbonnet Date: 2010-02-17 23:39:59 +0000 (Wed, 17 Feb 2010) Log Message: ----------- Fix Makefile Modified Paths: -------------- csw/mgar/pkg/seamonkey/trunk/Makefile Modified: csw/mgar/pkg/seamonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/seamonkey/trunk/Makefile 2010-02-17 23:32:14 UTC (rev 8636) +++ csw/mgar/pkg/seamonkey/trunk/Makefile 2010-02-17 23:39:59 UTC (rev 8637) @@ -87,8 +87,8 @@ WORK_BUILD = $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME) WORK_INSTALL = $(WORKROOTDIR)/install-$(firstword $(MODULATIONS)) -post-extract-modulated: - @mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORK_BUILD) +post-extract: + mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORK_BUILD) @$(MAKECOOKIE) pre-configure-modulated:: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Feb 18 00:42:30 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Feb 2010 23:42:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8638] csw/mgar/pkg/seamonkey/trunk/Makefile Message-ID: Revision: 8638 http://gar.svn.sourceforge.net/gar/?rev=8638&view=rev Author: wbonnet Date: 2010-02-17 23:42:30 +0000 (Wed, 17 Feb 2010) Log Message: ----------- Fix Makefile Modified Paths: -------------- csw/mgar/pkg/seamonkey/trunk/Makefile Modified: csw/mgar/pkg/seamonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/seamonkey/trunk/Makefile 2010-02-17 23:39:59 UTC (rev 8637) +++ csw/mgar/pkg/seamonkey/trunk/Makefile 2010-02-17 23:42:30 UTC (rev 8638) @@ -87,7 +87,7 @@ WORK_BUILD = $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME) WORK_INSTALL = $(WORKROOTDIR)/install-$(firstword $(MODULATIONS)) -post-extract: +post-extract-modulated: mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORK_BUILD) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 18 08:22:39 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 18 Feb 2010 07:22:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8639] csw/mgar/gar/v2 Message-ID: Revision: 8639 http://gar.svn.sourceforge.net/gar/?rev=8639&view=rev Author: wahwah Date: 2010-02-18 07:22:39 +0000 (Thu, 18 Feb 2010) Log Message: ----------- Moving submit_to_newpkgs.py from opencsw.sf.net to gar.sf.net. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py Added Paths: ----------- csw/mgar/gar/v2/bin/submitpkg csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Added: csw/mgar/gar/v2/bin/submitpkg =================================================================== --- csw/mgar/gar/v2/bin/submitpkg (rev 0) +++ csw/mgar/gar/v2/bin/submitpkg 2010-02-18 07:22:39 UTC (rev 8639) @@ -0,0 +1 @@ +link ../lib/python/submit_to_newpkgs.py \ No newline at end of file Property changes on: csw/mgar/gar/v2/bin/submitpkg ___________________________________________________________________ Added: svn:special + * Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-17 23:42:30 UTC (rev 8638) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-18 07:22:39 UTC (rev 8639) @@ -58,8 +58,7 @@ EMAIL_TMPL = """From: %(from)s To: %(to)s -Cc: %(cc)s -Date: %(date)s +%(optional_cc)sDate: %(date)s Subject: newpkgs %(pkgnames)s %(body)s @@ -210,7 +209,7 @@ for line in catalog_source: # Working around the GPG signature if line.startswith("#"): continue - if "BEGIN PGP SIGNED MESSAGE" in line: continue + if "BEGIN PGP SIGNED MESSAGE" in line: continue if line.startswith("Hash:"): continue if len(line.strip()) <= 0: continue if "BEGIN PGP SIGNATURE" in line: break @@ -273,7 +272,9 @@ self.pkgnames = pkgnames self.paths = paths self.release_mgr = u"%s <%s>" % (release_mgr_name, release_mgr_email) - self.release_cc = u"%s" % release_cc + self.release_cc = release_cc + if self.release_cc: + self.release_cc = unicode(release_cc) def FormatMail(self): body_list = ["The following package files are ready to be released:"] @@ -318,14 +319,17 @@ body_list.extend(msg) body_list.append("") body = "\n".join(body_list) + # TODO: This needs to be rewritten using Cheetah d = { 'from': self.sender, 'to': self.release_mgr, - 'cc': self.release_cc, + 'optional_cc': '', 'pkgnames': ", ".join(self.pkgnames), 'body': body, 'date': datetime.datetime.now(), } + if self.release_cc: + d['optional_cc'] = "cc: %s\n" % self.release_cc mail_text = EMAIL_TMPL % d return mail_text Added: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py (rev 0) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-02-18 07:22:39 UTC (rev 8639) @@ -0,0 +1,163 @@ +#!/opt/csw/bin/python2.6 +# coding=utf-8 +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# +# Copyright (c) 2009 Maciej Blizinski +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by the +# Free Software Foundation. +# +# Formats e-mail to the OpenCSW maintainer. +# +# To avoid leaking the e-mail addresses, they're base64-encoded: +# +# python -c "print repr('somebody at example.com'.encode('base64'))" +# +# +# The plan: +# +# 1. If necessary, move the relevant packages from /home/testing to +# ~/to-release +# 2. Construct a list of all the files that are in ~/to-release +# 3. Clean newpkgs/ from the older versions of the files +# 4. Copy all the relevant files from ~/to-release to newpkgs/ +# 5. Format the e-mail +# 6. Tell how to send it (no automatic sending for now) + +import ConfigParser +import datetime +import logging +import optparse +import os +import subprocess +import sys +import opencsw + + +CONFIG_INFO = """Create a file in ~/.releases.ini with the following content: + +; A configuration file for the release automation script + +[releases] +sender name = Your Name +sender email = your.email at example.com +release manager name = Release Manager +release manager email = their.email at example.com +release cc = maintainers at example.com +; Usually it's /home/testing +package dir = /home/testing +target host = bender +target dir = /home/newpkgs +""" + +CONFIGURATION_FILE_LOCATIONS = [ + "/etc/opt/csw/releases.ini", + "%(HOME)s/.releases.ini", +] +CONFIG_REQUIRED_OPTS = [ + "sender name", "sender email", + "release manager name", "release manager email", + "package dir", +] +DEFAULT_FILE_NAME = "newpkgs.mail" +CONFIG_RELEASE_SECTION = "releases" + +class Error(Exception): + pass + + +class ConfigurationError(Error): + pass + + +class PackageSubmissionError(Error): + pass + + +def main(): + try: + config = ConfigParser.SafeConfigParser() + for file_name_tmpl in CONFIGURATION_FILE_LOCATIONS: + config.read(file_name_tmpl % os.environ) + for opt_name in CONFIG_REQUIRED_OPTS: + if not config.has_option(CONFIG_RELEASE_SECTION, opt_name): + logging.error("Option %s is missing from the configuration.", + repr(opt_name)) + raise ConfigurationError("Option %s is missing from the configuration." + % repr(opt_name)) + parser = optparse.OptionParser() + parser.add_option("-p", "--pkgnames", + dest="pkgnames", + help="A comma-separated list of pkgnames") + parser.add_option("-d", "--debug", + dest="debug", default=False, + action="store_true", + help="Print debugging messages") + (options, args) = parser.parse_args() + level = logging.WARN + if options.debug: + level = logging.DEBUG + logging.basicConfig(level=level) + if not options.pkgnames: + parser.print_help() + raise ConfigurationError("You need to specify a package name or names.") + if config.has_option(CONFIG_RELEASE_SECTION, "release cc"): + release_cc = config.get(CONFIG_RELEASE_SECTION, "release cc") + else: + release_cc = None + except ConfigurationError, e: + print "There was a problem with your configuration." + print CONFIG_INFO + print e + sys.exit(1) + pkgnames = options.pkgnames.split(",") + package_files = [] + staging_dir = opencsw.StagingDir(config.get(CONFIG_RELEASE_SECTION, + "package dir")) + for p in pkgnames: + package_files.extend(staging_dir.GetLatest(p)) + logging.debug("Copying files to the target host:dir") + remote_package_files = [] + remote_package_references = [] + files_to_rsync = [] + for p in package_files: + dst_arg = ("%s:%s" % (config.get(CONFIG_RELEASE_SECTION, "target host"), + config.get(CONFIG_RELEASE_SECTION, "target dir"))) + files_to_rsync.append(p) + remote_package_files.append(dst_arg) + package_base_file_name = os.path.split(p)[1] + remote_package_references.append(dst_arg + "/" + package_base_file_name) + # TODO(maciej): rsync only once + args = ["rsync", "-v"] + files_to_rsync + [dst_arg] + logging.debug(args) + ret = subprocess.call(args) + if ret: + msg = "Copying %s to %s has failed." % (p, dst_arg) + logging.error(msg) + raise PackageSubmissionError(msg) + nm = opencsw.NewpkgMailer( + pkgnames, remote_package_references, + release_mgr_name=config.get(CONFIG_RELEASE_SECTION, "release manager name"), + release_mgr_email=config.get(CONFIG_RELEASE_SECTION, "release manager email"), + sender_name=config.get(CONFIG_RELEASE_SECTION, "sender name"), + sender_email=config.get(CONFIG_RELEASE_SECTION, "sender email"), + release_cc=release_cc) + mail_text = nm.FormatMail() + fd = open(DEFAULT_FILE_NAME, "w") + fd.write(mail_text) + fd.close() + text_editor = nm.GetEditorName(os.environ) + args = [text_editor, DEFAULT_FILE_NAME] + editor_ret = subprocess.call(args) + if editor_ret: + raise Error("File editing has failed.") + print + print "Your e-mail hasn't been sent yet!" + print "Issue the following command to have it sent:" + print "sendmail -t < %s" % DEFAULT_FILE_NAME + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 18 09:35:57 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 18 Feb 2010 08:35:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8640] csw/mgar/gar/v2 Message-ID: Revision: 8640 http://gar.svn.sourceforge.net/gar/?rev=8640&view=rev Author: wahwah Date: 2010-02-18 08:35:57 +0000 (Thu, 18 Feb 2010) Log Message: ----------- mGAR v2: Printing out ready to use override statements when errors are found. Modified Paths: -------------- csw/mgar/gar/v2/bin/analyze_module_results.py csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/opencsw.py Property Changed: ---------------- csw/mgar/gar/v2/lib/python/opencsw.py Modified: csw/mgar/gar/v2/bin/analyze_module_results.py =================================================================== --- csw/mgar/gar/v2/bin/analyze_module_results.py 2010-02-18 07:22:39 UTC (rev 8639) +++ csw/mgar/gar/v2/bin/analyze_module_results.py 2010-02-18 08:35:57 UTC (rev 8640) @@ -30,16 +30,22 @@ fd = open(os.path.join(options.extractdir, file_name)) for line in fd: if line.startswith("#"): - continue + continue pkgname, tag_name, tag_info = checkpkg.ParseTagLine(line) error_tags.append(checkpkg.CheckpkgTag(pkgname, tag_name, tag_info)) overrides = reduce(lambda x, y: x + y, overrides_list) tags_after_overrides = checkpkg.ApplyOverrides(error_tags, overrides) exit_code = bool(tags_after_overrides) if tags_after_overrides: - print "The reported error tags are:" + print "There were errors reported." + print "If you know they are false positives, you can override them:" for tag in tags_after_overrides: - print "*", repr(tag) + if tag.tag_info: + tag_postfix = "|%s" % tag.tag_info.replace(" ", "|") + else: + tag_postfix = "" + print ("CHECKPKG_OVERRIDES_%s = %s%s" + % (tag.pkgname, tag.tag_name, tag_postfix)) sys.exit(exit_code) Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-02-18 07:22:39 UTC (rev 8639) +++ csw/mgar/gar/v2/bin/checkpkg 2010-02-18 08:35:57 UTC (rev 8640) @@ -637,18 +637,20 @@ print "All modular tests completed. Analyzing the reports." fi -override_info_printed=0 -for tagfile in ${EXTRACTDIR}/tags.*; do - if [[ -s "${tagfile}" ]]; then - if [[ "${override_info_printed}" -ne 1 ]]; then - echo "# You can use the following lines to create overrides" - echo "# See http://wiki.opencsw.org/checkpkg" - override_info_printed=1 +if [[ "${DEBUG}" != "" ]]; then + override_info_printed=0 + for tagfile in ${EXTRACTDIR}/tags.*; do + if [[ -s "${tagfile}" ]]; then + if [[ "${override_info_printed}" -ne 1 ]]; then + echo "# You can use the following lines to create overrides" + echo "# See http://wiki.opencsw.org/checkpkg" + override_info_printed=1 + fi + echo "# ${tagfile}:" + cat "${tagfile}" fi - echo "# ${tagfile}:" - cat "${tagfile}" - fi -done + done +fi # Collecting errors and applying the overrides. ${checkpkg_basedir}/analyze_module_results.py \ Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-18 07:22:39 UTC (rev 8639) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-18 08:35:57 UTC (rev 8640) @@ -65,7 +65,7 @@ #end if """ -ERROR_REPORT_TMPL = u"""#if $errors +SCREEN_ERROR_REPORT_TMPL = u"""#if $errors and $debug ERROR: One or more errors have been found by $name. #for $pkgname in $errors $pkgname: @@ -613,7 +613,7 @@ "errors": errors, "debug": self.debug, } - screen_t = Template.Template(ERROR_REPORT_TMPL, searchList=[namespace]) + screen_t = Template.Template(SCREEN_ERROR_REPORT_TMPL, searchList=[namespace]) tags_report_t = Template.Template(TAG_REPORT_TMPL, searchList=[namespace]) screen_report = unicode(screen_t) tags_report = unicode(tags_report_t) Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-18 07:22:39 UTC (rev 8639) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-18 08:35:57 UTC (rev 8640) @@ -64,7 +64,7 @@ %(body)s -- -$Id$ +Generated by submitpkg, $Rev$. """ Property changes on: csw/mgar/gar/v2/lib/python/opencsw.py ___________________________________________________________________ Modified: svn:keywords - Id + Id Rev 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 Feb 18 11:19:28 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 18 Feb 2010 10:19:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[8642] csw/mgar/pkg/fbopenssl/trunk/Makefile Message-ID: Revision: 8642 http://gar.svn.sourceforge.net/gar/?rev=8642&view=rev Author: dmichelsen Date: 2010-02-18 10:19:28 +0000 (Thu, 18 Feb 2010) Log Message: ----------- fbopenssl: Clarify description Modified Paths: -------------- csw/mgar/pkg/fbopenssl/trunk/Makefile Modified: csw/mgar/pkg/fbopenssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/fbopenssl/trunk/Makefile 2010-02-18 10:17:10 UTC (rev 8641) +++ csw/mgar/pkg/fbopenssl/trunk/Makefile 2010-02-18 10:19:28 UTC (rev 8642) @@ -2,7 +2,7 @@ GARVERSION = 0.0.4 CATEGORIES = lib -DESCRIPTION = SPNEGO API +DESCRIPTION = Extensions to OpenSSL including support for GSS-API and SPNEGO define BLURB fbopenssl is a library containing extensions to OpenSSL, including support for: - GSS-API (RFC 2743) 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 Feb 18 11:17:10 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 18 Feb 2010 10:17:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[8641] csw/mgar/pkg/cpan/Task-Weaken/trunk/Makefile Message-ID: Revision: 8641 http://gar.svn.sourceforge.net/gar/?rev=8641&view=rev Author: dmichelsen Date: 2010-02-18 10:17:10 +0000 (Thu, 18 Feb 2010) Log Message: ----------- cpan/Task-Weaken: Fix typo Modified Paths: -------------- csw/mgar/pkg/cpan/Task-Weaken/trunk/Makefile Modified: csw/mgar/pkg/cpan/Task-Weaken/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Task-Weaken/trunk/Makefile 2010-02-18 08:35:57 UTC (rev 8640) +++ csw/mgar/pkg/cpan/Task-Weaken/trunk/Makefile 2010-02-18 10:17:10 UTC (rev 8641) @@ -12,6 +12,6 @@ LICENSE = LICENSE -ACHALL = 1 +ARCHALL = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Feb 18 12:14:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 18 Feb 2010 11:14:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8643] csw/mgar/pkg/setoolkit/trunk/checksums Message-ID: Revision: 8643 http://gar.svn.sourceforge.net/gar/?rev=8643&view=rev Author: dmichelsen Date: 2010-02-18 11:14:25 +0000 (Thu, 18 Feb 2010) Log Message: ----------- setoolkit: Update to new 3.5.1 release Modified Paths: -------------- csw/mgar/pkg/setoolkit/trunk/checksums Modified: csw/mgar/pkg/setoolkit/trunk/checksums =================================================================== --- csw/mgar/pkg/setoolkit/trunk/checksums 2010-02-18 10:19:28 UTC (rev 8642) +++ csw/mgar/pkg/setoolkit/trunk/checksums 2010-02-18 11:14:25 UTC (rev 8643) @@ -1 +1 @@ -c9ccd992e747668bb4d8921fb2423e1c setoolkit-3.5.1.tar.gz +42f6f22d03ce2fc4ac145c816af56f59 setoolkit-3.5.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 18 12:58:54 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 18 Feb 2010 11:58:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8644] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 8644 http://gar.svn.sourceforge.net/gar/?rev=8644&view=rev Author: wahwah Date: 2010-02-18 11:58:53 +0000 (Thu, 18 Feb 2010) Log Message: ----------- subversion: Added *-contrib and *-tools packages, added overrides for the symbol-not-found error. Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-02-18 11:14:25 UTC (rev 8643) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-02-18 11:58:53 UTC (rev 8644) @@ -33,9 +33,14 @@ PACKAGES = CSWsvn CSWsvn-devel CSWap2svn CSWpmsvn PACKAGES += CSWpythonsvn CSWrbsvn CSWjavasvn +PACKAGES += CSWsvn-contrib CSWsvn-tools SPKG_DESC_CSWsvn = Version control rethought +SPKG_DESC_CSWsvn-tools = Additional subversion tools +SPKG_DESC_CSWsvn-contrib = Contributed subversion scripts CATALOGNAME_CSWsvn = subversion +CATALOGNAME_CSWsvn-contrib = subversion_contrib +CATALOGNAME_CSWsvn-tools = subversion_tools RUNTIME_DEP_PKGS_CSWsvn = CSWapache2rt RUNTIME_DEP_PKGS_CSWsvn += CSWbdb48 RUNTIME_DEP_PKGS_CSWsvn += CSWexpat @@ -47,11 +52,12 @@ RUNTIME_DEP_PKGS_CSWsvn += CSWlibserf RUNTIME_DEP_PKGS_CSWsvn += CSWsqlite3rt RUNTIME_DEP_PKGS_CSWsvn += CSWzlib -# There are additional requirements for $(docdir)/subversion/tools/ which -# also contains the stack of hook-scripts. Should we add those? -#RUNTIME_DEP_PKGS_CSWsvn += CSWperl -#RUNTIME_DEP_PKGS_CSWsvn += CSWpython -#RUNTIME_DEP_PKGS_CSWsvn += CSWruby +RUNTIME_DEP_PKGS_CSWsvn += CSWlibserf +RUNTIME_DEP_PKGS_CSWsvn-contrib += CSWperl +RUNTIME_DEP_PKGS_CSWsvn-contrib += CSWpython +RUNTIME_DEP_PKGS_CSWsvn-tools += CSWperl +RUNTIME_DEP_PKGS_CSWsvn-tools += CSWpython +RUNTIME_DEP_PKGS_CSWsvn-tools += CSWruby SPKG_DESC_CSWsvn-devel = Subversion Development Support CATALOGNAME_CSWsvn-devel = subversion_devel @@ -60,6 +66,12 @@ PKGFILES_CSWsvn-devel = $(PKGFILES_DEVEL) PKGFILES_CSWsvn-devel += $(docdir)/$(CATALOGNAME_CSWsvn-devel)/changelog.CSW +PKGFILES_CSWsvn-contrib = $(docdir)/subversion/contrib.* +ARCHALL_CSWsvn-contrib = 1 + +PKGFILES_CSWsvn-tools = $(docdir)/subversion/tools.* +ARCHALL_CSWsvn-tools = 1 + SPKG_DESC_CSWap2svn = Subversion Modules for Apache 2.2 CATALOGNAME_CSWap2svn = ap2_subversion RUNTIME_DEP_PKGS_CSWap2svn = CSWsvn @@ -187,6 +199,13 @@ # tail -f $(WORKSRC)/tests.log | grep merge_tests.py TEST_TARGET = check +# Overrides +CHECKPKG_OVERRIDES_CSWap2svn = symbol-not-found +CHECKPKG_OVERRIDES_CSWrbsvn = symbol-not-found +CHECKPKG_OVERRIDES_CSWsvn = symbol-not-found|libsvn_ra-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWpythonsvn = symbol-not-found +CHECKPKG_OVERRIDES_CSWpmsvn = symbol-not-found + include gar/category.mk BINDING_LANGS = java perl python ruby This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Feb 18 13:18:47 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 18 Feb 2010 12:18:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[8645] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: Revision: 8645 http://gar.svn.sourceforge.net/gar/?rev=8645&view=rev Author: hson Date: 2010-02-18 12:18:47 +0000 (Thu, 18 Feb 2010) Log Message: ----------- imagemagick: checkpkg override syntax change Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-02-18 11:58:53 UTC (rev 8644) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-02-18 12:18:47 UTC (rev 8645) @@ -54,227 +54,227 @@ CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|libMagick++.so.10.0.4 CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ept.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cip.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|otb.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|gif.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|vid.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pix.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mvg.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|palm.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pdf.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|avs.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pcd.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|icon.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|magick.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|tim.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xc.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ps2.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|raw.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xcf.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dps.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ps3.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ps.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mpc.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|fpx.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pnm.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mpeg.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xwd.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|url.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|gray.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ycbcr.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|rgb.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|tile.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|uil.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pwp.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|sfw.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|stegano.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pattern.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|txt.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mpr.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|html.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|info.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pdb.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cut.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|msl.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|jp2.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|fits.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|vicar.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cmyk.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|histogram.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|scr.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|avi.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|label.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|bmp.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|psd.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|jbig.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|null.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dcm.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|tiff.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dot.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|sun.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|wmf.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|x.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ttf.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|miff.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xbm.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|jpeg.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|map.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|rle.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|art.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xpm.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|svg.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|uyvy.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|tga.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dib.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|wbmp.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|fax.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|clip.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|sct.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pcl.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mono.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|rla.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|matte.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mat.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pict.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|preview.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|viff.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|meta.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|gradient.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|sgi.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|yuv.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cin.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|plasma.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|png.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mtv.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pcx.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|caption.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|wpg.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dpx.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|analyze.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|inline.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pcd.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|jpeg.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ps2.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|miff.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|tim.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mpc.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xcf.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ps3.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|raw.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|uyvy.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pnm.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|fpx.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|jbig.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cip.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ept.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|label.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|otb.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cmyk.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|thumbnail.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|tiff.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|gif.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|braille.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|avs.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pdf.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|null.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pix.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mvg.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|exr.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|vid.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|txt.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mpr.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|x.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|msl.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pdb.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cut.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|plasma.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|jp2.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dds.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|hald.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|caption.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xwd.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|hrz.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|clip.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|wbmp.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|rgb.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|url.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|sfw.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|meta.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|uil.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|viff.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pwp.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|matte.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pict.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|preview.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xps.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mono.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xbm.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ttf.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|sun.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|magick.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|wmf.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|art.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|rle.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|map.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|icon.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dng.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|svg.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xpm.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|tga.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|xc.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|bmp.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cals.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|scr.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|psd.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dcm.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|palm.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dot.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ipl.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ps.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|sgi.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|gradient.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|info.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|html.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|png.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|stegano.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|djvu.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|cin.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pattern.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|yuv.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pcx.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mtv.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|vicar.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|fits.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dpx.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|wpg.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ycbcr.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|dib.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|gray.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|sct.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|pcl.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mpeg.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|histogram.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|fax.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mat.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|tile.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|rla.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|convolve.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|analyze.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|libMagick++.so.2.0.1 -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|libWand.so.10.0.4 -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|libMagickWand.so.2.0.1 -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|Magick.so -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|conjure -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|montage -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|animate -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|import -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|display -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|mogrify -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|identify -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|convert -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|compare2 -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|composite -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|stream +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cip.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|otb.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gif.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|vid.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pix.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mvg.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|palm.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pdf.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|avs.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcd.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|icon.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|magick.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tim.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xc.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps2.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|raw.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xcf.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dps.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps3.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpc.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fpx.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pnm.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpeg.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xwd.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|url.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gray.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ycbcr.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rgb.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tile.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|uil.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pwp.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sfw.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|stegano.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pattern.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|txt.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpr.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|html.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|info.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pdb.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cut.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|msl.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jp2.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fits.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|vicar.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cmyk.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|histogram.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|scr.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|avi.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|label.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|bmp.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|psd.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jbig.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|null.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dcm.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tiff.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dot.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sun.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wmf.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|x.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ttf.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|miff.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xbm.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jpeg.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|map.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rle.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|art.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xpm.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|svg.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|uyvy.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tga.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dib.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wbmp.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fax.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|clip.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sct.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcl.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mono.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rla.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|matte.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mat.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pict.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|preview.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|viff.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|meta.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gradient.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sgi.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|yuv.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cin.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|plasma.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|png.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mtv.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcx.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|caption.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wpg.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dpx.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|analyze.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|inline.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcd.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jpeg.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps2.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|miff.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tim.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpc.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xcf.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps3.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|raw.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|uyvy.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pnm.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fpx.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jbig.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cip.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ept.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|label.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|otb.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cmyk.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|thumbnail.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tiff.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gif.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|braille.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|avs.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pdf.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|null.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pix.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mvg.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|exr.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|vid.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|txt.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpr.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|x.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|msl.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pdb.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cut.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|plasma.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jp2.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dds.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|hald.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|caption.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xwd.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|hrz.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|clip.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wbmp.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rgb.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|url.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sfw.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|meta.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|uil.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|viff.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pwp.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|matte.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pict.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|preview.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xps.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mono.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xbm.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ttf.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sun.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|magick.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wmf.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|art.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rle.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|map.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|icon.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dng.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|svg.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xpm.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tga.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xc.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|bmp.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cals.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|scr.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|psd.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dcm.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|palm.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dot.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ipl.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sgi.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gradient.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|info.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|html.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|png.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|stegano.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|djvu.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cin.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pattern.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|yuv.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcx.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mtv.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|vicar.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fits.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dpx.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wpg.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ycbcr.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dib.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gray.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sct.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcl.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpeg.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|histogram.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fax.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mat.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tile.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rla.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|convolve.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|analyze.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|libMagick++.so.2.0.1 +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|libWand.so.10.0.4 +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|libMagickWand.so.2.0.1 +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|Magick.so +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|conjure +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|montage +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|animate +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|import +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|display +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mogrify +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|identify +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|convert +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|compare2 +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|composite +CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|stream # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 18 13:43:29 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 18 Feb 2010 12:43:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8646] csw/mgar/gar/v2/bin/analyze_module_results.py Message-ID: Revision: 8646 http://gar.svn.sourceforge.net/gar/?rev=8646&view=rev Author: wahwah Date: 2010-02-18 12:43:29 +0000 (Thu, 18 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, make CHECKPKG_OVERRIDES statements use '+=' instead of '=' Modified Paths: -------------- csw/mgar/gar/v2/bin/analyze_module_results.py Modified: csw/mgar/gar/v2/bin/analyze_module_results.py =================================================================== --- csw/mgar/gar/v2/bin/analyze_module_results.py 2010-02-18 12:18:47 UTC (rev 8645) +++ csw/mgar/gar/v2/bin/analyze_module_results.py 2010-02-18 12:43:29 UTC (rev 8646) @@ -44,7 +44,7 @@ tag_postfix = "|%s" % tag.tag_info.replace(" ", "|") else: tag_postfix = "" - print ("CHECKPKG_OVERRIDES_%s = %s%s" + print ("CHECKPKG_OVERRIDES_%s += %s%s" % (tag.pkgname, tag.tag_name, tag_postfix)) sys.exit(exit_code) 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 Feb 18 13:47:10 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 18 Feb 2010 12:47:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[8647] csw/mgar/pkg/chkconfig/trunk Message-ID: Revision: 8647 http://gar.svn.sourceforge.net/gar/?rev=8647&view=rev Author: dmichelsen Date: 2010-02-18 12:47:10 +0000 (Thu, 18 Feb 2010) Log Message: ----------- alternatives: Associate preservations with the package where something is preserved Modified Paths: -------------- csw/mgar/pkg/chkconfig/trunk/checksums csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives Modified: csw/mgar/pkg/chkconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/chkconfig/trunk/checksums 2010-02-18 12:43:29 UTC (rev 8646) +++ csw/mgar/pkg/chkconfig/trunk/checksums 2010-02-18 12:47:10 UTC (rev 8647) @@ -1,7 +1,7 @@ d56d4f7b5aef5af5235943c384734780 0001-Add-missing-include-to-alloca.h.patch a1045173b8bc0a667883080f85a38597 0002-Don-t-use-named-struct-initializers.patch 5abe74bf8f38f45068f43f12b52cfc4b 0003-Fix-manpage-to-use-csw-pathes.patch -d021adfa40e57e62c435654111e7f08c CSWalternatives.i.cswalternatives -cd3e42659af6e3adfa8a220bd95dad29 CSWalternatives.r.cswalternatives +5e7b546021e5606165c34f154b70bc7b CSWalternatives.i.cswalternatives +b610f50080c8ffe65037bb9891316935 CSWalternatives.r.cswalternatives 02019af22d048085f3006de791a0c95e alloca.patch 592a1fe77f3844d7748adbab6357ee25 chkconfig-1.3.30c.tar.gz Modified: csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives =================================================================== --- csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives 2010-02-18 12:43:29 UTC (rev 8646) +++ csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives 2010-02-18 12:47:10 UTC (rev 8647) @@ -38,12 +38,12 @@ chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives $ARGS # Redo previous manual selection if this is an upgrade - if /usr/bin/test -L "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$ALTNAME"; then - CHOICE=`/usr/bin/perl -e 'print readlink $ARGV[0]' "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$ALTNAME"` + if /usr/bin/test -L "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$ALTNAME"; then + CHOICE=`/usr/bin/perl -e 'print readlink $ARGV[0]' "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$ALTNAME"` if [ "${CHOICE}" = "$ALTPATH" ]; then echo "Applying previous manual selection ${CHOICE} ..." chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives --set $ALTNAME ${CHOICE} - rm -f ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$ALTNAME + rm -f ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$ALTNAME fi fi done Modified: csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives =================================================================== --- csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives 2010-02-18 12:43:29 UTC (rev 8646) +++ csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives 2010-02-18 12:47:10 UTC (rev 8647) @@ -20,9 +20,9 @@ CHOICE="`perl -e 'print readlink $ARGV[0]' ${PKG_INSTALL_ROOT}/etc/opt/csw/alternatives/$2`" if [ "$3" = "${CHOICE}" ]; then echo "Preserving '$2' manual choice ${CHOICE} ..." - mkdir -p ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives - rm -f ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$2 - ln -s "${CHOICE}" ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/CSWalternatives/alternatives/$2 + mkdir -p ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives + rm -f ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$2 + ln -s "${CHOICE}" ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$2 fi fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Thu Feb 18 13:59:50 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Thu, 18 Feb 2010 12:59:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8648] csw/mgar/pkg Message-ID: Revision: 8648 http://gar.svn.sourceforge.net/gar/?rev=8648&view=rev Author: bensons Date: 2010-02-18 12:59:50 +0000 (Thu, 18 Feb 2010) Log Message: ----------- babl: initial babl commit, used by gimp 2.6 Added Paths: ----------- csw/mgar/pkg/babl/ csw/mgar/pkg/babl/branches/ csw/mgar/pkg/babl/tags/ csw/mgar/pkg/babl/trunk/ csw/mgar/pkg/babl/trunk/Makefile csw/mgar/pkg/babl/trunk/checksums csw/mgar/pkg/babl/trunk/files/ Property changes on: csw/mgar/pkg/babl/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/babl/trunk/Makefile =================================================================== --- csw/mgar/pkg/babl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/babl/trunk/Makefile 2010-02-18 12:59:50 UTC (rev 8648) @@ -0,0 +1,40 @@ +GARNAME = babl +GARVERSION = 0.1.2 +CATEGORIES = gnome + +DESCRIPTION = babl is a dynamic, any to any, pixel format translation library +define BLURB + babl is a library for dynamically handling pixel formats and managing + conversions between them. It is being used by GEGL. +endef + +MASTER_SITES = http://ftp.gnome.org/pub/gimp/babl/0.1/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +# 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) + +# STRIP_LIBTOOL = 1 +PATCHFILES += patch-xml_insert.sh + +CHECKPKG_OVERRIDES_CSWbabl += symbol-not-found|CIE.so +CHECKPKG_OVERRIDES_CSWbabl += symbol-not-found|gimp-8bit.so +CHECKPKG_OVERRIDES_CSWbabl += symbol-not-found|gegl-fixups.so +CHECKPKG_OVERRIDES_CSWbabl += symbol-not-found|gggl.so +CHECKPKG_OVERRIDES_CSWbabl += symbol-not-found|gggl-lies.so +CHECKPKG_OVERRIDES_CSWbabl += symbol-not-found|naive-CMYK.so + +TEST_SCRIPTS = + +include gar/category.mk + +post-configure-modulated: + gfind $(WORKSRC) -name \*.c | xargs perl -pi \ + -e 's/stdint.h/limits.h/' + perl -pi -e 's/-pthread/-lpthread/' $(WORKSRC)/tests/Makefile Added: csw/mgar/pkg/babl/trunk/checksums =================================================================== --- csw/mgar/pkg/babl/trunk/checksums (rev 0) +++ csw/mgar/pkg/babl/trunk/checksums 2010-02-18 12:59:50 UTC (rev 8648) @@ -0,0 +1,2 @@ +8eebd8d78d3173db7af5e3e60b1e03ea babl-0.1.2.tar.bz2 +90be8f7b8dd32a8a94964953449c5c42 patch-xml_insert.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Thu Feb 18 14:01:38 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Thu, 18 Feb 2010 13:01:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8649] csw/mgar/pkg/babl/trunk/files/patch-xml_insert.sh Message-ID: Revision: 8649 http://gar.svn.sourceforge.net/gar/?rev=8649&view=rev Author: bensons Date: 2010-02-18 13:01:38 +0000 (Thu, 18 Feb 2010) Log Message: ----------- babl: added patch for missing mktemp Added Paths: ----------- csw/mgar/pkg/babl/trunk/files/patch-xml_insert.sh Added: csw/mgar/pkg/babl/trunk/files/patch-xml_insert.sh =================================================================== --- csw/mgar/pkg/babl/trunk/files/patch-xml_insert.sh (rev 0) +++ csw/mgar/pkg/babl/trunk/files/patch-xml_insert.sh 2010-02-18 13:01:38 UTC (rev 8649) @@ -0,0 +1,40 @@ +--- babl-0.1.2.orig/docs/tools/xml_insert.sh 2009-09-25 18:14:41.000000000 +0200 ++++ babl-0.1.2/docs/tools/xml_insert.sh 2010-02-18 13:57:12.000000000 +0100 +@@ -11,7 +11,7 @@ + # + # FIXME: add argument checking / error handling + +-: ${AWK="awk"} ++: ${AWK="nawk"} + : ${ECHO="echo"} + : ${MKDIR="mkdir"} + : ${SED="sed"} +@@ -84,8 +84,27 @@ + + $ECHO "X$my_tmpdir" | $Xsed + } ++# tmp_dir="`func_mktempdir`" ++ ++func_perlfunc_mktempdir () ++{ ++ my_template="${TMPDIR-/tmp}/${1-$progname}" ++ if test "$opt_dry_run" = ":"; then ++ # Return a directory name, but don't create it in dry-run mode ++ my_tmpdir="${my_template}-$$" ++ else ++ my_template="${my_template}-XXXXXXXX" ++ my_tmpdir=`/opt/csw/bin/perl -e 'use File::Temp qw/ :mktemp /; print mkdtemp("'${my_template}'")."\n"'` ++ if test ! -d "$my_tmpdir"; then ++ func_fatal_error "cannot create temporary directory \`$my_tmpdir'" ++ fi ++ ++ fi ++ ++ $ECHO "X$my_tmpdir" | $Xsed ++} ++tmp_dir="`func_perlfunc_mktempdir`" + +-tmp_dir="`func_mktempdir`" + tmp_file="$tmp_dir/one" + + cp $1 $tmp_file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 18 14:20:58 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 18 Feb 2010 13:20:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8650] csw/mgar/gar/v2 Message-ID: Revision: 8650 http://gar.svn.sourceforge.net/gar/?rev=8650&view=rev Author: wahwah Date: 2010-02-18 13:20:57 +0000 (Thu, 18 Feb 2010) Log Message: ----------- mGAR v2: merging the v2-checkpkg-stats branch back to v2 Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py csw/mgar/gar/v2/bin/update_contents_cache.py csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/tests/overrides_test.py csw/mgar/gar/v2/tests/run_tests.py Added Paths: ----------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-basic.py csw/mgar/gar/v2/bin/checkpkg_collect_stats.py csw/mgar/gar/v2/bin/checkpkg_collect_stats_test.py csw/mgar/gar/v2/bin/custom-pkgtrans csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/lib/sh/ csw/mgar/gar/v2/lib/sh/libcheckpkg.sh Removed Paths: ------------- csw/mgar/gar/v2/lib/sh/libcheckpkg.sh Property Changed: ---------------- csw/mgar/gar/v2/ csw/mgar/gar/v2/pkglib/csw/depend Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-02-18 13:01:38 UTC (rev 8649) +++ csw/mgar/gar/v2/bin/checkpkg 2010-02-18 13:20:57 UTC (rev 8650) @@ -21,10 +21,15 @@ # you know you are tracking the most current version. # - PATH=$PATH:/usr/sbin readonly NAME_MAX_LENGTH=${NAME_MAX_LENGTH:-20} +command_basename=`basename $0` +command_basedir="${0%/${command_basename}}" +libshdir="${command_basedir}/../lib/sh" +readonly command_basename command_basedir libshdir +. "${libshdir}/libcheckpkg.sh" + LOCAL_ARCH=`uname -p` if [[ -z "${CHECKPKG_TMPDIR}" ]]; then readonly CHECKPKG_TMPDIR="/var/tmp" @@ -44,9 +49,10 @@ BOLD="" COLOR_RESET="" fi +readonly GREEN RED BOLD COLOR_RESET readonly selfpath="$0" -readonly selfargs="$*" +readonly selfargs="$@" # always print out a warning message. (to stderr) # exit script, if quit_on_warn set @@ -124,8 +130,9 @@ shift fi if [[ "$1" == "-h" ]] ; then - print 'Usage: checkpkg [-e] pkg1 [pkg2 ....]' - print ' -e = "exit on warnings"' + print 'Usage: checkpkg [-d] [-e] pkg1 [pkg2 ....]' + print ' -d display debug messages' + print ' -e exit on warnings (soon to be obsolete)' shift fi @@ -209,12 +216,6 @@ basedir=`sed -n 's/^BASEDIR=//p' $TMPFILE` pkgarch=`sed -n 's/^ARCH=//p' $TMPFILE|head -1` -case $software in - *[A-Z]*) - errmsg "$software must be all lowercase" - ;; -esac - case `basename $f` in ${software}-${version}-*) # file name looks okay @@ -337,38 +338,9 @@ # exit 0 #fi - -# This function exists, because pkgtrans is BROKEN!! -# It leaves a directory in /var/tmp/aaXXXXXXX, even after clean quit -# SO, emulate pkgtrans behaviour, for "pkgtrans src destdir pkgname" -# Except that we ignore pkgname arg, and just do first one we find. -# and we are a bit hacky about how we do things. -pkgtrans(){ - if [[ ! -d $2 ]] ; then - print ERROR: $2 is not a directory >/dev/fd/2 - return 1 - fi - hdrblks=`(dd if=$1 skip=1 2>/dev/null| cpio -i -t >/dev/null) 2>&1 | - nawk '{print $1; exit;}'` - - ## print initial hdrblks=$hdrblks - - hdrblks=$(($hdrblks + 1)) - mkdir $2/$3 || return 1 - - dd if=$1 skip=$hdrblks 2>/dev/null | (cd $2/$3 ; cpio -ivdm) - # on fail, SOMETIMES cpio returns 1, but sometimes it returns 0!! - if [[ ! -d $2/$3/install ]] ; then - print retrying extract with different archive offset... - # no, I cant tell in advance why/when the prev fails - hdrblks=$(($hdrblks + 1)) - dd if=$1 skip=$hdrblks 2>/dev/null| (cd $2/$3 ; cpio -ivdm) - fi -} - print "" print Extracing pkg for examination of files... -pkgtrans $f $EXTRACTDIR $pkgname +custom_pkgtrans $f $EXTRACTDIR $pkgname ############################################################# # We now have the package expanded, in "directory" form, in @@ -566,33 +538,36 @@ set_variables_for_individual_package_check "$f" test_suite_ok=1 -checkpkg_scriptname=`basename $0` -checkpkg_basedir=${0%/${checkpkg_scriptname}} -plugindir=${checkpkg_basedir}/checkpkg.d +checkpkg_module_dir=${command_basedir}/checkpkg.d checkpkg_module_tag="checkpkg-" +checkpkg_stats_basedir="${HOME}/.checkpkg/stats" # Cleaning up old *.pyc files which can cause grief. This is because of the # move of Python libraries. -for pyc_file in ${plugindir}/opencsw.pyc \ - ${plugindir}/checkpkg.pyc; do +for pyc_file in ${checkpkg_module_dir}/opencsw.pyc \ + ${checkpkg_module_dir}/checkpkg.pyc; do if [ -f "${pyc_file}" ]; then echo "Removing old pyc file: '${pyc_file}'" rm "${pyc_file}" fi done -# /var/sadm/install/contents cache update -${checkpkg_basedir}/update_contents_cache.py - if [[ "${DEBUG}" != "" ]]; then extra_options="--debug" fi -debugmsg "plugindir: '$plugindir'" + +# /var/sadm/install/contents cache update +${command_basedir}/update_contents_cache.py +# Collects package stats to be later analyzed +${command_basedir}/checkpkg_collect_stats.py ${extra_options} "$@" + +debugmsg "checkpkg_module_dir: '$checkpkg_module_dir'" log_files="" module_name_format="%-40s" -if [[ -d "$plugindir" ]]; then - echo "Running modular tests" - for plugin in "${plugindir}/${checkpkg_module_tag}"*; do +md5sums=`gmd5sum "$@" | awk '{print $1}'` +if [[ -d "${checkpkg_module_dir}" ]]; then + echo "Running modular tests in ${checkpkg_module_dir}" + for plugin in "${checkpkg_module_dir}/${checkpkg_module_tag}"*; do if [[ -x "${plugin}" ]]; then plugin_base_name=`basename ${plugin}` plugin_log="${EXTRACTDIR}/${plugin_base_name}.log" @@ -600,12 +575,12 @@ plugin_name="`echo ${plugin} | sed -e 's+.*/checkpkg-++' | sed -e 's+\.py$++'`" error_tag_file="tags.${plugin_name}" printf "${BOLD}${module_name_format}${COLOR_RESET} running..." "${plugin_name}" - debugmsg "Executing: ${plugin} $extra_options -e \"${EXTRACTDIR}\" ${pkgnames}" + debugmsg "Executing: ${plugin} $extra_options -b \"${checkpkg_stats_basedir}\" -o \"${EXTRACTDIR}/${error_tag_file}\" ${md5sums}" ${plugin} \ $extra_options \ - -e "${EXTRACTDIR}" \ + -b "${checkpkg_stats_basedir}" \ -o "${EXTRACTDIR}/${error_tag_file}" \ - ${pkgnames} \ + ${md5sums} \ > "${plugin_log}" 2>&1 if [[ "$?" -ne 0 ]]; then printf "\r${module_name_format} ${RED}[ERROR]${COLOR_RESET} \\n" "${plugin_name}" @@ -618,7 +593,7 @@ fi done else - debugmsg "plugin dir ${plugindir} does not exist" + debugmsg "module dir ${checkpkg_module_dir} does not exist" fi for log_file in ${log_files}; do @@ -653,7 +628,7 @@ fi # Collecting errors and applying the overrides. -${checkpkg_basedir}/analyze_module_results.py \ +${command_basedir}/analyze_module_results.py \ -e "${EXTRACTDIR}" \ ${pkgnames} if [[ "$?" -ne 0 ]]; then Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py 2010-02-18 13:01:38 UTC (rev 8649) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py 2010-02-18 13:20:57 UTC (rev 8650) @@ -22,18 +22,21 @@ import opencsw -def CheckActionClasses(pkg, debug): +def CheckActionClasses(pkg_data, debug): """Checks the consistency between classes in the prototype and pkginfo.""" errors = [] - pkginfo = pkg.GetParsedPkginfo() - pkgmap = pkg.GetPkgmap() + pkginfo = pkg_data["pkginfo"] + pkgmap = pkg_data["pkgmap"] pkginfo_classes = set(re.split(opencsw.WS_RE, pkginfo["CLASSES"])) - pkgmap_classes = pkgmap.GetClasses() + pkgmap_classes = set() + for entry in pkgmap: + if entry["class"]: # might be None + pkgmap_classes.add(entry["class"]) only_in_pkginfo = pkginfo_classes.difference(pkgmap_classes) only_in_pkgmap = pkgmap_classes.difference(pkginfo_classes) for action_class in only_in_pkginfo: error = checkpkg.CheckpkgTag( - pkg.pkgname, + pkg_data["basic_stats"]["pkgname"], "action-class-only-in-pkginfo", action_class, msg="This shouldn't cause any problems, but it might be not necessary.") @@ -46,10 +49,16 @@ def main(): options, args = checkpkg.GetOptions() - pkgnames = args + if options.debug: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.INFO) + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.extractdir, - pkgnames, + options.stats_basedir, + md5sums, options.debug) # Registering functions defined above. check_manager.RegisterIndividualCheck(CheckActionClasses) Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py 2010-02-18 13:01:38 UTC (rev 8649) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py 2010-02-18 13:20:57 UTC (rev 8650) @@ -19,13 +19,14 @@ ARCH_RE = re.compile(r"(sparcv(8|9)|i386|amd64)") -def CheckArchitectureVsContents(pkg, debug): +def CheckArchitectureVsContents(pkg_data, debug): """Verifies the relationship between package contents and architecture.""" errors = [] - binaries = pkg.ListBinaries() - pkginfo = pkg.GetParsedPkginfo() + binaries = pkg_data["binaries"] + pkginfo = pkg_data["pkginfo"] pkgmap = pkg.GetPkgmap() arch = pkginfo["ARCH"] + pkgname = pkg_data["basic_stats"]["pkgname"] reasons_to_be_arch_specific = [] for pkgmap_path in pkgmap.entries_by_path: # print "pkgmap_path", repr(pkgmap_path), type(pkgmap_path) @@ -41,13 +42,13 @@ "package contains binary %s" % binary)) if arch == "all": for tag, param, desc in reasons_to_be_arch_specific: - errors.append(checkpkg.CheckpkgTag(pkg.pkgname, tag, param)) + errors.append(checkpkg.CheckpkgTag(pkgname, tag, param)) elif not reasons_to_be_arch_specific: # This is not a clean way of handling messages for the user, but there's # not better way at the moment. - print "Package %s does not contain any binaries." % pkg.pkgname + print "Package %s does not contain any binaries." % pkgname print "Consider making it ARCHALL = 1 instead of %s:" % arch - print "ARCHALL_%s = 1" % pkg.pkgname + print "ARCHALL_%s = 1" % pkgname print ("However, be aware that there might be other reasons " "to keep it architecture-specific.") return errors @@ -55,10 +56,12 @@ def main(): options, args = checkpkg.GetOptions() - pkgnames = args + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.extractdir, - pkgnames, + options.stats_basedir, + md5sums, options.debug) check_manager.RegisterIndividualCheck(CheckArchitectureVsContents) Copied: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-basic.py (from rev 8649, csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg.d/checkpkg-basic.py) =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-basic.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-basic.py 2010-02-18 13:20:57 UTC (rev 8650) @@ -0,0 +1,44 @@ +#!/opt/csw/bin/python2.6 +# $Id: checkpkg-you-can-write-your-own.py 8571 2010-02-16 09:05:51Z wahwah $ + +"""This is a dummy module. You can use it as a boilerplate for your own modules. + +Copy it and modify. +""" + +import os.path +import sys + +CHECKPKG_MODULE_NAME = "basic checks ported from Korn shell" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import package_checks + +def main(): + options, args = checkpkg.GetOptions() + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + # Registering functions defined above. + check_manager.RegisterIndividualCheck(package_checks.CatalognameLowercase) + check_manager.RegisterIndividualCheck(package_checks.FileNameSanity) + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-02-18 13:01:38 UTC (rev 8649) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-02-18 13:20:57 UTC (rev 8650) @@ -28,69 +28,32 @@ import checkpkg import opencsw -DUMP_BIN = "/usr/ccs/bin/dump" - -def GetIsalist(): - args = ["isalist"] - isalist_proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = isalist_proc.communicate() - ret = isalist_proc.wait() - if ret: - logging.error("Calling isalist has failed.") - isalist = re.split(r"\s+", stdout.strip()) - return isalist - - -def CheckSharedLibraryConsistency(pkgs, debug): +def CheckSharedLibraryConsistency(pkgs_data, debug): + ws_re = re.compile(r"\s+") result_ok = True errors = [] binaries = [] binaries_by_pkgname = {} sonames_by_pkgname = {} pkg_by_any_filename = {} - for checker in pkgs: - pkg_binary_paths = checker.ListBinaries() - binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] - binaries_by_pkgname[checker.pkgname] = binaries_base - binaries.extend(pkg_binary_paths) - for filename in checker.GetAllFilenames(): - pkg_by_any_filename[filename] = checker.pkgname + needed_sonames_by_binary = {} + filenames_by_soname = {} + for pkg_data in pkgs_data: + binaries_base = [os.path.basename(x) for x in pkg_data["binaries"]] + pkgname = pkg_data["basic_stats"]["pkgname"] + binaries_by_pkgname[pkgname] = binaries_base + binaries.extend(pkg_data["binaries"]) + for filename in pkg_data["all_filenames"]: + pkg_by_any_filename[filename] = pkgname + for binary_data in pkg_data["binaries_dump_info"]: + binary_base_name = os.path.basename(binary_data["base_name"]) + needed_sonames_by_binary[binary_base_name] = binary_data + filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name + # Making the binaries unique binaries = set(binaries) - ws_re = re.compile(r"\s+") + isalist = pkg_data["isalist"] - # man ld.so.1 for more info on this hack - env = copy.copy(os.environ) - env["LD_NOAUXFLTR"] = "1" - needed_sonames_by_binary = {} - filenames_by_soname = {} - # Assembling a data structure with the data about binaries. - # { - # : { checkpkg.NEEDED_SONAMES: [...], - # checkpkg.RUNPATH: [...]}, - # : ..., - # ... - # } - # - for binary in binaries: - binary_base_name = binary.split("/")[-1] - args = [DUMP_BIN, "-Lv", binary] - dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) - stdout, stderr = dump_proc.communicate() - ret = dump_proc.wait() - binary_data = checkpkg.ParseDumpOutput(stdout) - needed_sonames_by_binary[binary_base_name] = binary_data - if checkpkg.SONAME not in binary_data: - logging.debug("The %s binary doesn't provide a SONAME. " - "(It might be an executable)", - binary_base_name) - # The shared library doesn't tell its SONAME. We're guessing it's the - # same as the base file name. - binary_data[checkpkg.SONAME] = binary_base_name - filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name - - isalist = GetIsalist() - # Building indexes by soname to simplify further processing # These are indexes "by soname". (needed_sonames, @@ -158,10 +121,9 @@ print dependent_pkgs = {} - for checker in pkgs: - pkgname = checker.pkgname - dir_format_pkg = opencsw.DirectoryFormatPackage(checker.pkgpath) - declared_dependencies = dir_format_pkg.GetDependencies() + for checker in pkgs_data: + pkgname = checker["basic_stats"]["pkgname"] + declared_dependencies = checker["depends"] if debug: sanitized_pkgname = pkgname.replace("-", "_") data_file_name = "/var/tmp/checkpkg_test_data_%s.py" % sanitized_pkgname @@ -191,7 +153,7 @@ filenames_by_soname, pkg_by_any_filename) namespace = { - "pkgname": checker.pkgname, + "pkgname": pkgname, "missing_deps": missing_deps, "surplus_deps": surplus_deps, "orphan_sonames": orphan_sonames, @@ -206,20 +168,22 @@ "orphan-soname", soname)) for missing_dep in missing_deps: - errors.append( - checkpkg.CheckpkgTag( - pkgname, - "missing-dependency", - missing_dep)) + errors.append( + checkpkg.CheckpkgTag( + pkgname, + "missing-dependency", + missing_dep)) return errors def main(): options, args = checkpkg.GetOptions() - pkgnames = args + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.extractdir, - pkgnames, + options.stats_basedir, + md5sums, options.debug) check_manager.RegisterSetCheck(CheckSharedLibraryConsistency) Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py 2010-02-18 13:01:38 UTC (rev 8649) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py 2010-02-18 13:20:57 UTC (rev 8650) @@ -19,16 +19,17 @@ LICENSE_TMPL = "/opt/csw/share/doc/%s/license" -def CheckLicenseFile(pkg, debug): +def CheckLicenseFile(pkg_data, debug): """Checks for the presence of the license file.""" errors = [] - pkgmap = pkg.GetPkgmap() - catalogname = pkg.GetCatalogname() + pkgmap = pkg_data["pkgmap"] + catalogname = pkg_data["basic_stats"]["catalogname"] license_path = LICENSE_TMPL % catalogname - if license_path not in pkgmap.entries_by_path: + pkgmap_paths = [x["path"] for x in pkgmap] + if license_path not in pkgmap_paths: errors.append( checkpkg.CheckpkgTag( - pkg.pkgname, + pkg_data["basic_stats"]["pkgname"], "license-missing", msg="See http://sourceforge.net/apps/trac/gar/wiki/CopyRight")) return errors @@ -36,10 +37,12 @@ def main(): options, args = checkpkg.GetOptions() - pkgnames = args + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.extractdir, - pkgnames, + options.stats_basedir, + md5sums, options.debug) # Registering functions defined above. check_manager.RegisterIndividualCheck(CheckLicenseFile) Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py 2010-02-18 13:01:38 UTC (rev 8649) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py 2010-02-18 13:20:57 UTC (rev 8650) @@ -22,39 +22,33 @@ # Defining checking functions. -def CheckForMissingSymbols(pkg, debug): +def CheckForMissingSymbols(pkg_data, debug): """Looks for "symbol not found" in ldd -r output.""" errors = [] - binaries = pkg.ListBinaries() + binaries = pkg_data["binaries"] symbol_re = re.compile(r"symbol not found:") for binary in binaries: - # this could be potentially moved into the DirectoryFormatPackage class. - args = ["ldd", "-r", binary] - ldd_proc = subprocess.Popen( - args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = ldd_proc.communicate() - retcode = ldd_proc.wait() - lines = stdout.splitlines() + lines = pkg_data["ldd_dash_r"][binary] missing_symbols = False for line in lines: if re.search(symbol_re, line): missing_symbols = True binary_base = os.path.basename(binary) if missing_symbols: - errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "symbol-not-found", binary_base)) + errors.append(checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "symbol-not-found", binary_base)) return errors def main(): options, args = checkpkg.GetOptions() - pkgnames = args + md5sums = args # CheckpkgManager class abstracts away things such as the collection of # results. check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.extractdir, - pkgnames, + options.stats_basedir, + md5sums, options.debug) # Registering functions defined above. check_manager.RegisterIndividualCheck(CheckForMissingSymbols) Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-02-18 13:01:38 UTC (rev 8649) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-02-18 13:20:57 UTC (rev 8650) @@ -8,6 +8,8 @@ import os.path import sys +CHECKPKG_MODULE_NAME = "obsolete dependencies" + # The following bit of code sets the correct path to Python libraries # distributed with GAR. path_list = [os.path.dirname(__file__), @@ -26,10 +28,10 @@ }, } -def CheckObsoleteDeps(pkg, debug): +def CheckObsoleteDeps(pkg_data, debug): """Checks for obsolete dependencies.""" errors = [] - deps = set(pkg.GetDependencies()) + deps = set(pkg_data["depends"]) obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) if obsolete_pkg_deps: for obsolete_pkg in obsolete_pkg_deps: @@ -43,17 +45,20 @@ if not msg: msg = None errors.append( - checkpkg.CheckpkgTag(pkg.pkgname, "obsolete-dependency", - obsolete_pkg, msg=msg)) + checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "obsolete-dependency", obsolete_pkg, msg=msg)) return errors def main(): options, args = checkpkg.GetOptions() - pkgnames = args - check_manager = checkpkg.CheckpkgManager("obsolete dependencies", - options.extractdir, - pkgnames, + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, options.debug) check_manager.RegisterIndividualCheck(CheckObsoleteDeps) # Running the checks, reporting and exiting. Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-02-18 13:01:38 UTC (rev 8649) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-02-18 13:20:57 UTC (rev 8650) @@ -21,7 +21,7 @@ # Defining the checking functions. They come in two flavors: individual # package checks and set checks. -def MyCheckForAsinglePackage(pkg, debug): +def MyCheckForAsinglePackage(pkg_data, debug): """Checks an individual package. Gets a DirctoryFormatPackage as an argument, and returns a list of errors. @@ -40,11 +40,13 @@ # Here's how to report an error: something_is_wrong = False if something_is_wrong: - errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "example-problem", "thing")) + errors.append(checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "example-problem", "thing")) return errors -def MyCheckForAsetOfPackages(pkgs, debug): +def MyCheckForAsetOfPackages(pkgs_data, debug): """Checks a set of packages. Sometimes individual checks aren't enough. If you need to write code which @@ -59,12 +61,12 @@ def main(): options, args = checkpkg.GetOptions() - pkgnames = args + md5sums = args # CheckpkgManager class abstracts away things such as the collection of # results. check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.extractdir, - pkgnames, + options.stats_basedir, + md5sums, options.debug) # Registering functions defined above. check_manager.RegisterIndividualCheck(MyCheckForAsinglePackage) Copied: csw/mgar/gar/v2/bin/checkpkg_collect_stats.py (from rev 8649, csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats.py) =================================================================== --- csw/mgar/gar/v2/bin/checkpkg_collect_stats.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg_collect_stats.py 2010-02-18 13:20:57 UTC (rev 8650) @@ -0,0 +1,42 @@ +#!/opt/csw/bin/python2.6 +# +# $Id$ +# +# Collects statistics about a package and saves to a directory, for later use +# by checkpkg modules. + +import logging +import optparse +import os +import os.path +import subprocess +import sys + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + + +def main(): + parser = optparse.OptionParser() + parser.add_option("-d", "--debug", dest="debug", + default=False, action="store_true", + help="Turn on debugging messages") + options, args = parser.parse_args() + if options.debug: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.INFO) + logging.info("Collecting statistics about given package files.") + logging.debug("calling: %s, please be patient", args) + packages = [opencsw.CswSrv4File(x, options.debug) for x in args] + stats_list = [checkpkg.PackageStats(pkg) for pkg in packages] + for pkg_stats in stats_list: + pkg_stats.CollectStats() + +if __name__ == '__main__': + main() Copied: csw/mgar/gar/v2/bin/checkpkg_collect_stats_test.py (from rev 8649, csw/mgar/gar/v2-checkpkg-stats/bin/checkpkg_collect_stats_test.py) =================================================================== --- csw/mgar/gar/v2/bin/checkpkg_collect_stats_test.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg_collect_stats_test.py 2010-02-18 13:20:57 UTC (rev 8650) @@ -0,0 +1,34 @@ +#!/opt/csw/bin/python2.6 + +import os +import sys +import unittest +import mox +import checkpkg_collect_stats as ccs + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + + +class PackageStatsUnitTest(unittest.TestCase): + + def setUp(self): + self.mocker = mox.Mox() + + def testGetStatsPath(self): + mock_pkg = self.mocker.CreateMock(opencsw.CswSrv4File) + mock_pkg.GetMd5sum().AndReturn("abcdef") + self.mocker.ReplayAll() + sc = ccs.PackageStats(mock_pkg) + expected = "/home/joe/.checkpkg/stats/ab/abcdef" + self.assertEqual(expected, sc.GetStatsPath("/home/joe")) + self.mocker.VerifyAll() + + +if __name__ == '__main__': + unittest.main() Copied: csw/mgar/gar/v2/bin/custom-pkgtrans (from rev 8649, csw/mgar/gar/v2-checkpkg-stats/bin/custom-pkgtrans) =================================================================== --- csw/mgar/gar/v2/bin/custom-pkgtrans (rev 0) +++ csw/mgar/gar/v2/bin/custom-pkgtrans 2010-02-18 13:20:57 UTC (rev 8650) @@ -0,0 +1,22 @@ +#!/bin/ksh -p +# +# $Id$ +# +# This file exists in order to avoid implementing pipelines in Python. It +# could be integrated into the package stats collection program. + +command_basename=`basename $0` +command_basedir="${0%/${command_basename}}" +libshdir="${command_basedir}/../lib/sh" +readonly command_basename command_basedir libshdir +. "${libshdir}/libcheckpkg.sh" + +if [[ -z "$1" || -z "$2" || -z "$3" ]]; then + print >&2 "usage: $0 " + exit 1 +fi +if [[ "$3" == "all" ]]; then + print >&2 "This script can't handle 'all' as the third argument" + exit 1 +fi +custom_pkgtrans "$1" "$2" "$3" Modified: csw/mgar/gar/v2/bin/update_contents_cache.py =================================================================== --- csw/mgar/gar/v2/bin/update_contents_cache.py 2010-02-18 13:01:38 UTC (rev 8649) +++ csw/mgar/gar/v2/bin/update_contents_cache.py 2010-02-18 13:20:57 UTC (rev 8650) @@ -12,8 +12,7 @@ # The following bit of code sets the correct path to Python libraries # distributed with GAR. -path_list = [os.getcwd(), - os.path.split(sys.argv[0])[0], +path_list = [os.path.dirname(__file__), "..", "lib", "python"] sys.path.append(os.path.join(*path_list)) import checkpkg Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-02-18 13:01:38 UTC (rev 8649) +++ csw/mgar/gar/v2/gar.conf.mk 2010-02-18 13:20:57 UTC (rev 8650) @@ -179,6 +179,7 @@ DEF_BASE_PKGS += CSWgsed DEF_BASE_PKGS += CSWgtar DEF_BASE_PKGS += CSWpy-cheetah +DEF_BASE_PKGS += CSWpy-yaml DEF_BASE_PKGS += CSWpython DEF_BASE_PKGS += CSWtextutils DEF_BASE_PKGS += CSWwget Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-18 13:01:38 UTC (rev 8649) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-18 13:20:57 UTC (rev 8650) @@ -3,6 +3,9 @@ # This is the checkpkg library, common for all checkpkg tests written in # Python. +import copy +import cPickle +import errno import itertools import logging import optparse @@ -12,6 +15,7 @@ import socket import sqlite3 import subprocess +import yaml from Cheetah import Template import opencsw @@ -24,21 +28,23 @@ DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) DO_NOT_REPORT_MISSING = set([]) DO_NOT_REPORT_MISSING_RE = [r"SUNW.*", r"\*SUNW.*"] +DUMP_BIN = "/usr/ccs/bin/dump" SYSTEM_SYMLINKS = ( - ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), - ("/64", ["/amd64", "/sparcv9"]), + ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), + ("/64", ["/amd64", "/sparcv9"]), ("/opt/csw/lib/i386", ["/opt/csw/lib"]), ) +INSTALL_CONTENTS_AVG_LINE_LENGTH = 102.09710677919261 # This shared library is present on Solaris 10 on amd64, but it's missing on # Solaris 8 on i386. It's okay if it's missing. ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) DEPENDENCY_FILENAME_REGEXES = ( - (r".*\.pl", u"CSWperl"), - (r".*\.pm", u"CSWperl"), - (r".*\.py", u"CSWpython"), - (r".*\.rb", u"CSWruby"), + (r".*\.pl$", u"CSWperl"), + (r".*\.pm$", u"CSWperl"), + (r".*\.py$", u"CSWpython"), + (r".*\.rb$", u"CSWruby"), ) REPORT_TMPL = u"""#if $missing_deps or $surplus_deps or $orphan_sonames @@ -75,7 +81,7 @@ #end for #else #if $debug -OK: $name found no problems. +OK: $repr($name) module found no problems. #end if #end if """ @@ -106,16 +112,19 @@ def GetOptions(): parser = optparse.OptionParser() - parser.add_option("-e", dest="extractdir", - help="The directory into which the package has been extracted") + parser.add_option("-b", dest="stats_basedir", + help=("The base directory with package statistics " + "in yaml format, e.g. ~/.checkpkg/stats")) parser.add_option("-d", "--debug", dest="debug", default=False, action="store_true", help="Turn on debugging messages") parser.add_option("-o", "--output", dest="output", help="Output error tag file") (options, args) = parser.parse_args() - if not options.extractdir: - raise ConfigurationError("ERROR: -e option is missing.") + if not options.stats_basedir: + raise ConfigurationError("ERROR: the -b option is missing.") + if not options.output: + raise ConfigurationError("ERROR: the -o option is missing.") # Using set() to make the arguments unique. return options, set(args) @@ -199,18 +208,21 @@ fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog """ + contents_length = os.stat(SYSTEM_PKGMAP).st_size + estimated_lines = contents_length / INSTALL_CONTENTS_AVG_LINE_LENGTH system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) # Creating a data structure: # soname - {: , : , ...} logging.debug("Building sqlite3 cache db of the %s file", SYSTEM_PKGMAP) + print "Processing %s" % SYSTEM_PKGMAP c = self.conn.cursor() count = itertools.count() for line in system_pkgmap_fd: i = count.next() if not i % 1000: - print "\r%s" % i, + print "\r~%3.1f%%" % (100.0 * i / estimated_lines,), if stop_re.search(line): continue fields = re.split(WS_RE, line) @@ -218,7 +230,7 @@ pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) - print + print "\rAll lines of %s were processed." % SYSTEM_PKGMAP print "Creating the main database index." sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" c.execute(sql) @@ -280,17 +292,18 @@ return self.GetFileMtime() <= self.GetDatabaseMtime() def PurgeDatabase(self): - logging.info("Purging the cache database") c = self.conn.cursor() - sql = "DELETE FROM config;" - c.execute(sql) - sql = "DELETE FROM systempkgmap;" - c.execute(sql) + logging.info("Dropping the index.") sql = "DROP INDEX basename_idx;" try: c.execute(sql) except sqlite3.OperationalError, e: logging.warn(e) + logging.info("Deleting all rows from the cache database") + sql = "DELETE FROM config;" + c.execute(sql) + sql = "DELETE FROM systempkgmap;" + c.execute(sql) def SharedObjectDependencies(pkgname, binaries_by_pkgname, @@ -560,11 +573,11 @@ class CheckpkgManager(object): """Takes care of calling checking functions""" - def __init__(self, name, extractdir, pkgname_list, debug=False): + def __init__(self, name, stats_basedir, md5sum_list, debug=False): self.debug = debug self.name = name - self.extractdir = extractdir - self.pkgname_list = pkgname_list + self.md5sum_list = md5sum_list + self.stats_basedir = stats_basedir self.errors = [] self.individual_checks = [] self.set_checks = [] @@ -576,23 +589,24 @@ def RegisterSetCheck(self, function): self.set_checks.append(function) - def GetDirectoryFormatPackages(self): - packages = [] - for pkgname in self.pkgname_list: - pkg_path = os.path.join(self.extractdir, pkgname) - packages.append(opencsw.DirectoryFormatPackage(pkg_path)) - return packages + def GetPackageStatsList(self): + stats_list = [] + for md5sum in self.md5sum_list: + stats_list.append(PackageStats(None, self.stats_basedir, md5sum)) + return stats_list - def GetAllTags(self, packages): + def GetAllTags(self, packages_data): errors = {} - for pkg in packages: + for pkg_data in packages_data: for function in self.individual_checks: - errors_for_pkg = function(pkg, debug=self.debug) + all_stats = pkg_data.GetAllStats() + errors_for_pkg = function(all_stats, debug=self.debug) if errors_for_pkg: - errors[pkg.pkgname] = errors_for_pkg + errors[all_stats["basic_stats"]["pkgname"]] = errors_for_pkg # Set checks for function in self.set_checks: - set_errors = function(packages, debug=self.debug) + set_errors = function([x.GetAllStats() for x in packages_data], + debug=self.debug) if set_errors: # These were generated by a set, but are likely to be bound to specific # packages. We'll try to preserve the package assignments. @@ -624,8 +638,8 @@ Returns a tuple of an exit code and a report. """ - packages = self.GetDirectoryFormatPackages() - errors = self.GetAllTags(packages) + packages_data = self.GetPackageStatsList() + errors = self.GetAllTags(packages_data) screen_report, tags_report = self.FormatReports(errors) exit_code = 0 return (exit_code, screen_report, tags_report) @@ -679,7 +693,6 @@ basket_b["tag_info"] = tag.tag_info basket_a["tag_name"] = self.tag_name basket_b["tag_name"] = tag.tag_name - # print "comparing", basket_a, basket_b return basket_a == basket_b def ParseOverrideLine(line): @@ -714,3 +727,234 @@ if not override_applies: tags_after_overrides.append(tag) return tags_after_overrides + + +def GetIsalist(): + args = ["isalist"] + isalist_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = isalist_proc.communicate() + ret = isalist_proc.wait() + if ret: + logging.error("Calling isalist has failed.") + isalist = re.split(r"\s+", stdout.strip()) + return isalist + + +class PackageStats(object): + """Collects stats about a package and saves it.""" + STATS_VERSION = 1L + # This list needs to be synchronized with the CollectStats() method. + STAT_FILES = [ + "all_filenames", + "basic_stats", + "binaries", + "binaries_dump_info", + "depends", + "isalist", + "ldd_dash_r", + "overrides", + "pkginfo", + "pkgmap", + ] + + def __init__(self, srv4_pkg, stats_basedir=None, md5sum=None): + self.srv4_pkg = srv4_pkg + self.md5sum = md5sum + self.dir_format_pkg = None + self.stats_path = None + self.all_stats = {} + self.stats_basedir = stats_basedir + if not self.stats_basedir: + home = os.environ["HOME"] + parts = [home, ".checkpkg", "stats"] + self.stats_basedir = os.path.join(*parts) + + def GetMd5sum(self): + if not self.md5sum: + self.md5sum = self.srv4_pkg.GetMd5sum() + return self.md5sum + + def GetStatsPath(self): + if not self.stats_path: + md5sum = self.GetMd5sum() + two_chars = md5sum[0:2] + parts = [self.stats_basedir, two_chars, md5sum] + self.stats_path = os.path.join(*parts) + return self.stats_path + + def StatsExist(self): + """Checks if statistics of a package exist. + + Returns: + bool + """ + if not self.StatsDirExists(): + return False + # More checks can be added in the future. + return True + + def StatsDirExists(self): + return os.path.isdir(self.GetStatsPath()) + + def GetDirFormatPkg(self): + if not self.dir_format_pkg: + self.dir_format_pkg = self.srv4_pkg.GetDirFormatPkg() + return self.dir_format_pkg + + def MakeStatsDir(self): + """mkdir -p equivalent. + + http://stackoverflow.com/questions/600268/mkdir-p-functionality-in-python + """ + stats_path = self.GetStatsPath() + try: + os.makedirs(stats_path) + except OSError, e: + if e.errno == errno.EEXIST: + pass + else: + raise + + def GetBinaryDumpInfo(self): + dir_pkg = self.GetDirFormatPkg() + # Binaries. This could be split off to a separate function. + # man ld.so.1 for more info on this hack + env = copy.copy(os.environ) + env["LD_NOAUXFLTR"] = "1" + binaries_dump_info = [] + for binary in dir_pkg.ListBinaries(): + binary_abs_path = os.path.join(dir_pkg.directory, "root", binary) + binary_base_name = os.path.basename(binary) + args = [DUMP_BIN, "-Lv", binary_abs_path] + dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) + stdout, stderr = dump_proc.communicate() + ret = dump_proc.wait() + binary_data = ParseDumpOutput(stdout) + binary_data["path"] = binary + binary_data["soname_guessed"] = False + binary_data["base_name"] = binary_base_name + if SONAME not in binary_data: + logging.debug("The %s binary doesn't provide a SONAME. " + "(It might be an executable)", + binary_base_name) + # The binary doesn't tell its SONAME. We're guessing it's the + # same as the base file name. + binary_data[SONAME] = binary_base_name + binary_data["soname_guessed"] = True + binaries_dump_info.append(binary_data) + return binaries_dump_info + + def GetBasicStats(self): + dir_pkg = self.GetDirFormatPkg() + basic_stats = {} + basic_stats["stats_version"] = self.STATS_VERSION + basic_stats["pkg_path"] = self.srv4_pkg.pkg_path + basic_stats["pkg_basename"] = os.path.basename(self.srv4_pkg.pkg_path) + basic_stats["parsed_basename"] = opencsw.ParsePackageFileName(basic_stats["pkg_basename"]) + basic_stats["pkgname"] = dir_pkg.pkgname + basic_stats["catalogname"] = dir_pkg.GetCatalogname() + return basic_stats + + def GetOverrides(self): + dir_pkg = self.GetDirFormatPkg() + overrides = dir_pkg.GetOverrides() + def OverrideToDict(override): + d = {} + d["pkgname"] = override.pkgname + d["tag_name"] = override.tag_name + d["tag_info"] = override.tag_info + return d + overrides_simple = [OverrideToDict(x) for x in overrides] + return overrides_simple + + def GetLddMinusRlines(self): + """Returns ldd -r output.""" + dir_pkg = self.GetDirFormatPkg() + binaries = dir_pkg.ListBinaries() + ldd_output = {} + for binary in binaries: + binary_abspath = os.path.join(dir_pkg.directory, "root", binary) + # this could be potentially moved into the DirectoryFormatPackage class. + # ldd needs the binary to be executable + os.chmod(binary_abspath, 0755) + args = ["ldd", "-r", binary_abspath] + ldd_proc = subprocess.Popen( + args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = ldd_proc.communicate() + retcode = ldd_proc.wait() + if retcode: + logging.error("%s returned an error: %s", args, stderr) + lines = stdout.splitlines() + ldd_output[binary] = lines + return ldd_output + + + def CollectStats(self): + stats_path = self.GetStatsPath() + self.MakeStatsDir() + dir_pkg = self.GetDirFormatPkg() + logging.info("Collecting %s package statistics.", repr(dir_pkg.pkgname)) + self.DumpObject(dir_pkg.GetAllFilenames(), "all_filenames") + self.DumpObject(self.GetBasicStats(), "basic_stats") + self.DumpObject(dir_pkg.ListBinaries(), "binaries") + self.DumpObject(self.GetBinaryDumpInfo(), "binaries_dump_info") + self.DumpObject(dir_pkg.GetDependencies(), "depends") + self.DumpObject(GetIsalist(), "isalist") + self.DumpObject(self.GetOverrides(), "overrides") + self.DumpObject(dir_pkg.GetParsedPkginfo(), "pkginfo") + self.DumpObject(dir_pkg.GetPkgmap().entries, "pkgmap") + self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") + logging.debug("Statistics collected.") + + def GetAllStats(self): + if self.StatsExist(): + self.all_stats = self.ReadSavedStats() + else: + self.CollectStats() + return self.all_stats + + def DumpObject(self, obj, name): + """Saves an object. + + TODO(maciej): Implement pickling with cPickle. + """ + stats_path = self.GetStatsPath() + # yaml + out_file_name = os.path.join(stats_path, "%s.yml" % name) + logging.debug("DumpObject(): writing %s", repr(out_file_name)) + f = open(out_file_name, "w") + f.write(yaml.safe_dump(obj)) + f.close() + # pickle + out_file_name_pickle = os.path.join(stats_path, "%s.pickle" % name) + f = open(out_file_name_pickle, "wb") + cPickle.dump(obj, f) + f.close() + self.all_stats[name] = obj + + def ReadObject(self, name): + """Reads an object.""" + stats_path = self.GetStatsPath() + in_file_name = os.path.join(stats_path, "%s.yml" % name) + in_file_name_pickle = os.path.join(stats_path, "%s.pickle" % name) + if os.path.exists(in_file_name_pickle): + logging.debug("ReadObject(): reading %s", repr(in_file_name_pickle)) + f = open(in_file_name_pickle, "r") + obj = cPickle.load(f) + f.close() + logging.debug("ReadObject(): finished reading %s", repr(in_file_name_pickle)) + else: + logging.debug("ReadObject(): reading %s", repr(in_file_name)) + f = open(in_file_name, "r") + obj = yaml.safe_load(f) + f.close() + logging.debug("ReadObject(): finished reading %s", repr(in_file_name)) + return obj + + def ReadSavedStats(self): + all_stats = {} + for name in self.STAT_FILES: + all_stats[name] = self.ReadObject(name) + return all_stats Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-18 13:01:38 UTC (rev 8649) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-18 13:20:57 UTC (rev 8650) @@ -15,6 +15,7 @@ import copy import datetime import difflib +import hashlib import logging import os import os.path @@ -347,14 +348,13 @@ def ShellCommand(self, args, quiet=False): logging.debug("Calling: %s", repr(args)) if quiet: - sub_stdout = subprocess.PIPE - sub_stderr = subprocess.PIPE + process = subprocess.Popen(args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = process.communicate() + retcode = process.wait() else: - sub_stdout = None - sub_stderr = None - retcode = subprocess.call(args, - stdout=sub_stdout, - stderr=sub_stderr) + retcode = subprocess.call(args) if retcode: raise Error("Running %s has failed." % repr(args)) return retcode @@ -363,13 +363,17 @@ class CswSrv4File(ShellMixin, object): """Represents a package in the srv4 format (pkg).""" - def __init__(self, pkg_path): + def __init__(self, pkg_path, debug=False): self.pkg_path = pkg_path self.workdir = None self.gunzipped_path = None self.transformed = False self.dir_format_pkg = None + self.debug = debug + def __repr__(self): + return u"CswSrv4File(%s)" % repr(self.pkg_path) + def GetWorkDir(self): if not self.workdir: self.workdir = tempfile.mkdtemp(prefix="pkg_") @@ -399,11 +403,49 @@ "%s or %s." % (gzip_suffix, pkg_suffix)) return self.gunzipped_path + def Pkgtrans(self, src_file, destdir, pkgname): + """A proxy for the pkgtrans command. + + This requires custom-pkgtrans to be available. + """ + if not os.path.isdir(destdir): + raise PackageError("%s doesn't exist or is not a directory" % destdir) + args = [os.path.join(os.path.dirname(__file__), "custom-pkgtrans"), + src_file, destdir, pkgname ] + pkgtrans_proc = subprocess.Popen(args) + pkgtrans_proc.communicate() + ret = pkgtrans_proc.wait() + if ret: + logging.error("% has failed" % args) + + def GetPkgname(self): + """It's necessary to figure out the pkgname from the .pkg file. + # nawk 'NR == 2 {print $1; exit;} $f + """ + gunzipped_path = self.GetGunzippedPath() + args = ["nawk", "NR == 2 {print $1; exit;}", gunzipped_path] + nawk_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = nawk_proc.communicate() + ret_code = nawk_proc.wait() + pkgname = stdout.strip() + logging.debug("GetPkgname(): %s", repr(pkgname)) + return pkgname + def TransformToDir(self): + """Transforms the file to the directory format. + + This uses the Pkgtrans function at the top, because pkgtrans behaves + differently on Solaris 8 and 10. Having our own implementation helps + achieve consistent behavior. + """ if not self.transformed: - args = ["pkgtrans", "-a", self.GetAdminFilePath(), - self.GetGunzippedPath(), self.GetWorkDir(), "all"] - unused_retcode = self.ShellCommand(args, quiet=True) + gunzipped_path = self.GetGunzippedPath() + pkgname = self.GetPkgname() + args = [os.path.join(os.path.dirname(__file__), + "..", "..", "bin", "custom-pkgtrans"), + gunzipped_path, self.GetWorkDir(), pkgname] + logging.info("transforming: %s", args) + unused_retcode = self.ShellCommand(args, quiet=(not self.debug)) dirs = self.GetDirs() if len(dirs) != 1: raise Error("Need exactly one package in the package stream: " @@ -428,6 +470,13 @@ dir_format_pkg = self.GetDirFormatPkg() return dir_format_pkg.GetPkgmap(analyze_permissions, strip) + def GetMd5sum(self): + fp = open(self.pkg_path) + hash = hashlib.md5() + hash.update(fp.read()) + fp.close() + return hash.hexdigest() + def __del__(self): if self.workdir: logging.debug("Removing %s", repr(self.workdir)) @@ -537,12 +586,17 @@ class DirectoryFormatPackage(ShellMixin, object): + """Represents a package in the directory format. + Allows some read-write operations. + """ + def __init__(self, directory): self.directory = directory - self.pkgname = os.path.split(directory)[1] + self.pkgname = os.path.basename(directory) self.pkgpath = self.directory self.pkginfo_dict = None + self.binaries = None def GetCatalogname(self): """Returns the catalog name of the package. @@ -682,16 +736,23 @@ Returns a list of absolute paths. """ - self.CheckPkgpathExists() - find_tmpl = "find '%s' -print | xargs file | grep ELF | nawk -F: '{print $1}'" - find_proc = subprocess.Popen(find_tmpl % self.directory, - shell=True, - stdout=subprocess.PIPE) - stdout, stderr = find_proc.communicate() - ret = find_proc.wait() - if ret: - logging.error("The find command returned an error.") - return stdout.splitlines() + if not self.binaries: + self.CheckPkgpathExists() + files_root = os.path.join(self.directory, "root") + find_tmpl = "find '%s' -print | xargs file | grep ELF | nawk -F: '{print $1}'" + find_proc = subprocess.Popen(find_tmpl % ".", + shell=True, + stdout=subprocess.PIPE, + cwd=files_root) + stdout, stderr = find_proc.communicate() + ret = find_proc.wait() + if ret: + logging.error("The find command returned an error.") + dotslash_re = re.compile(r"^./") + def StripRe(x, strip_re): + return re.sub(strip_re, "", x) + self.binaries = [StripRe(x, dotslash_re) for x in stdout.splitlines()] + return self.binaries def GetAllFilenames(self): self.CheckPkgpathExists() @@ -710,15 +771,15 @@ # worry about that at this stage. logging.debug("Trying to open %s", repr(file_path)) if os.path.isfile(file_path): - return open(file_path, "r") + return open(file_path, "r") else: - return None + return None def _ParseOverridesStream(self, stream): overrides = [] for line in stream: if line.startswith("#"): - continue + continue overrides.append(checkpkg.ParseOverrideLine(line)) return overrides @@ -726,9 +787,9 @@ """Returns overrides, a list of checkpkg.Override instances.""" stream = self._GetOverridesStream() if stream: - return self._ParseOverridesStream(stream) + return self._ParseOverridesStream(stream) else: - return list() + return list() def GetFileContent(self, pkg_file_path): if pkg_file_path.startswith("/"): @@ -802,7 +863,7 @@ if line_to_add: self.paths.add(line_to_add) entry = { - "line": line, + "line": line.strip(), "type": line_type, } entry["path"] = installed_path @@ -892,6 +953,7 @@ else: logging.warn("%s is not a directory.", pkg_path) + def Srv4Exists(self, pkg_dir): pkg = DirectoryFormatPackage(pkg_dir) srv4_name = pkg.GetSrv4FileName() Copied: csw/mgar/gar/v2/lib/python/package_checks.py (from rev 8649, csw/mgar/gar/v2-checkpkg-stats/lib/python/package_checks.py) =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py (rev 0) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-02-18 13:20:57 UTC (rev 8650) @@ -0,0 +1,32 @@ +# Defining the checking functions. They come in two flavors: individual +# package checks and set checks. + +import checkpkg +import re + +def CatalognameLowercase(pkg_data, debug): + errors = [] + # Here's how to report an error: + catalogname = pkg_data["basic_stats"]["catalogname"] + if catalogname != catalogname.lower(): + errors.append(checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "catalogname-not-lowercase")) + if not re.match(r"^\w+$", catalogname): + errors.append(checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "catalogname-is-not-a-simple-word")) + return errors + + +def FileNameSanity(pkg_data, debug): + errors = [] + # Here's how to report an error: + basic_stats = pkg_data["basic_stats"] + revision_info = basic_stats["parsed_basename"]["revision_info"] + catalogname = pkg_data["basic_stats"]["catalogname"] + if "REV" not in revision_info: + errors.append(checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "rev-tag-missing-in-filename")) + return errors Copied: csw/mgar/gar/v2/lib/python/package_checks_test.py (from rev 8649, csw/mgar/gar/v2-checkpkg-stats/lib/python/package_checks_test.py) =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py (rev 0) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-02-18 13:20:57 UTC (rev 8650) @@ -0,0 +1,55 @@ +#!/opt/csw/bin/python2.6 +# coding=utf-8 +# $Id$ + +import unittest +import package_checks as pc + +class PackageChecksUnitTest(unittest.TestCase): + + def setUp(self): + self.pkg_data_1 = { + "basic_stats": { + "pkgname": "CSWfoo" + } + } + self.pkg_data_2 = { + 'basic_stats': { + 'parsed_basename': + {'revision_info': {'REV': '2010.02.15'}, + 'catalogname': 'python_tk', + 'full_version_string': '2.6.4,REV=2010.02.15', + 'version': '2.6.4', + 'version_info': { + 'minor version': '6', + 'major version': '2', + 'patchlevel': '4'}}, + 'pkgname': 'CSWpython-tk', + 'stats_version': 1, + 'pkg_basename': 'python_tk-2.6.4,REV=2010.02.15-SunOS5.8-sparc-CSW.pkg.gz', + 'pkg_path': '/tmp/pkg_lL0HDH/python_tk-2.6.4,REV=2010.02.15-SunOS5.8-sparc-CSW.pkg.gz', + 'catalogname': 'python_tk'}} + + def testCatalogName_1(self): + self.pkg_data_1["basic_stats"]["catalogname"] = "Foo" + errors = pc.CatalognameLowercase(self.pkg_data_1, False) + self.failUnless(errors) + + def testCatalogName_2(self): + self.pkg_data_1["basic_stats"]["catalogname"] = "foo" + errors = pc.CatalognameLowercase(self.pkg_data_1, False) + self.failIf(errors) + + def testCatalogNameSpecialCharacters(self): + self.pkg_data_1["basic_stats"]["catalogname"] = "foo+abc&123" + errors = pc.CatalognameLowercase(self.pkg_data_1, False) + self.failUnless(errors) + + def testFileNameSanity(self): + del(self.pkg_data_2["basic_stats"]["parsed_basename"]["revision_info"]["REV"]) + errors = pc.FileNameSanity(self.pkg_data_2, False) + self.failUnless(errors) + + +if __name__ == '__main__': + unittest.main() Deleted: csw/mgar/gar/v2/lib/sh/libcheckpkg.sh =================================================================== --- csw/mgar/gar/v2-checkpkg-stats/lib/sh/libcheckpkg.sh 2010-02-18 13:01:38 UTC (rev 8649) +++ csw/mgar/gar/v2/lib/sh/libcheckpkg.sh 2010-02-18 13:20:57 UTC (rev 8650) @@ -1,30 +0,0 @@ -#!/bin/ksh -p -# -# $Id$ - -# pkgtrans leaves a directory in /var/tmp/aaXXXXXXX even after clean quit. -# Emulating pkgtrans behaviour, for "pkgtrans src destdir pkgname". Except -# that the pkgname arg is ignored, and only the first pkg is processed. - -custom_pkgtrans(){ - if [[ ! -d $2 ]] ; then - print ERROR: $2 is not a directory >/dev/fd/2 - return 1 - fi - hdrblks=`(dd if=$1 skip=1 2>/dev/null| cpio -i -t >/dev/null) 2>&1 | - nawk '{print $1; exit;}'` - - ## print initial hdrblks=$hdrblks - - hdrblks=$(($hdrblks + 1)) - mkdir $2/$3 || return 1 - - dd if=$1 skip=$hdrblks 2>/dev/null | (cd $2/$3 ; cpio -ivdm) - # on fail, SOMETIMES cpio returns 1, but sometimes it returns 0!! - if [[ ! -d $2/$3/install ]] ; then - print retrying extract with different archive offset... - # no, I can't tell in advance why/when the prev fails - hdrblks=$(($hdrblks + 1)) - dd if=$1 skip=$hdrblks 2>/dev/null| (cd $2/$3 ; cpio -ivdm) - fi -} Copied: csw/mgar/gar/v2/lib/sh/libcheckpkg.sh (from rev 8649, csw/mgar/gar/v2-checkpkg-stats/lib/sh/libcheckpkg.sh) =================================================================== --- csw/mgar/gar/v2/lib/sh/libcheckpkg.sh (rev 0) +++ csw/mgar/gar/v2/lib/sh/libcheckpkg.sh 2010-02-18 13:20:57 UTC (rev 8650) @@ -0,0 +1,30 @@ +#!/bin/ksh -p +# +# $Id$ + +# pkgtrans leaves a directory in /var/tmp/aaXXXXXXX even after clean quit. +# Emulating pkgtrans behaviour, for "pkgtrans src destdir pkgname". Except +# that the pkgname arg is ignored, and only the first pkg is processed. + +custom_pkgtrans(){ + if [[ ! -d $2 ]] ; then + print ERROR: $2 is not a directory >/dev/fd/2 + return 1 + fi + hdrblks=`(dd if=$1 skip=1 2>/dev/null| cpio -i -t >/dev/null) 2>&1 | + nawk '{print $1; exit;}'` + + ## print initial hdrblks=$hdrblks + + hdrblks=$(($hdrblks + 1)) + mkdir $2/$3 || return 1 + + dd if=$1 skip=$hdrblks 2>/dev/null | (cd $2/$3 ; cpio -ivdm) + # on fail, SOMETIMES cpio returns 1, but sometimes it returns 0!! + if [[ ! -d $2/$3/install ]] ; then + print retrying extract with different archive offset... + # no, I can't tell in advance why/when the prev fails + hdrblks=$(($hdrblks + 1)) + dd if=$1 skip=$hdrblks 2>/dev/null| (cd $2/$3 ; cpio -ivdm) + fi +} Property changes on: csw/mgar/gar/v2/pkglib/csw/depend ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678 /csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855 /csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895 /csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180 /csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132 + /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678 /csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855 /csw/mgar/gar/v2-checkpkg-stats/pkglib/csw/depend:8454-8649 /csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895 /csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180 /csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132 Modified: csw/mgar/gar/v2/tests/overrides_test.py =================================================================== --- csw/mgar/gar/v2/tests/overrides_test.py 2010-02-18 13:01:38 UTC (rev 8649) +++ csw/mgar/gar/v2/tests/overrides_test.py 2010-02-18 13:20:57 UTC (rev 8650) @@ -6,7 +6,7 @@ sys.path.append("../lib/python") import gartest -class OverridesUnitTest(unittest.TestCase): +class OverridesUnitTest_1(unittest.TestCase): """Tests CHECKPKG_OVERRIDES support.""" def testOneOverride(self): @@ -15,7 +15,7 @@ mybuild.SetGarVariable("GARNAME", "overrides-test") mybuild.SetGarVariable("CATALOGNAME", "overrides_test") mybuild.SetGarVariable("CHECKPKG_OVERRIDES", - "CSWoverrides-test|example-tag|example-parameter") + "example-tag|example-parameter") mybuild.WriteGarFiles() self.assertEquals(0, mybuild.Build()) pkg = mybuild.GetFirstBuiltPackage() @@ -32,8 +32,8 @@ mybuild.SetGarVariable("CATALOGNAME", "overrides_test") mybuild.SetGarVariable( "CHECKPKG_OVERRIDES", - ("CSWoverrides-test|example-tag-1|example-parameter-1 " - "CSWoverrides-test|example-tag-2|example-parameter-2")) + ("example-tag-1|example-parameter-1 " + "example-tag-2|example-parameter-2")) mybuild.WriteGarFiles() self.assertEquals(0, mybuild.Build()) pkg = mybuild.GetFirstBuiltPackage() @@ -43,3 +43,39 @@ self.assertEqual(expected, pkg.GetFileContent(overr_file)) overrides = pkg.GetOverrides() self.assertEqual(2, len(overrides)) + +# This bit fails, needs more work. +# +# class OverridesUnitTest_2(unittest.TestCase): +# """Tests CHECKPKG_OVERRIDES support.""" +# +# def testOverridersForTwoPackages(self): +# """http://sourceforge.net/apps/trac/gar/ticket/17""" +# overr_file_1 = "/opt/csw/share/checkpkg/overrides/overrides_test_1" +# mybuild = gartest.DynamicGarBuild() +# mybuild.SetGarVariable("GARNAME", "overrides-test") +# mybuild.SetGarVariable("PACKAGES", "CSWoverrides-test-1 " +# "CSWoverrides-test-2") +# mybuild.SetGarVariable("CATALOGNAME_CSWoverrides-test-1", +# "overrides_test_1") +# mybuild.SetGarVariable("CATALOGNAME_CSWoverrides-test-2", +# "overrides_test_2") +# mybuild.SetGarVariable("SPKG_DESC_CSWoverrides-test-1", +# "Test package 1") +# mybuild.SetGarVariable("SPKG_DESC_CSWoverrides-test-1", +# "Test package 2") +# mybuild.SetGarVariable("PKGFILES_CSWoverrides-test-1", +# overr_file_1) +# mybuild.SetGarVariable( +# "CHECKPKG_OVERRIDESCSWoverrides-test-1", +# "example-tag-1|example-parameter-1") +# mybuild.SetGarVariable( +# "CHECKPKG_OVERRIDESCSWoverrides-test-2", +# "example-tag-2|example-parameter-2") +# mybuild.WriteGarFiles() +# self.assertEquals(0, mybuild.Build()) +# pkg = mybuild.GetFirstBuiltPackage() +# expected = ('CSWoverrides-test-1: example-tag-1 example-parameter-1\n') +# self.assertEqual(expected, pkg.GetFileContent(overr_file_1)) +# overrides = pkg.GetOverrides() +# self.assertEqual(1, len(overrides)) Modified: csw/mgar/gar/v2/tests/run_tests.py =================================================================== --- csw/mgar/gar/v2/tests/run_tests.py 2010-02-18 13:01:38 UTC (rev 8649) +++ csw/mgar/gar/v2/tests/run_tests.py 2010-02-18 13:20:57 UTC (rev 8650) @@ -10,10 +10,11 @@ # To add more test files, create .py file and add a corresponding line # here: -from opencsw_test import * -from checkpkg_test import * -from example_test import * -from overrides_test import * +from checkpkg_test import * +from example_test import * +from opencsw_test import * +from overrides_test import * +from package_checks_test import * if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Feb 18 14:25:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 18 Feb 2010 13:25:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8651] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8651 http://gar.svn.sourceforge.net/gar/?rev=8651&view=rev Author: dmichelsen Date: 2010-02-18 13:25:37 +0000 (Thu, 18 Feb 2010) Log Message: ----------- mGAR v2: Allow multiple filenames per prototype modified, fixing #16 Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-18 13:20:57 UTC (rev 8650) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-18 13:25:37 UTC (rev 8651) @@ -352,7 +352,7 @@ _PROTOTYPE_MODIFIERS = | perl -ane '\ $(foreach M,$(PROTOTYPE_MODIFIERS),\ - $(if $(PROTOTYPE_FILES_$M),if( $$F[2] =~ m(^$(PROTOTYPE_FILES_$M)$$) ) {)\ + $(if $(PROTOTYPE_FILES_$M),if( $$F[2] =~ m(^$(shell echo $(PROTOTYPE_FILES_$M) | /usr/bin/tr " " "|")$$) ) {)\ $(if $(PROTOTYPE_FTYPE_$M),$$F[0] = "$(PROTOTYPE_FTYPE_$M)";)\ $(if $(PROTOTYPE_CLASS_$M),$$F[1] = "$(PROTOTYPE_CLASS_$M)";)\ $(if $(PROTOTYPE_PERMS_$M),$$F[3] = "$(PROTOTYPE_PERMS_$M)";)\ 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 Feb 18 15:08:57 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 18 Feb 2010 14:08:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8652] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8652 http://gar.svn.sourceforge.net/gar/?rev=8652&view=rev Author: dmichelsen Date: 2010-02-18 14:08:57 +0000 (Thu, 18 Feb 2010) Log Message: ----------- mGAR v2: Preset CATALOGNAME from default GARNAME or PACKAGES. This fixes #12 Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-18 13:25:37 UTC (rev 8651) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-18 14:08:57 UTC (rev 8652) @@ -32,10 +32,12 @@ ifeq ($(origin PACKAGES), undefined) PACKAGES = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(GARNAME)) +CATALOGNAME = $(if $(filter %.gspec,$(DISTFILES)),,$(GARNAME)) SRCPACKAGE_BASE = $(firstword $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES)) SRCPACKAGE ?= $(SRCPACKAGE_BASE)-src SPKG_SPECS ?= $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE)) else +CATALOGNAME ?= $(if $(filter-out $(firstword $(PACKAGES)),$(PACKAGES)),,$(patsubst CSW%,%,$(PACKAGES))) SRCPACKAGE_BASE = $(firstword $(PACKAGES)) SRCPACKAGE ?= $(SRCPACKAGE_BASE)-src SPKG_SPECS ?= $(sort $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE))) 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 Feb 18 15:59:35 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 18 Feb 2010 14:59:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[8653] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8653 http://gar.svn.sourceforge.net/gar/?rev=8653&view=rev Author: dmichelsen Date: 2010-02-18 14:59:35 +0000 (Thu, 18 Feb 2010) Log Message: ----------- mGAR v2: Use only one platform when building ARCHALL packages. This fixes #11 Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-18 14:08:57 UTC (rev 8652) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-18 14:59:35 UTC (rev 8653) @@ -820,8 +820,9 @@ # This rule automatically logs into every host where a package for this software should # be built. It is especially suited for automated build bots. +platforms: _PACKAGING_PLATFORMS=$(if $(ARCHALL),$(firstword $(PACKAGING_PLATFORMS)),$(PACKAGING_PLATFORMS)) platforms: - $(foreach P,$(PACKAGING_PLATFORMS),\ + $(foreach P,$(_PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ $(MAKE) PLATFORM=$P _package && ,\ @@ -833,8 +834,9 @@ @echo @echo "The following packages have been built during this invocation:" @echo - @$(foreach P,$(PACKAGING_PLATFORMS),\ + @$(foreach P,$(_PACKAGING_PLATFORMS),\ echo "* Platform $P\c";\ + $(if $(ARCHALL),echo " (suitable for all architectures)\c";) \ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ echo " (built on this host)";\ $(MAKE) -s PLATFORM=$P _pkgshow;echo;,\ @@ -844,11 +846,12 @@ ) @$(MAKECOOKIE) +platforms-%: _PACKAGING_PLATFORMS=$(if $(ARCHALL),$(firstword $(PACKAGING_PLATFORMS)),$(PACKAGING_PLATFORMS)) platforms-%: - $(foreach P,$(PACKAGING_PLATFORMS),\ + $(foreach P,$(_PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) PLATFORM=$P $* && ,\ + $(MAKE) -s PLATFORM=$P $* && ,\ $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) PLATFORM=$P $*" && \ ),\ $(error *** No host has been defined for platform $P)\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 18 16:18:20 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 18 Feb 2010 15:18:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8654] csw/mgar/gar/v2 Message-ID: Revision: 8654 http://gar.svn.sourceforge.net/gar/?rev=8654&view=rev Author: wahwah Date: 2010-02-18 15:18:19 +0000 (Thu, 18 Feb 2010) Log Message: ----------- mGAR v2: A bugfix for the archall check and a unit test for it. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/testdata/example-1-pkginfo.yml csw/mgar/gar/v2/lib/python/testdata/example-1-pkgmap.yml Property Changed: ---------------- csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py 2010-02-18 14:59:35 UTC (rev 8653) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py 2010-02-18 15:18:19 UTC (rev 8654) @@ -16,44 +16,8 @@ "..", "..", "lib", "python"] sys.path.append(os.path.join(*path_list)) import checkpkg +import package_checks -ARCH_RE = re.compile(r"(sparcv(8|9)|i386|amd64)") - -def CheckArchitectureVsContents(pkg_data, debug): - """Verifies the relationship between package contents and architecture.""" - errors = [] - binaries = pkg_data["binaries"] - pkginfo = pkg_data["pkginfo"] - pkgmap = pkg.GetPkgmap() - arch = pkginfo["ARCH"] - pkgname = pkg_data["basic_stats"]["pkgname"] - reasons_to_be_arch_specific = [] - for pkgmap_path in pkgmap.entries_by_path: - # print "pkgmap_path", repr(pkgmap_path), type(pkgmap_path) - if re.search(ARCH_RE, str(pkgmap_path)): - reasons_to_be_arch_specific.append(( - "archall-with-arch-paths", - pkgmap_path, - "path %s looks arch-specific" % pkgmap_path)) - for binary in binaries: - reasons_to_be_arch_specific.append(( - "archall-with-binaries", - binary, - "package contains binary %s" % binary)) - if arch == "all": - for tag, param, desc in reasons_to_be_arch_specific: - errors.append(checkpkg.CheckpkgTag(pkgname, tag, param)) - elif not reasons_to_be_arch_specific: - # This is not a clean way of handling messages for the user, but there's - # not better way at the moment. - print "Package %s does not contain any binaries." % pkgname - print "Consider making it ARCHALL = 1 instead of %s:" % arch - print "ARCHALL_%s = 1" % pkgname - print ("However, be aware that there might be other reasons " - "to keep it architecture-specific.") - return errors - - def main(): options, args = checkpkg.GetOptions() md5sums = args @@ -64,8 +28,8 @@ md5sums, options.debug) - check_manager.RegisterIndividualCheck(CheckArchitectureVsContents) - + check_manager.RegisterIndividualCheck( + package_checks.CheckArchitectureVsContents) exit_code, screen_report, tags_report = check_manager.Run() f = open(options.output, "w") f.write(tags_report) Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-02-18 14:59:35 UTC (rev 8653) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-02-18 15:18:19 UTC (rev 8654) @@ -4,6 +4,8 @@ import checkpkg import re +ARCH_RE = re.compile(r"(sparcv(8|9)|i386|amd64)") + def CatalognameLowercase(pkg_data, debug): errors = [] # Here's how to report an error: @@ -30,3 +32,41 @@ pkg_data["basic_stats"]["pkgname"], "rev-tag-missing-in-filename")) return errors + + +def CheckArchitectureVsContents(pkg_data, debug): + """Verifies the relationship between package contents and architecture.""" + errors = [] + binaries = pkg_data["binaries"] + pkginfo = pkg_data["pkginfo"] + pkgmap = pkg_data["pkgmap"] + arch = pkginfo["ARCH"] + pkgname = pkg_data["basic_stats"]["pkgname"] + reasons_to_be_arch_specific = [] + pkgmap_paths = [x["path"] for x in pkgmap] + for pkgmap_path in pkgmap_paths: + if re.search(ARCH_RE, str(pkgmap_path)): + reasons_to_be_arch_specific.append(( + "archall-with-arch-paths", + pkgmap_path, + "path %s looks arch-specific" % pkgmap_path)) + for binary in binaries: + reasons_to_be_arch_specific.append(( + "archall-with-binaries", + binary, + "package contains binary %s" % binary)) + if arch == "all": + for tag, param, desc in reasons_to_be_arch_specific: + errors.append(checkpkg.CheckpkgTag(pkgname, tag, param)) + elif not reasons_to_be_arch_specific: + # This is not a clean way of handling messages for the user, but there's + # not better way at the moment. + print "Package %s does not contain any binaries." % pkgname + print "Consider making it ARCHALL = 1 instead of %s:" % arch + print "ARCHALL_%s = 1" % pkgname + print ("However, be aware that there might be other reasons " + "to keep it architecture-specific.") + return errors + + + Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-02-18 14:59:35 UTC (rev 8653) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-02-18 15:18:19 UTC (rev 8654) @@ -4,13 +4,18 @@ import unittest import package_checks as pc +import yaml +import os.path +BASE_DIR = os.path.dirname(__file__) +TESTDATA_DIR = os.path.join(BASE_DIR, "testdata") + class PackageChecksUnitTest(unittest.TestCase): def setUp(self): self.pkg_data_1 = { - "basic_stats": { - "pkgname": "CSWfoo" + "basic_stats": { + "pkgname": "CSWfoo" } } self.pkg_data_2 = { @@ -30,6 +35,13 @@ 'pkg_path': '/tmp/pkg_lL0HDH/python_tk-2.6.4,REV=2010.02.15-SunOS5.8-sparc-CSW.pkg.gz', 'catalogname': 'python_tk'}} + def LoadData(self, name): + file_name = os.path.join(TESTDATA_DIR, "%s.yml" % name) + f = open(file_name, "rb") + data = yaml.safe_load(f) + f.close() + return data + def testCatalogName_1(self): self.pkg_data_1["basic_stats"]["catalogname"] = "Foo" errors = pc.CatalognameLowercase(self.pkg_data_1, False) @@ -50,6 +62,13 @@ errors = pc.FileNameSanity(self.pkg_data_2, False) self.failUnless(errors) + def testCheckArchitectureVsContents(self): + self.pkg_data_2["pkgmap"] = self.LoadData("example-1-pkgmap") + self.pkg_data_2["binaries"] = [] + self.pkg_data_2["pkginfo"] = self.LoadData("example-1-pkginfo") + errors = pc.CheckArchitectureVsContents(self.pkg_data_2, False) + print errors + if __name__ == '__main__': unittest.main() Property changes on: csw/mgar/gar/v2/lib/python/package_checks_test.py ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/gar/v2/lib/python/testdata/example-1-pkginfo.yml =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/example-1-pkginfo.yml (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/example-1-pkginfo.yml 2010-02-18 15:18:19 UTC (rev 8654) @@ -0,0 +1,5 @@ +{ARCH: sparc, CATEGORY: application, CLASSES: none, EMAIL: maciej at opencsw.org, HOTLINE: 'http://www.opencsw.org/bugtrack/', + NAME: rsync - utility which provides fast incremental file transfer, OPENCSW_CATALOGNAME: rsync, + OPENCSW_MODE64: '32', OPENCSW_REPOSITORY: 'https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/rsync/trunk at UNCOMMITTED', + PKG: CSWrsync, PSTAMP: maciej at build8s-20100217091032, VENDOR: 'http://rsync.samba.org/ + packaged for CSW by Maciej Blizinski', VERSION: '3.0.7,REV=2010.02.17', WORKDIR_FIRSTMOD: ../build-isa-sparcv8} Added: csw/mgar/gar/v2/lib/python/testdata/example-1-pkgmap.yml =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/example-1-pkgmap.yml (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/example-1-pkgmap.yml 2010-02-18 15:18:19 UTC (rev 8654) @@ -0,0 +1,27 @@ +- {class: null, group: null, line: ': 1 1611', mode: null, path: null, type: '1', + user: null} +- {class: none, group: bin, line: 1 f none /opt/csw/bin/rsync 0755 root bin 585864 + 12576 1266394054, mode: '0755', path: /opt/csw/bin/rsync, type: f, user: root} +- {class: none, group: bin, line: 1 f none /opt/csw/bin/sparcv9/rsync 0755 root bin 585864 + 12576 1266394054, mode: '0755', path: /opt/csw/bin/rsync, type: f, user: root} +- {class: none, group: bin, line: 1 d none /opt/csw/share/doc/rsync 0755 root bin, + mode: '0755', path: /opt/csw/share/doc/rsync, type: d, user: root} +- {class: none, group: bin, line: 1 f none /opt/csw/share/doc/rsync/license 0644 root + bin 35147 30328 1266394230, mode: '0644', path: /opt/csw/share/doc/rsync/license, + type: f, user: root} +- {class: none, group: bin, line: 1 d none /opt/csw/share/man/man1 0755 root bin, + mode: '0755', path: /opt/csw/share/man/man1, type: d, user: root} +- {class: none, group: bin, line: 1 f none /opt/csw/share/man/man1/rsync.1 0644 root + bin 159739 65016 1266394053, mode: '0644', path: /opt/csw/share/man/man1/rsync.1, + type: f, user: root} +- {class: none, group: bin, line: 1 d none /opt/csw/share/man/man5 0755 root bin, + mode: '0755', path: /opt/csw/share/man/man5, type: d, user: root} +- {class: none, group: bin, line: 1 f none /opt/csw/share/man/man5/rsyncd.conf.5 0644 + root bin 36372 24688 1266394053, mode: '0644', path: /opt/csw/share/man/man5/rsyncd.conf.5, + type: f, user: root} +- {class: null, group: null, line: 1 i copyright 69 6484 1266394230, mode: null, path: null, + type: i, user: null} +- {class: null, group: null, line: 1 i depend 179 15991 1266394232, mode: null, path: null, + type: i, user: null} +- {class: null, group: null, line: 1 i pkginfo 507 42930 1266394235, mode: null, path: null, + type: i, user: null} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Feb 18 16:22:47 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 18 Feb 2010 15:22:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[8655] csw/mgar/pkg/transmission/trunk Message-ID: Revision: 8655 http://gar.svn.sourceforge.net/gar/?rev=8655&view=rev Author: janholzh Date: 2010-02-18 15:22:46 +0000 (Thu, 18 Feb 2010) Log Message: ----------- transmission: Update to 1.90 Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile csw/mgar/pkg/transmission/trunk/checksums Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2010-02-18 15:18:19 UTC (rev 8654) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-02-18 15:22:46 UTC (rev 8655) @@ -1,5 +1,5 @@ GARNAME = transmission -GARVERSION = 1.83 +GARVERSION = 1.90 CATEGORIES = net DESCRIPTION = Fast, easy, and free multi-platform BitTorrent client @@ -8,7 +8,7 @@ MASTER_SITES = http://mirrors.m0k.org/transmission/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 PATCHFILES = icons-makefile.patch -PATCHFILES += linker-include.patch +#PATCHFILES += linker-include.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2 Modified: csw/mgar/pkg/transmission/trunk/checksums =================================================================== --- csw/mgar/pkg/transmission/trunk/checksums 2010-02-18 15:18:19 UTC (rev 8654) +++ csw/mgar/pkg/transmission/trunk/checksums 2010-02-18 15:22:46 UTC (rev 8655) @@ -1,3 +1,2 @@ cbdb5cfaf24b68727042c3828b252534 icons-makefile.patch -7124b4836210a10fe649bba75c706cc9 linker-include.patch -fbdc151040ec64f55c3f28be60a21060 transmission-1.83.tar.bz2 +91cc216807745a7d287150a6947e9bac transmission-1.90.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Feb 18 16:36:19 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 18 Feb 2010 15:36:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8656] csw/mgar/pkg/transmission/trunk/Makefile Message-ID: Revision: 8656 http://gar.svn.sourceforge.net/gar/?rev=8656&view=rev Author: janholzh Date: 2010-02-18 15:36:19 +0000 (Thu, 18 Feb 2010) Log Message: ----------- transmission: add CHECKPKG_OVERRIDES Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2010-02-18 15:22:46 UTC (rev 8655) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-02-18 15:36:19 UTC (rev 8656) @@ -66,6 +66,7 @@ STRIP_LIBTOOL = 1 TEST_TARGET = check +CHECKPKG_OVERRIDES_CSWtransmissiongtk2 += symbol-not-found|transmission include gar/category.mk PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Feb 18 17:30:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 18 Feb 2010 16:30:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8657] csw/mgar/gar/v2 Message-ID: Revision: 8657 http://gar.svn.sourceforge.net/gar/?rev=8657&view=rev Author: dmichelsen Date: 2010-02-18 16:30:06 +0000 (Thu, 18 Feb 2010) Log Message: ----------- mGAR v2: Make sure isaexec work even on calling 'package' directly. This fixes #19 Modified Paths: -------------- csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-02-18 15:36:19 UTC (rev 8656) +++ csw/mgar/gar/v2/gar.mk 2010-02-18 16:30:06 UTC (rev 8657) @@ -613,24 +613,10 @@ # These directories get relocated into their ISA subdirectories MERGE_DIRS ?= $(MERGE_DIRS_$(MODULATION)) -# The files in ISAEXEC get relocated and will be replaced by the isaexec-wrapper -_ISAEXEC_EXCLUDE_FILES = $(bindir)/%-config $(bindir)/%/%-config -_ISAEXEC_FILES = $(filter-out $(foreach F,$(_ISAEXEC_EXCLUDE_FILES) $(ISAEXEC_EXCLUDE_FILES),$(PKGROOT)$(F)), \ - $(wildcard $(foreach D,$(ISAEXEC_DIRS),$(PKGROOT)$(D)/* )) \ - ) -ISAEXEC_FILES ?= $(if $(_ISAEXEC_FILES),$(patsubst $(PKGROOT)%,%, \ - $(shell for F in $(_ISAEXEC_FILES); do \ - if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi; \ - done)),) - ifneq ($(COMMON_PKG_DEPENDS),) _EXTRA_GAR_PKGS += $(COMMON_PKG_DEPENDS) endif -ifneq ($(ISAEXEC_FILES),) -_EXTRA_GAR_PKGS += CSWisaexec -endif - # These merge-rules are actually processed for the current modulation MERGE_TARGETS ?= $(addprefix merge-,$(MERGE_SCRIPTS_$(MODULATION))) $(EXTRA_MERGE_TARGETS) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-18 15:36:19 UTC (rev 8656) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-18 16:30:06 UTC (rev 8657) @@ -744,7 +744,22 @@ # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. ENABLE_CHECK ?= 1 -_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package $(if $(ENABLE_CHECK),pkgcheck) + +# The files in ISAEXEC get relocated and will be replaced by the isaexec-wrapper. +# The trick is to delay the calculcation of the variable values until that time +# when PKGROOT has already been populated. +_ISAEXEC_EXCLUDE_FILES = $(bindir)/%-config $(bindir)/%/%-config +_buildpackage: _ISAEXEC_FILES=$(filter-out $(foreach F,$(_ISAEXEC_EXCLUDE_FILES) $(ISAEXEC_EXCLUDE_FILES),$(PKGROOT)$(F)), \ + $(wildcard $(foreach D,$(ISAEXEC_DIRS),$(PKGROOT)$(D)/* )) \ + ) +_buildpackage: ISAEXEC_FILES ?= $(if $(_ISAEXEC_FILES),$(patsubst $(PKGROOT)%,%, \ + $(shell for F in $(_ISAEXEC_FILES); do \ + if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi; \ + done)),) +_buildpackage: _EXTRA_GAR_PKGS += $(if $(ISAEXEC_FILES),CSWisaexec) +_buildpackage: pre-package $(PACKAGE_TARGETS) post-package $(if $(ENABLE_CHECK),pkgcheck) + +_package: validateplatform extract-global merge $(SPKG_DESTDIRS) _buildpackage @$(MAKECOOKIE) package: _package 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 Feb 18 18:36:50 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 18 Feb 2010 17:36:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8658] csw/mgar/pkg/lzlib/trunk Message-ID: Revision: 8658 http://gar.svn.sourceforge.net/gar/?rev=8658&view=rev Author: dmichelsen Date: 2010-02-18 17:36:50 +0000 (Thu, 18 Feb 2010) Log Message: ----------- lzlib: Move towards Sun Studio compiler, linkage libC and docs missing Modified Paths: -------------- csw/mgar/pkg/lzlib/trunk/Makefile csw/mgar/pkg/lzlib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lzlib/trunk/files/0001-Do-not-do-ldconfig.patch csw/mgar/pkg/lzlib/trunk/files/0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch csw/mgar/pkg/lzlib/trunk/files/0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch csw/mgar/pkg/lzlib/trunk/files/0002-Use-ucb-echo-as-it-only-understands-n.patch Modified: csw/mgar/pkg/lzlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzlib/trunk/Makefile 2010-02-18 16:30:06 UTC (rev 8657) +++ csw/mgar/pkg/lzlib/trunk/Makefile 2010-02-18 17:36:50 UTC (rev 8658) @@ -1,5 +1,5 @@ GARNAME = lzlib -GARVERSION = 0.8-rc1 +GARVERSION = 0.9 CATEGORIES = lib DESCRIPTION = lzlib is a lossless data compression library based on the LZMA algorithm. @@ -9,17 +9,47 @@ data. The compressed data format used by the library is the lzip format. endef -MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ +MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch +PATCHFILES += 0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch +PATCHFILES += 0001-Do-not-do-ldconfig.patch +PATCHFILES += 0002-Use-ucb-echo-as-it-only-understands-n.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = +VENDOR_URL = http://www.nongnu.org/lzip/lzlib.html -GARCOMPILER = GNU +EXTRA_CXXFLAGS = -xcode=pic32 + +# GARCOMPILER = GNU +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared +CONFIGURE_ARGS += CXX="$(CXX)" +CONFIGURE_ARGS += CPPFLAGS="$(CPPFLAGS)" +CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)" +CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)" +#BUILD_OVERRIDE_VARS = CXX CPPFLAGS CXXFLAGS LDFLAGS +#BUILD_OVERRIDE_VAR_CXX = $(CXX) +#BUILD_OVERRIDE_VAR_CPPFLAGS = $(CPPFLAGS) +#BUILD_OVERRIDE_VAR_CXXFLAGS = $(CXXFLAGS) +#BUILD_OVERRIDE_VAR_LDFLAGS = $(LDFLAGS) + +#TEST_OVERRIDE_VARS = CXX CPPFLAGS CXXFLAGS LDFLAGS +#TEST_OVERRIDE_VAR_CXX = $(CXX) +#TEST_OVERRIDE_VAR_CPPFLAGS = $(CPPFLAGS) +#TEST_OVERRIDE_VAR_CXXFLAGS = $(CXXFLAGS) +#TEST_OVERRIDE_VAR_LDFLAGS = $(LDFLAGS) + +TEST_TARGET = check + +INSTALL_OVERRIDE_VARS = INSTALL +INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall + include gar/category.mk + +# Only ucb echo understands -n +# PATH := /usr/ucb:$(PATH) Modified: csw/mgar/pkg/lzlib/trunk/checksums =================================================================== --- csw/mgar/pkg/lzlib/trunk/checksums 2010-02-18 16:30:06 UTC (rev 8657) +++ csw/mgar/pkg/lzlib/trunk/checksums 2010-02-18 17:36:50 UTC (rev 8658) @@ -1 +1,5 @@ -cdb51b3a9fb9b01a7582a5ad797377ca lzlib-0.8-rc1.tar.gz +8d8488783fd776ead11ab9b19b63f4bf 0001-Do-not-do-ldconfig.patch +ae8e904a8c07f7533b94eaf8bfb2075d 0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch +fe24dd11cfece198006a781133fb13fa 0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch +dcb22fb244b8d124742cad9ddd18985a 0002-Use-ucb-echo-as-it-only-understands-n.patch +65382168a05975e550f5381f99efc0c6 lzlib-0.9.tar.gz Added: csw/mgar/pkg/lzlib/trunk/files/0001-Do-not-do-ldconfig.patch =================================================================== --- csw/mgar/pkg/lzlib/trunk/files/0001-Do-not-do-ldconfig.patch (rev 0) +++ csw/mgar/pkg/lzlib/trunk/files/0001-Do-not-do-ldconfig.patch 2010-02-18 17:36:50 UTC (rev 8658) @@ -0,0 +1,30 @@ +From e81994a6f342f98d03c7008b1865bb8f29e6931b Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 18 Feb 2010 18:19:49 +0100 +Subject: [PATCH 1/2] Do not do ldconfig + +--- + Makefile.in | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index c2ba00d..e51513b 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -92,12 +92,11 @@ install : all install-info + $(INSTALL_DATA) ./lib$(libname).a "$(DESTDIR)$(libdir)/lib$(libname).a" + if [ -n "$(progname_shared)" ] ; then \ + $(INSTALL_PROGRAM) ./lib$(libname).so.$(pkgversion) "$(DESTDIR)$(libdir)/lib$(libname).so.$(pkgversion)" ; \ +- if [ -e "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \ ++ if [ -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \ + run_ldconfig=no ; rm -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ; \ + else run_ldconfig=yes ; \ + fi ; \ + cd "$(DESTDIR)$(libdir)" && ln -s lib$(libname).so.$(pkgversion) lib$(libname).so.$(soversion) ; \ +- if [ $${run_ldconfig} = yes ] ; then $(LDCONFIG) "$(DESTDIR)$(libdir)" ; fi ; \ + fi + + install-info : +-- +1.6.6 + Added: csw/mgar/pkg/lzlib/trunk/files/0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch =================================================================== --- csw/mgar/pkg/lzlib/trunk/files/0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch (rev 0) +++ csw/mgar/pkg/lzlib/trunk/files/0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch 2010-02-18 17:36:50 UTC (rev 8658) @@ -0,0 +1,95 @@ +From 015e68da03c76cdd90f5f8879259e1648717062e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 18 Feb 2010 17:46:25 +0100 +Subject: [PATCH] Remove Linux specific stuff, add Solaris specific stuff + +--- + configure | 2 +- + decoder.cc | 2 +- + encoder.cc | 2 +- + lzcheck.cc | 2 +- + lzlib.cc | 2 +- + main.cc | 3 ++- + +diff --git a/configure b/configure +index fe01eac..eb9dbc8 100755 +--- a/configure ++++ b/configure +@@ -32,7 +32,7 @@ mandir='$(datadir)/man' + sysconfdir='$(prefix)/etc' + CXX= + CPPFLAGS= +-CXXFLAGS='-Wall -W -O2' ++CXXFLAGS= + LDFLAGS= + + # Loop over all args +diff --git a/decoder.cc b/decoder.cc +index 429d33e..0d69bcc 100644 +--- a/decoder.cc ++++ b/decoder.cc +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + + #include "lzlib.h" + #include "lzip.h" +diff --git a/encoder.cc b/encoder.cc +index 1b979ed..7625a35 100644 +--- a/encoder.cc ++++ b/encoder.cc +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + + #include "lzlib.h" + #include "lzip.h" +diff --git a/lzcheck.cc b/lzcheck.cc +index b54f525..54a4869 100644 +--- a/lzcheck.cc ++++ b/lzcheck.cc +@@ -18,7 +18,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "lzlib.h" +diff --git a/lzlib.cc b/lzlib.cc +index de5d0a9..0abc3d3 100644 +--- a/lzlib.cc ++++ b/lzlib.cc +@@ -27,7 +27,7 @@ + + #include + #include +-#include ++#include + + #include "lzlib.h" + #include "lzip.h" +diff --git a/main.cc b/main.cc +index 3d4c0f6..fb78a1e 100644 +--- a/main.cc ++++ b/main.cc +@@ -33,7 +33,8 @@ + #include + #include + #include +-#include ++#include ++#include + #include + #include + #include +-- +1.6.6 + Added: csw/mgar/pkg/lzlib/trunk/files/0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/lzlib/trunk/files/0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch (rev 0) +++ csw/mgar/pkg/lzlib/trunk/files/0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch 2010-02-18 17:36:50 UTC (rev 8658) @@ -0,0 +1,25 @@ +From ccab3f0f516aa027a935e70e77ff0c0b0a6445f8 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 18 Feb 2010 18:08:08 +0100 +Subject: [PATCH] Change linker flags for shared libs to be Sun Studio + +--- + Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index a68698a..c2ba00d 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -23,7 +23,7 @@ lib$(libname).a: $(lib_objs) + $(AR) -rcs lib$(libname).a $(lib_objs) + + lib$(libname).so.$(pkgversion) : $(sh_lib_objs) +- $(CXX) -shared -Wl,--soname=lib$(libname).so.$(soversion) -o lib$(libname).so.$(pkgversion) $(sh_lib_objs) ++ $(CXX) $(LDFLAGS) -G -h lib$(libname).so.$(soversion) -o lib$(libname).so.$(pkgversion) $(sh_lib_objs) + + $(progname) : $(objs) lib$(libname).a + $(CXX) $(LDFLAGS) -o $(progname) $(objs) lib$(libname).a +-- +1.6.6 + Added: csw/mgar/pkg/lzlib/trunk/files/0002-Use-ucb-echo-as-it-only-understands-n.patch =================================================================== --- csw/mgar/pkg/lzlib/trunk/files/0002-Use-ucb-echo-as-it-only-understands-n.patch (rev 0) +++ csw/mgar/pkg/lzlib/trunk/files/0002-Use-ucb-echo-as-it-only-understands-n.patch 2010-02-18 17:36:50 UTC (rev 8658) @@ -0,0 +1,26 @@ +From 583bcd2e4276b290bd8cf29894292a1fe5b0057a Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 18 Feb 2010 18:20:56 +0100 +Subject: [PATCH 2/2] Use ucb echo as it only understands -n + +--- + testsuite/check.sh | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/testsuite/check.sh b/testsuite/check.sh +index e35876d..69b5c03 100755 +--- a/testsuite/check.sh ++++ b/testsuite/check.sh +@@ -5,6 +5,9 @@ + # This script is free software: you have unlimited permission + # to copy, distribute and modify it. + ++PATH=/usr/ucb:$PATH ++export PATH ++ + LC_ALL=C + export LC_ALL + objdir=`pwd` +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Feb 18 22:36:50 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Feb 2010 21:36:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8659] csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile Message-ID: Revision: 8659 http://gar.svn.sourceforge.net/gar/?rev=8659&view=rev Author: wbonnet Date: 2010-02-18 21:36:39 +0000 (Thu, 18 Feb 2010) Log Message: ----------- Set version to 1.0.4 Modified Paths: -------------- csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile 2010-02-18 17:36:50 UTC (rev 8658) +++ csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile 2010-02-18 21:36:39 UTC (rev 8659) @@ -1,5 +1,5 @@ GARNAME = libfontenc -GARVERSION = 1.0.5 +GARVERSION = 1.0.4 CATEGORIES = x11 DESCRIPTION = X11 font encoding library This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Feb 18 22:38:19 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Feb 2010 21:38:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8660] csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums Message-ID: Revision: 8660 http://gar.svn.sourceforge.net/gar/?rev=8660&view=rev Author: wbonnet Date: 2010-02-18 21:38:17 +0000 (Thu, 18 Feb 2010) Log Message: ----------- Set version to 1.0.4 Modified Paths: -------------- csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums Modified: csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums 2010-02-18 21:36:39 UTC (rev 8659) +++ csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums 2010-02-18 21:38:17 UTC (rev 8660) @@ -1 +1 @@ -4f0d8191819be9f2bdf9dad49a65e43b libfontenc-1.0.5.tar.bz2 +5cd16a2e51ca7b96a3081c7486ff98b9 libfontenc-1.0.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Feb 18 23:29:24 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Feb 2010 22:29:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8661] csw/mgar/pkg/x11/lib/libsm/trunk/Makefile Message-ID: Revision: 8661 http://gar.svn.sourceforge.net/gar/?rev=8661&view=rev Author: wbonnet Date: 2010-02-18 22:29:23 +0000 (Thu, 18 Feb 2010) Log Message: ----------- Fix dependencies Modified Paths: -------------- csw/mgar/pkg/x11/lib/libsm/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libsm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libsm/trunk/Makefile 2010-02-18 21:38:17 UTC (rev 8660) +++ csw/mgar/pkg/x11/lib/libsm/trunk/Makefile 2010-02-18 22:29:23 UTC (rev 8661) @@ -16,8 +16,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -# BUILD_DEP_PKGS = CSWlibicedevel -RUNTIME_DEP_PKGS = CSWlibice +RUNTIME_DEP_PKGS_CSWlibsm = CSWlibice +RUNTIME_DEP_PKGS_CSWlibsmdevel += CSWlibsm PACKAGES = CSWlibsm CSWlibsmdevel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Feb 18 23:45:40 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Feb 2010 22:45:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[8662] csw/mgar/gar/v2/categories/x11/category.mk Message-ID: Revision: 8662 http://gar.svn.sourceforge.net/gar/?rev=8662&view=rev Author: wbonnet Date: 2010-02-18 22:45:32 +0000 (Thu, 18 Feb 2010) Log Message: ----------- Switch to version X11R7.5 Modified Paths: -------------- csw/mgar/gar/v2/categories/x11/category.mk Modified: csw/mgar/gar/v2/categories/x11/category.mk =================================================================== --- csw/mgar/gar/v2/categories/x11/category.mk 2010-02-18 22:29:23 UTC (rev 8661) +++ csw/mgar/gar/v2/categories/x11/category.mk 2010-02-18 22:45:32 UTC (rev 8662) @@ -1,7 +1,7 @@ # X11 # Version of X11 -X11_RELEASE_VERSION = X11R7.4 +X11_RELEASE_VERSION = X11R7.5 # Definition of the URL to access sources X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/$(X11_RELEASE_VERSION)/src/proto/ 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 Feb 19 00:01:16 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 18 Feb 2010 23:01:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8663] csw/mgar/gar/v2-checkpkg-stats/ Message-ID: Revision: 8663 http://gar.svn.sourceforge.net/gar/?rev=8663&view=rev Author: wahwah Date: 2010-02-18 23:01:15 +0000 (Thu, 18 Feb 2010) Log Message: ----------- mGAR v2-checkpkg-stats: Removing an old branch Removed Paths: ------------- csw/mgar/gar/v2-checkpkg-stats/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Feb 19 00:03:17 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Feb 2010 23:03:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8664] csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile Message-ID: Revision: 8664 http://gar.svn.sourceforge.net/gar/?rev=8664&view=rev Author: wbonnet Date: 2010-02-18 23:03:16 +0000 (Thu, 18 Feb 2010) Log Message: ----------- Fix version number Modified Paths: -------------- csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile 2010-02-18 23:01:15 UTC (rev 8663) +++ csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile 2010-02-18 23:03:16 UTC (rev 8664) @@ -1,5 +1,5 @@ GARNAME = libfontenc -GARVERSION = 1.0.4 +GARVERSION = 1.0.5 CATEGORIES = x11 DESCRIPTION = X11 font encoding library This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Feb 19 00:04:29 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Feb 2010 23:04:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8665] csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums Message-ID: Revision: 8665 http://gar.svn.sourceforge.net/gar/?rev=8665&view=rev Author: wbonnet Date: 2010-02-18 23:04:28 +0000 (Thu, 18 Feb 2010) Log Message: ----------- Fix version number Modified Paths: -------------- csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums Modified: csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums 2010-02-18 23:03:16 UTC (rev 8664) +++ csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums 2010-02-18 23:04:28 UTC (rev 8665) @@ -1 +1 @@ -5cd16a2e51ca7b96a3081c7486ff98b9 libfontenc-1.0.4.tar.bz2 +4f0d8191819be9f2bdf9dad49a65e43b libfontenc-1.0.5.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 Fri Feb 19 00:30:40 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 18 Feb 2010 23:30:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[8666] csw/mgar/gar/v2/lib/python/opencsw.py Message-ID: Revision: 8666 http://gar.svn.sourceforge.net/gar/?rev=8666&view=rev Author: wahwah Date: 2010-02-18 23:30:36 +0000 (Thu, 18 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, fixed a problem with listing binaries in an empty package. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-18 23:04:28 UTC (rev 8665) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-18 23:30:36 UTC (rev 8666) @@ -275,7 +275,7 @@ self.release_mgr = u"%s <%s>" % (release_mgr_name, release_mgr_email) self.release_cc = release_cc if self.release_cc: - self.release_cc = unicode(release_cc) + self.release_cc = unicode(release_cc) def FormatMail(self): body_list = ["The following package files are ready to be released:"] @@ -730,7 +730,6 @@ rm -rf $EXTRACTDIR exit 1 fi - find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' } @@ -739,6 +738,8 @@ if not self.binaries: self.CheckPkgpathExists() files_root = os.path.join(self.directory, "root") + if not os.path.exists(files_root): + return [] find_tmpl = "find '%s' -print | xargs file | grep ELF | nawk -F: '{print $1}'" find_proc = subprocess.Popen(find_tmpl % ".", shell=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 Fri Feb 19 00:34:21 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 18 Feb 2010 23:34:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8667] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 8667 http://gar.svn.sourceforge.net/gar/?rev=8667&view=rev Author: wahwah Date: 2010-02-18 23:34:10 +0000 (Thu, 18 Feb 2010) Log Message: ----------- mysql-5.0.x: Fixing a problem with backward compatibility symlink, http://www.opencsw.org/bugtrack/view.php?id=4149 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-02-18 23:30:36 UTC (rev 8666) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-02-18 23:34:10 UTC (rev 8667) @@ -221,5 +221,5 @@ gln -s . $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT) # http://www.opencsw.org/bugtrack/view.php?id=4149 ginstall -m 755 -d $(PKGROOT)/opt/csw/lib - gln -s ../../mysql5/lib/mysql $(PKGROOT)/opt/csw/lib/mysql + gln -s ../mysql5/lib/mysql $(PKGROOT)/opt/csw/lib/mysql @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Feb 19 00:53:19 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Feb 2010 23:53:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8668] csw/mgar/pkg/seamonkey/trunk/Makefile Message-ID: Revision: 8668 http://gar.svn.sourceforge.net/gar/?rev=8668&view=rev Author: wbonnet Date: 2010-02-18 23:53:18 +0000 (Thu, 18 Feb 2010) Log Message: ----------- Fix makefile Modified Paths: -------------- csw/mgar/pkg/seamonkey/trunk/Makefile Modified: csw/mgar/pkg/seamonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/seamonkey/trunk/Makefile 2010-02-18 23:34:10 UTC (rev 8667) +++ csw/mgar/pkg/seamonkey/trunk/Makefile 2010-02-18 23:53:18 UTC (rev 8668) @@ -87,7 +87,7 @@ WORK_BUILD = $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME) WORK_INSTALL = $(WORKROOTDIR)/install-$(firstword $(MODULATIONS)) -post-extract-modulated: +post-extract: mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORK_BUILD) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Feb 19 01:37:59 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 19 Feb 2010 00:37:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8669] csw/mgar/pkg/x11/lib/libxv/trunk/checksums Message-ID: Revision: 8669 http://gar.svn.sourceforge.net/gar/?rev=8669&view=rev Author: wbonnet Date: 2010-02-19 00:37:59 +0000 (Fri, 19 Feb 2010) Log Message: ----------- Update checksums Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxv/trunk/checksums Modified: csw/mgar/pkg/x11/lib/libxv/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxv/trunk/checksums 2010-02-18 23:53:18 UTC (rev 8668) +++ csw/mgar/pkg/x11/lib/libxv/trunk/checksums 2010-02-19 00:37:59 UTC (rev 8669) @@ -1 +1 @@ -723a0275227165383e967a1ca8899b52 download/libXv-1.0.4.tar.bz2 +723a0275227165383e967a1ca8899b52 libXv-1.0.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Feb 19 01:38:32 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 19 Feb 2010 00:38:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8670] csw/mgar/pkg/x11/lib/libxt/trunk/Makefile Message-ID: Revision: 8670 http://gar.svn.sourceforge.net/gar/?rev=8670&view=rev Author: wbonnet Date: 2010-02-19 00:38:32 +0000 (Fri, 19 Feb 2010) Log Message: ----------- Update dependencies Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxt/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libxt/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxt/trunk/Makefile 2010-02-19 00:37:59 UTC (rev 8669) +++ csw/mgar/pkg/x11/lib/libxt/trunk/Makefile 2010-02-19 00:38:32 UTC (rev 8670) @@ -26,7 +26,7 @@ SPKG_DESC_CSWlibxt = X11 toolkit intrinsics library SPKG_DESC_CSWlibxtdevel = X11 toolkit intrinsics library development files -RUNTIME_DEP_PKGS_CSWlibxt = CSWlibx11 CSWlibice +RUNTIME_DEP_PKGS_CSWlibxt = CSWlibx11 CSWlibice CSWlibsm RUNTIME_DEP_PKGS_CSWlibxtdevel = CSWlibxt PKGFILES_CSWlibxtdevel = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Feb 19 01:59:13 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 19 Feb 2010 00:59:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8671] csw/mgar/pkg/x11/lib/libxau/trunk/checksums Message-ID: Revision: 8671 http://gar.svn.sourceforge.net/gar/?rev=8671&view=rev Author: wbonnet Date: 2010-02-19 00:59:02 +0000 (Fri, 19 Feb 2010) Log Message: ----------- Update checkssums Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxau/trunk/checksums Modified: csw/mgar/pkg/x11/lib/libxau/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxau/trunk/checksums 2010-02-19 00:38:32 UTC (rev 8670) +++ csw/mgar/pkg/x11/lib/libxau/trunk/checksums 2010-02-19 00:59:02 UTC (rev 8671) @@ -1 +1 @@ -0f2b88d857e0a3f5898e4759c541af46 download/libXau-1.0.4.tar.bz2 +0f2b88d857e0a3f5898e4759c541af46 libXau-1.0.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Feb 19 07:34:44 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 19 Feb 2010 06:34:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8672] csw/mgar/pkg/librsvg/trunk/Makefile Message-ID: Revision: 8672 http://gar.svn.sourceforge.net/gar/?rev=8672&view=rev Author: hson Date: 2010-02-19 06:34:44 +0000 (Fri, 19 Feb 2010) Log Message: ----------- librsvg: Add checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2010-02-19 00:59:02 UTC (rev 8671) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2010-02-19 06:34:44 UTC (rev 8672) @@ -43,6 +43,7 @@ RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibcairo CSWlibcroco CSWlibgsf CSWlibx11 RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibxml2 CSWpango CSWpng CSWzlib CSWorbit2 RUNTIME_DEP_PKGS_CSWlibrsvg += CSWbonobo2 CSWgconf2 CSWgnomevfs2 CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWiconv RUNTIME_DEP_PKGS_CSWlibrsvgdevel += CSWlibrsvg RUNTIME_DEP_PKGS_CSWlibrsvgdoc += RUNTIME_DEP_PKGS_CSWlibrsvgmozilla += CSWggettextrt CSWglib2 @@ -57,6 +58,10 @@ BUILD_DEP_PKGS += CSWmozilla BUILD_DEP_PKGS += CSWlibxml2devel +CHECKPKG_OVERRIDES_CSWlibrsvg += symbol-not-found|rsvg-convert +CHECKPKG_OVERRIDES_CSWlibrsvg += symbol-not-found|rsvg-view +CHECKPKG_OVERRIDES_CSWlibrsvg += symbol-not-found|libsvg.so + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 # Upstream develops on gcc only This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Feb 19 08:24:06 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 19 Feb 2010 07:24:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8673] csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile Message-ID: Revision: 8673 http://gar.svn.sourceforge.net/gar/?rev=8673&view=rev Author: wbonnet Date: 2010-02-19 07:24:06 +0000 (Fri, 19 Feb 2010) Log Message: ----------- Fix makefile Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile 2010-02-19 06:34:44 UTC (rev 8672) +++ csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile 2010-02-19 07:24:06 UTC (rev 8673) @@ -25,8 +25,8 @@ SPKG_DESC_CSWlibxaw = X Athena Widgets SPKG_DESC_CSWlibxawdevel = X Athena Widgets development files -RUNTIME_DEP_PKGS_CSWlibxaw = CSWlibice CSWlibsm CSWlibx11 CSWlibxext CSWlibxmu CSWlibxt CSWlibxpm -RUNTIME_DEP_PKGS_CSWlibxawdevel = CSWlibxpmdevel +RUNTIME_DEP_PKGS_CSWlibxaw = CSWlibice CSWlibsm CSWlibx11 CSWlibxext CSWlibxmu CSWlibxt CSWlibxpm +RUNTIME_DEP_PKGS_CSWlibxawdevel = CSWlibxaw BUILD64 = 1 NOISALIST = 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 Feb 19 08:52:03 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 19 Feb 2010 07:52:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[8674] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 8674 http://gar.svn.sourceforge.net/gar/?rev=8674&view=rev Author: wahwah Date: 2010-02-19 07:52:02 +0000 (Fri, 19 Feb 2010) Log Message: ----------- subversion: Setting the dependency to CSWbdb47 (doesn't seem to be linking against CSWbdb48), and removing the duplicate dependency on CSWlibserf. Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-02-19 07:24:06 UTC (rev 8673) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-02-19 07:52:02 UTC (rev 8674) @@ -1,3 +1,5 @@ +# $Id$ +# # TODO (release-critical prefixed with !, non release-critical with *) # # * How about shipping a changelog.CSW (example in files/)? @@ -42,7 +44,7 @@ CATALOGNAME_CSWsvn-contrib = subversion_contrib CATALOGNAME_CSWsvn-tools = subversion_tools RUNTIME_DEP_PKGS_CSWsvn = CSWapache2rt -RUNTIME_DEP_PKGS_CSWsvn += CSWbdb48 +RUNTIME_DEP_PKGS_CSWsvn += CSWbdb47 RUNTIME_DEP_PKGS_CSWsvn += CSWexpat RUNTIME_DEP_PKGS_CSWsvn += CSWggettextrt RUNTIME_DEP_PKGS_CSWsvn += CSWiconv @@ -52,7 +54,6 @@ RUNTIME_DEP_PKGS_CSWsvn += CSWlibserf RUNTIME_DEP_PKGS_CSWsvn += CSWsqlite3rt RUNTIME_DEP_PKGS_CSWsvn += CSWzlib -RUNTIME_DEP_PKGS_CSWsvn += CSWlibserf RUNTIME_DEP_PKGS_CSWsvn-contrib += CSWperl RUNTIME_DEP_PKGS_CSWsvn-contrib += CSWpython RUNTIME_DEP_PKGS_CSWsvn-tools += CSWperl Property changes on: csw/mgar/pkg/subversion/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Feb 19 09:13:23 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 19 Feb 2010 08:13:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8675] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 8675 http://gar.svn.sourceforge.net/gar/?rev=8675&view=rev Author: wahwah Date: 2010-02-19 08:13:23 +0000 (Fri, 19 Feb 2010) Log Message: ----------- subversion: Updated the documentation in the Makefile comments. Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-02-19 07:52:02 UTC (rev 8674) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-02-19 08:13:23 UTC (rev 8675) @@ -11,12 +11,10 @@ # # Known build facts/issues: # -# * Build takes about 50 mins on build8x, 25 mins on build8s. This is only -# the build, the tests take about 5 times as much (see TEST_TARGET). -# * checkpkg suggests CSWbdb over CSWbdb47, because it picks up the -# libdb-4.7.so symlink in $(libdir) which belongs to the stub CSWbdb. As -# the lib itself belongs to CSWbdb47, the CSWbdb47 dep is completely fine. -# +# * The complete build (gmake platforms) takes 4 hours. Build takes about 50 +# mins on build8x, 25 mins on build8s. This is only the build, the tests take +# about 5 times as much (see TEST_TARGET). + GARNAME = subversion GARVERSION = 1.6.9 CATEGORIES = utils 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 Feb 19 09:36:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Feb 2010 08:36:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8676] csw/mgar/pkg/lzlib/trunk/Makefile Message-ID: Revision: 8676 http://gar.svn.sourceforge.net/gar/?rev=8676&view=rev Author: dmichelsen Date: 2010-02-19 08:36:10 +0000 (Fri, 19 Feb 2010) Log Message: ----------- lzlib: Final linkage fixes Modified Paths: -------------- csw/mgar/pkg/lzlib/trunk/Makefile Modified: csw/mgar/pkg/lzlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzlib/trunk/Makefile 2010-02-19 08:13:23 UTC (rev 8675) +++ csw/mgar/pkg/lzlib/trunk/Makefile 2010-02-19 08:36:10 UTC (rev 8676) @@ -2,7 +2,7 @@ GARVERSION = 0.9 CATEGORIES = lib -DESCRIPTION = lzlib is a lossless data compression library based on the LZMA algorithm. +DESCRIPTION = A lossless data compression library based on the LZMA algorithm define BLURB The lzlib compression library provides in-memory LZMA compression and decompression functions, including integrity checking of the uncompressed @@ -22,9 +22,10 @@ VENDOR_URL = http://www.nongnu.org/lzip/lzlib.html EXTRA_CXXFLAGS = -xcode=pic32 +EXTRA_LINKER_FLAGS = -lCrun -# GARCOMPILER = GNU BUILD64 = 1 +NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += CXX="$(CXX)" @@ -32,18 +33,6 @@ CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)" CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)" -#BUILD_OVERRIDE_VARS = CXX CPPFLAGS CXXFLAGS LDFLAGS -#BUILD_OVERRIDE_VAR_CXX = $(CXX) -#BUILD_OVERRIDE_VAR_CPPFLAGS = $(CPPFLAGS) -#BUILD_OVERRIDE_VAR_CXXFLAGS = $(CXXFLAGS) -#BUILD_OVERRIDE_VAR_LDFLAGS = $(LDFLAGS) - -#TEST_OVERRIDE_VARS = CXX CPPFLAGS CXXFLAGS LDFLAGS -#TEST_OVERRIDE_VAR_CXX = $(CXX) -#TEST_OVERRIDE_VAR_CPPFLAGS = $(CPPFLAGS) -#TEST_OVERRIDE_VAR_CXXFLAGS = $(CXXFLAGS) -#TEST_OVERRIDE_VAR_LDFLAGS = $(LDFLAGS) - TEST_TARGET = check INSTALL_OVERRIDE_VARS = INSTALL @@ -51,5 +40,3 @@ include gar/category.mk -# Only ucb echo understands -n -# PATH := /usr/ucb:$(PATH) 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 Feb 19 09:38:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Feb 2010 08:38:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8677] csw/mgar/pkg/automake/trunk/Makefile Message-ID: Revision: 8677 http://gar.svn.sourceforge.net/gar/?rev=8677&view=rev Author: dmichelsen Date: 2010-02-19 08:38:25 +0000 (Fri, 19 Feb 2010) Log Message: ----------- automake: Add sourceurl Modified Paths: -------------- csw/mgar/pkg/automake/trunk/Makefile Modified: csw/mgar/pkg/automake/trunk/Makefile =================================================================== --- csw/mgar/pkg/automake/trunk/Makefile 2010-02-19 08:36:10 UTC (rev 8676) +++ csw/mgar/pkg/automake/trunk/Makefile 2010-02-19 08:38:25 UTC (rev 8677) @@ -26,6 +26,8 @@ NOCHECKSUM = $(notdir $(POSTMSG)) NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz, $(SOURCEFILES)) +SPKG_SOURCEURL = http://www.gnu.org/software/automake/ + RUNTIME_DEP_PKGS = CSWperl CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Feb 19 09:42:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Feb 2010 08:42:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[8678] csw/mgar/pkg/automake/trunk/Makefile Message-ID: Revision: 8678 http://gar.svn.sourceforge.net/gar/?rev=8678&view=rev Author: dmichelsen Date: 2010-02-19 08:42:05 +0000 (Fri, 19 Feb 2010) Log Message: ----------- automake: Minor URL fix Modified Paths: -------------- csw/mgar/pkg/automake/trunk/Makefile Modified: csw/mgar/pkg/automake/trunk/Makefile =================================================================== --- csw/mgar/pkg/automake/trunk/Makefile 2010-02-19 08:38:25 UTC (rev 8677) +++ csw/mgar/pkg/automake/trunk/Makefile 2010-02-19 08:42:05 UTC (rev 8678) @@ -36,7 +36,7 @@ # Lots of test fail on Solaris, but they are safe to ignore for now: # -SKIPTEST = 1 +SKIPTEST ?= 1 ARCHALL = 1 @@ -82,7 +82,7 @@ echo; \ echo " /opt/csw/sbin/alternatives --config automake"; \ echo; \ - echo "See http://wiki.opencsw.org/package-alternatives for details."; \ + echo "See http://www.opencsw.org/packages/alternatives for details."; \ ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Feb 19 09:44:40 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Feb 2010 08:44:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[8679] csw/mgar/pkg/mutt/trunk Message-ID: Revision: 8679 http://gar.svn.sourceforge.net/gar/?rev=8679&view=rev Author: dmichelsen Date: 2010-02-19 08:44:40 +0000 (Fri, 19 Feb 2010) Log Message: ----------- mutt: Minor URL fix Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/checksums csw/mgar/pkg/mutt/trunk/files/CSWmutt.postmsg Modified: csw/mgar/pkg/mutt/trunk/checksums =================================================================== --- csw/mgar/pkg/mutt/trunk/checksums 2010-02-19 08:42:05 UTC (rev 8678) +++ csw/mgar/pkg/mutt/trunk/checksums 2010-02-19 08:44:40 UTC (rev 8679) @@ -1,2 +1,2 @@ -f4dc40545ed4a4dd66f18782df282892 CSWmutt.postmsg +cbeed4711dc224a1ae0900780d469b38 CSWmutt.postmsg 027cdd9959203de0c3c64149a7ee351c mutt-1.5.20.tar.gz Modified: csw/mgar/pkg/mutt/trunk/files/CSWmutt.postmsg =================================================================== --- csw/mgar/pkg/mutt/trunk/files/CSWmutt.postmsg 2010-02-19 08:42:05 UTC (rev 8678) +++ csw/mgar/pkg/mutt/trunk/files/CSWmutt.postmsg 2010-02-19 08:44:40 UTC (rev 8679) @@ -8,5 +8,5 @@ /opt/csw/sbin/alternatives --config mutt -See http://wiki.opencsw.org/package-alternatives for details. +See http://www.opencsw.org/packages/alternatives for details. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Feb 19 10:24:47 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 19 Feb 2010 09:24:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[8680] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 8680 http://gar.svn.sourceforge.net/gar/?rev=8680&view=rev Author: bonivart Date: 2010-02-19 09:24:46 +0000 (Fri, 19 Feb 2010) Log Message: ----------- cswclassutils: update to 1.34 including Dagos texinfo fix Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-02-19 08:44:40 UTC (rev 8679) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-02-19 09:24:46 UTC (rev 8680) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.33 +GARVERSION = 1.34 CATEGORIES = utils DESCRIPTION = CSW class action utilities Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2010-02-19 08:44:40 UTC (rev 8679) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2010-02-19 09:24:46 UTC (rev 8680) @@ -8,7 +8,7 @@ 8ab721535d43dcef702538d394e7a2ce CSWcswclassutils.i.cswpostmsg 0fc6128391af4c9aebf72b84755532cb CSWcswclassutils.i.cswpreserveconf 9018419febe06c12e89d66cc76e7261f CSWcswclassutils.i.cswpycompile -1282bef941c49d98a061b3701a1fda7c CSWcswclassutils.i.cswtexinfo +4f816acb06e8f95add6faf8607859da2 CSWcswclassutils.i.cswtexinfo 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup d278a28a6f901c4ff5f07c583b4cff3d CSWcswclassutils.r.cswcpsampleconf a204ca80139dd1d79e1a3af3e8bad7cb CSWcswclassutils.r.cswcrontab 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 Feb 19 13:53:49 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Feb 2010 12:53:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[8681] csw/mgar/pkg/lzlib/trunk/Makefile Message-ID: Revision: 8681 http://gar.svn.sourceforge.net/gar/?rev=8681&view=rev Author: dmichelsen Date: 2010-02-19 12:53:49 +0000 (Fri, 19 Feb 2010) Log Message: ----------- liblz: Add symlink to generic shared lib Modified Paths: -------------- csw/mgar/pkg/lzlib/trunk/Makefile Modified: csw/mgar/pkg/lzlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzlib/trunk/Makefile 2010-02-19 09:24:46 UTC (rev 8680) +++ csw/mgar/pkg/lzlib/trunk/Makefile 2010-02-19 12:53:49 UTC (rev 8681) @@ -40,3 +40,7 @@ include gar/category.mk +post-install-modulated: + gln -s liblz.so.0 $(DESTDIR)$(libdir)/liblz.so + @$(MAKECOOKIE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Feb 19 14:21:20 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Feb 2010 13:21:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8682] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 8682 http://gar.svn.sourceforge.net/gar/?rev=8682&view=rev Author: dmichelsen Date: 2010-02-19 13:21:20 +0000 (Fri, 19 Feb 2010) Log Message: ----------- subversion: Adjust exclude for Perl 5.10 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-02-19 12:53:49 UTC (rev 8681) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-02-19 13:21:20 UTC (rev 8682) @@ -167,8 +167,8 @@ # All of the perl modules go to $(libdir)/perl/site_perl. We are not interested # in the version specific perl directory which only contains a perllocal.pod. # Can this be re-done as a version agnostic regex? Couldn't get this to work :/ -# EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/perl/(?!site_perl\/) -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/perl/5.8.8.* +# EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/perl/(?!site_perl) +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/perl/5.* NODIRPATHS = --libdir --libexecdir CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) 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 Feb 19 14:35:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Feb 2010 13:35:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8683] csw/mgar/pkg/plzip/trunk Message-ID: Revision: 8683 http://gar.svn.sourceforge.net/gar/?rev=8683&view=rev Author: dmichelsen Date: 2010-02-19 13:35:06 +0000 (Fri, 19 Feb 2010) Log Message: ----------- plzip: Update to 0.5 and Sun Studio Modified Paths: -------------- csw/mgar/pkg/plzip/trunk/Makefile csw/mgar/pkg/plzip/trunk/checksums Added Paths: ----------- csw/mgar/pkg/plzip/trunk/files/0001-Use-inttypes-instead-of-stdint.patch csw/mgar/pkg/plzip/trunk/files/0002-Use-ucb-echo.patch Modified: csw/mgar/pkg/plzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/plzip/trunk/Makefile 2010-02-19 13:21:20 UTC (rev 8682) +++ csw/mgar/pkg/plzip/trunk/Makefile 2010-02-19 13:35:06 UTC (rev 8683) @@ -1,5 +1,5 @@ GARNAME = plzip -GARVERSION = 0.1 +GARVERSION = 0.5 CATEGORIES = utils DESCRIPTION = plzip is a lossless data compressor based on the LZMA algorithm. @@ -14,15 +14,29 @@ MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Use-inttypes-instead-of-stdint.patch +PATCHFILES += 0002-Use-ucb-echo.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = +DEP_PKGS = CSWlzlib -GARCOMPILER = GNU +VENDOR_URL = http://www.nongnu.org/lzip/lzlib.html + +EXTRA_CXXFLAGS = -xcode=pic32 + +NOISALIST = 1 +NODIRPATHS = --includedir CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += CXX="$(CXX)" +CONFIGURE_ARGS += CPPFLAGS="$(CPPFLAGS)" +CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)" +CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)" +TEST_TARGET = check + +INSTALL_OVERRIDE_VARS = INSTALL +INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall + include gar/category.mk Modified: csw/mgar/pkg/plzip/trunk/checksums =================================================================== --- csw/mgar/pkg/plzip/trunk/checksums 2010-02-19 13:21:20 UTC (rev 8682) +++ csw/mgar/pkg/plzip/trunk/checksums 2010-02-19 13:35:06 UTC (rev 8683) @@ -1 +1,3 @@ -8e736e5d24ca40046a2c52a5b4bebb62 plzip-0.1.tar.gz +ac5eb1a5daa65a55d37b6bcde4c58fe7 0001-Use-inttypes-instead-of-stdint.patch +690e11a488625fbb1f99e0ea411e28d4 0002-Use-ucb-echo.patch +f32bd13e94afc29c6d7f2ff770845cf1 plzip-0.5.tar.gz Added: csw/mgar/pkg/plzip/trunk/files/0001-Use-inttypes-instead-of-stdint.patch =================================================================== --- csw/mgar/pkg/plzip/trunk/files/0001-Use-inttypes-instead-of-stdint.patch (rev 0) +++ csw/mgar/pkg/plzip/trunk/files/0001-Use-inttypes-instead-of-stdint.patch 2010-02-19 13:35:06 UTC (rev 8683) @@ -0,0 +1,54 @@ +From 4ab77d47d08780c9f97961c34c3228a290aeed2f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 19 Feb 2010 11:51:24 +0100 +Subject: [PATCH] Use inttypes instead of stdint + +--- + compress.cc | 2 +- + decompress.cc | 2 +- + main.cc | 3 ++- + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/compress.cc b/compress.cc +index 3f5e143..2e3b843 100644 +--- a/compress.cc ++++ b/compress.cc +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +diff --git a/decompress.cc b/decompress.cc +index 85baaf6..2264d1b 100644 +--- a/decompress.cc ++++ b/decompress.cc +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +diff --git a/main.cc b/main.cc +index dc21a9a..d9bc0ab 100644 +--- a/main.cc ++++ b/main.cc +@@ -35,7 +35,8 @@ + #include + #include + #include +-#include ++#include ++#include + #include + #include + #include +-- +1.6.5.1 + Added: csw/mgar/pkg/plzip/trunk/files/0002-Use-ucb-echo.patch =================================================================== --- csw/mgar/pkg/plzip/trunk/files/0002-Use-ucb-echo.patch (rev 0) +++ csw/mgar/pkg/plzip/trunk/files/0002-Use-ucb-echo.patch 2010-02-19 13:35:06 UTC (rev 8683) @@ -0,0 +1,27 @@ +From 3c11f541ea47a3e5f2bd3bd74b46de2e13740058 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 19 Feb 2010 14:30:07 +0100 +Subject: [PATCH] Use ucb echo + +--- + testsuite/check.sh | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/testsuite/check.sh b/testsuite/check.sh +index 438df1b..ae98708 100755 +--- a/testsuite/check.sh ++++ b/testsuite/check.sh +@@ -5,6 +5,10 @@ + # This script is free software: you have unlimited permission + # to copy, distribute and modify it. + ++# Only ucb echo understands -n ++PATH=/usr/ucb:$PATH ++export PATH ++ + LC_ALL=C + export LC_ALL + objdir=`pwd` +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Feb 19 14:52:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Feb 2010 13:52:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8684] csw/mgar/pkg Message-ID: Revision: 8684 http://gar.svn.sourceforge.net/gar/?rev=8684&view=rev Author: dmichelsen Date: 2010-02-19 13:52:15 +0000 (Fri, 19 Feb 2010) Log Message: ----------- lzip: Initial commit Added Paths: ----------- csw/mgar/pkg/lzip/ csw/mgar/pkg/lzip/branches/ csw/mgar/pkg/lzip/tags/ csw/mgar/pkg/lzip/trunk/ csw/mgar/pkg/lzip/trunk/Makefile csw/mgar/pkg/lzip/trunk/checksums csw/mgar/pkg/lzip/trunk/files/ csw/mgar/pkg/lzip/trunk/files/0001-Make-configure-use-bash.patch csw/mgar/pkg/lzip/trunk/files/0002-Use-inttypes-instead-of-stdint.patch csw/mgar/pkg/lzip/trunk/files/0003-Make-testsuite-use-ucb-echo.patch Property changes on: csw/mgar/pkg/lzip/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/lzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzip/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lzip/trunk/Makefile 2010-02-19 13:52:15 UTC (rev 8684) @@ -0,0 +1,38 @@ +GARNAME = lzip +GARVERSION = 1.9 +CATEGORIES = utils + +DESCRIPTION = A lossless data compressor based on the LZMA algorithm +define BLURB + Lzip is a lossless data compressor based on the LZMA algorithm, with very safe + integrity checking and a user interface similar to the one of gzip or bzip2. Lzip + decompresses almost as fast as gzip and compresses better than bzip2, which makes + it well suited for software distribution and data archiving. + Currently only compression is performed in parallel. Parallel decompression is + planned to be implemented soon. +endef + +MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Make-configure-use-bash.patch +PATCHFILES += 0002-Use-inttypes-instead-of-stdint.patch +PATCHFILES += 0003-Make-testsuite-use-ucb-echo.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +VENDOR_URL = http://www.nongnu.org/lzip/clzip.html + +NODIRPATHS = --includedir +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += CXX="$(CXX)" +CONFIGURE_ARGS += CPPFLAGS="$(CPPFLAGS)" +CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)" +CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)" + +TEST_TARGET = check + +INSTALL_OVERRIDE_VARS = INSTALL +INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall + +include gar/category.mk Added: csw/mgar/pkg/lzip/trunk/checksums =================================================================== --- csw/mgar/pkg/lzip/trunk/checksums (rev 0) +++ csw/mgar/pkg/lzip/trunk/checksums 2010-02-19 13:52:15 UTC (rev 8684) @@ -0,0 +1,4 @@ +c88ba40a011ff3bb3fb1a36a1d5d1832 0001-Make-configure-use-bash.patch +b9048c2b7eb8974a7cd9d6486aaa4d4a 0002-Use-inttypes-instead-of-stdint.patch +095a3aafd43cbd99dd12c78e7cc336c0 0003-Make-testsuite-use-ucb-echo.patch +9e1d7f4db5b953e9f75b8500ebe0d4c0 lzip-1.9.tar.gz Added: csw/mgar/pkg/lzip/trunk/files/0001-Make-configure-use-bash.patch =================================================================== --- csw/mgar/pkg/lzip/trunk/files/0001-Make-configure-use-bash.patch (rev 0) +++ csw/mgar/pkg/lzip/trunk/files/0001-Make-configure-use-bash.patch 2010-02-19 13:52:15 UTC (rev 8684) @@ -0,0 +1,31 @@ +From f2651c910740d07b705e91c051e5838790104d96 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 19 Feb 2010 14:48:19 +0100 +Subject: [PATCH 1/3] Make configure use bash + +--- + configure | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 56462e8..6fa8696 100755 +--- a/configure ++++ b/configure +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#!/opt/csw/bin/bash + # configure script for Lzip - A data compressor based on the LZMA algorithm + # Copyright (C) 2008, 2009, 2010 Antonio Diaz Diaz. + # +@@ -27,7 +27,7 @@ mandir='$(datadir)/man' + sysconfdir='$(prefix)/etc' + CXX= + CPPFLAGS= +-CXXFLAGS='-Wall -W -O2' ++CXXFLAGS= + LDFLAGS= + + # Loop over all args +-- +1.6.5.1 + Added: csw/mgar/pkg/lzip/trunk/files/0002-Use-inttypes-instead-of-stdint.patch =================================================================== --- csw/mgar/pkg/lzip/trunk/files/0002-Use-inttypes-instead-of-stdint.patch (rev 0) +++ csw/mgar/pkg/lzip/trunk/files/0002-Use-inttypes-instead-of-stdint.patch 2010-02-19 13:52:15 UTC (rev 8684) @@ -0,0 +1,68 @@ +From c09e736df974dbe9be9ae1bcace4de5a8cfbeac6 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 19 Feb 2010 14:48:40 +0100 +Subject: [PATCH 2/3] Use inttypes instead of stdint + +--- + decoder.cc | 2 +- + encoder.cc | 2 +- + lziprecover.cc | 2 +- + main.cc | 3 ++- + 4 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/decoder.cc b/decoder.cc +index 4e3a8fc..4aadc86 100644 +--- a/decoder.cc ++++ b/decoder.cc +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + + #include "lzip.h" + #include "decoder.h" +diff --git a/encoder.cc b/encoder.cc +index 27d3db0..d38f2a8 100644 +--- a/encoder.cc ++++ b/encoder.cc +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + #include "lzip.h" + #include "encoder.h" +diff --git a/lziprecover.cc b/lziprecover.cc +index dda4b5e..dfb1fc1 100644 +--- a/lziprecover.cc ++++ b/lziprecover.cc +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +diff --git a/main.cc b/main.cc +index 1f12805..90c3686 100644 +--- a/main.cc ++++ b/main.cc +@@ -33,7 +33,8 @@ + #include + #include + #include +-#include ++#include ++#include + #include + #include + #include +-- +1.6.5.1 + Added: csw/mgar/pkg/lzip/trunk/files/0003-Make-testsuite-use-ucb-echo.patch =================================================================== --- csw/mgar/pkg/lzip/trunk/files/0003-Make-testsuite-use-ucb-echo.patch (rev 0) +++ csw/mgar/pkg/lzip/trunk/files/0003-Make-testsuite-use-ucb-echo.patch 2010-02-19 13:52:15 UTC (rev 8684) @@ -0,0 +1,27 @@ +From f930db1d6fd81746e6d51a9caadf7104154f3117 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 19 Feb 2010 14:49:00 +0100 +Subject: [PATCH 3/3] Make testsuite use ucb echo + +--- + testsuite/check.sh | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/testsuite/check.sh b/testsuite/check.sh +index ec61c89..a1fe6da 100755 +--- a/testsuite/check.sh ++++ b/testsuite/check.sh +@@ -5,6 +5,10 @@ + # This script is free software: you have unlimited permission + # to copy, distribute and modify it. + ++# Only ucb echo has -n ++PATH=/usr/ucb:$PATH ++export PATH ++ + LC_ALL=C + export LC_ALL + objdir=`pwd` +-- +1.6.5.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 Feb 19 16:08:48 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 19 Feb 2010 15:08:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8685] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 8685 http://gar.svn.sourceforge.net/gar/?rev=8685&view=rev Author: wahwah Date: 2010-02-19 15:08:48 +0000 (Fri, 19 Feb 2010) Log Message: ----------- cups: Added license, added some overrides, did the dependencies again. Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2010-02-19 13:52:15 UTC (rev 8684) +++ csw/mgar/pkg/cups/trunk/Makefile 2010-02-19 15:08:48 UTC (rev 8685) @@ -77,42 +77,36 @@ INCOMPATIBLE_PKGS_CSWcupslinks = SUNWpcr SUNWpcu CATALOGNAME_CSWcupslinks = cups_links ARCHALL_CSWcupslinks = 1 - ARCHALL_CSWcupsdoc = 1 ARCHALL_CSWcupsdev = 1 RUNTIME_DEP_PKGS_CSWcups = CSWcupsd CSWcupsclient +RUNTIME_DEP_PKGS_CSWcupsclient += CSWgnutls +RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcups +RUNTIME_DEP_PKGS_CSWcupsclient += CSWzlib RUNTIME_DEP_PKGS_CSWcupsd += CSWgnutls RUNTIME_DEP_PKGS_CSWcupsd += CSWkrb5lib RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcups RUNTIME_DEP_PKGS_CSWcupsd += CSWlibdbus RUNTIME_DEP_PKGS_CSWcupsd += CSWoldaprt RUNTIME_DEP_PKGS_CSWcupsd += CSWzlib - -RUNTIME_DEP_PKGS_CSWcupsclient = CSWgnutls -RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcups -RUNTIME_DEP_PKGS_CSWcupsclient += CSWzlib -RUNTIME_DEP_PKGS_CSWcupsdoc = -RUNTIME_DEP_PKGS_CSWcupsdev = CSWcupsd RUNTIME_DEP_PKGS_CSWlibcups += CSWgnutls RUNTIME_DEP_PKGS_CSWlibcups += CSWjpeg RUNTIME_DEP_PKGS_CSWlibcups += CSWpng RUNTIME_DEP_PKGS_CSWlibcups += CSWtiff RUNTIME_DEP_PKGS_CSWlibcups += CSWzlib -RUNTIME_DEP_PKGS_CSWcupslinks = CSWcupsclient +RUNTIME_DEP_PKGS_CSWcupsdev += CSWcupsd -PKGFILES_CSWlibcups = $(libdir)/libcups.* +PKGFILES_CSWlibcups = $(libdir)/libcups.* PKGFILES_CSWcupsdoc = $(datadir)/doc PKGFILES_CSWcupsdoc += $(datadir)/doc/.* PKGFILES_CSWcupsdoc += $(datadir)/cups/examples.* - PKGFILES_CSWcupsdev = $(includedir)/cups/?.* PKGFILES_CSWcupsdev += $(mandir)/man1/cups-config.1 PKGFILES_CSWcupsdev += $(bindir)/cups-config PKGFILES_CSWcupsdev += $(datadir)/cups/ppdc.* PKGFILES_CSWcupsdev += $(datadir)/cups/drv.* - PKGFILES_CSWcupsd = $(sysconfdir)/init\.d/.* PKGFILES_CSWcupsd += $(sysconfdir)/rc.* PKGFILES_CSWcupsd += $(sysconfdir)/cups/cupsd.* @@ -138,7 +132,6 @@ PKGFILES_CSWcupsd += $(bindir)/ppd(c|html|i|merge|po) PKGFILES_CSWcupsd += $(sbindir)/(cupsfilter|cupsd) PKGFILES_CSWcupsd += $(localstatedir)/.* - PKGFILES_CSWcupsclient = $(sbindir)/(accept|reject|cups(addsmb|ctl|(en|dis)able)) PKGFILES_CSWcupsclient += $(sbindir)/cups(accept|reject) PKGFILES_CSWcupsclient += $(sbindir)/(lp(admin|p|c|info|move)) @@ -159,18 +152,18 @@ PKGFILES_CSWcupslinks = /usr/sbin/.* PKGFILES_CSWcupslinks += /usr/bin/.* -SPKG_DESC_CSWcups = Common Unix Printing System -SPKG_DESC_CSWlibcups = CUPS libraries -SPKG_DESC_CSWcupsd = CUPS daemon +SPKG_DESC_CSWcups = Common Unix Printing System +SPKG_DESC_CSWlibcups = CUPS libraries +SPKG_DESC_CSWcupsd = CUPS daemon SPKG_DESC_CSWcupsclient = CUPS client binaries -SPKG_DESC_CSWcupsdoc = CUPS documentation -SPKG_DESC_CSWcupsdev = CUPS header files -SPKG_DESC_CSWcupslinks = Drop-in replacement for SUNWpcu and SUNWpcr +SPKG_DESC_CSWcupsdoc = CUPS documentation +SPKG_DESC_CSWcupsdev = CUPS header files +SPKG_DESC_CSWcupslinks = Drop-in replacement for SUNWpcu and SUNWpcr # http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html -SAMPLECONF = $(sysconfdir)/cups/cupsd\.conf\.CSW -SAMPLECONF += $(sysconfdir)/cups/client\.conf\.CSW -INITSMF = $(sysconfdir)/init\.d/cswcups +SAMPLECONF_CSWcupsd = $(sysconfdir)/cups/cupsd\.conf\.CSW +SAMPLECONF_CSWcupsclient += $(sysconfdir)/cups/client\.conf\.CSW +INITSMF_CSWcupsd = $(sysconfdir)/init\.d/cswcups LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib @@ -186,7 +179,6 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) - # This is a hack that's needed, because configure (Makedefs) will otherwise # plase -ltiff, etc. first and -L/opt/csw/lib afterwards, thus being unable # to find any of the image libraries. @@ -212,6 +204,11 @@ OPTIM = $(OPTIM_$(GARFLAVOR)) export OPTIM +LICENSE = LICENSE.txt + +CHECKPKG_OVERRIDES_CSWlibcups += symbol-not-found|libcupsppdc.so.1 +CHECKPKG_OVERRIDES_CSWcupsdev += missing-dependency|CSWcups + 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 bensons at users.sourceforge.net Fri Feb 19 16:30:08 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 19 Feb 2010 15:30:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8686] csw/mgar/pkg/cpan/PDL/trunk Message-ID: Revision: 8686 http://gar.svn.sourceforge.net/gar/?rev=8686&view=rev Author: bensons Date: 2010-02-19 15:30:07 +0000 (Fri, 19 Feb 2010) Log Message: ----------- cpan PDL: fixed build, added patches for nan Modified Paths: -------------- csw/mgar/pkg/cpan/PDL/trunk/Makefile csw/mgar/pkg/cpan/PDL/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/PDL/trunk/files/patch-perldl.conf csw/mgar/pkg/cpan/PDL/trunk/files/patch-quiet_nan.c Modified: csw/mgar/pkg/cpan/PDL/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/PDL/trunk/Makefile 2010-02-19 15:08:48 UTC (rev 8685) +++ csw/mgar/pkg/cpan/PDL/trunk/Makefile 2010-02-19 15:30:07 UTC (rev 8686) @@ -14,7 +14,14 @@ PACKAGES = CSWpmpdl CATALOGNAME = pm_pdl -RUNTIME_DEP_PKGS = CSWpmextutilsf77 CSWpminline -#BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +PATCHFILES += patch-quiet_nan.c +PATCHFILES += patch-perldl.conf +RUNTIME_DEP_PKGS = CSWpmextutilsf77 CSWpminline CSWgd +BUILD_DEP_PKGS = CSWpminline CSWgd + include gar/category.mk + +post-configure-modulated: + gfind $(WORKSRC) -name Makefile | xargs \ + perl -pi -e 's,-L/opt/csw/lib/libperl.so,-R/opt/csw/lib -lperl,' Modified: csw/mgar/pkg/cpan/PDL/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/PDL/trunk/checksums 2010-02-19 15:08:48 UTC (rev 8685) +++ csw/mgar/pkg/cpan/PDL/trunk/checksums 2010-02-19 15:30:07 UTC (rev 8686) @@ -1 +1,3 @@ a4aa5f3fd7363824e8f555d0245c4ac7 PDL-2.4.6.tar.gz +89384edb64eac7dc3533b7ec93aecc09 patch-perldl.conf +7b5f68c9a691b94cd8ec5f19f2d0ee61 patch-quiet_nan.c Added: csw/mgar/pkg/cpan/PDL/trunk/files/patch-perldl.conf =================================================================== --- csw/mgar/pkg/cpan/PDL/trunk/files/patch-perldl.conf (rev 0) +++ csw/mgar/pkg/cpan/PDL/trunk/files/patch-perldl.conf 2010-02-19 15:30:07 UTC (rev 8686) @@ -0,0 +1,30 @@ +--- PDL-2.4.6.orig/perldl.conf 2009-12-27 18:20:50.000000000 +0100 ++++ PDL-2.4.6/perldl.conf 2010-02-18 09:33:20.288047152 +0100 +@@ -150,12 +150,12 @@ + # 0 -> don't use + # true -> force use + +- WITH_SLATEC => undef, # Leave it up to PDL to decide ++ WITH_SLATEC => 0, # Leave it up to PDL to decide + + # Whether or not to build the PDL::Minuit module + # 0 -> don't use + +- WITH_MINUIT => undef, # Leave it up to PDL to decide ++ WITH_MINUIT => 0, # Leave it up to PDL to decide + + # If MINUIT_LIB is undef a standalone version of Minuit will be compiled + # and PDL::Minuit will link to this library (fortran code can be found +@@ -201,9 +201,9 @@ + # Whether or not to build the PDL::IO::GD module + # 0 -> don't use + # true -> force use +- WITH_GD => undef, +- GD_LIBS => undef, +- GD_INC => undef, ++ WITH_GD => undef, ++ GD_LIBS => ['/opt/csw/lib'], ++ GD_INC => ['/opt/csw/include'], + + # Whether or not to build the PDL::GIS::Proj module + # 0 -> don't use Added: csw/mgar/pkg/cpan/PDL/trunk/files/patch-quiet_nan.c =================================================================== --- csw/mgar/pkg/cpan/PDL/trunk/files/patch-quiet_nan.c (rev 0) +++ csw/mgar/pkg/cpan/PDL/trunk/files/patch-quiet_nan.c 2010-02-19 15:30:07 UTC (rev 8686) @@ -0,0 +1,10 @@ +--- PDL-2.4.6.orig/Basic/Math/quiet_nan.c 2009-10-17 23:37:41.000000000 +0200 ++++ PDL-2.4.6/Basic/Math/quiet_nan.c 2010-02-17 22:03:09.788528006 +0100 +@@ -1,6 +1,6 @@ + #include "mconf.h" + /* Patch NaN function where no system NaN is available */ +-double quiet_nan(void) ++double quiet_nan(long unused) + { + #ifdef NaN + double a; 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 Feb 19 16:50:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Feb 2010 15:50:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8687] csw/mgar/pkg Message-ID: Revision: 8687 http://gar.svn.sourceforge.net/gar/?rev=8687&view=rev Author: dmichelsen Date: 2010-02-19 15:50:16 +0000 (Fri, 19 Feb 2010) Log Message: ----------- zutils: Initial commit Added Paths: ----------- csw/mgar/pkg/zutils/ csw/mgar/pkg/zutils/branches/ csw/mgar/pkg/zutils/tags/ csw/mgar/pkg/zutils/trunk/ csw/mgar/pkg/zutils/trunk/Makefile csw/mgar/pkg/zutils/trunk/checksums csw/mgar/pkg/zutils/trunk/files/ csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes-instead-of-stdint.patch csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch Property changes on: csw/mgar/pkg/zutils/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/zutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/zutils/trunk/Makefile (rev 0) +++ csw/mgar/pkg/zutils/trunk/Makefile 2010-02-19 15:50:16 UTC (rev 8687) @@ -0,0 +1,41 @@ +GARNAME = zutils +GARVERSION = 0.7 +CATEGORIES = utils + +DESCRIPTION = Utilities to deal with compressed and non-compressed files +define BLURB + Lzip is a lossless data compressor based on the LZMA algorithm, with very safe + integrity checking and a user interface similar to the one of gzip or bzip2. Lzip + decompresses almost as fast as gzip and compresses better than bzip2, which makes + it well suited for software distribution and data archiving. + Currently only compression is performed in parallel. Parallel decompression is + planned to be implemented soon. +endef + +MASTER_SITES = http://download.savannah.gnu.org/releases/zutils/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Use-inttypes-instead-of-stdint.patch +PATCHFILES += 0002-Use-correct-path-on-testsuite.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD_DEP_PKGS = CSWhelp2man + +VENDOR_URL = http://www.nongnu.org/zutils/zutils.html + +NODIRPATHS = --includedir +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += CXX="$(CXX)" +CONFIGURE_ARGS += CPPFLAGS="$(CPPFLAGS)" +CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)" +CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)" + +TEST_TARGET = check + +INSTALL_OVERRIDE_VARS = INSTALL +INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall + +EXTRA_PAX_ARGS = -s ",/z,/Z,p" + +include gar/category.mk Added: csw/mgar/pkg/zutils/trunk/checksums =================================================================== --- csw/mgar/pkg/zutils/trunk/checksums (rev 0) +++ csw/mgar/pkg/zutils/trunk/checksums 2010-02-19 15:50:16 UTC (rev 8687) @@ -0,0 +1,3 @@ +649455382564a2724f207badf40a26eb 0001-Use-inttypes-instead-of-stdint.patch +fce5a15a5f23bb5e3e44009823031c5f 0002-Use-correct-path-on-testsuite.patch +c9163bbaf3c6e84044b86b58fa9fe3ff zutils-0.7.tar.gz Added: csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes-instead-of-stdint.patch =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes-instead-of-stdint.patch (rev 0) +++ csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes-instead-of-stdint.patch 2010-02-19 15:50:16 UTC (rev 8687) @@ -0,0 +1,26 @@ +From 7e91887f79edf0b1893f2a0e0ddd0f6c96d5d239 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 19 Feb 2010 16:44:13 +0100 +Subject: [PATCH 1/2] Use inttypes instead of stdint + +--- + main.cc | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/main.cc b/main.cc +index eba364b..75765c2 100644 +--- a/main.cc ++++ b/main.cc +@@ -33,7 +33,8 @@ + #include + #include + #include +-#include ++#include ++#include + #include + #include + #include +-- +1.6.5.1 + Added: csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch (rev 0) +++ csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch 2010-02-19 15:50:16 UTC (rev 8687) @@ -0,0 +1,27 @@ +From 5a911b56730fe7fb0d792ebafa6197ead63c4f5d Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 19 Feb 2010 16:44:26 +0100 +Subject: [PATCH 2/2] Use correct path on testsuite + +--- + testsuite/check.sh | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/testsuite/check.sh b/testsuite/check.sh +index 1c8b249..11e8171 100755 +--- a/testsuite/check.sh ++++ b/testsuite/check.sh +@@ -5,6 +5,10 @@ + # This script is free software: you have unlimited permission + # to copy, distribute and modify it. + ++# Only ucb echo understands -n ++PATH=/opt/csw/bin:/opt/csw/gnu:/usr/ucb:$PATH ++export PATH ++ + LC_ALL=C + export LC_ALL + objdir=`pwd` +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Feb 19 17:04:36 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Feb 2010 16:04:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8688] csw/mgar/pkg/zutils/trunk/Makefile Message-ID: Revision: 8688 http://gar.svn.sourceforge.net/gar/?rev=8688&view=rev Author: dmichelsen Date: 2010-02-19 16:04:36 +0000 (Fri, 19 Feb 2010) Log Message: ----------- zutils: Fix dependencies Modified Paths: -------------- csw/mgar/pkg/zutils/trunk/Makefile Modified: csw/mgar/pkg/zutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/zutils/trunk/Makefile 2010-02-19 15:50:16 UTC (rev 8687) +++ csw/mgar/pkg/zutils/trunk/Makefile 2010-02-19 16:04:36 UTC (rev 8688) @@ -20,7 +20,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -BUILD_DEP_PKGS = CSWhelp2man +BUILD_DEP_PKGS = CSWhelp2man CSWlzip +RUNTIME_DEP_PKGS = CSWlzip VENDOR_URL = http://www.nongnu.org/zutils/zutils.html 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 Feb 19 17:18:54 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 19 Feb 2010 16:18:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8689] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 8689 http://gar.svn.sourceforge.net/gar/?rev=8689&view=rev Author: wahwah Date: 2010-02-19 16:18:54 +0000 (Fri, 19 Feb 2010) Log Message: ----------- cups: Remove custom SPKG_CLASSES since GAR does it better Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2010-02-19 16:04:36 UTC (rev 8688) +++ csw/mgar/pkg/cups/trunk/Makefile 2010-02-19 16:18:54 UTC (rev 8689) @@ -69,8 +69,6 @@ UFILES_REGEX = cups-(\d+(?:\.\d+)*)-source.tar.bz2 -SPKG_CLASSES = none cswcpsampleconf cswinitsmf - PACKAGES = CSWlibcups CSWcupsd CSWcupsclient CSWcupsdoc CSWcupsdev CSWcups PACKAGES += CSWcupslinks This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Feb 19 18:42:12 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 19 Feb 2010 17:42:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[8690] csw/mgar/pkg/gstreamer/trunk Message-ID: Revision: 8690 http://gar.svn.sourceforge.net/gar/?rev=8690&view=rev Author: bensons Date: 2010-02-19 17:42:12 +0000 (Fri, 19 Feb 2010) Log Message: ----------- gstreamer: added to GAR Added Paths: ----------- csw/mgar/pkg/gstreamer/trunk/Makefile csw/mgar/pkg/gstreamer/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/gstreamer/trunk/ Property changes on: csw/mgar/pkg/gstreamer/trunk ___________________________________________________________________ Added: svn:ignore + cookies\ndownload\nwork\n Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/gstreamer/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstreamer/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gstreamer/trunk/Makefile 2010-02-19 17:42:12 UTC (rev 8690) @@ -0,0 +1,43 @@ +GARNAME = gstreamer +GARVERSION = 0.10.26 +CATEGORIES = gnome + +DESCRIPTION = open source multimedia framework +define BLURB + GStreamer is a library for constructing graphs of media-handling components. + The applications it supports range from simple Ogg/Vorbis playback, + audio/video streaming to complex audio (mixing) and video (non-linear + editing) processing. +endef + +MASTER_SITES = http://gstreamer.freedesktop.org/src/gstreamer/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --disable-debug + +RUNTIME_DEP_PKGS = CSWglib2 CSWggettextrt CSWlibxml2 +BUILD_DEP_PKGS = CSWbison CSWflex-new $(RUNTIME_DEP_PKGS) + +STRIP_LIBTOOL = 1 + +CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|gst-inspect-0.10 +CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|gst-xmlinspect-0.10 +CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|gst-xmllaunch-0.10 +CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|gst-launch-0.10 +CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|gst-typefind-0.10 +CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|libgstbase-0.10.so.0.23.0 +CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|libgstcoreindexers.so +CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|libgstcoreelements.so +CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|libgstcheck-0.10.so.0.23.0 +CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|libgstdataprotocol-0.10.so.0.23.0 +CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|libgstcontroller-0.10.so.0.23.0 +CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|libgstnet-0.10.so.0.23.0 +CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|gst-plugin-scanner + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/gstreamer/trunk/checksums =================================================================== 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 Feb 19 18:51:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 19 Feb 2010 17:51:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8691] csw/mgar/gar/v2/lib/python/opencsw.py Message-ID: Revision: 8691 http://gar.svn.sourceforge.net/gar/?rev=8691&view=rev Author: wahwah Date: 2010-02-19 17:51:13 +0000 (Fri, 19 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, move pkgtrans logging to the debug level. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-19 17:42:12 UTC (rev 8690) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-19 17:51:13 UTC (rev 8691) @@ -444,7 +444,7 @@ args = [os.path.join(os.path.dirname(__file__), "..", "..", "bin", "custom-pkgtrans"), gunzipped_path, self.GetWorkDir(), pkgname] - logging.info("transforming: %s", args) + logging.debug("transforming: %s", args) unused_retcode = self.ShellCommand(args, quiet=(not self.debug)) dirs = self.GetDirs() if len(dirs) != 1: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Fri Feb 19 19:53:27 2010 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 19 Feb 2010 18:53:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[8692] csw/mgar/pkg/gkrellm/trunk Message-ID: Revision: 8692 http://gar.svn.sourceforge.net/gar/?rev=8692&view=rev Author: jake_goerzen Date: 2010-02-19 18:53:27 +0000 (Fri, 19 Feb 2010) Log Message: ----------- patch file gkrellm.h Modified Paths: -------------- csw/mgar/pkg/gkrellm/trunk/Makefile csw/mgar/pkg/gkrellm/trunk/checksums csw/mgar/pkg/gkrellm/trunk/files/src.Makefile Added Paths: ----------- csw/mgar/pkg/gkrellm/trunk/files/gkrellm.h.patch Modified: csw/mgar/pkg/gkrellm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gkrellm/trunk/Makefile 2010-02-19 17:51:13 UTC (rev 8691) +++ csw/mgar/pkg/gkrellm/trunk/Makefile 2010-02-19 18:53:27 UTC (rev 8692) @@ -19,6 +19,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += Makefile server.Makefile src.Makefile cswgkrellmd PATCHFILES = 0001-Add-LOG_MAKEPRI.patch +PATCHFILES += gkrellm.h.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 Modified: csw/mgar/pkg/gkrellm/trunk/checksums =================================================================== --- csw/mgar/pkg/gkrellm/trunk/checksums 2010-02-19 17:51:13 UTC (rev 8691) +++ csw/mgar/pkg/gkrellm/trunk/checksums 2010-02-19 18:53:27 UTC (rev 8692) @@ -2,5 +2,6 @@ 6a34a1bc0d7b7af7882b612af3300535 Makefile 0b90e7e6e08187a73641d84868a1c805 cswgkrellmd 270917784da6bf1292aba0c82af726d6 gkrellm-2.3.4.tar.bz2 +80c3eb3d6d3be4613a1b772b2b92ffd1 gkrellm.h.patch 6c5b47a9c7e2109ae41aa2eba264b94c server.Makefile -6701c6a8214d9cd7f0a2e1726f842eb9 src.Makefile +d29832f484d1f33b1f8571a732e1f891 src.Makefile Added: csw/mgar/pkg/gkrellm/trunk/files/gkrellm.h.patch =================================================================== --- csw/mgar/pkg/gkrellm/trunk/files/gkrellm.h.patch (rev 0) +++ csw/mgar/pkg/gkrellm/trunk/files/gkrellm.h.patch 2010-02-19 18:53:27 UTC (rev 8692) @@ -0,0 +1,21 @@ +diff -rupN gkrellm-2.3.4/src/gkrellm.h gkrellm-2.3.4.new/src/gkrellm.h +--- gkrellm-2.3.4/src/gkrellm.h 2010-01-05 00:14:58.000000000 +0100 ++++ gkrellm-2.3.4.new/src/gkrellm.h 2010-02-19 19:18:50.867583892 +0100 +@@ -132,13 +132,13 @@ + + #if !defined(WIN32) + +-#define LOCAL_THEMES_DIR "/usr/local/share/gkrellm2/themes" ++#define LOCAL_THEMES_DIR "/opt/csw/share/gkrellm2/themes" + #if !defined(SYSTEM_THEMES_DIR) +-#define SYSTEM_THEMES_DIR "/usr/share/gkrellm2/themes" ++#define SYSTEM_THEMES_DIR "/opt/csw/gkrellm2/themes" + #endif +-#define LOCAL_PLUGINS_DIR "/usr/local/lib/gkrellm2/plugins" ++#define LOCAL_PLUGINS_DIR "/opt/csw/lib/gkrellm2/plugins" + #if !defined(SYSTEM_PLUGINS_DIR) +-#define SYSTEM_PLUGINS_DIR "/usr/lib/gkrellm2/plugins" ++#define SYSTEM_PLUGINS_DIR "/opt/csw/gkrellm2/plugins" + #endif + + #else Modified: csw/mgar/pkg/gkrellm/trunk/files/src.Makefile =================================================================== --- csw/mgar/pkg/gkrellm/trunk/files/src.Makefile 2010-02-19 17:51:13 UTC (rev 8691) +++ csw/mgar/pkg/gkrellm/trunk/files/src.Makefile 2010-02-19 18:53:27 UTC (rev 8692) @@ -249,8 +249,8 @@ install_solaris: $(MAKE) install INSTALL=/opt/csw/bin/ginstall - fakeroot chgrp sys $(INSTALLDIR)/$(PACKAGE) - fakeroot chmod g+s $(INSTALLDIR)/$(PACKAGE) + # chgrp sys $(INSTALLDIR)/$(PACKAGE) + # chmod g+s $(INSTALLDIR)/$(PACKAGE) install_windows: $(MAKE) BINEXT=".exe" install_bin install_inc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Feb 19 22:21:44 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 19 Feb 2010 21:21:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8693] csw/mgar/pkg/java/ajcbeanutils/trunk Message-ID: Revision: 8693 http://gar.svn.sourceforge.net/gar/?rev=8693&view=rev Author: wbonnet Date: 2010-02-19 21:21:44 +0000 (Fri, 19 Feb 2010) Log Message: ----------- Working version. For debugging purpose. Modified Paths: -------------- csw/mgar/pkg/java/ajcbeanutils/trunk/Makefile csw/mgar/pkg/java/ajcbeanutils/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/java/ajcbeanutils/trunk/files/CSWajcbeanutils.gspec csw/mgar/pkg/java/ajcbeanutils/trunk/files/CSWajcbeanutilsdoc.gspec Modified: csw/mgar/pkg/java/ajcbeanutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajcbeanutils/trunk/Makefile 2010-02-19 18:53:27 UTC (rev 8692) +++ csw/mgar/pkg/java/ajcbeanutils/trunk/Makefile 2010-02-19 21:21:44 UTC (rev 8693) @@ -1,12 +1,12 @@ SHORTNAME = beanutils -GARVERSION = 1.8.0 +GARVERSION = 1.8.2 GARNAME = commons-$(SHORTNAME) CATEGORIES = java DESCRIPTION = Apache Jakarta Commons BeanUtils define BLURB -Apache Jakarta Commons BeanUtils provides wrappers around the Java reflection and introspection + Apache Jakarta Commons BeanUtils provides wrappers around the Java reflection and introspection endef # Use jakarta sources @@ -16,18 +16,22 @@ DISTFILES = $(GARNAME)-$(GARVERSION)-bin.tar.gz # Defines two packages, lib and doc -DISTFILES += $(call admfiles,CSWajcbeanutils,) -DISTFILES += $(call admfiles,CSWajcbeanutilsdoc,) +PACKAGES = CSWajcbeanutils CSWajcbeanutilsdoc +# Package architecture is ALL (pure java) +ARCHALL = 1 + # Defines package description SPKG_DESC_CSWajcbeanutils = $(DESCRIPTION) SPKG_DESC_CSWajcbeanutilsdoc = $(DESCRIPTION) documentation package -# Defines dependencies -# RUNTIME_DEP_PKGS_CSWajcbeanutils = +CATALOGNAME_CSWajcbeanutils = commons_beanutils +CATALOGNAME_CSWajcbeanutilsdoc = commons_beanutl_doc +LICENSE = LICENSE.txt + # Defines package content -PKGFILES_CSWajcbeanutils = $(prefix)/share/doc/$(GARNAME)/LICENSE.txt +# PKGFILES_CSWajcbeanutils = $(prefix)/share/doc/$(GARNAME)/LICENSE.txt PKGFILES_CSWajcbeanutils += $(prefix)/share/java/.* # Defines custom steps since java libs do not use autotools @@ -42,13 +46,11 @@ install-custom: @ginstall -d $(DESTDIR)$(datadir)/java - @gcp -fp $(WORKSRC)/$(DISTNAME)/commons-beanutils-1.8.0.jar $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/commons-beanutils-$(GARVERSION).jar $(DESTDIR)$(datadir)/java @( cd $(DESTDIR)$(datadir)/java ; \ ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.8.jar ; \ ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.jar ; \ ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) - @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME) - @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/LICENSE-documentation.txt @gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* $(DESTDIR)$(datadir)/doc/$(GARNAME) @$(MAKECOOKIE) Modified: csw/mgar/pkg/java/ajcbeanutils/trunk/checksums =================================================================== --- csw/mgar/pkg/java/ajcbeanutils/trunk/checksums 2010-02-19 18:53:27 UTC (rev 8692) +++ csw/mgar/pkg/java/ajcbeanutils/trunk/checksums 2010-02-19 21:21:44 UTC (rev 8693) @@ -1,3 +1 @@ -bffa9e8a9d2a09d4c3641b042e8954fc download/commons-beanutils-1.8.0-bin.tar.gz -b90efc0d932ea4782b7ab7b66aacfc6f download/CSWajcbeanutils.gspec -70b796946d8fd437dc0820ea1c89bf0b download/CSWajcbeanutilsdoc.gspec +744fcff65e91ef60f83caca1e2458312 commons-beanutils-1.8.2-bin.tar.gz Deleted: csw/mgar/pkg/java/ajcbeanutils/trunk/files/CSWajcbeanutils.gspec =================================================================== --- csw/mgar/pkg/java/ajcbeanutils/trunk/files/CSWajcbeanutils.gspec 2010-02-19 18:53:27 UTC (rev 8692) +++ csw/mgar/pkg/java/ajcbeanutils/trunk/files/CSWajcbeanutils.gspec 2010-02-19 21:21:44 UTC (rev 8693) @@ -1,7 +0,0 @@ -%var bitname commons_beanutils -%var pkgname CSWajcbeanutils -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/%{GARNAME}/LICENSE.txt for license information Deleted: csw/mgar/pkg/java/ajcbeanutils/trunk/files/CSWajcbeanutilsdoc.gspec =================================================================== --- csw/mgar/pkg/java/ajcbeanutils/trunk/files/CSWajcbeanutilsdoc.gspec 2010-02-19 18:53:27 UTC (rev 8692) +++ csw/mgar/pkg/java/ajcbeanutils/trunk/files/CSWajcbeanutilsdoc.gspec 2010-02-19 21:21:44 UTC (rev 8693) @@ -1,7 +0,0 @@ -%var bitname commons_beanutl_doc -%var pkgname CSWajcbeanutilsdoc -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/%{GARNAME}/LICENSE-documentation.txt for license information 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 Feb 19 23:07:07 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Feb 2010 22:07:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[8694] csw/mgar/pkg/pigz/trunk Message-ID: Revision: 8694 http://gar.svn.sourceforge.net/gar/?rev=8694&view=rev Author: dmichelsen Date: 2010-02-19 22:06:53 +0000 (Fri, 19 Feb 2010) Log Message: ----------- pigz: Update to 2.1.6 Modified Paths: -------------- csw/mgar/pkg/pigz/trunk/Makefile csw/mgar/pkg/pigz/trunk/checksums Modified: csw/mgar/pkg/pigz/trunk/Makefile =================================================================== --- csw/mgar/pkg/pigz/trunk/Makefile 2010-02-19 21:21:44 UTC (rev 8693) +++ csw/mgar/pkg/pigz/trunk/Makefile 2010-02-19 22:06:53 UTC (rev 8694) @@ -1,5 +1,5 @@ GARNAME = pigz -GARVERSION = 2.1.5 +GARVERSION = 2.1.6 CATEGORIES = utils DESCRIPTION = A parallel implementation of gzip Modified: csw/mgar/pkg/pigz/trunk/checksums =================================================================== --- csw/mgar/pkg/pigz/trunk/checksums 2010-02-19 21:21:44 UTC (rev 8693) +++ csw/mgar/pkg/pigz/trunk/checksums 2010-02-19 22:06:53 UTC (rev 8694) @@ -1,3 +1,3 @@ -580873165ef3a369674f0c0af4c96d67 pigz-2.1.5.tar.gz +cbe9030c4be3d0ef2438ee5f8b169ca4 pigz-2.1.6.tar.gz 58c123caae9ea93973c815d175e43dbf pigz-wrapper 13ba5dde0a6279f3394947a587f1c027 unpigz-wrapper 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 Feb 20 00:48:19 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 19 Feb 2010 23:48:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8695] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 8695 http://gar.svn.sourceforge.net/gar/?rev=8695&view=rev Author: wahwah Date: 2010-02-19 23:48:19 +0000 (Fri, 19 Feb 2010) Log Message: ----------- cups: Making CSWcups ARCHALL=1 since it's an empty package. Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2010-02-19 22:06:53 UTC (rev 8694) +++ csw/mgar/pkg/cups/trunk/Makefile 2010-02-19 23:48:19 UTC (rev 8695) @@ -74,9 +74,10 @@ INCOMPATIBLE_PKGS_CSWcupslinks = SUNWpcr SUNWpcu CATALOGNAME_CSWcupslinks = cups_links +ARCHALL_CSWcups = 1 ARCHALL_CSWcupslinks = 1 -ARCHALL_CSWcupsdoc = 1 -ARCHALL_CSWcupsdev = 1 +ARCHALL_CSWcupsdoc = 1 +ARCHALL_CSWcupsdev = 1 RUNTIME_DEP_PKGS_CSWcups = CSWcupsd CSWcupsclient RUNTIME_DEP_PKGS_CSWcupsclient += CSWgnutls 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 Feb 20 00:59:22 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 19 Feb 2010 23:59:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8696] csw/mgar/gar/v2/lib/python/checkpkg.py Message-ID: Revision: 8696 http://gar.svn.sourceforge.net/gar/?rev=8696&view=rev Author: wahwah Date: 2010-02-19 23:59:22 +0000 (Fri, 19 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, skipping hashed lines from /var/sadm/install/contents. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-19 23:48:19 UTC (rev 8695) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-19 23:59:22 UTC (rev 8696) @@ -225,6 +225,8 @@ print "\r~%3.1f%%" % (100.0 * i / estimated_lines,), if stop_re.search(line): continue + if line.startswith("#"): + continue fields = re.split(WS_RE, line) pkgmap_entry_path = fields[0].split("=")[0] pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) 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 Feb 20 09:31:40 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 20 Feb 2010 08:31:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[8697] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 8697 http://gar.svn.sourceforge.net/gar/?rev=8697&view=rev Author: wahwah Date: 2010-02-20 08:31:40 +0000 (Sat, 20 Feb 2010) Log Message: ----------- subversion: Added information about how to update upstream binary packages information. Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-02-19 23:59:22 UTC (rev 8696) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-02-20 08:31:40 UTC (rev 8697) @@ -14,6 +14,12 @@ # * The complete build (gmake platforms) takes 4 hours. Build takes about 50 # mins on build8x, 25 mins on build8s. This is only the build, the tests take # about 5 times as much (see TEST_TARGET). +# * Our package is listed on Subversion's binary packages page. If this +# package is being taken over, the new maintainer needs to be listed on +# Subversion's page. To update their page, one needs to check out this +# repository: http://svn.apache.org/repos/asf/subversion/site/ +# ...and send the patch to the subversion dev mailing list. +# http://subversion.apache.org/mailing-lists.html GARNAME = subversion GARVERSION = 1.6.9 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 Feb 20 12:24:30 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 20 Feb 2010 11:24:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8698] csw/mgar/gar/v2-git Message-ID: Revision: 8698 http://gar.svn.sourceforge.net/gar/?rev=8698&view=rev Author: wahwah Date: 2010-02-20 11:24:28 +0000 (Sat, 20 Feb 2010) Log Message: ----------- mGAR v2-git: Merged changes from the v2 branch. Modified Paths: -------------- csw/mgar/gar/v2-git/Makefile csw/mgar/gar/v2-git/bin/checkpkg csw/mgar/gar/v2-git/bin/checkpkg.d/README csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-actionclasses.py csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-you-can-write-your-own.py csw/mgar/gar/v2-git/bin/fixlibtool csw/mgar/gar/v2-git/bin/update-commondirs csw/mgar/gar/v2-git/categories/cpan/category.mk csw/mgar/gar/v2-git/categories/x11/category.mk csw/mgar/gar/v2-git/etc/commondirs-i386 csw/mgar/gar/v2-git/etc/commondirs-sparc csw/mgar/gar/v2-git/gar.conf.mk csw/mgar/gar/v2-git/gar.lib.mk csw/mgar/gar/v2-git/gar.mk csw/mgar/gar/v2-git/gar.pkg.mk csw/mgar/gar/v2-git/lib/python/checkpkg.py csw/mgar/gar/v2-git/lib/python/checkpkg_test.py csw/mgar/gar/v2-git/lib/python/opencsw.py csw/mgar/gar/v2-git/tests/run_tests.py Added Paths: ----------- csw/mgar/gar/v2-git/bin/analyze_module_results.py csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-archall.py csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-basic.py csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-license.py csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-missing-symbols.py csw/mgar/gar/v2-git/bin/checkpkg_collect_stats.py csw/mgar/gar/v2-git/bin/checkpkg_collect_stats_test.py csw/mgar/gar/v2-git/bin/custom-pkgtrans csw/mgar/gar/v2-git/bin/submitpkg csw/mgar/gar/v2-git/bin/update_contents_cache.py csw/mgar/gar/v2-git/lib/python/package_checks.py csw/mgar/gar/v2-git/lib/python/package_checks_test.py csw/mgar/gar/v2-git/lib/python/submit_to_newpkgs.py csw/mgar/gar/v2-git/lib/python/testdata/example-1-pkginfo.yml csw/mgar/gar/v2-git/lib/python/testdata/example-1-pkgmap.yml csw/mgar/gar/v2-git/lib/sh/ csw/mgar/gar/v2-git/lib/sh/libcheckpkg.sh csw/mgar/gar/v2-git/tests/overrides_test.py Removed Paths: ------------- csw/mgar/gar/v2-git/lib/sh/libcheckpkg.sh Property Changed: ---------------- csw/mgar/gar/v2-git/ csw/mgar/gar/v2-git/lib/python/opencsw.py csw/mgar/gar/v2-git/pkglib/csw/depend Property changes on: csw/mgar/gar/v2-git ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678,6915-8229 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678,6915-8697 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2-git/Makefile =================================================================== --- csw/mgar/gar/v2-git/Makefile 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/Makefile 2010-02-20 11:24:28 UTC (rev 8698) @@ -1,3 +1,7 @@ + +stoptheunwary: + $(error "*** You are in the GAR directory and probably didn't mean to call make") + FILTER_DIRS = CVS/ bin/ meta/ # top-level Makefile for the entire tree. %: Copied: csw/mgar/gar/v2-git/bin/analyze_module_results.py (from rev 8697, csw/mgar/gar/v2/bin/analyze_module_results.py) =================================================================== --- csw/mgar/gar/v2-git/bin/analyze_module_results.py (rev 0) +++ csw/mgar/gar/v2-git/bin/analyze_module_results.py 2010-02-20 11:24:28 UTC (rev 8698) @@ -0,0 +1,53 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +import optparse +import os +import sys + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + +def main(): + parser = optparse.OptionParser() + parser.add_option("-e", "--extract-dir", dest="extractdir", + help="Directory with extracted packages") + options, args = parser.parse_args() + pkgnames = args + packages = [opencsw.DirectoryFormatPackage( + os.path.join(options.extractdir, pkgname)) + for pkgname in pkgnames] + overrides_list = [pkg.GetOverrides() for pkg in packages] + files = os.listdir(options.extractdir) + error_tags = [] + for file_name in files: + if file_name.startswith("tags."): + fd = open(os.path.join(options.extractdir, file_name)) + for line in fd: + if line.startswith("#"): + continue + pkgname, tag_name, tag_info = checkpkg.ParseTagLine(line) + error_tags.append(checkpkg.CheckpkgTag(pkgname, tag_name, tag_info)) + overrides = reduce(lambda x, y: x + y, overrides_list) + tags_after_overrides = checkpkg.ApplyOverrides(error_tags, overrides) + exit_code = bool(tags_after_overrides) + if tags_after_overrides: + print "There were errors reported." + print "If you know they are false positives, you can override them:" + for tag in tags_after_overrides: + if tag.tag_info: + tag_postfix = "|%s" % tag.tag_info.replace(" ", "|") + else: + tag_postfix = "" + print ("CHECKPKG_OVERRIDES_%s += %s%s" + % (tag.pkgname, tag.tag_name, tag_postfix)) + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Modified: csw/mgar/gar/v2-git/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/bin/checkpkg 2010-02-20 11:24:28 UTC (rev 8698) @@ -21,10 +21,15 @@ # you know you are tracking the most current version. # - PATH=$PATH:/usr/sbin readonly NAME_MAX_LENGTH=${NAME_MAX_LENGTH:-20} +command_basename=`basename $0` +command_basedir="${0%/${command_basename}}" +libshdir="${command_basedir}/../lib/sh" +readonly command_basename command_basedir libshdir +. "${libshdir}/libcheckpkg.sh" + LOCAL_ARCH=`uname -p` if [[ -z "${CHECKPKG_TMPDIR}" ]]; then readonly CHECKPKG_TMPDIR="/var/tmp" @@ -36,15 +41,18 @@ if [[ -t 1 ]]; then GREEN="\\033[0;32;40m" RED="\\033[1;31;40m" + BOLD="\\033[1m" COLOR_RESET="\\033[00m" else GREEN="" RED="" + BOLD="" COLOR_RESET="" fi +readonly GREEN RED BOLD COLOR_RESET readonly selfpath="$0" -readonly selfargs="$*" +readonly selfargs="$@" # always print out a warning message. (to stderr) # exit script, if quit_on_warn set @@ -122,8 +130,9 @@ shift fi if [[ "$1" == "-h" ]] ; then - print 'Usage: checkpkg [-e] pkg1 [pkg2 ....]' - print ' -e = "exit on warnings"' + print 'Usage: checkpkg [-d] [-e] pkg1 [pkg2 ....]' + print ' -d display debug messages' + print ' -e exit on warnings (soon to be obsolete)' shift fi @@ -207,12 +216,6 @@ basedir=`sed -n 's/^BASEDIR=//p' $TMPFILE` pkgarch=`sed -n 's/^ARCH=//p' $TMPFILE|head -1` -case $software in - *[A-Z]*) - errmsg "$software must be all lowercase" - ;; -esac - case `basename $f` in ${software}-${version}-*) # file name looks okay @@ -263,8 +266,12 @@ print basedir="'$basedir'" fi -if [[ ${#software} -gt ${NAME_MAX_LENGTH} ]] ; then errmsg $f: software name greater than 20 chars ; fi -if [[ ${#pkgname} -gt ${NAME_MAX_LENGTH} ]] ; then errmsg $f: pkg name greater than 20 chars; fi +if [[ ${#software} -gt ${NAME_MAX_LENGTH} ]] ; then + errmsg "$f: software name longer than ${NAME_MAX_LENGTH} chars" +fi +if [[ ${#pkgname} -gt ${NAME_MAX_LENGTH} ]] ; then + errmsg "$f: pkg name longer than ${NAME_MAX_LENGTH} chars" +fi if [ "$software" = "" ] ; then errmsg $f: software field not set properly in NAME ; fi if [ "$pkgname" = "" ] ; then errmsg $f: pkgname field blank ; fi @@ -331,38 +338,9 @@ # exit 0 #fi - -# This function exists, because pkgtrans is BROKEN!! -# It leaves a directory in /var/tmp/aaXXXXXXX, even after clean quit -# SO, emulate pkgtrans behaviour, for "pkgtrans src destdir pkgname" -# Except that we ignore pkgname arg, and just do first one we find. -# and we are a bit hacky about how we do things. -pkgtrans(){ - if [[ ! -d $2 ]] ; then - print ERROR: $2 is not a directory >/dev/fd/2 - return 1 - fi - hdrblks=`(dd if=$1 skip=1 2>/dev/null| cpio -i -t >/dev/null) 2>&1 | - nawk '{print $1; exit;}'` - - ## print initial hdrblks=$hdrblks - - hdrblks=$(($hdrblks + 1)) - mkdir $2/$3 || return 1 - - dd if=$1 skip=$hdrblks 2>/dev/null | (cd $2/$3 ; cpio -ivdm) - # on fail, SOMETIMES cpio returns 1, but sometimes it returns 0!! - if [[ ! -d $2/$3/install ]] ; then - print retrying extract with different archive offset... - # no, I cant tell in advance why/when the prev fails - hdrblks=$(($hdrblks + 1)) - dd if=$1 skip=$hdrblks 2>/dev/null| (cd $2/$3 ; cpio -ivdm) - fi -} - print "" print Extracing pkg for examination of files... -pkgtrans $f $EXTRACTDIR $pkgname +custom_pkgtrans $f $EXTRACTDIR $pkgname ############################################################# # We now have the package expanded, in "directory" form, in @@ -506,7 +484,7 @@ | sort | uniq -c | awk '{print $1}' | sort | uniq | wc -l)" if [[ "$repeated_depends" -gt 1 ]]; then cat $EXTRACTDIR/$pkgname/install/depend - errmsg "$pkgname has multiple depends" + errmsg "$pkgname lists a dependency more than once, see above" fi #to retain a record of all packages currently being examined from $@ @@ -520,8 +498,8 @@ if [[ $? -ne 0 ]]; then #if we've already looked at the package named $dep, #it'll be in the file. - awk "\$1 == \"$dep\" {print}" $SETDEPS | /usr/bin/grep $dep >/dev/null - if [[ $? -ne 0 ]]; then #we haven't yet seen this package in our set + awk "\$1 == \"$dep\" {print}" $SETDEPS | /usr/bin/grep $dep >/dev/null + if [[ $? -ne 0 ]]; then #we haven't yet seen this package in our set echo "Can't validate dependence on $dep. Storing for delayed validation." #store for validation at the end. echo "$dep $pkgname" >> $SETDEPS.missing @@ -560,71 +538,105 @@ set_variables_for_individual_package_check "$f" test_suite_ok=1 -checkpkg_scriptname=`basename $0` -checkpkg_basedir=${0%/${checkpkg_scriptname}} -plugindir=${checkpkg_basedir}/checkpkg.d +checkpkg_module_dir=${command_basedir}/checkpkg.d +checkpkg_module_tag="checkpkg-" +checkpkg_stats_basedir="${HOME}/.checkpkg/stats" # Cleaning up old *.pyc files which can cause grief. This is because of the # move of Python libraries. -for pyc_file in ${plugindir}/opencsw.pyc \ - ${plugindir}/checkpkg.pyc; do +for pyc_file in ${checkpkg_module_dir}/opencsw.pyc \ + ${checkpkg_module_dir}/checkpkg.pyc; do if [ -f "${pyc_file}" ]; then echo "Removing old pyc file: '${pyc_file}'" rm "${pyc_file}" fi done -# /var/sadm/install/contents cache update -${plugindir}/update_contents_cache.py - if [[ "${DEBUG}" != "" ]]; then extra_options="--debug" fi -debugmsg "plugindir: '$plugindir'" + +# /var/sadm/install/contents cache update +${command_basedir}/update_contents_cache.py +# Collects package stats to be later analyzed +${command_basedir}/checkpkg_collect_stats.py ${extra_options} "$@" + +debugmsg "checkpkg_module_dir: '$checkpkg_module_dir'" log_files="" -if [[ -d "$plugindir" ]]; then - echo "Running modular tests" - # echo plugin dir exists - for plugin in "${plugindir}"/checkpkg-*; do +module_name_format="%-40s" +md5sums=`gmd5sum "$@" | awk '{print $1}'` +if [[ -d "${checkpkg_module_dir}" ]]; then + echo "Running modular tests in ${checkpkg_module_dir}" + for plugin in "${checkpkg_module_dir}/${checkpkg_module_tag}"*; do if [[ -x "${plugin}" ]]; then - debugmsg "Executing: ${plugin} $extra_options -e \"${EXTRACTDIR}\" ${pkgnames}" plugin_base_name=`basename ${plugin}` plugin_log="${EXTRACTDIR}/${plugin_base_name}.log" log_files="${log_files} ${plugin_log}" - printf "TEST: ${plugin} running..." - ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} > "${plugin_log}" 2>&1 + plugin_name="`echo ${plugin} | sed -e 's+.*/checkpkg-++' | sed -e 's+\.py$++'`" + error_tag_file="tags.${plugin_name}" + printf "${BOLD}${module_name_format}${COLOR_RESET} running..." "${plugin_name}" + debugmsg "Executing: ${plugin} $extra_options -b \"${checkpkg_stats_basedir}\" -o \"${EXTRACTDIR}/${error_tag_file}\" ${md5sums}" + ${plugin} \ + $extra_options \ + -b "${checkpkg_stats_basedir}" \ + -o "${EXTRACTDIR}/${error_tag_file}" \ + ${md5sums} \ + > "${plugin_log}" 2>&1 if [[ "$?" -ne 0 ]]; then - printf "\rTEST: ${plugin} ${RED}[FAIL]${COLOR_RESET} \\n" + printf "\r${module_name_format} ${RED}[ERROR]${COLOR_RESET} \\n" "${plugin_name}" test_suite_ok=0 else - printf "\rTEST: ${plugin} ${GREEN}[OK]${COLOR_RESET} \\n" + printf "\r${module_name_format} [Done] \\n" "${plugin_name}" fi else debugmsg "'${plugin}' is not executable" fi done else - debugmsg "plugin dir does not exist" + debugmsg "module dir ${checkpkg_module_dir} does not exist" fi -echo for log_file in ${log_files}; do - if [[ -s "${log_file}" ]]; then + if [[ `gwc -c "${log_file}" | awk '{print $1}'` -gt 1 ]]; then debugmsg ">> LOG START: ${log_file}" cat "${log_file}" debugmsg "<< LOG END: ${log_file}" - else - debugmsg "-- LOG ${log_file} is empty" + else + debugmsg "-- LOG ${log_file} is empty" fi done -echo if [[ ${test_suite_ok} -ne 1 ]]; then - errmsg "One or more modular tests have failed." + errmsg "One or more modular tests have finished with an error." else - print "All modular tests were successful." + print "All modular tests completed. Analyzing the reports." fi +if [[ "${DEBUG}" != "" ]]; then + override_info_printed=0 + for tagfile in ${EXTRACTDIR}/tags.*; do + if [[ -s "${tagfile}" ]]; then + if [[ "${override_info_printed}" -ne 1 ]]; then + echo "# You can use the following lines to create overrides" + echo "# See http://wiki.opencsw.org/checkpkg" + override_info_printed=1 + fi + echo "# ${tagfile}:" + cat "${tagfile}" + fi + done +fi + +# Collecting errors and applying the overrides. +${command_basedir}/analyze_module_results.py \ + -e "${EXTRACTDIR}" \ + ${pkgnames} +if [[ "$?" -ne 0 ]]; then + errmsg "${RED}Modular checks are reporting errors.${COLOR_RESET}" +else + print "${GREEN}All modular tests were successful.${COLOR_RESET}" +fi + print "" # Cleaning up after all packages Modified: csw/mgar/gar/v2-git/bin/checkpkg.d/README =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg.d/README 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/README 2010-02-20 11:24:28 UTC (rev 8698) @@ -2,10 +2,12 @@ This directory contains modular checks. Each check is an executable file, written in any language, accepting specific command line options and returning -the result as a status exit code. +the result by writing to a text file. To see the required flags, issue: -./checkpkg-dummy.py -h +./checkpkg-you-can-write-your-own.py -h Each test's file name must begin with "checkpkg-". + +See http://wiki.opencsw.org/checkpkg for more information. Modified: csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-actionclasses.py =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-actionclasses.py 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-actionclasses.py 2010-02-20 11:24:28 UTC (rev 8698) @@ -11,6 +11,8 @@ import sys import re +CHECKPKG_MODULE_NAME = "class action scripts / prototype integrity" + # The following bit of code sets the correct path to Python libraries # distributed with GAR. path_list = [os.path.dirname(__file__), @@ -20,38 +22,52 @@ import opencsw -def CheckActionClasses(pkg): +def CheckActionClasses(pkg_data, debug): """Checks the consistency between classes in the prototype and pkginfo.""" errors = [] - pkginfo = pkg.GetParsedPkginfo() - pkgmap = pkg.GetPkgmap() + pkginfo = pkg_data["pkginfo"] + pkgmap = pkg_data["pkgmap"] pkginfo_classes = set(re.split(opencsw.WS_RE, pkginfo["CLASSES"])) - pkgmap_classes = pkgmap.GetClasses() + pkgmap_classes = set() + for entry in pkgmap: + if entry["class"]: # might be None + pkgmap_classes.add(entry["class"]) only_in_pkginfo = pkginfo_classes.difference(pkgmap_classes) only_in_pkgmap = pkgmap_classes.difference(pkginfo_classes) - for cls in only_in_pkginfo: - print "Class %s of %s is only in pkginfo" % (repr(cls), pkg.pkgname) - print "This shouldn't cause any problems, but it might be not necessary." - for cls in only_in_pkgmap: + for action_class in only_in_pkginfo: + error = checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "action-class-only-in-pkginfo", + action_class, + msg="This shouldn't cause any problems, but it might be not necessary.") + errors.append(error) + for action_class in only_in_pkgmap: errors.append( - opencsw.PackageError("Class %s is only in pkgmap" % repr(cls))) - if only_in_pkginfo or only_in_pkgmap: - print ("pkginfo_classes: %s, pkgmap classes: %s" - % (pkginfo_classes, pkgmap_classes)) + checkpkg.CheckpkgTag(pkg.pkgname, "action-class-only-in-pkgmap", action_class)) return errors def main(): options, args = checkpkg.GetOptions() - pkgnames = args - check_manager = checkpkg.CheckpkgManager( - "class action scripts / prototype integrity", - options.extractdir, - pkgnames, - options.debug) + if options.debug: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.INFO) + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + # Registering functions defined above. check_manager.RegisterIndividualCheck(CheckActionClasses) - exit_code, report = check_manager.Run() - print report.strip() + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() sys.exit(exit_code) Copied: csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-archall.py (from rev 8697, csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-archall.py) =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-archall.py (rev 0) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-archall.py 2010-02-20 11:24:28 UTC (rev 8698) @@ -0,0 +1,44 @@ +#!/opt/csw/bin/python2.6 +# +# $Id$ + +"""Verifies the architecture of the package.""" + +import os.path +import re +import sys + +CHECKPKG_MODULE_NAME = "architecture check" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import package_checks + +def main(): + options, args = checkpkg.GetOptions() + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + + check_manager.RegisterIndividualCheck( + package_checks.CheckArchitectureVsContents) + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() + +# vim:set sw=2 ts=2 sts=2 expandtab: Copied: csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-basic.py (from rev 8697, csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-basic.py) =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-basic.py (rev 0) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-basic.py 2010-02-20 11:24:28 UTC (rev 8698) @@ -0,0 +1,44 @@ +#!/opt/csw/bin/python2.6 +# $Id: checkpkg-you-can-write-your-own.py 8571 2010-02-16 09:05:51Z wahwah $ + +"""This is a dummy module. You can use it as a boilerplate for your own modules. + +Copy it and modify. +""" + +import os.path +import sys + +CHECKPKG_MODULE_NAME = "basic checks ported from Korn shell" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import package_checks + +def main(): + options, args = checkpkg.GetOptions() + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + # Registering functions defined above. + check_manager.RegisterIndividualCheck(package_checks.CatalognameLowercase) + check_manager.RegisterIndividualCheck(package_checks.FileNameSanity) + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Modified: csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-libs.py 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-libs.py 2010-02-20 11:24:28 UTC (rev 8698) @@ -1,13 +1,13 @@ #!/opt/csw/bin/python2.6 # # $Id$ -# -# A check for dependencies between shared libraries. -# -# This is currently more of a prototype than a mature program, but it has some -# unit tests and it appears to be working. The main problem is that it's not -# divided into smaller testable sections. +"""A check for dependencies between shared libraries. +This is currently more of a prototype than a mature program, but it has some +unit tests and it appears to be working. The main problem is that it's not +divided into smaller testable sections. +""" + import os import os.path import copy @@ -16,7 +16,10 @@ import logging import sys import textwrap +from Cheetah import Template +CHECKPKG_MODULE_NAME = "shared library linking consistency" + # The following bit of code sets the correct path to Python libraries # distributed with GAR. path_list = [os.path.dirname(__file__), @@ -25,79 +28,32 @@ import checkpkg import opencsw -DUMP_BIN = "/usr/ccs/bin/dump" - -def GetIsalist(): - args = ["isalist"] - isalist_proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = isalist_proc.communicate() - ret = isalist_proc.wait() - if ret: - logging.error("Calling isalist has failed.") - isalist = re.split(r"\s+", stdout.strip()) - return isalist - - -def main(): +def CheckSharedLibraryConsistency(pkgs_data, debug): + ws_re = re.compile(r"\s+") result_ok = True errors = [] - options, args = checkpkg.GetOptions() - pkgnames = args - if options.debug: - logging.basicConfig(level=logging.DEBUG) - else: - logging.basicConfig(level=logging.INFO) - checkers = [] - for pkgname in pkgnames: - checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) - checkers.append(checker) binaries = [] binaries_by_pkgname = {} sonames_by_pkgname = {} pkg_by_any_filename = {} - for checker in checkers: - pkg_binary_paths = checker.ListBinaries() - binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] - binaries_by_pkgname[checker.pkgname] = binaries_base - binaries.extend(pkg_binary_paths) - for filename in checker.GetAllFilenames(): - pkg_by_any_filename[filename] = checker.pkgname + needed_sonames_by_binary = {} + filenames_by_soname = {} + for pkg_data in pkgs_data: + binaries_base = [os.path.basename(x) for x in pkg_data["binaries"]] + pkgname = pkg_data["basic_stats"]["pkgname"] + binaries_by_pkgname[pkgname] = binaries_base + binaries.extend(pkg_data["binaries"]) + for filename in pkg_data["all_filenames"]: + pkg_by_any_filename[filename] = pkgname + for binary_data in pkg_data["binaries_dump_info"]: + binary_base_name = os.path.basename(binary_data["base_name"]) + needed_sonames_by_binary[binary_base_name] = binary_data + filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name + # Making the binaries unique binaries = set(binaries) - ws_re = re.compile(r"\s+") + isalist = pkg_data["isalist"] - # man ld.so.1 for more info on this hack - env = copy.copy(os.environ) - env["LD_NOAUXFLTR"] = "1" - needed_sonames_by_binary = {} - filenames_by_soname = {} - # Assembling a data structure with the data about binaries. - # { - # : { checkpkg.NEEDED_SONAMES: [...], - # checkpkg.RUNPATH: [...]}, - # : ..., - # ... - # } - # - for binary in binaries: - binary_base_name = binary.split("/")[-1] - args = [DUMP_BIN, "-Lv", binary] - dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) - stdout, stderr = dump_proc.communicate() - ret = dump_proc.wait() - binary_data = checkpkg.ParseDumpOutput(stdout) - needed_sonames_by_binary[binary_base_name] = binary_data - if checkpkg.SONAME not in binary_data: - logging.debug("The %s binary doesn't provide a SONAME. " - "(It might be an executable)", - binary_base_name) - # The shared library doesn't tell its SONAME. We're guessing it's the - # same as the base file name. - binary_data[checkpkg.SONAME] = binary_base_name - filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name - - isalist = GetIsalist() - # Building indexes by soname to simplify further processing # These are indexes "by soname". (needed_sonames, @@ -128,7 +84,7 @@ # same bit of code with do checking and reporting. # # TODO: Rewrite this using cheetah templates - if options.debug and needed_sonames: + if debug and needed_sonames: print "Analysis of sonames needed by the package set:" binaries_with_missing_sonames = set([]) for soname in needed_sonames: @@ -150,10 +106,13 @@ if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: print "However, it's a whitelisted soname." else: - errors.append( - checkpkg.Error("%s is required by %s, but " - "we don't know what provides it." - % (soname, binaries_by_soname[soname]))) + pass + # The error checking needs to be unified: done in one place only. + # errors.append( + # checkpkg.CheckpkgTag( + # "%s is required by %s, but " + # "we don't know what provides it." + # % (soname, binaries_by_soname[soname]))) if binaries_with_missing_sonames: print "The following are binaries with missing sonames:" binary_lines = " ".join(sorted(binaries_with_missing_sonames)) @@ -162,11 +121,10 @@ print dependent_pkgs = {} - for checker in checkers: - pkgname = checker.pkgname - dir_format_pkg = opencsw.DirectoryFormatPackage(checker.pkgpath) - declared_dependencies = dir_format_pkg.GetDependencies() - if options.debug: + for checker in pkgs_data: + pkgname = checker["basic_stats"]["pkgname"] + declared_dependencies = checker["depends"] + if debug: sanitized_pkgname = pkgname.replace("-", "_") data_file_name = "/var/tmp/checkpkg_test_data_%s.py" % sanitized_pkgname logging.warn("Saving test data to %s." % repr(data_file_name)) @@ -194,22 +152,50 @@ pkgs_by_filename, filenames_by_soname, pkg_by_any_filename) - print checker.FormatDepsReport(missing_deps, - surplus_deps, - orphan_sonames) + namespace = { + "pkgname": pkgname, + "missing_deps": missing_deps, + "surplus_deps": surplus_deps, + "orphan_sonames": orphan_sonames, + } + t = Template.Template(checkpkg.REPORT_TMPL, searchList=[namespace]) + print unicode(t) for soname in orphan_sonames: - errors.append(checkpkg.Error("The following soname does't belong to " - "any package: %s" % soname)) + errors.append( + checkpkg.CheckpkgTag( + pkgname, + "orphan-soname", + soname)) + for missing_dep in missing_deps: + errors.append( + checkpkg.CheckpkgTag( + pkgname, + "missing-dependency", + missing_dep)) + return errors - if errors: - for error in errors: - logging.error(error) - sys.exit(1) - else: - sys.exit(0) +def main(): + options, args = checkpkg.GetOptions() + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + check_manager.RegisterSetCheck(CheckSharedLibraryConsistency) + + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + if __name__ == '__main__': main() Copied: csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-license.py (from rev 8697, csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-license.py) =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-license.py (rev 0) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-license.py 2010-02-20 11:24:28 UTC (rev 8698) @@ -0,0 +1,59 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""Checks for the existence of the license file.""" + +import logging +import os.path +import sys + +CHECKPKG_MODULE_NAME = "license presence" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + +LICENSE_TMPL = "/opt/csw/share/doc/%s/license" + +def CheckLicenseFile(pkg_data, debug): + """Checks for the presence of the license file.""" + errors = [] + pkgmap = pkg_data["pkgmap"] + catalogname = pkg_data["basic_stats"]["catalogname"] + license_path = LICENSE_TMPL % catalogname + pkgmap_paths = [x["path"] for x in pkgmap] + if license_path not in pkgmap_paths: + errors.append( + checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "license-missing", + msg="See http://sourceforge.net/apps/trac/gar/wiki/CopyRight")) + return errors + + +def main(): + options, args = checkpkg.GetOptions() + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + # Registering functions defined above. + check_manager.RegisterIndividualCheck(CheckLicenseFile) + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Copied: csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-missing-symbols.py (from rev 8697, csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py) =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-missing-symbols.py (rev 0) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-missing-symbols.py 2010-02-20 11:24:28 UTC (rev 8698) @@ -0,0 +1,65 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""Check for missing symbols in binaries. + +http://sourceforge.net/tracker/?func=detail&aid=2939416&group_id=229205&atid=1075770 +""" + +import os.path +import re +import sys +import subprocess + +CHECKPKG_MODULE_NAME = "missing symbols" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg + +# Defining checking functions. + +def CheckForMissingSymbols(pkg_data, debug): + """Looks for "symbol not found" in ldd -r output.""" + errors = [] + binaries = pkg_data["binaries"] + symbol_re = re.compile(r"symbol not found:") + for binary in binaries: + lines = pkg_data["ldd_dash_r"][binary] + missing_symbols = False + for line in lines: + if re.search(symbol_re, line): + missing_symbols = True + binary_base = os.path.basename(binary) + if missing_symbols: + errors.append(checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "symbol-not-found", binary_base)) + return errors + + +def main(): + options, args = checkpkg.GetOptions() + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + # Registering functions defined above. + check_manager.RegisterIndividualCheck(CheckForMissingSymbols) + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Modified: csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-02-20 11:24:28 UTC (rev 8698) @@ -8,6 +8,8 @@ import os.path import sys +CHECKPKG_MODULE_NAME = "obsolete dependencies" + # The following bit of code sets the correct path to Python libraries # distributed with GAR. path_list = [os.path.dirname(__file__), @@ -26,36 +28,45 @@ }, } -def CheckObsoleteDeps(pkg): +def CheckObsoleteDeps(pkg_data, debug): """Checks for obsolete dependencies.""" errors = [] - deps = set(pkg.GetDependencies()) + deps = set(pkg_data["depends"]) obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) if obsolete_pkg_deps: for obsolete_pkg in obsolete_pkg_deps: - errors.append( - checkpkg.PackageError( - "Package %s should not depend on %s." - % (pkg.pkgname, obsolete_pkg))) + msg = "" if "hint" in OBSOLETE_DEPS[obsolete_pkg]: - errors.append( - checkpkg.PackageError("Hint: %s" % OBSOLETE_DEPS[obsolete_pkg]["hint"])) + msg += "Hint: %s" % OBSOLETE_DEPS[obsolete_pkg]["hint"] if "url" in OBSOLETE_DEPS[obsolete_pkg]: - errors.append( - checkpkg.PackageError("URL: %s" % OBSOLETE_DEPS[obsolete_pkg]["url"])) + if msg: + msg += ", " + msg += "URL: %s" % OBSOLETE_DEPS[obsolete_pkg]["url"] + if not msg: + msg = None + errors.append( + checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "obsolete-dependency", obsolete_pkg, msg=msg)) return errors def main(): options, args = checkpkg.GetOptions() - pkgnames = args - check_manager = checkpkg.CheckpkgManager("obsolete dependencies", - options.extractdir, - pkgnames, + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, options.debug) check_manager.RegisterIndividualCheck(CheckObsoleteDeps) - exit_code, report = check_manager.Run() - print report.strip() + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() sys.exit(exit_code) Modified: csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-you-can-write-your-own.py =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-02-20 11:24:28 UTC (rev 8698) @@ -9,6 +9,8 @@ import os.path import sys +CHECKPKG_MODULE_NAME = "a template of a checkpkg module" + # The following bit of code sets the correct path to Python libraries # distributed with GAR. path_list = [os.path.dirname(__file__), @@ -16,16 +18,19 @@ sys.path.append(os.path.join(*path_list)) import checkpkg -# Defining checking functions. +# Defining the checking functions. They come in two flavors: individual +# package checks and set checks. -def MyCheckForAsinglePackage(pkg): +def MyCheckForAsinglePackage(pkg_data, debug): """Checks an individual package. Gets a DirctoryFormatPackage as an argument, and returns a list of errors. - Errors should be a list of checkpkg.PackageError objects: + Errors should be a list of checkpkg.CheckpkgTag objects: + errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "tag-name")) - errors.append(checkpkg.PackageError("There's something wrong.")) + You can also add a parameter: + errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "tag-name", "/opt/csw/bin/problem")) """ errors = [] # Checking code for an individual package goes here. See the @@ -35,11 +40,13 @@ # Here's how to report an error: something_is_wrong = False if something_is_wrong: - errors.append(checkpkg.PackageError("There's something wrong.")) + errors.append(checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "example-problem", "thing")) return errors -def MyCheckForAsetOfPackages(pkgs): +def MyCheckForAsetOfPackages(pkgs_data, debug): """Checks a set of packages. Sometimes individual checks aren't enough. If you need to write code which @@ -54,19 +61,22 @@ def main(): options, args = checkpkg.GetOptions() - pkgnames = args + md5sums = args # CheckpkgManager class abstracts away things such as the collection of # results. - check_manager = checkpkg.CheckpkgManager("a template of a checkpkg module", - options.extractdir, - pkgnames, + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, options.debug) # Registering functions defined above. check_manager.RegisterIndividualCheck(MyCheckForAsinglePackage) check_manager.RegisterSetCheck(MyCheckForAsetOfPackages) # Running the checks, reporting and exiting. - exit_code, report = check_manager.Run() - print report.strip() + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() sys.exit(exit_code) Copied: csw/mgar/gar/v2-git/bin/checkpkg_collect_stats.py (from rev 8697, csw/mgar/gar/v2/bin/checkpkg_collect_stats.py) =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg_collect_stats.py (rev 0) +++ csw/mgar/gar/v2-git/bin/checkpkg_collect_stats.py 2010-02-20 11:24:28 UTC (rev 8698) @@ -0,0 +1,42 @@ +#!/opt/csw/bin/python2.6 +# +# $Id$ +# +# Collects statistics about a package and saves to a directory, for later use +# by checkpkg modules. + +import logging +import optparse +import os +import os.path +import subprocess +import sys + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + + +def main(): + parser = optparse.OptionParser() + parser.add_option("-d", "--debug", dest="debug", + default=False, action="store_true", + help="Turn on debugging messages") + options, args = parser.parse_args() + if options.debug: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.INFO) + logging.info("Collecting statistics about given package files.") + logging.debug("calling: %s, please be patient", args) + packages = [opencsw.CswSrv4File(x, options.debug) for x in args] + stats_list = [checkpkg.PackageStats(pkg) for pkg in packages] + for pkg_stats in stats_list: + pkg_stats.CollectStats() + +if __name__ == '__main__': + main() Copied: csw/mgar/gar/v2-git/bin/checkpkg_collect_stats_test.py (from rev 8697, csw/mgar/gar/v2/bin/checkpkg_collect_stats_test.py) =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg_collect_stats_test.py (rev 0) +++ csw/mgar/gar/v2-git/bin/checkpkg_collect_stats_test.py 2010-02-20 11:24:28 UTC (rev 8698) @@ -0,0 +1,34 @@ +#!/opt/csw/bin/python2.6 + +import os +import sys +import unittest +import mox +import checkpkg_collect_stats as ccs + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + + +class PackageStatsUnitTest(unittest.TestCase): + + def setUp(self): + self.mocker = mox.Mox() + + def testGetStatsPath(self): + mock_pkg = self.mocker.CreateMock(opencsw.CswSrv4File) + mock_pkg.GetMd5sum().AndReturn("abcdef") + self.mocker.ReplayAll() + sc = ccs.PackageStats(mock_pkg) + expected = "/home/joe/.checkpkg/stats/ab/abcdef" + self.assertEqual(expected, sc.GetStatsPath("/home/joe")) + self.mocker.VerifyAll() + + +if __name__ == '__main__': + unittest.main() Copied: csw/mgar/gar/v2-git/bin/custom-pkgtrans (from rev 8697, csw/mgar/gar/v2/bin/custom-pkgtrans) =================================================================== --- csw/mgar/gar/v2-git/bin/custom-pkgtrans (rev 0) +++ csw/mgar/gar/v2-git/bin/custom-pkgtrans 2010-02-20 11:24:28 UTC (rev 8698) @@ -0,0 +1,22 @@ +#!/bin/ksh -p +# +# $Id$ +# +# This file exists in order to avoid implementing pipelines in Python. It +# could be integrated into the package stats collection program. + +command_basename=`basename $0` +command_basedir="${0%/${command_basename}}" +libshdir="${command_basedir}/../lib/sh" +readonly command_basename command_basedir libshdir +. "${libshdir}/libcheckpkg.sh" + +if [[ -z "$1" || -z "$2" || -z "$3" ]]; then + print >&2 "usage: $0 " + exit 1 +fi +if [[ "$3" == "all" ]]; then + print >&2 "This script can't handle 'all' as the third argument" + exit 1 +fi +custom_pkgtrans "$1" "$2" "$3" Modified: csw/mgar/gar/v2-git/bin/fixlibtool =================================================================== --- csw/mgar/gar/v2-git/bin/fixlibtool 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/bin/fixlibtool 2010-02-20 11:24:28 UTC (rev 8698) @@ -21,7 +21,6 @@ # @$(MAKECOOKIE) # #################################################### - umask 0022 PATH=/opt/csw/bin @@ -34,7 +33,8 @@ ## Fix Makefiles for mk in $(gfind ${BASEPATH} -name Makefile -print); do gcp ${mk} ${mk}.orig - LT_FILES=$(for lib in $(ggrep '/opt/csw.*/lib/.*\.la' ${mk}); do \ + LT_FILES=$(for lib in $(gegrep -v '^#|^$' ${mk} | \ + ggrep '/opt/csw.*/lib/.*\.la'); do \ echo $lib |gsed -ne '/\/opt.*\.la/p'; done) for file in ${LT_FILES}; do LIB_NAME=$(ggrep 'dlname=' ${file} | \ @@ -44,7 +44,7 @@ fixpath=$(gecho $file |gsed 's/\//\\\//g') gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >${mk}.new LIB_DIR=$(ggrep 'libdir=' ${file} | gsed -e "s/.*'\(.*\)'/\1/") - gsed "s,\(LDFLAGS =.*\),\1 -R${LIB_DIR} -L${LIB_DIR}," ${mk}.new >${mk} + perl -pe 's,(LDFLAGS =[^\\]*)(\\)?\n,$1 -R'${LIB_DIR}' -L'${LIB_DIR}' $2\n,' ${mk}.new >${mk} gchmod +x ${mk} done done Copied: csw/mgar/gar/v2-git/bin/submitpkg (from rev 8697, csw/mgar/gar/v2/bin/submitpkg) =================================================================== --- csw/mgar/gar/v2-git/bin/submitpkg (rev 0) +++ csw/mgar/gar/v2-git/bin/submitpkg 2010-02-20 11:24:28 UTC (rev 8698) @@ -0,0 +1 @@ +link ../lib/python/submit_to_newpkgs.py \ No newline at end of file Modified: csw/mgar/gar/v2-git/bin/update-commondirs =================================================================== --- csw/mgar/gar/v2-git/bin/update-commondirs 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/bin/update-commondirs 2010-02-20 11:24:28 UTC (rev 8698) @@ -29,7 +29,10 @@ print ($l[3] =~ /([^=]*)/); print "\n"; } - ' $TMPDIR/CSWcommon/pkgmap; echo "/var"; echo "/var/run") > ../etc/commondirs-$1 + ' $TMPDIR/CSWcommon/pkgmap + echo "/var"; echo "/var/run" + echo "/usr"; echo "/usr/sadm"; echo "/usr/sadm/install"; echo "/usr/sadm/install/scripts" + ) > ../etc/commondirs-$1 rm -rf $TMPDIR } Copied: csw/mgar/gar/v2-git/bin/update_contents_cache.py (from rev 8697, csw/mgar/gar/v2/bin/update_contents_cache.py) =================================================================== --- csw/mgar/gar/v2-git/bin/update_contents_cache.py (rev 0) +++ csw/mgar/gar/v2-git/bin/update_contents_cache.py 2010-02-20 11:24:28 UTC (rev 8698) @@ -0,0 +1,27 @@ +#!/opt/csw/bin/python2.6 +# +# $Id$ +# +# This file only creates an instance of SystemPkgmap in order to update the +# package cache (if necessary), and display the information about the update. + +import os +import os.path +import sys +import logging + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg + +def main(): + print "Checking if the package cache is up to date." + logging.basicConfig(level=logging.INFO) + test_pkgmap = checkpkg.SystemPkgmap() + + +if __name__ == '__main__': + main() Modified: csw/mgar/gar/v2-git/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2-git/categories/cpan/category.mk 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/categories/cpan/category.mk 2010-02-20 11:24:28 UTC (rev 8698) @@ -62,10 +62,11 @@ INSTALL_ENV += PERL5LIB=$(PERL5LIB) # Configure a target using Makefile.PL +_CATEGORY_LD_OPTIONS ?= -L$(libdir) -lperl PERL_CONFIGURE_ARGS ?= INSTALLDIRS=vendor $(EXTRA_PERL_CONFIGURE_ARGS) configure-%/Makefile.PL: @echo " ==> Running Makefile.PL in $*" - @( cd $* ; \ + ( cd $* ; \ $(CONFIGURE_ENV) perl Makefile.PL \ $(CONFIGURE_ARGS) $(PERL_CONFIGURE_ARGS) ) @$(MAKECOOKIE) @@ -73,14 +74,14 @@ PERLBUILD_CONFIGURE_ARGS ?= installdirs=vendor $(EXTRA_PERLBUILD_CONFIGURE_ARGS) configure-%/Build.PL: @echo " ==> Running Build.PL in $*" - @( cd $* ; \ + ( cd $* ; \ $(CONFIGURE_ENV) perl Build.PL \ $(PERLBUILD_CONFIGURE_ARGS) $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) build-%/Build: @echo " ==> Running Build in $*" - @( cd $* ; $(BUILD_ENV) ./Build ) + ( cd $* ; $(BUILD_ENV) ./Build ) @$(MAKECOOKIE) test-%/Build: Modified: csw/mgar/gar/v2-git/categories/x11/category.mk =================================================================== --- csw/mgar/gar/v2-git/categories/x11/category.mk 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/categories/x11/category.mk 2010-02-20 11:24:28 UTC (rev 8698) @@ -1,7 +1,7 @@ # X11 # Version of X11 -X11_RELEASE_VERSION = X11R7.4 +X11_RELEASE_VERSION = X11R7.5 # Definition of the URL to access sources X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/$(X11_RELEASE_VERSION)/src/proto/ Modified: csw/mgar/gar/v2-git/etc/commondirs-i386 =================================================================== --- csw/mgar/gar/v2-git/etc/commondirs-i386 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/etc/commondirs-i386 2010-02-20 11:24:28 UTC (rev 8698) @@ -156,3 +156,7 @@ /var/opt/csw/pkg-hooks /var /var/run +/usr +/usr/sadm +/usr/sadm/install +/usr/sadm/install/scripts Modified: csw/mgar/gar/v2-git/etc/commondirs-sparc =================================================================== --- csw/mgar/gar/v2-git/etc/commondirs-sparc 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/etc/commondirs-sparc 2010-02-20 11:24:28 UTC (rev 8698) @@ -160,3 +160,7 @@ /var/opt/csw/pkg-hooks /var /var/run +/usr +/usr/sadm +/usr/sadm/install +/usr/sadm/install/scripts Modified: csw/mgar/gar/v2-git/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-git/gar.conf.mk 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/gar.conf.mk 2010-02-20 11:24:28 UTC (rev 8698) @@ -179,6 +179,7 @@ DEF_BASE_PKGS += CSWgsed DEF_BASE_PKGS += CSWgtar DEF_BASE_PKGS += CSWpy-cheetah +DEF_BASE_PKGS += CSWpy-yaml DEF_BASE_PKGS += CSWpython DEF_BASE_PKGS += CSWtextutils DEF_BASE_PKGS += CSWwget @@ -497,10 +498,10 @@ # may not be a subdirectory for the 32-bit standard case (this would normally # be a symlink of the form lib/sparcv8 -> . and lib/i386 -> .). This is most likely # the case for libraries in $(EXTRA_LIB) for which no links generated in CSWcommon. -RUNPATH_DIRS ?= $(libpath_install) $(filter-out $(libpath_install),$(libdir_install)) $(EXTRA_LIB) $(EXTRA_RUNPATH_DIRS) +RUNPATH_DIRS ?= $(EXTRA_RUNPATH_DIRS) $(EXTRA_LIB) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install) ifndef NOISALIST -RUNPATH_ISALIST ?= $(libpath_install) $(filter-out $(libpath_install),$(libdir_install)) $(EXTRA_LIB) $(EXTRA_RUNPATH_ISALIST) +RUNPATH_ISALIST ?= $(EXTRA_RUNPATH_DIRS) $(EXTRA_LIB) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install) endif # Iterate over all directories in RUNPATH_DIRS, prefix each directory with one @@ -508,7 +509,7 @@ RUNPATH_LINKER_FLAGS ?= $(foreach D,$(RUNPATH_DIRS),$(addprefix -R,$(addsuffix /\$$ISALIST,$(filter $D,$(RUNPATH_ISALIST))) $(abspath $D/$(MM_LIBDIR)))) $(addprefix -R,$(filter-out $(RUNPATH_DIRS),$(RUNPATH_ISALIST))) $(EXTRA_RUNPATH_LINKER_FLAGS) endif -LINKER_FLAGS ?= $(foreach ELIB,$(libpath_install) $(filter-out $(libpath_install),$(libdir_install)) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) +LINKER_FLAGS ?= $(foreach ELIB,$(EXTRA_LIB) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) @@ -525,7 +526,7 @@ SOS11_LD_OPTIONS = $(EXTRA_SOS11_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) SOS12_LD_OPTIONS = $(EXTRA_SOS12_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) -LD_OPTIONS ?= $(strip $($(GARCOMPILER)_LD_OPTIONS) $(RUNPATH_LINKER_FLAGS) $(EXTRA_LD_OPTIONS)) +LD_OPTIONS ?= $(strip $($(GARCOMPILER)_LD_OPTIONS) $(RUNPATH_LINKER_FLAGS) $(EXTRA_LD_OPTIONS) $(_CATEGORY_LD_OPTIONS)) # 1. Make sure everything works fine for SOS12 # 2. Allow us to use programs we just built. This is a bit complicated, Modified: csw/mgar/gar/v2-git/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-git/gar.lib.mk 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/gar.lib.mk 2010-02-20 11:24:28 UTC (rev 8698) @@ -196,6 +196,8 @@ # echo ""; \ # echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ # echo ""; \ +# echo "Questions, problem report or help should be sent to mailto:maintainers at lists.opencsw.org"; \ +# echo ""; \ # echo "--"; \ # echo "Kindest regards"; \ # echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ @@ -222,6 +224,8 @@ echo " $(UPSTREAM_MASTER_SITES)"; \ echo ""; \ echo "Please consider updating your package." ; \ + echo ""; \ + echo "Questions, problem report or help should be sent to mailto:maintainers at lists.opencsw.org"; \ echo ""; \ echo "--"; \ echo "Kindest regards"; \ Modified: csw/mgar/gar/v2-git/gar.mk =================================================================== --- csw/mgar/gar/v2-git/gar.mk 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/gar.mk 2010-02-20 11:24:28 UTC (rev 8698) @@ -295,7 +295,7 @@ @echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]" # prerequisite - Make sure that the system is in a sane state for building the package -PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) +PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS) $(DEP_PKGS) $(foreach S,$(_PKG_SPECS),$(DEP_PKGS_$S))) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS)) # Force to be called in global modulation prerequisite: $(if $(filter global,$(MODULATION)),announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite) @@ -650,24 +650,10 @@ # These directories get relocated into their ISA subdirectories MERGE_DIRS ?= $(MERGE_DIRS_$(MODULATION)) -# The files in ISAEXEC get relocated and will be replaced by the isaexec-wrapper -_ISAEXEC_EXCLUDE_FILES = $(bindir)/%-config $(bindir)/%/%-config -_ISAEXEC_FILES = $(filter-out $(foreach F,$(_ISAEXEC_EXCLUDE_FILES) $(ISAEXEC_EXCLUDE_FILES),$(PKGROOT)$(F)), \ - $(wildcard $(foreach D,$(ISAEXEC_DIRS),$(PKGROOT)$(D)/* )) \ - ) -ISAEXEC_FILES ?= $(if $(_ISAEXEC_FILES),$(patsubst $(PKGROOT)%,%, \ - $(shell for F in $(_ISAEXEC_FILES); do \ - if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi; \ - done)),) - ifneq ($(COMMON_PKG_DEPENDS),) _EXTRA_GAR_PKGS += $(COMMON_PKG_DEPENDS) endif -ifneq ($(ISAEXEC_FILES),) -_EXTRA_GAR_PKGS += CSWisaexec -endif - # These merge-rules are actually processed for the current modulation MERGE_TARGETS ?= $(addprefix merge-,$(MERGE_SCRIPTS_$(MODULATION))) $(EXTRA_MERGE_TARGETS) @@ -749,7 +735,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license merge-classutils $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge +merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge @$(DONADA) merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential) @@ -825,7 +811,7 @@ .PHONY: remerge reset-merge reset-merge-modulated remerge: reset-merge merge -reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-src +reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-alternatives reset-merge-src @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge @rm -rf $(PKGROOT) @$(DONADA) Modified: csw/mgar/gar/v2-git/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-git/gar.pkg.mk 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/gar.pkg.mk 2010-02-20 11:24:28 UTC (rev 8698) @@ -32,10 +32,12 @@ ifeq ($(origin PACKAGES), undefined) PACKAGES = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(GARNAME)) +CATALOGNAME = $(if $(filter %.gspec,$(DISTFILES)),,$(GARNAME)) SRCPACKAGE_BASE = $(firstword $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES)) SRCPACKAGE ?= $(SRCPACKAGE_BASE)-src SPKG_SPECS ?= $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE)) else +CATALOGNAME ?= $(if $(filter-out $(firstword $(PACKAGES)),$(PACKAGES)),,$(patsubst CSW%,%,$(PACKAGES))) SRCPACKAGE_BASE = $(firstword $(PACKAGES)) SRCPACKAGE ?= $(SRCPACKAGE_BASE)-src SPKG_SPECS ?= $(sort $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE))) @@ -67,6 +69,13 @@ GARPKG_v2 = CSWgar-v2 RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) +# Sanity checks for r8335 +$(if $(NO_ISAEXEC),$(error The deprecated variable 'NO_ISAEXEC' is defined, please replace it with NOISAEXEC)) +$(if $(PREREQUISITE_PKGS),$(error The deprecated variable 'PREREQUISITE_PKGS' is defined, please replace it with BUILD_DEP_PKGS)) +$(foreach P,$(SPKG_SPECS),$(if $(PREREQUISITE_PKGS_$P),$(error The deprecated variable 'PREREQUISITE_PKGS_$P' is defined, please replace it with BUILD_DEP_PKGS_$P))) +$(if $(REQUIRED_PKGS),$(error The deprecated variable 'REQUIRED_PKGS' is defined, please replace it with RUNTIME_DEP_PKGS)) +$(foreach P,$(SPKG_SPECS),$(if $(REQUIRED_PKGS_$P),$(error The deprecated variable 'REQUIRED_PACKAGES_$P' is defined, please replace it with RUNTIME_DEP_PKGS_$P))) + _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) # pkgname - Get the name of a package from a gspec-name or package-name @@ -205,6 +214,7 @@ _CSWCLASSES += cswinetd _CSWCLASSES += cswinitsmf _CSWCLASSES += cswtexinfo +_CSWCLASSES += cswpostmsg # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. @@ -344,7 +354,7 @@ _PROTOTYPE_MODIFIERS = | perl -ane '\ $(foreach M,$(PROTOTYPE_MODIFIERS),\ - $(if $(PROTOTYPE_FILES_$M),if( $$F[2] =~ m(^$(PROTOTYPE_FILES_$M)$$) ) {)\ + $(if $(PROTOTYPE_FILES_$M),if( $$F[2] =~ m(^$(shell echo $(PROTOTYPE_FILES_$M) | /usr/bin/tr " " "|")$$) ) {)\ $(if $(PROTOTYPE_FTYPE_$M),$$F[0] = "$(PROTOTYPE_FTYPE_$M)";)\ $(if $(PROTOTYPE_CLASS_$M),$$F[1] = "$(PROTOTYPE_CLASS_$M)";)\ $(if $(PROTOTYPE_PERMS_$M),$$F[3] = "$(PROTOTYPE_PERMS_$M)";)\ @@ -352,6 +362,8 @@ $(if $(PROTOTYPE_GROUP_$M),$$F[5] = "$(PROTOTYPE_GROUP_$M)";)\ $(if $(PROTOTYPE_FILES_$M),})\ )\ + $(foreach F,$(POSTMSG),$$F[1] = "cswpostmsg" if( $$F[2] eq "$F" );)\ + $$F[1] = "cswalternatives" if( $$F[2] =~ m,^/opt/csw/share/alternatives/[^/]+$$, );\ print join(" ", at F),"\n";' @@ -382,8 +394,18 @@ -n "$(_PKGFILES_EXCLUDE)" -o \ -n "$(ISAEXEC_FILES_$*)" -o \ -n "$(ISAEXEC_FILES)" ]; then \ - (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license -I /etc/opt/csw/pkg/$*/cswmigrateconf) \ - $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license -X /etc/opt/csw/pkg/$S/cswmigrateconf) \ + (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),\ + -I $(call licensedir,$*)/license \ + -I /etc/opt/csw/pkg/$*/cswmigrateconf \ + -I /opt/csw/share/alternatives/$(call catalogname,$*) \ + -I /opt/csw/share/checkpkg/overrides/$(call catalogname,$*) \ + )\ + $(foreach S,$(filter-out $*,$(SPKG_SPECS)),\ + -X $(call licensedir,$S)/license \ + -X /etc/opt/csw/pkg/$S/cswmigrateconf \ + -X /opt/csw/share/alternatives/$(call catalogname,$S) \ + -X /opt/csw/share/checkpkg/overrides/$(call catalogname,$S) \ + ) \ $(foreach I,$(EXTRA_PKGFILES_INCLUDED) $(EXTRA_PKGFILES_INCLUDED_$*),-i '$I') \ $(foreach X,$(EXTRA_PKGFILES_EXCLUDED) $(EXTRA_PKGFILES_EXCLUDED_$*),-x '$X') \ $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \ @@ -422,14 +444,15 @@ # The dependencies to CSWcswclassutils and CSWtexinfo are only added if there are files # actually matching the _TEXINFO_FILTER. This is done at the prototype-level. $(WORKDIR)/%.depend: $(WORKDIR)/$*.prototype +$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswalternatives")')),CSWalternatives) $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$F[1] eq "$C");)')),CSWcswclassutils) $(WORKDIR)/%.depend: $(WORKDIR) - $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(RUNTIME_DEP_PKGS_$*)$(RUNTIME_DEP_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ + $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(RUNTIME_DEP_PKGS_$*)$(RUNTIME_DEP_PKGS)$(DEP_PKGS)$(DEP_PKGS_$*)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ ($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\ echo "I $(PKG)";\ )\ - $(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(RUNTIME_DEP_PKGS_$*) $(RUNTIME_DEP_PKGS),\ + $(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(or $(RUNTIME_DEP_PKGS_$*),$(RUNTIME_DEP_PKGS),$(DEP_PKGS_$*),$(DEP_PKGS)),\ $(if $(SPKG_DESC_$(PKG)), \ echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | $(GAWK) '{ $$1 = "P"; print } ')"; \ @@ -527,6 +550,7 @@ # The texinfo filter has been taken out of the normal filters as TEXINFO has a default. $(WORKDIR)/%.pkginfo: $(WORKDIR)/%.prototype +$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswalternatives")')),cswalternatives) $(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(shell cat $(WORKDIR)/$*.prototype | perl -e 'while(<>){@F=split;$$c{$$F[1]}++};$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$c{$C});)') $(WORKDIR)/%.pkginfo: $(WORKDIR) @@ -540,8 +564,9 @@ echo "PSTAMP=$(LOGNAME)@$(shell hostname)-$(shell date '+%Y%m%d%H%M%S')"; \ echo "CLASSES=$(call pkgvar,SPKG_CLASSES,$*)"; \ echo "HOTLINE=http://www.opencsw.org/bugtrack/"; \ + echo "OPENCSW_CATALOGNAME=$(call catalogname,$*)"; \ + echo "OPENCSW_MODE64=$(call mode64,$*)"; \ echo "OPENCSW_REPOSITORY=$(call _URL)@$(call _REVISION)"; \ - echo "OPENCSW_MODE64=$(call mode64,$*)"; \ ) >$@ @@ -600,8 +625,8 @@ @echo "X: $(MIGRATE_FILES_$*) Y: $(MIGRATE_FILES)" $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* $(_DBG)(echo "MIGRATE_FILES=\"$(or $(MIGRATE_FILES_$*),$(MIGRATE_FILES))\"";\ - $(if $(MIGRATE_SOURCE_DIR_$*),echo "SOURCE_DIR___default__=\"$(MIGRATE_SOURCE_DIR_$*)\"";)\ - $(if $(MIGRATE_DEST_DIR_$*),echo "DEST_DIR___default__=\"$(MIGRATE_DEST_DIR_$*)\"";)\ + $(if $(or $(MIGRATE_SOURCE_DIR_$*),$(MIGRATE_SOURCE_DIR)),echo "SOURCE_DIR___default__=\"$(or $(MIGRATE_SOURCE_DIR_$*),$(MIGRATE_SOURCE_DIR))\"";)\ + $(if $(or $(MIGRATE_DEST_DIR_$*),$(MIGRATE_DEST_DIR)),echo "DEST_DIR___default__=\"$(or $(MIGRATE_DEST_DIR_$*),$(MIGRATE_DEST_DIR))\"";)\ $(foreach F,$(or $(MIGRATE_FILES_$*),$(MIGRATE_FILES)),\ $(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst .,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\ $(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst .,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\ @@ -649,6 +674,31 @@ reset-merge-etcservices: @rm -f $(COOKIEDIR)/merge-etcservices $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-etcservices-$(SPEC)) +merge-checkpkgoverrides-%: + @echo "[ Generating checkpkg override for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/checkpkg/overrides + $(_DBG)($(foreach O,$(or $(CHECKPKG_OVERRIDES_$*),$(CHECKPKG_OVERRIDES)),echo "$O";)) | \ + perl -F'\|' -ane 'unshift @F,"$*"; $$F[0].=":"; print join(" ", at F );' \ + > $(PKGROOT)/opt/csw/share/checkpkg/overrides/$(call catalogname,$*) + @$(MAKECOOKIE) + +merge-checkpkgoverrides: $(foreach S,$(SPKG_SPECS),$(if $(or $(CHECKPKG_OVERRIDES_$S),$(CHECKPKG_OVERRIDES)),merge-checkpkgoverrides-$S)) + +reset-merge-checkpkgoverrides: + @rm -f $(COOKIEDIR)/merge-checkpkgoverrides $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-checkpkgoverrides-$(SPEC)) + +merge-alternatives-%: + @echo "[ Generating alternatives for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/alternatives + $(_DBG)($(foreach A,$(or $(ALTERNATIVES_$*),$(ALTERNATIVES)),echo "$(ALTERNATIVE_$A)";)) \ + > $(PKGROOT)/opt/csw/share/alternatives/$(call catalogname,$*) + @$(MAKECOOKIE) + +merge-alternatives: $(foreach S,$(SPKG_SPECS),$(if $(or $(ALTERNATIVES_$S),$(ALTERNATIVES)),merge-alternatives-$S)) + +reset-merge-alternatives: + @rm -f $(COOKIEDIR)/merge-alternatives $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-alternatives-$(SPEC)) + merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE)) merge-src: fetch $(_DBG)mkdir -p $(_SRCDIR)/files @@ -694,7 +744,22 @@ # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. ENABLE_CHECK ?= 1 -_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package $(if $(ENABLE_CHECK),pkgcheck) + +# The files in ISAEXEC get relocated and will be replaced by the isaexec-wrapper. +# The trick is to delay the calculcation of the variable values until that time +# when PKGROOT has already been populated. +_ISAEXEC_EXCLUDE_FILES = $(bindir)/%-config $(bindir)/%/%-config +_buildpackage: _ISAEXEC_FILES=$(filter-out $(foreach F,$(_ISAEXEC_EXCLUDE_FILES) $(ISAEXEC_EXCLUDE_FILES),$(PKGROOT)$(F)), \ + $(wildcard $(foreach D,$(ISAEXEC_DIRS),$(PKGROOT)$(D)/* )) \ + ) +_buildpackage: ISAEXEC_FILES ?= $(if $(_ISAEXEC_FILES),$(patsubst $(PKGROOT)%,%, \ + $(shell for F in $(_ISAEXEC_FILES); do \ + if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi; \ + done)),) +_buildpackage: _EXTRA_GAR_PKGS += $(if $(ISAEXEC_FILES),CSWisaexec) +_buildpackage: pre-package $(PACKAGE_TARGETS) post-package $(if $(ENABLE_CHECK),pkgcheck) + +_package: validateplatform extract-global merge $(SPKG_DESTDIRS) _buildpackage @$(MAKECOOKIE) package: _package @@ -770,8 +835,9 @@ # This rule automatically logs into every host where a package for this software should # be built. It is especially suited for automated build bots. +platforms: _PACKAGING_PLATFORMS=$(if $(ARCHALL),$(firstword $(PACKAGING_PLATFORMS)),$(PACKAGING_PLATFORMS)) platforms: - $(foreach P,$(PACKAGING_PLATFORMS),\ + $(foreach P,$(_PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ $(MAKE) PLATFORM=$P _package && ,\ @@ -783,8 +849,9 @@ @echo @echo "The following packages have been built during this invocation:" @echo - @$(foreach P,$(PACKAGING_PLATFORMS),\ + @$(foreach P,$(_PACKAGING_PLATFORMS),\ echo "* Platform $P\c";\ + $(if $(ARCHALL),echo " (suitable for all architectures)\c";) \ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ echo " (built on this host)";\ $(MAKE) -s PLATFORM=$P _pkgshow;echo;,\ @@ -794,11 +861,12 @@ ) @$(MAKECOOKIE) +platforms-%: _PACKAGING_PLATFORMS=$(if $(ARCHALL),$(firstword $(PACKAGING_PLATFORMS)),$(PACKAGING_PLATFORMS)) platforms-%: - $(foreach P,$(PACKAGING_PLATFORMS),\ + $(foreach P,$(_PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) PLATFORM=$P $* && ,\ + $(MAKE) -s PLATFORM=$P $* && ,\ $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) PLATFORM=$P $*" && \ ),\ $(error *** No host has been defined for platform $P)\ Modified: csw/mgar/gar/v2-git/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2-git/lib/python/checkpkg.py 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/lib/python/checkpkg.py 2010-02-20 11:24:28 UTC (rev 8698) @@ -3,6 +3,9 @@ # This is the checkpkg library, common for all checkpkg tests written in # Python. +import copy +import cPickle +import errno import itertools import logging import optparse @@ -12,6 +15,7 @@ import socket import sqlite3 import subprocess +import yaml from Cheetah import Template import opencsw @@ -22,26 +26,30 @@ SONAME = "soname" CONFIG_MTIME = "mtime" DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) -DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", - u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms", - u"SUNWcslx"]) +DO_NOT_REPORT_MISSING = set([]) +DO_NOT_REPORT_MISSING_RE = [r"SUNW.*", r"\*SUNW.*"] +DUMP_BIN = "/usr/ccs/bin/dump" + SYSTEM_SYMLINKS = ( - ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), - ("/64", ["/amd64", "/sparcv9"]), + ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), + ("/64", ["/amd64", "/sparcv9"]), ("/opt/csw/lib/i386", ["/opt/csw/lib"]), ) +INSTALL_CONTENTS_AVG_LINE_LENGTH = 102.09710677919261 # This shared library is present on Solaris 10 on amd64, but it's missing on # Solaris 8 on i386. It's okay if it's missing. ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) DEPENDENCY_FILENAME_REGEXES = ( - (r".*\.pl", u"CSWperl"), - (r".*\.pm", u"CSWperl"), - (r".*\.py", u"CSWpython"), - (r".*\.rb", u"CSWruby"), + (r".*\.pl$", u"CSWperl"), + (r".*\.pm$", u"CSWperl"), + (r".*\.py$", u"CSWpython"), + (r".*\.rb$", u"CSWruby"), ) -REPORT_TMPL = u"""# $pkgname: +REPORT_TMPL = u"""#if $missing_deps or $surplus_deps or $orphan_sonames +# $pkgname: +#end if #if $missing_deps # SUGGESTION: you may want to add some or all of the following as depends: # (Feel free to ignore SUNW or SPRO packages) @@ -61,12 +69,9 @@ # ! $soname #end for #end if -#if not $missing_deps and not $surplus_deps and not $orphan_sonames -# + Dependencies of $pkgname look good. -#end if """ -ERROR_REPORT_TMPL = u"""#if $errors +SCREEN_ERROR_REPORT_TMPL = u"""#if $errors and $debug ERROR: One or more errors have been found by $name. #for $pkgname in $errors $pkgname: @@ -76,11 +81,23 @@ #end for #else #if $debug -OK: $name found no problems. +OK: $repr($name) module found no problems. #end if #end if """ +# http://www.cheetahtemplate.org/docs/users_guide_html_multipage/language.directives.closures.html +TAG_REPORT_TMPL = u"""#if $errors +# Tags reported by $name module +#for $pkgname in $errors +#for $tag in $errors[$pkgname] +$pkgname: ${tag.tag_name}#if $tag.tag_info# $tag.tag_info#end if# +#end for +#end for +#end if +""" + + class Error(Exception): pass @@ -95,79 +112,35 @@ def GetOptions(): parser = optparse.OptionParser() - parser.add_option("-e", dest="extractdir", - help="The directory into which the package has been extracted") + parser.add_option("-b", dest="stats_basedir", + help=("The base directory with package statistics " + "in yaml format, e.g. ~/.checkpkg/stats")) parser.add_option("-d", "--debug", dest="debug", default=False, action="store_true", help="Turn on debugging messages") + parser.add_option("-o", "--output", dest="output", + help="Output error tag file") (options, args) = parser.parse_args() - if not options.extractdir: - raise ConfigurationError("ERROR: -e option is missing.") + if not options.stats_basedir: + raise ConfigurationError("ERROR: the -b option is missing.") + if not options.output: + raise ConfigurationError("ERROR: the -o option is missing.") # Using set() to make the arguments unique. return options, set(args) -class CheckpkgBase(object): - """This class has functionality overlapping with DirectoryFormatPackage - from the opencsw.py library. The classes should be merged. - """ +def FormatDepsReport(pkgname, missing_deps, surplus_deps, orphan_sonames): + """To be removed.""" + namespace = { + "pkgname": pkgname, + "missing_deps": missing_deps, + "surplus_deps": surplus_deps, + "orphan_sonames": orphan_sonames, + } + t = Template.Template(REPORT_TMPL, searchList=[namespace]) + return unicode(t) - def __init__(self, extractdir, pkgname): - self.extractdir = extractdir - self.pkgname = pkgname - self.pkgpath = os.path.join(self.extractdir, self.pkgname) - def CheckPkgpathExists(self): - if not os.path.isdir(self.pkgpath): - raise PackageError("%s does not exist or is not a directory" - % self.pkgpath) - - def ListBinaries(self): - """Shells out to list all the binaries from a given package. - - Original checkpkg code: - - # ######################################### - # # find all executables and dynamic libs,and list their filenames. - # listbinaries() { - # if [ ! -d $1 ] ; then - # print errmsg $1 not a directory - # rm -rf $EXTRACTDIR - # exit 1 - # fi - # - # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' - # } - """ - self.CheckPkgpathExists() - find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" - find_proc = subprocess.Popen(find_tmpl % self.pkgpath, - shell=True, stdout=subprocess.PIPE) - stdout, stderr = find_proc.communicate() - ret = find_proc.wait() - if ret: - logging.error("The find command returned an error.") - return stdout.splitlines() - - def GetAllFilenames(self): - self.CheckPkgpathExists() - file_basenames = [] - for root, dirs, files in os.walk(self.pkgpath): - file_basenames.extend(files) - return file_basenames - - def FormatDepsReport(self, missing_deps, surplus_deps, orphan_sonames): - """To be removed.""" - namespace = { - "pkgname": self.pkgname, - "missing_deps": missing_deps, - "surplus_deps": surplus_deps, - "orphan_sonames": orphan_sonames, - } - t = Template.Template(REPORT_TMPL, searchList=[namespace]) - return unicode(t) - - class SystemPkgmap(object): """A class to hold and manipulate the /var/sadm/install/contents file. @@ -235,26 +208,31 @@ fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog """ + contents_length = os.stat(SYSTEM_PKGMAP).st_size + estimated_lines = contents_length / INSTALL_CONTENTS_AVG_LINE_LENGTH system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) # Creating a data structure: # soname - {: , : , ...} logging.debug("Building sqlite3 cache db of the %s file", SYSTEM_PKGMAP) + print "Processing %s" % SYSTEM_PKGMAP c = self.conn.cursor() count = itertools.count() for line in system_pkgmap_fd: i = count.next() if not i % 1000: - print "\r%s" % i, + print "\r~%3.1f%%" % (100.0 * i / estimated_lines,), if stop_re.search(line): continue + if line.startswith("#"): + continue fields = re.split(WS_RE, line) pkgmap_entry_path = fields[0].split("=")[0] pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) - print + print "\rAll lines of %s were processed." % SYSTEM_PKGMAP print "Creating the main database index." sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" c.execute(sql) @@ -316,17 +294,18 @@ return self.GetFileMtime() <= self.GetDatabaseMtime() def PurgeDatabase(self): - logging.info("Purging the cache database") c = self.conn.cursor() - sql = "DELETE FROM config;" - c.execute(sql) - sql = "DELETE FROM systempkgmap;" - c.execute(sql) + logging.info("Dropping the index.") sql = "DROP INDEX basename_idx;" try: c.execute(sql) except sqlite3.OperationalError, e: logging.warn(e) + logging.info("Deleting all rows from the cache database") + sql = "DELETE FROM config;" + c.execute(sql) + sql = "DELETE FROM systempkgmap;" + c.execute(sql) def SharedObjectDependencies(pkgname, binaries_by_pkgname, @@ -441,6 +420,11 @@ # Don't report itself as a suggested dependency. missing_deps = missing_deps.difference(set([pkgname])) missing_deps = missing_deps.difference(set(DO_NOT_REPORT_MISSING)) + for re_str in DO_NOT_REPORT_MISSING_RE: + padded_re = "^%s$" % re_str + missing_deps = filter(lambda x: not re.match(padded_re, x), + missing_deps) + missing_deps = set(missing_deps) surplus_deps = declared_dependencies_set.difference(auto_dependencies) surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS) orphan_sonames = orphan_sonames.difference(ALLOWED_ORPHAN_SONAMES) @@ -573,14 +557,29 @@ return binary_data +class CheckpkgTag(object): + """Represents a tag to be written to the checkpkg tag file.""" + + def __init__(self, pkgname, tag_name, tag_info=None, severity=None, msg=None): + self.pkgname = pkgname + self.tag_name = tag_name + self.tag_info = tag_info + self.severity = severity + self.msg = msg + + def __repr__(self): + return (u"CheckpkgTag(%s, %s, %s, ...)" + % (repr(self.pkgname), repr(self.tag_name), repr(self.tag_info))) + + class CheckpkgManager(object): """Takes care of calling checking functions""" - def __init__(self, name, extractdir, pkgname_list, debug=False): + def __init__(self, name, stats_basedir, md5sum_list, debug=False): self.debug = debug self.name = name - self.extractdir = extractdir - self.pkgname_list = pkgname_list + self.md5sum_list = md5sum_list + self.stats_basedir = stats_basedir self.errors = [] self.individual_checks = [] self.set_checks = [] @@ -592,31 +591,372 @@ def RegisterSetCheck(self, function): self.set_checks.append(function) - def Run(self): - """Runs all the checks + def GetPackageStatsList(self): + stats_list = [] + for md5sum in self.md5sum_list: + stats_list.append(PackageStats(None, self.stats_basedir, md5sum)) + return stats_list - Returns a tuple of an exit code and a report. - """ - packages = [] + def GetAllTags(self, packages_data): errors = {} - for pkgname in self.pkgname_list: - pkg_path = os.path.join(self.extractdir, pkgname) - packages.append(opencsw.DirectoryFormatPackage(pkg_path)) - for pkg in packages: + for pkg_data in packages_data: for function in self.individual_checks: - errors_for_pkg = function(pkg) + all_stats = pkg_data.GetAllStats() + errors_for_pkg = function(all_stats, debug=self.debug) if errors_for_pkg: - errors[pkg.pkgname] = errors_for_pkg + errors[all_stats["basic_stats"]["pkgname"]] = errors_for_pkg # Set checks for function in self.set_checks: - set_errors = function(packages) + set_errors = function([x.GetAllStats() for x in packages_data], + debug=self.debug) if set_errors: - errors["The package set"] = set_errors + # These were generated by a set, but are likely to be bound to specific + # packages. We'll try to preserve the package assignments. + for tag in set_errors: + if tag.pkgname: + if not tag.pkgname in errors: + errors[tag.pkgname] = [] + errors[tag.pkgname].append(tag) + else: + if "package-set" not in errors: + errors["package-set"] = [] + errors["package-set"].append(error) + return errors + + def FormatReports(self, errors): namespace = { "name": self.name, "errors": errors, "debug": self.debug, } - t = Template.Template(ERROR_REPORT_TMPL, searchList=[namespace]) - exit_code = bool(errors) - return (exit_code, unicode(t)) + screen_t = Template.Template(SCREEN_ERROR_REPORT_TMPL, searchList=[namespace]) + tags_report_t = Template.Template(TAG_REPORT_TMPL, searchList=[namespace]) + screen_report = unicode(screen_t) + tags_report = unicode(tags_report_t) + return screen_report, tags_report + + def Run(self): + """Runs all the checks + + Returns a tuple of an exit code and a report. + """ + packages_data = self.GetPackageStatsList() + errors = self.GetAllTags(packages_data) + screen_report, tags_report = self.FormatReports(errors) + exit_code = 0 + return (exit_code, screen_report, tags_report) + + +def ParseTagLine(line): + """Parses a line from the tag.${module} file. + + Returns a triplet of pkgname, tagname, tag_info. + """ + level_1 = line.strip().split(":") + if len(level_1) > 1: + data_1 = level_1[1] + pkgname = level_1[0] + else: + data_1 = level_1[0] + pkgname = None + level_2 = re.split(WS_RE, data_1.strip()) + tag_name = level_2[0] + if len(level_2) > 1: + tag_info = " ".join(level_2[1:]) + else: + tag_info = None + return (pkgname, tag_name, tag_info) + + +class Override(object): + """Represents an override of a certain checkpkg tag. + + It's similar to checkpkg.CheckpkgTag, but serves a different purpose. + """ + + def __init__(self, pkgname, tag_name, tag_info): + self.pkgname = pkgname + self.tag_name = tag_name + self.tag_info = tag_info + + def __repr__(self): + return (u"Override(%s, %s, %s)" + % (self.pkgname, self.tag_name, self.tag_info)) + + def DoesApply(self, tag): + """Figures out if this override applies to the given tag.""" + basket_a = {} + basket_b = {} + if self.pkgname: + basket_a["pkgname"] = self.pkgname + basket_b["pkgname"] = tag.pkgname + if self.tag_info: + basket_a["tag_info"] = self.tag_info + basket_b["tag_info"] = tag.tag_info + basket_a["tag_name"] = self.tag_name + basket_b["tag_name"] = tag.tag_name + return basket_a == basket_b + +def ParseOverrideLine(line): + level_1 = line.split(":") + if len(level_1) > 1: + pkgname = level_1[0] + data_1 = level_1[1] + else: + pkgname = None + data_1 = level_1[0] + level_2 = re.split(WS_RE, data_1.strip()) + if len(level_2) > 1: + tag_name = level_2[0] + tag_info = " ".join(level_2[1:]) + else: + tag_name = level_2[0] + tag_info = None + return Override(pkgname, tag_name, tag_info) + + +def ApplyOverrides(error_tags, overrides): + """Filters out all the error tags that overrides apply to. + + O(N * M), but N and M are always small. + """ + tags_after_overrides = [] + for tag in error_tags: + override_applies = False + for override in overrides: + if override.DoesApply(tag): + override_applies = True + if not override_applies: + tags_after_overrides.append(tag) + return tags_after_overrides + + +def GetIsalist(): + args = ["isalist"] + isalist_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = isalist_proc.communicate() + ret = isalist_proc.wait() + if ret: + logging.error("Calling isalist has failed.") + isalist = re.split(r"\s+", stdout.strip()) + return isalist + + +class PackageStats(object): + """Collects stats about a package and saves it.""" + STATS_VERSION = 1L + # This list needs to be synchronized with the CollectStats() method. + STAT_FILES = [ + "all_filenames", + "basic_stats", + "binaries", + "binaries_dump_info", + "depends", + "isalist", + "ldd_dash_r", + "overrides", + "pkginfo", + "pkgmap", + ] + + def __init__(self, srv4_pkg, stats_basedir=None, md5sum=None): + self.srv4_pkg = srv4_pkg + self.md5sum = md5sum + self.dir_format_pkg = None + self.stats_path = None + self.all_stats = {} + self.stats_basedir = stats_basedir + if not self.stats_basedir: + home = os.environ["HOME"] + parts = [home, ".checkpkg", "stats"] + self.stats_basedir = os.path.join(*parts) + + def GetMd5sum(self): + if not self.md5sum: + self.md5sum = self.srv4_pkg.GetMd5sum() + return self.md5sum + + def GetStatsPath(self): + if not self.stats_path: + md5sum = self.GetMd5sum() + two_chars = md5sum[0:2] + parts = [self.stats_basedir, two_chars, md5sum] + self.stats_path = os.path.join(*parts) + return self.stats_path + + def StatsExist(self): + """Checks if statistics of a package exist. + + Returns: + bool + """ + if not self.StatsDirExists(): + return False + # More checks can be added in the future. + return True + + def StatsDirExists(self): + return os.path.isdir(self.GetStatsPath()) + + def GetDirFormatPkg(self): + if not self.dir_format_pkg: + self.dir_format_pkg = self.srv4_pkg.GetDirFormatPkg() + return self.dir_format_pkg + + def MakeStatsDir(self): + """mkdir -p equivalent. + + http://stackoverflow.com/questions/600268/mkdir-p-functionality-in-python + """ + stats_path = self.GetStatsPath() + try: + os.makedirs(stats_path) + except OSError, e: + if e.errno == errno.EEXIST: + pass + else: + raise + + def GetBinaryDumpInfo(self): + dir_pkg = self.GetDirFormatPkg() + # Binaries. This could be split off to a separate function. + # man ld.so.1 for more info on this hack + env = copy.copy(os.environ) + env["LD_NOAUXFLTR"] = "1" + binaries_dump_info = [] + for binary in dir_pkg.ListBinaries(): + binary_abs_path = os.path.join(dir_pkg.directory, "root", binary) + binary_base_name = os.path.basename(binary) + args = [DUMP_BIN, "-Lv", binary_abs_path] + dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) + stdout, stderr = dump_proc.communicate() + ret = dump_proc.wait() + binary_data = ParseDumpOutput(stdout) + binary_data["path"] = binary + binary_data["soname_guessed"] = False + binary_data["base_name"] = binary_base_name + if SONAME not in binary_data: + logging.debug("The %s binary doesn't provide a SONAME. " + "(It might be an executable)", + binary_base_name) + # The binary doesn't tell its SONAME. We're guessing it's the + # same as the base file name. + binary_data[SONAME] = binary_base_name + binary_data["soname_guessed"] = True + binaries_dump_info.append(binary_data) + return binaries_dump_info + + def GetBasicStats(self): + dir_pkg = self.GetDirFormatPkg() + basic_stats = {} + basic_stats["stats_version"] = self.STATS_VERSION + basic_stats["pkg_path"] = self.srv4_pkg.pkg_path + basic_stats["pkg_basename"] = os.path.basename(self.srv4_pkg.pkg_path) + basic_stats["parsed_basename"] = opencsw.ParsePackageFileName(basic_stats["pkg_basename"]) + basic_stats["pkgname"] = dir_pkg.pkgname + basic_stats["catalogname"] = dir_pkg.GetCatalogname() + return basic_stats + + def GetOverrides(self): + dir_pkg = self.GetDirFormatPkg() + overrides = dir_pkg.GetOverrides() + def OverrideToDict(override): + d = {} + d["pkgname"] = override.pkgname + d["tag_name"] = override.tag_name + d["tag_info"] = override.tag_info + return d + overrides_simple = [OverrideToDict(x) for x in overrides] + return overrides_simple + + def GetLddMinusRlines(self): + """Returns ldd -r output.""" + dir_pkg = self.GetDirFormatPkg() + binaries = dir_pkg.ListBinaries() + ldd_output = {} + for binary in binaries: + binary_abspath = os.path.join(dir_pkg.directory, "root", binary) + # this could be potentially moved into the DirectoryFormatPackage class. + # ldd needs the binary to be executable + os.chmod(binary_abspath, 0755) + args = ["ldd", "-r", binary_abspath] + ldd_proc = subprocess.Popen( + args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = ldd_proc.communicate() + retcode = ldd_proc.wait() + if retcode: + logging.error("%s returned an error: %s", args, stderr) + lines = stdout.splitlines() + ldd_output[binary] = lines + return ldd_output + + + def CollectStats(self): + stats_path = self.GetStatsPath() + self.MakeStatsDir() + dir_pkg = self.GetDirFormatPkg() + logging.info("Collecting %s package statistics.", repr(dir_pkg.pkgname)) + self.DumpObject(dir_pkg.GetAllFilenames(), "all_filenames") + self.DumpObject(self.GetBasicStats(), "basic_stats") + self.DumpObject(dir_pkg.ListBinaries(), "binaries") + self.DumpObject(self.GetBinaryDumpInfo(), "binaries_dump_info") + self.DumpObject(dir_pkg.GetDependencies(), "depends") + self.DumpObject(GetIsalist(), "isalist") + self.DumpObject(self.GetOverrides(), "overrides") + self.DumpObject(dir_pkg.GetParsedPkginfo(), "pkginfo") + self.DumpObject(dir_pkg.GetPkgmap().entries, "pkgmap") + self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") + logging.debug("Statistics collected.") + + def GetAllStats(self): + if self.StatsExist(): + self.all_stats = self.ReadSavedStats() + else: + self.CollectStats() + return self.all_stats + + def DumpObject(self, obj, name): + """Saves an object. + + TODO(maciej): Implement pickling with cPickle. + """ + stats_path = self.GetStatsPath() + # yaml + out_file_name = os.path.join(stats_path, "%s.yml" % name) + logging.debug("DumpObject(): writing %s", repr(out_file_name)) + f = open(out_file_name, "w") + f.write(yaml.safe_dump(obj)) + f.close() + # pickle + out_file_name_pickle = os.path.join(stats_path, "%s.pickle" % name) + f = open(out_file_name_pickle, "wb") + cPickle.dump(obj, f) + f.close() + self.all_stats[name] = obj + + def ReadObject(self, name): + """Reads an object.""" + stats_path = self.GetStatsPath() + in_file_name = os.path.join(stats_path, "%s.yml" % name) + in_file_name_pickle = os.path.join(stats_path, "%s.pickle" % name) + if os.path.exists(in_file_name_pickle): + logging.debug("ReadObject(): reading %s", repr(in_file_name_pickle)) + f = open(in_file_name_pickle, "r") + obj = cPickle.load(f) + f.close() + logging.debug("ReadObject(): finished reading %s", repr(in_file_name_pickle)) + else: + logging.debug("ReadObject(): reading %s", repr(in_file_name)) + f = open(in_file_name, "r") + obj = yaml.safe_load(f) + f.close() + logging.debug("ReadObject(): finished reading %s", repr(in_file_name)) + return obj + + def ReadSavedStats(self): + all_stats = {} + for name in self.STAT_FILES: + all_stats[name] = self.ReadObject(name) + return all_stats Modified: csw/mgar/gar/v2-git/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-git/lib/python/checkpkg_test.py 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/lib/python/checkpkg_test.py 2010-02-20 11:24:28 UTC (rev 8698) @@ -5,6 +5,7 @@ import mox import difflib import checkpkg +import opencsw import testdata.checkpkg_test_data_CSWmysql51rt as d1 import testdata.checkpkg_test_data_CSWmysql51client as d2 import testdata.checkpkg_test_data_CSWmysql51 as d3 @@ -150,7 +151,7 @@ def testMissingDeps(self): # This tends to report itself... - expected = set([u'SUNWgss']) + expected = set([]) self.assertEquals(expected, self.missing_deps) @@ -556,8 +557,8 @@ missing_deps = set([u'SUNWgss', u'*SUNWlxsl']) surplus_deps = set(['CSWsudo', 'CSWlibxslt']) orphan_sonames = set([u'libm.so.2']) - testdata = (missing_deps, surplus_deps, orphan_sonames) - checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") + testdata = ("CSWfoo", missing_deps, surplus_deps, orphan_sonames) + checker = opencsw.DirectoryFormatPackage("/tmp/nonexistent/CSWfoo") expected = u"""# CSWfoo: # SUGGESTION: you may want to add some or all of the following as depends: # (Feel free to ignore SUNW or SPRO packages) @@ -569,21 +570,151 @@ # The following required sonames would not be found at runtime: # ! libm.so.2 """ - result = checker.FormatDepsReport(*testdata) + result = checkpkg.FormatDepsReport(*testdata) self.AssertTextEqual(result, expected) def testNone(self): missing_deps = set([]) surplus_deps = set([]) orphan_sonames = set([]) - testdata = (missing_deps, surplus_deps, orphan_sonames) - checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") - expected = u"""# CSWfoo: -# + Dependencies of CSWfoo look good. -""" - result = checker.FormatDepsReport(*testdata) + testdata = ("CSWfoo", missing_deps, surplus_deps, orphan_sonames) + checker = opencsw.DirectoryFormatPackage("/tmp/nonexistent/CSWfoo") + expected = u"" + result = checkpkg.FormatDepsReport(*testdata) self.AssertTextEqual(result, expected) +class CheckpkgTagsUnitTest(unittest.TestCase): + + def test_1(self): + m = checkpkg.CheckpkgManager("testname", "/tmp", ["CSWfoo"]) + tags = { + "CSWfoo": [ + checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "foo-info"), + ], + } + screen_report, tags_report = m.FormatReports(tags) + expected = u'# Tags reported by testname module\nCSWfoo: foo-tag foo-info\n' + self.assertEqual(expected, tags_report) + + def test_2(self): + m = checkpkg.CheckpkgManager("testname", "/tmp", ["CSWfoo"]) + tags = { + "CSWfoo": [ + checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "foo-info"), + checkpkg.CheckpkgTag("CSWfoo", "bar-tag", "bar-info"), + checkpkg.CheckpkgTag("CSWfoo", "baz-tag"), + ], + } + screen_report, tags_report = m.FormatReports(tags) + expected = (u'# Tags reported by testname module\n' + u'CSWfoo: foo-tag foo-info\n' + u'CSWfoo: bar-tag bar-info\n' + u'CSWfoo: baz-tag\n') + self.assertEqual(expected, tags_report) + + def testParseTagLine1(self): + line = "foo-tag" + self.assertEquals((None, "foo-tag", None), checkpkg.ParseTagLine(line)) + + def testParseTagLine2(self): + line = "CSWfoo: foo-tag" + self.assertEquals(("CSWfoo", "foo-tag", None), checkpkg.ParseTagLine(line)) + + def testParseTagLine3(self): + line = "CSWfoo: foo-tag foo-info" + self.assertEquals(("CSWfoo", "foo-tag", "foo-info"), checkpkg.ParseTagLine(line)) + + def testParseTagLine4(self): + line = "CSWfoo: foo-tag foo-info1 foo-info2" + self.assertEquals(("CSWfoo", "foo-tag", "foo-info1 foo-info2"), checkpkg.ParseTagLine(line)) + + +class ParseOverrideLineUnitTest(unittest.TestCase): + + def setUp(self): + line1 = "CSWfoo: foo-override" + line2 = "CSWfoo: foo-override foo-info" + line3 = "CSWfoo: foo-override foo-info-1 foo-info-2" + self.o1 = checkpkg.ParseOverrideLine(line1) + self.o2 = checkpkg.ParseOverrideLine(line2) + self.o3 = checkpkg.ParseOverrideLine(line3) + + def test_ParseOverridesLine1(self): + self.assertEqual("CSWfoo", self.o1.pkgname) + + def test_ParseOverridesLine2(self): + self.assertEqual("foo-override", self.o1.tag_name) + + def test_ParseOverridesLine3(self): + self.assertEqual(None, self.o1.tag_info) + + def test_ParseOverridesLine4(self): + self.assertEqual("foo-info", self.o2.tag_info) + + def test_ParseOverridesLine5(self): + self.assertEqual("CSWfoo", self.o3.pkgname) + + def test_ParseOverridesLine6(self): + self.assertEqual("foo-override", self.o3.tag_name) + + def test_ParseOverridesLine7(self): + self.assertEqual("foo-info-1 foo-info-2", self.o3.tag_info) + + +class ApplyOverridesUnitTest(unittest.TestCase): + + # This would be better, more terse. But requires metaclasses. + DATA_1 = ( + (None, 'tag1', 'info1', None, 'tag1', 'info1', None), + ) + + def test_1a(self): + """One tag, no overrides.""" + tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag")] + overrides = [] + self.assertEqual(tags, checkpkg.ApplyOverrides(tags, overrides)) + + def test_1b(self): + """One override, matching by tag name only.""" + tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag")] + overrides = [checkpkg.Override(None, "foo-tag", None)] + self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) + + def test_1c(self): + """One override, matching by tag name only, no pkgname.""" + tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag")] + overrides = [checkpkg.Override(None, "foo-tag", None)] + self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) + + def test_2(self): + """One override, matching by tag name and tag info, no pkgname.""" + tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag")] + overrides = [checkpkg.Override(None, "foo-tag", None)] + self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) + + def test_3(self): + """One override, matching by tag name, mismatching tag info, no pkgname.""" + tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")] + overrides = [checkpkg.Override(None, "foo-tag", "tag-info-2")] + self.assertEqual(tags, checkpkg.ApplyOverrides(tags, overrides)) + + def test_4(self): + tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")] + overrides = [checkpkg.Override(None, "foo-tag", "tag-info-1")] + self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) + + def test_5(self): + tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")] + overrides = [checkpkg.Override("CSWfoo", "foo-tag", "tag-info-1")] + self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) + + def test_5(self): + """Pkgname mismatch.""" + tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")] + overrides = [checkpkg.Override("CSWbar", "foo-tag", "tag-info-1")] + self.assertEqual(tags, checkpkg.ApplyOverrides(tags, overrides)) + + if __name__ == '__main__': unittest.main() Modified: csw/mgar/gar/v2-git/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2-git/lib/python/opencsw.py 2010-02-20 08:31:40 UTC (rev 8697) +++ csw/mgar/gar/v2-git/lib/python/opencsw.py 2010-02-20 11:24:28 UTC (rev 8698) @@ -15,6 +15,7 @@ import copy import datetime import difflib +import hashlib import logging import os import os.path @@ -23,6 +24,7 @@ import subprocess import tempfile import urllib2 +import checkpkg ARCHITECTURES = ["i386", "sparc", "all"] MAJOR_VERSION = "major version" @@ -57,14 +59,13 @@ EMAIL_TMPL = """From: %(from)s To: %(to)s -Cc: %(cc)s -Date: %(date)s +%(optional_cc)sDate: %(date)s Subject: newpkgs %(pkgnames)s %(body)s -- -$Id$ +Generated by submitpkg, $Rev$. """ @@ -209,7 +210,7 @@ for line in catalog_source: # Working around the GPG signature if line.startswith("#"): continue - if "BEGIN PGP SIGNED MESSAGE" in line: continue + if "BEGIN PGP SIGNED MESSAGE" in line: continue if line.startswith("Hash:"): continue if len(line.strip()) <= 0: continue if "BEGIN PGP SIGNATURE" in line: break @@ -272,7 +273,9 @@ self.pkgnames = pkgnames self.paths = paths self.release_mgr = u"%s <%s>" % (release_mgr_name, release_mgr_email) - self.release_cc = u"%s" % release_cc + self.release_cc = release_cc + if self.release_cc: + self.release_cc = unicode(release_cc) def FormatMail(self): body_list = ["The following package files are ready to be released:"] @@ -317,14 +320,17 @@ body_list.extend(msg) body_list.append("") body = "\n".join(body_list) + # TODO: This needs to be rewritten using Cheetah d = { 'from': self.sender, 'to': self.release_mgr, - 'cc': self.release_cc, + 'optional_cc': '', 'pkgnames': ", ".join(self.pkgnames), 'body': body, 'date': datetime.datetime.now(), } + if self.release_cc: + d['optional_cc'] = "cc: %s\n" % self.release_cc mail_text = EMAIL_TMPL % d return mail_text @@ -342,14 +348,13 @@ def ShellCommand(self, args, quiet=False): logging.debug("Calling: %s", repr(args)) if quiet: - sub_stdout = subprocess.PIPE - sub_stderr = subprocess.PIPE + process = subprocess.Popen(args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = process.communicate() + retcode = process.wait() else: - sub_stdout = None - sub_stderr = None - retcode = subprocess.call(args, - stdout=sub_stdout, - stderr=sub_stderr) + retcode = subprocess.call(args) if retcode: raise Error("Running %s has failed." % repr(args)) return retcode @@ -358,13 +363,17 @@ class CswSrv4File(ShellMixin, object): """Represents a package in the srv4 format (pkg).""" - def __init__(self, pkg_path): + def __init__(self, pkg_path, debug=False): self.pkg_path = pkg_path self.workdir = None self.gunzipped_path = None self.transformed = False self.dir_format_pkg = None + self.debug = debug + def __repr__(self): + return u"CswSrv4File(%s)" % repr(self.pkg_path) + def GetWorkDir(self): if not self.workdir: self.workdir = tempfile.mkdtemp(prefix="pkg_") @@ -394,11 +403,49 @@ "%s or %s." % (gzip_suffix, pkg_suffix)) return self.gunzipped_path + def Pkgtrans(self, src_file, destdir, pkgname): + """A proxy for the pkgtrans command. + + This requires custom-pkgtrans to be available. + """ + if not os.path.isdir(destdir): + raise PackageError("%s doesn't exist or is not a directory" % destdir) + args = [os.path.join(os.path.dirname(__file__), "custom-pkgtrans"), + src_file, destdir, pkgname ] + pkgtrans_proc = subprocess.Popen(args) + pkgtrans_proc.communicate() + ret = pkgtrans_proc.wait() + if ret: + logging.error("% has failed" % args) + + def GetPkgname(self): + """It's necessary to figure out the pkgname from the .pkg file. + # nawk 'NR == 2 {print $1; exit;} $f + """ + gunzipped_path = self.GetGunzippedPath() + args = ["nawk", "NR == 2 {print $1; exit;}", gunzipped_path] + nawk_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = nawk_proc.communicate() + ret_code = nawk_proc.wait() + pkgname = stdout.strip() + logging.debug("GetPkgname(): %s", repr(pkgname)) + return pkgname + def TransformToDir(self): + """Transforms the file to the directory format. + + This uses the Pkgtrans function at the top, because pkgtrans behaves + differently on Solaris 8 and 10. Having our own implementation helps + achieve consistent behavior. + """ @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Feb 20 12:34:21 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 20 Feb 2010 11:34:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8699] csw/mgar/pkg Message-ID: Revision: 8699 http://gar.svn.sourceforge.net/gar/?rev=8699&view=rev Author: wahwah Date: 2010-02-20 11:34:20 +0000 (Sat, 20 Feb 2010) Log Message: ----------- google-gflags: Initial commit, builds under Solaris 9 Modified Paths: -------------- csw/mgar/pkg/google-gflags/trunk/Makefile csw/mgar/pkg/google-gflags/trunk/checksums Added Paths: ----------- csw/mgar/pkg/google-gflags/ Modified: csw/mgar/pkg/google-gflags/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-02-13 12:42:13 UTC (rev 8535) +++ csw/mgar/pkg/google-gflags/trunk/Makefile 2010-02-20 11:34:20 UTC (rev 8699) @@ -2,184 +2,23 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = gflags +GARVERSION = 1.3 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = a library that implements commandline flags processing define BLURB - + The gflags package contains a library that implements commandline flags + processing. As such it's a replacement for getopt(). It has increased + flexibility, including built-in support for C++ types like string, and the + ability to define flags in the source file in which they're used. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://code.google.com/p/google-gflags/ +MASTER_SITES = $(GOOGLE_MIRROR) +GOOGLE_PROJECT = google-gflags DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386 +TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +BUILD64 = 1 +include gar/category.mk Modified: csw/mgar/pkg/google-gflags/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-02-13 12:42:13 UTC (rev 8535) +++ csw/mgar/pkg/google-gflags/trunk/checksums 2010-02-20 11:34:20 UTC (rev 8699) @@ -0,0 +1 @@ +6da3d3b9cd82c222b521ae686b6cfa8b gflags-1.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Feb 20 13:34:36 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 20 Feb 2010 12:34:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8700] csw/mgar/pkg/google-gflags/trunk/Makefile Message-ID: Revision: 8700 http://gar.svn.sourceforge.net/gar/?rev=8700&view=rev Author: wahwah Date: 2010-02-20 12:34:36 +0000 (Sat, 20 Feb 2010) Log Message: ----------- google-gflags: It does build on Solaris 8 Modified Paths: -------------- csw/mgar/pkg/google-gflags/trunk/Makefile Modified: csw/mgar/pkg/google-gflags/trunk/Makefile =================================================================== --- csw/mgar/pkg/google-gflags/trunk/Makefile 2010-02-20 11:34:20 UTC (rev 8699) +++ csw/mgar/pkg/google-gflags/trunk/Makefile 2010-02-20 12:34:36 UTC (rev 8700) @@ -17,7 +17,6 @@ GOOGLE_PROJECT = google-gflags DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386 TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sat Feb 20 19:24:13 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sat, 20 Feb 2010 18:24:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8701] csw/mgar/pkg Message-ID: Revision: 8701 http://gar.svn.sourceforge.net/gar/?rev=8701&view=rev Author: bensons Date: 2010-02-20 18:24:12 +0000 (Sat, 20 Feb 2010) Log Message: ----------- gstplugins: initial GAR recipe Added Paths: ----------- csw/mgar/pkg/gstplugins/ csw/mgar/pkg/gstplugins/branches/ csw/mgar/pkg/gstplugins/tags/ csw/mgar/pkg/gstplugins/trunk/ csw/mgar/pkg/gstplugins/trunk/Makefile csw/mgar/pkg/gstplugins/trunk/checksums csw/mgar/pkg/gstplugins/trunk/files/ Property changes on: csw/mgar/pkg/gstplugins/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/gstplugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gstplugins/trunk/Makefile 2010-02-20 18:24:12 UTC (rev 8701) @@ -0,0 +1,64 @@ +GARNAME = gstplugins +GARVERSION = 0.10.26 +CATEGORIES = gnome + +DESCRIPTION = an essential exemplary set of elements for gstreamer +define BLURB + GStreamer Base Plug-ins is a well-groomed and well-maintained collection + of GStreamer plug-ins and elements, spanning the range of possible types + of elements one would want to write for GStreamer. It also contains helper + libraries and base classes useful for writing elements. A wide range of + video and audio decoders, encoders, and filters are included. +endef + +MASTER_SITES = http://gstreamer.freedesktop.org/src/gst-plugins-base/ +SRCNAME = gst-plugins-base +DISTFILES = $(SRCNAME)-$(GARVERSION).tar.gz +WORKSRC = $(WORKDIR)/$(SRCNAME)-$(GARVERSION) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD_DEP_PKGS += CSWgstreamer CSWliboil CSWglib2 CSWgnomevfs2 CSWlibogg +BUILD_DEP_PKGS += CSWgconf2 CSWggettextrt CSWlibxml2 CSWtheora CSWvorbis +RUNTIME_DEP_PKGS = $(BUILD_DEP_PKGS) + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --disable-debug +CONFIGURE_ARGS += --disable-alsa +CONFIGURE_ARGS += --disable-cdparanoia +CONFIGURE_ARGS += --disable-xvideo +CONFIGURE_ARGS += --disable-gst_v4l +CONFIGURE_ARGS += --disable-libvisual +CONFIGURE_ARGS += --disable-pango + +STRIP_LIBTOOL = 1 + +TEST_SCRIPTS = + +LICENSE = $(WORKDIR_FIRSTMOD)/$(SRCNAME)-$(GARVERSION)/COPYING + +# we are providing those symbols +CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstaudio-0.10.so.0.19.0 +CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstriff-0.10.so.0.19.0 +CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstgnomevfs.so +CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstapp.so +CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstvolume.so +CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstplaybin.so +CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstogg.so +CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstdecodebin.so +CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstaudioconvert.so +CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstadder.so +CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgsttheora.so +CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstdecodebin2.so +CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstvideoscale.so +CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstximagesink.so +CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstvorbis.so +CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstcdda-0.10.so.0.19.0 + +include gar/category.mk + +# sigh, portable code? +post-configure-modulated: + perl -pi -e 's/(LIBS = -lnsl -lsocket)/$$1 -lresolv/' \ + $(WORKSRC)/gst/tcp/Makefile Added: csw/mgar/pkg/gstplugins/trunk/checksums =================================================================== --- csw/mgar/pkg/gstplugins/trunk/checksums (rev 0) +++ csw/mgar/pkg/gstplugins/trunk/checksums 2010-02-20 18:24:12 UTC (rev 8701) @@ -0,0 +1 @@ +74fec1ea3b24daa796e7ef4a71651156 gst-plugins-base-0.10.26.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sat Feb 20 19:39:39 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sat, 20 Feb 2010 18:39:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8702] csw/mgar/pkg/gstplugins/trunk/Makefile Message-ID: Revision: 8702 http://gar.svn.sourceforge.net/gar/?rev=8702&view=rev Author: bensons Date: 2010-02-20 18:39:39 +0000 (Sat, 20 Feb 2010) Log Message: ----------- gstplugins: adjusted DESCRIPTION Modified Paths: -------------- csw/mgar/pkg/gstplugins/trunk/Makefile Modified: csw/mgar/pkg/gstplugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins/trunk/Makefile 2010-02-20 18:24:12 UTC (rev 8701) +++ csw/mgar/pkg/gstplugins/trunk/Makefile 2010-02-20 18:39:39 UTC (rev 8702) @@ -2,7 +2,7 @@ GARVERSION = 0.10.26 CATEGORIES = gnome -DESCRIPTION = an essential exemplary set of elements for gstreamer +DESCRIPTION = Base GStreamer plugins handling various media types define BLURB GStreamer Base Plug-ins is a well-groomed and well-maintained collection of GStreamer plug-ins and elements, spanning the range of possible types This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sat Feb 20 19:52:02 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sat, 20 Feb 2010 18:52:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[8703] csw/mgar/pkg/gstplugins/trunk/Makefile Message-ID: Revision: 8703 http://gar.svn.sourceforge.net/gar/?rev=8703&view=rev Author: bensons Date: 2010-02-20 18:52:02 +0000 (Sat, 20 Feb 2010) Log Message: ----------- gstplugins: added dependencies Modified Paths: -------------- csw/mgar/pkg/gstplugins/trunk/Makefile Modified: csw/mgar/pkg/gstplugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins/trunk/Makefile 2010-02-20 18:39:39 UTC (rev 8702) +++ csw/mgar/pkg/gstplugins/trunk/Makefile 2010-02-20 18:52:02 UTC (rev 8703) @@ -21,6 +21,7 @@ BUILD_DEP_PKGS += CSWgstreamer CSWliboil CSWglib2 CSWgnomevfs2 CSWlibogg BUILD_DEP_PKGS += CSWgconf2 CSWggettextrt CSWlibxml2 CSWtheora CSWvorbis +BUILD_DEP_PKGS += CSWzlib CSWsunmath CSWorbit2 CSWlibxml2 CSWbonobo2 RUNTIME_DEP_PKGS = $(BUILD_DEP_PKGS) CONFIGURE_ARGS += $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sat Feb 20 20:00:57 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sat, 20 Feb 2010 19:00:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8704] csw/mgar/pkg Message-ID: Revision: 8704 http://gar.svn.sourceforge.net/gar/?rev=8704&view=rev Author: bensons Date: 2010-02-20 19:00:57 +0000 (Sat, 20 Feb 2010) Log Message: ----------- gstplugins_ugly: initial GAR recipe Added Paths: ----------- csw/mgar/pkg/gstplugins_ugly/ csw/mgar/pkg/gstplugins_ugly/branches/ csw/mgar/pkg/gstplugins_ugly/tags/ csw/mgar/pkg/gstplugins_ugly/trunk/ csw/mgar/pkg/gstplugins_ugly/trunk/Makefile csw/mgar/pkg/gstplugins_ugly/trunk/checksums csw/mgar/pkg/gstplugins_ugly/trunk/files/ Property changes on: csw/mgar/pkg/gstplugins_ugly/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/gstplugins_ugly/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins_ugly/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gstplugins_ugly/trunk/Makefile 2010-02-20 19:00:57 UTC (rev 8704) @@ -0,0 +1,37 @@ +GARNAME = gstplugins_ugly +GARVERSION = 0.10.13 +CATEGORIES = gnome + +DESCRIPTION = GStreamer plugins (Ugly) +define BLURB + GStreamer Ugly Plug-ins is a set of plug-ins that have good quality and + correct functionality, but distributing them might pose problems. + The license on either the plug-ins or the supporting libraries might not + be how we'd like. The code might be widely known to present patent problems. +endef + +MASTER_SITES = http://gstreamer.freedesktop.org/src/gst-plugins-ugly/ +SRCNAME = gst-plugins-ugly +DISTFILES = $(SRCNAME)-$(GARVERSION).tar.gz +WORKSRC = $(WORKDIR)/$(SRCNAME)-$(GARVERSION) +PACKAGES = CSWgstpluginsugly +CATALOGNAME = gstplugins_ugly + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD_DEP_PKGS += CSWgstreamer CSWgstplugins CSWglib2 CSWggettext CSWggettextrt +BUILD_DEP_PKGS += CSWlibdvdread CSWlibid3tag CSWlibmad CSWliboil CSWlibxml2 +BUILD_DEP_PKGS += CSWsunmath CSWzlib CSWliba52 +RUNTIME_DEP_PKGS = $(BUILD_DEP_PKGS) + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --disable-debug + +STRIP_LIBTOOL = 1 + +TEST_SCRIPTS = + +LICENSE = $(WORKDIR_FIRSTMOD)/$(SRCNAME)-$(GARVERSION)/COPYING + +include gar/category.mk Added: csw/mgar/pkg/gstplugins_ugly/trunk/checksums =================================================================== --- csw/mgar/pkg/gstplugins_ugly/trunk/checksums (rev 0) +++ csw/mgar/pkg/gstplugins_ugly/trunk/checksums 2010-02-20 19:00:57 UTC (rev 8704) @@ -0,0 +1 @@ +abf125b9a3c0432721493bc49d7a04c8 gst-plugins-ugly-0.10.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Feb 20 21:39:17 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 20 Feb 2010 20:39:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8705] csw/mgar/pkg Message-ID: Revision: 8705 http://gar.svn.sourceforge.net/gar/?rev=8705&view=rev Author: wbonnet Date: 2010-02-20 20:39:17 +0000 (Sat, 20 Feb 2010) Log Message: ----------- Fixpackage category Modified Paths: -------------- csw/mgar/pkg/firefox/trunk/Makefile csw/mgar/pkg/seamonkey/trunk/Makefile Modified: csw/mgar/pkg/firefox/trunk/Makefile =================================================================== --- csw/mgar/pkg/firefox/trunk/Makefile 2010-02-20 19:00:57 UTC (rev 8704) +++ csw/mgar/pkg/firefox/trunk/Makefile 2010-02-20 20:39:17 UTC (rev 8705) @@ -1,6 +1,6 @@ GARNAME = firefox -GARVERSION = 3.0.15 -CATEGORIES = x11 +GARVERSION = 3.0.16 +CATEGORIES = apps DISTNAME = $(GARNAME) DESCRIPTION = Firefox Community Edition web browser @@ -13,7 +13,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*) -MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(GARVERSION)/source/ +MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(GARVERSION)-real/source/ UPSTREAM_MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/ PACKAGES = CSWfirefox Modified: csw/mgar/pkg/seamonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/seamonkey/trunk/Makefile 2010-02-20 19:00:57 UTC (rev 8704) +++ csw/mgar/pkg/seamonkey/trunk/Makefile 2010-02-20 20:39:17 UTC (rev 8705) @@ -1,6 +1,6 @@ GARNAME = seamonkey GARVERSION = 1.1.18 -CATEGORIES = x11 +CATEGORIES = apps DISTNAME = $(GARNAME) DESCRIPTION = Seamonkey all-in-one internet application suite This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Feb 20 22:33:20 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 20 Feb 2010 21:33:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8706] csw/mgar/pkg Message-ID: Revision: 8706 http://gar.svn.sourceforge.net/gar/?rev=8706&view=rev Author: wbonnet Date: 2010-02-20 21:33:19 +0000 (Sat, 20 Feb 2010) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/firefox-l10n/ csw/mgar/pkg/firefox-l10n/branches/ csw/mgar/pkg/firefox-l10n/tags/ csw/mgar/pkg/firefox-l10n/trunk/ csw/mgar/pkg/firefox-l10n/trunk/Makefile csw/mgar/pkg/firefox-l10n/trunk/checksums csw/mgar/pkg/firefox-l10n/trunk/files/ csw/mgar/pkg/firefox-l10n/trunk/files/License Property changes on: csw/mgar/pkg/firefox-l10n/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/firefox-l10n/trunk/Makefile =================================================================== --- csw/mgar/pkg/firefox-l10n/trunk/Makefile (rev 0) +++ csw/mgar/pkg/firefox-l10n/trunk/Makefile 2010-02-20 21:33:19 UTC (rev 8706) @@ -0,0 +1,70 @@ +GARNAME = firefox-l10n +GARVERSION = 3.0.14 +CATEGORIES = apps + +DESCRIPTION = Firefox language pack : +define BLURB + Firefox Community Edition web browser localization file. +endef + +# Definition of the list of locale to process +# LANG = af ar be bg bn-IN ca cs cy da de el en-GB eo es-AR es-ES et eu fi fr fy-NL ga-IE gl gu-IN he hi-IN hu id is it ja ka kn ko ku lt lv mk mn mr nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT ro ru si sk sl sq sr sv-SE te th tr uk zh-CN zh-TW + +LANG = de fr + +# Set arch to all +ARCHALL = 1 + +# Defines the list of packages +PACKAGES = $(foreach PKG, $(LANG), CSWfirefox-l10n-$(PKG) ) +LICENSE = License +INCOMPATIBLE_PKGS_CSWfirefox-l10n-fr = firefox_fr + +# Defines the package description +$(foreach LOCALE_NAME, $(LANG), $(eval SPKG_DESC_CSWfirefox-l10n-$(LOCALE_NAME) = $(DESCRIPTION) $(LOCALE_NAME))) + +# Defines the catalog names +$(foreach LOCALE_NAME, $(LANG), $(eval CATALOGNAME_CSWfirefox-l10n-$(LOCALE_NAME) = firefox_l10n_$(LOCALE_NAME))) + +# Defines the files filters +$(foreach LOCALE_NAME, $(LANG), $(eval PKGFILES_CSWfirefox-l10n-$(LOCALE_NAME) = .*langpack-$(LOCALE_NAME).*)) + +# Defines the content to be downloaded +MASTER_SITES = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(GARVERSION)/linux-i686/xpi/ +DISTFILES = License +$(foreach LOCALE_NAME, $(LANG), $(eval DISTFILES += $(LOCALE_NAME).xpi)) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +# Defines the custom steps +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +post-extract-modulated: + for LOCALE_NAME in $(foreach L,$(LANG),$(L)); do \ + mkdir -p "$(WORKROOTDIR)/build-$(MODULATIONS)/$$LOCALE_NAME" ; \ + CUR_DIR=`pwd` ; \ + cd "$(WORKROOTDIR)/build-$(MODULATIONS)/$$LOCALE_NAME" ; \ + unzip -u ../$$LOCALE_NAME.xpi ; \ + cd $$CUR_DIR ; \ + done + $(MAKECOOKIE) + +install-custom: + @echo " ==> Installing $(GARNAME)" + + for LOCALE_NAME in $(foreach L, $(LANG), $(L)); do \ + PKG_EXTENSION=`grep "em:id=" "$(WORKROOTDIR)/build-$(MODULATIONS)/$$LOCALE_NAME/install.rdf" | cut -d\" -f 2` ; \ + ginstall -d "$(PKGROOT)$(prefix)/mozilla/firefox/lib/extensions" ; \ + cp -fr "$(WORKROOTDIR)/build-$(MODULATIONS)/$$LOCALE_NAME" "$(PKGROOT)$(prefix)/mozilla/firefox/lib/extensions/$$PKG_EXTENSION" ; \ + done + @$(MAKECOOKIE) Added: csw/mgar/pkg/firefox-l10n/trunk/checksums =================================================================== --- csw/mgar/pkg/firefox-l10n/trunk/checksums (rev 0) +++ csw/mgar/pkg/firefox-l10n/trunk/checksums 2010-02-20 21:33:19 UTC (rev 8706) @@ -0,0 +1,3 @@ +ce6efbce92c3d02ffb007c3f56747eb2 License +40444641aacef72cae13b149c2f7e941 de.xpi +1edb811c4d5d60e9b88282a73d5b041d fr.xpi Added: csw/mgar/pkg/firefox-l10n/trunk/files/License =================================================================== --- csw/mgar/pkg/firefox-l10n/trunk/files/License (rev 0) +++ csw/mgar/pkg/firefox-l10n/trunk/files/License 2010-02-20 21:33:19 UTC (rev 8706) @@ -0,0 +1,614 @@ +Mozilla Project and Mozilla Localization Projects. + +The official Firefox locales are tripple-licenses under the GNU General +Public License (GPL), the GNU Lesser General Public License (LGPL), and +the Mozilla Public License (MPL). + + +License (GPL): + + Copyright (C) Mozilla Project and Mozilla Localization Projects + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +License (LGPL): + + Copyright (C) Mozilla Project and Mozilla Localization Projects + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +License (MPL): + + Copyright (C) Mozilla Project and Mozilla Localization Projects + + MOZILLA PUBLIC LICENSE + Version 1.1 + + --------------- + +1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + +3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + +7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8. TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. + + The Covered Code is a "commercial item," as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + +11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + +12. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the NPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + +EXHIBIT A -Mozilla Public License. + + ``The contents of this file are subject to the Mozilla Public License + Version 1.1 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + License for the specific language governing rights and limitations + under the License. + + The Original Code is ______________________________________. + + The Initial Developer of the Original Code is ________________________. + Portions created by ______________________ are Copyright (C) ______ + _______________________. All Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the terms + of the _____ license (the "[___] License"), in which case the + provisions of [______] License are applicable instead of those + above. If you wish to allow use of your version of this file only + under the terms of the [____] License and not to allow others to use + your version of this file under the MPL, indicate your decision by + deleting the provisions above and replace them with the notice and + other provisions required by the [___] License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the [___] License." + + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] + + ---------------------------------------------------------------------- + + AMENDMENTS + + The Netscape Public License Version 1.1 ("NPL") consists of the + Mozilla Public License Version 1.1 with the following Amendments, + including Exhibit A-Netscape Public License. Files identified with + "Exhibit A-Netscape Public License" are governed by the Netscape + Public License Version 1.1. + + Additional Terms applicable to the Netscape Public License. + I. Effect. + These additional terms described in this Netscape Public + License -- Amendments shall apply to the Mozilla Communicator + client code and to all Covered Code under this License. + + II. "Netscape's Branded Code" means Covered Code that Netscape + distributes and/or permits others to distribute under one or more + trademark(s) which are controlled by Netscape but which are not + licensed for use under this License. + + III. Netscape and logo. + This License does not grant any rights to use the trademarks + "Netscape", the "Netscape N and horizon" logo or the "Netscape + lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript", + "Smart Browsing" even if such marks are included in the Original + Code or Modifications. + + IV. Inability to Comply Due to Contractual Obligation. + Prior to licensing the Original Code under this License, Netscape + has licensed third party code for use in Netscape's Branded Code. + To the extent that Netscape is limited contractually from making + such third party code available under this License, Netscape may + choose to reintegrate such code into Covered Code without being + required to distribute such code in Source Code form, even if + such code would otherwise be considered "Modifications" under + this License. + + V. Use of Modifications and Covered Code by Initial Developer. + V.1. In General. + The obligations of Section 3 apply to Netscape, except to + the extent specified in this Amendment, Section V.2 and V.3. + + V.2. Other Products. + Netscape may include Covered Code in products other than the + Netscape's Branded Code which are released by Netscape + during the two (2) years following the release date of the + Original Code, without such additional products becoming + subject to the terms of this License, and may license such + additional products on different terms from those contained + in this License. + + V.3. Alternative Licensing. + Netscape may license the Source Code of Netscape's Branded + Code, including Modifications incorporated therein, without + such Netscape Branded Code becoming subject to the terms of + this License, and may license such Netscape Branded Code on + different terms from those contained in this License. + + VI. Litigation. + Notwithstanding the limitations of Section 11 above, the + provisions regarding litigation in Section 11(a), (b) and (c) of + the License shall apply to all disputes relating to this License. + + EXHIBIT A-Netscape Public License. + + "The contents of this file are subject to the Netscape Public + License Version 1.1 (the "License"); you may not use this file + except in compliance with the License. You may obtain a copy of + the License at http://www.mozilla.org/NPL/ + + Software distributed under the License is distributed on an "AS + IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + implied. See the License for the specific language governing + rights and limitations under the License. + + The Original Code is Mozilla Communicator client code, released + March 31, 1998. + + The Initial Developer of the Original Code is Netscape + Communications Corporation. Portions created by Netscape are + Copyright (C) 1998-1999 Netscape Communications Corporation. All + Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the + terms of the _____ license (the "[___] License"), in which case + the provisions of [______] License are applicable instead of + those above. If you wish to allow use of your version of this + file only under the terms of the [____] License and not to allow + others to use your version of this file under the NPL, indicate + your decision by deleting the provisions above and replace them + with the notice and other provisions required by the [___] + License. If you do not delete the provisions above, a recipient + may use your version of this file under either the NPL or the + [___] License." 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 Feb 20 23:04:43 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 20 Feb 2010 22:04:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8707] csw/mgar/pkg/trac/trunk/ Message-ID: Revision: 8707 http://gar.svn.sourceforge.net/gar/?rev=8707&view=rev Author: wahwah Date: 2010-02-20 22:04:43 +0000 (Sat, 20 Feb 2010) Log Message: ----------- trac: Setting svn:externals to v2 Property Changed: ---------------- csw/mgar/pkg/trac/trunk/ Property changes on: csw/mgar/pkg/trac/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2-relocate + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Feb 20 23:07:17 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 20 Feb 2010 22:07:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8708] csw/mgar/pkg Message-ID: Revision: 8708 http://gar.svn.sourceforge.net/gar/?rev=8708&view=rev Author: wahwah Date: 2010-02-20 22:07:17 +0000 (Sat, 20 Feb 2010) Log Message: ----------- protobuf: Initial commit, doesn't build yet. Modified Paths: -------------- csw/mgar/pkg/protobuf/trunk/Makefile csw/mgar/pkg/protobuf/trunk/checksums Added Paths: ----------- csw/mgar/pkg/protobuf/ csw/mgar/pkg/protobuf/trunk/files/std-map-2.patch csw/mgar/pkg/protobuf/trunk/files/std-map-in-google-protobuf-extension_set.cc.patch csw/mgar/pkg/protobuf/trunk/files/stdint-and-ddi.patch csw/mgar/pkg/protobuf/trunk/files/stdint-gcc.patch Modified: csw/mgar/pkg/protobuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-02-13 12:42:13 UTC (rev 8535) +++ csw/mgar/pkg/protobuf/trunk/Makefile 2010-02-20 22:07:17 UTC (rev 8708) @@ -2,184 +2,26 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = protobuf +GARVERSION = 2.3.0 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = encoding structured data in an efficient yet extensible format define BLURB - + Protocol Buffers are a way of encoding structured data in an efficient yet + extensible format. Google uses Protocol Buffers for almost all of its + internal RPC protocols and file formats. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386 +SPKG_SOURCEURL = http://code.google.com/p/protobuf/ +MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +PATCHFILES = stdint-and-ddi.patch +PATCHFILES += std-map-in-google-protobuf-extension_set.cc.patch +PATCHFILES += stdint-gcc.patch +PATCHFILES += std-map-2.patch +LICENSE = COPYING.txt CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +GARCOMPILER = SOS12 +# GARCOMPILER = GNU +include gar/category.mk Modified: csw/mgar/pkg/protobuf/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-02-13 12:42:13 UTC (rev 8535) +++ csw/mgar/pkg/protobuf/trunk/checksums 2010-02-20 22:07:17 UTC (rev 8708) @@ -0,0 +1,5 @@ +65dba2c04923595b6f0a6a44d8106f0a protobuf-2.3.0.tar.gz +ca4082250f24ec40fbce6993bcfb87cd std-map-2.patch +603e491e286232a90cf9b378317db9f2 std-map-in-google-protobuf-extension_set.cc.patch +2c16ccb4bd7120f71d557d2cb9841c42 stdint-and-ddi.patch +d57e96bdf15bb207ba7df46d83b1a6bd stdint-gcc.patch Added: csw/mgar/pkg/protobuf/trunk/files/std-map-2.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/std-map-2.patch (rev 0) +++ csw/mgar/pkg/protobuf/trunk/files/std-map-2.patch 2010-02-20 22:07:17 UTC (rev 8708) @@ -0,0 +1,11 @@ +--- protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface.h.orig 2010-02-20 19:04:19.471295716 +0100 ++++ protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface.h 2010-02-20 19:05:14.390216481 +0100 +@@ -55,6 +55,8 @@ + + namespace compiler { + ++using std::map; ++ + class CodeGenerator; // code_generator.h + class OutputDirectory; // code_generator.h + class DiskSourceTree; // importer.h Added: csw/mgar/pkg/protobuf/trunk/files/std-map-in-google-protobuf-extension_set.cc.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/std-map-in-google-protobuf-extension_set.cc.patch (rev 0) +++ csw/mgar/pkg/protobuf/trunk/files/std-map-in-google-protobuf-extension_set.cc.patch 2010-02-20 22:07:17 UTC (rev 8708) @@ -0,0 +1,243 @@ +From 69fe78fbe6c50a69eb57d20538e78d73d2abab4a Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 20 Feb 2010 15:36:34 +0100 +Subject: [PATCH] std::map in google/protobuf/extension_set.cc + +--- + src/google/protobuf/extension_set.cc | 52 +++++++++++++++++----------------- + 1 files changed, 26 insertions(+), 26 deletions(-) + +diff --git a/src/google/protobuf/extension_set.cc b/src/google/protobuf/extension_set.cc +index 6084885..2cd66f6 100644 +--- a/src/google/protobuf/extension_set.cc ++++ b/src/google/protobuf/extension_set.cc +@@ -162,7 +162,7 @@ void ExtensionSet::RegisterMessageExtension(const MessageLite* containing_type, + ExtensionSet::ExtensionSet() {} + + ExtensionSet::~ExtensionSet() { +- for (map::iterator iter = extensions_.begin(); ++ for (std::map::iterator iter = extensions_.begin(); + iter != extensions_.end(); ++iter) { + iter->second.Free(); + } +@@ -174,20 +174,20 @@ ExtensionSet::~ExtensionSet() { + // vector* output) const + + bool ExtensionSet::Has(int number) const { +- map::const_iterator iter = extensions_.find(number); ++ std::map::const_iterator iter = extensions_.find(number); + if (iter == extensions_.end()) return false; + GOOGLE_DCHECK(!iter->second.is_repeated); + return !iter->second.is_cleared; + } + + int ExtensionSet::ExtensionSize(int number) const { +- map::const_iterator iter = extensions_.find(number); ++ std::map::const_iterator iter = extensions_.find(number); + if (iter == extensions_.end()) return false; + return iter->second.GetSize(); + } + + void ExtensionSet::ClearExtension(int number) { +- map::iterator iter = extensions_.find(number); ++ std::map::iterator iter = extensions_.find(number); + if (iter == extensions_.end()) return; + iter->second.Clear(); + } +@@ -215,7 +215,7 @@ enum Cardinality { + \ + LOWERCASE ExtensionSet::Get##CAMELCASE(int number, \ + LOWERCASE default_value) const { \ +- map::const_iterator iter = extensions_.find(number); \ ++ std::map::const_iterator iter = extensions_.find(number); \ + if (iter == extensions_.end() || iter->second.is_cleared) { \ + return default_value; \ + } else { \ +@@ -240,7 +240,7 @@ void ExtensionSet::Set##CAMELCASE(int number, FieldType type, \ + } \ + \ + LOWERCASE ExtensionSet::GetRepeated##CAMELCASE(int number, int index) const { \ +- map::const_iterator iter = extensions_.find(number); \ ++ std::map::const_iterator iter = extensions_.find(number); \ + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; \ + GOOGLE_DCHECK_TYPE(iter->second, REPEATED, UPPERCASE); \ + return iter->second.repeated_##LOWERCASE##_value->Get(index); \ +@@ -248,7 +248,7 @@ LOWERCASE ExtensionSet::GetRepeated##CAMELCASE(int number, int index) const { \ + \ + void ExtensionSet::SetRepeated##CAMELCASE( \ + int number, int index, LOWERCASE value) { \ +- map::iterator iter = extensions_.find(number); \ ++ std::map::iterator iter = extensions_.find(number); \ + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; \ + GOOGLE_DCHECK_TYPE(iter->second, REPEATED, UPPERCASE); \ + iter->second.repeated_##LOWERCASE##_value->Set(index, value); \ +@@ -285,7 +285,7 @@ PRIMITIVE_ACCESSORS( BOOL, bool, Bool) + // Enums + + int ExtensionSet::GetEnum(int number, int default_value) const { +- map::const_iterator iter = extensions_.find(number); ++ std::map::const_iterator iter = extensions_.find(number); + if (iter == extensions_.end() || iter->second.is_cleared) { + // Not present. Return the default value. + return default_value; +@@ -310,14 +310,14 @@ void ExtensionSet::SetEnum(int number, FieldType type, int value, + } + + int ExtensionSet::GetRepeatedEnum(int number, int index) const { +- map::const_iterator iter = extensions_.find(number); ++ std::map::const_iterator iter = extensions_.find(number); + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; + GOOGLE_DCHECK_TYPE(iter->second, REPEATED, ENUM); + return iter->second.repeated_enum_value->Get(index); + } + + void ExtensionSet::SetRepeatedEnum(int number, int index, int value) { +- map::iterator iter = extensions_.find(number); ++ std::map::iterator iter = extensions_.find(number); + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; + GOOGLE_DCHECK_TYPE(iter->second, REPEATED, ENUM); + iter->second.repeated_enum_value->Set(index, value); +@@ -345,7 +345,7 @@ void ExtensionSet::AddEnum(int number, FieldType type, + + const string& ExtensionSet::GetString(int number, + const string& default_value) const { +- map::const_iterator iter = extensions_.find(number); ++ std::map::const_iterator iter = extensions_.find(number); + if (iter == extensions_.end() || iter->second.is_cleared) { + // Not present. Return the default value. + return default_value; +@@ -371,14 +371,14 @@ string* ExtensionSet::MutableString(int number, FieldType type, + } + + const string& ExtensionSet::GetRepeatedString(int number, int index) const { +- map::const_iterator iter = extensions_.find(number); ++ std::map::const_iterator iter = extensions_.find(number); + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; + GOOGLE_DCHECK_TYPE(iter->second, REPEATED, STRING); + return iter->second.repeated_string_value->Get(index); + } + + string* ExtensionSet::MutableRepeatedString(int number, int index) { +- map::iterator iter = extensions_.find(number); ++ std::map::iterator iter = extensions_.find(number); + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; + GOOGLE_DCHECK_TYPE(iter->second, REPEATED, STRING); + return iter->second.repeated_string_value->Mutable(index); +@@ -404,7 +404,7 @@ string* ExtensionSet::AddString(int number, FieldType type, + + const MessageLite& ExtensionSet::GetMessage( + int number, const MessageLite& default_value) const { +- map::const_iterator iter = extensions_.find(number); ++ std::map::const_iterator iter = extensions_.find(number); + if (iter == extensions_.end()) { + // Not present. Return the default value. + return default_value; +@@ -442,14 +442,14 @@ MessageLite* ExtensionSet::MutableMessage(int number, FieldType type, + + const MessageLite& ExtensionSet::GetRepeatedMessage( + int number, int index) const { +- map::const_iterator iter = extensions_.find(number); ++ std::map::const_iterator iter = extensions_.find(number); + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; + GOOGLE_DCHECK_TYPE(iter->second, REPEATED, MESSAGE); + return iter->second.repeated_message_value->Get(index); + } + + MessageLite* ExtensionSet::MutableRepeatedMessage(int number, int index) { +- map::iterator iter = extensions_.find(number); ++ std::map::iterator iter = extensions_.find(number); + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; + GOOGLE_DCHECK_TYPE(iter->second, REPEATED, MESSAGE); + return iter->second.repeated_message_value->Mutable(index); +@@ -488,7 +488,7 @@ MessageLite* ExtensionSet::AddMessage(int number, FieldType type, + #undef GOOGLE_DCHECK_TYPE + + void ExtensionSet::RemoveLast(int number) { +- map::iterator iter = extensions_.find(number); ++ std::map::iterator iter = extensions_.find(number); + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; + + Extension* extension = &iter->second; +@@ -529,7 +529,7 @@ void ExtensionSet::RemoveLast(int number) { + } + + void ExtensionSet::SwapElements(int number, int index1, int index2) { +- map::iterator iter = extensions_.find(number); ++ std::map::iterator iter = extensions_.find(number); + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; + + Extension* extension = &iter->second; +@@ -572,14 +572,14 @@ void ExtensionSet::SwapElements(int number, int index1, int index2) { + // =================================================================== + + void ExtensionSet::Clear() { +- for (map::iterator iter = extensions_.begin(); ++ for (std::map::iterator iter = extensions_.begin(); + iter != extensions_.end(); ++iter) { + iter->second.Clear(); + } + } + + void ExtensionSet::MergeFrom(const ExtensionSet& other) { +- for (map::const_iterator iter = other.extensions_.begin(); ++ for (std::map::const_iterator iter = other.extensions_.begin(); + iter != other.extensions_.end(); ++iter) { + const Extension& other_extension = iter->second; + +@@ -682,7 +682,7 @@ void ExtensionSet::Swap(ExtensionSet* x) { + bool ExtensionSet::IsInitialized() const { + // Extensions are never required. However, we need to check that all + // embedded messages are initialized. +- for (map::const_iterator iter = extensions_.begin(); ++ for (std::map::const_iterator iter = extensions_.begin(); + iter != extensions_.end(); ++iter) { + const Extension& extension = iter->second; + if (cpp_type(extension.type) == WireFormatLite::CPPTYPE_MESSAGE) { +@@ -1001,7 +1001,7 @@ bool ExtensionSet::ParseMessageSetItem(io::CodedInputStream* input, + void ExtensionSet::SerializeWithCachedSizes( + int start_field_number, int end_field_number, + io::CodedOutputStream* output) const { +- map::const_iterator iter; ++ std::map::const_iterator iter; + for (iter = extensions_.lower_bound(start_field_number); + iter != extensions_.end() && iter->first < end_field_number; + ++iter) { +@@ -1011,7 +1011,7 @@ void ExtensionSet::SerializeWithCachedSizes( + + void ExtensionSet::SerializeMessageSetWithCachedSizes( + io::CodedOutputStream* output) const { +- map::const_iterator iter; ++ std::map::const_iterator iter; + for (iter = extensions_.begin(); iter != extensions_.end(); ++iter) { + iter->second.SerializeMessageSetItemWithCachedSizes(iter->first, output); + } +@@ -1020,7 +1020,7 @@ void ExtensionSet::SerializeMessageSetWithCachedSizes( + int ExtensionSet::ByteSize() const { + int total_size = 0; + +- for (map::const_iterator iter = extensions_.begin(); ++ for (std::map::const_iterator iter = extensions_.begin(); + iter != extensions_.end(); ++iter) { + total_size += iter->second.ByteSize(iter->first); + } +@@ -1031,7 +1031,7 @@ int ExtensionSet::ByteSize() const { + int ExtensionSet::MessageSetByteSize() const { + int total_size = 0; + +- for (map::const_iterator iter = extensions_.begin(); ++ for (std::map::const_iterator iter = extensions_.begin(); + iter != extensions_.end(); ++iter) { + total_size += iter->second.MessageSetItemByteSize(iter->first); + } +@@ -1045,7 +1045,7 @@ int ExtensionSet::MessageSetByteSize() const { + bool ExtensionSet::MaybeNewExtension(int number, + const FieldDescriptor* descriptor, + Extension** result) { +- pair::iterator, bool> insert_result = ++ pair::iterator, bool> insert_result = + extensions_.insert(make_pair(number, Extension())); + *result = &insert_result.first->second; + (*result)->descriptor = descriptor; +-- +1.6.6 + Added: csw/mgar/pkg/protobuf/trunk/files/stdint-and-ddi.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/stdint-and-ddi.patch (rev 0) +++ csw/mgar/pkg/protobuf/trunk/files/stdint-and-ddi.patch 2010-02-20 22:07:17 UTC (rev 8708) @@ -0,0 +1,22 @@ +diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h +index 551ee4a..d0ba7d5 100644 +--- a/src/google/protobuf/stubs/common.h ++++ b/src/google/protobuf/stubs/common.h +@@ -40,13 +40,16 @@ + #include + #include + #include +-#if defined(__osf__) ++#if defined(__osf__) || defined(__SUNPRO_CC) + // Tru64 lacks stdint.h, but has inttypes.h which defines a superset of + // what stdint.h would define. + #include + #elif !defined(_MSC_VER) + #include + #endif ++#if defined(__SUNPRO_CC) ++#include ++#endif + + namespace std {} + Added: csw/mgar/pkg/protobuf/trunk/files/stdint-gcc.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/stdint-gcc.patch (rev 0) +++ csw/mgar/pkg/protobuf/trunk/files/stdint-gcc.patch 2010-02-20 22:07:17 UTC (rev 8708) @@ -0,0 +1,19 @@ +--- protobuf-2.3.0/src/google/protobuf/stubs/common.h.orig 2010-02-20 19:43:54.828914057 +0100 ++++ protobuf-2.3.0/src/google/protobuf/stubs/common.h 2010-02-20 19:44:12.015263840 +0100 +@@ -40,14 +40,14 @@ + #include + #include + #include +-#if defined(__osf__) || defined(__SUNPRO_CC) ++#if defined(__osf__) || defined(__SUNPRO_CC) || defined(__sun__) + // Tru64 lacks stdint.h, but has inttypes.h which defines a superset of + // what stdint.h would define. + #include + #elif !defined(_MSC_VER) + #include + #endif +-#if defined(__SUNPRO_CC) ++#if defined(__SUNPRO_CC) || defined(__sun__) + #include + #endif + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Feb 20 23:11:54 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 20 Feb 2010 22:11:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8709] csw/mgar/pkg/firefox-l10n/trunk/Makefile Message-ID: Revision: 8709 http://gar.svn.sourceforge.net/gar/?rev=8709&view=rev Author: wbonnet Date: 2010-02-20 22:11:52 +0000 (Sat, 20 Feb 2010) Log Message: ----------- First simple list of locales Modified Paths: -------------- csw/mgar/pkg/firefox-l10n/trunk/Makefile Modified: csw/mgar/pkg/firefox-l10n/trunk/Makefile =================================================================== --- csw/mgar/pkg/firefox-l10n/trunk/Makefile 2010-02-20 22:07:17 UTC (rev 8708) +++ csw/mgar/pkg/firefox-l10n/trunk/Makefile 2010-02-20 22:11:52 UTC (rev 8709) @@ -9,8 +9,10 @@ # Definition of the list of locale to process # LANG = af ar be bg bn-IN ca cs cy da de el en-GB eo es-AR es-ES et eu fi fr fy-NL ga-IE gl gu-IN he hi-IN hu id is it ja ka kn ko ku lt lv mk mn mr nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT ro ru si sk sl sq sr sv-SE te th tr uk zh-CN zh-TW +LANG = af ar be bg ca cs cy da de el eo et eu fi fr gl he hu id is it ja ka kn ko ku lt lv mk mn mr nl oc pl ro ru si sk sl sq sr te th tr uk -LANG = de fr +# Short list of locales, used only for testing during build description modification +# LANG = de fr # Set arch to all ARCHALL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Feb 21 00:49:30 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 20 Feb 2010 23:49:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8710] csw/mgar/pkg/firefox-l10n/trunk Message-ID: Revision: 8710 http://gar.svn.sourceforge.net/gar/?rev=8710&view=rev Author: wbonnet Date: 2010-02-20 23:49:30 +0000 (Sat, 20 Feb 2010) Log Message: ----------- Modified Paths: -------------- csw/mgar/pkg/firefox-l10n/trunk/Makefile csw/mgar/pkg/firefox-l10n/trunk/checksums Modified: csw/mgar/pkg/firefox-l10n/trunk/Makefile =================================================================== --- csw/mgar/pkg/firefox-l10n/trunk/Makefile 2010-02-20 22:11:52 UTC (rev 8709) +++ csw/mgar/pkg/firefox-l10n/trunk/Makefile 2010-02-20 23:49:30 UTC (rev 8710) @@ -20,7 +20,7 @@ # Defines the list of packages PACKAGES = $(foreach PKG, $(LANG), CSWfirefox-l10n-$(PKG) ) LICENSE = License -INCOMPATIBLE_PKGS_CSWfirefox-l10n-fr = firefox_fr +INCOMPATIBLE_PKGS_CSWfirefox-l10n-fr = CSWfirefox-fr # Defines the package description $(foreach LOCALE_NAME, $(LANG), $(eval SPKG_DESC_CSWfirefox-l10n-$(LOCALE_NAME) = $(DESCRIPTION) $(LOCALE_NAME))) Modified: csw/mgar/pkg/firefox-l10n/trunk/checksums =================================================================== --- csw/mgar/pkg/firefox-l10n/trunk/checksums 2010-02-20 22:11:52 UTC (rev 8709) +++ csw/mgar/pkg/firefox-l10n/trunk/checksums 2010-02-20 23:49:30 UTC (rev 8710) @@ -1,3 +1,46 @@ ce6efbce92c3d02ffb007c3f56747eb2 License +3314f41475b26e48f0427d3f073b1bdf af.xpi +f5085a6bf085bbbb73a56a55e0fba0bf ar.xpi +7f8650adb4b3ee52e4669eca55cbfa8a be.xpi +db1fed93aae708b9852b01cdbb7aaa1f bg.xpi +67e9259c9547bc55a809a4d16f5c8abf ca.xpi +ab0d4084f83c8eb617493d7f57e45e84 cs.xpi +230d6ee5c9be6453a135e8f30e1cae2c cy.xpi +8e048b8053b59cb227dba3b2ea6a26cc da.xpi 40444641aacef72cae13b149c2f7e941 de.xpi +f1ac89cdf4809376b8a5b4c5dda82d53 el.xpi +2b56fbff905c2c93757464848924eaef eo.xpi +f1e47745cb3d0032cfa2ab75076a5c29 et.xpi +db8b2cd5a1c5f6c6e04f277fec8ab349 eu.xpi +18f9b012bc2956c9e5e702f40ae01a73 fi.xpi 1edb811c4d5d60e9b88282a73d5b041d fr.xpi +d09a4a7307ab972b8424c1613b079474 gl.xpi +6cbd20ad7842f996bfcace7c0943c277 he.xpi +a50b09280ddb6f01d8114e1e0d3e7bdc hu.xpi +253a1f9f72b32247b7dbce04403aa0d2 id.xpi +1847367742ba265c017d8bde40fac0eb is.xpi +60cfc97d1ff530902df557cfafe45427 it.xpi +1079a8e532652c3b8e7a395b7ecec7cc ja.xpi +8718a1d84ecabb9ec6c1248b7d054a96 ka.xpi +b3e281a1faec786a90012dbde72a0d4c kn.xpi +59b5fa6d18f61dbf52d80b3d037e5db7 ko.xpi +120441e49773806d743c22b16274a16a ku.xpi +e33c08be1b02c33421747898083594bd lt.xpi +0dc1a712ee6ac860be480dfef9f4e95a lv.xpi +9731b63138d84c43c6636b2803e11c07 mk.xpi +efc6469398af69ea47953f2ebee4bfa5 mn.xpi +639cead5d4869171674d5fb09db6c18d mr.xpi +4eb7c6331f86513cf3de857597bbce09 nl.xpi +b802e2e2b2578e29dd2c626d15985144 oc.xpi +aec9cc64f3ff4248ff7217192639efce pl.xpi +a110c7e95f98032465f07673041d3ce9 ro.xpi +1cebeb16caadcddc605af9d706ab02d2 ru.xpi +93cd509ea77771ef834bdf1826f83c2d si.xpi +3f6b3de621b302e3d95705888ffdd963 sk.xpi +5bb4011d9cb3196effeed44464eee26a sl.xpi +3ff7ef55daa28e97b02e611f02a170d1 sq.xpi +b142c25c255eb5dad0b3d4f5fd8d9e2d sr.xpi +17f5282c0e7a996f750d096390e0a72e te.xpi +0c1f649c0197fc69201e36dcddb90aa2 th.xpi +e752c22649f0e895af6a2df712725bfa tr.xpi +fb9da329b398526b05a3e64f43153200 uk.xpi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Feb 21 01:21:45 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 21 Feb 2010 00:21:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8711] csw/mgar/pkg/firefox-l10n/trunk Message-ID: Revision: 8711 http://gar.svn.sourceforge.net/gar/?rev=8711&view=rev Author: wbonnet Date: 2010-02-21 00:21:45 +0000 (Sun, 21 Feb 2010) Log Message: ----------- Fix catalogue names, reduce package name length Modified Paths: -------------- csw/mgar/pkg/firefox-l10n/trunk/Makefile csw/mgar/pkg/firefox-l10n/trunk/checksums Modified: csw/mgar/pkg/firefox-l10n/trunk/Makefile =================================================================== --- csw/mgar/pkg/firefox-l10n/trunk/Makefile 2010-02-20 23:49:30 UTC (rev 8710) +++ csw/mgar/pkg/firefox-l10n/trunk/Makefile 2010-02-21 00:21:45 UTC (rev 8711) @@ -8,28 +8,27 @@ endef # Definition of the list of locale to process -# LANG = af ar be bg bn-IN ca cs cy da de el en-GB eo es-AR es-ES et eu fi fr fy-NL ga-IE gl gu-IN he hi-IN hu id is it ja ka kn ko ku lt lv mk mn mr nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT ro ru si sk sl sq sr sv-SE te th tr uk zh-CN zh-TW -LANG = af ar be bg ca cs cy da de el eo et eu fi fr gl he hu id is it ja ka kn ko ku lt lv mk mn mr nl oc pl ro ru si sk sl sq sr te th tr uk +LANG = af ar be bg bn-IN ca cs cy da de el en-GB eo es-AR es-ES et eu fi fr fy-NL ga-IE gl gu-IN he hi-IN hu id is it ja ka kn ko ku lt lv mk mn mr nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT ro ru si sk sl sq sr sv-SE te th tr uk zh-CN zh-TW # Short list of locales, used only for testing during build description modification -# LANG = de fr +# LANG = de fr pt-PT # Set arch to all ARCHALL = 1 # Defines the list of packages -PACKAGES = $(foreach PKG, $(LANG), CSWfirefox-l10n-$(PKG) ) +PACKAGES = $(foreach PKG, $(LANG), CSWffox-l10n-$(PKG) ) LICENSE = License -INCOMPATIBLE_PKGS_CSWfirefox-l10n-fr = CSWfirefox-fr +INCOMPATIBLE_PKGS_CSWffox-l10n-fr = CSWfirefox-fr # Defines the package description -$(foreach LOCALE_NAME, $(LANG), $(eval SPKG_DESC_CSWfirefox-l10n-$(LOCALE_NAME) = $(DESCRIPTION) $(LOCALE_NAME))) +$(foreach LOCALE_NAME, $(LANG), $(eval SPKG_DESC_CSWffox-l10n-$(LOCALE_NAME) = $(DESCRIPTION) $(LOCALE_NAME))) # Defines the catalog names -$(foreach LOCALE_NAME, $(LANG), $(eval CATALOGNAME_CSWfirefox-l10n-$(LOCALE_NAME) = firefox_l10n_$(LOCALE_NAME))) +$(foreach LOCALE_NAME, $(LANG), $(eval CATALOGNAME_CSWffox-l10n-$(LOCALE_NAME) = firefox_l10n_$(shell echo $(LOCALE_NAME) | tr \- _ | tr [A-Z] [a-z] ))) # Defines the files filters -$(foreach LOCALE_NAME, $(LANG), $(eval PKGFILES_CSWfirefox-l10n-$(LOCALE_NAME) = .*langpack-$(LOCALE_NAME).*)) +$(foreach LOCALE_NAME, $(LANG), $(eval PKGFILES_CSWffox-l10n-$(LOCALE_NAME) = .*langpack-$(LOCALE_NAME).*)) # Defines the content to be downloaded MASTER_SITES = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(GARVERSION)/linux-i686/xpi/ Modified: csw/mgar/pkg/firefox-l10n/trunk/checksums =================================================================== --- csw/mgar/pkg/firefox-l10n/trunk/checksums 2010-02-20 23:49:30 UTC (rev 8710) +++ csw/mgar/pkg/firefox-l10n/trunk/checksums 2010-02-21 00:21:45 UTC (rev 8711) @@ -1,46 +1,2 @@ ce6efbce92c3d02ffb007c3f56747eb2 License -3314f41475b26e48f0427d3f073b1bdf af.xpi -f5085a6bf085bbbb73a56a55e0fba0bf ar.xpi -7f8650adb4b3ee52e4669eca55cbfa8a be.xpi -db1fed93aae708b9852b01cdbb7aaa1f bg.xpi -67e9259c9547bc55a809a4d16f5c8abf ca.xpi -ab0d4084f83c8eb617493d7f57e45e84 cs.xpi -230d6ee5c9be6453a135e8f30e1cae2c cy.xpi -8e048b8053b59cb227dba3b2ea6a26cc da.xpi -40444641aacef72cae13b149c2f7e941 de.xpi -f1ac89cdf4809376b8a5b4c5dda82d53 el.xpi -2b56fbff905c2c93757464848924eaef eo.xpi -f1e47745cb3d0032cfa2ab75076a5c29 et.xpi -db8b2cd5a1c5f6c6e04f277fec8ab349 eu.xpi -18f9b012bc2956c9e5e702f40ae01a73 fi.xpi -1edb811c4d5d60e9b88282a73d5b041d fr.xpi -d09a4a7307ab972b8424c1613b079474 gl.xpi -6cbd20ad7842f996bfcace7c0943c277 he.xpi -a50b09280ddb6f01d8114e1e0d3e7bdc hu.xpi -253a1f9f72b32247b7dbce04403aa0d2 id.xpi -1847367742ba265c017d8bde40fac0eb is.xpi -60cfc97d1ff530902df557cfafe45427 it.xpi -1079a8e532652c3b8e7a395b7ecec7cc ja.xpi -8718a1d84ecabb9ec6c1248b7d054a96 ka.xpi -b3e281a1faec786a90012dbde72a0d4c kn.xpi -59b5fa6d18f61dbf52d80b3d037e5db7 ko.xpi -120441e49773806d743c22b16274a16a ku.xpi -e33c08be1b02c33421747898083594bd lt.xpi -0dc1a712ee6ac860be480dfef9f4e95a lv.xpi -9731b63138d84c43c6636b2803e11c07 mk.xpi -efc6469398af69ea47953f2ebee4bfa5 mn.xpi -639cead5d4869171674d5fb09db6c18d mr.xpi -4eb7c6331f86513cf3de857597bbce09 nl.xpi -b802e2e2b2578e29dd2c626d15985144 oc.xpi -aec9cc64f3ff4248ff7217192639efce pl.xpi -a110c7e95f98032465f07673041d3ce9 ro.xpi -1cebeb16caadcddc605af9d706ab02d2 ru.xpi -93cd509ea77771ef834bdf1826f83c2d si.xpi -3f6b3de621b302e3d95705888ffdd963 sk.xpi -5bb4011d9cb3196effeed44464eee26a sl.xpi -3ff7ef55daa28e97b02e611f02a170d1 sq.xpi -b142c25c255eb5dad0b3d4f5fd8d9e2d sr.xpi -17f5282c0e7a996f750d096390e0a72e te.xpi -0c1f649c0197fc69201e36dcddb90aa2 th.xpi -e752c22649f0e895af6a2df712725bfa tr.xpi -fb9da329b398526b05a3e64f43153200 uk.xpi +2c9eea7b3ccc9ce1bcd8f387afebaaab pt-PT.xpi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Feb 21 01:25:15 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 21 Feb 2010 00:25:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[8712] csw/mgar/pkg/firefox-l10n/trunk/Makefile Message-ID: Revision: 8712 http://gar.svn.sourceforge.net/gar/?rev=8712&view=rev Author: wbonnet Date: 2010-02-21 00:25:15 +0000 (Sun, 21 Feb 2010) Log Message: ----------- Add Firefox as runtime depend Modified Paths: -------------- csw/mgar/pkg/firefox-l10n/trunk/Makefile Modified: csw/mgar/pkg/firefox-l10n/trunk/Makefile =================================================================== --- csw/mgar/pkg/firefox-l10n/trunk/Makefile 2010-02-21 00:21:45 UTC (rev 8711) +++ csw/mgar/pkg/firefox-l10n/trunk/Makefile 2010-02-21 00:25:15 UTC (rev 8712) @@ -19,8 +19,13 @@ # Defines the list of packages PACKAGES = $(foreach PKG, $(LANG), CSWffox-l10n-$(PKG) ) LICENSE = License + +# There was previously a french localization package. It is renamed, thus declared as incompatible INCOMPATIBLE_PKGS_CSWffox-l10n-fr = CSWfirefox-fr +# Add firefox as a depend +RUNTIME_DEP_PKGS = CSWfirefox + # Defines the package description $(foreach LOCALE_NAME, $(LANG), $(eval SPKG_DESC_CSWffox-l10n-$(LOCALE_NAME) = $(DESCRIPTION) $(LOCALE_NAME))) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Feb 21 09:54:47 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 21 Feb 2010 08:54:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[8713] csw/mgar/pkg/protobuf/trunk Message-ID: Revision: 8713 http://gar.svn.sourceforge.net/gar/?rev=8713&view=rev Author: wahwah Date: 2010-02-21 08:54:47 +0000 (Sun, 21 Feb 2010) Log Message: ----------- protobuf: More patches, still doesn't build, http://code.google.com/p/protobuf/issues/detail?id=166 Modified Paths: -------------- csw/mgar/pkg/protobuf/trunk/Makefile csw/mgar/pkg/protobuf/trunk/checksums Added Paths: ----------- csw/mgar/pkg/protobuf/trunk/files/std-map-again.patch csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again-include-map.patch csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again.patch csw/mgar/pkg/protobuf/trunk/files/strtof.patch csw/mgar/pkg/protobuf/trunk/files/vector-in-repeated_field.h.patch Modified: csw/mgar/pkg/protobuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/protobuf/trunk/Makefile 2010-02-21 00:25:15 UTC (rev 8712) +++ csw/mgar/pkg/protobuf/trunk/Makefile 2010-02-21 08:54:47 UTC (rev 8713) @@ -2,6 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Still doesn't build, I've filed a bug: +# http://code.google.com/p/protobuf/issues/detail?id=166 + GARNAME = protobuf GARVERSION = 2.3.0 CATEGORIES = lib @@ -20,6 +23,11 @@ PATCHFILES += std-map-in-google-protobuf-extension_set.cc.patch PATCHFILES += stdint-gcc.patch PATCHFILES += std-map-2.patch +PATCHFILES += vector-in-repeated_field.h.patch +PATCHFILES += strtof.patch +PATCHFILES += std-map-again.patch +PATCHFILES += std-map-yet-again.patch +PATCHFILES += std-map-yet-again-include-map.patch LICENSE = COPYING.txt CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = SOS12 Modified: csw/mgar/pkg/protobuf/trunk/checksums =================================================================== --- csw/mgar/pkg/protobuf/trunk/checksums 2010-02-21 00:25:15 UTC (rev 8712) +++ csw/mgar/pkg/protobuf/trunk/checksums 2010-02-21 08:54:47 UTC (rev 8713) @@ -1,5 +1,10 @@ 65dba2c04923595b6f0a6a44d8106f0a protobuf-2.3.0.tar.gz ca4082250f24ec40fbce6993bcfb87cd std-map-2.patch +0b2f1b0bd5747aefe412af51b7434294 std-map-again.patch 603e491e286232a90cf9b378317db9f2 std-map-in-google-protobuf-extension_set.cc.patch +e02c84596b8b4a03d5a160469edc8187 std-map-yet-again-include-map.patch +20dee4f5aa23962864d55423fcbc63aa std-map-yet-again.patch 2c16ccb4bd7120f71d557d2cb9841c42 stdint-and-ddi.patch d57e96bdf15bb207ba7df46d83b1a6bd stdint-gcc.patch +c22e22af396037fd24f8c5e276b31d98 strtof.patch +d2919404a19d4dd38d4e4378014b4518 vector-in-repeated_field.h.patch Added: csw/mgar/pkg/protobuf/trunk/files/std-map-again.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/std-map-again.patch (rev 0) +++ csw/mgar/pkg/protobuf/trunk/files/std-map-again.patch 2010-02-21 08:54:47 UTC (rev 8713) @@ -0,0 +1,11 @@ +--- protobuf-2.3.0/src/google/protobuf/descriptor_database.h.orig 2010-02-20 23:33:10.978002985 +0100 ++++ protobuf-2.3.0/src/google/protobuf/descriptor_database.h 2010-02-20 23:33:21.265334100 +0100 +@@ -233,7 +233,7 @@ + + // Find the last entry in the by_symbol_ map whose key is less than or + // equal to the given name. +- typename map::iterator FindLastLessOrEqual( ++ typename std::map::iterator FindLastLessOrEqual( + const string& name); + + // True if either the arguments are equal or super_symbol identifies a Added: csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again-include-map.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again-include-map.patch (rev 0) +++ csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again-include-map.patch 2010-02-21 08:54:47 UTC (rev 8713) @@ -0,0 +1,10 @@ +--- protobuf-2.3.0/src/google/protobuf/descriptor_database.cc.orig 2010-02-20 23:39:07.835347049 +0100 ++++ protobuf-2.3.0/src/google/protobuf/descriptor_database.cc 2010-02-20 23:43:55.328201640 +0100 +@@ -35,6 +35,7 @@ + #include + + #include ++#include + + #include + #include Added: csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again.patch (rev 0) +++ csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again.patch 2010-02-21 08:54:47 UTC (rev 8713) @@ -0,0 +1,38 @@ +--- protobuf-2.3.0/src/google/protobuf/descriptor_database.cc.orig 2010-02-20 23:39:07.835347049 +0100 ++++ protobuf-2.3.0/src/google/protobuf/descriptor_database.cc 2010-02-20 23:39:49.843758591 +0100 +@@ -97,7 +97,7 @@ + + // Try to look up the symbol to make sure a super-symbol doesn't already + // exist. +- typename map::iterator iter = FindLastLessOrEqual(name); ++ typename std::map::iterator iter = FindLastLessOrEqual(name); + + if (iter == by_symbol_.end()) { + // Apparently the map is currently empty. Just insert and be done with it. +@@ -179,7 +179,7 @@ + template + Value SimpleDescriptorDatabase::DescriptorIndex::FindSymbol( + const string& name) { +- typename map::iterator iter = FindLastLessOrEqual(name); ++ typename std::map::iterator iter = FindLastLessOrEqual(name); + + return (iter != by_symbol_.end() && IsSubSymbol(iter->first, name)) ? + iter->second : Value(); +@@ -198,7 +198,7 @@ + bool SimpleDescriptorDatabase::DescriptorIndex::FindAllExtensionNumbers( + const string& containing_type, + vector* output) { +- typename map, Value >::const_iterator it = ++ typename std::map, Value >::const_iterator it = + by_extension_.lower_bound(make_pair(containing_type, 0)); + bool success = false; + +@@ -212,7 +212,7 @@ + } + + template +-typename map::iterator ++typename std::map::iterator + SimpleDescriptorDatabase::DescriptorIndex::FindLastLessOrEqual( + const string& name) { + // Find the last key in the map which sorts less than or equal to the Added: csw/mgar/pkg/protobuf/trunk/files/strtof.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/strtof.patch (rev 0) +++ csw/mgar/pkg/protobuf/trunk/files/strtof.patch 2010-02-21 08:54:47 UTC (rev 8713) @@ -0,0 +1,13 @@ +--- protobuf-2.3.0/src/google/protobuf/stubs/strutil.h.orig 2010-02-20 23:30:45.020320818 +0100 ++++ protobuf-2.3.0/src/google/protobuf/stubs/strutil.h 2010-02-20 23:31:46.345602745 +0100 +@@ -37,6 +37,10 @@ + #include + #include + ++#if defined(__SUNPRO_CC) ++#define strtof strtod ++#endif ++ + namespace google { + namespace protobuf { + Added: csw/mgar/pkg/protobuf/trunk/files/vector-in-repeated_field.h.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/vector-in-repeated_field.h.patch (rev 0) +++ csw/mgar/pkg/protobuf/trunk/files/vector-in-repeated_field.h.patch 2010-02-21 08:54:47 UTC (rev 8713) @@ -0,0 +1,10 @@ +--- protobuf-2.3.0/src/google/protobuf/repeated_field.h.orig 2010-02-20 23:27:43.399507660 +0100 ++++ protobuf-2.3.0/src/google/protobuf/repeated_field.h 2010-02-20 23:27:56.747055871 +0100 +@@ -48,6 +48,7 @@ + + #include + #include ++#include + #include + #include + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Feb 21 12:32:29 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 21 Feb 2010 11:32:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8714] csw/mgar/pkg/firefox-l10n/trunk/checksums Message-ID: Revision: 8714 http://gar.svn.sourceforge.net/gar/?rev=8714&view=rev Author: wbonnet Date: 2010-02-21 11:32:29 +0000 (Sun, 21 Feb 2010) Log Message: ----------- Final tweak Modified Paths: -------------- csw/mgar/pkg/firefox-l10n/trunk/checksums Modified: csw/mgar/pkg/firefox-l10n/trunk/checksums =================================================================== --- csw/mgar/pkg/firefox-l10n/trunk/checksums 2010-02-21 08:54:47 UTC (rev 8713) +++ csw/mgar/pkg/firefox-l10n/trunk/checksums 2010-02-21 11:32:29 UTC (rev 8714) @@ -1,2 +1,62 @@ ce6efbce92c3d02ffb007c3f56747eb2 License +3314f41475b26e48f0427d3f073b1bdf af.xpi +f5085a6bf085bbbb73a56a55e0fba0bf ar.xpi +7f8650adb4b3ee52e4669eca55cbfa8a be.xpi +db1fed93aae708b9852b01cdbb7aaa1f bg.xpi +4cfe48b7251a35308e2944e15a01c89b bn-IN.xpi +67e9259c9547bc55a809a4d16f5c8abf ca.xpi +ab0d4084f83c8eb617493d7f57e45e84 cs.xpi +230d6ee5c9be6453a135e8f30e1cae2c cy.xpi +8e048b8053b59cb227dba3b2ea6a26cc da.xpi +40444641aacef72cae13b149c2f7e941 de.xpi +f1ac89cdf4809376b8a5b4c5dda82d53 el.xpi +dc668d9554698a70d129843cc3084cc1 en-GB.xpi +2b56fbff905c2c93757464848924eaef eo.xpi +b37dc8562227bd1ae79b529f63963f64 es-AR.xpi +c3ec5961b48d3bdb90a6462a33e894eb es-ES.xpi +f1e47745cb3d0032cfa2ab75076a5c29 et.xpi +db8b2cd5a1c5f6c6e04f277fec8ab349 eu.xpi +18f9b012bc2956c9e5e702f40ae01a73 fi.xpi +1edb811c4d5d60e9b88282a73d5b041d fr.xpi +96a1fc6c4a2d3ced49e611d2d3d455a4 fy-NL.xpi +3fa2918558de0d6c6816a622ab6fe5ce ga-IE.xpi +d09a4a7307ab972b8424c1613b079474 gl.xpi +e20fdd0d33685dbc60e13686a117880e gu-IN.xpi +6cbd20ad7842f996bfcace7c0943c277 he.xpi +93d9ea2cbf2b2c60c56b13f84e821bf8 hi-IN.xpi +a50b09280ddb6f01d8114e1e0d3e7bdc hu.xpi +253a1f9f72b32247b7dbce04403aa0d2 id.xpi +1847367742ba265c017d8bde40fac0eb is.xpi +60cfc97d1ff530902df557cfafe45427 it.xpi +1079a8e532652c3b8e7a395b7ecec7cc ja.xpi +8718a1d84ecabb9ec6c1248b7d054a96 ka.xpi +b3e281a1faec786a90012dbde72a0d4c kn.xpi +59b5fa6d18f61dbf52d80b3d037e5db7 ko.xpi +120441e49773806d743c22b16274a16a ku.xpi +e33c08be1b02c33421747898083594bd lt.xpi +0dc1a712ee6ac860be480dfef9f4e95a lv.xpi +9731b63138d84c43c6636b2803e11c07 mk.xpi +efc6469398af69ea47953f2ebee4bfa5 mn.xpi +639cead5d4869171674d5fb09db6c18d mr.xpi +057fe7a193e3d92eb2974cbadeabcf51 nb-NO.xpi +4eb7c6331f86513cf3de857597bbce09 nl.xpi +cbe8739c13cd99fbd46a4e05cd7f5f4c nn-NO.xpi +b802e2e2b2578e29dd2c626d15985144 oc.xpi +caa8762f52e6326a82e5d885e25cd99a pa-IN.xpi +aec9cc64f3ff4248ff7217192639efce pl.xpi +fd2f36c18e6b63866b303d446ef24c70 pt-BR.xpi 2c9eea7b3ccc9ce1bcd8f387afebaaab pt-PT.xpi +a110c7e95f98032465f07673041d3ce9 ro.xpi +1cebeb16caadcddc605af9d706ab02d2 ru.xpi +93cd509ea77771ef834bdf1826f83c2d si.xpi +3f6b3de621b302e3d95705888ffdd963 sk.xpi +5bb4011d9cb3196effeed44464eee26a sl.xpi +3ff7ef55daa28e97b02e611f02a170d1 sq.xpi +b142c25c255eb5dad0b3d4f5fd8d9e2d sr.xpi +33e228fd6583ed37fed9246c00f36d32 sv-SE.xpi +17f5282c0e7a996f750d096390e0a72e te.xpi +0c1f649c0197fc69201e36dcddb90aa2 th.xpi +e752c22649f0e895af6a2df712725bfa tr.xpi +fb9da329b398526b05a3e64f43153200 uk.xpi +0824ab86aa80509ac6fc5890c1371606 zh-CN.xpi +f0c299b746a182c1569752c4efd0b8af zh-TW.xpi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Feb 21 13:18:05 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 21 Feb 2010 12:18:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[8715] csw/mgar/gar/v2/lib/python Message-ID: Revision: 8715 http://gar.svn.sourceforge.net/gar/?rev=8715&view=rev Author: wahwah Date: 2010-02-21 12:18:05 +0000 (Sun, 21 Feb 2010) Log Message: ----------- mGAR v2: submitpkg, ported to use Cheetah templates, added unit tests Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/opencsw_test.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-21 11:32:29 UTC (rev 8714) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-21 12:18:05 UTC (rev 8715) @@ -25,6 +25,7 @@ import tempfile import urllib2 import checkpkg +from Cheetah import Template ARCHITECTURES = ["i386", "sparc", "all"] MAJOR_VERSION = "major version" @@ -57,18 +58,32 @@ proxy= """ -EMAIL_TMPL = """From: %(from)s -To: %(to)s -%(optional_cc)sDate: %(date)s -Subject: newpkgs %(pkgnames)s +SUBMITPKG_TMPL = """From: $from +To: $to +#if $cc +Cc: $cc +#end if +Subject: $subject -%(body)s +#for $pkg_group in $pkg_groups +#if $pkg_group.upgrade_type == $NEW_PACKAGE +* $pkg_group.name: new package +#elif $pkg_group.upgrade_type == $NO_VERSION_CHANGE +* WARNING: no version change of $pkg_group.name +#else +* $pkg_group.name: $pkg_group.upgrade_type upgrade + - from: $pkg_group.versions[0] + - to: $pkg_group.versions[1] +#end if +#for pkg in $pkg_group.pkgs + + $pkg.basename +#end for +#end for -- -Generated by submitpkg, $Rev$. +Generated by submitpkg """ - class Error(Exception): pass @@ -278,12 +293,13 @@ self.release_cc = unicode(release_cc) def FormatMail(self): - body_list = ["The following package files are ready to be released:"] - body_list.append("") - # Gathering package information, grouping packages that are upgraded - # together. + return self._FormatMail(self.paths, self.pkgnames, self.sender, + self.release_mgr, self.release_cc) + + def _GetPkgsData(self, paths): + """Gathering package info, grouping packages that are upgraded together.""" pkgs_data = {} - for p in self.paths: + for p in paths: base_file_name = os.path.split(p)[1] catalogname = base_file_name.split("-")[0] pkg = CatalogBasedOpencswPackage(catalogname) @@ -302,37 +318,38 @@ pkg.cat_version_str = catalog_version_str pkg.new_version_str = new_version_str pkgs_data[pkgs_data_key].append(pkg) + return pkgs_data + + def _FormatMail(self, paths, pkgnames, sender, release_mgr, release_cc): + pkgs_data = self._GetPkgsData(paths) # Formatting grouped packages: + pkg_groups = [] for upgrade_type, upgrade_msg, versions in pkgs_data: - msg = [] + pkg_group = {} + pkg_group["upgrade_type"] = upgrade_type + pkg_group["upgrade_msg"] = upgrade_msg + pkg_group["versions"] = versions pkgs = pkgs_data[(upgrade_type, upgrade_msg, versions)] group_name = CatalogNameGroupName([pkg.catalogname for pkg in pkgs]) - if upgrade_type == NEW_PACKAGE: - msg.append("* %s: %s" % (upgrade_type, group_name)) - elif upgrade_type == NO_VERSION_CHANGE: - msg.append("* WARNING: no version change of %s" % group_name) - else: - msg.append("* %s: %s upgrade" % (group_name, upgrade_type)) - msg.append(" - from: %s" % versions[0]) - msg.append(" - to: %s" % versions[1]) - for pkg in pkgs: - msg.append(" + %s" % os.path.split(pkg.srv4path)[1]) - body_list.extend(msg) - body_list.append("") - body = "\n".join(body_list) - # TODO: This needs to be rewritten using Cheetah - d = { - 'from': self.sender, - 'to': self.release_mgr, - 'optional_cc': '', - 'pkgnames': ", ".join(self.pkgnames), - 'body': body, + pkg_group["name"] = group_name + pkg_group["pkgs"] = [{'basename': os.path.basename(x.srv4path)} for x in pkgs] + pkg_groups.append(pkg_group) + subject = u"newpkgs %s" % (", ".join(pkgnames)) + if len(subject) > 50: + subject = "%s(...)" % (subject[:45],) + # Cheetah + namespace = { + 'from': sender, + 'to': release_mgr, + 'cc': release_cc, + 'subject': subject, 'date': datetime.datetime.now(), + 'pkg_groups': pkg_groups, + 'NEW_PACKAGE': NEW_PACKAGE, + 'NO_VERSION_CHANGE': NO_VERSION_CHANGE, } - if self.release_cc: - d['optional_cc'] = "cc: %s\n" % self.release_cc - mail_text = EMAIL_TMPL % d - return mail_text + t = Template.Template(SUBMITPKG_TMPL, searchList=[namespace]) + return unicode(t) def GetEditorName(self, env): editor = "/opt/csw/bin/vim" Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-02-21 11:32:29 UTC (rev 8714) +++ csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-02-21 12:18:05 UTC (rev 8715) @@ -1,10 +1,13 @@ #!/opt/csw/bin/python2.6 # $Id$ +import copy +import datetime import opencsw import os.path import re import unittest +from Cheetah import Template CATALOG_DATA_1 = """amavisd_new 2.6.3,REV=2009.04.23 CSWamavisdnew amavisd_new-2.6.3,REV=2009.04.23-SunOS5.8-all-CSW.pkg.gz 831f063d1ba20eb8bea0e0e60ceef3cb 813802 CSWperl|CSWcswclassutils|CSWpmunixsyslog|CSWpmiostringy|CSWpmnetserver|CSWpmmailtools|CSWpmmimetools|CSWpmcompresszlib|CSWpmarchivetar|CSWpmarchivezip|CSWspamassassin|CSWpmberkeleydb|CSWpmconverttnef|CSWpmconvertuulib|CSWpmmaildkim|CSWcommon none amsn 0.94 CSWamsn amsn-0.94-SunOS5.8-all-CSW.pkg.gz 99afd828dd38fb39a37cb8ffd448b098 2420919 CSWtcl|CSWtk|CSWtcltls none @@ -60,11 +63,45 @@ 1 i preinstall 1488 45678 125630250 """ +SUBMITPKG_DATA_1 = { + 'NEW_PACKAGE': 'new package', + 'to': u'Release Manager ', + 'NO_VERSION_CHANGE': 'no version change', + 'from': u'Maciej Blizinski ', + 'date': datetime.datetime(2010, 2, 21, 12, 52, 44, 295766), + 'cc': None, + 'pkg_groups': [ + {'upgrade_msg': '1.5.2.2,REV=2009.09.04 --> 1.5.3,REV=2010.02.02', + 'versions': ('1.5.2.2,REV=2009.09.04', '1.5.3,REV=2010.02.02'), + 'pkgs': [ + {'basename': 'tree-1.5.3,REV=2010.02.02-SunOS5.8-i386-CSW.pkg.gz'}, + {'basename': 'tree-1.5.3,REV=2010.02.02-SunOS5.8-sparc-CSW.pkg.gz'} + ], + 'name': 'tree', + 'upgrade_type': opencsw.PATCHLEVEL, + } + ], + 'subject': u'newpkgs tree' +} +SUBMITPKG_EXPECTED_1 = u"""From: Maciej Blizinski +To: Release Manager +Subject: newpkgs tree +* tree: patchlevel upgrade + - from: 1.5.2.2,REV=2009.09.04 + - to: 1.5.3,REV=2010.02.02 + + tree-1.5.3,REV=2010.02.02-SunOS5.8-i386-CSW.pkg.gz + + tree-1.5.3,REV=2010.02.02-SunOS5.8-sparc-CSW.pkg.gz + +-- +Generated by submitpkg +""" + class ParsePackageFileNameTest(unittest.TestCase): def testParsePackageFileName1(self): - test_data = open(os.path.join(os.path.split(__file__)[0], "testdata/example-catalog.txt")) + test_data = open(os.path.join(os.path.split(__file__)[0], + "testdata/example-catalog.txt")) split_re = re.compile(r"\s+") for line in test_data: fields = re.split(split_re, line) @@ -247,18 +284,18 @@ class PkgmapUnitTest(unittest.TestCase): - + def test_1(self): pkgmap = opencsw.Pkgmap(PKGMAP_1.splitlines()) expected = [ { - 'group': 'bin', - 'user': 'root', - 'path': '/etc/opt/csw/cups/cupsd.conf.CSW', - 'line': '1 f cswcpsampleconf /etc/opt/csw/cups/cupsd.conf.CSW 0644 root bin 4053 20987 1264420689', - 'type': 'f', - 'class': 'cswcpsampleconf', - 'mode': '0644' + 'group': 'bin', + 'user': 'root', + 'path': '/etc/opt/csw/cups/cupsd.conf.CSW', + 'line': '1 f cswcpsampleconf /etc/opt/csw/cups/cupsd.conf.CSW 0644 root bin 4053 20987 1264420689', + 'type': 'f', + 'class': 'cswcpsampleconf', + 'mode': '0644' } ] self.assertEqual(expected, pkgmap.entries) @@ -282,9 +319,9 @@ {"a": 3}, ] expected = { - 1: [{'a': 1}], - 2: [{'a': 2}], - 3: [{'a': 3}], + 1: [{'a': 1}], + 2: [{'a': 2}], + 3: [{'a': 3}], } self.assertEquals(expected, opencsw.IndexDictsBy(list_of_dicts, "a")) @@ -304,5 +341,30 @@ self.assertEquals(expected, opencsw.IndexDictsBy(list_of_dicts, "a")) +class SubmitpkgTemplateUnitTest(unittest.TestCase): + + def testTypicalUpgradeStrict(self): + """Strict testing of standard upgrade.""" + t = Template.Template(opencsw.SUBMITPKG_TMPL, + searchList=[SUBMITPKG_DATA_1]) + self.assertEquals(SUBMITPKG_EXPECTED_1, unicode(t)) + + def testWarningOnNoChange(self): + """If there's no version change, a warning is needed.""" + submitpkg_data = copy.deepcopy(SUBMITPKG_DATA_1) + submitpkg_data["pkg_groups"][0]["upgrade_type"] = opencsw.NO_VERSION_CHANGE + t = Template.Template(opencsw.SUBMITPKG_TMPL, + searchList=[submitpkg_data]) + self.assertTrue(re.search(r"WARNING", unicode(t)), unicode(t)) + + def testNewPackage(self): + """Tests for "new package" somewhere in the message.""" + submitpkg_data = copy.deepcopy(SUBMITPKG_DATA_1) + submitpkg_data["pkg_groups"][0]["upgrade_type"] = opencsw.NEW_PACKAGE + t = Template.Template(opencsw.SUBMITPKG_TMPL, + searchList=[submitpkg_data]) + self.assertTrue(re.search(r"new package", unicode(t)), unicode(t)) + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Feb 21 13:25:35 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 21 Feb 2010 12:25:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[8716] csw/mgar/gar/v2/lib/python Message-ID: Revision: 8716 http://gar.svn.sourceforge.net/gar/?rev=8716&view=rev Author: wahwah Date: 2010-02-21 12:25:35 +0000 (Sun, 21 Feb 2010) Log Message: ----------- mGAR v2: submitpkg, for packages foo_a and foo_b, return group name foo, not foo_. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/opencsw_test.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-21 12:18:05 UTC (rev 8715) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-21 12:25:35 UTC (rev 8716) @@ -562,6 +562,9 @@ catalogname_list.pop()) if substring_set: current_substring = list(substring_set)[0] + # If it's something like foo_, make it foo. + while current_substring and not current_substring[-1].isalnum(): + current_substring = current_substring[:-1] if len(current_substring) >= 2: return current_substring return "various packages" Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-02-21 12:18:05 UTC (rev 8715) +++ csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-02-21 12:25:35 UTC (rev 8716) @@ -261,6 +261,8 @@ ("foo", ["foo"]), ("foo", ["foo", "libfoo"]), ("foo", ["foo", "libfoo", "foo_devel"]), + ("foo_ba", ["foo_bar", "foo_baz"]), + ("foo", ["foo_a", "foo_b"]), ("various packages", ["foo", "libfoo", "foo_devel", "bar"]), ] for expected_name, catalogname_list in data: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Feb 21 15:43:44 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 21 Feb 2010 14:43:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8717] csw/mgar/pkg Message-ID: Revision: 8717 http://gar.svn.sourceforge.net/gar/?rev=8717&view=rev Author: bensons Date: 2010-02-21 14:43:44 +0000 (Sun, 21 Feb 2010) Log Message: ----------- gstplugins_good: initial GAR recipe Added Paths: ----------- csw/mgar/pkg/gstplugins_good/ csw/mgar/pkg/gstplugins_good/branches/ csw/mgar/pkg/gstplugins_good/tags/ csw/mgar/pkg/gstplugins_good/trunk/ csw/mgar/pkg/gstplugins_good/trunk/Makefile csw/mgar/pkg/gstplugins_good/trunk/checksums csw/mgar/pkg/gstplugins_good/trunk/files/ csw/mgar/pkg/gstplugins_good/trunk/files/patch-matroska-demux.c Property changes on: csw/mgar/pkg/gstplugins_good/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/gstplugins_good/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins_good/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gstplugins_good/trunk/Makefile 2010-02-21 14:43:44 UTC (rev 8717) @@ -0,0 +1,47 @@ +GARNAME = gstplugins_good +GARVERSION = 0.10.18 +CATEGORIES = gnome + +DESCRIPTION = GStreamer plugins (Good) +define BLURB + GStreamer Good Plug-ins is a set of plug-ins that we consider to have + good quality code, correct functionality, our preferred license + (LGPL for the plug-in code, LGPL or LGPL-compatible for the supporting + library). +endef + +MASTER_SITES = http://gstreamer.freedesktop.org/src/gst-plugins-good/ +SRCNAME = gst-plugins-good +DISTFILES = $(SRCNAME)-$(GARVERSION).tar.gz +WORKSRC = $(WORKDIR)/$(SRCNAME)-$(GARVERSION) +PACKAGES = CSWgstpluginsgood +CATALOGNAME = gstplugins_good + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD_DEP_PKGS += CSWzlib CSWsunmath CSWspeex CSWpng CSWpango CSWorbit2 +BUILD_DEP_PKGS += CSWlibxml2 CSWliboil CSWlibcairo CSWlibatk CSWjpeg CSWgtk2 +BUILD_DEP_PKGS += CSWgstreamer CSWgstplugins CSWglib2 CSWggettext CSWgconf2 +BUILD_DEP_PKGS += CSWflac CSWesound CSWaudiofile CSWaalib CSWbzip2 +BUILD_DEP_PKGS += CSWggettextrt CSWlibogg CSWlibshout CSWncurses CSWtheora +BUILD_DEP_PKGS += CSWvorbis +RUNTIME_DEP_PKGS = $(BUILD_DEP_PKGS) + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --disable-debug + +STRIP_LIBTOOL = 1 + +TEST_SCRIPTS = + +LICENSE = $(WORKDIR_FIRSTMOD)/$(SRCNAME)-$(GARVERSION)/COPYING + +PATCHFILES = patch-matroska-demux.c + +include gar/category.mk +post-configure-modulated: + # we do not have a hyperbolic tangent float function on solaris8, + # using hyperbolic tangent double instead + perl -pi -e 's,tanhf,tanh,' \ + $(WORKSRC)/gst/replaygain/gstrglimiter.c Added: csw/mgar/pkg/gstplugins_good/trunk/checksums =================================================================== --- csw/mgar/pkg/gstplugins_good/trunk/checksums (rev 0) +++ csw/mgar/pkg/gstplugins_good/trunk/checksums 2010-02-21 14:43:44 UTC (rev 8717) @@ -0,0 +1,2 @@ +5631add1ae2d4f5db0a3358cb4056002 gst-plugins-good-0.10.18.tar.gz +c26dd91683972189df36b4f15a1d6e31 patch-matroska-demux.c Added: csw/mgar/pkg/gstplugins_good/trunk/files/patch-matroska-demux.c =================================================================== --- csw/mgar/pkg/gstplugins_good/trunk/files/patch-matroska-demux.c (rev 0) +++ csw/mgar/pkg/gstplugins_good/trunk/files/patch-matroska-demux.c 2010-02-21 14:43:44 UTC (rev 8717) @@ -0,0 +1,11 @@ +--- gst-plugins-good-0.10.18.orig/gst/matroska/matroska-demux.c 2010-02-04 18:36:43.000000000 +0100 ++++ gst-plugins-good-0.10.18/gst/matroska/matroska-demux.c 2010-02-21 15:32:53.643034561 +0100 +@@ -2298,7 +2298,7 @@ + { + GST_OBJECT_UNLOCK (demux); + GST_PAD_STREAM_UNLOCK (demux->sinkpad); +- GST_ELEMENT_ERROR (demux, STREAM, DEMUX, NULL, ("Got a seek error")); ++ GST_ELEMENT_ERROR (demux, STREAM, DEMUX, (NULL), ("Got a seek error")); + return FALSE; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Feb 21 16:38:56 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 21 Feb 2010 15:38:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[8718] csw/mgar/pkg Message-ID: Revision: 8718 http://gar.svn.sourceforge.net/gar/?rev=8718&view=rev Author: bensons Date: 2010-02-21 15:38:47 +0000 (Sun, 21 Feb 2010) Log Message: ----------- gstplugins_bad: initial GAR recipe Added Paths: ----------- csw/mgar/pkg/gstplugins_bad/ csw/mgar/pkg/gstplugins_bad/branches/ csw/mgar/pkg/gstplugins_bad/tags/ csw/mgar/pkg/gstplugins_bad/trunk/ csw/mgar/pkg/gstplugins_bad/trunk/Makefile csw/mgar/pkg/gstplugins_bad/trunk/checksums csw/mgar/pkg/gstplugins_bad/trunk/files/ csw/mgar/pkg/gstplugins_bad/trunk/files/patch-gstvideomeasure_collector.h csw/mgar/pkg/gstplugins_bad/trunk/files/patch-gstvideomeasure_ssim.h Property changes on: csw/mgar/pkg/gstplugins_bad/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/gstplugins_bad/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins_bad/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gstplugins_bad/trunk/Makefile 2010-02-21 15:38:47 UTC (rev 8718) @@ -0,0 +1,55 @@ +GARNAME = gstplugins_bad +GARVERSION = 0.10.17 +CATEGORIES = gnome + +DESCRIPTION = GStreamer plugins (Bad) +define BLURB + GStreamer Bad Plug-ins is a set of plug-ins that aren't up to par compared + to the rest. They might be close to being good quality, but they're + missing something - be it a good code review, some documentation, a set + of tests, a real live maintainer, or some actual wide use. +endef + +MASTER_SITES = http://gstreamer.freedesktop.org/src/gst-plugins-bad/ +SRCNAME = gst-plugins-bad +DISTFILES = $(SRCNAME)-$(GARVERSION).tar.gz +WORKSRC = $(WORKDIR)/$(SRCNAME)-$(GARVERSION) +PACKAGES = CSWgstpluginsbad +CATALOGNAME = gstplugins_bad + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD_DEP_PKGS += CSWzlib CSWsunmath CSWneon CSWmesa CSWlibxml2 CSWlibsdl +BUILD_DEP_PKGS += CSWiconv CSWgstreamer CSWgstplugins CSWglib2 CSWggettext +BUILD_DEP_PKGS += CSWbzip2 CSWfaac CSWfaad2 CSWggettextrt CSWjasper CSWliboil +RUNTIME_DEP_PKGS = $(BUILD_DEP_PKGS) + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --disable-debug + +STRIP_LIBTOOL = 1 + +TEST_SCRIPTS = + +LICENSE = $(WORKDIR_FIRSTMOD)/$(SRCNAME)-$(GARVERSION)/COPYING + +PATCHFILES = patch-gstvideomeasure_collector.h patch-gstvideomeasure_ssim.h + +# we provide that symbol +CHECKPKG_OVERRIDES_CSWgstpluginsbad += symbol-not-found|libgstcamerabin.so + +include gar/category.mk +post-configure-modulated: + perl -pi -e 's,(LIBS = -lnsl -lsocket),$$1 -lresolv,' \ + $(WORKSRC)/gst/dccp/Makefile + perl -pi -e 's,#include ,,' \ + $(WORKSRC)/gst/dtmf/tone_detect.c + perl -pi -e 's,powf,pow,' \ + $(WORKSRC)/gst/hdvparse/gsthdvparse.c + perl -pi -e 's,(#include) "stdint.h",$$1 ,' \ + $(WORKSRC)/gst/librfb/d3des.c + perl -pi -e 's,(#include) "stdint.h",,' \ + $(WORKSRC)/gst/librfb/vncauth.c + perl -pi -e 's,INADDR_NONE,~INADDR_ANY,' \ + $(WORKSRC)/gst/pcapparse/gstpcapparse.c Added: csw/mgar/pkg/gstplugins_bad/trunk/checksums =================================================================== --- csw/mgar/pkg/gstplugins_bad/trunk/checksums (rev 0) +++ csw/mgar/pkg/gstplugins_bad/trunk/checksums 2010-02-21 15:38:47 UTC (rev 8718) @@ -0,0 +1,3 @@ +454f1bfaa9a1dff48d7a1df2fbf5b3c3 gst-plugins-bad-0.10.17.tar.gz +4f8db8228a9066d3a68501dfc2202d59 patch-gstvideomeasure_collector.h +5f7b6d332bb6e70488e8ae8043cdf0dc patch-gstvideomeasure_ssim.h Added: csw/mgar/pkg/gstplugins_bad/trunk/files/patch-gstvideomeasure_collector.h =================================================================== --- csw/mgar/pkg/gstplugins_bad/trunk/files/patch-gstvideomeasure_collector.h (rev 0) +++ csw/mgar/pkg/gstplugins_bad/trunk/files/patch-gstvideomeasure_collector.h 2010-02-21 15:38:47 UTC (rev 8718) @@ -0,0 +1,25 @@ +--- gst-plugins-bad-0.10.17.orig/gst/videomeasure/gstvideomeasure_collector.h 2009-10-12 12:23:35.000000000 +0200 ++++ gst-plugins-bad-0.10.17/gst/videomeasure/gstvideomeasure_collector.h 2010-02-21 16:23:40.000000000 +0100 +@@ -29,17 +29,11 @@ + typedef struct _GstMeasureCollectorClass GstMeasureCollectorClass; + + #define GST_TYPE_MEASURE_COLLECTOR (gst_measure_collector_get_type()) +-#define GST_MEASURE_COLLECTOR(obj) \ +- (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MEASURE_COLLECTOR, \ +- GstMeasureCollector)) +-#define GST_IS_MEASURE_COLLECTOR(obj) \ +- (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_MEASURE_COLLECTOR)) +-#define GST_MEASURE_COLLECTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),\ +- GST_TYPE_MEASURE_COLLECTOR, GstMeasureCollectorClass)) +-#define GST_IS_MEASURE_COLLECTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),\ +- GST_TYPE_MEASURE_COLLECTOR)) +-#define GST_MEASURE_COLLECTOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),\ +- GST_TYPE_MEASURE_COLLECTOR, GstMeasureCollectorClass)) ++#define GST_MEASURE_COLLECTOR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MEASURE_COLLECTOR, GstMeasureCollector)) ++#define GST_IS_MEASURE_COLLECTOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_MEASURE_COLLECTOR)) ++#define GST_MEASURE_COLLECTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_MEASURE_COLLECTOR, GstMeasureCollectorClass)) ++#define GST_IS_MEASURE_COLLECTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_MEASURE_COLLECTOR)) ++#define GST_MEASURE_COLLECTOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GST_TYPE_MEASURE_COLLECTOR, GstMeasureCollectorClass)) + + typedef enum { + GST_MEASURE_COLLECTOR_0 = 0, Added: csw/mgar/pkg/gstplugins_bad/trunk/files/patch-gstvideomeasure_ssim.h =================================================================== --- csw/mgar/pkg/gstplugins_bad/trunk/files/patch-gstvideomeasure_ssim.h (rev 0) +++ csw/mgar/pkg/gstplugins_bad/trunk/files/patch-gstvideomeasure_ssim.h 2010-02-21 15:38:47 UTC (rev 8718) @@ -0,0 +1,24 @@ +--- gst-plugins-bad-0.10.17.orig/gst/videomeasure/gstvideomeasure_ssim.h 2009-10-12 12:23:35.000000000 +0200 ++++ gst-plugins-bad-0.10.17/gst/videomeasure/gstvideomeasure_ssim.h 2010-02-21 16:23:33.000000000 +0100 +@@ -37,16 +37,11 @@ + + + #define GST_TYPE_SSIM (gst_ssim_get_type()) +-#define GST_SSIM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ +- GST_TYPE_SSIM,GstSSim)) +-#define GST_IS_SSIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \ +- GST_TYPE_SSIM)) +-#define GST_SSIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass) , \ +- GST_TYPE_SSIM,GstSSimClass)) +-#define GST_IS_SSIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass) , \ +- GST_TYPE_SSIM)) +-#define GST_SSIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj) , \ +- GST_TYPE_SSIM,GstSSimClass)) ++#define GST_SSIM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_SSIM,GstSSim)) ++#define GST_IS_SSIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_SSIM)) ++#define GST_SSIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass) , GST_TYPE_SSIM,GstSSimClass)) ++#define GST_IS_SSIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass) , GST_TYPE_SSIM)) ++#define GST_SSIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj) , GST_TYPE_SSIM,GstSSimClass)) + + typedef struct _GstSSim GstSSim; + typedef struct _GstSSimClass GstSSimClass; 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 Feb 21 17:55:49 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 21 Feb 2010 16:55:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[8719] csw/mgar/pkg/libassuan/trunk Message-ID: Revision: 8719 http://gar.svn.sourceforge.net/gar/?rev=8719&view=rev Author: dmichelsen Date: 2010-02-21 16:55:45 +0000 (Sun, 21 Feb 2010) Log Message: ----------- libassuan: Update to 2.0.0 Modified Paths: -------------- csw/mgar/pkg/libassuan/trunk/Makefile csw/mgar/pkg/libassuan/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libassuan/trunk/files/CSWlibassuan.gspec Modified: csw/mgar/pkg/libassuan/trunk/Makefile =================================================================== --- csw/mgar/pkg/libassuan/trunk/Makefile 2010-02-21 15:38:47 UTC (rev 8718) +++ csw/mgar/pkg/libassuan/trunk/Makefile 2010-02-21 16:55:45 UTC (rev 8719) @@ -1,5 +1,5 @@ GARNAME = libassuan -GARVERSION = 1.0.5 +GARVERSION = 2.0.0 CATEGORIES = lib DESCRIPTION = IPC library used by some GnuPG related software @@ -8,11 +8,12 @@ MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/libassuan/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWlibassuan,) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2 +SPKG_SOURCEURL = http://www.gnupg.org/download/#libassuan + BUILD_DEP_PKGS = CSWpth BUILD64 = 1 Modified: csw/mgar/pkg/libassuan/trunk/checksums =================================================================== --- csw/mgar/pkg/libassuan/trunk/checksums 2010-02-21 15:38:47 UTC (rev 8718) +++ csw/mgar/pkg/libassuan/trunk/checksums 2010-02-21 16:55:45 UTC (rev 8719) @@ -1,3 +1 @@ -c2db0974fcce4401f48f3fa41c4edc5a download/libassuan-1.0.5.tar.bz2 -c424181532045b5760d087e58cc1c935 download/CSWlibassuan.gspec -e5f74688c543ec7d4a4e94a55699d0e1 download/patch-pth_config_dir.diff +59bc0ae7194c412d7a522029005684b2 libassuan-2.0.0.tar.bz2 Deleted: csw/mgar/pkg/libassuan/trunk/files/CSWlibassuan.gspec =================================================================== --- csw/mgar/pkg/libassuan/trunk/files/CSWlibassuan.gspec 2010-02-21 15:38:47 UTC (rev 8718) +++ csw/mgar/pkg/libassuan/trunk/files/CSWlibassuan.gspec 2010-02-21 16:55:45 UTC (rev 8719) @@ -1,4 +0,0 @@ -%var bitname libassuan -%var pkgname CSWlibassuan -%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 wbonnet at users.sourceforge.net Sun Feb 21 21:16:40 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 21 Feb 2010 20:16:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[8720] csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile Message-ID: Revision: 8720 http://gar.svn.sourceforge.net/gar/?rev=8720&view=rev Author: wbonnet Date: 2010-02-21 20:16:40 +0000 (Sun, 21 Feb 2010) Log Message: ----------- Add missing dependencies Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile 2010-02-21 16:55:45 UTC (rev 8719) +++ csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile 2010-02-21 20:16:40 UTC (rev 8720) @@ -23,6 +23,9 @@ SPKG_DESC_CSWlibxtstdevel = The Xtst Library development files RUNTIME_DEP_PKGS_CSWlibxtstdevel = CSWlibxtst +RUNTIME_DEP_PKGS_CSWlibxtst += CSWlibx11 +RUNTIME_DEP_PKGS_CSWlibxtst += CSWlibxext +RUNTIME_DEP_PKGS_CSWlibxtst += CSWlibxi BUILD64 = 1 NOISALIST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Feb 21 22:07:07 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 21 Feb 2010 21:07:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[8721] csw/mgar/pkg/libassuan/trunk/Makefile Message-ID: Revision: 8721 http://gar.svn.sourceforge.net/gar/?rev=8721&view=rev Author: dmichelsen Date: 2010-02-21 21:07:07 +0000 (Sun, 21 Feb 2010) Log Message: ----------- libassuan: Fix runtime deps, this is now a shared library Modified Paths: -------------- csw/mgar/pkg/libassuan/trunk/Makefile Modified: csw/mgar/pkg/libassuan/trunk/Makefile =================================================================== --- csw/mgar/pkg/libassuan/trunk/Makefile 2010-02-21 20:16:40 UTC (rev 8720) +++ csw/mgar/pkg/libassuan/trunk/Makefile 2010-02-21 21:07:07 UTC (rev 8721) @@ -14,19 +14,16 @@ SPKG_SOURCEURL = http://www.gnupg.org/download/#libassuan -BUILD_DEP_PKGS = CSWpth +BUILD_DEP_PKGS = CSWgpgerr CSWpth +RUNTIME_DEP_PKGS = CSWgpgerr BUILD64 = 1 NOISAEXEC = 1 -EXTRA_LDFLAGS = -lrt -lsocket -lnsl +# EXTRA_LDFLAGS = -lrt -lsocket -lnsl CONFIGURE_ARGS = $(DIRPATHS) -# We must include static libs here as libassuan contains *only* -# static libs -MERGE_EXCLUDE_STATICLIBS = - 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 wbonnet at users.sourceforge.net Sun Feb 21 22:47:26 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 21 Feb 2010 21:47:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[8722] csw/mgar/pkg/x11/lib/libxi/trunk/Makefile Message-ID: Revision: 8722 http://gar.svn.sourceforge.net/gar/?rev=8722&view=rev Author: wbonnet Date: 2010-02-21 21:47:26 +0000 (Sun, 21 Feb 2010) Log Message: ----------- Add missing dependencies Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxi/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libxi/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/Makefile 2010-02-21 21:07:07 UTC (rev 8721) +++ csw/mgar/pkg/x11/lib/libxi/trunk/Makefile 2010-02-21 21:47:26 UTC (rev 8722) @@ -23,8 +23,9 @@ SPKG_DESC_CSWlibxi = Client library for XInput SPKG_DESC_CSWlibxi = Client library for XInput development files -#RUNTIME_DEP_PKGS_CSWlibxi = RUNTIME_DEP_PKGS_CSWlibxidevel = CSWlibxi +RUNTIME_DEP_PKGS_CSWlibxi += CSWlibx11 +RUNTIME_DEP_PKGS_CSWlibxi += CSWlibxext BUILD64 = 1 NOISALIST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Feb 22 00:01:44 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 21 Feb 2010 23:01:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8723] csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile Message-ID: Revision: 8723 http://gar.svn.sourceforge.net/gar/?rev=8723&view=rev Author: wbonnet Date: 2010-02-21 23:01:43 +0000 (Sun, 21 Feb 2010) Log Message: ----------- Fix Dependencies Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2010-02-21 21:47:26 UTC (rev 8722) +++ csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2010-02-21 23:01:43 UTC (rev 8723) @@ -27,7 +27,10 @@ RUNTIME_DEP_PKGS_CSWlibxvmc = CSWlibx11 CSWlibxext CSWlibxv RUNTIME_DEP_PKGS_CSWlibxvmcdevel = CSWlibxvmc +RUNTIME_DEP_PKGS_CSWlibxvmcdevel = CSWxv +BUILD_DEP_PKGS_CSWlibxvmcdevel = CSWxv + PKGFILES_CSWlibxvmcdevel = $(PKGFILES_DEVEL) BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Feb 22 00:06:18 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 21 Feb 2010 23:06:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8724] csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile Message-ID: Revision: 8724 http://gar.svn.sourceforge.net/gar/?rev=8724&view=rev Author: wbonnet Date: 2010-02-21 23:06:18 +0000 (Sun, 21 Feb 2010) Log Message: ----------- Fix Dependencies Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2010-02-21 23:01:43 UTC (rev 8723) +++ csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2010-02-21 23:06:18 UTC (rev 8724) @@ -26,11 +26,9 @@ # BUILD_DEP_PKGS = CSWlibxvdevel CSWxvideoproto RUNTIME_DEP_PKGS_CSWlibxvmc = CSWlibx11 CSWlibxext CSWlibxv -RUNTIME_DEP_PKGS_CSWlibxvmcdevel = CSWlibxvmc RUNTIME_DEP_PKGS_CSWlibxvmcdevel = CSWxv +RUNTIME_DEP_PKGS_CSWlibxvmcdevel += CSWlibxvmc -BUILD_DEP_PKGS_CSWlibxvmcdevel = CSWxv - PKGFILES_CSWlibxvmcdevel = $(PKGFILES_DEVEL) BUILD64 = 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 Mon Feb 22 00:42:51 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 21 Feb 2010 23:42:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[8725] csw/mgar/gar/v2 Message-ID: Revision: 8725 http://gar.svn.sourceforge.net/gar/?rev=8725&view=rev Author: wahwah Date: 2010-02-21 23:42:51 +0000 (Sun, 21 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, table schema version awareness, added the packages table Modified Paths: -------------- csw/mgar/gar/v2/bin/update_contents_cache.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py Modified: csw/mgar/gar/v2/bin/update_contents_cache.py =================================================================== --- csw/mgar/gar/v2/bin/update_contents_cache.py 2010-02-21 23:06:18 UTC (rev 8724) +++ csw/mgar/gar/v2/bin/update_contents_cache.py 2010-02-21 23:42:51 UTC (rev 8725) @@ -21,6 +21,7 @@ print "Checking if the package cache is up to date." logging.basicConfig(level=logging.INFO) test_pkgmap = checkpkg.SystemPkgmap() + test_pkgmap.InitializeDatabase() if __name__ == '__main__': Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-21 23:06:18 UTC (rev 8724) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-21 23:42:51 UTC (rev 8725) @@ -36,6 +36,7 @@ ("/opt/csw/lib/i386", ["/opt/csw/lib"]), ) INSTALL_CONTENTS_AVG_LINE_LENGTH = 102.09710677919261 +DB_SCHEMA_VERSION = 2L # This shared library is present on Solaris 10 on amd64, but it's missing on # Solaris 8 on i386. It's okay if it's missing. @@ -146,8 +147,8 @@ TODO: Implement timestamp checking and refreshing the cache. """ - - STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] + + STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] CHECKPKG_DIR = ".checkpkg" SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s" @@ -162,20 +163,36 @@ self.SQLITE3_DBNAME_TMPL % self.fqdn) self.file_mtime = None self.cache_mtime = None + self.initialized = False + + def _LazyInitializeDatabase(self): + if not self.initialized: + self.InitializeDatabase() + + def InitializeDatabase(self): if os.path.exists(self.db_path): logging.debug("Connecting to the %s database.", self.db_path) self.conn = sqlite3.connect(self.db_path) + if not self.IsDatabaseGoodSchema(): + logging.warning("Old database schema detected. Dropping tables.") + self.PurgeDatabase(drop_tables=True) + self.CreateTables() if not self.IsDatabaseUpToDate(): logging.warning("Rebuilding the package cache, can take a few minutes.") self.PurgeDatabase() self.PopulateDatabase() else: - print "Building a cache of /var/sadm/install/contents." + print "Building a cache of %s." % SYSTEM_PKGMAP print "The cache will be kept in %s." % self.db_path if not os.path.exists(self.checkpkg_dir): logging.debug("Creating %s", self.checkpkg_dir) os.mkdir(self.checkpkg_dir) self.conn = sqlite3.connect(self.db_path) + self.CreateTables() + self.PopulateDatabase() + self.initialized = True + + def CreateTables(self): c = self.conn.cursor() c.execute(""" CREATE TABLE systempkgmap ( @@ -190,24 +207,24 @@ CREATE TABLE config ( key VARCHAR(255) PRIMARY KEY, float_value FLOAT, + int_value INTEGER, str_value VARCHAR(255) ); """) - self.PopulateDatabase() + c.execute(""" + CREATE TABLE packages ( + pkgname VARCHAR(255) PRIMARY KEY, + pkg_desc VARCHAR(255) + ); + """) - def SymlinkDuringInstallation(self, p): - """Emulates the effect of some symlinks present during installations.""" - p = p.replace("/opt/csw/lib/i386", "/opt/csw/lib") - def PopulateDatabase(self): """Imports data into the database. Original bit of code from checkpkg: - egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog """ - contents_length = os.stat(SYSTEM_PKGMAP).st_size estimated_lines = contents_length / INSTALL_CONTENTS_AVG_LINE_LENGTH system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") @@ -236,9 +253,31 @@ print "Creating the main database index." sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" c.execute(sql) + self.PopulatePackagesTable() self.SetDatabaseMtime() + self.SetDatabaseSchemaVersion() self.conn.commit() + def _ParsePkginfoLine(self, line): + fields = re.split(WS_RE, line) + pkgname = fields[1] + pkg_desc = u" ".join(fields[2:]) + return pkgname, pkg_desc + + def PopulatePackagesTable(self): + args = ["pkginfo"] + pkginfo_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = pkginfo_proc.communicate() + ret = pkginfo_proc.wait() + c = self.conn.cursor() + sql = """ + INSERT INTO packages (pkgname, pkg_desc) + VALUES (?, ?); + """ + for line in stdout.splitlines(): + pkgname, pkg_desc = self._ParsePkginfoLine(line) + c.execute(sql, [pkgname, pkg_desc]) + def SetDatabaseMtime(self): c = self.conn.cursor() sql = "DELETE FROM config WHERE key = ?;" @@ -251,7 +290,17 @@ """ c.execute(sql, [CONFIG_MTIME, mtime]) + def SetDatabaseSchemaVersion(self): + sql = """ + INSERT INTO config (key, int_value) + VALUES (?, ?); + """ + c = self.conn.cursor() + c.execute(sql, ["db_schema_version", DB_SCHEMA_VERSION]) + logging.debug("Setting db_schema_version to %s", DB_SCHEMA_VERSION) + def GetPkgmapLineByBasename(self, filename): + self._LazyInitializeDatabase() if filename in self.cache: return self.cache[filename] sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" @@ -287,26 +336,66 @@ self.file_mtime = stat_data.st_mtime return self.file_mtime + def GetDatabaseSchemaVersion(self): + sql = """ + SELECT int_value FROM config + WHERE key = ?; + """ + c = self.conn.cursor() + schema_on_disk = 1L + try: + c.execute(sql, ["db_schema_version"]) + for row in c: + schema_on_disk = row[0] + except sqlite3.OperationalError, e: + # : no such column: int_value + # The first versions of the database did not + # have the int_value field. + if re.search(r"int_value", str(e)): + # We assume it's the first schema version. + logging.debug("sqlite3.OperationalError, %s: guessing it's 1.", e) + else: + raise + return schema_on_disk + + def IsDatabaseGoodSchema(self): + good_version = self.GetDatabaseSchemaVersion() >= DB_SCHEMA_VERSION + return good_version + def IsDatabaseUpToDate(self): f_mtime = self.GetFileMtime() d_mtime = self.GetDatabaseMtime() logging.debug("f_mtime %s, d_time: %s", f_mtime, d_mtime) - return self.GetFileMtime() <= self.GetDatabaseMtime() + fresh = self.GetFileMtime() <= self.GetDatabaseMtime() + good_version = self.GetDatabaseSchemaVersion() >= DB_SCHEMA_VERSION + return fresh and good_version - def PurgeDatabase(self): + def SoftDropTable(self, tablename): c = self.conn.cursor() - logging.info("Dropping the index.") - sql = "DROP INDEX basename_idx;" try: - c.execute(sql) + # This doesn't accept placeholders. + c.execute("DROP TABLE %s;" % tablename) except sqlite3.OperationalError, e: - logging.warn(e) - logging.info("Deleting all rows from the cache database") - sql = "DELETE FROM config;" - c.execute(sql) - sql = "DELETE FROM systempkgmap;" - c.execute(sql) + logging.warn("sqlite3.OperationalError: %s", e) + def PurgeDatabase(self, drop_tables=False): + c = self.conn.cursor() + if drop_tables: + for table_name in ("config", "systempkgmap", "packages"): + self.SoftDropTable(table_name) + else: + logging.info("Dropping the index.") + sql = "DROP INDEX basename_idx;" + try: + c.execute(sql) + except sqlite3.OperationalError, e: + logging.warn(e) + logging.info("Deleting all rows from the cache database") + sql = "DELETE FROM config;" + c.execute(sql) + sql = "DELETE FROM systempkgmap;" + c.execute(sql) + def SharedObjectDependencies(pkgname, binaries_by_pkgname, needed_sonames_by_binary, Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-21 23:06:18 UTC (rev 8724) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-21 23:42:51 UTC (rev 8725) @@ -716,5 +716,16 @@ self.assertEqual(tags, checkpkg.ApplyOverrides(tags, overrides)) +class SystemPkgmapUnitTest(unittest.TestCase): + + def testParsePkginfoLine(self): + line = ('application CSWcswclassutils ' + 'cswclassutils - CSW class action utilities') + expected = ('CSWcswclassutils', + 'cswclassutils - CSW class action utilities') + spkgmap = checkpkg.SystemPkgmap() + self.assertEqual(expected, spkgmap._ParsePkginfoLine(line)) + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Feb 22 01:29:40 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 22 Feb 2010 00:29:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[8726] csw/mgar/pkg/x11 Message-ID: Revision: 8726 http://gar.svn.sourceforge.net/gar/?rev=8726&view=rev Author: wbonnet Date: 2010-02-22 00:29:40 +0000 (Mon, 22 Feb 2010) Log Message: ----------- Create directories for libs and proto from previous versions. They contains packages that are not longer provided in current X11 version. Move libxfontcache andlibxxf86misc to /old/ Added Paths: ----------- csw/mgar/pkg/x11/lib-old/ csw/mgar/pkg/x11/lib-old/Makefile csw/mgar/pkg/x11/lib-old/libxfontcache/ csw/mgar/pkg/x11/lib-old/libxxf86misc/ csw/mgar/pkg/x11/proto-old/ csw/mgar/pkg/x11/proto-old/Makefile Removed Paths: ------------- csw/mgar/pkg/x11/lib/libpthread-stubs/tags/libpthread-stubs-0.1,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/lib/libxfontcache/ csw/mgar/pkg/x11/lib/libxxf86misc/ Added: csw/mgar/pkg/x11/lib-old/Makefile =================================================================== --- csw/mgar/pkg/x11/lib-old/Makefile (rev 0) +++ csw/mgar/pkg/x11/lib-old/Makefile 2010-02-22 00:29:40 UTC (rev 8726) @@ -0,0 +1,65 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 6092 2009-08-23 21:50:45Z skayser $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/x11/lib directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @(echo "GARNAME = $*"; \ + echo "GARVERSION = 1.0"; \ + echo "CATEGORIES = category"; \ + echo ""; \ + echo "DESCRIPTION = Brief description"; \ + echo "define BLURB"; \ + echo " Long description"; \ + echo "endef"; \ + echo ""; \ + echo "MASTER_SITES = "; \ + echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ + echo ""; \ + echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ + echo "UFILES_REGEX = $$(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo ""; \ + echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ + echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ + echo "# UPSTREAM_MASTER_SITES = "; \ + echo ""; \ + echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ + echo ""; \ + echo "include gar/category.mk"; \ + ) > $*/trunk/Makefile + @touch $*/trunk/checksums + @svn add $*/trunk/Makefile $*/trunk/checksums + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk + @if [ -d ../../gar/v2 ]; then \ + ln -s ../../../../gar/v2 $*/trunk/gar; \ + else \ + svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \ + fi + @echo + @echo "Your package is set up for editing at $*/trunk" + Added: csw/mgar/pkg/x11/proto-old/Makefile =================================================================== --- csw/mgar/pkg/x11/proto-old/Makefile (rev 0) +++ csw/mgar/pkg/x11/proto-old/Makefile 2010-02-22 00:29:40 UTC (rev 8726) @@ -0,0 +1,65 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 6092 2009-08-23 21:50:45Z skayser $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/x11/proto directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @(echo "GARNAME = $*"; \ + echo "GARVERSION = 1.0"; \ + echo "CATEGORIES = category"; \ + echo ""; \ + echo "DESCRIPTION = Brief description"; \ + echo "define BLURB"; \ + echo " Long description"; \ + echo "endef"; \ + echo ""; \ + echo "MASTER_SITES = "; \ + echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ + echo ""; \ + echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ + echo "UFILES_REGEX = $$(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo ""; \ + echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ + echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ + echo "# UPSTREAM_MASTER_SITES = "; \ + echo ""; \ + echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ + echo ""; \ + echo "include gar/category.mk"; \ + ) > $*/trunk/Makefile + @touch $*/trunk/checksums + @svn add $*/trunk/Makefile $*/trunk/checksums + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk + @if [ -d ../../gar/v2 ]; then \ + ln -s ../../../../gar/v2 $*/trunk/gar; \ + else \ + svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \ + fi + @echo + @echo "Your package is set up for editing at $*/trunk" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Feb 22 08:40:09 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 22 Feb 2010 07:40:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8727] csw/mgar/gar/v2 Message-ID: Revision: 8727 http://gar.svn.sourceforge.net/gar/?rev=8727&view=rev Author: wahwah Date: 2010-02-22 07:40:09 +0000 (Mon, 22 Feb 2010) Log Message: ----------- mGAR v2: checkpkg-libs, moving sql query assignment out of the loop, small correction to code comments Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2/lib/python/checkpkg.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-02-22 00:29:40 UTC (rev 8726) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-02-22 07:40:09 UTC (rev 8727) @@ -81,7 +81,7 @@ # This section is somewhat overlapping with checkpkg.AnalyzeDependencies(), # it has a different purpose: it reports the relationships between shared # libraries, binaries using them and packages providing them. Ideally, the - # same bit of code with do checking and reporting. + # same bit of code would do both checking and reporting. # # TODO: Rewrite this using cheetah templates if debug and needed_sonames: Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-22 00:29:40 UTC (rev 8726) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-22 07:40:09 UTC (rev 8727) @@ -236,6 +236,7 @@ print "Processing %s" % SYSTEM_PKGMAP c = self.conn.cursor() count = itertools.count() + sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" for line in system_pkgmap_fd: i = count.next() if not i % 1000: @@ -247,7 +248,6 @@ fields = re.split(WS_RE, line) pkgmap_entry_path = fields[0].split("=")[0] pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) - sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) print "\rAll lines of %s were processed." % SYSTEM_PKGMAP print "Creating the main database index." @@ -405,7 +405,7 @@ """This is one of the more obscure and more important pieces of code. I tried to make it simpler, but given that the operations here involve - whole sets of packages, it's not easy. + whole sets of packages, it's not easy to simplify. """ so_dependencies = set() orphan_sonames = set() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Feb 22 10:16:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 22 Feb 2010 09:16:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8728] csw/mgar/gar/v2 Message-ID: Revision: 8728 http://gar.svn.sourceforge.net/gar/?rev=8728&view=rev Author: wahwah Date: 2010-02-22 09:16:13 +0000 (Mon, 22 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, moved checkpkg.d from bin to lib. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Added Paths: ----------- csw/mgar/gar/v2/lib/checkpkg.d/ Removed Paths: ------------- csw/mgar/gar/v2/bin/checkpkg.d/ Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-02-22 07:40:09 UTC (rev 8727) +++ csw/mgar/gar/v2/bin/checkpkg 2010-02-22 09:16:13 UTC (rev 8728) @@ -538,7 +538,7 @@ set_variables_for_individual_package_check "$f" test_suite_ok=1 -checkpkg_module_dir=${command_basedir}/checkpkg.d +checkpkg_module_dir=${command_basedir}/../lib/checkpkg.d checkpkg_module_tag="checkpkg-" checkpkg_stats_basedir="${HOME}/.checkpkg/stats" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Feb 22 11:53:10 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 22 Feb 2010 10:53:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[8729] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 8729 http://gar.svn.sourceforge.net/gar/?rev=8729&view=rev Author: wahwah Date: 2010-02-22 10:53:10 +0000 (Mon, 22 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, some ideas for future APIs Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-02-22 09:16:13 UTC (rev 8728) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-02-22 10:53:10 UTC (rev 8729) @@ -1,5 +1,58 @@ -# Defining the checking functions. They come in two flavors: individual -# package checks and set checks. +# $Id$ +# +# Package checking functions. They come in two flavors: +# - individual package checks +# - set checks +# +# Some ideas for the future development of the checks. Here's what a check +# could look like: +# +# class FooCheck(checkpkg.IndividualCheck): +# """Simplest check for an individual package.""" +# +# def CheckExampleOne(self): +# """First idea, with an ReportError method.""" +# if self.catalogname != self.catalogname.lower(): +# self.ReportError("catalogname-not-lowercase") +# +# def CheckExampleTwo(self): +# """Second idea, more similar to a unit test.""" +# self.checkEqual(self.catalogname, +# self.catalogname.lower(), +# "catalogname-not-lowercase") +# +# What would be needed to do that: +# +# - Have a class that looks for classes derived from checkpkg.IndividualCheck, +# run SetUp on them (which sets things such as self.catalogname) and then +# Check(). +# - Read all the data and set appropriate member names. +# +# Set checks would be slightly more complicated. +# +# class BarCheck(checkpkg.SetCheck): +# """More complex check for multiple packages. +# +# We cannot have package data as class members any more, we have to use +# a class member with a list of objects containing packages' data. +# +# In this class, checkEqual() methods needs one more parameter, denoting +# the package to assign the error to. +# """ +# +# def Check(self): +# for pkg in self.pkgs: +# self.checkEqual(pkg.catalogname, +# pkg.catalogname.lower(), +# pkg, +# "catalogname-not-lowercase") +# +# Alternately, a function-based approach is possible: +# +# def IndividualCheckCatalogname(pkg_data, checkpkg_mgr): +# catalogdata = pkg_data["basic_stats"]["catalogname"] +# if catalogdata != catalogdata.lower(): +# checkpkg_mgr.ReportError("catalogname-not-lowercase") import checkpkg import re This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Feb 22 11:53:53 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 22 Feb 2010 10:53:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8730] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 8730 http://gar.svn.sourceforge.net/gar/?rev=8730&view=rev Author: wahwah Date: 2010-02-22 10:53:53 +0000 (Mon, 22 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, setting Id keyword on v2/lib/python/package_checks.py Property Changed: ---------------- csw/mgar/gar/v2/lib/python/package_checks.py Property changes on: csw/mgar/gar/v2/lib/python/package_checks.py ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Feb 22 12:17:26 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 22 Feb 2010 11:17:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[8731] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 8731 http://gar.svn.sourceforge.net/gar/?rev=8731&view=rev Author: wahwah Date: 2010-02-22 11:17:26 +0000 (Mon, 22 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, more comments and future ideas. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-02-22 10:53:53 UTC (rev 8730) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-02-22 11:17:26 UTC (rev 8731) @@ -46,13 +46,30 @@ # pkg.catalogname.lower(), # pkg, # "catalogname-not-lowercase") +# +# A question: What would unit tests of these checks look like? # # Alternately, a function-based approach is possible: # -# def IndividualCheckCatalogname(pkg_data, checkpkg_mgr): -# catalogdata = pkg_data["basic_stats"]["catalogname"] -# if catalogdata != catalogdata.lower(): +# def IndividualCheckCatalogname(pkg_data, checkpkg_mgr, debug): +# catalogname = pkg_data["basic_stats"]["catalogname"] +# if catalogname != catalogname.lower(): # checkpkg_mgr.ReportError("catalogname-not-lowercase") +# +# Here, unit testing of these functions would always require mock objects. But +# overall it looks like a simpler approach. +# +# Instead of the debug flag, a logger could be used, although it would make +# testing slightly annoying, since it would be necessary to mock +# all the calls to the logger. +# +# def IndividualCheckCatalogname(pkg_data, checkpkg_mgr, logger): +# catalogname = pkg_data["basic_stats"]["catalogname"] +# logger.debug("catalogname: %s", catalogname) +# if catalogname != catalogname.lower(): +# checkpkg_mgr.ReportError("catalogname-not-lowercase") +# +# import checkpkg import re @@ -120,6 +137,3 @@ print ("However, be aware that there might be other reasons " "to keep it architecture-specific.") return 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 Mon Feb 22 14:17:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 22 Feb 2010 13:17:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8732] csw/mgar/pkg/neon/trunk/Makefile Message-ID: Revision: 8732 http://gar.svn.sourceforge.net/gar/?rev=8732&view=rev Author: dmichelsen Date: 2010-02-22 13:17:00 +0000 (Mon, 22 Feb 2010) Log Message: ----------- neon: Add minimal/full alternatives Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2010-02-22 11:17:26 UTC (rev 8731) +++ csw/mgar/pkg/neon/trunk/Makefile 2010-02-22 13:17:00 UTC (rev 8732) @@ -2,8 +2,9 @@ GARVERSION = 0.29.3 CATEGORIES = lib -EXTRA_MODULATORS = GARVERSION +EXTRA_MODULATORS = GARVERSION FEATURES MODULATIONS_GARVERSION = 0.26.4 0.29.3 +MODULATIONS_FEATURES = minimal full DESCRIPTION = Neon HTTP and WebDAV client library define BLURB @@ -20,26 +21,33 @@ NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) -PACKAGES = CSWneon CSWneon-devel +PACKAGES = CSWneon CSWneonfull CSWneon-devel CATALOGNAME_CSWneon = neon +CATALOGNAME_CSWneonfull = neon_full CATALOGNAME_CSWneon-devel = neon_devel -RUNTIME_DEP_PKGS_CSWneon = CSWexpat CSWkrb5lib CSWosslrt CSWzlib CSWggettextrt CSWpakchois CSWlibproxy +RUNTIME_DEP_PKGS_CSWneon = CSWexpat CSWosslrt CSWzlib CSWggettextrt CSWpakchois +RUNTIME_DEP_PKGS_CSWneonfull = CSWexpat CSWkrb5lib CSWosslrt CSWzlib CSWggettextrt CSWpakchois CSWlibproxy RUNTIME_DEP_PKGS_CSWneon-devel = CSWneon -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWneon) +BUILD_DEP_PKGS = $(sort $(RUNTIME_DEP_PKGS_CSWneon) $(RUNTIME_DEP_PKGS_CSWneonfull)) -SPKG_DESC_CSWneon = Neon HTTP and WebDAV client library +SPKG_DESC_CSWneon = Neon HTTP and WebDAV client library (minimal dependencies) +SPKG_DESC_CSWneonfull = Neon HTTP and WebDAV client library (full featured) SPKG_DESC_CSWneon-devel = Neon HTTP and WebDAV development support # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +CONFIGURE_ARGS_features-minimal = --without-libproxy --without-pakchois +CONFIGURE_ARGS_features-full = --with-libproxy --with-packchois + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --with-ssl=openssl CONFIGURE_ARGS += --with-expat +CONFIGURE_ARGS += $(CONFIGURE_ARGS_features-$(FEATURES)) BUILD64 = 1 NOISAEXEC = 1 @@ -48,18 +56,44 @@ INSTALL_OVERRIDE_VARS = docdir INSTALL_OVERRIDE_VAR_docdir = $(datadir)/doc/neon -MERGE_SCRIPTS_isa-default-garversion-0.26.4 = copy-only -MERGE_DIRS_isa-default-garversion-0.26.4 = $(libdir) -MERGE_SCRIPTS_isa-default64-garversion-0.26.4 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-0.26.4 = $(libdir) +# isa-sparcv8-garversion-0.26.4-features-minimal isa-sparcv8-garversion-0.26.4-features-full isa-sparcv8-garversion-0.29.3-features-minimal isa-sparcv8-garversion-0.29.3-features-full isa-sparcv9-garversion-0.26.4-features-minimal isa-sparcv9-garversion-0.26.4-features-full isa-sparcv9-garversion-0.29.3-features-minimal isa-sparcv9-garversion-0.29.3-features-full -MERGE_SCRIPTS_isa-default-garversion-0.29.3 = copy-all -MERGE_SCRIPTS_isa-default64-garversion-0.29.3 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-0.29.3 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +# We select pkgconfig for minimal library bindings. As libneon is self-contained (links +# to all necessary libs directly) the full version can simly be linked in. +EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,," -PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL) +EXTRA_PAX_ARGS += -s ",$(libdir)/libneon\.so\.,$(libdir_install)/libneon-$(FEATURES).so.,p" +EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES)) + +MERGE_SCRIPTS_isa-default-garversion-0.26.4-features-minimal = copy-only +MERGE_DIRS_isa-default-garversion-0.26.4-features-minimal = $(libdir) +MERGE_SCRIPTS_isa-default64-garversion-0.26.4-features-minimal = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-0.26.4-features-minimal = $(libdir) +MERGE_SCRIPTS_isa-default-garversion-0.26.4-features-full = copy-relocated-only +MERGE_DIRS_isa-default-garversion-0.26.4-features-full = $(libdir) +MERGE_SCRIPTS_isa-default64-garversion-0.26.4-features-full = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-0.26.4-features-full = $(libdir) + +MERGE_SCRIPTS_isa-default-garversion-0.29.3-features-minimal = copy-all +MERGE_SCRIPTS_isa-default64-garversion-0.29.3-features-minimal = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-0.29.3-features-minimal = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-garversion-0.29.3-features-full = copy-relocated-only +MERGE_DIRS_isa-default-garversion-0.29.3-features-full = $(libdir) +MERGE_SCRIPTS_isa-default64-garversion-0.29.3-features-full = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-0.29.3-features-full = $(libdir) + PKGFILES_CSWneon-devel += $(docdir)/.* EXTRA_LINKER_FLAGS = -lintl +ALTERNATIVES_CSWneon = minimal +ALTERNATIVES_CSWneonfull = full +ALTERNATIVE_minimal = $(libdir)/libneon.so.27 neon $(libdir)/libneon-minimal.so.27 200 +ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libneon.so.27 neon64 $(libdir)/$(ISA_DEFAULT64)/libneon-minimal.so.27 +ALTERNATIVE_full = $(libdir)/libneon.so.27 neon $(libdir)/libneon-full.so.27 100 +ALTERNATIVE_full += $(libdir)/$(ISA_DEFAULT64)/libneon.so.27 neon64 $(libdir)/$(ISA_DEFAULT64)/libneon-full.so.27 + +PKGFILES_CSWneonfull = .*-full.* +PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL) + 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 Mon Feb 22 15:06:24 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 22 Feb 2010 14:06:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8733] csw/mgar/pkg/botnet/trunk Message-ID: Revision: 8733 http://gar.svn.sourceforge.net/gar/?rev=8733&view=rev Author: bonivart Date: 2010-02-22 14:06:24 +0000 (Mon, 22 Feb 2010) Log Message: ----------- botnet: migrate to /etc/opt/csw/spamassassin Modified Paths: -------------- csw/mgar/pkg/botnet/trunk/Makefile csw/mgar/pkg/botnet/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/botnet/trunk/files/CSWbotnet.gspec Modified: csw/mgar/pkg/botnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/botnet/trunk/Makefile 2010-02-22 13:17:00 UTC (rev 8732) +++ csw/mgar/pkg/botnet/trunk/Makefile 2010-02-22 14:06:24 UTC (rev 8733) @@ -12,40 +12,38 @@ MASTER_SITES = http://people.ucsc.edu/~jrudd/spamassassin/ DISTFILES = Botnet-$(GARVERSION).tar -DISTFILES += $(call admfiles,CSWbotnet,) -SPKG_DESC_CSWspamassassin = mail filter with a wide range of tests -RUNTIME_DEP_PKGS = CSWspamassassin CSWcswclassutils +RUNTIME_DEP_PKGS = CSWspamassassin CSWperl -# We define upstream file regex so we can be notifed of new upstream software release +ARCHALL = 1 + UFILES_REGEX = -(\d+(?:\.\d+)*).tar -SPKG_CLASSES = none cswcpsampleconf +SAMPLECONF = /etc/opt/csw/spamassassin/Botnet.cf +MIGRATE_FILES = Botnet.cf +MIGRATE_SOURCE_DIR = /opt/csw/etc/spamassassin +MIGRATE_DEST_DIR = /etc/opt/csw/spamassassin + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = INSTALL_SCRIPTS = custom -#ENABLE_CHECK = 0 - -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/Botnet.cf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' - include gar/category.mk WORKSRC = $(WORKDIR) -MAINFILES = Botnet.pm Botnet.cf.CSW +MAINFILES = Botnet.pm Botnet.cf DOCFILES = Botnet.api.txt Botnet.credits.txt Botnet.txt Botnet.variants.txt INSTALL install-custom: @echo " ==> Installing $(GARNAME) (custom)" - @mv $(WORKSRC)/Botnet.cf $(WORKSRC)/Botnet.cf.CSW @rm -rf $(DESTDIR) @ginstall -d $(DESTDIR)$(bindir) @cp $(WORKSRC)/Botnet.pl $(DESTDIR)$(bindir) - @ginstall -d $(DESTDIR)$(sysconfdir)/spamassassin - @$(foreach FILE, $(MAINFILES), cp $(WORKSRC)/$(FILE) $(DESTDIR)$(sysconfdir)/spamassassin ;) + @ginstall -d $(DESTDIR)/etc/opt/csw/spamassassin + @$(foreach FILE, $(MAINFILES), cp $(WORKSRC)/$(FILE) $(DESTDIR)/etc/opt/csw/spamassassin ;) + @chmod 644 $(DESTDIR)/etc/opt/csw/spamassassin/Botnet.cf @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @$(foreach FILE, $(DOCFILES), cp $(WORKSRC)/$(FILE) $(DESTDIR)$(docdir)/$(GARNAME) ;) - @cp -r $(WORKSRC)/COPYING $(DESTDIR)$(docdir)/$(GARNAME)/LICENSE @$(MAKECOOKIE) Modified: csw/mgar/pkg/botnet/trunk/checksums =================================================================== --- csw/mgar/pkg/botnet/trunk/checksums 2010-02-22 13:17:00 UTC (rev 8732) +++ csw/mgar/pkg/botnet/trunk/checksums 2010-02-22 14:06:24 UTC (rev 8733) @@ -1,2 +1 @@ -1bf1b358e7b1802c2ac15ca6bb084621 download/Botnet-0.8.tar -2ff988f4d47eba1da4cd3d28a37664c3 download/CSWbotnet.gspec +1bf1b358e7b1802c2ac15ca6bb084621 Botnet-0.8.tar Deleted: csw/mgar/pkg/botnet/trunk/files/CSWbotnet.gspec =================================================================== --- csw/mgar/pkg/botnet/trunk/files/CSWbotnet.gspec 2010-02-22 13:17:00 UTC (rev 8732) +++ csw/mgar/pkg/botnet/trunk/files/CSWbotnet.gspec 2010-02-22 14:06:24 UTC (rev 8733) @@ -1,8 +0,0 @@ -%var bitname botnet -%var pkgname CSWbotnet -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/botnet/LICENSE for license information - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Feb 22 15:14:48 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 22 Feb 2010 14:14:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8734] csw/mgar/pkg/gstplugins/trunk/Makefile Message-ID: Revision: 8734 http://gar.svn.sourceforge.net/gar/?rev=8734&view=rev Author: bensons Date: 2010-02-22 14:14:48 +0000 (Mon, 22 Feb 2010) Log Message: ----------- gstplugins: changed GARNAME, linking against /opt/csw/X11 now, adjusted dependencies Modified Paths: -------------- csw/mgar/pkg/gstplugins/trunk/Makefile Modified: csw/mgar/pkg/gstplugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins/trunk/Makefile 2010-02-22 14:06:24 UTC (rev 8733) +++ csw/mgar/pkg/gstplugins/trunk/Makefile 2010-02-22 14:14:48 UTC (rev 8734) @@ -1,4 +1,4 @@ -GARNAME = gstplugins +GARNAME = gst-plugins-base GARVERSION = 0.10.26 CATEGORIES = gnome @@ -12,17 +12,17 @@ endef MASTER_SITES = http://gstreamer.freedesktop.org/src/gst-plugins-base/ -SRCNAME = gst-plugins-base -DISTFILES = $(SRCNAME)-$(GARVERSION).tar.gz -WORKSRC = $(WORKDIR)/$(SRCNAME)-$(GARVERSION) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PACKAGES = CSWgstplugins +CATALOGNAME = gstplugins + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -BUILD_DEP_PKGS += CSWgstreamer CSWliboil CSWglib2 CSWgnomevfs2 CSWlibogg -BUILD_DEP_PKGS += CSWgconf2 CSWggettextrt CSWlibxml2 CSWtheora CSWvorbis -BUILD_DEP_PKGS += CSWzlib CSWsunmath CSWorbit2 CSWlibxml2 CSWbonobo2 -RUNTIME_DEP_PKGS = $(BUILD_DEP_PKGS) +DEP_PKGS += CSWgstreamer CSWliboil CSWglib2 CSWgnomevfs2 CSWlibogg +DEP_PKGS += CSWgconf2 CSWggettextrt CSWlibxml2 CSWtheora CSWvorbis +DEP_PKGS += CSWlibice CSWlibx11 CSWlibsm CSWlibxext CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --disable-debug @@ -32,13 +32,16 @@ CONFIGURE_ARGS += --disable-gst_v4l CONFIGURE_ARGS += --disable-libvisual CONFIGURE_ARGS += --disable-pango +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib/$(MM_LIBDIR) +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + STRIP_LIBTOOL = 1 TEST_SCRIPTS = -LICENSE = $(WORKDIR_FIRSTMOD)/$(SRCNAME)-$(GARVERSION)/COPYING - # we are providing those symbols CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstaudio-0.10.so.0.19.0 CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstriff-0.10.so.0.19.0 @@ -61,5 +64,9 @@ # sigh, portable code? post-configure-modulated: - perl -pi -e 's/(LIBS = -lnsl -lsocket)/$$1 -lresolv/' \ + gsed -i 's/\(LIBS = -lnsl -lsocket\)/\1 -lresolv/' \ $(WORKSRC)/gst/tcp/Makefile + gsed -i 's/\(giosrc_mounting_LDFLAGS =\)/\1 $$(X_LIBS)/' \ + $(WORKSRC)/tests/examples/gio/Makefile + gsed -i 's/\(volume_LDFLAGS =\)/\1 $$(X_LIBS)/' \ + $(WORKSRC)/tests/examples/volume/Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Feb 22 15:48:45 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 22 Feb 2010 14:48:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8735] csw/mgar/pkg/gstreamer/trunk Message-ID: Revision: 8735 http://gar.svn.sourceforge.net/gar/?rev=8735&view=rev Author: bensons Date: 2010-02-22 14:48:45 +0000 (Mon, 22 Feb 2010) Log Message: ----------- gstreamer: added PACKAGES, CATALOGNAME Modified Paths: -------------- csw/mgar/pkg/gstreamer/trunk/Makefile csw/mgar/pkg/gstreamer/trunk/checksums Modified: csw/mgar/pkg/gstreamer/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstreamer/trunk/Makefile 2010-02-22 14:14:48 UTC (rev 8734) +++ csw/mgar/pkg/gstreamer/trunk/Makefile 2010-02-22 14:48:45 UTC (rev 8735) @@ -10,6 +10,9 @@ editing) processing. endef +PACKAGES = CSWgstreamer +CATALOGNAME = gstreamer + MASTER_SITES = http://gstreamer.freedesktop.org/src/gstreamer/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz Modified: csw/mgar/pkg/gstreamer/trunk/checksums =================================================================== --- csw/mgar/pkg/gstreamer/trunk/checksums 2010-02-22 14:14:48 UTC (rev 8734) +++ csw/mgar/pkg/gstreamer/trunk/checksums 2010-02-22 14:48:45 UTC (rev 8735) @@ -0,0 +1 @@ +ef4fcaceffa97c7c181c03a28a14a257 gstreamer-0.10.26.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Feb 22 15:49:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 22 Feb 2010 14:49:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[8736] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 8736 http://gar.svn.sourceforge.net/gar/?rev=8736&view=rev Author: dmichelsen Date: 2010-02-22 14:49:56 +0000 (Mon, 22 Feb 2010) Log Message: ----------- curl: Add feature modulation Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2010-02-22 14:48:45 UTC (rev 8735) +++ csw/mgar/pkg/curl/trunk/Makefile 2010-02-22 14:49:56 UTC (rev 8736) @@ -21,31 +21,38 @@ DISTFILES += libcurl.so.2.0.2.i DISTFILES += curlbuild.h -PACKAGES = CSWcurl CSWcurlrt CSWcurldevel +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +PACKAGES = CSWcurl CSWcurlrt CSWcurlrtfull CSWcurldevel CATALOGNAME_CSWcurl = curl CATALOGNAME_CSWcurlrt = curl_rt +CATALOGNAME_CSWcurlrtfull = curl_rt_full CATALOGNAME_CSWcurldevel = curl_devel SPKG_DESC_CSWcurl = A command line tool and library for client-side URL transfers -SPKG_DESC_CSWcurlrt = Curl Runtime Libraries +SPKG_DESC_CSWcurlrt = Curl Runtime Libraries (minimal dependencies) +SPKG_DESC_CSWcurlrtfull = Curl Runtime Libraries (full featured) SPKG_DESC_CSWcurldevel = Curl Developer Files SPKG_SOURCEURL = http://curl.haxx.se -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +EXTRA_MODULATORS = FEATURES +MODULATIONS_FEATURES = minimal full # amd64 is built without openldap because there are no libs available right now (Mantis 3028) -EXTRA_CONFIGURE_ARGS_isa-sparcv8 = --enable-ldap --enable-ldaps -EXTRA_CONFIGURE_ARGS_isa-sparcv9 = --enable-ldap --enable-ldaps -EXTRA_CONFIGURE_ARGS_isa-i386 = --enable-ldap --enable-ldaps -EXTRA_CONFIGURE_ARGS_isa-amd64 = --disable-ldap +EXTRA_CONFIGURE_ARGS_LDAP_isa-sparcv8 = --enable-ldap --enable-ldaps +EXTRA_CONFIGURE_ARGS_LDAP_isa-sparcv9 = --enable-ldap --enable-ldaps +EXTRA_CONFIGURE_ARGS_LDAP_isa-i386 = --enable-ldap --enable-ldaps +EXTRA_CONFIGURE_ARGS_LDAP_isa-amd64 = --disable-ldap +EXTRA_CONFIGURE_ARGS_features-minimal = --disable-ldap --disable-libssh2 --disable-ares +EXTRA_CONFIGURE_ARGS_features-full = --enable-ares --with-spnego=$(libdir) +EXTRA_CONFIGURE_ARGS_features-full += $(EXTRA_CONFIGURE_ARGS_LDAP_isa-$(ISA)) + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl -CONFIGURE_ARGS += --enable-ares -CONFIGURE_ARGS += --with-spnego=$(libdir) CONFIGURE_ARGS += --with-ca-path=/opt/csw/ssl/certs -CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_isa-$(ISA)) +CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_features-$(FEATURES)) BUILD64 = 1 @@ -53,38 +60,57 @@ NOISAEXEC = 1 RUNTIME_DEP_PKGS_CSWcurl = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl CSWcurlrt CSWlibcares CSWlibssh2 -RUNTIME_DEP_PKGS_CSWcurlrt = CSWlibidn CSWoldaprt CSWosslrt CSWzlib CSWlibcares CSWlibssh2 CSWlibfbopenssl +RUNTIME_DEP_PKGS_CSWcurlrt = CSWlibidn CSWosslrt CSWzlib +RUNTIME_DEP_PKGS_CSWcurlrtfull = CSWlibidn CSWoldaprt CSWosslrt CSWzlib CSWlibcares CSWlibssh2 CSWlibfbopenssl RUNTIME_DEP_PKGS_CSWcurldevel = CSWcurl -BUILD_DEP_PKGS = $(filter-out CSWcurl CSWcurlrt,$(RUNTIME_DEP_PKGS_CSWcurl) $(RUNTIME_DEP_PKGS_CSWcurlrt) $(RUNTIME_DEP_PKGS_CSWcurldevel)) +BUILD_DEP_PKGS = $(filter-out CSWcurl CSWcurlrt,$(RUNTIME_DEP_PKGS_CSWcurl) $(RUNTIME_DEP_PKGS_CSWcurlrt) $(RUNTIME_DEP_PKGS_CSWcurlrtfull) $(RUNTIME_DEP_PKGS_CSWcurldevel)) BUILD_DEP_PKGS += CSWoldapdevel CSWossldevel CSWlibcaresdevel CSWlibssh2devel SKIPTEST = 1 -# The 64 bit binary just takes space -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = $(bindir)/curl -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = $(bindir)/curl +# isa-sparcv8-features-minimal isa-sparcv8-features-full isa-sparcv9-features-minimal isa-sparcv9-features-full EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-32.h,p" EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-64.h,p" -EXTRA_PAX_ARGS_isa-sparcv8 = $(EXTRA_PAX_ARGS_32) -EXTRA_PAX_ARGS_isa-sparcv9 = $(EXTRA_PAX_ARGS_64) -EXTRA_PAX_ARGS_isa-i386 = $(EXTRA_PAX_ARGS_32) -EXTRA_PAX_ARGS_isa-amd64 = $(EXTRA_PAX_ARGS_64) +EXTRA_PAX_ARGS_32 += -s ",$(libdir)/libcurl\.so\.4\.2\.0$$,$(libdir_install)/libcurl-$(FEATURES).so.4.2.0,p" +EXTRA_PAX_ARGS_64 += -s ",$(libdir)/libcurl\.so\.4\.2\.0$$,$(libdir_install)/$(ISA)/libcurl-$(FEATURES).so.4.2.0,p" +EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) +# We select pkgconfig for minimal library bindings. As libneon is self-contained (links +# to all necessary libs directly) the full version can simly be linked in. +EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,," +EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES)) + +MERGE_SCRIPTS_isa-default-features-minimal = copy-all +MERGE_SCRIPTS_isa-default64-features-minimal = copy-relocated-only +MERGE_DIRS_isa-default64-features-minimal = $(libdir) +MERGE_SCRIPTS_isa-default-features-full = copy-only +MERGE_DIRS_isa-default-features-full = $(libdir) +MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only +MERGE_DIRS_isa-default64-features-full = $(libdir) + +ALTERNATIVES_CSWcurlrt = minimal +ALTERNATIVES_CSWcurlrtfull = full +ALTERNATIVE_minimal = $(libdir)/libcurl.so.4.2.0 curl $(libdir)/libcurl-minimal.so.4.2.0 100 +ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libcurl.so.4.2.0 curl64 $(libdir)/$(ISA_DEFAULT64)/libcurl-minimal.so.4.2.0 +ALTERNATIVE_full = $(libdir)/libcurl.so.4.2.0 curl $(libdir)/libcurl-full.so.4.2.0 200 +ALTERNATIVE_full += $(libdir)/$(ISA_DEFAULT64)/libcurl.so.4.2.0 curl64 $(libdir)/$(ISA_DEFAULT64)/libcurl-full.so.4.2.0 + PKGFILES_CSWcurldevel = $(PKGFILES_DEVEL) PKGFILES_CSWcurlrt = $(PKGFILES_RT) +PKGFILES_CSWcurlrtfull = .*-full.* include gar/category.mk -post-install-isa-sparcv8: +post-install-isa-sparcv8-features-minimal: ginstall $(FILEDIR)/libcurl.so.3.0.0.s $(DESTDIR)$(libdir)/libcurl.so.3.0.0 ginstall $(FILEDIR)/libcurl.so.2.0.2.s $(DESTDIR)$(libdir)/libcurl.so.2.0.2 ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3 ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2 @$(MAKECOOKIE) -post-install-isa-i386: +post-install-isa-i386-features-minimal: cp $(FILEDIR)/libcurl.so.3.0.0.i $(DESTDIR)$(libdir)/libcurl.so.3.0.0 cp $(FILEDIR)/libcurl.so.2.0.2.i $(DESTDIR)$(libdir)/libcurl.so.2.0.2 ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3 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 Feb 22 16:03:36 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 22 Feb 2010 15:03:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8737] csw/mgar/pkg/transmission/trunk Message-ID: Revision: 8737 http://gar.svn.sourceforge.net/gar/?rev=8737&view=rev Author: janholzh Date: 2010-02-22 15:03:35 +0000 (Mon, 22 Feb 2010) Log Message: ----------- transmission: Update to 1.91 Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile csw/mgar/pkg/transmission/trunk/checksums Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2010-02-22 14:49:56 UTC (rev 8736) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-02-22 15:03:35 UTC (rev 8737) @@ -1,5 +1,5 @@ GARNAME = transmission -GARVERSION = 1.90 +GARVERSION = 1.91 CATEGORIES = net DESCRIPTION = Fast, easy, and free multi-platform BitTorrent client Modified: csw/mgar/pkg/transmission/trunk/checksums =================================================================== --- csw/mgar/pkg/transmission/trunk/checksums 2010-02-22 14:49:56 UTC (rev 8736) +++ csw/mgar/pkg/transmission/trunk/checksums 2010-02-22 15:03:35 UTC (rev 8737) @@ -1,2 +1,2 @@ cbdb5cfaf24b68727042c3828b252534 icons-makefile.patch -91cc216807745a7d287150a6947e9bac transmission-1.90.tar.bz2 +2c6993300988d5aa2e3fc24a439d3633 transmission-1.91.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Feb 22 16:29:54 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 22 Feb 2010 15:29:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8738] csw/mgar/pkg/gstreamer/trunk/ Message-ID: Revision: 8738 http://gar.svn.sourceforge.net/gar/?rev=8738&view=rev Author: bensons Date: 2010-02-22 15:29:53 +0000 (Mon, 22 Feb 2010) Log Message: ----------- gstreamer: set proper svn:ignore Property Changed: ---------------- csw/mgar/pkg/gstreamer/trunk/ Property changes on: csw/mgar/pkg/gstreamer/trunk ___________________________________________________________________ Modified: svn:ignore - cookies\ndownload\nwork\n + cookies download work This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Feb 22 16:33:04 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 22 Feb 2010 15:33:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[8739] csw/mgar/gar/v2/lib/python/checkpkg.py Message-ID: Revision: 8739 http://gar.svn.sourceforge.net/gar/?rev=8739&view=rev Author: wahwah Date: 2010-02-22 15:33:04 +0000 (Mon, 22 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, tolerate duplicate pkgnames Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-22 15:29:53 UTC (rev 8738) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-22 15:33:04 UTC (rev 8739) @@ -276,7 +276,11 @@ """ for line in stdout.splitlines(): pkgname, pkg_desc = self._ParsePkginfoLine(line) - c.execute(sql, [pkgname, pkg_desc]) + try: + c.execute(sql, [pkgname, pkg_desc]) + except sqlite3.IntegrityError, e: + logging.warn("pkgname %s throws an sqlite3.IntegrityError: %s", + repr(pkgname), e) def SetDatabaseMtime(self): c = self.conn.cursor() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Feb 22 16:43:37 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 22 Feb 2010 15:43:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8740] csw/mgar/gar/v2/lib/python/checkpkg.py Message-ID: Revision: 8740 http://gar.svn.sourceforge.net/gar/?rev=8740&view=rev Author: wahwah Date: 2010-02-22 15:43:36 +0000 (Mon, 22 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, delete rows from all the tables. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-22 15:33:04 UTC (rev 8739) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-22 15:43:36 UTC (rev 8740) @@ -395,10 +395,11 @@ except sqlite3.OperationalError, e: logging.warn(e) logging.info("Deleting all rows from the cache database") - sql = "DELETE FROM config;" - c.execute(sql) - sql = "DELETE FROM systempkgmap;" - c.execute(sql) + for table in ("config", "systempkgmap", "packages"): + try: + c.execute("DELETE FROM %s;" % table) + except sqlite3.OperationalError, e: + logging.warn("sqlite3.OperationalError: %s", e) def SharedObjectDependencies(pkgname, binaries_by_pkgname, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Feb 22 17:42:27 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 22 Feb 2010 16:42:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[8741] csw/mgar/gar/v2/lib/python/checkpkg_test.py Message-ID: Revision: 8741 http://gar.svn.sourceforge.net/gar/?rev=8741&view=rev Author: wahwah Date: 2010-02-22 16:42:27 +0000 (Mon, 22 Feb 2010) Log Message: ----------- mGAR v2: checkpkg unit tests, rename a test method Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-22 15:43:36 UTC (rev 8740) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-22 16:42:27 UTC (rev 8741) @@ -709,7 +709,7 @@ overrides = [checkpkg.Override("CSWfoo", "foo-tag", "tag-info-1")] self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) - def test_5(self): + def test_6(self): """Pkgname mismatch.""" tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")] overrides = [checkpkg.Override("CSWbar", "foo-tag", "tag-info-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 Mon Feb 22 17:56:58 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 22 Feb 2010 16:56:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8742] csw/mgar/gar/v2/lib/python/checkpkg_test.py Message-ID: Revision: 8742 http://gar.svn.sourceforge.net/gar/?rev=8742&view=rev Author: wahwah Date: 2010-02-22 16:56:58 +0000 (Mon, 22 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, Added a unit test for _ParseNmSymLine Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-22 16:42:27 UTC (rev 8741) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-22 16:56:58 UTC (rev 8742) @@ -727,5 +727,18 @@ self.assertEqual(expected, spkgmap._ParsePkginfoLine(line)) +class PackageStatsUnitTest(unittest.TestCase): + + def test_ParseNmSymLine(self): + line = '0000097616 T aliases_lookup' + expected = { + 'address': '0000097616', + 'type': 'T', + 'name': 'aliases_lookup', + } + pkgstats = checkpkg.PackageStats(None) + self.assertEqual(expected, pkgstats._ParseNmSymLine(line)) + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Feb 22 17:58:36 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 22 Feb 2010 16:58:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8743] csw/mgar/gar/v2/lib/python/checkpkg_test.py Message-ID: Revision: 8743 http://gar.svn.sourceforge.net/gar/?rev=8743&view=rev Author: wahwah Date: 2010-02-22 16:58:36 +0000 (Mon, 22 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, lib/python/checkpkg_test.py set to executable Property Changed: ---------------- csw/mgar/gar/v2/lib/python/checkpkg_test.py Property changes on: csw/mgar/gar/v2/lib/python/checkpkg_test.py ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Feb 22 17:59:08 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 22 Feb 2010 16:59:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8744] csw/mgar/pkg/gstplugins_good/trunk/Makefile Message-ID: Revision: 8744 http://gar.svn.sourceforge.net/gar/?rev=8744&view=rev Author: bensons Date: 2010-02-22 16:59:07 +0000 (Mon, 22 Feb 2010) Log Message: ----------- gstplugins_good: changed GARNAME, link against our X11 libraries Modified Paths: -------------- csw/mgar/pkg/gstplugins_good/trunk/Makefile Modified: csw/mgar/pkg/gstplugins_good/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins_good/trunk/Makefile 2010-02-22 16:58:36 UTC (rev 8743) +++ csw/mgar/pkg/gstplugins_good/trunk/Makefile 2010-02-22 16:59:07 UTC (rev 8744) @@ -1,4 +1,4 @@ -GARNAME = gstplugins_good +GARNAME = gst-plugins-good GARVERSION = 0.10.18 CATEGORIES = gnome @@ -11,37 +11,51 @@ endef MASTER_SITES = http://gstreamer.freedesktop.org/src/gst-plugins-good/ -SRCNAME = gst-plugins-good -DISTFILES = $(SRCNAME)-$(GARVERSION).tar.gz -WORKSRC = $(WORKDIR)/$(SRCNAME)-$(GARVERSION) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + PACKAGES = CSWgstpluginsgood CATALOGNAME = gstplugins_good # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -BUILD_DEP_PKGS += CSWzlib CSWsunmath CSWspeex CSWpng CSWpango CSWorbit2 -BUILD_DEP_PKGS += CSWlibxml2 CSWliboil CSWlibcairo CSWlibatk CSWjpeg CSWgtk2 -BUILD_DEP_PKGS += CSWgstreamer CSWgstplugins CSWglib2 CSWggettext CSWgconf2 -BUILD_DEP_PKGS += CSWflac CSWesound CSWaudiofile CSWaalib CSWbzip2 -BUILD_DEP_PKGS += CSWggettextrt CSWlibogg CSWlibshout CSWncurses CSWtheora -BUILD_DEP_PKGS += CSWvorbis -RUNTIME_DEP_PKGS = $(BUILD_DEP_PKGS) +DEP_PKGS += CSWzlib CSWspeex CSWpng CSWlibice CSWlibx11 CSWgtk2 CSWvorbis +DEP_PKGS += CSWlibxml2 CSWliboil CSWlibcairo CSWjpeg CSWglib2 CSWgconf2 +DEP_PKGS += CSWgstreamer CSWgstplugins CSWflac CSWesound CSWbzip2 CSWlibsm +DEP_PKGS += CSWggettextrt CSWlibogg CSWlibshout CSWtheora CSWlibxext CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --disable-debug +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib/$(MM_LIBDIR) +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + + STRIP_LIBTOOL = 1 TEST_SCRIPTS = -LICENSE = $(WORKDIR_FIRSTMOD)/$(SRCNAME)-$(GARVERSION)/COPYING - PATCHFILES = patch-matroska-demux.c include gar/category.mk post-configure-modulated: - # we do not have a hyperbolic tangent float function on solaris8, - # using hyperbolic tangent double instead + @# we do not have a hyperbolic tangent float function on solaris8, + @# using hyperbolic tangent double instead perl -pi -e 's,tanhf,tanh,' \ $(WORKSRC)/gst/replaygain/gstrglimiter.c + @# [bus_message_cb]:ube: error: SIGNAL: Segmentation Fault + @# <@Dagobert> Yes, try lowering the optimizer level from -xO3 down to -xO2 + @# and may further down. + perl -pi -e 's,xO3,xO1,' $(WORKSRC)/tests/icles/Makefile + gsed -i 's/\(demo_LDFLAGS =\)/\1 $$(X_LIBS)/' \ + $(WORKSRC)/tests/examples/equalizer/Makefile + gsed -i 's/\(demo_LDFLAGS =\)/\1 $$(X_LIBS)/' \ + $(WORKSRC)/tests/examples/spectrum/Makefile + gsed -i 's/\(demo_osssrc_LDFLAGS =\)/\1 $$(X_LIBS)/' \ + $(WORKSRC)/tests/examples/spectrum/Makefile + gsed -i 's/\(demo_audiotest_LDFLAGS =\)/\1 $$(X_LIBS)/' \ + $(WORKSRC)/tests/examples/spectrum/Makefile + gsed -i 's/\(spectrum_example_LDFLAGS =\)/\1 $$(X_LIBS)/' \ + $(WORKSRC)/tests/examples/spectrum/Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Feb 22 18:03:36 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 22 Feb 2010 17:03:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8745] csw/mgar/gar/v2/lib/python/checkpkg.py Message-ID: Revision: 8745 http://gar.svn.sourceforge.net/gar/?rev=8745&view=rev Author: skayser Date: 2010-02-22 17:03:36 +0000 (Mon, 22 Feb 2010) Log Message: ----------- checkpkg: added GetDefinedSymbols to determine package-contained symbols Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-22 16:59:07 UTC (rev 8744) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-22 17:03:36 UTC (rev 8745) @@ -986,7 +986,56 @@ ldd_output[binary] = lines return ldd_output + def GetDefinedSymbols(self): + """Returns text symbols (i.e. defined functions) for packaged ELF objects + To do this we parse output lines from nm similar to the following. "T"s are + the definitions which we are after. + + 0000104000 D _lib_version + 0000986980 D _libiconv_version + 0000000000 U abort + 0000097616 T aliases_lookup + """ + dir_pkg = self.GetDirFormatPkg() + binaries = dir_pkg.ListBinaries() + defined_symbols = {} + + for binary in binaries: + binary_abspath = os.path.join(dir_pkg.directory, "root", binary) + # Get parsable, ld.so.1 relevant SHT_DYNSYM symbol information + args = ["/usr/ccs/bin/nm", "-p", "-D", binary_abspath] + nm_proc = subprocess.Popen( + args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = nm_proc.communicate() + retcode = nm_proc.wait() + if retcode: + logging.error("%s returned an error: %s", args, stderr) + continue + nm_out = stdout.splitlines() + + defined_symbols[binary] = [] + for line in nm_out: + sym = self._ParseNmSymLine(line) + if not sym: + continue + if not sym['type'] == "T": + continue + defined_symbols[binary].append(sym['name']) + + return defined_symbols + + def _ParseNmSymLine(self, line): + re_defined_symbol = re.compile('[0-9]+ [ABDFNSTU] \S+') + m = re_defined_symbol.match(line) + if not m: + return None + fields = line.split() + sym = { 'address': fields[0], 'type': fields[1], 'name': fields[2] } + return sym + def CollectStats(self): stats_path = self.GetStatsPath() self.MakeStatsDir() @@ -1002,6 +1051,7 @@ self.DumpObject(dir_pkg.GetParsedPkginfo(), "pkginfo") self.DumpObject(dir_pkg.GetPkgmap().entries, "pkgmap") self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") + self.DumpObject(self.GetDefinedSymbols(), "defined_symbols") logging.debug("Statistics collected.") def GetAllStats(self): 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 Feb 22 18:07:52 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 22 Feb 2010 17:07:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8746] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 8746 http://gar.svn.sourceforge.net/gar/?rev=8746&view=rev Author: dmichelsen Date: 2010-02-22 17:07:52 +0000 (Mon, 22 Feb 2010) Log Message: ----------- curl: Minor tweaks Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2010-02-22 17:03:36 UTC (rev 8745) +++ csw/mgar/pkg/curl/trunk/Makefile 2010-02-22 17:07:52 UTC (rev 8746) @@ -24,15 +24,15 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 PACKAGES = CSWcurl CSWcurlrt CSWcurlrtfull CSWcurldevel -CATALOGNAME_CSWcurl = curl -CATALOGNAME_CSWcurlrt = curl_rt +CATALOGNAME_CSWcurl = curl +CATALOGNAME_CSWcurlrt = curl_rt CATALOGNAME_CSWcurlrtfull = curl_rt_full -CATALOGNAME_CSWcurldevel = curl_devel +CATALOGNAME_CSWcurldevel = curl_devel -SPKG_DESC_CSWcurl = A command line tool and library for client-side URL transfers -SPKG_DESC_CSWcurlrt = Curl Runtime Libraries (minimal dependencies) +SPKG_DESC_CSWcurl = A command line tool and library for client-side URL transfers +SPKG_DESC_CSWcurlrt = Curl Runtime Libraries (minimal dependencies) SPKG_DESC_CSWcurlrtfull = Curl Runtime Libraries (full featured) -SPKG_DESC_CSWcurldevel = Curl Developer Files +SPKG_DESC_CSWcurldevel = Curl Developer Files SPKG_SOURCEURL = http://curl.haxx.se @@ -45,7 +45,7 @@ EXTRA_CONFIGURE_ARGS_LDAP_isa-i386 = --enable-ldap --enable-ldaps EXTRA_CONFIGURE_ARGS_LDAP_isa-amd64 = --disable-ldap -EXTRA_CONFIGURE_ARGS_features-minimal = --disable-ldap --disable-libssh2 --disable-ares +EXTRA_CONFIGURE_ARGS_features-minimal = --disable-ldap --without-libssh2 --disable-ares EXTRA_CONFIGURE_ARGS_features-full = --enable-ares --with-spnego=$(libdir) EXTRA_CONFIGURE_ARGS_features-full += $(EXTRA_CONFIGURE_ARGS_LDAP_isa-$(ISA)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Feb 22 18:42:26 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 22 Feb 2010 17:42:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[8747] csw/mgar/gar/v2/lib/python Message-ID: Revision: 8747 http://gar.svn.sourceforge.net/gar/?rev=8747&view=rev Author: wahwah Date: 2010-02-22 17:42:26 +0000 (Mon, 22 Feb 2010) Log Message: ----------- mGAR v2: checkpkg_test.py style cleanup, wrapping long lines Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-22 17:07:52 UTC (rev 8746) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-22 17:42:26 UTC (rev 8747) @@ -1090,7 +1090,8 @@ f = open(in_file_name_pickle, "r") obj = cPickle.load(f) f.close() - logging.debug("ReadObject(): finished reading %s", repr(in_file_name_pickle)) + logging.debug("ReadObject(): finished reading %s", + repr(in_file_name_pickle)) else: logging.debug("ReadObject(): reading %s", repr(in_file_name)) f = open(in_file_name, "r") Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-22 17:07:52 UTC (rev 8746) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-22 17:42:26 UTC (rev 8747) @@ -34,10 +34,19 @@ SELECT * FROM systempkgmap WHERE basename = 'libncursesw.so.5'; """ +LDD_R_OUTPUT_1 = """\tlibc.so.1 => /lib/libc.so.1 +\tsymbol not found: check_encoding_conversion_args (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) +\tsymbol not found: LocalToUtf (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) +\tsymbol not found: UtfToLocal (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) +\tlibm.so.2 => /lib/libm.so.2 +""" + class DependenciesUnitTest_1(unittest.TestCase): def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + (self.missing_deps, + self.surplus_deps, + self.orphan_sonames) = checkpkg.AnalyzeDependencies( d1.DATA_PKGNAME, d1.DATA_DECLARED_DEPENDENCIES, d1.DATA_BINARIES_BY_PKGNAME, @@ -61,7 +70,9 @@ class DependenciesUnitTest_2(unittest.TestCase): def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + (self.missing_deps, + self.surplus_deps, + self.orphan_sonames) = checkpkg.AnalyzeDependencies( d2.DATA_PKGNAME, d2.DATA_DECLARED_DEPENDENCIES, d2.DATA_BINARIES_BY_PKGNAME, @@ -85,7 +96,9 @@ class DependenciesUnitTest_3(unittest.TestCase): def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + (self.missing_deps, + self.surplus_deps, + self.orphan_sonames) = checkpkg.AnalyzeDependencies( d3.DATA_PKGNAME, d3.DATA_DECLARED_DEPENDENCIES, d3.DATA_BINARIES_BY_PKGNAME, @@ -109,7 +122,9 @@ class DependenciesUnitTest_4(unittest.TestCase): def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + (self.missing_deps, + self.surplus_deps, + self.orphan_sonames) = checkpkg.AnalyzeDependencies( d4.DATA_PKGNAME, d4.DATA_DECLARED_DEPENDENCIES, d4.DATA_BINARIES_BY_PKGNAME, @@ -133,7 +148,9 @@ class DependenciesUnitTest_5(unittest.TestCase): def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + (self.missing_deps, + self.surplus_deps, + self.orphan_sonames) = checkpkg.AnalyzeDependencies( d5.DATA_PKGNAME, d5.DATA_DECLARED_DEPENDENCIES, d5.DATA_BINARIES_BY_PKGNAME, @@ -260,13 +277,15 @@ data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) data2 = dict(((x, x) for x in data1)) - self.assertEqual(set([u"CSWmysql51"]), checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", data2)) + self.assertEqual(set([u"CSWmysql51"]), + checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", data2)) def testGuessDepsByPkgname4(self): data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) data2 = dict(((x, x) for x in data1)) - self.assertEqual(set([]), checkpkg.GuessDepsByPkgname(u"CSWmysql51rt", data2)) + self.assertEqual(set([]), + checkpkg.GuessDepsByPkgname(u"CSWmysql51rt", data2)) class GetLinesBySonameUnitTest(unittest.TestCase): @@ -291,7 +310,8 @@ def testExpandRunpath_2(self): isalist = ["foo", "bar"] runpath = "/opt/csw/mysql5/lib/$ISALIST/mysql" - expected = ["/opt/csw/mysql5/lib/foo/mysql", "/opt/csw/mysql5/lib/bar/mysql"] + expected = ["/opt/csw/mysql5/lib/foo/mysql", + "/opt/csw/mysql5/lib/bar/mysql"] self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) def testEmulate64BitSymlinks_1(self): @@ -329,8 +349,10 @@ expected = "/opt/csw/bdb42" not_expected = "/opt/csw/bdb422" result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) + self.assertTrue(expected in result, + "%s not in %s" % (expected, result)) + self.assertFalse(not_expected in result, + "%s is in %s" % (not_expected, result)) def testEmulateSymlinks_5(self): """Install time symlink expansion.""" @@ -344,9 +366,12 @@ runpath_list = ["/opt/csw/lib/i386"] expected = "/opt/csw/lib" not_expected = "/opt/csw/lib/i386" - result = checkpkg.ExpandSymlink("/opt/csw/lib/i386", "/opt/csw/lib", "/opt/csw/lib/i386") + result = checkpkg.ExpandSymlink("/opt/csw/lib/i386", + "/opt/csw/lib", + "/opt/csw/lib/i386") self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) + self.assertFalse(not_expected in result, + "%s is in %s" % (not_expected, result)) def testGetLinesBySoname(self): expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} @@ -438,8 +463,9 @@ def testGetLinesBySoname_6(self): """Based on CSWmysql5client on build8x.""" soname = u'libz.so.1' - expected = {u'libz.so.1': u'/opt/csw/lib/pentium_pro+mmx/libz.so.1=libz.so.1.2.3 ' - u's none CSWzlib\n'} + expected = { + u'libz.so.1': u'/opt/csw/lib/pentium_pro+mmx/libz.so.1=libz.so.1.2.3 ' + u's none CSWzlib\n'} pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) (needed_sonames, binaries_by_soname, @@ -457,9 +483,9 @@ soname = u'libncursesw.so.5' # To test the 64-bit symlink expansion expected = { - u'libncursesw.so.5': - u'/opt/csw/lib/amd64/libncursesw.so.5=libncursesw.so.5.7 ' - u's none CSWncurses\n'} + u'libncursesw.so.5': + u'/opt/csw/lib/amd64/libncursesw.so.5=libncursesw.so.5.7 ' + u's none CSWncurses\n'} pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) (needed_sonames, binaries_by_soname, @@ -482,7 +508,8 @@ pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) self.pkgmap_mocker.ReplayAll() needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/postgresql/lib/", "/usr/lib"]} + runpath_by_needed_soname = { + "foo.so.1": ["/opt/csw/postgresql/lib/", "/usr/lib"]} isalist = ["isa-value-1", "isa-value-2"] result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) self.pkgmap_mocker.VerifyAll() @@ -502,15 +529,18 @@ needed_sonames = set(["foo.so.0"]) runpath_by_needed_soname = {"foo.so.0": ["/opt/csw/lib", "/usr/lib"]} isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + result = checkpkg.GetLinesBySoname( + pkgmap, needed_sonames, runpath_by_needed_soname, isalist) self.pkgmap_mocker.VerifyAll() self.assertEqual(expected, result) def testSanitizeRunpath_1(self): - self.assertEqual("/opt/csw/lib", checkpkg.SanitizeRunpath("/opt/csw/lib/")) + self.assertEqual("/opt/csw/lib", + checkpkg.SanitizeRunpath("/opt/csw/lib/")) def testSanitizeRunpath_2(self): - self.assertEqual("/opt/csw/lib", checkpkg.SanitizeRunpath("/opt//csw////lib/")) + self.assertEqual("/opt/csw/lib", + checkpkg.SanitizeRunpath("/opt//csw////lib/")) @@ -541,7 +571,8 @@ checkpkg.ParseDumpOutput(dump_1.DATA_DUMP_OUTPUT)) def test_2(self): - expected_runpath = ['/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'] + expected_runpath = ['/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', + '/lib'] self.assertEqual( expected_runpath, checkpkg.ParseDumpOutput(dump_2.DATA_DUMP_OUTPUT)["runpath"]) @@ -623,11 +654,13 @@ def testParseTagLine3(self): line = "CSWfoo: foo-tag foo-info" - self.assertEquals(("CSWfoo", "foo-tag", "foo-info"), checkpkg.ParseTagLine(line)) + self.assertEquals(("CSWfoo", "foo-tag", "foo-info"), + checkpkg.ParseTagLine(line)) def testParseTagLine4(self): line = "CSWfoo: foo-tag foo-info1 foo-info2" - self.assertEquals(("CSWfoo", "foo-tag", "foo-info1 foo-info2"), checkpkg.ParseTagLine(line)) + self.assertEquals(("CSWfoo", "foo-tag", "foo-info1 foo-info2"), + checkpkg.ParseTagLine(line)) class ParseOverrideLineUnitTest(unittest.TestCase): @@ -729,7 +762,7 @@ class PackageStatsUnitTest(unittest.TestCase): - def test_ParseNmSymLine(self): + def test_ParseNmSymLineGoodLine(self): line = '0000097616 T aliases_lookup' expected = { 'address': '0000097616', @@ -739,6 +772,11 @@ pkgstats = checkpkg.PackageStats(None) self.assertEqual(expected, pkgstats._ParseNmSymLine(line)) + def test_ParseNmSymLineBadLine(self): + line = 'foo' + pkgstats = checkpkg.PackageStats(None) + self.assertEqual(None, pkgstats._ParseNmSymLine(line)) + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Feb 22 19:08:37 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 22 Feb 2010 18:08:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8748] csw/mgar/pkg/gstplugins_bad/trunk/Makefile Message-ID: Revision: 8748 http://gar.svn.sourceforge.net/gar/?rev=8748&view=rev Author: bensons Date: 2010-02-22 18:08:37 +0000 (Mon, 22 Feb 2010) Log Message: ----------- gstplugins_bad: adjusted GARNAME, link against our X11 libraries Modified Paths: -------------- csw/mgar/pkg/gstplugins_bad/trunk/Makefile Modified: csw/mgar/pkg/gstplugins_bad/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins_bad/trunk/Makefile 2010-02-22 17:42:26 UTC (rev 8747) +++ csw/mgar/pkg/gstplugins_bad/trunk/Makefile 2010-02-22 18:08:37 UTC (rev 8748) @@ -1,4 +1,4 @@ -GARNAME = gstplugins_bad +GARNAME = gst-plugins-bad GARVERSION = 0.10.17 CATEGORIES = gnome @@ -11,33 +11,35 @@ endef MASTER_SITES = http://gstreamer.freedesktop.org/src/gst-plugins-bad/ -SRCNAME = gst-plugins-bad -DISTFILES = $(SRCNAME)-$(GARVERSION).tar.gz -WORKSRC = $(WORKDIR)/$(SRCNAME)-$(GARVERSION) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWgstpluginsbad CATALOGNAME = gstplugins_bad # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -BUILD_DEP_PKGS += CSWzlib CSWsunmath CSWneon CSWmesa CSWlibxml2 CSWlibsdl -BUILD_DEP_PKGS += CSWiconv CSWgstreamer CSWgstplugins CSWglib2 CSWggettext -BUILD_DEP_PKGS += CSWbzip2 CSWfaac CSWfaad2 CSWggettextrt CSWjasper CSWliboil -RUNTIME_DEP_PKGS = $(BUILD_DEP_PKGS) +DEP_PKGS += CSWlibxml2 CSWgtk2 CSWlibx11 CSWlibice CSWlibglade2 CSWlibsm +DEP_PKGS += CSWgstreamer CSWgstplugins CSWglib2 CSWpango CSWlibatk CSWlibcairo +DEP_PKGS += CSWbzip2 CSWfaac CSWfaad2 CSWggettextrt CSWjasper CSWliboil +DEP_PKGS += CSWfconfig CSWftype2 CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --disable-debug +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib/$(MM_LIBDIR) +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + STRIP_LIBTOOL = 1 TEST_SCRIPTS = -LICENSE = $(WORKDIR_FIRSTMOD)/$(SRCNAME)-$(GARVERSION)/COPYING - PATCHFILES = patch-gstvideomeasure_collector.h patch-gstvideomeasure_ssim.h # we provide that symbol CHECKPKG_OVERRIDES_CSWgstpluginsbad += symbol-not-found|libgstcamerabin.so +CHECKPKG_OVERRIDES_CSWgstpluginsbad += symbol-not-found|gst-camera include gar/category.mk post-configure-modulated: @@ -53,3 +55,12 @@ $(WORKSRC)/gst/librfb/vncauth.c perl -pi -e 's,INADDR_NONE,~INADDR_ANY,' \ $(WORKSRC)/gst/pcapparse/gstpcapparse.c + perl -pi -e 's,(LIBS = -lnsl -lsocket),$$1 -lm,' \ + $(WORKSRC)/tests/examples/scaletempo/Makefile + @# because of our legacy libXrender + gsed -i 's/^\(LDFLAGS =\)/\1 $$(X_LIBS)/' \ + $(WORKSRC)/tests/examples/camerabin/Makefile + gsed -i 's/\(mxfdemux_structure_LDFLAGS =\)/\1 $$(X_LIBS)/' \ + $(WORKSRC)/tests/examples/mxf/Makefile + gsed -i 's/\(scaletempo_demo_LDFLAGS =\)/\1 $$(X_LIBS)/' \ + $(WORKSRC)/tests/examples/scaletempo/Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Feb 22 19:19:43 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 22 Feb 2010 18:19:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8749] csw/mgar/pkg/gstplugins_ugly/trunk/Makefile Message-ID: Revision: 8749 http://gar.svn.sourceforge.net/gar/?rev=8749&view=rev Author: bensons Date: 2010-02-22 18:19:43 +0000 (Mon, 22 Feb 2010) Log Message: ----------- gstplugins_ugly: adjusted GARNAME, link against our X11 libraries Modified Paths: -------------- csw/mgar/pkg/gstplugins_ugly/trunk/Makefile Modified: csw/mgar/pkg/gstplugins_ugly/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins_ugly/trunk/Makefile 2010-02-22 18:08:37 UTC (rev 8748) +++ csw/mgar/pkg/gstplugins_ugly/trunk/Makefile 2010-02-22 18:19:43 UTC (rev 8749) @@ -1,4 +1,4 @@ -GARNAME = gstplugins_ugly +GARNAME = gst-plugins-ugly GARVERSION = 0.10.13 CATEGORIES = gnome @@ -11,9 +11,7 @@ endef MASTER_SITES = http://gstreamer.freedesktop.org/src/gst-plugins-ugly/ -SRCNAME = gst-plugins-ugly -DISTFILES = $(SRCNAME)-$(GARVERSION).tar.gz -WORKSRC = $(WORKDIR)/$(SRCNAME)-$(GARVERSION) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWgstpluginsugly CATALOGNAME = gstplugins_ugly @@ -27,11 +25,14 @@ CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --disable-debug +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib/$(MM_LIBDIR) +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + STRIP_LIBTOOL = 1 TEST_SCRIPTS = -LICENSE = $(WORKDIR_FIRSTMOD)/$(SRCNAME)-$(GARVERSION)/COPYING - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Feb 22 19:27:29 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 22 Feb 2010 18:27:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8750] csw/mgar/gar/v2/lib/python Message-ID: Revision: 8750 http://gar.svn.sourceforge.net/gar/?rev=8750&view=rev Author: wahwah Date: 2010-02-22 18:27:29 +0000 (Mon, 22 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, ldd -r line parser and a unit test for it. It's not plugged in anywhere yet. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-22 18:19:43 UTC (rev 8749) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-22 18:27:29 UTC (rev 8750) @@ -1105,3 +1105,28 @@ for name in self.STAT_FILES: all_stats[name] = self.ReadObject(name) return all_stats + + def _ParseLddDashRline(self, line): + found_re = r"^\t(?P\S+)\s+=>\s+(?P\S+)" + symbol_not_found_re = r"^\tsymbol not found:\s(?P\S+)\s+\((?P\S+)\)" + common_re = r"(%s|%s)" % (found_re, symbol_not_found_re) + m = re.match(common_re, line) + response = {} + if m: + d = m.groupdict() + if "soname" in d and d["soname"]: + # it was found + response["state"] = "OK" + response["soname"] = d["soname"] + response["path"] = d["path_found"] + response["symbol"] = None + elif "symbol" in d: + response["state"] = "symbol-not-found" + response["soname"] = None + response["path"] = d["path_not_found"] + response["symbol"] = d["symbol"] + else: + raise StdoutSyntaxError("Could not parse %s" % repr(line)) + else: + raise StdoutSyntaxError("Could not parse %s" % repr(line)) + return response Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-22 18:19:43 UTC (rev 8749) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-22 18:27:29 UTC (rev 8750) @@ -762,6 +762,9 @@ class PackageStatsUnitTest(unittest.TestCase): + def setUp(self): + self.pkgstats = checkpkg.PackageStats(None) + def test_ParseNmSymLineGoodLine(self): line = '0000097616 T aliases_lookup' expected = { @@ -769,14 +772,33 @@ 'type': 'T', 'name': 'aliases_lookup', } - pkgstats = checkpkg.PackageStats(None) - self.assertEqual(expected, pkgstats._ParseNmSymLine(line)) + self.assertEqual(expected, self.pkgstats._ParseNmSymLine(line)) def test_ParseNmSymLineBadLine(self): line = 'foo' - pkgstats = checkpkg.PackageStats(None) - self.assertEqual(None, pkgstats._ParseNmSymLine(line)) + self.assertEqual(None, self.pkgstats._ParseNmSymLine(line)) + def test_ParseLddDashRlineFound(self): + line = '\tlibc.so.1 => /lib/libc.so.1' + expected = { + 'state': 'OK', + 'soname': 'libc.so.1', + 'path': '/lib/libc.so.1', + 'symbol': None, + } + self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + def test_ParseLddDashRlineSymbolMissing(self): + line = ('\tsymbol not found: check_encoding_conversion_args ' + '(/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so)') + expected = { + 'state': 'symbol-not-found', + 'soname': None, + 'path': '/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so', + 'symbol': 'check_encoding_conversion_args', + } + self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Feb 22 21:21:12 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 22 Feb 2010 20:21:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[8751] csw/mgar/pkg/rrdtool/trunk/Makefile Message-ID: Revision: 8751 http://gar.svn.sourceforge.net/gar/?rev=8751&view=rev Author: idogan23 Date: 2010-02-22 20:21:12 +0000 (Mon, 22 Feb 2010) Log Message: ----------- rrdtool: just a commit in between... Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/Makefile Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2010-02-22 18:27:29 UTC (rev 8750) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2010-02-22 20:21:12 UTC (rev 8751) @@ -16,6 +16,10 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +#GARCOMPILER = SOS12 +#GARCOMPILER = GCC4 +#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 + RUNTIME_DEP_PKGS = CSWggettextrt RUNTIME_DEP_PKGS += CSWglib2 RUNTIME_DEP_PKGS += CSWiconv @@ -29,7 +33,7 @@ RUNTIME_DEP_PKGS += CSWruby EXTRA_INC = $(prefix)/include/cairo -EXTRA_INC += $(prefix)/include/libxml2/libxml +EXTRA_INC += $(prefix)/include/libxml2 EXTRA_INC += $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib 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 Feb 23 01:10:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 23 Feb 2010 00:10:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8752] csw/mgar/gar/v2 Message-ID: Revision: 8752 http://gar.svn.sourceforge.net/gar/?rev=8752&view=rev Author: wahwah Date: 2010-02-23 00:10:13 +0000 (Tue, 23 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, using nm to collect symbols and anlayze them. Slow. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg_collect_stats.py csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-missing-symbols.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Property Changed: ---------------- csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/bin/checkpkg_collect_stats.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg_collect_stats.py 2010-02-22 20:21:12 UTC (rev 8751) +++ csw/mgar/gar/v2/bin/checkpkg_collect_stats.py 2010-02-23 00:10:13 UTC (rev 8752) @@ -36,7 +36,7 @@ packages = [opencsw.CswSrv4File(x, options.debug) for x in args] stats_list = [checkpkg.PackageStats(pkg) for pkg in packages] for pkg_stats in stats_list: - pkg_stats.CollectStats() + pkg_stats.CollectStats() if __name__ == '__main__': - main() + main() Modified: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-missing-symbols.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-missing-symbols.py 2010-02-22 20:21:12 UTC (rev 8751) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-missing-symbols.py 2010-02-23 00:10:13 UTC (rev 8752) @@ -19,28 +19,10 @@ "..", "..", "lib", "python"] sys.path.append(os.path.join(*path_list)) import checkpkg +import package_checks # Defining checking functions. -def CheckForMissingSymbols(pkg_data, debug): - """Looks for "symbol not found" in ldd -r output.""" - errors = [] - binaries = pkg_data["binaries"] - symbol_re = re.compile(r"symbol not found:") - for binary in binaries: - lines = pkg_data["ldd_dash_r"][binary] - missing_symbols = False - for line in lines: - if re.search(symbol_re, line): - missing_symbols = True - binary_base = os.path.basename(binary) - if missing_symbols: - errors.append(checkpkg.CheckpkgTag( - pkg_data["basic_stats"]["pkgname"], - "symbol-not-found", binary_base)) - return errors - - def main(): options, args = checkpkg.GetOptions() md5sums = args @@ -51,7 +33,7 @@ md5sums, options.debug) # Registering functions defined above. - check_manager.RegisterIndividualCheck(CheckForMissingSymbols) + check_manager.RegisterSetCheck(package_checks.CheckForMissingSymbols) # Running the checks, reporting and exiting. exit_code, screen_report, tags_report = check_manager.Run() f = open(options.output, "w") Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-22 20:21:12 UTC (rev 8751) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-23 00:10:13 UTC (rev 8752) @@ -111,6 +111,10 @@ pass +class StdoutSyntaxError(Error): + pass + + def GetOptions(): parser = optparse.OptionParser() parser.add_option("-b", dest="stats_basedir", @@ -811,7 +815,7 @@ def ApplyOverrides(error_tags, overrides): """Filters out all the error tags that overrides apply to. - + O(N * M), but N and M are always small. """ tags_after_overrides = [] @@ -845,6 +849,7 @@ "basic_stats", "binaries", "binaries_dump_info", + "defined_symbols", "depends", "isalist", "ldd_dash_r", @@ -982,8 +987,10 @@ retcode = ldd_proc.wait() if retcode: logging.error("%s returned an error: %s", args, stderr) - lines = stdout.splitlines() - ldd_output[binary] = lines + ldd_info = [] + for line in stdout.splitlines(): + ldd_info.append(self._ParseLddDashRline(line)) + ldd_output[binary] = ldd_info return ldd_output def GetDefinedSymbols(self): @@ -1036,7 +1043,14 @@ sym = { 'address': fields[0], 'type': fields[1], 'name': fields[2] } return sym - def CollectStats(self): + def CollectStats(self, force=False): + if not self.StatsDirExists() or force: + self._CollectStats() + + def _CollectStats(self): + """The list of variables needs to be synchronized with the one + at the top of this class. + """ stats_path = self.GetStatsPath() self.MakeStatsDir() dir_pkg = self.GetDirFormatPkg() @@ -1109,7 +1123,8 @@ def _ParseLddDashRline(self, line): found_re = r"^\t(?P\S+)\s+=>\s+(?P\S+)" symbol_not_found_re = r"^\tsymbol not found:\s(?P\S+)\s+\((?P\S+)\)" - common_re = r"(%s|%s)" % (found_re, symbol_not_found_re) + only_so = r"^\t(?P\S+)$" + common_re = r"(%s|%s|%s)" % (found_re, symbol_not_found_re, only_so) m = re.match(common_re, line) response = {} if m: @@ -1120,11 +1135,16 @@ response["soname"] = d["soname"] response["path"] = d["path_found"] response["symbol"] = None - elif "symbol" in d: + elif "symbol" in d and d["symbol"]: response["state"] = "symbol-not-found" response["soname"] = None response["path"] = d["path_not_found"] response["symbol"] = d["symbol"] + elif d["path_only"]: + response["state"] = "OK" + response["soname"] = None + response["path"] = d["path_only"] + response["symbol"] = None else: raise StdoutSyntaxError("Could not parse %s" % repr(line)) else: Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-22 20:21:12 UTC (rev 8751) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-23 00:10:13 UTC (rev 8752) @@ -39,6 +39,7 @@ \tsymbol not found: LocalToUtf (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) \tsymbol not found: UtfToLocal (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) \tlibm.so.2 => /lib/libm.so.2 +\t/usr/lib/secure/s8_preload.so.1 """ class DependenciesUnitTest_1(unittest.TestCase): @@ -799,6 +800,20 @@ } self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + def test_ParseLddDashRlineFound(self): + line = '\t/usr/lib/secure/s8_preload.so.1' + expected = { + 'state': 'OK', + 'soname': None, + 'path': '/usr/lib/secure/s8_preload.so.1', + 'symbol': None, + } + self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + def test_ParseLddDashRlineManyLines(self): + for line in LDD_R_OUTPUT_1.splitlines(): + parsed = self.pkgstats._ParseLddDashRline(line) + + if __name__ == '__main__': unittest.main() Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-02-22 20:21:12 UTC (rev 8751) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-02-23 00:10:13 UTC (rev 8752) @@ -137,3 +137,41 @@ print ("However, be aware that there might be other reasons " "to keep it architecture-specific.") return errors + + +def CheckForMissingSymbols(pkgs_data, debug): + """Analyzes missing symbols reported by ldd -r. + + 1. Collect triplets: pkgname, binary, missing symbol + 2. If there are any missing symbols, collect all the symbols that are provided + by the set of packages. + 3. From the list of missing symbols, remove all symbols that are provided + by the set of packages. + 4. Report any remaining symbols as errors. + + What indexes do we need? + + symbol -> (pkgname, binary) + set(allsymbols) + """ + errors = [] + missing_symbols = [] + all_symbols = set() + for pkg_data in pkgs_data: + pkgname = pkg_data["basic_stats"]["pkgname"] + binaries = pkg_data["binaries"] + for binary in binaries: + for ldd_elem in pkg_data["ldd_dash_r"][binary]: + if ldd_elem["state"] == "symbol-not-found": + missing_symbols.append((pkgname, + binary, + ldd_elem["symbol"])) + for symbol in pkg_data["defined_symbols"][binary]: + all_symbols.add(symbol) + # Remove symbols defined elsewhere. + while missing_symbols: + ms_pkgname, ms_binary, ms_symbol = missing_symbols.pop() + if ms_symbol not in all_symbols: + errors.append(checkpkg.CheckpkgTag( + ms_pkgname, "symbol-not-found", "%s %s" % (ms_binary, ms_symbol))) + return errors Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-02-22 20:21:12 UTC (rev 8751) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-02-23 00:10:13 UTC (rev 8752) @@ -67,8 +67,50 @@ self.pkg_data_2["binaries"] = [] self.pkg_data_2["pkginfo"] = self.LoadData("example-1-pkginfo") errors = pc.CheckArchitectureVsContents(self.pkg_data_2, False) - print errors + self.failIf(errors) + def testCheckForMissingSymbols(self): + ldd_dash_r_yml = """opt/csw/lib/postgresql/8.4/_int.so: +- {path: /usr/lib/libc.so.1, soname: libc.so.1, state: OK, symbol: null} +- {path: /usr/lib/libdl.so.1, soname: libdl.so.1, state: OK, symbol: null} +- {path: /tmp/pkg_W8UcnK/CSWlibpq-84/root/opt/csw/lib/postgresql/8.4/_int.so, soname: null, + state: symbol-not-found, symbol: CurrentMemoryContext} +- {path: /tmp/pkg_W8UcnK/CSWlibpq-84/root/opt/csw/lib/postgresql/8.4/_int.so, soname: null, + state: symbol-not-found, symbol: MemoryContextAlloc} +- {path: /tmp/pkg_W8UcnK/CSWlibpq-84/root/opt/csw/lib/postgresql/8.4/_int.so, soname: null, + state: symbol-not-found, symbol: errstart} +- {path: /tmp/pkg_W8UcnK/CSWlibpq-84/root/opt/csw/lib/postgresql/8.4/_int.so, soname: null, + state: symbol-not-found, symbol: errcode} +opt/csw/lib/postgresql/8.4/_int2.so: +- {path: /usr/lib/libdl.so.1, soname: libdl.so.1, state: OK, symbol: null}""" + defined_symbols_yml = """opt/csw/lib/postgresql/8.4/_int.so: [Pg_magic_func, _fini, _init, _int_contained, + _int_contains, _int_different, _int_inter, _int_overlap, _int_same, _int_union, + _int_unique, _intbig_in, _intbig_out, boolop, bqarr_in, bqarr_out, compASC, compDESC, + copy_intArrayType, execconsistent, g_int_compress, g_int_consistent, g_int_decompress, + g_int_penalty, g_int_picksplit, g_int_same, g_int_union, g_intbig_compress, g_intbig_consistent, + g_intbig_decompress, g_intbig_penalty, g_intbig_picksplit, g_intbig_same, g_intbig_union, + gensign, ginconsistent, ginint4_consistent, ginint4_queryextract, icount, idx, inner_int_contains, + inner_int_inter, inner_int_overlap, inner_int_union, int_to_intset, intarray_add_elem, + intarray_concat_arrays, intarray_del_elem, intarray_match_first, intarray_push_array, + intarray_push_elem, internal_size, intset, intset_subtract, intset_union_elem, isort, + new_intArrayType, pg_finfo__int_contained, pg_finfo__int_contains, pg_finfo__int_different, + pg_finfo__int_inter, pg_finfo__int_overlap, pg_finfo__int_same, pg_finfo__int_union, + pg_finfo__intbig_in, pg_finfo__intbig_out, pg_finfo_boolop, pg_finfo_bqarr_in, pg_finfo_bqarr_out, + pg_finfo_g_int_compress, pg_finfo_g_int_consistent, pg_finfo_g_int_decompress, pg_finfo_g_int_penalty, + pg_finfo_g_int_picksplit, pg_finfo_g_int_same, pg_finfo_g_int_union, pg_finfo_g_intbig_compress, + pg_finfo_g_intbig_consistent, pg_finfo_g_intbig_decompress, pg_finfo_g_intbig_penalty, + pg_finfo_g_intbig_picksplit, pg_finfo_g_intbig_same, pg_finfosc, subarray, uniq] +opt/csw/lib/postgresql/8.4/adminpack.so: [Pg_magic_func, _fini, _init, pg_file_rename, + pg_file_unlink, pg_file_write, pg_finfo_pg_file_rename, pg_finfo_pg_file_unlink, + pg_finfo_pg_file_write, pg_finfo_pg_logdir_ls, pg_logdir_ls]""" + self.pkg_data_2["ldd_dash_r"] = yaml.safe_load(ldd_dash_r_yml) + self.pkg_data_2["defined_symbols"] = yaml.safe_load(defined_symbols_yml) + self.pkg_data_2["binaries"] = ["opt/csw/lib/postgresql/8.4/_int.so", + "opt/csw/lib/postgresql/8.4/_int2.so"] + errors = pc.CheckForMissingSymbols([self.pkg_data_2], False) + self.failUnless(errors) + + if __name__ == '__main__': unittest.main() Property changes on: csw/mgar/gar/v2/lib/python/package_checks_test.py ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Feb 23 08:37:37 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 23 Feb 2010 07:37:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8753] csw/mgar/gar/v2/lib/python/checkpkg.py Message-ID: Revision: 8753 http://gar.svn.sourceforge.net/gar/?rev=8753&view=rev Author: wahwah Date: 2010-02-23 07:37:33 +0000 (Tue, 23 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, also take into account 'D' type symbols. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-23 00:10:13 UTC (rev 8752) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-23 07:37:33 UTC (rev 8753) @@ -1028,7 +1028,7 @@ sym = self._ParseNmSymLine(line) if not sym: continue - if not sym['type'] == "T": + if sym['type'] not in ("T", "D"): continue defined_symbols[binary].append(sym['name']) 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 Feb 23 08:41:51 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 23 Feb 2010 07:41:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[8754] csw/mgar/pkg/protobuf/trunk Message-ID: Revision: 8754 http://gar.svn.sourceforge.net/gar/?rev=8754&view=rev Author: wahwah Date: 2010-02-23 07:41:51 +0000 (Tue, 23 Feb 2010) Log Message: ----------- protobuf: It builds now on Solaris 8 with SOS11 and stlport4 Modified Paths: -------------- csw/mgar/pkg/protobuf/trunk/Makefile csw/mgar/pkg/protobuf/trunk/checksums Added Paths: ----------- csw/mgar/pkg/protobuf/trunk/files/0001-Patches-from-GAR.patch csw/mgar/pkg/protobuf/trunk/files/0002-std-map-in-two-more-files.patch Removed Paths: ------------- csw/mgar/pkg/protobuf/trunk/files/std-map-2.patch csw/mgar/pkg/protobuf/trunk/files/std-map-again.patch csw/mgar/pkg/protobuf/trunk/files/std-map-in-google-protobuf-extension_set.cc.patch csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again-include-map.patch csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again.patch csw/mgar/pkg/protobuf/trunk/files/stdint-and-ddi.patch csw/mgar/pkg/protobuf/trunk/files/stdint-gcc.patch csw/mgar/pkg/protobuf/trunk/files/strtof.patch csw/mgar/pkg/protobuf/trunk/files/vector-in-repeated_field.h.patch Modified: csw/mgar/pkg/protobuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/protobuf/trunk/Makefile 2010-02-23 07:37:33 UTC (rev 8753) +++ csw/mgar/pkg/protobuf/trunk/Makefile 2010-02-23 07:41:51 UTC (rev 8754) @@ -4,6 +4,9 @@ # Still doesn't build, I've filed a bug: # http://code.google.com/p/protobuf/issues/detail?id=166 +# +# About using stlport4 +# http://developers.sun.com/solaris/articles/cmp_stlport_libCstd.html GARNAME = protobuf GARVERSION = 2.3.0 @@ -14,22 +17,19 @@ extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. endef -PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386 +# PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386 SPKG_SOURCEURL = http://code.google.com/p/protobuf/ MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PATCHFILES = stdint-and-ddi.patch -PATCHFILES += std-map-in-google-protobuf-extension_set.cc.patch -PATCHFILES += stdint-gcc.patch -PATCHFILES += std-map-2.patch -PATCHFILES += vector-in-repeated_field.h.patch -PATCHFILES += strtof.patch -PATCHFILES += std-map-again.patch -PATCHFILES += std-map-yet-again.patch -PATCHFILES += std-map-yet-again-include-map.patch +PATCHFILES += 0001-Patches-from-GAR.patch +PATCHFILES += 0002-std-map-in-two-more-files.patch LICENSE = COPYING.txt +EXTRA_CFLAGS = +EXTRA_CXXFLAGS = -library=stlport4 -library=no%Cstd +EXTRA_LDFLAGS = -lCrun -lm CONFIGURE_ARGS = $(DIRPATHS) -GARCOMPILER = SOS12 -# GARCOMPILER = GNU +TEST_TARGET = check +RUNTIME_DEP_PKGS_CSWprotobuf += CSWstlport +RUNTIME_DEP_PKGS_CSWprotobuf += CSWzlib include gar/category.mk Modified: csw/mgar/pkg/protobuf/trunk/checksums =================================================================== --- csw/mgar/pkg/protobuf/trunk/checksums 2010-02-23 07:37:33 UTC (rev 8753) +++ csw/mgar/pkg/protobuf/trunk/checksums 2010-02-23 07:41:51 UTC (rev 8754) @@ -1,10 +1,3 @@ +9dbbdcb35c7f44b3d53405021c388c3d 0001-Patches-from-GAR.patch +3412715e07bdb891951c8e72cfd937af 0002-std-map-in-two-more-files.patch 65dba2c04923595b6f0a6a44d8106f0a protobuf-2.3.0.tar.gz -ca4082250f24ec40fbce6993bcfb87cd std-map-2.patch -0b2f1b0bd5747aefe412af51b7434294 std-map-again.patch -603e491e286232a90cf9b378317db9f2 std-map-in-google-protobuf-extension_set.cc.patch -e02c84596b8b4a03d5a160469edc8187 std-map-yet-again-include-map.patch -20dee4f5aa23962864d55423fcbc63aa std-map-yet-again.patch -2c16ccb4bd7120f71d557d2cb9841c42 stdint-and-ddi.patch -d57e96bdf15bb207ba7df46d83b1a6bd stdint-gcc.patch -c22e22af396037fd24f8c5e276b31d98 strtof.patch -d2919404a19d4dd38d4e4378014b4518 vector-in-repeated_field.h.patch Added: csw/mgar/pkg/protobuf/trunk/files/0001-Patches-from-GAR.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/0001-Patches-from-GAR.patch (rev 0) +++ csw/mgar/pkg/protobuf/trunk/files/0001-Patches-from-GAR.patch 2010-02-23 07:41:51 UTC (rev 8754) @@ -0,0 +1,372 @@ +From 8a36482ed025a9ae5adbc43e7285028119dab121 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 21 Feb 2010 20:07:10 +0100 +Subject: [PATCH 1/2] Patches from GAR + +--- + .../protobuf/compiler/command_line_interface.h | 2 + + src/google/protobuf/descriptor_database.cc | 9 ++-- + src/google/protobuf/descriptor_database.h | 2 +- + src/google/protobuf/extension_set.cc | 52 ++++++++++---------- + src/google/protobuf/repeated_field.h | 1 + + src/google/protobuf/stubs/common.h | 5 ++- + src/google/protobuf/stubs/strutil.h | 4 ++ + 7 files changed, 43 insertions(+), 32 deletions(-) + +diff --git a/src/google/protobuf/compiler/command_line_interface.h b/src/google/protobuf/compiler/command_line_interface.h +index d25a50e..3815d5c 100644 +--- a/src/google/protobuf/compiler/command_line_interface.h ++++ b/src/google/protobuf/compiler/command_line_interface.h +@@ -55,6 +55,8 @@ template class RepeatedPtrField; // repeated_field.h + + namespace compiler { + ++using std::map; ++ + class CodeGenerator; // code_generator.h + class OutputDirectory; // code_generator.h + class DiskSourceTree; // importer.h +diff --git a/src/google/protobuf/descriptor_database.cc b/src/google/protobuf/descriptor_database.cc +index 95708d9..ad29ed1 100644 +--- a/src/google/protobuf/descriptor_database.cc ++++ b/src/google/protobuf/descriptor_database.cc +@@ -35,6 +35,7 @@ + #include + + #include ++#include + + #include + #include +@@ -97,7 +98,7 @@ bool SimpleDescriptorDatabase::DescriptorIndex::AddSymbol( + + // Try to look up the symbol to make sure a super-symbol doesn't already + // exist. +- typename map::iterator iter = FindLastLessOrEqual(name); ++ typename std::map::iterator iter = FindLastLessOrEqual(name); + + if (iter == by_symbol_.end()) { + // Apparently the map is currently empty. Just insert and be done with it. +@@ -179,7 +180,7 @@ Value SimpleDescriptorDatabase::DescriptorIndex::FindFile( + template + Value SimpleDescriptorDatabase::DescriptorIndex::FindSymbol( + const string& name) { +- typename map::iterator iter = FindLastLessOrEqual(name); ++ typename std::map::iterator iter = FindLastLessOrEqual(name); + + return (iter != by_symbol_.end() && IsSubSymbol(iter->first, name)) ? + iter->second : Value(); +@@ -198,7 +199,7 @@ template + bool SimpleDescriptorDatabase::DescriptorIndex::FindAllExtensionNumbers( + const string& containing_type, + vector* output) { +- typename map, Value >::const_iterator it = ++ typename std::map, Value >::const_iterator it = + by_extension_.lower_bound(make_pair(containing_type, 0)); + bool success = false; + +@@ -212,7 +213,7 @@ bool SimpleDescriptorDatabase::DescriptorIndex::FindAllExtensionNumbers( + } + + template +-typename map::iterator ++typename std::map::iterator + SimpleDescriptorDatabase::DescriptorIndex::FindLastLessOrEqual( + const string& name) { + // Find the last key in the map which sorts less than or equal to the +diff --git a/src/google/protobuf/descriptor_database.h b/src/google/protobuf/descriptor_database.h +index f32b1db..49f0de6 100644 +--- a/src/google/protobuf/descriptor_database.h ++++ b/src/google/protobuf/descriptor_database.h +@@ -233,7 +233,7 @@ class LIBPROTOBUF_EXPORT SimpleDescriptorDatabase : public DescriptorDatabase { + + // Find the last entry in the by_symbol_ map whose key is less than or + // equal to the given name. +- typename map::iterator FindLastLessOrEqual( ++ typename std::map::iterator FindLastLessOrEqual( + const string& name); + + // True if either the arguments are equal or super_symbol identifies a +diff --git a/src/google/protobuf/extension_set.cc b/src/google/protobuf/extension_set.cc +index 6084885..2cd66f6 100644 +--- a/src/google/protobuf/extension_set.cc ++++ b/src/google/protobuf/extension_set.cc +@@ -162,7 +162,7 @@ void ExtensionSet::RegisterMessageExtension(const MessageLite* containing_type, + ExtensionSet::ExtensionSet() {} + + ExtensionSet::~ExtensionSet() { +- for (map::iterator iter = extensions_.begin(); ++ for (std::map::iterator iter = extensions_.begin(); + iter != extensions_.end(); ++iter) { + iter->second.Free(); + } +@@ -174,20 +174,20 @@ ExtensionSet::~ExtensionSet() { + // vector* output) const + + bool ExtensionSet::Has(int number) const { +- map::const_iterator iter = extensions_.find(number); ++ std::map::const_iterator iter = extensions_.find(number); + if (iter == extensions_.end()) return false; + GOOGLE_DCHECK(!iter->second.is_repeated); + return !iter->second.is_cleared; + } + + int ExtensionSet::ExtensionSize(int number) const { +- map::const_iterator iter = extensions_.find(number); ++ std::map::const_iterator iter = extensions_.find(number); + if (iter == extensions_.end()) return false; + return iter->second.GetSize(); + } + + void ExtensionSet::ClearExtension(int number) { +- map::iterator iter = extensions_.find(number); ++ std::map::iterator iter = extensions_.find(number); + if (iter == extensions_.end()) return; + iter->second.Clear(); + } +@@ -215,7 +215,7 @@ enum Cardinality { + \ + LOWERCASE ExtensionSet::Get##CAMELCASE(int number, \ + LOWERCASE default_value) const { \ +- map::const_iterator iter = extensions_.find(number); \ ++ std::map::const_iterator iter = extensions_.find(number); \ + if (iter == extensions_.end() || iter->second.is_cleared) { \ + return default_value; \ + } else { \ +@@ -240,7 +240,7 @@ void ExtensionSet::Set##CAMELCASE(int number, FieldType type, \ + } \ + \ + LOWERCASE ExtensionSet::GetRepeated##CAMELCASE(int number, int index) const { \ +- map::const_iterator iter = extensions_.find(number); \ ++ std::map::const_iterator iter = extensions_.find(number); \ + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; \ + GOOGLE_DCHECK_TYPE(iter->second, REPEATED, UPPERCASE); \ + return iter->second.repeated_##LOWERCASE##_value->Get(index); \ +@@ -248,7 +248,7 @@ LOWERCASE ExtensionSet::GetRepeated##CAMELCASE(int number, int index) const { \ + \ + void ExtensionSet::SetRepeated##CAMELCASE( \ + int number, int index, LOWERCASE value) { \ +- map::iterator iter = extensions_.find(number); \ ++ std::map::iterator iter = extensions_.find(number); \ + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; \ + GOOGLE_DCHECK_TYPE(iter->second, REPEATED, UPPERCASE); \ + iter->second.repeated_##LOWERCASE##_value->Set(index, value); \ +@@ -285,7 +285,7 @@ PRIMITIVE_ACCESSORS( BOOL, bool, Bool) + // Enums + + int ExtensionSet::GetEnum(int number, int default_value) const { +- map::const_iterator iter = extensions_.find(number); ++ std::map::const_iterator iter = extensions_.find(number); + if (iter == extensions_.end() || iter->second.is_cleared) { + // Not present. Return the default value. + return default_value; +@@ -310,14 +310,14 @@ void ExtensionSet::SetEnum(int number, FieldType type, int value, + } + + int ExtensionSet::GetRepeatedEnum(int number, int index) const { +- map::const_iterator iter = extensions_.find(number); ++ std::map::const_iterator iter = extensions_.find(number); + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; + GOOGLE_DCHECK_TYPE(iter->second, REPEATED, ENUM); + return iter->second.repeated_enum_value->Get(index); + } + + void ExtensionSet::SetRepeatedEnum(int number, int index, int value) { +- map::iterator iter = extensions_.find(number); ++ std::map::iterator iter = extensions_.find(number); + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; + GOOGLE_DCHECK_TYPE(iter->second, REPEATED, ENUM); + iter->second.repeated_enum_value->Set(index, value); +@@ -345,7 +345,7 @@ void ExtensionSet::AddEnum(int number, FieldType type, + + const string& ExtensionSet::GetString(int number, + const string& default_value) const { +- map::const_iterator iter = extensions_.find(number); ++ std::map::const_iterator iter = extensions_.find(number); + if (iter == extensions_.end() || iter->second.is_cleared) { + // Not present. Return the default value. + return default_value; +@@ -371,14 +371,14 @@ string* ExtensionSet::MutableString(int number, FieldType type, + } + + const string& ExtensionSet::GetRepeatedString(int number, int index) const { +- map::const_iterator iter = extensions_.find(number); ++ std::map::const_iterator iter = extensions_.find(number); + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; + GOOGLE_DCHECK_TYPE(iter->second, REPEATED, STRING); + return iter->second.repeated_string_value->Get(index); + } + + string* ExtensionSet::MutableRepeatedString(int number, int index) { +- map::iterator iter = extensions_.find(number); ++ std::map::iterator iter = extensions_.find(number); + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; + GOOGLE_DCHECK_TYPE(iter->second, REPEATED, STRING); + return iter->second.repeated_string_value->Mutable(index); +@@ -404,7 +404,7 @@ string* ExtensionSet::AddString(int number, FieldType type, + + const MessageLite& ExtensionSet::GetMessage( + int number, const MessageLite& default_value) const { +- map::const_iterator iter = extensions_.find(number); ++ std::map::const_iterator iter = extensions_.find(number); + if (iter == extensions_.end()) { + // Not present. Return the default value. + return default_value; +@@ -442,14 +442,14 @@ MessageLite* ExtensionSet::MutableMessage(int number, FieldType type, + + const MessageLite& ExtensionSet::GetRepeatedMessage( + int number, int index) const { +- map::const_iterator iter = extensions_.find(number); ++ std::map::const_iterator iter = extensions_.find(number); + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; + GOOGLE_DCHECK_TYPE(iter->second, REPEATED, MESSAGE); + return iter->second.repeated_message_value->Get(index); + } + + MessageLite* ExtensionSet::MutableRepeatedMessage(int number, int index) { +- map::iterator iter = extensions_.find(number); ++ std::map::iterator iter = extensions_.find(number); + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; + GOOGLE_DCHECK_TYPE(iter->second, REPEATED, MESSAGE); + return iter->second.repeated_message_value->Mutable(index); +@@ -488,7 +488,7 @@ MessageLite* ExtensionSet::AddMessage(int number, FieldType type, + #undef GOOGLE_DCHECK_TYPE + + void ExtensionSet::RemoveLast(int number) { +- map::iterator iter = extensions_.find(number); ++ std::map::iterator iter = extensions_.find(number); + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; + + Extension* extension = &iter->second; +@@ -529,7 +529,7 @@ void ExtensionSet::RemoveLast(int number) { + } + + void ExtensionSet::SwapElements(int number, int index1, int index2) { +- map::iterator iter = extensions_.find(number); ++ std::map::iterator iter = extensions_.find(number); + GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; + + Extension* extension = &iter->second; +@@ -572,14 +572,14 @@ void ExtensionSet::SwapElements(int number, int index1, int index2) { + // =================================================================== + + void ExtensionSet::Clear() { +- for (map::iterator iter = extensions_.begin(); ++ for (std::map::iterator iter = extensions_.begin(); + iter != extensions_.end(); ++iter) { + iter->second.Clear(); + } + } + + void ExtensionSet::MergeFrom(const ExtensionSet& other) { +- for (map::const_iterator iter = other.extensions_.begin(); ++ for (std::map::const_iterator iter = other.extensions_.begin(); + iter != other.extensions_.end(); ++iter) { + const Extension& other_extension = iter->second; + +@@ -682,7 +682,7 @@ void ExtensionSet::Swap(ExtensionSet* x) { + bool ExtensionSet::IsInitialized() const { + // Extensions are never required. However, we need to check that all + // embedded messages are initialized. +- for (map::const_iterator iter = extensions_.begin(); ++ for (std::map::const_iterator iter = extensions_.begin(); + iter != extensions_.end(); ++iter) { + const Extension& extension = iter->second; + if (cpp_type(extension.type) == WireFormatLite::CPPTYPE_MESSAGE) { +@@ -1001,7 +1001,7 @@ bool ExtensionSet::ParseMessageSetItem(io::CodedInputStream* input, + void ExtensionSet::SerializeWithCachedSizes( + int start_field_number, int end_field_number, + io::CodedOutputStream* output) const { +- map::const_iterator iter; ++ std::map::const_iterator iter; + for (iter = extensions_.lower_bound(start_field_number); + iter != extensions_.end() && iter->first < end_field_number; + ++iter) { +@@ -1011,7 +1011,7 @@ void ExtensionSet::SerializeWithCachedSizes( + + void ExtensionSet::SerializeMessageSetWithCachedSizes( + io::CodedOutputStream* output) const { +- map::const_iterator iter; ++ std::map::const_iterator iter; + for (iter = extensions_.begin(); iter != extensions_.end(); ++iter) { + iter->second.SerializeMessageSetItemWithCachedSizes(iter->first, output); + } +@@ -1020,7 +1020,7 @@ void ExtensionSet::SerializeMessageSetWithCachedSizes( + int ExtensionSet::ByteSize() const { + int total_size = 0; + +- for (map::const_iterator iter = extensions_.begin(); ++ for (std::map::const_iterator iter = extensions_.begin(); + iter != extensions_.end(); ++iter) { + total_size += iter->second.ByteSize(iter->first); + } +@@ -1031,7 +1031,7 @@ int ExtensionSet::ByteSize() const { + int ExtensionSet::MessageSetByteSize() const { + int total_size = 0; + +- for (map::const_iterator iter = extensions_.begin(); ++ for (std::map::const_iterator iter = extensions_.begin(); + iter != extensions_.end(); ++iter) { + total_size += iter->second.MessageSetItemByteSize(iter->first); + } +@@ -1045,7 +1045,7 @@ int ExtensionSet::MessageSetByteSize() const { + bool ExtensionSet::MaybeNewExtension(int number, + const FieldDescriptor* descriptor, + Extension** result) { +- pair::iterator, bool> insert_result = ++ pair::iterator, bool> insert_result = + extensions_.insert(make_pair(number, Extension())); + *result = &insert_result.first->second; + (*result)->descriptor = descriptor; +diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h +index defdefe..39138f0 100644 +--- a/src/google/protobuf/repeated_field.h ++++ b/src/google/protobuf/repeated_field.h +@@ -48,6 +48,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h +index 551ee4a..f000c76 100644 +--- a/src/google/protobuf/stubs/common.h ++++ b/src/google/protobuf/stubs/common.h +@@ -40,13 +40,16 @@ + #include + #include + #include +-#if defined(__osf__) ++#if defined(__osf__) || defined(__SUNPRO_CC) || defined(__sun__) + // Tru64 lacks stdint.h, but has inttypes.h which defines a superset of + // what stdint.h would define. + #include + #elif !defined(_MSC_VER) + #include + #endif ++#if defined(__SUNPRO_CC) || defined(__sun__) ++#include ++#endif + + namespace std {} + +diff --git a/src/google/protobuf/stubs/strutil.h b/src/google/protobuf/stubs/strutil.h +index 777694b..b22babe 100644 +--- a/src/google/protobuf/stubs/strutil.h ++++ b/src/google/protobuf/stubs/strutil.h +@@ -37,6 +37,10 @@ + #include + #include + ++#if defined(__SUNPRO_CC) ++#define strtof strtod ++#endif ++ + namespace google { + namespace protobuf { + +-- +1.6.6 + Added: csw/mgar/pkg/protobuf/trunk/files/0002-std-map-in-two-more-files.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/0002-std-map-in-two-more-files.patch (rev 0) +++ csw/mgar/pkg/protobuf/trunk/files/0002-std-map-in-two-more-files.patch 2010-02-23 07:41:51 UTC (rev 8754) @@ -0,0 +1,116 @@ +From 7e368ce421202baea74a89d03a516ffc95c788ae Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 23 Feb 2010 06:12:10 +0100 +Subject: [PATCH 2/2] std::map in two more files + +--- + src/google/protobuf/descriptor_database.cc | 2 +- + src/google/protobuf/extension_set_heavy.cc | 12 ++++++------ + src/google/protobuf/io/printer.cc | 8 ++++---- + 3 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/src/google/protobuf/descriptor_database.cc b/src/google/protobuf/descriptor_database.cc +index ad29ed1..7d94853 100644 +--- a/src/google/protobuf/descriptor_database.cc ++++ b/src/google/protobuf/descriptor_database.cc +@@ -219,7 +219,7 @@ SimpleDescriptorDatabase::DescriptorIndex::FindLastLessOrEqual( + // Find the last key in the map which sorts less than or equal to the + // symbol name. Since upper_bound() returns the *first* key that sorts + // *greater* than the input, we want the element immediately before that. +- typename map::iterator iter = by_symbol_.upper_bound(name); ++ typename std::map::iterator iter = by_symbol_.upper_bound(name); + if (iter != by_symbol_.begin()) --iter; + return iter; + } +diff --git a/src/google/protobuf/extension_set_heavy.cc b/src/google/protobuf/extension_set_heavy.cc +index 2721f15..6a62005 100644 +--- a/src/google/protobuf/extension_set_heavy.cc ++++ b/src/google/protobuf/extension_set_heavy.cc +@@ -68,7 +68,7 @@ class DescriptorPoolExtensionFinder : public ExtensionFinder { + void ExtensionSet::AppendToList(const Descriptor* containing_type, + const DescriptorPool* pool, + vector* output) const { +- for (map::const_iterator iter = extensions_.begin(); ++ for (std::map::const_iterator iter = extensions_.begin(); + iter != extensions_.end(); ++iter) { + bool has = false; + if (iter->second.is_repeated) { +@@ -112,7 +112,7 @@ inline FieldDescriptor::CppType cpp_type(FieldType type) { + const MessageLite& ExtensionSet::GetMessage(int number, + const Descriptor* message_type, + MessageFactory* factory) const { +- map::const_iterator iter = extensions_.find(number); ++ std::map::const_iterator iter = extensions_.find(number); + if (iter == extensions_.end() || iter->second.is_cleared) { + // Not present. Return the default value. + return *factory->GetPrototype(message_type); +@@ -234,8 +234,8 @@ bool ExtensionSet::ParseMessageSet(io::CodedInputStream* input, + + int ExtensionSet::SpaceUsedExcludingSelf() const { + int total_size = +- extensions_.size() * sizeof(map::value_type); +- for (map::const_iterator iter = extensions_.begin(), ++ extensions_.size() * sizeof(std::map::value_type); ++ for (std::map::const_iterator iter = extensions_.begin(), + end = extensions_.end(); + iter != end; + ++iter) { +@@ -301,7 +301,7 @@ int ExtensionSet::Extension::SpaceUsedExcludingSelf() const { + uint8* ExtensionSet::SerializeWithCachedSizesToArray( + int start_field_number, int end_field_number, + uint8* target) const { +- map::const_iterator iter; ++ std::map::const_iterator iter; + for (iter = extensions_.lower_bound(start_field_number); + iter != extensions_.end() && iter->first < end_field_number; + ++iter) { +@@ -313,7 +313,7 @@ uint8* ExtensionSet::SerializeWithCachedSizesToArray( + + uint8* ExtensionSet::SerializeMessageSetWithCachedSizesToArray( + uint8* target) const { +- map::const_iterator iter; ++ std::map::const_iterator iter; + for (iter = extensions_.begin(); iter != extensions_.end(); ++iter) { + target = iter->second.SerializeMessageSetItemWithCachedSizesToArray( + iter->first, target); +diff --git a/src/google/protobuf/io/printer.cc b/src/google/protobuf/io/printer.cc +index c7d3074..4d583ef 100644 +--- a/src/google/protobuf/io/printer.cc ++++ b/src/google/protobuf/io/printer.cc +@@ -93,7 +93,7 @@ void Printer::Print(const map& variables, const char* text) { + WriteRaw(&variable_delimiter_, 1); + } else { + // Replace with the variable's value. +- map::const_iterator iter = variables.find(varname); ++ std::map::const_iterator iter = variables.find(varname); + if (iter == variables.end()) { + GOOGLE_LOG(DFATAL) << " Undefined variable: " << varname; + } else { +@@ -112,13 +112,13 @@ void Printer::Print(const map& variables, const char* text) { + } + + void Printer::Print(const char* text) { +- static map empty; ++ static std::map empty; + Print(empty, text); + } + + void Printer::Print(const char* text, + const char* variable, const string& value) { +- map vars; ++ std::map vars; + vars[variable] = value; + Print(vars, text); + } +@@ -126,7 +126,7 @@ void Printer::Print(const char* text, + void Printer::Print(const char* text, + const char* variable1, const string& value1, + const char* variable2, const string& value2) { +- map vars; ++ std::map vars; + vars[variable1] = value1; + vars[variable2] = value2; + Print(vars, text); +-- +1.6.6 + Deleted: csw/mgar/pkg/protobuf/trunk/files/std-map-2.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/std-map-2.patch 2010-02-23 07:37:33 UTC (rev 8753) +++ csw/mgar/pkg/protobuf/trunk/files/std-map-2.patch 2010-02-23 07:41:51 UTC (rev 8754) @@ -1,11 +0,0 @@ ---- protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface.h.orig 2010-02-20 19:04:19.471295716 +0100 -+++ protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface.h 2010-02-20 19:05:14.390216481 +0100 -@@ -55,6 +55,8 @@ - - namespace compiler { - -+using std::map; -+ - class CodeGenerator; // code_generator.h - class OutputDirectory; // code_generator.h - class DiskSourceTree; // importer.h Deleted: csw/mgar/pkg/protobuf/trunk/files/std-map-again.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/std-map-again.patch 2010-02-23 07:37:33 UTC (rev 8753) +++ csw/mgar/pkg/protobuf/trunk/files/std-map-again.patch 2010-02-23 07:41:51 UTC (rev 8754) @@ -1,11 +0,0 @@ ---- protobuf-2.3.0/src/google/protobuf/descriptor_database.h.orig 2010-02-20 23:33:10.978002985 +0100 -+++ protobuf-2.3.0/src/google/protobuf/descriptor_database.h 2010-02-20 23:33:21.265334100 +0100 -@@ -233,7 +233,7 @@ - - // Find the last entry in the by_symbol_ map whose key is less than or - // equal to the given name. -- typename map::iterator FindLastLessOrEqual( -+ typename std::map::iterator FindLastLessOrEqual( - const string& name); - - // True if either the arguments are equal or super_symbol identifies a Deleted: csw/mgar/pkg/protobuf/trunk/files/std-map-in-google-protobuf-extension_set.cc.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/std-map-in-google-protobuf-extension_set.cc.patch 2010-02-23 07:37:33 UTC (rev 8753) +++ csw/mgar/pkg/protobuf/trunk/files/std-map-in-google-protobuf-extension_set.cc.patch 2010-02-23 07:41:51 UTC (rev 8754) @@ -1,243 +0,0 @@ -From 69fe78fbe6c50a69eb57d20538e78d73d2abab4a Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Sat, 20 Feb 2010 15:36:34 +0100 -Subject: [PATCH] std::map in google/protobuf/extension_set.cc - ---- - src/google/protobuf/extension_set.cc | 52 +++++++++++++++++----------------- - 1 files changed, 26 insertions(+), 26 deletions(-) - -diff --git a/src/google/protobuf/extension_set.cc b/src/google/protobuf/extension_set.cc -index 6084885..2cd66f6 100644 ---- a/src/google/protobuf/extension_set.cc -+++ b/src/google/protobuf/extension_set.cc -@@ -162,7 +162,7 @@ void ExtensionSet::RegisterMessageExtension(const MessageLite* containing_type, - ExtensionSet::ExtensionSet() {} - - ExtensionSet::~ExtensionSet() { -- for (map::iterator iter = extensions_.begin(); -+ for (std::map::iterator iter = extensions_.begin(); - iter != extensions_.end(); ++iter) { - iter->second.Free(); - } -@@ -174,20 +174,20 @@ ExtensionSet::~ExtensionSet() { - // vector* output) const - - bool ExtensionSet::Has(int number) const { -- map::const_iterator iter = extensions_.find(number); -+ std::map::const_iterator iter = extensions_.find(number); - if (iter == extensions_.end()) return false; - GOOGLE_DCHECK(!iter->second.is_repeated); - return !iter->second.is_cleared; - } - - int ExtensionSet::ExtensionSize(int number) const { -- map::const_iterator iter = extensions_.find(number); -+ std::map::const_iterator iter = extensions_.find(number); - if (iter == extensions_.end()) return false; - return iter->second.GetSize(); - } - - void ExtensionSet::ClearExtension(int number) { -- map::iterator iter = extensions_.find(number); -+ std::map::iterator iter = extensions_.find(number); - if (iter == extensions_.end()) return; - iter->second.Clear(); - } -@@ -215,7 +215,7 @@ enum Cardinality { - \ - LOWERCASE ExtensionSet::Get##CAMELCASE(int number, \ - LOWERCASE default_value) const { \ -- map::const_iterator iter = extensions_.find(number); \ -+ std::map::const_iterator iter = extensions_.find(number); \ - if (iter == extensions_.end() || iter->second.is_cleared) { \ - return default_value; \ - } else { \ -@@ -240,7 +240,7 @@ void ExtensionSet::Set##CAMELCASE(int number, FieldType type, \ - } \ - \ - LOWERCASE ExtensionSet::GetRepeated##CAMELCASE(int number, int index) const { \ -- map::const_iterator iter = extensions_.find(number); \ -+ std::map::const_iterator iter = extensions_.find(number); \ - GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; \ - GOOGLE_DCHECK_TYPE(iter->second, REPEATED, UPPERCASE); \ - return iter->second.repeated_##LOWERCASE##_value->Get(index); \ -@@ -248,7 +248,7 @@ LOWERCASE ExtensionSet::GetRepeated##CAMELCASE(int number, int index) const { \ - \ - void ExtensionSet::SetRepeated##CAMELCASE( \ - int number, int index, LOWERCASE value) { \ -- map::iterator iter = extensions_.find(number); \ -+ std::map::iterator iter = extensions_.find(number); \ - GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; \ - GOOGLE_DCHECK_TYPE(iter->second, REPEATED, UPPERCASE); \ - iter->second.repeated_##LOWERCASE##_value->Set(index, value); \ -@@ -285,7 +285,7 @@ PRIMITIVE_ACCESSORS( BOOL, bool, Bool) - // Enums - - int ExtensionSet::GetEnum(int number, int default_value) const { -- map::const_iterator iter = extensions_.find(number); -+ std::map::const_iterator iter = extensions_.find(number); - if (iter == extensions_.end() || iter->second.is_cleared) { - // Not present. Return the default value. - return default_value; -@@ -310,14 +310,14 @@ void ExtensionSet::SetEnum(int number, FieldType type, int value, - } - - int ExtensionSet::GetRepeatedEnum(int number, int index) const { -- map::const_iterator iter = extensions_.find(number); -+ std::map::const_iterator iter = extensions_.find(number); - GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; - GOOGLE_DCHECK_TYPE(iter->second, REPEATED, ENUM); - return iter->second.repeated_enum_value->Get(index); - } - - void ExtensionSet::SetRepeatedEnum(int number, int index, int value) { -- map::iterator iter = extensions_.find(number); -+ std::map::iterator iter = extensions_.find(number); - GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; - GOOGLE_DCHECK_TYPE(iter->second, REPEATED, ENUM); - iter->second.repeated_enum_value->Set(index, value); -@@ -345,7 +345,7 @@ void ExtensionSet::AddEnum(int number, FieldType type, - - const string& ExtensionSet::GetString(int number, - const string& default_value) const { -- map::const_iterator iter = extensions_.find(number); -+ std::map::const_iterator iter = extensions_.find(number); - if (iter == extensions_.end() || iter->second.is_cleared) { - // Not present. Return the default value. - return default_value; -@@ -371,14 +371,14 @@ string* ExtensionSet::MutableString(int number, FieldType type, - } - - const string& ExtensionSet::GetRepeatedString(int number, int index) const { -- map::const_iterator iter = extensions_.find(number); -+ std::map::const_iterator iter = extensions_.find(number); - GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; - GOOGLE_DCHECK_TYPE(iter->second, REPEATED, STRING); - return iter->second.repeated_string_value->Get(index); - } - - string* ExtensionSet::MutableRepeatedString(int number, int index) { -- map::iterator iter = extensions_.find(number); -+ std::map::iterator iter = extensions_.find(number); - GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; - GOOGLE_DCHECK_TYPE(iter->second, REPEATED, STRING); - return iter->second.repeated_string_value->Mutable(index); -@@ -404,7 +404,7 @@ string* ExtensionSet::AddString(int number, FieldType type, - - const MessageLite& ExtensionSet::GetMessage( - int number, const MessageLite& default_value) const { -- map::const_iterator iter = extensions_.find(number); -+ std::map::const_iterator iter = extensions_.find(number); - if (iter == extensions_.end()) { - // Not present. Return the default value. - return default_value; -@@ -442,14 +442,14 @@ MessageLite* ExtensionSet::MutableMessage(int number, FieldType type, - - const MessageLite& ExtensionSet::GetRepeatedMessage( - int number, int index) const { -- map::const_iterator iter = extensions_.find(number); -+ std::map::const_iterator iter = extensions_.find(number); - GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; - GOOGLE_DCHECK_TYPE(iter->second, REPEATED, MESSAGE); - return iter->second.repeated_message_value->Get(index); - } - - MessageLite* ExtensionSet::MutableRepeatedMessage(int number, int index) { -- map::iterator iter = extensions_.find(number); -+ std::map::iterator iter = extensions_.find(number); - GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; - GOOGLE_DCHECK_TYPE(iter->second, REPEATED, MESSAGE); - return iter->second.repeated_message_value->Mutable(index); -@@ -488,7 +488,7 @@ MessageLite* ExtensionSet::AddMessage(int number, FieldType type, - #undef GOOGLE_DCHECK_TYPE - - void ExtensionSet::RemoveLast(int number) { -- map::iterator iter = extensions_.find(number); -+ std::map::iterator iter = extensions_.find(number); - GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; - - Extension* extension = &iter->second; -@@ -529,7 +529,7 @@ void ExtensionSet::RemoveLast(int number) { - } - - void ExtensionSet::SwapElements(int number, int index1, int index2) { -- map::iterator iter = extensions_.find(number); -+ std::map::iterator iter = extensions_.find(number); - GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; - - Extension* extension = &iter->second; -@@ -572,14 +572,14 @@ void ExtensionSet::SwapElements(int number, int index1, int index2) { - // =================================================================== - - void ExtensionSet::Clear() { -- for (map::iterator iter = extensions_.begin(); -+ for (std::map::iterator iter = extensions_.begin(); - iter != extensions_.end(); ++iter) { - iter->second.Clear(); - } - } - - void ExtensionSet::MergeFrom(const ExtensionSet& other) { -- for (map::const_iterator iter = other.extensions_.begin(); -+ for (std::map::const_iterator iter = other.extensions_.begin(); - iter != other.extensions_.end(); ++iter) { - const Extension& other_extension = iter->second; - -@@ -682,7 +682,7 @@ void ExtensionSet::Swap(ExtensionSet* x) { - bool ExtensionSet::IsInitialized() const { - // Extensions are never required. However, we need to check that all - // embedded messages are initialized. -- for (map::const_iterator iter = extensions_.begin(); -+ for (std::map::const_iterator iter = extensions_.begin(); - iter != extensions_.end(); ++iter) { - const Extension& extension = iter->second; - if (cpp_type(extension.type) == WireFormatLite::CPPTYPE_MESSAGE) { -@@ -1001,7 +1001,7 @@ bool ExtensionSet::ParseMessageSetItem(io::CodedInputStream* input, - void ExtensionSet::SerializeWithCachedSizes( - int start_field_number, int end_field_number, - io::CodedOutputStream* output) const { -- map::const_iterator iter; -+ std::map::const_iterator iter; - for (iter = extensions_.lower_bound(start_field_number); - iter != extensions_.end() && iter->first < end_field_number; - ++iter) { -@@ -1011,7 +1011,7 @@ void ExtensionSet::SerializeWithCachedSizes( - - void ExtensionSet::SerializeMessageSetWithCachedSizes( - io::CodedOutputStream* output) const { -- map::const_iterator iter; -+ std::map::const_iterator iter; - for (iter = extensions_.begin(); iter != extensions_.end(); ++iter) { - iter->second.SerializeMessageSetItemWithCachedSizes(iter->first, output); - } -@@ -1020,7 +1020,7 @@ void ExtensionSet::SerializeMessageSetWithCachedSizes( - int ExtensionSet::ByteSize() const { - int total_size = 0; - -- for (map::const_iterator iter = extensions_.begin(); -+ for (std::map::const_iterator iter = extensions_.begin(); - iter != extensions_.end(); ++iter) { - total_size += iter->second.ByteSize(iter->first); - } -@@ -1031,7 +1031,7 @@ int ExtensionSet::ByteSize() const { - int ExtensionSet::MessageSetByteSize() const { - int total_size = 0; - -- for (map::const_iterator iter = extensions_.begin(); -+ for (std::map::const_iterator iter = extensions_.begin(); - iter != extensions_.end(); ++iter) { - total_size += iter->second.MessageSetItemByteSize(iter->first); - } -@@ -1045,7 +1045,7 @@ int ExtensionSet::MessageSetByteSize() const { - bool ExtensionSet::MaybeNewExtension(int number, - const FieldDescriptor* descriptor, - Extension** result) { -- pair::iterator, bool> insert_result = -+ pair::iterator, bool> insert_result = - extensions_.insert(make_pair(number, Extension())); - *result = &insert_result.first->second; - (*result)->descriptor = descriptor; --- -1.6.6 - Deleted: csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again-include-map.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again-include-map.patch 2010-02-23 07:37:33 UTC (rev 8753) +++ csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again-include-map.patch 2010-02-23 07:41:51 UTC (rev 8754) @@ -1,10 +0,0 @@ ---- protobuf-2.3.0/src/google/protobuf/descriptor_database.cc.orig 2010-02-20 23:39:07.835347049 +0100 -+++ protobuf-2.3.0/src/google/protobuf/descriptor_database.cc 2010-02-20 23:43:55.328201640 +0100 -@@ -35,6 +35,7 @@ - #include - - #include -+#include - - #include - #include Deleted: csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again.patch 2010-02-23 07:37:33 UTC (rev 8753) +++ csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again.patch 2010-02-23 07:41:51 UTC (rev 8754) @@ -1,38 +0,0 @@ ---- protobuf-2.3.0/src/google/protobuf/descriptor_database.cc.orig 2010-02-20 23:39:07.835347049 +0100 -+++ protobuf-2.3.0/src/google/protobuf/descriptor_database.cc 2010-02-20 23:39:49.843758591 +0100 -@@ -97,7 +97,7 @@ - - // Try to look up the symbol to make sure a super-symbol doesn't already - // exist. -- typename map::iterator iter = FindLastLessOrEqual(name); -+ typename std::map::iterator iter = FindLastLessOrEqual(name); - - if (iter == by_symbol_.end()) { - // Apparently the map is currently empty. Just insert and be done with it. -@@ -179,7 +179,7 @@ - template - Value SimpleDescriptorDatabase::DescriptorIndex::FindSymbol( - const string& name) { -- typename map::iterator iter = FindLastLessOrEqual(name); -+ typename std::map::iterator iter = FindLastLessOrEqual(name); - - return (iter != by_symbol_.end() && IsSubSymbol(iter->first, name)) ? - iter->second : Value(); -@@ -198,7 +198,7 @@ - bool SimpleDescriptorDatabase::DescriptorIndex::FindAllExtensionNumbers( - const string& containing_type, - vector* output) { -- typename map, Value >::const_iterator it = -+ typename std::map, Value >::const_iterator it = - by_extension_.lower_bound(make_pair(containing_type, 0)); - bool success = false; - -@@ -212,7 +212,7 @@ - } - - template --typename map::iterator -+typename std::map::iterator - SimpleDescriptorDatabase::DescriptorIndex::FindLastLessOrEqual( - const string& name) { - // Find the last key in the map which sorts less than or equal to the Deleted: csw/mgar/pkg/protobuf/trunk/files/stdint-and-ddi.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/stdint-and-ddi.patch 2010-02-23 07:37:33 UTC (rev 8753) +++ csw/mgar/pkg/protobuf/trunk/files/stdint-and-ddi.patch 2010-02-23 07:41:51 UTC (rev 8754) @@ -1,22 +0,0 @@ -diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h -index 551ee4a..d0ba7d5 100644 ---- a/src/google/protobuf/stubs/common.h -+++ b/src/google/protobuf/stubs/common.h -@@ -40,13 +40,16 @@ - #include - #include - #include --#if defined(__osf__) -+#if defined(__osf__) || defined(__SUNPRO_CC) - // Tru64 lacks stdint.h, but has inttypes.h which defines a superset of - // what stdint.h would define. - #include - #elif !defined(_MSC_VER) - #include - #endif -+#if defined(__SUNPRO_CC) -+#include -+#endif - - namespace std {} - Deleted: csw/mgar/pkg/protobuf/trunk/files/stdint-gcc.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/stdint-gcc.patch 2010-02-23 07:37:33 UTC (rev 8753) +++ csw/mgar/pkg/protobuf/trunk/files/stdint-gcc.patch 2010-02-23 07:41:51 UTC (rev 8754) @@ -1,19 +0,0 @@ ---- protobuf-2.3.0/src/google/protobuf/stubs/common.h.orig 2010-02-20 19:43:54.828914057 +0100 -+++ protobuf-2.3.0/src/google/protobuf/stubs/common.h 2010-02-20 19:44:12.015263840 +0100 -@@ -40,14 +40,14 @@ - #include - #include - #include --#if defined(__osf__) || defined(__SUNPRO_CC) -+#if defined(__osf__) || defined(__SUNPRO_CC) || defined(__sun__) - // Tru64 lacks stdint.h, but has inttypes.h which defines a superset of - // what stdint.h would define. - #include - #elif !defined(_MSC_VER) - #include - #endif --#if defined(__SUNPRO_CC) -+#if defined(__SUNPRO_CC) || defined(__sun__) - #include - #endif - Deleted: csw/mgar/pkg/protobuf/trunk/files/strtof.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/strtof.patch 2010-02-23 07:37:33 UTC (rev 8753) +++ csw/mgar/pkg/protobuf/trunk/files/strtof.patch 2010-02-23 07:41:51 UTC (rev 8754) @@ -1,13 +0,0 @@ ---- protobuf-2.3.0/src/google/protobuf/stubs/strutil.h.orig 2010-02-20 23:30:45.020320818 +0100 -+++ protobuf-2.3.0/src/google/protobuf/stubs/strutil.h 2010-02-20 23:31:46.345602745 +0100 -@@ -37,6 +37,10 @@ - #include - #include - -+#if defined(__SUNPRO_CC) -+#define strtof strtod -+#endif -+ - namespace google { - namespace protobuf { - Deleted: csw/mgar/pkg/protobuf/trunk/files/vector-in-repeated_field.h.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/vector-in-repeated_field.h.patch 2010-02-23 07:37:33 UTC (rev 8753) +++ csw/mgar/pkg/protobuf/trunk/files/vector-in-repeated_field.h.patch 2010-02-23 07:41:51 UTC (rev 8754) @@ -1,10 +0,0 @@ ---- protobuf-2.3.0/src/google/protobuf/repeated_field.h.orig 2010-02-20 23:27:43.399507660 +0100 -+++ protobuf-2.3.0/src/google/protobuf/repeated_field.h 2010-02-20 23:27:56.747055871 +0100 -@@ -48,6 +48,7 @@ - - #include - #include -+#include - #include - #include - 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 Feb 23 08:51:14 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 23 Feb 2010 07:51:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8755] csw/mgar/pkg/doxygen/tags/doxygen-1.6.1, REV=2009.11. 08/ Message-ID: Revision: 8755 http://gar.svn.sourceforge.net/gar/?rev=8755&view=rev Author: dmichelsen Date: 2010-02-23 07:51:14 +0000 (Tue, 23 Feb 2010) Log Message: ----------- Tag doxygen-1.6.1,REV=2009.11.08 Added Paths: ----------- csw/mgar/pkg/doxygen/tags/doxygen-1.6.1,REV=2009.11.08/ 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 Feb 23 09:04:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 23 Feb 2010 08:04:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8756] csw/mgar/pkg/chkconfig/trunk/Makefile Message-ID: Revision: 8756 http://gar.svn.sourceforge.net/gar/?rev=8756&view=rev Author: dmichelsen Date: 2010-02-23 08:04:22 +0000 (Tue, 23 Feb 2010) Log Message: ----------- alternatives: Adjust description Modified Paths: -------------- csw/mgar/pkg/chkconfig/trunk/Makefile Modified: csw/mgar/pkg/chkconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/chkconfig/trunk/Makefile 2010-02-23 07:51:14 UTC (rev 8755) +++ csw/mgar/pkg/chkconfig/trunk/Makefile 2010-02-23 08:04:22 UTC (rev 8756) @@ -6,7 +6,7 @@ GARVERSION = 1.3.30c CATEGORIES = utils -DESCRIPTION = Alternatives system from Red Hat +DESCRIPTION = RedHat alternatives engine with CSW customizations define BLURB Alternatives system from Red Hat endef 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 Feb 23 10:00:43 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 23 Feb 2010 09:00:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8757] csw/mgar/pkg/pysetuptools/trunk Message-ID: Revision: 8757 http://gar.svn.sourceforge.net/gar/?rev=8757&view=rev Author: wahwah Date: 2010-02-23 09:00:43 +0000 (Tue, 23 Feb 2010) Log Message: ----------- pysetuptools: Update to 0.6c11, removal large chunk of the Makefile, adding license, prettifying the revstamp, enabling the use of checkpkg, removing the dependency on a removed package (distutils). Modified Paths: -------------- csw/mgar/pkg/pysetuptools/trunk/Makefile csw/mgar/pkg/pysetuptools/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pysetuptools/trunk/files/LICENSE Property Changed: ---------------- csw/mgar/pkg/pysetuptools/trunk/Makefile Modified: csw/mgar/pkg/pysetuptools/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysetuptools/trunk/Makefile 2010-02-23 08:04:22 UTC (rev 8756) +++ csw/mgar/pkg/pysetuptools/trunk/Makefile 2010-02-23 09:00:43 UTC (rev 8757) @@ -1,48 +1,26 @@ +# $Id$ + GARNAME = setuptools -GARVERSION = 0.6c9 -CATEGORIES = lang +GARVERSION = 0.6c11 +CATEGORIES = python SPKG_SOURCEURL = http://peak.telecommunity.com/DevCenter/setuptools PYSETUPTOOLS_VERSION := $(shell echo $(GARVERSION) | sed -e 's/[a-z].*//') PYSETUPTOOLS_RELEASE := $(shell echo $(GARVERSION) | sed -e 's/^[0-9].[0-9]*//') -DESCRIPTION = Distribution Utiltiies for Python +DESCRIPTION = Distribution Utilities for Python define BLURB Distribution Utilities for Python endef ARCHALL_CSWpysetuptools = 1 MASTER_SITES = http://cheeseshop.python.org/packages/source/s/setuptools/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - -RUNTIME_DEP_PKGS_CSWpysetuptools = CSWpython CSWpydistutils +UFILES_REGEX = $(GARNAME)(\d+(?:\.\d+)*) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += LICENSE PACKAGES = CSWpysetuptools CATALOGNAME_CSWpysetuptools = pysetuptools SPKG_DESC_CSWpysetuptools = Distribution Utiltiies for Python - -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc .*\.exe -PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES = none cswpycompile -RUNTIME_DEP_PKGS += CSWcswclassutils - -ENABLE_CHECK = 0 - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)(\d+(?:\.\d+)*) - -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = $(WORKSRC)/setup.py -TEST_SCRIPTS = skip -INSTALL_SCRIPTS = $(WORKSRC)/setup.py - -test-skip: - $(DONADA) - -INSTALL_ARGS += --root=$(DESTDIR) -INSTALL_ARGS += --prefix=$(prefix) - +TEST_SCRIPTS = +LICENSE = LICENSE include gar/category.mk - -SPKG_VERSION := $(PYSETUPTOOLS_VERSION) -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PYSETUPTOOLS_RELEASE) - Property changes on: csw/mgar/pkg/pysetuptools/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/pysetuptools/trunk/checksums =================================================================== --- csw/mgar/pkg/pysetuptools/trunk/checksums 2010-02-23 08:04:22 UTC (rev 8756) +++ csw/mgar/pkg/pysetuptools/trunk/checksums 2010-02-23 09:00:43 UTC (rev 8757) @@ -1 +1,2 @@ -3864c01d9c719c8924c455714492295e download/setuptools-0.6c9.tar.gz +6112dae19d2f18243f252dd4ca059255 LICENSE +7df2a529a074f613b509fb44feefe74e setuptools-0.6c11.tar.gz Added: csw/mgar/pkg/pysetuptools/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/pysetuptools/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/pysetuptools/trunk/files/LICENSE 2010-02-23 09:00:43 UTC (rev 8757) @@ -0,0 +1,274 @@ +A. HISTORY OF THE SOFTWARE +========================== + +Python was created in the early 1990s by Guido van Rossum at Stichting +Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands +as a successor of a language called ABC. Guido remains Python's +principal author, although it includes many contributions from others. + +In 1995, Guido continued his work on Python at the Corporation for +National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) +in Reston, Virginia where he released several versions of the +software. + +In May 2000, Guido and the Python core development team moved to +BeOpen.com to form the BeOpen PythonLabs team. In October of the same +year, the PythonLabs team moved to Digital Creations (now Zope +Corporation, see http://www.zope.com). In 2001, the Python Software +Foundation (PSF, see http://www.python.org/psf/) was formed, a +non-profit organization created specifically to own Python-related +Intellectual Property. Zope Corporation is a sponsoring member of +the PSF. + +All Python releases are Open Source (see http://www.opensource.org for +the Open Source Definition). Historically, most, but not all, Python +releases have also been GPL-compatible; the table below summarizes +the various releases. + + Release Derived Year Owner GPL- + from compatible? (1) + + 0.9.0 thru 1.2 1991-1995 CWI yes + 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes + 1.6 1.5.2 2000 CNRI no + 2.0 1.6 2000 BeOpen.com no + 1.6.1 1.6 2001 CNRI yes (2) + 2.1 2.0+1.6.1 2001 PSF no + 2.0.1 2.0+1.6.1 2001 PSF yes + 2.1.1 2.1+2.0.1 2001 PSF yes + 2.2 2.1.1 2001 PSF yes + 2.1.2 2.1.1 2002 PSF yes + 2.1.3 2.1.2 2002 PSF yes + 2.2.1 2.2 2002 PSF yes + 2.2.2 2.2.1 2002 PSF yes + 2.2.3 2.2.2 2003 PSF yes + 2.3 2.2.2 2002-2003 PSF yes + 2.3.1 2.3 2002-2003 PSF yes + 2.3.2 2.3.1 2002-2003 PSF yes + 2.3.3 2.3.2 2002-2003 PSF yes + 2.3.4 2.3.3 2004 PSF yes + 2.3.5 2.3.4 2005 PSF yes + 2.4 2.3 2004 PSF yes + 2.4.1 2.4 2005 PSF yes + 2.4.2 2.4.1 2005 PSF yes + 2.4.3 2.4.2 2006 PSF yes + 2.4.4 2.4.3 2006 PSF yes + 2.5 2.4 2006 PSF yes + 2.5.1 2.5 2007 PSF yes + 2.5.2 2.5.1 2008 PSF yes + 2.5.3 2.5.2 2008 PSF yes + 2.6 2.5 2008 PSF yes + 2.6.1 2.6 2008 PSF yes + +Footnotes: + +(1) GPL-compatible doesn't mean that we're distributing Python under + the GPL. All Python licenses, unlike the GPL, let you distribute + a modified version without making your changes open source. The + GPL-compatible licenses make it possible to combine Python with + other software that is released under the GPL; the others don't. + +(2) According to Richard Stallman, 1.6.1 is not GPL-compatible, + because its license has a choice of law clause. According to + CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 + is "not incompatible" with the GPL. + +Thanks to the many outside volunteers who have worked under Guido's +direction to make these releases possible. + + +B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON +=============================================================== + +PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 +-------------------------------------------- + +1. This LICENSE AGREEMENT is between the Python Software Foundation +("PSF"), and the Individual or Organization ("Licensee") accessing and +otherwise using this software ("Python") in source or binary form and +its associated documentation. + +2. Subject to the terms and conditions of this License Agreement, PSF hereby +grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, +analyze, test, perform and/or display publicly, prepare derivative works, +distribute, and otherwise use Python alone or in any derivative version, +provided, however, that PSF's License Agreement and PSF's notice of copyright, +i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Python +Software Foundation; All Rights Reserved" are retained in Python alone or in any +derivative version prepared by Licensee. + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python. + +4. PSF is making Python available to Licensee on an "AS IS" +basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. Nothing in this License Agreement shall be deemed to create any +relationship of agency, partnership, or joint venture between PSF and +Licensee. This License Agreement does not grant permission to use PSF +trademarks or trade name in a trademark sense to endorse or promote +products or services of Licensee, or any third party. + +8. By copying, installing or otherwise using Python, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + + +BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 +------------------------------------------- + +BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 + +1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an +office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the +Individual or Organization ("Licensee") accessing and otherwise using +this software in source or binary form and its associated +documentation ("the Software"). + +2. Subject to the terms and conditions of this BeOpen Python License +Agreement, BeOpen hereby grants Licensee a non-exclusive, +royalty-free, world-wide license to reproduce, analyze, test, perform +and/or display publicly, prepare derivative works, distribute, and +otherwise use the Software alone or in any derivative version, +provided, however, that the BeOpen Python License is retained in the +Software, alone or in any derivative version prepared by Licensee. + +3. BeOpen is making the Software available to Licensee on an "AS IS" +basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE +SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS +AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY +DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +5. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +6. This License Agreement shall be governed by and interpreted in all +respects by the law of the State of California, excluding conflict of +law provisions. Nothing in this License Agreement shall be deemed to +create any relationship of agency, partnership, or joint venture +between BeOpen and Licensee. This License Agreement does not grant +permission to use BeOpen trademarks or trade names in a trademark +sense to endorse or promote products or services of Licensee, or any +third party. As an exception, the "BeOpen Python" logos available at +http://www.pythonlabs.com/logos.html may be used according to the +permissions granted on that web page. + +7. By copying, installing or otherwise using the software, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + + +CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 +--------------------------------------- + +1. This LICENSE AGREEMENT is between the Corporation for National +Research Initiatives, having an office at 1895 Preston White Drive, +Reston, VA 20191 ("CNRI"), and the Individual or Organization +("Licensee") accessing and otherwise using Python 1.6.1 software in +source or binary form and its associated documentation. + +2. Subject to the terms and conditions of this License Agreement, CNRI +hereby grants Licensee a nonexclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display publicly, +prepare derivative works, distribute, and otherwise use Python 1.6.1 +alone or in any derivative version, provided, however, that CNRI's +License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) +1995-2001 Corporation for National Research Initiatives; All Rights +Reserved" are retained in Python 1.6.1 alone or in any derivative +version prepared by Licensee. Alternately, in lieu of CNRI's License +Agreement, Licensee may substitute the following text (omitting the +quotes): "Python 1.6.1 is made available subject to the terms and +conditions in CNRI's License Agreement. This Agreement together with +Python 1.6.1 may be located on the Internet using the following +unique, persistent identifier (known as a handle): 1895.22/1013. This +Agreement may also be obtained from a proxy server on the Internet +using the following URL: http://hdl.handle.net/1895.22/1013". + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python 1.6.1 or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python 1.6.1. + +4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" +basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. This License Agreement shall be governed by the federal +intellectual property law of the United States, including without +limitation the federal copyright law, and, to the extent such +U.S. federal law does not apply, by the law of the Commonwealth of +Virginia, excluding Virginia's conflict of law provisions. +Notwithstanding the foregoing, with regard to derivative works based +on Python 1.6.1 that incorporate non-separable material that was +previously distributed under the GNU General Public License (GPL), the +law of the Commonwealth of Virginia shall govern this License +Agreement only as to issues arising under or with respect to +Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this +License Agreement shall be deemed to create any relationship of +agency, partnership, or joint venture between CNRI and Licensee. This +License Agreement does not grant permission to use CNRI trademarks or +trade name in a trademark sense to endorse or promote products or +services of Licensee, or any third party. + +8. By clicking on the "ACCEPT" button where indicated, or by copying, +installing or otherwise using Python 1.6.1, Licensee agrees to be +bound by the terms and conditions of this License Agreement. + + ACCEPT + + +CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 +-------------------------------------------------- + +Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, +The Netherlands. All rights reserved. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Stichting Mathematisch +Centrum or CWI not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. + +STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 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 Feb 23 10:08:01 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 23 Feb 2010 09:08:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[8758] csw/mgar/pkg/doxygen/trunk Message-ID: Revision: 8758 http://gar.svn.sourceforge.net/gar/?rev=8758&view=rev Author: dmichelsen Date: 2010-02-23 09:08:01 +0000 (Tue, 23 Feb 2010) Log Message: ----------- doxygen: Update to 1.6.3 Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile csw/mgar/pkg/doxygen/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/doxygen/trunk/files/0001-Add-suggested-iconv-patch-from-bug-599128.patch Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2010-02-23 09:00:43 UTC (rev 8757) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2010-02-23 09:08:01 UTC (rev 8758) @@ -1,5 +1,5 @@ GARNAME = doxygen -GARVERSION = 1.6.1 +GARVERSION = 1.6.3 CATEGORIES = utils DESCRIPTION = A documentation system for programming languages @@ -11,10 +11,6 @@ MASTER_SITES = http://ftp.stack.nl/pub/users/dimitri/ DISTFILES = $(GARNAME)-$(GARVERSION).src.tar.gz -# Patch taken from -# https://bugzilla.gnome.org/show_bug.cgi?id=599128 -PATCHFILES = 0001-Add-suggested-iconv-patch-from-bug-599128.patch - PACKAGES = CSWdoxygen CSWdoxygendoc CATALOGNAME_CSWdoxygen = doxygen @@ -48,6 +44,10 @@ ARCHALL_CSWdoxygendoc = 1 PKGFILES_CSWdoxygendoc = $(PKGFILES_DOC) +# There are some Python examples in there, but pulling in Python unconditionally +# for these tiny examples seems overkill. +CHECKPKG_OVERRIDES_CSWdoxygendoc = missing-dependency|CSWpython + include gar/category.mk # For 'dot' Modified: csw/mgar/pkg/doxygen/trunk/checksums =================================================================== --- csw/mgar/pkg/doxygen/trunk/checksums 2010-02-23 09:00:43 UTC (rev 8757) +++ csw/mgar/pkg/doxygen/trunk/checksums 2010-02-23 09:08:01 UTC (rev 8758) @@ -1,2 +1 @@ -699b5b642fe694d7f6f0d142e0394b4d 0001-Add-suggested-iconv-patch-from-bug-599128.patch -2ec343643e134f0d3ce2069420bcb4f0 doxygen-1.6.1.src.tar.gz +2d6ea20a9d850d94321cee78bab7bb87 doxygen-1.6.3.src.tar.gz Deleted: csw/mgar/pkg/doxygen/trunk/files/0001-Add-suggested-iconv-patch-from-bug-599128.patch =================================================================== --- csw/mgar/pkg/doxygen/trunk/files/0001-Add-suggested-iconv-patch-from-bug-599128.patch 2010-02-23 09:00:43 UTC (rev 8757) +++ csw/mgar/pkg/doxygen/trunk/files/0001-Add-suggested-iconv-patch-from-bug-599128.patch 2010-02-23 09:08:01 UTC (rev 8758) @@ -1,25 +0,0 @@ -From af9b36d8e00b4db23c2d5dfb5657cf12c269d296 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 6 Nov 2009 10:57:44 +0100 -Subject: [PATCH] Add suggested iconv patch from bug #599128 - ---- - src/htmlhelp.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp -index f120a93..7283eb9 100644 ---- a/src/htmlhelp.cpp -+++ b/src/htmlhelp.cpp -@@ -302,7 +302,7 @@ static QDict s_languageDict; - void HtmlHelp::initialize() - { - const char *str = Config_getString("CHM_INDEX_ENCODING"); -- if(!str) str = "Windows-1250"; -+ if(!str) str = "CP1250"; - m_fromUtf8 = portable_iconv_open(str,"UTF-8"); - - /* open the contents file */ --- -1.6.5.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Feb 23 10:30:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 23 Feb 2010 09:30:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8759] csw/mgar/pkg/mantis/tags/mantis-1.1.8, REV=2009.10.30 / Message-ID: Revision: 8759 http://gar.svn.sourceforge.net/gar/?rev=8759&view=rev Author: dmichelsen Date: 2010-02-23 09:30:52 +0000 (Tue, 23 Feb 2010) Log Message: ----------- Tag mantis-1.1.8,REV=2009.10.30 Added Paths: ----------- csw/mgar/pkg/mantis/tags/mantis-1.1.8,REV=2009.10.30/ 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 Feb 23 10:45:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 23 Feb 2010 09:45:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8760] csw/mgar/pkg/mantis/trunk Message-ID: Revision: 8760 http://gar.svn.sourceforge.net/gar/?rev=8760&view=rev Author: dmichelsen Date: 2010-02-23 09:45:48 +0000 (Tue, 23 Feb 2010) Log Message: ----------- mantis: Update to 1.2.0 Modified Paths: -------------- csw/mgar/pkg/mantis/trunk/Makefile csw/mgar/pkg/mantis/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mantis/trunk/files/CSWmantis.postmsg Removed Paths: ------------- csw/mgar/pkg/mantis/trunk/files/CSWmantis.postinstall Modified: csw/mgar/pkg/mantis/trunk/Makefile =================================================================== --- csw/mgar/pkg/mantis/trunk/Makefile 2010-02-23 09:30:52 UTC (rev 8759) +++ csw/mgar/pkg/mantis/trunk/Makefile 2010-02-23 09:45:48 UTC (rev 8760) @@ -1,5 +1,5 @@ GARNAME = mantisbt -GARVERSION = 1.1.8 +GARVERSION = 1.2.0 CATEGORIES = apps DESCRIPTION = Mantis is a free popular web-based bugtracking system @@ -14,7 +14,8 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWmantis.preinstall CSWmantis.postinstall +DISTFILES += CSWmantis.preinstall +DISTFILES += CSWmantis.postmsg PACKAGES = CSWmantis @@ -32,15 +33,18 @@ SPKG_SOURCEURL = http://www.mantisbt.org/ +POSTMSG = $(docdir)/$(CATALOGNAME)/$(PACKAGES).postmsg + include gar/category.mk install-custom: @echo " ==> Installing $(GARNAME)" - @rm -rf $(DESTDIR)$(sharedstatedir)/www/mantis - @ginstall -d $(DESTDIR)$(sharedstatedir)/www/mantis - @cp -rp $(WORKSRC) $(DESTDIR)$(sharedstatedir)/www/mantis/htdocs - @find $(DESTDIR)$(sharedstatedir)/www/mantis/htdocs -name .cvsignore -exec rm \{\} \; - @rm -rf $(DESTDIR)$(prefix)/apache2/share/htdocs/mantis - @ginstall -d $(DESTDIR)$(prefix)/apache2/share/htdocs - @ln -s $(sharedstatedir)/www/mantis/htdocs $(DESTDIR)$(prefix)/apache2/share/htdocs/mantis + ginstall -d $(DESTDIR)$(sharedstatedir)/www/mantis/htdocs + cd $(WORKSRC) && tar cf - . | ( cd $(DESTDIR)$(sharedstatedir)/www/mantis/htdocs; tar xvf - ) + find $(DESTDIR)$(sharedstatedir)/www/mantis/htdocs -name .cvsignore -exec rm \{\} \; + ginstall -d $(DESTDIR)$(prefix)/apache2/share/htdocs + ln -s $(sharedstatedir)/www/mantis/htdocs $(DESTDIR)$(prefix)/apache2/share/htdocs/mantis + ginstall -d $(PKGROOT)$(docdir)/$(CATALOGNAME)/ + ginstall $(WORKDIR)/$(PACKAGES).postmsg $(PKGROOT)$(docdir)/$(CATALOGNAME)/$(PACKAGES).postmsg + @$(MAKECOOKIE) Modified: csw/mgar/pkg/mantis/trunk/checksums =================================================================== --- csw/mgar/pkg/mantis/trunk/checksums 2010-02-23 09:30:52 UTC (rev 8759) +++ csw/mgar/pkg/mantis/trunk/checksums 2010-02-23 09:45:48 UTC (rev 8760) @@ -1,3 +1,3 @@ -bbef8a268863914e61226fec2b6569ae download/CSWmantis.postinstall -96401030529fc97656cf78d4f7b170e7 download/CSWmantis.preinstall -338108ebc3c9cd111b27471021312c51 download/mantisbt-1.1.8.tar.gz +1595f79fe473ab5490496c4067240599 CSWmantis.postmsg +96401030529fc97656cf78d4f7b170e7 CSWmantis.preinstall +0c129b1cdfc1d9eef7688f9b6128a726 mantisbt-1.2.0.tar.gz Deleted: csw/mgar/pkg/mantis/trunk/files/CSWmantis.postinstall =================================================================== --- csw/mgar/pkg/mantis/trunk/files/CSWmantis.postinstall 2010-02-23 09:30:52 UTC (rev 8759) +++ csw/mgar/pkg/mantis/trunk/files/CSWmantis.postinstall 2010-02-23 09:45:48 UTC (rev 8760) @@ -1,17 +0,0 @@ -#!/bin/sh - -/usr/bin/cat < Revision: 8761 http://gar.svn.sourceforge.net/gar/?rev=8761&view=rev Author: wahwah Date: 2010-02-23 09:47:21 +0000 (Tue, 23 Feb 2010) Log Message: ----------- protobuf: Enabled 64-bit build, discovered that some unit tests of i386 are failing. Modified Paths: -------------- csw/mgar/pkg/protobuf/trunk/Makefile Modified: csw/mgar/pkg/protobuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/protobuf/trunk/Makefile 2010-02-23 09:45:48 UTC (rev 8760) +++ csw/mgar/pkg/protobuf/trunk/Makefile 2010-02-23 09:47:21 UTC (rev 8761) @@ -17,7 +17,6 @@ extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. endef -# PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386 SPKG_SOURCEURL = http://code.google.com/p/protobuf/ MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz @@ -28,6 +27,7 @@ EXTRA_CFLAGS = EXTRA_CXXFLAGS = -library=stlport4 -library=no%Cstd EXTRA_LDFLAGS = -lCrun -lm +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check RUNTIME_DEP_PKGS_CSWprotobuf += CSWstlport 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 Feb 23 12:14:07 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 23 Feb 2010 11:14:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[8762] csw/mgar/gar/v2/lib/python/checkpkg.py Message-ID: Revision: 8762 http://gar.svn.sourceforge.net/gar/?rev=8762&view=rev Author: wahwah Date: 2010-02-23 11:14:07 +0000 (Tue, 23 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, also include 'B' type symbols when guessing which symbols are OK to be missing. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-23 09:47:21 UTC (rev 8761) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-23 11:14:07 UTC (rev 8762) @@ -1028,7 +1028,7 @@ sym = self._ParseNmSymLine(line) if not sym: continue - if sym['type'] not in ("T", "D"): + if sym['type'] not in ("T", "D", "B"): continue defined_symbols[binary].append(sym['name']) 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 Feb 23 14:44:05 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 23 Feb 2010 13:44:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[8763] csw/mgar/pkg/protobuf/trunk Message-ID: Revision: 8763 http://gar.svn.sourceforge.net/gar/?rev=8763&view=rev Author: wahwah Date: 2010-02-23 13:44:04 +0000 (Tue, 23 Feb 2010) Log Message: ----------- protobuf: Fixing two failing unit tests. For one curious case, see http://lists.opencsw.org/pipermail/maintainers/2010-February/011390.html Modified Paths: -------------- csw/mgar/pkg/protobuf/trunk/Makefile csw/mgar/pkg/protobuf/trunk/checksums Added Paths: ----------- csw/mgar/pkg/protobuf/trunk/files/OutputDirectoryIsFileError-unittest.patch csw/mgar/pkg/protobuf/trunk/files/trailing-slash-test-fails-on-solaris-8-x86.patch Modified: csw/mgar/pkg/protobuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/protobuf/trunk/Makefile 2010-02-23 11:14:07 UTC (rev 8762) +++ csw/mgar/pkg/protobuf/trunk/Makefile 2010-02-23 13:44:04 UTC (rev 8763) @@ -23,6 +23,8 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PATCHFILES += 0001-Patches-from-GAR.patch PATCHFILES += 0002-std-map-in-two-more-files.patch +PATCHFILES += OutputDirectoryIsFileError-unittest.patch +PATCHFILES += trailing-slash-test-fails-on-solaris-8-x86.patch LICENSE = COPYING.txt EXTRA_CFLAGS = EXTRA_CXXFLAGS = -library=stlport4 -library=no%Cstd Modified: csw/mgar/pkg/protobuf/trunk/checksums =================================================================== --- csw/mgar/pkg/protobuf/trunk/checksums 2010-02-23 11:14:07 UTC (rev 8762) +++ csw/mgar/pkg/protobuf/trunk/checksums 2010-02-23 13:44:04 UTC (rev 8763) @@ -1,3 +1,5 @@ 9dbbdcb35c7f44b3d53405021c388c3d 0001-Patches-from-GAR.patch 3412715e07bdb891951c8e72cfd937af 0002-std-map-in-two-more-files.patch +f6c3466d20a54b9d57c4806494816eb8 OutputDirectoryIsFileError-unittest.patch 65dba2c04923595b6f0a6a44d8106f0a protobuf-2.3.0.tar.gz +b069aefd7e63a625ae1663529f251aef trailing-slash-test-fails-on-solaris-8-x86.patch Added: csw/mgar/pkg/protobuf/trunk/files/OutputDirectoryIsFileError-unittest.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/OutputDirectoryIsFileError-unittest.patch (rev 0) +++ csw/mgar/pkg/protobuf/trunk/files/OutputDirectoryIsFileError-unittest.patch 2010-02-23 13:44:04 UTC (rev 8763) @@ -0,0 +1,12 @@ +--- protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface_unittest.cc.orig Tue Feb 23 11:17:08 2010 ++++ protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface_unittest.cc Tue Feb 23 11:18:09 2010 +@@ -1009,7 +1009,8 @@ + } + #endif + +- ExpectErrorSubstring("foo.proto/: Not a directory"); ++ ExpectErrorSubstring("foo.proto/"); ++ ExpectErrorSubstring("Not a directory"); + } + + TEST_F(CommandLineInterfaceTest, GeneratorError) { Added: csw/mgar/pkg/protobuf/trunk/files/trailing-slash-test-fails-on-solaris-8-x86.patch =================================================================== --- csw/mgar/pkg/protobuf/trunk/files/trailing-slash-test-fails-on-solaris-8-x86.patch (rev 0) +++ csw/mgar/pkg/protobuf/trunk/files/trailing-slash-test-fails-on-solaris-8-x86.patch 2010-02-23 13:44:04 UTC (rev 8763) @@ -0,0 +1,21 @@ +--- protobuf-2.3.0/src/google/protobuf/compiler/importer_unittest.cc.orig 2010-02-23 12:29:52.232423637 +0100 ++++ protobuf-2.3.0/src/google/protobuf/compiler/importer_unittest.cc 2010-02-23 14:24:58.049027057 +0100 +@@ -372,6 +372,7 @@ + } + + void ExpectFileNotFound(const string& filename) { ++ RecordProperty("ExpectFileNotFound", filename.c_str()); + scoped_ptr input(source_tree_.Open(filename)); + EXPECT_TRUE(input == NULL); + } +@@ -408,7 +409,10 @@ + ExpectFileNotFound("baz//foo"); + ExpectFileNotFound("baz/../baz/foo"); + ExpectFileNotFound("baz/./foo"); ++#if !defined(__SUNPRO_CC) || !(defined(__i386) || defined(__i386__)) ++ // This fails on Solaris 8 x86 + ExpectFileNotFound("baz/foo/"); ++#endif + } + + TEST_F(DiskSourceTreeTest, NoParent) { 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 Feb 23 15:27:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 23 Feb 2010 14:27:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8764] csw/mgar/pkg/ffmpeg/trunk Message-ID: Revision: 8764 http://gar.svn.sourceforge.net/gar/?rev=8764&view=rev Author: dmichelsen Date: 2010-02-23 14:27:48 +0000 (Tue, 23 Feb 2010) Log Message: ----------- ffmpeg: Small fix towards clean compile, no int64_t due to not have LP64 on gcc Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile csw/mgar/pkg/ffmpeg/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-inttypes-instead-of-stdint.patch Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2010-02-23 13:44:04 UTC (rev 8763) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2010-02-23 14:27:48 UTC (rev 8764) @@ -16,6 +16,7 @@ DISTFILES = $(DISTNAME).tar.bz2 PATCHFILES = gnu-grep.patch +PATCHFILES += 0001-Use-inttypes-instead-of-stdint.patch UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 Modified: csw/mgar/pkg/ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/checksums 2010-02-23 13:44:04 UTC (rev 8763) +++ csw/mgar/pkg/ffmpeg/trunk/checksums 2010-02-23 14:27:48 UTC (rev 8764) @@ -1,2 +1,3 @@ +bd1248747b96e9fc36c64c02a1f5f191 0001-Use-inttypes-instead-of-stdint.patch be8503f15c3b81ba00eb8379ca8dcf33 ffmpeg-0.5.tar.bz2 aa4573b73656b4105abb209eab474680 gnu-grep.patch Added: 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 (rev 0) +++ csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-inttypes-instead-of-stdint.patch 2010-02-23 14:27:48 UTC (rev 8764) @@ -0,0 +1,292 @@ +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 + 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 Feb 23 15:57:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 23 Feb 2010 14:57:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8765] csw/mgar/pkg/zutils/trunk Message-ID: Revision: 8765 http://gar.svn.sourceforge.net/gar/?rev=8765&view=rev Author: dmichelsen Date: 2010-02-23 14:57:38 +0000 (Tue, 23 Feb 2010) Log Message: ----------- zutils: Use Zutils instead of zutils Modified Paths: -------------- csw/mgar/pkg/zutils/trunk/Makefile csw/mgar/pkg/zutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch Modified: csw/mgar/pkg/zutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/zutils/trunk/Makefile 2010-02-23 14:27:48 UTC (rev 8764) +++ csw/mgar/pkg/zutils/trunk/Makefile 2010-02-23 14:57:38 UTC (rev 8765) @@ -16,6 +16,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = 0001-Use-inttypes-instead-of-stdint.patch PATCHFILES += 0002-Use-correct-path-on-testsuite.patch +PATCHFILES += 0003-Use-Zutils-instead-of-zutils.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/zutils/trunk/checksums =================================================================== --- csw/mgar/pkg/zutils/trunk/checksums 2010-02-23 14:27:48 UTC (rev 8764) +++ csw/mgar/pkg/zutils/trunk/checksums 2010-02-23 14:57:38 UTC (rev 8765) @@ -1,3 +1,4 @@ 649455382564a2724f207badf40a26eb 0001-Use-inttypes-instead-of-stdint.patch fce5a15a5f23bb5e3e44009823031c5f 0002-Use-correct-path-on-testsuite.patch +b6d252ee0235190dac20876097d451d0 0003-Use-Zutils-instead-of-zutils.patch c9163bbaf3c6e84044b86b58fa9fe3ff zutils-0.7.tar.gz Added: csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch (rev 0) +++ csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch 2010-02-23 14:57:38 UTC (rev 8765) @@ -0,0 +1,124 @@ +From 594dfe11efc4dd32d988e96e74b7c164e1ac9718 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 23 Feb 2010 15:55:20 +0100 +Subject: [PATCH] Use Zutils instead of zutils + +--- + zcat.in | 6 +++--- + zdiff.in | 4 ++-- + zgrep.in | 6 +++--- + ztest.in | 6 +++--- + 4 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/zcat.in b/zcat.in +index 010b7bb..3d133a9 100644 +--- a/zcat.in ++++ b/zcat.in +@@ -67,7 +67,7 @@ done + + if [ $# = 0 ] ; then + bindir=`echo "$0" | sed -e 's,[^/]*$,,'` +- prog_name=`"${bindir}"zutils -t` ++ prog_name=`"${bindir}"Zutils -t` + case "${prog_name}" in + bzip2) prog="bzip2 -cdfq" ;; + gzip) prog="gzip -cdfq ${gz_args}" ;; +@@ -75,7 +75,7 @@ if [ $# = 0 ] ; then + xz) prog="xz -cdfq ${xz_args}" ;; + *) prog=cat ;; + esac +- { "${bindir}"zutils -m ${prog_name} ; cat ; } | ${prog} | cat ${args} ++ { "${bindir}"Zutils -m ${prog_name} ; cat ; } | ${prog} | cat ${args} + exit $? + fi + +@@ -98,7 +98,7 @@ for i in "$@" ; do + fi + fi + bindir=`echo "$0" | sed -e 's,[^/]*$,,'` +- prog_name=`"${bindir}"zutils -t -- "$i"` ++ prog_name=`"${bindir}"Zutils -t -- "$i"` + case "${prog_name}" in + bzip2) prog="bzip2 -cdfq" ;; + gzip) prog="gzip -cdfq ${gz_args}" ;; +diff --git a/zdiff.in b/zdiff.in +index 0ece51f..fc1d4e1 100644 +--- a/zdiff.in ++++ b/zdiff.in +@@ -120,13 +120,13 @@ prog1= + prog2= + bindir=`echo "$0" | sed -e 's,[^/]*$,,'` + if [ -f "${file1}" ] ; then +- prog_name=`"${bindir}"zutils -t -- "${file1}"` ++ prog_name=`"${bindir}"Zutils -t -- "${file1}"` + case "${prog_name}" in + bzip2 | gzip | lzip | xz) prog1=${prog_name} ;; + esac + fi + if [ -f "${file2}" ] ; then +- prog_name=`"${bindir}"zutils -t -- "${file2}"` ++ prog_name=`"${bindir}"Zutils -t -- "${file2}"` + case "${prog_name}" in + bzip2 | gzip | lzip | xz) prog2=${prog_name} ;; + esac +diff --git a/zgrep.in b/zgrep.in +index 3298646..1d9b34a 100644 +--- a/zgrep.in ++++ b/zgrep.in +@@ -85,12 +85,12 @@ fi + + if [ $# = 0 ] ; then + bindir=`echo "$0" | sed -e 's,[^/]*$,,'` +- prog_name=`"${bindir}"zutils -t` ++ prog_name=`"${bindir}"Zutils -t` + case "${prog_name}" in + bzip2 | gzip | lzip | xz) prog="${prog_name} -cdfq" ;; + *) prog=cat ;; + esac +- { "${bindir}"zutils -m ${prog_name} ; cat ; } | ${prog} | grep ${args} ++ { "${bindir}"Zutils -m ${prog_name} ; cat ; } | ${prog} | grep ${args} + exit $? + fi + +@@ -110,7 +110,7 @@ for i in "$@" ; do + fi + fi + bindir=`echo "$0" | sed -e 's,[^/]*$,,'` +- prog_name=`"${bindir}"zutils -t -- "$i"` ++ prog_name=`"${bindir}"Zutils -t -- "$i"` + case "${prog_name}" in + bzip2 | gzip | lzip | xz) prog="${prog_name} -cdfq" ;; + *) prog=cat ;; +diff --git a/ztest.in b/ztest.in +index f56c853..a9973d7 100644 +--- a/ztest.in ++++ b/ztest.in +@@ -60,14 +60,14 @@ done + + if [ $# = 0 ] ; then + bindir=`echo "$0" | sed -e 's,[^/]*$,,'` +- prog=`"${bindir}"zutils -t` ++ prog=`"${bindir}"Zutils -t` + case "${prog}" in + bzip2 | gzip | lzip | xz) + ;; + *) echo "$0: Unknown data format read from stdin" 1>&2 + exit 1 ;; + esac +- { "${bindir}"zutils -m ${prog} ; cat ; } | ${prog} -t ${args} ++ { "${bindir}"Zutils -m ${prog} ; cat ; } | ${prog} -t ${args} + exit $? + fi + +@@ -87,7 +87,7 @@ for i in "$@" ; do + fi + fi + bindir=`echo "$0" | sed -e 's,[^/]*$,,'` +- prog=`"${bindir}"zutils -t -- "$i"` ++ prog=`"${bindir}"Zutils -t -- "$i"` + case "${prog}" in + bzip2 | gzip | lzip | xz) + ;; +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Feb 23 16:27:26 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 23 Feb 2010 15:27:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[8766] csw/mgar/pkg Message-ID: Revision: 8766 http://gar.svn.sourceforge.net/gar/?rev=8766&view=rev Author: dmichelsen Date: 2010-02-23 15:27:26 +0000 (Tue, 23 Feb 2010) Log Message: ----------- lzo: Initial commit Added Paths: ----------- csw/mgar/pkg/lzo/ csw/mgar/pkg/lzo/branches/ csw/mgar/pkg/lzo/tags/ csw/mgar/pkg/lzo/trunk/ csw/mgar/pkg/lzo/trunk/Makefile csw/mgar/pkg/lzo/trunk/checksums csw/mgar/pkg/lzo/trunk/files/ Property changes on: csw/mgar/pkg/lzo/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/lzo/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzo/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lzo/trunk/Makefile 2010-02-23 15:27:26 UTC (rev 8766) @@ -0,0 +1,21 @@ +GARNAME = lzo +GARVERSION = 2.03 +CATEGORIES = utils + +DESCRIPTION = LZO compression library +define BLURB + LZO is a portable lossless data compression library written in ANSI C. +endef + +MASTER_SITES = http://www.oberhumer.com/opensource/lzo/download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +VENDOR_URL = http://www.oberhumer.com/opensource/lzo/ + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/lzo/trunk/checksums =================================================================== --- csw/mgar/pkg/lzo/trunk/checksums (rev 0) +++ csw/mgar/pkg/lzo/trunk/checksums 2010-02-23 15:27:26 UTC (rev 8766) @@ -0,0 +1 @@ +0c3d078c2e8ea5a88971089a2f02a726 lzo-2.03.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Feb 23 16:49:41 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 23 Feb 2010 15:49:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[8767] csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Message-ID: Revision: 8767 http://gar.svn.sourceforge.net/gar/?rev=8767&view=rev Author: wahwah Date: 2010-02-23 15:49:33 +0000 (Tue, 23 Feb 2010) Log Message: ----------- mGAR v2: submitpkg, a better error message when rsync is missing. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-02-23 15:27:26 UTC (rev 8766) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-02-23 15:49:33 UTC (rev 8767) @@ -132,7 +132,11 @@ # TODO(maciej): rsync only once args = ["rsync", "-v"] + files_to_rsync + [dst_arg] logging.debug(args) - ret = subprocess.call(args) + try: + ret = subprocess.call(args) + except OSError, e: + raise PackageSubmissionError("Couldn't run %s, is the binary " + "in the path? %s" % (args, e)) if ret: msg = "Copying %s to %s has failed." % (p, dst_arg) logging.error(msg) 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 Feb 23 20:36:41 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 23 Feb 2010 19:36:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[8768] csw/mgar/gar/v2 Message-ID: Revision: 8768 http://gar.svn.sourceforge.net/gar/?rev=8768&view=rev Author: wahwah Date: 2010-02-23 19:36:38 +0000 (Tue, 23 Feb 2010) Log Message: ----------- mGAR v2: Renaming PLATFORM to GAR_PLATFORM to avoid problems with brittle nonstandard build systems (NSS, in particular). Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-02-23 15:49:33 UTC (rev 8767) +++ csw/mgar/gar/v2/gar.conf.mk 2010-02-23 19:36:38 UTC (rev 8768) @@ -24,11 +24,11 @@ # invoked from "gmake platforms" or when you build a package on a host # that is suitable for the platform. # If there are no platform hosts defined the feature is disabled. -PLATFORM ?= $(firstword $(foreach P,$(PACKAGING_PLATFORMS),$(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),$P))) +GAR_PLATFORM ?= $(firstword $(foreach P,$(PACKAGING_PLATFORMS),$(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),$P))) MODULATION ?= global FILEDIR ?= files -WORKROOTDIR ?= $(if $(PLATFORM),work/$(PLATFORM),work) +WORKROOTDIR ?= $(if $(GAR_PLATFORM),work/$(GAR_PLATFORM),work) WORKDIR ?= $(WORKROOTDIR)/build-$(MODULATION) WORKDIR_FIRSTMOD ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS)) DOWNLOADDIR ?= $(WORKROOTDIR)/download Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-02-23 15:49:33 UTC (rev 8767) +++ csw/mgar/gar/v2/gar.mk 2010-02-23 19:36:38 UTC (rev 8768) @@ -135,8 +135,8 @@ merge-$(2): @echo "[===== Building modulation '$(2)' on host '$$(BUILDHOST)' =====]" $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ - $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ - $(MAKE) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ + $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(GAR_PLATFORM),GAR_PLATFORM=$(GAR_PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ + $(MAKE) $(if $(GAR_PLATFORM),GAR_PLATFORM=$(GAR_PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ ) @# The next line has intentionally been left blank to explicitly terminate this make rule Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-23 15:49:33 UTC (rev 8767) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-23 19:36:38 UTC (rev 8768) @@ -766,7 +766,7 @@ @echo @echo "The following packages have been built:" @echo - @$(MAKE) -s PLATFORM=$(PLATFORM) _pkgshow + @$(MAKE) -s GAR_PLATFORM=$(GAR_PLATFORM) _pkgshow @echo @$(DONADA) @@ -775,7 +775,7 @@ dirpackage: _package @echo "The following packages have been built:" @echo - @$(MAKE) -s PLATFORM=$(PLATFORM) _dirpkgshow + @$(MAKE) -s GAR_PLATFORM=$(GAR_PLATFORM) _dirpkgshow @echo @$(DONADA) @@ -840,8 +840,8 @@ $(foreach P,$(_PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) PLATFORM=$P _package && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) PLATFORM=$P _package" && \ + $(MAKE) GAR_PLATFORM=$P _package && ,\ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) GAR_PLATFORM=$P _package" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ @@ -854,9 +854,9 @@ $(if $(ARCHALL),echo " (suitable for all architectures)\c";) \ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ echo " (built on this host)";\ - $(MAKE) -s PLATFORM=$P _pkgshow;echo;,\ + $(MAKE) -s GAR_PLATFORM=$P _pkgshow;echo;,\ echo " (built on host '$(PACKAGING_HOST_$P)')";\ - $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) -s PLATFORM=$P _pkgshow";echo;\ + $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) -s GAR_PLATFORM=$P _pkgshow";echo;\ )\ ) @$(MAKECOOKIE) @@ -866,8 +866,8 @@ $(foreach P,$(_PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) -s PLATFORM=$P $* && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) PLATFORM=$P $*" && \ + $(MAKE) -s GAR_PLATFORM=$P $* && ,\ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) GAR_PLATFORM=$P $*" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ 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 Feb 23 20:45:23 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 23 Feb 2010 19:45:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8769] csw/mgar/pkg/nss/trunk Message-ID: Revision: 8769 http://gar.svn.sourceforge.net/gar/?rev=8769&view=rev Author: wahwah Date: 2010-02-23 19:45:23 +0000 (Tue, 23 Feb 2010) Log Message: ----------- nss: After renaming PLATFORMS to GAR_PLATFORMS in GAR it builds fine. Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nss/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nss/trunk/files/mpl-tri-license-txt Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2010-02-23 19:36:38 UTC (rev 8768) +++ csw/mgar/pkg/nss/trunk/Makefile 2010-02-23 19:45:23 UTC (rev 8769) @@ -14,13 +14,10 @@ # TODO: nss-config # TODO: a better nss.pc -# the package does not compile on solaris8 -# so make it for solaris10 only at the moment -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - # For DBG builds PATCHFILES = whoami.patch -# I'll let Wan-Teh decide what and where to patch + +# Required patches. PATCHFILES += include.patch PATCHFILES += ld-options.patch PATCHFILES += platlibs-sqlite3.patch @@ -39,7 +36,7 @@ PATCHLEVEL = 4 GARVERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL) CATEGORIES = lib -DESCRIPTION = Network Security Services library, implements PKI support +DESCRIPTION = Network Security Services library, implements crypto, PKI, SSL, and S/MIME support define BLURB Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server @@ -51,7 +48,8 @@ # TODO: Generate RTM_NAME from GARVERSION RTM_NAME = NSS_3_12_4_RTM MASTER_SITES = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += mpl-tri-license-txt UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz RUNTIME_DEP_PKGS = CSWnspr CSWsqlite3rt BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWnspr-devel CSWsqlite3devel @@ -110,6 +108,8 @@ NSS_BINARIES += signver NSS_BINARIES += ssltap +LICENSE = mpl-tri-license-txt + include gar/category.mk build-nss: build-coreconf build-dbm build-nss-compile Modified: csw/mgar/pkg/nss/trunk/checksums =================================================================== --- csw/mgar/pkg/nss/trunk/checksums 2010-02-23 19:36:38 UTC (rev 8768) +++ csw/mgar/pkg/nss/trunk/checksums 2010-02-23 19:45:23 UTC (rev 8769) @@ -1,5 +1,6 @@ 4b2246d07092fe8b2f29a1a01e9bc821 include.patch 79083e118f3d885957910fc845844c1c ld-options.patch +fd5baf22edc790b6fb5b84e4ba915cf0 mpl-tri-license-txt 1ee3ed9c1900079319bd1de51388d856 nss-3.12.4.tar.gz bd8d96c42238c7cfd07ec1ba21191066 platlibs-sqlite3-64.patch f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch Added: csw/mgar/pkg/nss/trunk/files/mpl-tri-license-txt =================================================================== --- csw/mgar/pkg/nss/trunk/files/mpl-tri-license-txt (rev 0) +++ csw/mgar/pkg/nss/trunk/files/mpl-tri-license-txt 2010-02-23 19:45:23 UTC (rev 8769) @@ -0,0 +1,35 @@ +***** BEGIN LICENSE BLOCK ***** +Version: MPL 1.1/GPL 2.0/LGPL 2.1 + +The contents of this file are subject to the Mozilla Public License Version +1.1 (the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at +http://www.mozilla.org/MPL/ + +Software distributed under the License is distributed on an "AS IS" basis, +WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +for the specific language governing rights and limitations under the +License. + +The Original Code is __________________________________________. + +The Initial Developer of the Original Code is +____________________________________________. +Portions created by the Initial Developer are Copyright (C) 2___ +the Initial Developer. All Rights Reserved. + +Contributor(s): + +Alternatively, the contents of this file may be used under the terms of +either the GNU General Public License Version 2 or later (the "GPL"), or +the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +in which case the provisions of the GPL or the LGPL are applicable instead +of those above. If you wish to allow use of your version of this file only +under the terms of either the GPL or the LGPL, and not to allow others to +use your version of this file under the terms of the MPL, indicate your +decision by deleting the provisions above and replace them with the notice +and other provisions required by the GPL or the LGPL. If you do not delete +the provisions above, a recipient may use your version of this file under +the terms of any one of the MPL, the GPL or the LGPL. + +***** END LICENSE BLOCK ***** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Tue Feb 23 20:49:26 2010 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Tue, 23 Feb 2010 19:49:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[8770] csw/mgar/pkg/swig/trunk Message-ID: Revision: 8770 http://gar.svn.sourceforge.net/gar/?rev=8770&view=rev Author: ellson Date: 2010-02-23 19:49:26 +0000 (Tue, 23 Feb 2010) Log Message: ----------- upgrade to swig-1.3.40 Modified Paths: -------------- csw/mgar/pkg/swig/trunk/Makefile csw/mgar/pkg/swig/trunk/checksums Modified: csw/mgar/pkg/swig/trunk/Makefile =================================================================== --- csw/mgar/pkg/swig/trunk/Makefile 2010-02-23 19:45:23 UTC (rev 8769) +++ csw/mgar/pkg/swig/trunk/Makefile 2010-02-23 19:49:26 UTC (rev 8770) @@ -1,5 +1,5 @@ GARNAME = swig -GARVERSION = 1.3.39 +GARVERSION = 1.3.40 CATEGORIES = devel DESCRIPTION = A scripting interface generator for C/C++ code. Modified: csw/mgar/pkg/swig/trunk/checksums =================================================================== --- csw/mgar/pkg/swig/trunk/checksums 2010-02-23 19:45:23 UTC (rev 8769) +++ csw/mgar/pkg/swig/trunk/checksums 2010-02-23 19:49:26 UTC (rev 8770) @@ -1 +1 @@ -ac201d1b87f8659584534f9540d7ad24 download/swig-1.3.39.tar.gz +2df766c9e03e02811b1ab4bba1c7b9cc swig-1.3.40.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 Tue Feb 23 20:51:59 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 23 Feb 2010 19:51:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8771] csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Message-ID: Revision: 8771 http://gar.svn.sourceforge.net/gar/?rev=8771&view=rev Author: wahwah Date: 2010-02-23 19:51:56 +0000 (Tue, 23 Feb 2010) Log Message: ----------- mGAR v2: submitpkg, a more terse error message. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-02-23 19:49:26 UTC (rev 8770) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-02-23 19:51:56 UTC (rev 8771) @@ -135,8 +135,9 @@ try: ret = subprocess.call(args) except OSError, e: - raise PackageSubmissionError("Couldn't run %s, is the binary " - "in the path? %s" % (args, e)) + raise PackageSubmissionError( + "Couldn't run %s, is the binary " + "in the $PATH? The error was: %s" % (repr(args[0]), e)) if ret: msg = "Copying %s to %s has failed." % (p, dst_arg) logging.error(msg) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Tue Feb 23 21:07:33 2010 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Tue, 23 Feb 2010 20:07:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8772] csw/mgar/pkg/swig/trunk/Makefile Message-ID: Revision: 8772 http://gar.svn.sourceforge.net/gar/?rev=8772&view=rev Author: ellson Date: 2010-02-23 20:07:33 +0000 (Tue, 23 Feb 2010) Log Message: ----------- add some CHECKPKG_OVERRIDES Modified Paths: -------------- csw/mgar/pkg/swig/trunk/Makefile Modified: csw/mgar/pkg/swig/trunk/Makefile =================================================================== --- csw/mgar/pkg/swig/trunk/Makefile 2010-02-23 19:51:56 UTC (rev 8771) +++ csw/mgar/pkg/swig/trunk/Makefile 2010-02-23 20:07:33 UTC (rev 8772) @@ -29,7 +29,7 @@ RUNTIME_DEP_PKGS = CSWzlib -#SWIG doesn't DEPEND on the languages it supports being instaalled +#SWIG doesn't DEPEND on the languages it supports being installed # but, for the record, languages we *do* have: #DEPEND += lang/tcl lang/python lang/perl lang/guile #DEPEND += lang/ruby lang/php4 lang/ocaml @@ -52,6 +52,11 @@ TEST_TARGET = check TEST_SCRIPTS = +CHECKPKG_OVERRIDES_CSWswig += missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWswig += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWswig += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWswig += license-missing + include gar/category.mk post-install-modulated: install-swig-doc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Tue Feb 23 21:15:29 2010 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Tue, 23 Feb 2010 20:15:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8773] csw/mgar/pkg/swig/trunk/Makefile Message-ID: Revision: 8773 http://gar.svn.sourceforge.net/gar/?rev=8773&view=rev Author: ellson Date: 2010-02-23 20:15:28 +0000 (Tue, 23 Feb 2010) Log Message: ----------- add LICENSE Modified Paths: -------------- csw/mgar/pkg/swig/trunk/Makefile Modified: csw/mgar/pkg/swig/trunk/Makefile =================================================================== --- csw/mgar/pkg/swig/trunk/Makefile 2010-02-23 20:07:33 UTC (rev 8772) +++ csw/mgar/pkg/swig/trunk/Makefile 2010-02-23 20:15:28 UTC (rev 8773) @@ -27,6 +27,8 @@ UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=1645 UPSTREAM_USE_SF = 1 +LICENSE_CSWswig = LICENSE + RUNTIME_DEP_PKGS = CSWzlib #SWIG doesn't DEPEND on the languages it supports being installed @@ -55,7 +57,6 @@ CHECKPKG_OVERRIDES_CSWswig += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWswig += missing-dependency|CSWruby CHECKPKG_OVERRIDES_CSWswig += missing-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWswig += license-missing include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Feb 23 23:03:03 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 23 Feb 2010 22:03:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[8774] csw/mgar/pkg/autossh/trunk Message-ID: Revision: 8774 http://gar.svn.sourceforge.net/gar/?rev=8774&view=rev Author: skayser Date: 2010-02-23 22:03:03 +0000 (Tue, 23 Feb 2010) Log Message: ----------- autossh: ship pre-formatted man page, move revision string, update changelog.CSW Modified Paths: -------------- csw/mgar/pkg/autossh/trunk/Makefile csw/mgar/pkg/autossh/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/autossh/trunk/files/autossh.1 csw/mgar/pkg/autossh/trunk/files/autossh.1.txt Modified: csw/mgar/pkg/autossh/trunk/Makefile =================================================================== --- csw/mgar/pkg/autossh/trunk/Makefile 2010-02-23 20:15:28 UTC (rev 8773) +++ csw/mgar/pkg/autossh/trunk/Makefile 2010-02-23 22:03:03 UTC (rev 8774) @@ -1,12 +1,10 @@ -# Todo -# * man page doesn't propely format on Solaris. Upstream notified on +# TODO (release-critical prefixed with !, non release-critical with *) +# * man page doesn't properly format on Solaris. Upstream notified on # 2009-06-24, intends to work on it, has access to his own Solaris # box. In case of a new upstream version, verify whether man page -# formats properly (right now no formatting works, no paragraphs -# no headings, no nothing). +# formats properly (for now see install-preformatted-manpage: below). GARNAME = autossh -GARVERSION = 1.4 -RELEASE = b +GARVERSION = 1.4b CATEGORIES = net DESCRIPTION = Automatically restart SSH sessions and tunnels @@ -16,16 +14,12 @@ rstunnel (Reliable SSH Tunnel), but implemented in C. endef +VENDOR_URL = http://www.harding.motd.ca/autossh/ MASTER_SITES = http://www.harding.motd.ca/autossh/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz -# We need to move the "b" in version to the end to make it -# pkg-get compatible. -DISTVERSION = $(GARVERSION)$(RELEASE) -DISTNAME = $(GARNAME)-$(DISTVERSION) -DISTFILES = $(DISTNAME).tgz - TEST_SCRIPTS = -INSTALL_SCRIPTS = custom +INSTALL_SCRIPTS = custom preformatted-manpage CONFIGURE_ARGS = $(DIRPATHS) NORUNPATH = 1 @@ -35,24 +29,30 @@ include gar/category.mk -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_$(RELEASE) - -# Makefile doesn't honor $(DESTDIR) so we have to do it manually +# Makefile install target doesn't honor $(DESTDIR) so we install manually install-custom: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) install-custom: DOCS=CHANGES README install-custom: - @ginstall -d $(DESTDIR)$(bindir) - @ginstall -d $(DESTDIR)$(prefix)/libexec/autossh - @ginstall -d $(DESTDIR)$(mandir)/man1 - @ginstall -d $(DOCDEST) - @ginstall -d $(DOCDEST)/examples + ginstall -d $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(prefix)/libexec/autossh + ginstall -d $(DOCDEST) + ginstall -d $(DOCDEST)/examples - @ginstall -m 755 $(FILEDIR)/autossh $(DESTDIR)$(bindir) - @cp $(WORKSRC)/autossh $(DESTDIR)$(prefix)/libexec/autossh - @cp $(FILEDIR)/autossh.1 $(DESTDIR)$(mandir)/man1 - @cp $(FILEDIR)/autossh.1.txt $(DOCDEST) - @cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) - @cp $(addprefix $(WORKSRC)/,autossh.host rscreen) $(DOCDEST)/examples - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) + ginstall -m 755 $(FILEDIR)/autossh $(DESTDIR)$(bindir)/autossh + cp $(WORKSRC)/autossh $(DESTDIR)$(prefix)/libexec/autossh + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) + cp $(addprefix $(WORKSRC)/,autossh.host rscreen) $(DOCDEST)/examples + cp $(FILEDIR)/changelog.CSW $(DOCDEST) @$(MAKECOOKIE) + +# The autossh man page comes with macros from the mdoc macro package which +# Solaris man doesn't handle by default. As a workaround we ship a pre- +# formatted man page as catman page. For some background see +# http://www.opencsw.org/mantis/view.php?id=4280 +# or the very enlightening roff(7) introduction to the whole roff stack. +install-preformatted-manpage: + ginstall -d $(DESTDIR)$(mandir)/catman1 + groff -m doc -Tascii -P-cuob $(WORKSRC)/autossh.1 > \ + $(DESTDIR)$(mandir)/catman1/autossh.1 + @$(MAKECOOKIE) Deleted: csw/mgar/pkg/autossh/trunk/files/autossh.1 =================================================================== --- csw/mgar/pkg/autossh/trunk/files/autossh.1 2010-02-23 20:15:28 UTC (rev 8773) +++ csw/mgar/pkg/autossh/trunk/files/autossh.1 2010-02-23 22:03:03 UTC (rev 8774) @@ -1,14 +0,0 @@ -.TH "autossh" "1" "Jun 2009" "" "" - -.PP -.SH "Please note" - -.PP -The upstream \fBautossh\fP man page currently doesn't display properly on Solaris -systems. For the time being, you can find the preformatted man page content under - -.PP -/opt/csw/share/doc/autossh/autossh.1.txt - -.PP -Use a pager of your choice (less, more, ...) to display it. Deleted: csw/mgar/pkg/autossh/trunk/files/autossh.1.txt =================================================================== --- csw/mgar/pkg/autossh/trunk/files/autossh.1.txt 2010-02-23 20:15:28 UTC (rev 8773) +++ csw/mgar/pkg/autossh/trunk/files/autossh.1.txt 2010-02-23 22:03:03 UTC (rev 8774) @@ -1,207 +0,0 @@ -AUTOSSH(1) BSD General Commands Manual AUTOSSH(1) - -NAME - autossh - monitor and restart ssh sessions - -SYNOPSIS - autossh [-V] [-M port[:echo_port]] [-f] [SSH_OPTIONS] - -DESCRIPTION - autossh is a program to start a copy of ssh and monitor it, restarting it - as necessary should it die or stop passing traffic. - - The original idea and the mechanism were from rstunnel (Reliable SSH Tun- - nel). With version 1.2 of autossh the method changed: autossh uses ssh to - construct a loop of ssh forwardings (one from local to remote, one from - remote to local), and then sends test data that it expects to get back. - (The idea is thanks to Terrence Martin.) - - With version 1.3, a new method is added (thanks to Ron Yorston): a port - may be specified for a remote echo service that will echo back the test - data. This avoids the congestion and the aggravation of making sure all - the port numbers on the remote machine do not collide. The loop-of -for- - wardings method remains available for situations where using an echo ser- - vice may not be possible. - -CONTROLLING SSH - SSH exits - autossh tries to distinguish the manner of death of the ssh process it is - monitoring and act appropriately. The rules are: - - 1. If the ssh process exited normally (for example, someone typed - "exit" in an interactive session), autossh exits rather than - restarting; - - 2. If autossh itself receives a SIGTERM, SIGINT, or a SIGKILL sig- - nal, it assumes that it was deliberately signalled, and exits - after killing the child ssh process; - - 3. If autossh itself receives a SIGUSR1 signal, it kills the child - ssh process and starts a new one; - - 4. Periodically (by default every 10 minutes), autossh attempts to - pass traffic on the monitor forwarded port. If this fails, - autossh will kill the child ssh process (if it is still running) - and start a new one; - - 5. If the child ssh process dies for any other reason, autossh will - attempt to start a new one. - - Startup behaviour - If the ssh session fails with an exit status of 1 on the very first try, - autossh - - 1. will assume that there is some problem with syntax or the connec- - tion setup, and will exit rather than retrying; - - 2. There is a "starting gate" time. If the first ssh process fails - within the first few seconds of being started, autossh assumes - that it never made it "out of the starting gate", and exits. This - is to handle initial failed authentication, connection, etc. This - time is 30 seconds by default, and can be adjusted (see the - AUTOSSH_GATETIME environment variable below). If AUTOSSH_GATETIME - is set to 0, then both behaviours are disabled: there is no - "starting gate", and autossh will restart even if ssh fails on - the first run with an exit status of 1. - - Continued failures - If the ssh connection fails and attempts to restart it fail in quick suc- - cession, autossh will start delaying its attempts to restart, gradually - backing farther and farther off up to a maximum interval of the autossh - poll time (usually 10 minutes). autossh can be "prodded" to retry by - signalling it, perhaps with SIGHUP ("kill -HUP"). - - Connection setup - As connections must be established unattended, the use of autossh - requires that some form of automatic authentication be set up. The use of - RSAAuthentication with ssh-agent is the recommended method. The example - wrapper script attempts to check if there is an agent running for the - current environment, and to start one if there isn't. - - It cannot be stressed enough that you must make sure ssh works on its - own, that you can set up the session you want before you try to run it - under autossh - - If you are tunnelling and using an older version of ssh that does not - support the -N flag, you should upgrade (your version has security - flaws). If you can't upgrade, you may wish to do as rstunnel does, and - give ssh a command to run, such as "sleep 99999999999". - -OPTIONS - -M port[:echo_port] - specifies the base monitoring port to use. Without the echo port, - this port and the port immediately above it ( port + 1) should be - something nothing else is using. autossh will send test data on - the base monitoring port, and receive it back on the port above. - For example, if you specify "-M 20000", autossh will set up for- - wards so that it can send data on port 20000 and receive it back - on 20001. - - Alternatively, a port for a remote echo service may be specified. - This should be port 7 if you wish to use the standard inetd echo - service. When an echo port is specified, only the specified mon- - itor port is used, and it carries the monitor message in both - directions. - - Many people disable the echo service, or even disable inetd, so - check that this service is available on the remote machine. Some - operating systems allow one to specify that the service only lis- - ten on the localhost (loopback interface), which would suffice - for this use. - - The echo service may also be something more complicated: perhaps - a daemon that monitors a group of ssh tunnels. - - Setting the monitor port to 0 turns the monitoring function off, - and autossh will only restart ssh upon ssh's exit. For example, - if you are using a recent version of OpenSSH, you may wish to - explore using the ServerAliveInterval and ServerAliveCountMax - options to have the SSH client exit if it finds itself no longer - connected to the server. In many ways this may be a better solu- - tion than the monitoring port. - - -f causes autossh to drop to the background before running ssh. The - -f flag is stripped from arguments passed to ssh. Note that there - is a crucial a difference between -f with autossh, and -f with - ssh: when used with autossh ssh will be unable to ask for pass- - words or passphrases. - - -V causes autossh to display its version number and exit. - -ENVIRONMENT - Other than the flag to set the connection monitoring port, autossh uses - environment variables to control features. ssh seems to be still collect- - ing letters for options, and this seems the easiest way to avoid colli- - sions. - - AUTOSSH_DEBUG - If this variable is set, the logging level is set to to - LOG_DEBUG, and if the operating system supports it, syslog is set - to duplicate log entries to stderr. - - AUTOSSH_FIRST_POLL - Specifies the time to wait before the first connection test. - Thereafter the general poll time is used (see AUTOSSH_POLL - below). - - AUTOSSH_GATETIME - Specifies how long ssh must be up before we consider it a suc- - cessful connection. The default is 30 seconds. Note that if - AUTOSSH_GATETIME is set to 0, then not only is the gatetime - behaviour turned off, but autossh also ignores the first run - failure of ssh. This may be useful when running autossh at boot. - - AUTOSSH_LOGLEVEL - Specifies the log level, corresponding to the levels used by sys- - log; so 0-7 with 7 being the chattiest. - - AUTOSSH_LOGFILE - Specifies that autossh should use the named log file, rather than - syslog. - - AUTOSSH_MAXLIFETIME - Sets the maximum number of seconds that the program should run. - Once the number of seconds has been passed, the ssh child will be - killed and the program will exit. - - AUTOSSH_MAXSTART - Specifies how many times ssh should be started. A negative number - means no limit on the number of times ssh is started. The default - value is -1. - - AUTOSSH_MESSAGE - Append message to echo message sent when testing connections. - - AUTOSSH_NTSERVICE - (Cygwin only.) When set to "yes" , autossh sets up to run as an - NT service under cygrunsrv. This adds the -N flag for ssh if not - already set, sets the log output to stdout, and changes the - behaviour on ssh exit so that it will restart even on a normal - exit. - - AUTOSSH_PATH - Specifies the path to the ssh executable, in case it is different - than the path compiled in. - - AUTOSSH_PIDFILE - Write autossh pid to specified file. - - AUTOSSH_POLL - Specifies the connection poll time in seconds; default is 600 - seconds. If the poll time is less than twice the network time- - outs (default 15 seconds) the network timeouts will be adjusted - downward to 1/2 the poll time. - - AUTOSSH_PORT - Sets the connection monitoring port. Mostly in case ssh appropri- - ates -M at some time. But because of this possible use, - AUTOSSH_PORT overrides the -M flag. A value of 0 turns the moni- - toring function off. - -AUTHOR - autossh was written by Carson Harding. - -SEE ALSO - ssh(1), ssh-add(1), ssh-agent(1), ssh-keygen(1), cygrunsrv(1). - -BSD Jul 20, 2004 BSD Modified: csw/mgar/pkg/autossh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/autossh/trunk/files/changelog.CSW 2010-02-23 20:15:28 UTC (rev 8773) +++ csw/mgar/pkg/autossh/trunk/files/changelog.CSW 2010-02-23 22:03:03 UTC (rev 8774) @@ -1,3 +1,11 @@ +autossh (1.4b,REV=2010.02.23) + + * Merged version suffix into package version. (Closes #4003) + * Package now ships with a preformatted autossh.1 catman page so + that "man autossh" works with Solaris nroff. + + -- Sebastian Kayser Tue, 23 Feb 2010 21:01:41 +0100 + autossh (1.4b,REV=2009.06.25) * Initial release. 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 Feb 23 23:33:31 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 23 Feb 2010 22:33:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[8775] csw/mgar/pkg/autossh/trunk/Makefile Message-ID: Revision: 8775 http://gar.svn.sourceforge.net/gar/?rev=8775&view=rev Author: skayser Date: 2010-02-23 22:33:31 +0000 (Tue, 23 Feb 2010) Log Message: ----------- autossh: add override for missing license Modified Paths: -------------- csw/mgar/pkg/autossh/trunk/Makefile Modified: csw/mgar/pkg/autossh/trunk/Makefile =================================================================== --- csw/mgar/pkg/autossh/trunk/Makefile 2010-02-23 22:03:03 UTC (rev 8774) +++ csw/mgar/pkg/autossh/trunk/Makefile 2010-02-23 22:33:31 UTC (rev 8775) @@ -3,6 +3,8 @@ # 2009-06-24, intends to work on it, has access to his own Solaris # box. In case of a new upstream version, verify whether man page # formats properly (for now see install-preformatted-manpage: below). +# * DESTDIR and --with-ssh handling could be fixed. See the Debian +# patch tracker: http://patch-tracker.debian.org/package/autossh/1.4b-1 GARNAME = autossh GARVERSION = 1.4b CATEGORIES = net @@ -27,6 +29,9 @@ # --with-ssh=/usr/bin/ssh doesn't work -> checking for ssh... /opt/csw/bin/ssh BUILD_ARGS = 'SSH=/usr/bin/ssh' +# autossh doesn't ship a license and can't find one on $VENDOR_URL either +CHECKPKG_OVERRIDES_CSWautossh += license-missing + include gar/category.mk # Makefile install target doesn't honor $(DESTDIR) so we install manually 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 Feb 24 10:14:59 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Feb 2010 09:14:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8776] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 8776 http://gar.svn.sourceforge.net/gar/?rev=8776&view=rev Author: dmichelsen Date: 2010-02-24 09:14:59 +0000 (Wed, 24 Feb 2010) Log Message: ----------- mGAR v2: Fix typo Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2010-02-23 22:33:31 UTC (rev 8775) +++ csw/mgar/gar/v2/gar.lib.mk 2010-02-24 09:14:59 UTC (rev 8776) @@ -568,12 +568,12 @@ # Run tests on pre-built sources test-%/Makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/GNUmakefile: 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 Feb 24 11:01:29 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Feb 2010 10:01:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8777] csw/mgar/pkg/xz/trunk/Makefile Message-ID: Revision: 8777 http://gar.svn.sourceforge.net/gar/?rev=8777&view=rev Author: dmichelsen Date: 2010-02-24 10:01:28 +0000 (Wed, 24 Feb 2010) Log Message: ----------- xz: Minor fixes Modified Paths: -------------- csw/mgar/pkg/xz/trunk/Makefile Modified: csw/mgar/pkg/xz/trunk/Makefile =================================================================== --- csw/mgar/pkg/xz/trunk/Makefile 2010-02-24 09:14:59 UTC (rev 8776) +++ csw/mgar/pkg/xz/trunk/Makefile 2010-02-24 10:01:28 UTC (rev 8777) @@ -13,20 +13,15 @@ MASTER_SITES = http://tukaani.org/xz/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -#RUNTIME_DEP_PKGS = CSWgcc3core CSWgcc3corert CSWgcc4corert CSWggettextrt -RUNTIME_DEP_PKGS = CSWgcc4corert CSWggettextrt +RUNTIME_DEP_PKGS = CSWggettextrt CSWgcc4corert # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - GARCOMPILER = GNU CONFIGURE_ARGS = $(DIRPATHS) # not able to figure out which target runs the tests in "tests" -TEST_TARGET = +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 Wed Feb 24 11:33:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Feb 2010 10:33:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8778] csw/mgar/pkg/lzo/trunk/Makefile Message-ID: Revision: 8778 http://gar.svn.sourceforge.net/gar/?rev=8778&view=rev Author: dmichelsen Date: 2010-02-24 10:33:22 +0000 (Wed, 24 Feb 2010) Log Message: ----------- lzo: Enable dynamic libs Modified Paths: -------------- csw/mgar/pkg/lzo/trunk/Makefile Modified: csw/mgar/pkg/lzo/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzo/trunk/Makefile 2010-02-24 10:01:28 UTC (rev 8777) +++ csw/mgar/pkg/lzo/trunk/Makefile 2010-02-24 10:33:22 UTC (rev 8778) @@ -17,5 +17,6 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared --disable-static 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 Feb 24 11:33:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Feb 2010 10:33:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8779] csw/mgar/pkg/zutils/trunk/Makefile Message-ID: Revision: 8779 http://gar.svn.sourceforge.net/gar/?rev=8779&view=rev Author: dmichelsen Date: 2010-02-24 10:33:54 +0000 (Wed, 24 Feb 2010) Log Message: ----------- zutils: Add link to allow testsuite to run after renaming binaries Modified Paths: -------------- csw/mgar/pkg/zutils/trunk/Makefile Modified: csw/mgar/pkg/zutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/zutils/trunk/Makefile 2010-02-24 10:33:22 UTC (rev 8778) +++ csw/mgar/pkg/zutils/trunk/Makefile 2010-02-24 10:33:54 UTC (rev 8779) @@ -41,3 +41,7 @@ EXTRA_PAX_ARGS = -s ",/z,/Z,p" include gar/category.mk + +post-extract-modulated: + -gln -s zutils $(WORKSRC)/Zutils + @$(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 Wed Feb 24 11:46:15 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Feb 2010 10:46:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[8780] csw/mgar/pkg/xz/trunk/Makefile Message-ID: Revision: 8780 http://gar.svn.sourceforge.net/gar/?rev=8780&view=rev Author: dmichelsen Date: 2010-02-24 10:46:15 +0000 (Wed, 24 Feb 2010) Log Message: ----------- xz: Add workaround from Ruperts bug report Modified Paths: -------------- csw/mgar/pkg/xz/trunk/Makefile Modified: csw/mgar/pkg/xz/trunk/Makefile =================================================================== --- csw/mgar/pkg/xz/trunk/Makefile 2010-02-24 10:33:54 UTC (rev 8779) +++ csw/mgar/pkg/xz/trunk/Makefile 2010-02-24 10:46:15 UTC (rev 8780) @@ -21,6 +21,10 @@ GARCOMPILER = GNU CONFIGURE_ARGS = $(DIRPATHS) +# Workaround for reported bug: +# +CONFIGURE_ARGS += gl_cv_cc_visibility=no + # not able to figure out which target runs the tests in "tests" TEST_TARGET = check 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 Feb 24 11:54:07 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Feb 2010 10:54:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[8781] csw/mgar/pkg/lzo/trunk/Makefile Message-ID: Revision: 8781 http://gar.svn.sourceforge.net/gar/?rev=8781&view=rev Author: dmichelsen Date: 2010-02-24 10:53:59 +0000 (Wed, 24 Feb 2010) Log Message: ----------- lzo: Disable non-functioning assembler optiomizations for amd64 and the testsuite falsely expects the optimizations to be there Modified Paths: -------------- csw/mgar/pkg/lzo/trunk/Makefile Modified: csw/mgar/pkg/lzo/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzo/trunk/Makefile 2010-02-24 10:46:15 UTC (rev 8780) +++ csw/mgar/pkg/lzo/trunk/Makefile 2010-02-24 10:53:59 UTC (rev 8781) @@ -15,8 +15,11 @@ VENDOR_URL = http://www.oberhumer.com/opensource/lzo/ +CONFIGURE_ARGS_isa-amd64 = --disable-asm + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared --disable-static +CONFIGURE_ARGS += $(CONFIGURE_ARGS_isa-$(ISA)) 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 Wed Feb 24 13:52:17 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 24 Feb 2010 12:52:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8782] csw/mgar/pkg/scponly/trunk Message-ID: Revision: 8782 http://gar.svn.sourceforge.net/gar/?rev=8782&view=rev Author: skayser Date: 2010-02-24 12:52:17 +0000 (Wed, 24 Feb 2010) Log Message: ----------- scponly: minor edits (intended to work on it, but well ...) Modified Paths: -------------- csw/mgar/pkg/scponly/trunk/Makefile csw/mgar/pkg/scponly/trunk/checksums Modified: csw/mgar/pkg/scponly/trunk/Makefile =================================================================== --- csw/mgar/pkg/scponly/trunk/Makefile 2010-02-24 10:53:59 UTC (rev 8781) +++ csw/mgar/pkg/scponly/trunk/Makefile 2010-02-24 12:52:17 UTC (rev 8782) @@ -4,19 +4,15 @@ DESCRIPTION = A Restricted Shell define BLURB -scponly is an alternative 'shell' (of sorts) for system administrators who would like to provide access to remote users to both read and write local files without providing any remote execution priviledges. + scponly is an alternative 'shell' (of sorts) for system administrators + who would like to provide access to remote users to both read and write + local files without providing any remote execution priviledges. endef +VENDOR_URL = http://sublimation.org/scponly/ MASTER_SITES = $(SF_MIRROR) -DISTFILES = $(GARNAME)-$(GARVERSION).tgz +DISTFILES = $(GARNAME)-$(GARVERSION).tgz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/scponly/trunk/checksums =================================================================== --- csw/mgar/pkg/scponly/trunk/checksums 2010-02-24 10:53:59 UTC (rev 8781) +++ csw/mgar/pkg/scponly/trunk/checksums 2010-02-24 12:52:17 UTC (rev 8782) @@ -1 +1 @@ -139ac9abd7f3b8dbc5c5520745318f8a download/scponly-4.8.tgz +139ac9abd7f3b8dbc5c5520745318f8a scponly-4.8.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Feb 24 14:15:57 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 24 Feb 2010 13:15:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8783] csw/mgar/pkg/tmpreaper/trunk Message-ID: Revision: 8783 http://gar.svn.sourceforge.net/gar/?rev=8783&view=rev Author: skayser Date: 2010-02-24 13:15:57 +0000 (Wed, 24 Feb 2010) Log Message: ----------- tmpreaper: minor edits Modified Paths: -------------- csw/mgar/pkg/tmpreaper/trunk/Makefile csw/mgar/pkg/tmpreaper/trunk/files/changelog.CSW Modified: csw/mgar/pkg/tmpreaper/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmpreaper/trunk/Makefile 2010-02-24 12:52:17 UTC (rev 8782) +++ csw/mgar/pkg/tmpreaper/trunk/Makefile 2010-02-24 13:15:57 UTC (rev 8783) @@ -15,9 +15,9 @@ enabling it to. endef -SPKG_SOURCEURL = http://packages.debian.org/sid/tmpreaper +VENDOR_URL = http://packages.debian.org/sid/tmpreaper MASTER_SITES = http://ftp.de.debian.org/debian/pool/main/t/tmpreaper/ -DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.gz TEST_SCRIPTS = Modified: csw/mgar/pkg/tmpreaper/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/tmpreaper/trunk/files/changelog.CSW 2010-02-24 12:52:17 UTC (rev 8782) +++ csw/mgar/pkg/tmpreaper/trunk/files/changelog.CSW 2010-02-24 13:15:57 UTC (rev 8783) @@ -1,6 +1,6 @@ -tmpreaper (1.6.13,REV=2009.10.03) +tmpreaper (1.6.13,REV=2010.02.24) * Adopted and updated to 1.6.13 * Added README.CSW with crontab example. - -- Sebastian Kayser Sat, 3 Oct 2009 23:49:33 +0200 + -- Sebastian Kayser Wed, 24 Feb 2010 14:15:16 +0100 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 Feb 24 14:38:09 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Feb 2010 13:38:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8784] csw/mgar/pkg/xz/trunk/Makefile Message-ID: Revision: 8784 http://gar.svn.sourceforge.net/gar/?rev=8784&view=rev Author: dmichelsen Date: 2010-02-24 13:38:09 +0000 (Wed, 24 Feb 2010) Log Message: ----------- xz: Split off legacy lzma package Modified Paths: -------------- csw/mgar/pkg/xz/trunk/Makefile Modified: csw/mgar/pkg/xz/trunk/Makefile =================================================================== --- csw/mgar/pkg/xz/trunk/Makefile 2010-02-24 13:15:57 UTC (rev 8783) +++ csw/mgar/pkg/xz/trunk/Makefile 2010-02-24 13:38:09 UTC (rev 8784) @@ -13,19 +13,35 @@ MASTER_SITES = http://tukaani.org/xz/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -RUNTIME_DEP_PKGS = CSWggettextrt CSWgcc4corert - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -GARCOMPILER = GNU +PACKAGES = CSWxz CSWlzma + +CATALOGNAME_CSWxz = xz +CATALOGNAME_CSWlzma = lzma + +SPKG_DESC_CSWxz = $(DESCRIPTION) +SPKG_DESC_CSWlzma = Stub to the successor xz + +RUNTIME_DEP_PKGS_CSWxz = CSWggettextrt CSWgcc4corert +RUNTIME_DEP_PKGS_CSWlzma = CSWxz + +GARCOMPILER = GNU + +BUILD64 = 1 +NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) # Workaround for reported bug: # CONFIGURE_ARGS += gl_cv_cc_visibility=no +MERGE_DIRS_isa-extra = $(libdir) + # not able to figure out which target runs the tests in "tests" TEST_TARGET = check +PKGFILES_CSWlzma = NOMATCH + 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 Feb 24 14:40:21 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Feb 2010 13:40:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8785] csw/mgar/pkg/xz/trunk/Makefile Message-ID: Revision: 8785 http://gar.svn.sourceforge.net/gar/?rev=8785&view=rev Author: dmichelsen Date: 2010-02-24 13:40:21 +0000 (Wed, 24 Feb 2010) Log Message: ----------- xz: Make legacy lzma ARCHALL as it is a stub Modified Paths: -------------- csw/mgar/pkg/xz/trunk/Makefile Modified: csw/mgar/pkg/xz/trunk/Makefile =================================================================== --- csw/mgar/pkg/xz/trunk/Makefile 2010-02-24 13:38:09 UTC (rev 8784) +++ csw/mgar/pkg/xz/trunk/Makefile 2010-02-24 13:40:21 UTC (rev 8785) @@ -42,6 +42,7 @@ # not able to figure out which target runs the tests in "tests" TEST_TARGET = check +ARCHALL_CSWlzma = 1 PKGFILES_CSWlzma = NOMATCH 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 Feb 24 14:47:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Feb 2010 13:47:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8786] csw/mgar/pkg/doxygen/trunk/Makefile Message-ID: Revision: 8786 http://gar.svn.sourceforge.net/gar/?rev=8786&view=rev Author: dmichelsen Date: 2010-02-24 13:47:16 +0000 (Wed, 24 Feb 2010) Log Message: ----------- doxygen: Move from legacy CSWgraphviz2 to CSWgraphviz package Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2010-02-24 13:40:21 UTC (rev 8785) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2010-02-24 13:47:16 UTC (rev 8786) @@ -27,12 +27,12 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).src.tar.gz UPSTREAM_MASTER_SITES = $(SPKG_SOURCEURL) -BUILD_DEP_PKGS = CSWgraphviz2 +BUILD_DEP_PKGS = CSWgraphviz CONFIGURE_ARGS = --prefix $(prefix) CONFIGURE_ARGS += --release CONFIGURE_ARGS += --docdir $(docdir)/doxygen -CONFIGURE_ARGS += --dot /opt/csw/graphviz2/bin/dot +CONFIGURE_ARGS += --dot /opt/csw/bin/dot CONFIGURE_ARGS += --platform solaris-cc TEST_SCRIPTS = 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 Feb 24 15:21:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Feb 2010 14:21:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[8787] csw/mgar/pkg/xz/trunk Message-ID: Revision: 8787 http://gar.svn.sourceforge.net/gar/?rev=8787&view=rev Author: dmichelsen Date: 2010-02-24 14:21:56 +0000 (Wed, 24 Feb 2010) Log Message: ----------- xz: Disable broken assembler optimizations on amd64 Modified Paths: -------------- csw/mgar/pkg/xz/trunk/Makefile csw/mgar/pkg/xz/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xz/trunk/files/0001-Do-not-force-inclusion-of-stdint.h.patch Modified: csw/mgar/pkg/xz/trunk/Makefile =================================================================== --- csw/mgar/pkg/xz/trunk/Makefile 2010-02-24 13:47:16 UTC (rev 8786) +++ csw/mgar/pkg/xz/trunk/Makefile 2010-02-24 14:21:56 UTC (rev 8787) @@ -12,6 +12,7 @@ MASTER_SITES = http://tukaani.org/xz/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Do-not-force-inclusion-of-stdint.h.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -31,7 +32,12 @@ BUILD64 = 1 NOISAEXEC = 1 + +# Assembler integration broken in amd64 +CONFIGURE_ARGS_isa-amd64 = --disable-assembler + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_isa-$(ISA)) # Workaround for reported bug: # Modified: csw/mgar/pkg/xz/trunk/checksums =================================================================== --- csw/mgar/pkg/xz/trunk/checksums 2010-02-24 13:47:16 UTC (rev 8786) +++ csw/mgar/pkg/xz/trunk/checksums 2010-02-24 14:21:56 UTC (rev 8787) @@ -1 +1,2 @@ +013b623b0f4f46adf992e44123cec1bc 0001-Do-not-force-inclusion-of-stdint.h.patch f2073579b6da2fe35d453adee1aaf1b2 xz-4.999.9beta.tar.gz Added: csw/mgar/pkg/xz/trunk/files/0001-Do-not-force-inclusion-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/xz/trunk/files/0001-Do-not-force-inclusion-of-stdint.h.patch (rev 0) +++ csw/mgar/pkg/xz/trunk/files/0001-Do-not-force-inclusion-of-stdint.h.patch 2010-02-24 14:21:56 UTC (rev 8787) @@ -0,0 +1,25 @@ +From 5424924f8c92878e914f5ec5c9bfd00915cf439a Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 24 Feb 2010 14:58:17 +0100 +Subject: [PATCH] Do not force inclusion of stdint.h + +--- + src/common/sysdefs.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/common/sysdefs.h b/src/common/sysdefs.h +index fbc9176..f413863 100644 +--- a/src/common/sysdefs.h ++++ b/src/common/sysdefs.h +@@ -34,7 +34,7 @@ + // C99 says that inttypes.h always includes stdint.h, but some systems + // don't do that, and require including stdint.h separately. + #ifdef HAVE_STDINT_H +-# include ++/* # include */ + #endif + + // Some pre-C99 systems have SIZE_MAX in limits.h instead of stdint.h. The +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Feb 24 15:37:23 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Feb 2010 14:37:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8788] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 8788 http://gar.svn.sourceforge.net/gar/?rev=8788&view=rev Author: dmichelsen Date: 2010-02-24 14:37:22 +0000 (Wed, 24 Feb 2010) Log Message: ----------- cyrus_imapd: Add explicit linkage to libperl.so to fix #3766 Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cyrus_imapd/trunk/files/0001-Force-linkage-to-libperl.so.patch Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2010-02-24 14:21:56 UTC (rev 8787) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2010-02-24 14:37:22 UTC (rev 8788) @@ -92,6 +92,10 @@ # we restore the previous default value to avoid upgrade problem PATCHFILES += restore_allowplaintext_default.patch +# Make sure the module is self contained. This fixes bug +# +PATCHFILES += 0001-Force-linkage-to-libperl.so.patch + #GARCOMPILER = GNU #GNU_CC_OPT = -g #GNU_LD_OPT = -g Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2010-02-24 14:21:56 UTC (rev 8787) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2010-02-24 14:37:22 UTC (rev 8788) @@ -1,3 +1,4 @@ +c86246806025404625c98a2348d0739d 0001-Force-linkage-to-libperl.so.patch 585646739e9403c02e868900ebed892a CSWcyrusimapd.checkinstall 5111a5573aa6d4878b852780aeae8a27 CSWcyrusimapd.preinstall 940d00efcc42b92f05e92e6dd2764f61 CSWcyrusimapd.prototype Added: csw/mgar/pkg/cyrus_imapd/trunk/files/0001-Force-linkage-to-libperl.so.patch =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/0001-Force-linkage-to-libperl.so.patch (rev 0) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/0001-Force-linkage-to-libperl.so.patch 2010-02-24 14:37:22 UTC (rev 8788) @@ -0,0 +1,39 @@ +From 46de9238dc1925a468812b315e9095600279c33f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 24 Feb 2010 15:17:57 +0100 +Subject: [PATCH] Force linkage to libperl.so + +--- + perl/imap/Makefile.PL | 2 +- + perl/sieve/managesieve/Makefile.PL | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/perl/imap/Makefile.PL b/perl/imap/Makefile.PL +index 27ae4ca..ea8080f 100644 +--- a/perl/imap/Makefile.PL ++++ b/perl/imap/Makefile.PL +@@ -65,7 +65,7 @@ WriteMakefile( + 'clean' => {'FILES' => 'libcyrperl.a cyradm'}, + 'OBJECT' => 'IMAP.o', + 'MYEXTLIB' => '../../lib/libcyrus.a ../../lib/libcyrus_min.a', +- 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto"], ++ 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto -lperl"], + 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING' + 'INC' => "-I../../lib -I../.. -I../../com_err/et $SASL_INC $OPENSSL_INC", + 'EXE_FILES' => [cyradm], +diff --git a/perl/sieve/managesieve/Makefile.PL b/perl/sieve/managesieve/Makefile.PL +index b577f4c..a32ffb8 100644 +--- a/perl/sieve/managesieve/Makefile.PL ++++ b/perl/sieve/managesieve/Makefile.PL +@@ -62,7 +62,7 @@ WriteMakefile( + 'ABSTRACT' => 'Cyurs Sieve management interface', + 'VERSION_FROM' => 'managesieve.pm', # finds $VERSION + 'MYEXTLIB' => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a', +- 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto"], ++ 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto -lperl"], + 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING' + 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC", + ); +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Feb 24 15:50:19 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Feb 2010 14:50:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8789] csw/mgar/pkg/mpeg4ip/tags/legacy/ mpeg4ip-build-script Message-ID: Revision: 8789 http://gar.svn.sourceforge.net/gar/?rev=8789&view=rev Author: dmichelsen Date: 2010-02-24 14:50:19 +0000 (Wed, 24 Feb 2010) Log Message: ----------- mpeg4ip: Add legacy build script Added Paths: ----------- csw/mgar/pkg/mpeg4ip/tags/legacy/mpeg4ip-build-script Added: csw/mgar/pkg/mpeg4ip/tags/legacy/mpeg4ip-build-script =================================================================== --- csw/mgar/pkg/mpeg4ip/tags/legacy/mpeg4ip-build-script (rev 0) +++ csw/mgar/pkg/mpeg4ip/tags/legacy/mpeg4ip-build-script 2010-02-24 14:50:19 UTC (rev 8789) @@ -0,0 +1,73 @@ +# vim: ft=perl + +$email = 'mjensen at opencsw.org'; + +$progname = 'mpeg4ip'; +$version = '1.6.1'; + +$buildroot = "${builddir}/${progname}-${version}-buildroot"; + +$category = 'system'; +$vendor = 'http://mpeg4ip.sourceforge.net/ packaged for CSW by Murray Jensen'; + + at sources = ("${progname}-${version}.tar.gz"); +$prepatch = <<"EOF"; + set -e + mv ${progname} ${progname}-${version} + rm -f ${progname}-${version}/Makefile +EOF + at patches = (["${progname}-${version}-mjj.patch", "${progname}-${version}", '-p1']); + + at packages = ({ + pkgname => "${progname}lib", + filename => "${progname}_lib", + name => "${progname}_lib - an end-to-end system to explore streaming multimedia - headers and libraries", + dependencies => ['CSWcommon','CSWgcc3g++rt'], + filelist => [qw(opt/csw/bin/mpeg4ip-config opt/csw/include opt/csw/lib opt/csw/share/man/man3 \! -wholename \*/mp4player_plugin\*)] + }, + { + pkgname => "${progname}", + filename => "${progname}", + name => "${progname} - an end-to-end system to explore streaming multimedia - binaries", + dependencies => ['CSWcommon',"CSW${progname}lib",'CSWsdlmixer'], + filelist => [qw(opt/csw/bin opt/csw/lib/mp4player_plugin opt/csw/share/man/man1 \! -wholename \*/mpeg4ip-config \! -name mp4live.1)] + }); + +$copyright = "${progname}-${version}/COPYING"; + +$build = <<"EOF"; + +cd ${progname}-${version} + +compiler=gcc3 +nozdefs=true + +. ${RealBin}/mjj_setup + +## ignore forced bootstrap +#ac_cv_file___bootstrapped=yes; export ac_cv_file___bootstrapped +rm -f bootstrapped + +cfgflags="\ + --prefix=/opt/csw \ + --mandir=/opt/csw/share/man \ + --enable-shared \ + --disable-static \ + --enable-server \ + --enable-player \ + --enable-mp4live \ + --enable-ipv6 \ +" + +case `uname -p` in +sparc) cfgflags="\$cfgflags --disable-mmx" ;; +i386) cfgflags="\$cfgflags --enable-mmx" ;; +esac + +buildroot=${buildroot} +cfgmarker=_always_run_configure_ +cfgprogram=./cvs_bootstrap + +. ${RealBin}/mjj_build + +EOF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Feb 24 16:08:58 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 24 Feb 2010 15:08:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8790] csw/mgar/gar/v2 Message-ID: Revision: 8790 http://gar.svn.sourceforge.net/gar/?rev=8790&view=rev Author: skayser Date: 2010-02-24 15:08:58 +0000 (Wed, 24 Feb 2010) Log Message: ----------- gar: reduce shell callouts to uname with immediate assignments Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-02-24 14:50:19 UTC (rev 8789) +++ csw/mgar/gar/v2/gar.conf.mk 2010-02-24 15:08:58 UTC (rev 8790) @@ -14,7 +14,7 @@ -include /etc/opt/csw/garrc -include /opt/csw/etc/garrc -THISHOST := $(shell uname -n) +THISHOST := $(shell /usr/bin/uname -n) # On these platforms packages are built. # They will include binaries for all ISAs that are specified for the platform. @@ -102,8 +102,8 @@ # Architecture GARCHLIST ?= sparc i386 -GARCH ?= $(shell uname -p) -GAROSREL ?= $(shell uname -r) +GARCH := $(if $(GARCH),$(GARCH),$(shell /usr/bin/uname -p)) +GAROSREL := $(if $(GAROSREL),$(GAROSREL),$(shell /usr/bin/uname -r)) # These are the standard directory name variables from all GNU Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-24 14:50:19 UTC (rev 8789) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-24 15:08:58 UTC (rev 8790) @@ -155,7 +155,7 @@ SPKG_PSTAMP ?= $(LOGNAME)@$(shell hostname)-$(call _REVISION)-$(shell date '+%Y%m%d%H%M%S') SPKG_BASEDIR ?= $(prefix) SPKG_CLASSES ?= none -SPKG_OSNAME ?= $(shell uname -s)$(shell uname -r) +SPKG_OSNAME := $(if $(SPKG_OSNAME),$(SPKG_OSNAME),$(shell /usr/bin/uname -s)$(shell /usr/bin/uname -r)) SPKG_SPOOLROOT ?= $(DESTROOT) SPKG_SPOOLDIR ?= $(SPKG_SPOOLROOT)/spool.$(GAROSREL)-$(GARCH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Feb 24 16:57:18 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 24 Feb 2010 15:57:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8791] csw/mgar/pkg Message-ID: Revision: 8791 http://gar.svn.sourceforge.net/gar/?rev=8791&view=rev Author: skayser Date: 2010-02-24 15:57:18 +0000 (Wed, 24 Feb 2010) Log Message: ----------- tmpwatch: initial commit Added Paths: ----------- csw/mgar/pkg/tmpwatch/ csw/mgar/pkg/tmpwatch/branches/ csw/mgar/pkg/tmpwatch/tags/ csw/mgar/pkg/tmpwatch/trunk/ csw/mgar/pkg/tmpwatch/trunk/Makefile csw/mgar/pkg/tmpwatch/trunk/checksums csw/mgar/pkg/tmpwatch/trunk/files/ csw/mgar/pkg/tmpwatch/trunk/files/0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch csw/mgar/pkg/tmpwatch/trunk/files/0002-tmpwatch.c-include-stpcpy.c.patch csw/mgar/pkg/tmpwatch/trunk/files/stpcpy.c Property changes on: csw/mgar/pkg/tmpwatch/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/tmpwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tmpwatch/trunk/Makefile 2010-02-24 15:57:18 UTC (rev 8791) @@ -0,0 +1,41 @@ +# TODO +# ! strtoimax implementation missing on Solaris 8/9 +# ! on repeated gmake build invocations (after build failures), only a subset of the +# environment is used, in particular CPPFLAGS/LDFLAGS are missing +GARNAME = tmpwatch +GARVERSION = 2.9.17 +CATEGORIES = apps + +DESCRIPTION = Removes files which haven't been accessed for a period of time +define BLURB + The tmpwatch utility recursively searches through specified directories + and removes files which have not been accessed in a specified period of + time. tmpwatch is normally used to clean up directories which are used + for temporarily holding files (for example, /tmp). +endef + +VENDOR_URL = https://fedorahosted.org/tmpwatch/ +MASTER_SITES = https://fedorahosted.org/releases/t/m/tmpwatch/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +# Taken from libgcrypt's stringhelp.c +DISTFILES += stpcpy.c + +# Tweak Makefile to honor environment variables +PATCHFILES = 0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch +# Include missing stpcpy() implementation +PATCHFILES += 0002-tmpwatch.c-include-stpcpy.c.patch + +CONFIGURE_SCRIPTS = +BUILD_ARGS = tmpwatch +TEST_SCRIPTS = + +# Link against our OpenCSW getopt lib which has getopt_long +EXTRA_LD_FLAGS = -lgnugetopt + +include gar/category.mk + +pre-build-modulated: + cp $(WORKDIR)/stpcpy.c $(WORKSRC) + @$(MAKECOOKIE) Added: csw/mgar/pkg/tmpwatch/trunk/checksums =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/checksums (rev 0) +++ csw/mgar/pkg/tmpwatch/trunk/checksums 2010-02-24 15:57:18 UTC (rev 8791) @@ -0,0 +1,4 @@ +9d3371e425a1214f59044487b2cf76b9 0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch +af1b38792e28777a049cbe4ca3dd2132 0002-tmpwatch.c-include-stpcpy.c.patch +6a89324536d839b75ceb2fbdac4bf255 stpcpy.c +7738f5db4ae0ce3795c224f13a597356 tmpwatch-2.9.17.tar.bz2 Added: csw/mgar/pkg/tmpwatch/trunk/files/0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/files/0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch (rev 0) +++ csw/mgar/pkg/tmpwatch/trunk/files/0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch 2010-02-24 15:57:18 UTC (rev 8791) @@ -0,0 +1,61 @@ +From a6bf87119784e5f4cf2ecfeab171e6b59ce725e1 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Wed, 24 Feb 2010 16:39:37 +0100 +Subject: [PATCH 1/2] Makefile: honor defaults and use DESTDIR instead of ROOT + +--- + Makefile | 24 +++++++++++++----------- + 1 files changed, 13 insertions(+), 11 deletions(-) + +diff --git a/Makefile b/Makefile +index cfb71dd..35297a3 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,9 @@ VERSION=2.9.17 + HGTAG = 'tmpwatch-$(VERSION)' + OS_NAME=$(shell uname -s) + +-CFLAGS=$(RPM_OPT_FLAGS) -W -Wall -DVERSION=\"$(VERSION)\" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE ++CFLAGS ?= $(RPM_OPT_FLAGS) -W -Wall ++CFLAGS += -DVERSION=\"$(VERSION)\" ++CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE + + ifeq ($(OS_NAME),HP-UX) + ROOT=/ +@@ -13,12 +15,12 @@ ifeq ($(OS_NAME),HP-UX) + CC=gcc + endif + ifeq ($(OS_NAME),SunOS) +- ROOT=/ +- PREFIX=/usr/local +- MANDIR=$(PREFIX)/man +- SBINDIR=$(PREFIX)/sbin +- INSTALL=./install-sh +- CC=gcc ++ DESTDIR?=/ ++ PREFIX?=/usr/local ++ MANDIR?=$(PREFIX)/man ++ SBINDIR?=$(PREFIX)/sbin ++ INSTALL?=./install-sh ++ CC?=gcc + endif + ifeq ($(OS_NAME),Linux) + ROOT=/ +@@ -31,10 +33,10 @@ endif + all: tmpwatch + + install: all +- [ -d $(ROOT)$(SBINDIR) ] || mkdir -p $(ROOT)$(SBINDIR) +- [ -d $(ROOT)$(MANDIR)/man8 ] || mkdir -p $(ROOT)$(MANDIR)/man8 +- $(INSTALL) -m 755 tmpwatch $(ROOT)$(SBINDIR)/tmpwatch +- $(INSTALL) -m 644 tmpwatch.8 $(ROOT)$(MANDIR)/man8/tmpwatch.8 ++ [ -d $(DESTDIR)$(SBINDIR) ] || mkdir -p $(DESTDIR)$(SBINDIR) ++ [ -d $(DESTDIR)$(MANDIR)/man8 ] || mkdir -p $(DESTDIR)$(MANDIR)/man8 ++ $(INSTALL) -m 755 tmpwatch $(DESTDIR)$(SBINDIR)/tmpwatch ++ $(INSTALL) -m 644 tmpwatch.8 $(DESTDIR)$(MANDIR)/man8/tmpwatch.8 + + clean: + rm -f tmpwatch +-- +1.6.6 + Added: csw/mgar/pkg/tmpwatch/trunk/files/0002-tmpwatch.c-include-stpcpy.c.patch =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/files/0002-tmpwatch.c-include-stpcpy.c.patch (rev 0) +++ csw/mgar/pkg/tmpwatch/trunk/files/0002-tmpwatch.c-include-stpcpy.c.patch 2010-02-24 15:57:18 UTC (rev 8791) @@ -0,0 +1,24 @@ +From a04d34c996c8f87f92f96243cd80dd54ff4a9a1a Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Wed, 24 Feb 2010 16:42:46 +0100 +Subject: [PATCH 2/2] tmpwatch.c: include stpcpy.c + +--- + tmpwatch.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/tmpwatch.c b/tmpwatch.c +index 4091013..a6b47a1 100644 +--- a/tmpwatch.c ++++ b/tmpwatch.c +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include "stpcpy.c" + #include + #include + #include +-- +1.6.6 + Added: csw/mgar/pkg/tmpwatch/trunk/files/stpcpy.c =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/files/stpcpy.c (rev 0) +++ csw/mgar/pkg/tmpwatch/trunk/files/stpcpy.c 2010-02-24 15:57:18 UTC (rev 8791) @@ -0,0 +1,9 @@ +char * +stpcpy(char *a,const char *b) +{ + while( *b ) + *a++ = *b++; + *a = 0; + + return (char*)a; +} 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 Feb 24 16:58:03 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Feb 2010 15:58:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[8792] csw/mgar/pkg/mpeg4ip/trunk Message-ID: Revision: 8792 http://gar.svn.sourceforge.net/gar/?rev=8792&view=rev Author: dmichelsen Date: 2010-02-24 15:58:03 +0000 (Wed, 24 Feb 2010) Log Message: ----------- mpeg4ip: Add functionality from legacy script mpeg4ip-build-script Modified Paths: -------------- csw/mgar/pkg/mpeg4ip/trunk/Makefile csw/mgar/pkg/mpeg4ip/trunk/checksums Modified: csw/mgar/pkg/mpeg4ip/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/Makefile 2010-02-24 15:57:18 UTC (rev 8791) +++ csw/mgar/pkg/mpeg4ip/trunk/Makefile 2010-02-24 15:58:03 UTC (rev 8792) @@ -15,13 +15,36 @@ MASTER_SITES = http://download.m0k.org/handbrake/contrib/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTNAME = $(GARNAME) -# PATCHFILES = mpeg4ip-1.6.1-mjj.patch -PATCHFILES += 0001-Bootstrap-again.patch +PATCHFILES = mpeg4ip-1.6.1-mjj.patch +# PATCHFILES += 0001-Bootstrap-again.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +GARCOMPILER = GNU BUILD64 = 1 + +EXTRA_CPPFLAGS = -D_GETOPT_H=1 + +CONFIGURE_SCRIPTS = $(WORKSRC)/cvs_bootstrap + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared --disable-static +CONFIGURE_ARGS += --enable-server --enable-player +CONFIGURE_ARGS += --enable-mp4live +CONFIGURE_ARGS += --enable-ipv6 +CONFIGURE_ARGS_isa-i386 = --enable-mmx +CONFIGURE_ARGS_isa-sparc = --disable-mmx +CONFIGURE_ARGS += $(CONFIGURE_ARGS_isa-$(ISA)) + include gar/category.mk + +post-extract-modulated: + -rm -f $(WORKSRC)/bootstrapped + @$(MAKECOOKIE) + +configure-%/cvs_bootstrap: + @echo " ==> Running CVS bootstrap in $*" + cd $* && $(CONFIGURE_ENV) ./cvs_bootstrap $(CONFIGURE_ARGS) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/mpeg4ip/trunk/checksums =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/checksums 2010-02-24 15:57:18 UTC (rev 8791) +++ csw/mgar/pkg/mpeg4ip/trunk/checksums 2010-02-24 15:58:03 UTC (rev 8792) @@ -1,2 +1,2 @@ -68f13fa229cb7e3cc9bd8b4b693766be 0001-Bootstrap-again.patch +0ae174e13da77a783e636aa2904b7c90 mpeg4ip-1.6.1-mjj.patch cd81b566cf2fafc7318f58be8998182c mpeg4ip-1.6.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Feb 24 17:03:13 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 24 Feb 2010 16:03:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8793] csw/mgar/pkg/tmpwatch/trunk/Makefile Message-ID: Revision: 8793 http://gar.svn.sourceforge.net/gar/?rev=8793&view=rev Author: skayser Date: 2010-02-24 16:03:13 +0000 (Wed, 24 Feb 2010) Log Message: ----------- tmpwatch: re-order linker flags Modified Paths: -------------- csw/mgar/pkg/tmpwatch/trunk/Makefile Modified: csw/mgar/pkg/tmpwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/Makefile 2010-02-24 15:58:03 UTC (rev 8792) +++ csw/mgar/pkg/tmpwatch/trunk/Makefile 2010-02-24 16:03:13 UTC (rev 8793) @@ -32,7 +32,7 @@ TEST_SCRIPTS = # Link against our OpenCSW getopt lib which has getopt_long -EXTRA_LD_FLAGS = -lgnugetopt +EXTRA_LINKER_FLAGS = -lgnugetopt 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 Wed Feb 24 17:08:34 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 24 Feb 2010 16:08:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8794] csw/mgar/pkg/tmpwatch/trunk/Makefile Message-ID: Revision: 8794 http://gar.svn.sourceforge.net/gar/?rev=8794&view=rev Author: skayser Date: 2010-02-24 16:08:34 +0000 (Wed, 24 Feb 2010) Log Message: ----------- tmpwatch: remove incorrect issue (tmpwatch.o was already built, only linking was left) Modified Paths: -------------- csw/mgar/pkg/tmpwatch/trunk/Makefile Modified: csw/mgar/pkg/tmpwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/Makefile 2010-02-24 16:03:13 UTC (rev 8793) +++ csw/mgar/pkg/tmpwatch/trunk/Makefile 2010-02-24 16:08:34 UTC (rev 8794) @@ -1,7 +1,5 @@ # TODO # ! strtoimax implementation missing on Solaris 8/9 -# ! on repeated gmake build invocations (after build failures), only a subset of the -# environment is used, in particular CPPFLAGS/LDFLAGS are missing GARNAME = tmpwatch GARVERSION = 2.9.17 CATEGORIES = apps 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 Feb 24 17:20:35 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Feb 2010 16:20:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[8795] csw/mgar/pkg/libfaad2/trunk/Makefile Message-ID: Revision: 8795 http://gar.svn.sourceforge.net/gar/?rev=8795&view=rev Author: dmichelsen Date: 2010-02-24 16:20:35 +0000 (Wed, 24 Feb 2010) Log Message: ----------- libfaad2: Add tbd Modified Paths: -------------- csw/mgar/pkg/libfaad2/trunk/Makefile Modified: csw/mgar/pkg/libfaad2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfaad2/trunk/Makefile 2010-02-24 16:08:34 UTC (rev 8794) +++ csw/mgar/pkg/libfaad2/trunk/Makefile 2010-02-24 16:20:35 UTC (rev 8795) @@ -23,6 +23,9 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(SF_PROJ)-(\d+(?:\.\d+)*).tar.bz2 +# TBD: +# DEP_PKGS = CSWmpeg4ip + BUILD64 = 1 NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Feb 24 17:33:21 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Feb 2010 16:33:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8796] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8796 http://gar.svn.sourceforge.net/gar/?rev=8796&view=rev Author: dmichelsen Date: 2010-02-24 16:33:21 +0000 (Wed, 24 Feb 2010) Log Message: ----------- mGAR v2: Allow empty depends Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-24 16:20:35 UTC (rev 8795) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-24 16:33:21 UTC (rev 8796) @@ -447,6 +447,7 @@ $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswalternatives")')),CSWalternatives) $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$F[1] eq "$C");)')),CSWcswclassutils) +# The final "true" is for packages without dependencies to make the shell happy as "( )" is not allowed. $(WORKDIR)/%.depend: $(WORKDIR) $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(RUNTIME_DEP_PKGS_$*)$(RUNTIME_DEP_PKGS)$(DEP_PKGS)$(DEP_PKGS_$*)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ ($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\ @@ -457,7 +458,8 @@ echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | $(GAWK) '{ $$1 = "P"; print } ')"; \ ) \ - )) >$@) + ) \ + true) >$@) # Dynamic gspec-files are constructed as follows: # - Packages using dynamic gspec-files must be listed in PACKAGES This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Feb 24 17:42:46 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 24 Feb 2010 16:42:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8797] csw/mgar/pkg/tmpwatch/trunk/Makefile Message-ID: Revision: 8797 http://gar.svn.sourceforge.net/gar/?rev=8797&view=rev Author: skayser Date: 2010-02-24 16:42:46 +0000 (Wed, 24 Feb 2010) Log Message: ----------- tmpwatch: add info about gnulib, add bug report, add DEPS Modified Paths: -------------- csw/mgar/pkg/tmpwatch/trunk/Makefile Modified: csw/mgar/pkg/tmpwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/Makefile 2010-02-24 16:33:21 UTC (rev 8796) +++ csw/mgar/pkg/tmpwatch/trunk/Makefile 2010-02-24 16:42:46 UTC (rev 8797) @@ -1,5 +1,9 @@ # TODO -# ! strtoimax implementation missing on Solaris 8/9 +# ! strtoimax implementation missing on Solaris 8/9, gnulib provides +# a strtoimax implementation. Relevant bug against tmpwatch: +# https://fedorahosted.org/tmpwatch/ticket/5 +# Any solutions will certainly also be appreciated by the people on the +# bug report. GARNAME = tmpwatch GARVERSION = 2.9.17 CATEGORIES = apps @@ -17,6 +21,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +BUILD_DEP_PKGS = CSWlibgnugetopt +RUNTIME_DEP_PKGS = CSWlibgnugetopt + # Taken from libgcrypt's stringhelp.c DISTFILES += stpcpy.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Feb 24 18:06:25 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 24 Feb 2010 17:06:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8798] csw/mgar/pkg/postfix/branches/postfix-2.6/files/ cswpostfix Message-ID: Revision: 8798 http://gar.svn.sourceforge.net/gar/?rev=8798&view=rev Author: bensons Date: 2010-02-24 17:06:25 +0000 (Wed, 24 Feb 2010) Log Message: ----------- postfix: extended init script Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix 2010-02-24 16:42:46 UTC (rev 8797) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix 2010-02-24 17:06:25 UTC (rev 8798) @@ -10,7 +10,7 @@ # cswclassutils settings #AUTOENABLE NO -PATH=/bin:/usr/bin:/sbin:/usr/sbin +PATH=/bin:/usr/bin:/sbin:/usr/sbin:/opt/csw/sbin CFGDIR=/etc/opt/csw/postfix DAEMON=/opt/csw/sbin/postfix PIDFILE=/var/opt/csw/run/postfix.pid @@ -18,22 +18,34 @@ TZ= unset TZ -test -x $DAEMON -a -f /etc/opt/csw/postfix/main.cf || exit 0 +test -x ${DAEMON} -a -f ${CFGDIR}/main.cf || exit 0 +running() { + queue=`/opt/csw/sbin/postconf -c ${CFGDIR} -h queue_directory 2>/dev/null` + if [ -f ${queue}/pid/master.pid ]; then + pid=`sed 's/ //g' ${queue}/pid/master.pid` + # what directory does the executable live in. stupid prelink systems. + pspid=`ps -fp $pid -o pid | sed -n '/[0-9]/{s/ //g;p;}'` + if [ "X$pid" = "X$pspid" ]; then + /bin/echo y + fi + fi +} + case "$1" in start) - if [ ! -f $CFGDIR/aliases.dir ]; then + if [ ! -f ${CFGDIR}/aliases.dir ]; then /opt/csw/bin/newaliases fi /bin/echo "Starting mail transport agent: Postfix" - ${DAEMON} start 2>&1 | + ${DAEMON} -c ${CFGDIR} start 2>&1 | (grep -v 'starting the Postfix' 1>&2 || /bin/true) ;; stop) /bin/echo "Stopping mail transport agent: Postfix" - ${DAEMON} stop 2>&1 | + ${DAEMON} -c ${CFGDIR} stop 2>&1 | (grep -v 'stopping the Postfix' 1>&2 || /bin/true) ;; @@ -44,21 +56,32 @@ force-reload|reload) /bin/echo "Reloading Postfix configuration..." - ${DAEMON} reload 2>&1 | + ${DAEMON} -c ${CFGDIR} reload 2>&1 | (grep -v 'refreshing the Postfix' 1>&2 || /bin/true) - echo "done." + /bin/echo "done." ;; flush) - ${DAEMON} flush + ${DAEMON} -c ${CFGDIR} flush ;; check) - ${DAEMON} check + ${DAEMON} -c ${CFGDIR} check ;; + status) + RUNNING=`running` + if [ -n "$RUNNING" ]; then + /bin/echo "postfix is running" + exit 0 + else + /bin/echo "postfix is not running" + exit 3 + fi + ;; + *) - echo "Usage: /etc/init.d/postfix {start|stop|restart|reload|flush|check|force-reload}" + /bin/echo "Usage: /etc/init.d/postfix {start|stop|restart|reload|flush|check|status|force-reload}" exit 1 ;; esac This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Feb 24 18:07:01 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 24 Feb 2010 17:07:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[8799] csw/mgar/pkg/postfix/branches/postfix-2.6/files/ cswpostfix Message-ID: Revision: 8799 http://gar.svn.sourceforge.net/gar/?rev=8799&view=rev Author: bensons Date: 2010-02-24 17:07:01 +0000 (Wed, 24 Feb 2010) Log Message: ----------- postfix: remove old comment Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix 2010-02-24 17:06:25 UTC (rev 8798) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix 2010-02-24 17:07:01 UTC (rev 8799) @@ -24,7 +24,6 @@ queue=`/opt/csw/sbin/postconf -c ${CFGDIR} -h queue_directory 2>/dev/null` if [ -f ${queue}/pid/master.pid ]; then pid=`sed 's/ //g' ${queue}/pid/master.pid` - # what directory does the executable live in. stupid prelink systems. pspid=`ps -fp $pid -o pid | sed -n '/[0-9]/{s/ //g;p;}'` if [ "X$pid" = "X$pspid" ]; then /bin/echo y This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Feb 24 18:09:11 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 24 Feb 2010 17:09:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8800] csw/mgar/pkg/postfix/branches/postfix-2.6/files/ cswpostfix Message-ID: Revision: 8800 http://gar.svn.sourceforge.net/gar/?rev=8800&view=rev Author: bensons Date: 2010-02-24 17:09:11 +0000 (Wed, 24 Feb 2010) Log Message: ----------- postfix: some minor cosmetics :) Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix 2010-02-24 17:07:01 UTC (rev 8799) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix 2010-02-24 17:09:11 UTC (rev 8800) @@ -10,7 +10,7 @@ # cswclassutils settings #AUTOENABLE NO -PATH=/bin:/usr/bin:/sbin:/usr/sbin:/opt/csw/sbin +PATH=/bin:/usr/bin:/sbin:/usr/sbin:/opt/csw/bin:/opt/csw/sbin CFGDIR=/etc/opt/csw/postfix DAEMON=/opt/csw/sbin/postfix PIDFILE=/var/opt/csw/run/postfix.pid @@ -21,12 +21,12 @@ test -x ${DAEMON} -a -f ${CFGDIR}/main.cf || exit 0 running() { - queue=`/opt/csw/sbin/postconf -c ${CFGDIR} -h queue_directory 2>/dev/null` + queue=`postconf -c ${CFGDIR} -h queue_directory 2>/dev/null` if [ -f ${queue}/pid/master.pid ]; then pid=`sed 's/ //g' ${queue}/pid/master.pid` pspid=`ps -fp $pid -o pid | sed -n '/[0-9]/{s/ //g;p;}'` if [ "X$pid" = "X$pspid" ]; then - /bin/echo y + echo y fi fi } @@ -37,13 +37,13 @@ /opt/csw/bin/newaliases fi - /bin/echo "Starting mail transport agent: Postfix" + echo "Starting mail transport agent: Postfix" ${DAEMON} -c ${CFGDIR} start 2>&1 | (grep -v 'starting the Postfix' 1>&2 || /bin/true) ;; stop) - /bin/echo "Stopping mail transport agent: Postfix" + echo "Stopping mail transport agent: Postfix" ${DAEMON} -c ${CFGDIR} stop 2>&1 | (grep -v 'stopping the Postfix' 1>&2 || /bin/true) ;; @@ -54,10 +54,10 @@ ;; force-reload|reload) - /bin/echo "Reloading Postfix configuration..." + echo "Reloading Postfix configuration..." ${DAEMON} -c ${CFGDIR} reload 2>&1 | (grep -v 'refreshing the Postfix' 1>&2 || /bin/true) - /bin/echo "done." + echo "done." ;; flush) @@ -71,16 +71,16 @@ status) RUNNING=`running` if [ -n "$RUNNING" ]; then - /bin/echo "postfix is running" + echo "postfix is running" exit 0 else - /bin/echo "postfix is not running" + echo "postfix is not running" exit 3 fi ;; *) - /bin/echo "Usage: /etc/init.d/postfix {start|stop|restart|reload|flush|check|status|force-reload}" + echo "Usage: /etc/init.d/postfix {start|stop|restart|reload|flush|check|status|force-reload}" exit 1 ;; esac 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 Feb 24 18:24:01 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 24 Feb 2010 17:24:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[8801] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 8801 http://gar.svn.sourceforge.net/gar/?rev=8801&view=rev Author: bonivart Date: 2010-02-24 17:24:00 +0000 (Wed, 24 Feb 2010) Log Message: ----------- pkgutil: change back to pre/post scripts, add note after install Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2010-02-24 17:09:11 UTC (rev 8800) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2010-02-24 17:24:00 UTC (rev 8801) @@ -1,4 +1,5 @@ GARNAME = pkgutil +#GARVERSION = 1.10b1 GARVERSION = 1.9.1 CATEGORIES = utils @@ -15,9 +16,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).zip -DISTFILES += $(call admfiles,CSWpkgutil,prototype) -DISTFILES += i.cswpkgutil -DISTFILES += r.cswpkgutil +DISTFILES += $(call admfiles,CSWpkgutil,prototype preremove postinstall) DISTFILES += build_sun_catalog.py DISTFILES += opencsw.py @@ -27,8 +26,8 @@ SPKG_DESC_CSWpkgutilplus = Extends pkgutil functionality # Explicitly depend on CSWcommon here since it's not the default -#RUNTIME_DEP_PKGS_CSWpkgutilplus = CSWcommon CSWperl CSWgnupg CSWpkgutil CSWpmwwwcurl -RUNTIME_DEP_PKGS_CSWpkgutilplus = CSWcommon CSWperl CSWgnupg CSWpkgutil CSWcswpkgloghooks CSWpython +RUNTIME_DEP_PKGS_CSWpkgutilplus = CSWcommon CSWperl CSWgnupg CSWpkgutil CSWcswpkgloghooks CSWpython +#RUNTIME_DEP_PKGS_CSWpkgutilplus += CSWpmwwwcurl PKGFILES_CSWpkgutilplus = .*bldcat.* PKGFILES_CSWpkgutilplus += .*chkcat.* @@ -50,7 +49,6 @@ WORKSRC = $(WORKDIR) SPKG_SOURCEURL = http://pkgutil.wikidot.com/ -SPKG_CLASSES_CSWpkgutil = none cswpkgutil install-custom: @echo " ==> Installing $(GARNAME) (custom)" Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2010-02-24 17:09:11 UTC (rev 8800) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2010-02-24 17:24:00 UTC (rev 8801) @@ -1,7 +1,7 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec -a751314ee495d7477888522435b769e4 CSWpkgutil.prototype +285664f5790e1e89cce4fe027bb296b4 CSWpkgutil.postinstall +2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove +a0e549282bf18241e4490ed6b051b92a CSWpkgutil.prototype b5fffa0be100ddbb7262ce3a0a4e3bb7 build_sun_catalog.py -33f82561e1fcf3aaf22f66bac22afba1 i.cswpkgutil 3a6b789b3d5e05f41d2363dd26a92acf opencsw.py d65a85a929f3901d4a613006e7c2c7bd pkgutil-1.9.1.zip -6d472d94ea850b600fd29aba7a6fc4b3 r.cswpkgutil Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall 2010-02-24 17:09:11 UTC (rev 8800) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall 2010-02-24 17:24:00 UTC (rev 8801) @@ -24,4 +24,8 @@ echo "admin already exists, will not copy admin.CSW to it." fi +echo +echo "NOTE! Make sure to check out any changes in /etc/opt/csw/pkgutil.conf.CSW." +echo + exit 0 Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2010-02-24 17:09:11 UTC (rev 8800) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2010-02-24 17:24:00 UTC (rev 8801) @@ -1,14 +1,12 @@ i pkginfo=CSWpkgutil.pkginfo i copyright=CSWpkgutil.copyright -i i.cswpkgutil -i r.cswpkgutil d none /etc/opt/csw 0755 root bin -f cswpkgutil /etc/opt/csw/pkgutil.conf.CSW 644 root bin +f none /etc/opt/csw/pkgutil.conf.CSW 644 root bin d none /opt/csw 0755 root bin d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/pkgutil 755 root bin d none /opt/csw/etc 0755 root bin -f cswpkgutil /opt/csw/etc/pkgutil.conf.CSW 644 root bin +f none /opt/csw/etc/pkgutil.conf.CSW 644 root bin d none /opt/csw/libexec 0755 root bin d none /opt/csw/libexec/pkgutil 0755 root bin f none /opt/csw/libexec/pkgutil/wget 755 root bin @@ -22,6 +20,6 @@ f none /opt/csw/share/man/man1/pkgutil.1 444 root bin d none /var/opt/csw 0755 root bin d none /var/opt/csw/pkgutil 0755 root bin -f cswpkgutil /var/opt/csw/pkgutil/admin.CSW 644 root bin +f none /var/opt/csw/pkgutil/admin.CSW 644 root bin d none /var/opt/csw/pkgutil/packages 0755 root bin d none /var/opt/csw/pkgutil/pkgask 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Feb 24 18:39:34 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 24 Feb 2010 17:39:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8802] csw/mgar/pkg Message-ID: Revision: 8802 http://gar.svn.sourceforge.net/gar/?rev=8802&view=rev Author: skayser Date: 2010-02-24 17:39:34 +0000 (Wed, 24 Feb 2010) Log Message: ----------- stmpclean: initial commit Added Paths: ----------- csw/mgar/pkg/stmpclean/ csw/mgar/pkg/stmpclean/branches/ csw/mgar/pkg/stmpclean/tags/ csw/mgar/pkg/stmpclean/trunk/ csw/mgar/pkg/stmpclean/trunk/Makefile csw/mgar/pkg/stmpclean/trunk/checksums csw/mgar/pkg/stmpclean/trunk/files/ csw/mgar/pkg/stmpclean/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/stmpclean/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/stmpclean/trunk/Makefile =================================================================== --- csw/mgar/pkg/stmpclean/trunk/Makefile (rev 0) +++ csw/mgar/pkg/stmpclean/trunk/Makefile 2010-02-24 17:39:34 UTC (rev 8802) @@ -0,0 +1,49 @@ +GARNAME = stmpclean +GARVERSION = 0.3 +CATEGORIES = apps + +DESCRIPTION = Removes old files from the specified directory +define BLURB + The stmpclean utility never removes files or directories owned by root. + It is a feature, not a bug. Great care is taken while descending into + the directory, and the operation is secure. Unlike floating around Perl + scripts that do the same task stmpclean never forks and consumes limited + amount of memory (these Perl script easily turn into forking bombs when + someone creates a lot a directories under /tmp). If your system is + attacked and the attacker creates an extremely deep file hierarchy, + stmpclean won't add to the problem by crashing your system trying to + remove it. +endef + +MASTER_SITES = http://shlang.com/stmpclean/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_SCRIPTS = +BUILD_ARGS = $(GARNAME) +INSTALL_SCRIPTS = custom +TEST_SCRIPTS = + +NORUNPATH = 1 + +include gar/category.mk + +# Remove gcc'isms and non-POSIX LOG_PERROR option to openlog() +# http://www.gnu.org/s/libc/manual/html_node/openlog.html +pre-build-modulated: + gsed -i -e '/^CFLAGS/d' $(WORKSRC)/Makefile + gsed -i -e 's/| LOG_PERROR//' $(WORKSRC)/$(GARNAME).c + @$(MAKECOOKIE) + +install-custom: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +install-custom: DOCS=README FAQ +install-custom: + ginstall -d $(DOCDEST) + ginstall -d $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(mandir)/man8 + + ginstall -m755 $(WORKSRC)/$(GARNAME) $(DESTDIR)$(bindir)/$(GARNAME) + cp $(WORKSRC)/$(GARNAME).8 $(DESTDIR)$(mandir)/man8/ + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + @$(MAKECOOKIE) Added: csw/mgar/pkg/stmpclean/trunk/checksums =================================================================== --- csw/mgar/pkg/stmpclean/trunk/checksums (rev 0) +++ csw/mgar/pkg/stmpclean/trunk/checksums 2010-02-24 17:39:34 UTC (rev 8802) @@ -0,0 +1 @@ +e33c64ada5c0e92381adac5c45eb540a stmpclean-0.3.tar.gz Added: csw/mgar/pkg/stmpclean/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/stmpclean/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/stmpclean/trunk/files/changelog.CSW 2010-02-24 17:39:34 UTC (rev 8802) @@ -0,0 +1,5 @@ +stmpclean (0.3,REV=2010.02.24) + + * Initial release. + + -- Sebastian Kayser Wed, 24 Feb 2010 18:36:28 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Feb 24 18:46:44 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 24 Feb 2010 17:46:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8803] csw/mgar/pkg/irssi/trunk/Makefile Message-ID: Revision: 8803 http://gar.svn.sourceforge.net/gar/?rev=8803&view=rev Author: bensons Date: 2010-02-24 17:46:43 +0000 (Wed, 24 Feb 2010) Log Message: ----------- irssi: cleaned up Makefile, added CHECKPKG_OVERRIDES Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2010-02-24 17:39:34 UTC (rev 8802) +++ csw/mgar/pkg/irssi/trunk/Makefile 2010-02-24 17:46:43 UTC (rev 8803) @@ -11,21 +11,19 @@ Support for other protocols like ICQ could be created some day too. endef +VENDOR_URL = http://www.irssi.org/ MASTER_SITES = http://www.irssi.org/files/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - -# We define upstream file regex so we can be notifed of new upstream software release +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_CLASSES = none cswcpsampleconf -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/irssi.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' +SAMPLECONF = .*/irssi.conf -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --enable-ipv6 CONFIGURE_ARGS += --with-socks CONFIGURE_ARGS += --with-bot CONFIGURE_ARGS += --with-proxy -CONFIGURE_ARGS += --with-perl=module +CONFIGURE_ARGS += --with-perl=yes CONFIGURE_ARGS += --with-perl-lib=vendor EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod @@ -36,19 +34,10 @@ RUNTIME_DEP_PKGS += CSWperl RUNTIME_DEP_PKGS += CSWsunmath RUNTIME_DEP_PKGS += CSWggettextrt -RUNTIME_DEP_PKGS += CSWcswclassutils +RUNTIME_DEP_PKGS += CSWbdb47 +CHECKPKG_OVERRIDES_CSWirssi += symbol-not-found + TEST_TARGET = check -# moving configuration file -post-install-modulated: - (cd $(DESTDIR)$(prefix)/etc; \ - for i in irssi.conf; do \ - if [ -r "$$i" ]; then \ - echo "$$i -> $$i.CSW"; \ - mv "$$i" "$$i.CSW"; \ - fi \ - done) - include gar/category.mk -PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Feb 24 21:42:24 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 24 Feb 2010 20:42:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8804] csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile Message-ID: Revision: 8804 http://gar.svn.sourceforge.net/gar/?rev=8804&view=rev Author: wbonnet Date: 2010-02-24 20:42:23 +0000 (Wed, 24 Feb 2010) Log Message: ----------- Update dependencies Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2010-02-24 17:46:43 UTC (rev 8803) +++ csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2010-02-24 20:42:23 UTC (rev 8804) @@ -23,10 +23,10 @@ SPKG_DESC_CSWlibxvmc = $(DESCRIPTION) SPKG_DESC_CSWlibxvmcdevel = $(DESCRIPTION) development files -# BUILD_DEP_PKGS = CSWlibxvdevel CSWxvideoproto +BUILD_DEP_PKGS = CSWxv -RUNTIME_DEP_PKGS_CSWlibxvmc = CSWlibx11 CSWlibxext CSWlibxv -RUNTIME_DEP_PKGS_CSWlibxvmcdevel = CSWxv +RUNTIME_DEP_PKGS_CSWlibxvmc = CSWlibx11 CSWlibxext CSWlibxv +RUNTIME_DEP_PKGS_CSWlibxvmc += CSWxv RUNTIME_DEP_PKGS_CSWlibxvmcdevel += CSWlibxvmc PKGFILES_CSWlibxvmcdevel = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Feb 24 22:17:18 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 24 Feb 2010 21:17:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8805] csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile Message-ID: Revision: 8805 http://gar.svn.sourceforge.net/gar/?rev=8805&view=rev Author: wbonnet Date: 2010-02-24 21:17:18 +0000 (Wed, 24 Feb 2010) Log Message: ----------- Fix dependencies Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2010-02-24 20:42:23 UTC (rev 8804) +++ csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2010-02-24 21:17:18 UTC (rev 8805) @@ -29,6 +29,9 @@ RUNTIME_DEP_PKGS_CSWlibxvmc += CSWxv RUNTIME_DEP_PKGS_CSWlibxvmcdevel += CSWlibxvmc +BUILD_DEP_PKGS_CSWlibxvmc += CSWlibxv +BUILD_DEP_PKGS_CSWlibxvmc += CSWlibxvdevel + PKGFILES_CSWlibxvmcdevel = $(PKGFILES_DEVEL) BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Feb 24 22:17:30 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 24 Feb 2010 21:17:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8806] csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile Message-ID: Revision: 8806 http://gar.svn.sourceforge.net/gar/?rev=8806&view=rev Author: wbonnet Date: 2010-02-24 21:17:30 +0000 (Wed, 24 Feb 2010) Log Message: ----------- Fix dependencies Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile 2010-02-24 21:17:18 UTC (rev 8805) +++ csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile 2010-02-24 21:17:30 UTC (rev 8806) @@ -27,6 +27,9 @@ RUNTIME_DEP_PKGS_CSWlibxtst += CSWlibxext RUNTIME_DEP_PKGS_CSWlibxtst += CSWlibxi +BUILD_DEP_PKGS_CSWlibxtst += CSWlibxi +BUILD_DEP_PKGS_CSWlibxtst += CSWlibxidevel + BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Feb 25 02:09:48 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 25 Feb 2010 01:09:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8807] csw/mgar/pkg/mpeg4ip/trunk Message-ID: Revision: 8807 http://gar.svn.sourceforge.net/gar/?rev=8807&view=rev Author: wbonnet Date: 2010-02-25 01:09:47 +0000 (Thu, 25 Feb 2010) Log Message: ----------- Fix some compilation issues. Does not compile fully yet Modified Paths: -------------- csw/mgar/pkg/mpeg4ip/trunk/Makefile csw/mgar/pkg/mpeg4ip/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mpeg4ip/trunk/files/SDL_sunaudio.c.diff csw/mgar/pkg/mpeg4ip/trunk/files/type_basic.cpp Modified: csw/mgar/pkg/mpeg4ip/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/Makefile 2010-02-24 21:17:30 UTC (rev 8806) +++ csw/mgar/pkg/mpeg4ip/trunk/Makefile 2010-02-25 01:09:47 UTC (rev 8807) @@ -13,9 +13,14 @@ # SF doesn't have the latest version as it was removed due to some breakage # So we get it from another place and patch the flaw away MASTER_SITES = http://download.m0k.org/handbrake/contrib/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTNAME = $(GARNAME) -PATCHFILES = mpeg4ip-1.6.1-mjj.patch + + +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = $(GARNAME) +PATCHFILES = mpeg4ip-1.6.1-mjj.patch +# PATCHFILES += SDL_sunaudio.c.diff +# PATCHFILES += type_basic.cpp.diff + # PATCHFILES += 0001-Bootstrap-again.patch # We define upstream file regex so we can be notifed of new upstream software release @@ -24,7 +29,8 @@ GARCOMPILER = GNU BUILD64 = 1 -EXTRA_CPPFLAGS = -D_GETOPT_H=1 +# EXTRA_CPPFLAGS = -D_GETOPT_H=1 -DHAVE_GETOPT_H +EXTRA_CPPFLAGS = -DHAVE_GETOPT_H -D__GNU_LIBRARY__ CONFIGURE_SCRIPTS = $(WORKSRC)/cvs_bootstrap @@ -38,6 +44,13 @@ CONFIGURE_ARGS_isa-sparc = --disable-mmx CONFIGURE_ARGS += $(CONFIGURE_ARGS_isa-$(ISA)) +PACKAGES = CSWmpeg4ip +CATALOGNAME_CSWmpeg4ip = mpeg4ip +SPKG_DESC_CSWmpeg4ip = $(DESCRIPTION) + +BUILD_DEP_PKGS_CSWmpeg4ip = CSWlibgnugetopt + + include gar/category.mk post-extract-modulated: Modified: csw/mgar/pkg/mpeg4ip/trunk/checksums =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/checksums 2010-02-24 21:17:30 UTC (rev 8806) +++ csw/mgar/pkg/mpeg4ip/trunk/checksums 2010-02-25 01:09:47 UTC (rev 8807) @@ -1,2 +1,3 @@ +a4a8aebe0781d30df528d53fea11fdcf SDL_sunaudio.c.diff 0ae174e13da77a783e636aa2904b7c90 mpeg4ip-1.6.1-mjj.patch cd81b566cf2fafc7318f58be8998182c mpeg4ip-1.6.1.tar.gz Added: csw/mgar/pkg/mpeg4ip/trunk/files/SDL_sunaudio.c.diff =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/files/SDL_sunaudio.c.diff (rev 0) +++ csw/mgar/pkg/mpeg4ip/trunk/files/SDL_sunaudio.c.diff 2010-02-25 01:09:47 UTC (rev 8807) @@ -0,0 +1,14 @@ +diff --speed-large-files --minimal -Nru mpeg4ip.orig/lib/SDLAudio/src/audio/sun/SDL_sunaudio.c mpeg4ip/lib/SDLAudio/src/audio/sun/SDL_sunaudio.c +--- mpeg4ip.orig/lib/SDLAudio/src/audio/sun/SDL_sunaudio.c 2010-02-25 01:29:55.025447000 +0100 ++++ mpeg4ip/lib/SDLAudio/src/audio/sun/SDL_sunaudio.c 2010-02-25 01:32:11.778312000 +0100 +@@ -163,9 +163,9 @@ + #endif + } + ++static Uint8 snd2au(int sample); + void DSP_PlayAudio(_THIS) + { +- static Uint8 snd2au(int sample); + /* Write the audio data */ + if ( ulaw_only ) { + /* Assuming that this->spec.freq >= 8000 Hz */ Added: csw/mgar/pkg/mpeg4ip/trunk/files/type_basic.cpp =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/files/type_basic.cpp (rev 0) +++ csw/mgar/pkg/mpeg4ip/trunk/files/type_basic.cpp 2010-02-25 01:09:47 UTC (rev 8807) @@ -0,0 +1,13 @@ +diff --speed-large-files --minimal -Nru mpeg4ip.orig/common/video/iso-mpeg4/src/type_basic.cpp mpeg4ip/common/video/iso-mpeg4/src/type_basic.cpp +--- mpeg4ip.orig/common/video/iso-mpeg4/src/type_basic.cpp 2010-02-25 01:59:55.429555000 +0100 ++++ mpeg4ip/common/video/iso-mpeg4/src/type_basic.cpp 2010-02-25 02:00:17.779765000 +0100 +@@ -317,7 +317,7 @@ + iHalfY = m_vctTrueHalfPel.y - iMVY * 2; + } + +-Void CMotionVector::setToZero (Void) ++Void CMotionVector::setToZero () + { + memset (this, 0, sizeof (*this)); + } + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Feb 25 12:52:43 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 25 Feb 2010 11:52:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8808] csw/mgar/pkg/pixman/trunk/Makefile Message-ID: Revision: 8808 http://gar.svn.sourceforge.net/gar/?rev=8808&view=rev Author: wbonnet Date: 2010-02-25 11:52:40 +0000 (Thu, 25 Feb 2010) Log Message: ----------- Upgrade to 0.17.8 Modified Paths: -------------- csw/mgar/pkg/pixman/trunk/Makefile Modified: csw/mgar/pkg/pixman/trunk/Makefile =================================================================== --- csw/mgar/pkg/pixman/trunk/Makefile 2010-02-25 01:09:47 UTC (rev 8807) +++ csw/mgar/pkg/pixman/trunk/Makefile 2010-02-25 11:52:40 UTC (rev 8808) @@ -1,5 +1,5 @@ GARNAME = pixman -GARVERSION = 0.17.6 +GARVERSION = 0.17.8 CATEGORIES = lib DESCRIPTION = The pixel-manipulation library for X and cairo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 25 14:00:24 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 25 Feb 2010 13:00:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8809] csw/mgar/pkg Message-ID: Revision: 8809 http://gar.svn.sourceforge.net/gar/?rev=8809&view=rev Author: wahwah Date: 2010-02-25 13:00:23 +0000 (Thu, 25 Feb 2010) Log Message: ----------- sharutils: Initial commit, tests are failing Modified Paths: -------------- csw/mgar/pkg/sharutils/trunk/Makefile csw/mgar/pkg/sharutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/sharutils/ Modified: csw/mgar/pkg/sharutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-02-13 12:42:13 UTC (rev 8535) +++ csw/mgar/pkg/sharutils/trunk/Makefile 2010-02-25 13:00:23 UTC (rev 8809) @@ -2,184 +2,19 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = sharutils +GARVERSION = 4.6.3 +CATEGORIES = utils +DESCRIPTION = makes so-called shell archives out of many files define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://www.gnu.org/software/sharutils/ +MASTER_SITES = ftp://ftp.gnu.org/gnu/sharutils/REL-$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +BUILD64 = 1 +MD5SUM = gm5sum +export MD5SUM +include gar/category.mk Modified: csw/mgar/pkg/sharutils/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-02-13 12:42:13 UTC (rev 8535) +++ csw/mgar/pkg/sharutils/trunk/checksums 2010-02-25 13:00:23 UTC (rev 8809) @@ -0,0 +1 @@ +74127a560e59be6dfa8b59993eb0ca91 sharutils-4.6.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 25 14:21:25 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 25 Feb 2010 13:21:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8810] csw/mgar/pkg/sharutils/trunk Message-ID: Revision: 8810 http://gar.svn.sourceforge.net/gar/?rev=8810&view=rev Author: wahwah Date: 2010-02-25 13:21:25 +0000 (Thu, 25 Feb 2010) Log Message: ----------- sharutils: Patching weird /bin/sh vs ^ issue, adding dependencies Modified Paths: -------------- csw/mgar/pkg/sharutils/trunk/Makefile csw/mgar/pkg/sharutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/sharutils/trunk/files/sun-sed.patch Modified: csw/mgar/pkg/sharutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/sharutils/trunk/Makefile 2010-02-25 13:00:23 UTC (rev 8809) +++ csw/mgar/pkg/sharutils/trunk/Makefile 2010-02-25 13:21:25 UTC (rev 8810) @@ -14,7 +14,11 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) +PATCHFILES = sun-sed.patch BUILD64 = 1 -MD5SUM = gm5sum +# To make the test use gmd5sum +MD5SUM = gmd5sum +RUNTIME_DEP_PKGS_CSWsharutils += CSWggettextrt +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWsharutils) CSWtextutils export MD5SUM include gar/category.mk Modified: csw/mgar/pkg/sharutils/trunk/checksums =================================================================== --- csw/mgar/pkg/sharutils/trunk/checksums 2010-02-25 13:00:23 UTC (rev 8809) +++ csw/mgar/pkg/sharutils/trunk/checksums 2010-02-25 13:21:25 UTC (rev 8810) @@ -1 +1,2 @@ 74127a560e59be6dfa8b59993eb0ca91 sharutils-4.6.3.tar.gz +528eb43a02b3208d5ff7d9ff43ed0c2f sun-sed.patch Added: csw/mgar/pkg/sharutils/trunk/files/sun-sed.patch =================================================================== --- csw/mgar/pkg/sharutils/trunk/files/sun-sed.patch (rev 0) +++ csw/mgar/pkg/sharutils/trunk/files/sun-sed.patch 2010-02-25 13:21:25 UTC (rev 8810) @@ -0,0 +1,11 @@ +--- sharutils-4.6.3/tests/shar-3.orig 2010-02-25 14:08:59.744913513 +0100 ++++ sharutils-4.6.3/tests/shar-3 2010-02-25 14:09:36.584244695 +0100 +@@ -16,7 +16,7 @@ + + cd ${top_builddir} + find . -type f | \ +- sed s,^./,, | \ ++ sed 's,^./,,' | \ + ${shar} -q ${opts} + + cd ${testdir} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Feb 25 15:14:13 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 25 Feb 2010 14:14:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8811] csw/mgar/pkg/pixman/trunk/checksums Message-ID: Revision: 8811 http://gar.svn.sourceforge.net/gar/?rev=8811&view=rev Author: wbonnet Date: 2010-02-25 14:14:13 +0000 (Thu, 25 Feb 2010) Log Message: ----------- Upgrade to 0.17.8 Modified Paths: -------------- csw/mgar/pkg/pixman/trunk/checksums Modified: csw/mgar/pkg/pixman/trunk/checksums =================================================================== --- csw/mgar/pkg/pixman/trunk/checksums 2010-02-25 13:21:25 UTC (rev 8810) +++ csw/mgar/pkg/pixman/trunk/checksums 2010-02-25 14:14:13 UTC (rev 8811) @@ -1,2 +1,2 @@ -32cbdf7a1ac1c275ee56230e26701456 pixman-0.17.6.tar.gz +a7deb2ff6b286b676d67aa6ae91317ae pixman-0.17.8.tar.gz f78d71433a7d574ff66b7d2bf3ea2a49 pixman-private.h.diff 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 Feb 25 15:57:18 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Feb 2010 14:57:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8812] csw/mgar/pkg/cpan Message-ID: Revision: 8812 http://gar.svn.sourceforge.net/gar/?rev=8812&view=rev Author: dmichelsen Date: 2010-02-25 14:57:18 +0000 (Thu, 25 Feb 2010) Log Message: ----------- cpan/XML-Stream: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/XML-Stream/ csw/mgar/pkg/cpan/XML-Stream/branches/ csw/mgar/pkg/cpan/XML-Stream/tags/ csw/mgar/pkg/cpan/XML-Stream/trunk/ csw/mgar/pkg/cpan/XML-Stream/trunk/Makefile csw/mgar/pkg/cpan/XML-Stream/trunk/checksums csw/mgar/pkg/cpan/XML-Stream/trunk/files/ Property changes on: csw/mgar/pkg/cpan/XML-Stream/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/XML-Stream/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-Stream/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/XML-Stream/trunk/Makefile 2010-02-25 14:57:18 UTC (rev 8812) @@ -0,0 +1,19 @@ +GARNAME = XML-Stream +GARVERSION = 1.23 +CATEGORIES = cpan +AUTHOR = DAPATRICK + +DESCRIPTION = Creates an XML Stream connection and parses return data +define BLURB + This module provides you with access to XML Streams. An XML Stream + is just that. A stream of XML over a connection between two computers. +endef + +PACKAGES = CSWpmxmlstream +CATALOGNAME = pm_xmlstream + +LICENSE = LICENSE.LGPL + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/XML-Stream/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-Stream/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/XML-Stream/trunk/checksums 2010-02-25 14:57:18 UTC (rev 8812) @@ -0,0 +1 @@ +1c0908384fe57a1c3c529071a8b882af XML-Stream-1.23.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 25 15:57:47 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 25 Feb 2010 14:57:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[8813] csw/mgar/gar/v2/lib/python Message-ID: Revision: 8813 http://gar.svn.sourceforge.net/gar/?rev=8813&view=rev Author: wahwah Date: 2010-02-25 14:57:47 +0000 (Thu, 25 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, fixed ldd parsing output. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-25 14:57:18 UTC (rev 8812) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-25 14:57:47 UTC (rev 8813) @@ -1124,7 +1124,8 @@ found_re = r"^\t(?P\S+)\s+=>\s+(?P\S+)" symbol_not_found_re = r"^\tsymbol not found:\s(?P\S+)\s+\((?P\S+)\)" only_so = r"^\t(?P\S+)$" - common_re = r"(%s|%s|%s)" % (found_re, symbol_not_found_re, only_so) + version_so = r'^\t(?P\S+) \((?P\S+)\) =>\t \(version not found\)' + common_re = r"(%s|%s|%s|%s)" % (found_re, symbol_not_found_re, only_so, version_so) m = re.match(common_re, line) response = {} if m: @@ -1145,6 +1146,11 @@ response["soname"] = None response["path"] = d["path_only"] response["symbol"] = None + elif d["soname_version_not_found"]: + response["state"] = "version-not-found" + response["soname"] = d["soname_version_not_found"] + response["path"] = None + response["symbol"] = None else: raise StdoutSyntaxError("Could not parse %s" % repr(line)) else: Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-25 14:57:18 UTC (rev 8812) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-25 14:57:47 UTC (rev 8813) @@ -40,6 +40,7 @@ \tsymbol not found: UtfToLocal (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) \tlibm.so.2 => /lib/libm.so.2 \t/usr/lib/secure/s8_preload.so.1 +\tlibXext.so.0 (SUNW_1.1) =>\t (version not found) """ class DependenciesUnitTest_1(unittest.TestCase): @@ -810,6 +811,16 @@ } self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + def test_ParseLdd_VersionNotFound(self): + line = '\tlibXext.so.0 (SUNW_1.1) =>\t (version not found)' + expected = { + 'symbol': None, + 'soname': 'libXext.so.0', + 'path': None, + 'state': 'version-not-found', + } + self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + def test_ParseLddDashRlineManyLines(self): for line in LDD_R_OUTPUT_1.splitlines(): parsed = self.pkgstats._ParseLddDashRline(line) 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 Feb 25 16:04:28 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Feb 2010 15:04:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[8814] csw/mgar/pkg/cpan Message-ID: Revision: 8814 http://gar.svn.sourceforge.net/gar/?rev=8814&view=rev Author: dmichelsen Date: 2010-02-25 15:04:27 +0000 (Thu, 25 Feb 2010) Log Message: ----------- cpan/Net-XMPP: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-XMPP/ csw/mgar/pkg/cpan/Net-XMPP/branches/ csw/mgar/pkg/cpan/Net-XMPP/tags/ csw/mgar/pkg/cpan/Net-XMPP/trunk/ csw/mgar/pkg/cpan/Net-XMPP/trunk/Makefile csw/mgar/pkg/cpan/Net-XMPP/trunk/checksums csw/mgar/pkg/cpan/Net-XMPP/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Net-XMPP/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-XMPP/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-XMPP/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-XMPP/trunk/Makefile 2010-02-25 15:04:27 UTC (rev 8814) @@ -0,0 +1,23 @@ +GARNAME = Net-XMPP +GARVERSION = 1.02 +CATEGORIES = cpan +AUTHOR = HACKER + +DESCRIPTION = XMPP Perl Library +define BLURB + The Extensible Messaging and Presence Protocol (XMPP) is an IETF standard + that provides a complete cross protocol messaging solution. The problem + with current IM solutions is that they are all proprietary and cannot + talk to each other. XMPP seeks to get rid of those barriers. +endef + +PACKAGES = CSWpmnetxmpp +CATALOGNAME = pm_netxmpp + +DEP_PKGS = CSWpmxmlstream + +LICENSE = LICENSE.LGPL + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-XMPP/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-XMPP/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-XMPP/trunk/checksums 2010-02-25 15:04:27 UTC (rev 8814) @@ -0,0 +1 @@ +67cf40d3bbbe6740c21c856c79692fde Net-XMPP-1.02.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Feb 25 16:15:34 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Feb 2010 15:15:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8815] csw/mgar/pkg/m4/trunk Message-ID: Revision: 8815 http://gar.svn.sourceforge.net/gar/?rev=8815&view=rev Author: dmichelsen Date: 2010-02-25 15:15:33 +0000 (Thu, 25 Feb 2010) Log Message: ----------- m4: Update to 1.4.14 Modified Paths: -------------- csw/mgar/pkg/m4/trunk/Makefile csw/mgar/pkg/m4/trunk/checksums Modified: csw/mgar/pkg/m4/trunk/Makefile =================================================================== --- csw/mgar/pkg/m4/trunk/Makefile 2010-02-25 15:04:27 UTC (rev 8814) +++ csw/mgar/pkg/m4/trunk/Makefile 2010-02-25 15:15:33 UTC (rev 8815) @@ -1,5 +1,5 @@ GARNAME = m4 -GARVERSION = 1.4.13 +GARVERSION = 1.4.14 CATEGORIES = utils DESCRIPTION = GNU m4 Unix macro processor Modified: csw/mgar/pkg/m4/trunk/checksums =================================================================== --- csw/mgar/pkg/m4/trunk/checksums 2010-02-25 15:04:27 UTC (rev 8814) +++ csw/mgar/pkg/m4/trunk/checksums 2010-02-25 15:15:33 UTC (rev 8815) @@ -1 +1 @@ -e9e36108b5f9855a82ca4a07ebc0fd2e download/m4-1.4.13.tar.gz +f0542d58f94c7d0ce0d01224e447be66 m4-1.4.14.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Feb 25 16:16:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Feb 2010 15:16:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8816] csw/mgar/pkg/cpan Message-ID: Revision: 8816 http://gar.svn.sourceforge.net/gar/?rev=8816&view=rev Author: dmichelsen Date: 2010-02-25 15:16:38 +0000 (Thu, 25 Feb 2010) Log Message: ----------- cpan/Net-Jabber: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-Jabber/ csw/mgar/pkg/cpan/Net-Jabber/branches/ csw/mgar/pkg/cpan/Net-Jabber/tags/ csw/mgar/pkg/cpan/Net-Jabber/trunk/ csw/mgar/pkg/cpan/Net-Jabber/trunk/Makefile csw/mgar/pkg/cpan/Net-Jabber/trunk/checksums csw/mgar/pkg/cpan/Net-Jabber/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Net-Jabber/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-Jabber/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Jabber/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-Jabber/trunk/Makefile 2010-02-25 15:16:38 UTC (rev 8816) @@ -0,0 +1,25 @@ +GARNAME = Net-Jabber +GARVERSION = 2.0 +CATEGORIES = cpan +AUTHOR = REATMON + +DESCRIPTION = Jabber Perl Library +define BLURB + The Jabber Instant Messaging project is an Open Source project seeking + to provide a complete cross protocol messaging solution. The problem + with current IM solutions is that they are all proprietary and cannot + talk to each other. Jabber seeks to get rid of those barriers by + allowing a Jabber client to talk with an AOL user, or an IRC chat room, + or any number of other programs. +endef + +PACKAGES = CSWpmnetjabber +CATALOGNAME = pm_netjabber + +DEP_PKGS = CSWpmnetxmpp + +LICENSE = LICENSE.LGPL + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-Jabber/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-Jabber/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-Jabber/trunk/checksums 2010-02-25 15:16:38 UTC (rev 8816) @@ -0,0 +1 @@ +1fd348fb9a1a6c5a167ae862ed89cd53 Net-Jabber-2.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Feb 25 16:24:09 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Feb 2010 15:24:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8817] csw/mgar/pkg/cpan/SOAP-Lite/trunk Message-ID: Revision: 8817 http://gar.svn.sourceforge.net/gar/?rev=8817&view=rev Author: dmichelsen Date: 2010-02-25 15:24:06 +0000 (Thu, 25 Feb 2010) Log Message: ----------- cpan/SOAP-Lite: Update dependencies Modified Paths: -------------- csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile csw/mgar/pkg/cpan/SOAP-Lite/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile 2010-02-25 15:16:38 UTC (rev 8816) +++ csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile 2010-02-25 15:24:06 UTC (rev 8817) @@ -10,8 +10,10 @@ client and server side. endef -DEP_PKGS = CSWpmiocompress CSWpmlibwww CSWpmmimelite CSWpmmimetools CSWpmuri CSWpmxmlparser CSWpmversion +DISTFILES = COPYING +DEP_PKGS = CSWpmiocompress CSWpmlibwww CSWpmmimelite CSWpmmimetools CSWpmuri CSWpmxmlparser CSWpmversion CSWpmnetjabber + PACKAGES = CSWpmsoaplite CATALOGNAME = pm_soaplite Modified: csw/mgar/pkg/cpan/SOAP-Lite/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/SOAP-Lite/trunk/checksums 2010-02-25 15:16:38 UTC (rev 8816) +++ csw/mgar/pkg/cpan/SOAP-Lite/trunk/checksums 2010-02-25 15:24:06 UTC (rev 8817) @@ -1 +1,2 @@ +54d428705c5d9309c8d6719168acf6ae COPYING 45d6679daac03fe4eb604a5b5f416fd5 SOAP-Lite-0.710.10.tar.gz Copied: csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/COPYING (from rev 2339, csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/CSWpmsoaplite.gspec) =================================================================== --- csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/COPYING 2010-02-25 15:24:06 UTC (rev 8817) @@ -0,0 +1,4 @@ +Copyright (C) 2000-2001 Paul Kulchenko. All rights reserved. + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 25 16:27:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 25 Feb 2010 15:27:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8818] csw/mgar/pkg Message-ID: Revision: 8818 http://gar.svn.sourceforge.net/gar/?rev=8818&view=rev Author: wahwah Date: 2010-02-25 15:27:13 +0000 (Thu, 25 Feb 2010) Log Message: ----------- icon-naming-utils: Initial commit Modified Paths: -------------- csw/mgar/pkg/icon-naming-utils/trunk/Makefile csw/mgar/pkg/icon-naming-utils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/icon-naming-utils/ Modified: csw/mgar/pkg/icon-naming-utils/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-02-13 12:42:13 UTC (rev 8535) +++ csw/mgar/pkg/icon-naming-utils/trunk/Makefile 2010-02-25 15:27:13 UTC (rev 8818) @@ -2,184 +2,17 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = icon-naming-utils +GARVERSION = 0.8.90 +CATEGORIES = gnome +DESCRIPTION = Icon naming utils define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release +SPKG_SOURCEURL = http://tango.freedesktop.org/releases/ +MASTER_SITES = http://tango.freedesktop.org/releases/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +CATALOGNAME = icon_naming_utils +TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +include gar/category.mk Modified: csw/mgar/pkg/icon-naming-utils/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-02-13 12:42:13 UTC (rev 8535) +++ csw/mgar/pkg/icon-naming-utils/trunk/checksums 2010-02-25 15:27:13 UTC (rev 8818) @@ -0,0 +1 @@ +dd8108b56130b9eedc4042df634efa66 icon-naming-utils-0.8.90.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 Thu Feb 25 16:38:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Feb 2010 15:38:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8819] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8819 http://gar.svn.sourceforge.net/gar/?rev=8819&view=rev Author: dmichelsen Date: 2010-02-25 15:38:11 +0000 (Thu, 25 Feb 2010) Log Message: ----------- mGAR v2: Honour CATALOGNAME even with implicit PACKAGES Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-25 15:27:13 UTC (rev 8818) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-25 15:38:11 UTC (rev 8819) @@ -32,7 +32,7 @@ ifeq ($(origin PACKAGES), undefined) PACKAGES = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(GARNAME)) -CATALOGNAME = $(if $(filter %.gspec,$(DISTFILES)),,$(GARNAME)) +CATALOGNAME ?= $(if $(filter %.gspec,$(DISTFILES)),,$(GARNAME)) SRCPACKAGE_BASE = $(firstword $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES)) SRCPACKAGE ?= $(SRCPACKAGE_BASE)-src SPKG_SPECS ?= $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE)) 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 Feb 25 16:47:37 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Feb 2010 15:47:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8820] csw/mgar/pkg/neon/trunk/Makefile Message-ID: Revision: 8820 http://gar.svn.sourceforge.net/gar/?rev=8820&view=rev Author: dmichelsen Date: 2010-02-25 15:47:37 +0000 (Thu, 25 Feb 2010) Log Message: ----------- neon: More fixes for alternatives Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2010-02-25 15:38:11 UTC (rev 8819) +++ csw/mgar/pkg/neon/trunk/Makefile 2010-02-25 15:47:37 UTC (rev 8820) @@ -27,8 +27,8 @@ CATALOGNAME_CSWneonfull = neon_full CATALOGNAME_CSWneon-devel = neon_devel -RUNTIME_DEP_PKGS_CSWneon = CSWexpat CSWosslrt CSWzlib CSWggettextrt CSWpakchois -RUNTIME_DEP_PKGS_CSWneonfull = CSWexpat CSWkrb5lib CSWosslrt CSWzlib CSWggettextrt CSWpakchois CSWlibproxy +RUNTIME_DEP_PKGS_CSWneon = CSWexpat CSWosslrt CSWzlib CSWggettextrt +RUNTIME_DEP_PKGS_CSWneonfull = CSWexpat CSWosslrt CSWzlib CSWggettextrt CSWpakchois CSWlibproxy RUNTIME_DEP_PKGS_CSWneon-devel = CSWneon BUILD_DEP_PKGS = $(sort $(RUNTIME_DEP_PKGS_CSWneon) $(RUNTIME_DEP_PKGS_CSWneonfull)) @@ -40,7 +40,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CONFIGURE_ARGS_features-minimal = --without-libproxy --without-pakchois +CONFIGURE_ARGS_features-minimal = --without-libproxy --without-pakchois --without-gssapi CONFIGURE_ARGS_features-full = --with-libproxy --with-packchois CONFIGURE_ARGS = $(DIRPATHS) @@ -61,15 +61,19 @@ # We select pkgconfig for minimal library bindings. As libneon is self-contained (links # to all necessary libs directly) the full version can simly be linked in. EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,," - -EXTRA_PAX_ARGS += -s ",$(libdir)/libneon\.so\.,$(libdir_install)/libneon-$(FEATURES).so.,p" EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES)) +EXTRA_PAX_ARGS-32 += -s ",\(\.$(libdir)/libneon\)\(\.so\.26\.0\.4\),\1-$(FEATURES)\2,p" +EXTRA_PAX_ARGS-32 += -s ",\(\.$(libdir)/libneon\)\(\.so\.27\.2\.3\),\1-$(FEATURES)\2,p" +EXTRA_PAX_ARGS-64 += -s ",\.$(libdir)/libneon\(\.so\.26\.0\.4\),.$(libdir_install)/$(ISA)/libneon-$(FEATURES)\1,p" +EXTRA_PAX_ARGS-64 += -s ",\.$(libdir)/libneon\(\.so\.27\.2\.3\),.$(libdir_install)/$(ISA)/libneon-$(FEATURES)\1,p" +EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS-$(MEMORYMODEL)) + MERGE_SCRIPTS_isa-default-garversion-0.26.4-features-minimal = copy-only MERGE_DIRS_isa-default-garversion-0.26.4-features-minimal = $(libdir) MERGE_SCRIPTS_isa-default64-garversion-0.26.4-features-minimal = copy-relocated-only MERGE_DIRS_isa-default64-garversion-0.26.4-features-minimal = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-0.26.4-features-full = copy-relocated-only +MERGE_SCRIPTS_isa-default-garversion-0.26.4-features-full = copy-only MERGE_DIRS_isa-default-garversion-0.26.4-features-full = $(libdir) MERGE_SCRIPTS_isa-default64-garversion-0.26.4-features-full = copy-relocated-only MERGE_DIRS_isa-default64-garversion-0.26.4-features-full = $(libdir) @@ -77,23 +81,33 @@ MERGE_SCRIPTS_isa-default-garversion-0.29.3-features-minimal = copy-all MERGE_SCRIPTS_isa-default64-garversion-0.29.3-features-minimal = copy-relocated-only MERGE_DIRS_isa-default64-garversion-0.29.3-features-minimal = $(bindir) $(sbindir) $(libexecdir) $(libdir) -MERGE_SCRIPTS_isa-default-garversion-0.29.3-features-full = copy-relocated-only +MERGE_SCRIPTS_isa-default-garversion-0.29.3-features-full = copy-only MERGE_DIRS_isa-default-garversion-0.29.3-features-full = $(libdir) MERGE_SCRIPTS_isa-default64-garversion-0.29.3-features-full = copy-relocated-only MERGE_DIRS_isa-default64-garversion-0.29.3-features-full = $(libdir) +EXTRA_LINKER_FLAGS = -lintl + +PKGFILES_CSWneonfull = .*-full.* +PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL) PKGFILES_CSWneon-devel += $(docdir)/.* -EXTRA_LINKER_FLAGS = -lintl - ALTERNATIVES_CSWneon = minimal ALTERNATIVES_CSWneonfull = full -ALTERNATIVE_minimal = $(libdir)/libneon.so.27 neon $(libdir)/libneon-minimal.so.27 200 -ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libneon.so.27 neon64 $(libdir)/$(ISA_DEFAULT64)/libneon-minimal.so.27 -ALTERNATIVE_full = $(libdir)/libneon.so.27 neon $(libdir)/libneon-full.so.27 100 -ALTERNATIVE_full += $(libdir)/$(ISA_DEFAULT64)/libneon.so.27 neon64 $(libdir)/$(ISA_DEFAULT64)/libneon-full.so.27 -PKGFILES_CSWneonfull = .*-full.* -PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL) +ALTERNATIVE_minimal = $(libdir)/libneon.so.27.2.3 neon $(libdir)/libneon-minimal.so.27.2.3 100 +ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libneon.so.27.2.3 neon64 $(libdir)/$(ISA_DEFAULT64)/libneon-minimal.so.27.2.3 +ALTERNATIVE_minimal += $(libdir)/libneon.so.26.0.4 neon.26 $(libdir)/libneon-minimal.so.26.0.4 +ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libneon.so.26.0.4 neon64.26 $(libdir)/$(ISA_DEFAULT64)/libneon-minimal.so.26.0.4 +ALTERNATIVE_full = $(libdir)/libneon.so.27.2.3 neon $(libdir)/libneon-full.so.27.2.3 200 +ALTERNATIVE_full += $(libdir)/$(ISA_DEFAULT64)/libneon.so.27.2.3 neon64 $(libdir)/$(ISA_DEFAULT64)/libneon-full.so.27.2.3 +ALTERNATIVE_full += $(libdir)/libneon.so.26.0.4 neon.26 $(libdir)/libneon-full.so.26.0.4 +ALTERNATIVE_full += $(libdir)/$(ISA_DEFAULT64)/libneon.so.26.0.4 neon64.26 $(libdir)/$(ISA_DEFAULT64)/libneon-full.so.26.0.4 + include gar/category.mk + +#post-install-modulated: +# rm -f $(DESTDIR)$(libdir)/libneon.so +# gln -s libneon.so.27 $(DESTDIR)$(libdir)/libneon.so +# @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 25 16:48:14 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 25 Feb 2010 15:48:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8821] csw/mgar/pkg/icon-naming-utils/trunk/Makefile Message-ID: Revision: 8821 http://gar.svn.sourceforge.net/gar/?rev=8821&view=rev Author: wahwah Date: 2010-02-25 15:48:14 +0000 (Thu, 25 Feb 2010) Log Message: ----------- icon-naming-utils: Adding catalogname Modified Paths: -------------- csw/mgar/pkg/icon-naming-utils/trunk/Makefile Modified: csw/mgar/pkg/icon-naming-utils/trunk/Makefile =================================================================== --- csw/mgar/pkg/icon-naming-utils/trunk/Makefile 2010-02-25 15:47:37 UTC (rev 8820) +++ csw/mgar/pkg/icon-naming-utils/trunk/Makefile 2010-02-25 15:48:14 UTC (rev 8821) @@ -12,7 +12,8 @@ MASTER_SITES = http://tango.freedesktop.org/releases/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CATALOGNAME = icon_naming_utils +CATALOGNAME_CSWicon-naming-utils = icon_naming_utils +ARCHALL_CSWicon-naming-utils = 1 TEST_TARGET = check 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 wahwah at users.sourceforge.net Thu Feb 25 16:57:48 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 25 Feb 2010 15:57:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8822] csw/mgar/pkg/icon-naming-utils/trunk/Makefile Message-ID: Revision: 8822 http://gar.svn.sourceforge.net/gar/?rev=8822&view=rev Author: wahwah Date: 2010-02-25 15:57:48 +0000 (Thu, 25 Feb 2010) Log Message: ----------- icon-naming-utils: Adding dependcy on XML::Simple Modified Paths: -------------- csw/mgar/pkg/icon-naming-utils/trunk/Makefile Modified: csw/mgar/pkg/icon-naming-utils/trunk/Makefile =================================================================== --- csw/mgar/pkg/icon-naming-utils/trunk/Makefile 2010-02-25 15:48:14 UTC (rev 8821) +++ csw/mgar/pkg/icon-naming-utils/trunk/Makefile 2010-02-25 15:57:48 UTC (rev 8822) @@ -14,6 +14,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CATALOGNAME_CSWicon-naming-utils = icon_naming_utils ARCHALL_CSWicon-naming-utils = 1 +RUNTIME_DEP_PKGS_CSWicon-naming-utils = CSWpmxmlsimple TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Feb 25 17:02:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Feb 2010 16:02:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8823] csw/mgar/pkg/neon/trunk/Makefile Message-ID: Revision: 8823 http://gar.svn.sourceforge.net/gar/?rev=8823&view=rev Author: dmichelsen Date: 2010-02-25 16:02:24 +0000 (Thu, 25 Feb 2010) Log Message: ----------- neon: Fix runtime deps Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2010-02-25 15:57:48 UTC (rev 8822) +++ csw/mgar/pkg/neon/trunk/Makefile 2010-02-25 16:02:24 UTC (rev 8823) @@ -28,7 +28,7 @@ CATALOGNAME_CSWneon-devel = neon_devel RUNTIME_DEP_PKGS_CSWneon = CSWexpat CSWosslrt CSWzlib CSWggettextrt -RUNTIME_DEP_PKGS_CSWneonfull = CSWexpat CSWosslrt CSWzlib CSWggettextrt CSWpakchois CSWlibproxy +RUNTIME_DEP_PKGS_CSWneonfull = CSWexpat CSWosslrt CSWzlib CSWggettextrt CSWpakchois CSWlibproxy CSWkrb5lib RUNTIME_DEP_PKGS_CSWneon-devel = CSWneon BUILD_DEP_PKGS = $(sort $(RUNTIME_DEP_PKGS_CSWneon) $(RUNTIME_DEP_PKGS_CSWneonfull)) 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 Feb 25 17:03:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Feb 2010 16:03:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8824] csw/mgar/pkg/netsnmp/trunk Message-ID: Revision: 8824 http://gar.svn.sourceforge.net/gar/?rev=8824&view=rev Author: dmichelsen Date: 2010-02-25 16:03:16 +0000 (Thu, 25 Feb 2010) Log Message: ----------- netsnmp: Fixes for Perl and 64 bit Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile csw/mgar/pkg/netsnmp/trunk/checksums csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2010-02-25 16:02:24 UTC (rev 8823) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2010-02-25 16:03:16 UTC (rev 8824) @@ -12,16 +12,19 @@ SF_PROJ = net-snmp MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(SF_PROJ)-$(GARVERSION).tar.gz - DISTNAME = $(SF_PROJ)-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz +# Patch for perl modules +PATCHFILES = perl_makefiles.diff +# Patch for python module +PATCHFILES += Makefile.in.diff + SPKG_SOURCEURL = http://www.net-snmp.org/ BUILD_DEP_PKGS = CSWpysetuptools +RUNTIME_DEP_PKGS = CSWosslrt CSWtcpwrap CSWpython -RUNTIME_DEP_PKGS += CSWosslrt CSWtcpwrap CSWpython - # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=12694 UPSTREAM_USE_SF = 1 @@ -30,44 +33,48 @@ BUILD64 = 1 NOISAEXEC = 1 +CONFIGURE_ARGS_mm-32 = --disable-embedded-perl --with-perl-modules=yes +CONFIGURE_ARGS_mm-32 += --with-python-modules=yes +CONFIGURE_ARGS_mm-64 = --disable-embedded-perl --without-perl-modules +CONFIGURE_ARGS_mm-64 += --without-python-modules + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-default-snmp-version=1 CONFIGURE_ARGS += --with-sys-contact=unknown CONFIGURE_ARGS += --with-sys-location=unknown CONFIGURE_ARGS += --with-logfile=/var/log/snmpd.log CONFIGURE_ARGS += --with-persistent-directory=/opt/csw/var/net-snmp -CONFIGURE_ARGS += '--with-mib-modules=ucd-snmp/diskio agentx mibII/mta_sendmail' -CONFIGURE_ARGS += '--with-libwrap=/opt/csw/lib' -CONFIGURE_ARGS += '--enable-ipv6' -CONFIGURE_ARGS += '--with-transports=UDP TCP Unix' -#CONFIGURE_ARGS += '--disable-embedded-perl' -CONFIGURE_ARGS += '--with-perl-modules=yes' -CONFIGURE_ARGS += '--with-python-modules=yes' +CONFIGURE_ARGS += --with-mib-modules="ucd-snmp/diskio agentx mibII/mta_sendmail" +CONFIGURE_ARGS += --with-libwrap=/opt/csw/lib +CONFIGURE_ARGS += --enable-ipv6 +CONFIGURE_ARGS += --with-transports="UDP TCP Unix" +CONFIGURE_ARGS += $(CONFIGURE_ARGS_mm-$(MEMORYMODEL)) -# Patch for perl modules -PATCHFILES = perl_makefiles.diff -# Patch for python module -PATCHFILES += Makefile.in.diff +EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod -#LD_OPTIONS = -#EXTRA_COMMON_EXPORTS = LD_OPTIONS +MERGE_DIRS_isa-extra = $(libdir) -EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod +# Overriding specific libs is not possible right now. Refine when finished. +# CHECKPKG_OVERRIDES_CSWnetsnmp = symbol-not-found|opt/csw/lib/python/site-packages/netsnmp/client_intf.so +CHECKPKG_OVERRIDES_CSWnetsnmp = symbol-not-found +CHECKPKG_OVERRIDES_CSWnetsnmp += missing-dependency|CSWperl include gar/category.mk post-install-isa-sparcv8: - @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_s.tar.gz |tar xf -) - @ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 - @ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 - @ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 - @ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 - @ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 + ( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_s.tar.gz |tar xf -) + ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 + ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 + ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 + ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 + ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 + @$(MAKECOOKIE) post-install-isa-i386: - @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_i.tar.gz |tar xf -) - @ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 - @ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 - @ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 - @ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 + ( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_i.tar.gz |tar xf -) + ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 + ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 + ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 + ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 @ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 + @$(MAKECOOKIE) Modified: csw/mgar/pkg/netsnmp/trunk/checksums =================================================================== --- csw/mgar/pkg/netsnmp/trunk/checksums 2010-02-25 16:02:24 UTC (rev 8823) +++ csw/mgar/pkg/netsnmp/trunk/checksums 2010-02-25 16:03:16 UTC (rev 8824) @@ -1,3 +1,3 @@ 5e0ec3e4d3dd363437d85eca6b91951a Makefile.in.diff 5b2551e7bd024fbbee84dca22a5f13a1 net-snmp-5.5.tar.gz -01897895a960cd9cafbf2457c1aff065 perl_makefiles.diff +c64f189decc111ba83c28f135bf96a9b perl_makefiles.diff Modified: csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2010-02-25 16:02:24 UTC (rev 8823) +++ csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2010-02-25 16:03:16 UTC (rev 8824) @@ -5,7 +5,7 @@ $lib_version = `$opts->{'nsconfig'} --version`; if (lc($opts->{'insource'}) eq "true") { -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ " . "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ " . $Params{'LIBS'}; $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'}; } @@ -16,7 +16,7 @@ $Params{'CCFLAGS'} .= " " . $Config{'ccflags'}; $lib_version = `$opts->{'nsconfig'} --version`; if (lc($opts->{'insource'}) eq "true") { -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ " . "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ " . $Params{'LIBS'}; $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'}; # } else { @@ -27,7 +27,7 @@ } $lib_version = `$opts->{'nsconfig'} --version`; if (lc($opts->{'insource'}) eq "true") { -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ " . "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ " . $Params{'LIBS'}; $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'}; # } else { @@ -38,7 +38,7 @@ } if (lc($opts->{'insource'}) eq "true") { -+ $Params{'LDDLFLAGS'} = "-L../../apps/.libs -L../../apps -L../../agent/.libs -L../../agent -L../../agent/helpers/.libs -L../../agent/helpers -L../../snmplib/.libs -L../../snmplib " . "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../apps/.libs -L../../apps -L../../agent/.libs -L../../agent -L../../agent/helpers/.libs -L../../agent/helpers -L../../snmplib/.libs -L../../snmplib -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = "-L../../apps/.libs -L../../apps -L../../agent/.libs -L../../agent -L../../agent/helpers/.libs -L../../agent/helpers -L../../snmplib/.libs -L../../snmplib " . $Params{'LIBS'}; $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'}; } else { @@ -49,7 +49,7 @@ $Params{'CCFLAGS'} .= " " . $Config{'ccflags'}; $lib_version = `$opts->{'nsconfig'} --version`; if (lc($opts->{'insource'}) eq "true") { -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L../../agent/.libs -L../../agent/ -L../../agent/helpers/.libs -L../../agent/helpers/ " . "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L../../agent/.libs -L../../agent/ -L../../agent/helpers/.libs -L../../agent/helpers/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ -L../../agent/.libs -L../../agent/ -L../../agent/helpers/.libs -L../../agent/helpers/ " . $Params{'LIBS'}; $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'}; # } else { @@ -60,7 +60,7 @@ $Params{'CCFLAGS'} .= " " . $Config{'ccflags'}; $lib_version = `$opts->{'nsconfig'} --version`; if (lc($opts->{'insource'}) eq "true") { -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ " . "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ " . $Params{'LIBS'}; $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'}; } @@ -70,7 +70,7 @@ } else { $opts = NetSNMPGetOpts("../../"); -+ $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; chomp($Params{'LIBS'}); $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; @@ -78,7 +78,7 @@ $Params{'CCFLAGS'} .= " " . $Config{'ccflags'}; $lib_version = `$opts->{'nsconfig'} --version`; if ($opts->{'insource'} eq "true") { -+ $Params{'LDDLFLAGS'} = "-L../../../snmplib/.libs -L../../../snmplib/ " . $Params{'LDDLFLAGS'}; ++ $Params{'LDDLFLAGS'} = "-L../../../snmplib/.libs -L../../../snmplib/ -L/opt/csw/lib -lperl " . $Params{'LDDLFLAGS'}; $Params{'LIBS'} = "-L../../../snmplib/.libs -L../../../snmplib/ " . $Params{'LIBS'}; $Params{'CCFLAGS'} = "-I../../../include " . $Params{'CCFLAGS'}; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 25 17:32:52 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 25 Feb 2010 16:32:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8825] csw/mgar/gar/v2/lib/checkpkg.d/ checkpkg-missing-symbols.py Message-ID: Revision: 8825 http://gar.svn.sourceforge.net/gar/?rev=8825&view=rev Author: wahwah Date: 2010-02-25 16:32:52 +0000 (Thu, 25 Feb 2010) Log Message: ----------- mGAR v2: Disabling the missing symbols check because it gives off too much false positives. Property Changed: ---------------- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-missing-symbols.py Property changes on: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-missing-symbols.py ___________________________________________________________________ Deleted: svn:executable - * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 25 18:45:44 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 25 Feb 2010 17:45:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8826] csw/mgar/pkg/googletest/trunk/Makefile Message-ID: Revision: 8826 http://gar.svn.sourceforge.net/gar/?rev=8826&view=rev Author: wahwah Date: 2010-02-25 17:45:44 +0000 (Thu, 25 Feb 2010) Log Message: ----------- googletest: Small updates, still doesn't build. Modified Paths: -------------- csw/mgar/pkg/googletest/trunk/Makefile Modified: csw/mgar/pkg/googletest/trunk/Makefile =================================================================== --- csw/mgar/pkg/googletest/trunk/Makefile 2010-02-25 16:32:52 UTC (rev 8825) +++ csw/mgar/pkg/googletest/trunk/Makefile 2010-02-25 17:45:44 UTC (rev 8826) @@ -17,13 +17,12 @@ SPKG_SOURCEURL = http://code.google.com/p/googletest/ MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = gtest-$(GARVERSION).tar.gz -WORKSRC = $(WORKDIR)/gtest-$(GARVERSION) +DISTNAME = gtest-$(GARVERSION) UFILES_REGEX = gtest-(\d+(?:\.\d+)*).tar.gz +EXTRA_CXXFLAGS = -library=stlport4 -library=no%Cstd +# EXTRA_LDFLAGS = -lCrun -lm +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -TEST_SCRIPTS = googletest -TEST_TARGETS = check -include gar/category.mk +TEST_TARGET = check -test-googletest: - (cd $(WORKSRC) && gmake check) - @$(MAKECOOKIE) +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Thu Feb 25 18:47:32 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Thu, 25 Feb 2010 17:47:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8827] csw/mgar/pkg/pidgin/trunk Message-ID: Revision: 8827 http://gar.svn.sourceforge.net/gar/?rev=8827&view=rev Author: bensons Date: 2010-02-25 17:47:24 +0000 (Thu, 25 Feb 2010) Log Message: ----------- pidgin: bumped to version 2.6.6, will build against our new perl, still some missing symbols, anyone eager to have a look at? beside that, pidgin runs fine :-) Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile csw/mgar/pkg/pidgin/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-Makefile.in csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-common-Makefile.PL.in csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-Makefile.in csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugin.c csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-Makefile.in csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-common-Makefile.PL.in Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2010-02-25 17:45:44 UTC (rev 8826) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2010-02-25 17:47:24 UTC (rev 8827) @@ -1,7 +1,7 @@ # $Id$ GARNAME = pidgin -GARVERSION = 2.6.5 +GARVERSION = 2.6.6 CATEGORIES = apps DESCRIPTION = Multi-protocol IM client @@ -20,12 +20,16 @@ CONFIGURE_ARGS += '--enable-gnutls=yes' CONFIGURE_ARGS += '--disable-nss' CONFIGURE_ARGS += '--disable-avahi' +CONFIGURE_ARGS += '--disable-screensaver' CONFIGURE_ARGS += '--disable-nm' CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib CONFIGURE_ARGS += --disable-vv +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so PATH = $(SOS11_CC_HOME)/bin:$(PATH) EXTRA_EXPORTS = PATH @@ -55,9 +59,16 @@ RUNTIME_DEP_PKGS += CSWlibcairo CSWlibdbus CSWlibxml2 CSWmeanwhile CSWncurses RUNTIME_DEP_PKGS += CSWpango CSWperl CSWpython CSWsilctoolkit CSWstartupnotif RUNTIME_DEP_PKGS += CSWtcl CSWtk CSWiconv CSWsunmath CSWzlib CSWdbus -RUNTIME_DEP_PKGS += CSWfconfig CSWftype2 CSWlibx11 CSWbdb CSWlibidn +RUNTIME_DEP_PKGS += CSWfconfig CSWftype2 CSWlibx11 CSWbdb47 CSWlibidn +RUNTIME_DEP_PKGS += CSWlibice CSWlibxext CSWlibsm CSWgstplugins - BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWlibdbusdev CSWdbusglibdev CSWgnutlsdevel +PATCHFILES += patch-pidgin-Makefile.in +PATCHFILES += patch-pidgin-plugin.c +PATCHFILES += patch-pidgin-plugins-perl-Makefile.in +PATCHFILES += patch-pidgin-plugins-perl-common-Makefile.PL.in +PATCHFILES += patch-libpurple-plugins-perl-Makefile.in +PATCHFILES += patch-libpurple-plugins-perl-common-Makefile.PL.in + include gar/category.mk Modified: csw/mgar/pkg/pidgin/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin/trunk/checksums 2010-02-25 17:45:44 UTC (rev 8826) +++ csw/mgar/pkg/pidgin/trunk/checksums 2010-02-25 17:47:24 UTC (rev 8827) @@ -1 +1,7 @@ -93306b1eff371fc28af580a2dc9679e6 download/pidgin-2.6.5.tar.gz +5043a5a5a6fd671631782a4562add729 patch-libpurple-plugins-perl-Makefile.in +685473080941d793ab08338c66a81e71 patch-libpurple-plugins-perl-common-Makefile.PL.in +99f3067ed65d2003f48629ebba5acc3d patch-pidgin-Makefile.in +37b9ed69736f803cc30eadc562d4b61c patch-pidgin-plugin.c +21aa84e80b62704aef90d90bb075f083 patch-pidgin-plugins-perl-Makefile.in +c643897c7eef3aefd713db4fa99e64e4 patch-pidgin-plugins-perl-common-Makefile.PL.in +29109672ea90e901b6bbebb09487e50f pidgin-2.6.6.tar.gz Added: csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-Makefile.in =================================================================== --- csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-Makefile.in (rev 0) +++ csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-Makefile.in 2010-02-25 17:47:24 UTC (rev 8827) @@ -0,0 +1,25 @@ +--- pidgin-2.6.6.orig/libpurple/plugins/perl/Makefile.in 2010-02-16 10:34:23.000000000 +0100 ++++ pidgin-2.6.6/libpurple/plugins/perl/Makefile.in 2010-02-25 17:26:31.537969797 +0100 +@@ -798,7 +798,7 @@ + ${LN_S} -f $$srcloc/$$f $$f; \ + done; \ + fi +- @cd common && $(perlpath) Makefile.PL ++ @cd common && $(perlpath) Makefile.PL INSTALLDIRS=vendor + + common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +@@ -807,10 +807,10 @@ + @for dir in $(perl_dirs); do \ + cd $$dir && \ + if [ ! -f Makefile ]; then \ +- $(perlpath) Makefile.PL; \ ++ $(perlpath) Makefile.PL INSTALLDIRS=vendor; \ + fi && \ +- ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \ +- $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \ ++ ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS) $(PERL_LIBS)" $(PERL_EXTRA_OPTS) || \ ++ $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS) $(PERL_LIBS)" $(PERL_EXTRA_OPTS)) && \ + cd ..; \ + done + Added: csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-common-Makefile.PL.in =================================================================== --- csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-common-Makefile.PL.in (rev 0) +++ csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-common-Makefile.PL.in 2010-02-25 17:47:24 UTC (rev 8827) @@ -0,0 +1,10 @@ +--- pidgin-2.6.6.orig/libpurple/plugins/perl/common/Makefile.PL.in 2010-02-16 10:34:06.000000000 +0100 ++++ pidgin-2.6.6/libpurple/plugins/perl/common/Makefile.PL.in 2010-02-25 18:18:46.653361400 +0100 +@@ -11,6 +11,7 @@ + AUTHOR => 'Purple ') : ()), + 'DEFINE' => '@DEBUG_CFLAGS@', + 'INC' => '-I. -I at srcdir@ -I at top_srcdir@ -I at top_srcdir@/libpurple @GLIB_CFLAGS@', ++ 'LIBS' => '@PERL_LIBS@', + 'OBJECT' => '$(O_FILES)', # link all the C files too + # 'OPTIMIZE' => '-g', # For debugging + 'INSTALLDIRS' => 'vendor', Added: csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-Makefile.in =================================================================== --- csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-Makefile.in (rev 0) +++ csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-Makefile.in 2010-02-25 17:47:24 UTC (rev 8827) @@ -0,0 +1,10 @@ +--- pidgin-2.6.6.orig/pidgin/Makefile.in 2010-02-16 10:34:30.000000000 +0100 ++++ pidgin-2.6.6/pidgin/Makefile.in 2010-02-25 17:32:26.985892766 +0100 +@@ -695,6 +695,7 @@ + @ENABLE_GTK_TRUE@ $(DBUS_LIBS) \ + @ENABLE_GTK_TRUE@ $(GSTREAMER_LIBS) \ + @ENABLE_GTK_TRUE@ $(XSS_LIBS) \ ++ at ENABLE_GTK_TRUE@ $(X11_LIBS) \ + @ENABLE_GTK_TRUE@ $(SM_LIBS) \ + @ENABLE_GTK_TRUE@ $(INTLLIBS) \ + @ENABLE_GTK_TRUE@ $(GTKSPELL_LIBS) \ Added: csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugin.c =================================================================== --- csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugin.c (rev 0) +++ csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugin.c 2010-02-25 17:47:24 UTC (rev 8827) @@ -0,0 +1,11 @@ +--- pidgin-2.6.6.orig/libpurple/plugin.c 2010-02-16 10:34:06.000000000 +0100 ++++ pidgin-2.6.6/libpurple/plugin.c 2010-02-25 12:01:40.545624295 +0100 +@@ -876,7 +876,7 @@ + * it keeps all the plugins open, meaning that valgrind is able to + * resolve symbol names in leak traces from plugins. + */ +- if (!g_getenv("PURPLE_LEAKCHECK_HELP") && !RUNNING_ON_VALGRIND) ++ if (!g_getenv("PURPLE_LEAKCHECK_HELP")) + { + if (plugin->handle != NULL) + g_module_close(plugin->handle); Added: csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-Makefile.in =================================================================== --- csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-Makefile.in (rev 0) +++ csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-Makefile.in 2010-02-25 17:47:24 UTC (rev 8827) @@ -0,0 +1,25 @@ +--- pidgin-2.6.6.orig/pidgin/plugins/perl/Makefile.in 2010-02-16 10:34:32.000000000 +0100 ++++ pidgin-2.6.6/pidgin/plugins/perl/Makefile.in 2010-02-25 17:25:56.810869007 +0100 +@@ -604,7 +604,7 @@ + ${LN_S} -f $$srcloc/$$f $$f; \ + done; \ + fi +- @cd common && $(perlpath) Makefile.PL ++ @cd common && $(perlpath) Makefile.PL INSTALLDIRS=vendor + + common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +@@ -613,10 +613,10 @@ + @for dir in $(perl_dirs); do \ + cd $$dir && \ + if [ ! -f Makefile ]; then \ +- $(perlpath) Makefile.PL; \ ++ $(perlpath) Makefile.PL INSTALLDIRS=vendor; \ + fi && \ +- ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \ +- $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \ ++ ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS) $(PERL_LIBS)" $(PERL_EXTRA_OPTS) || \ ++ $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS) $(PERL_LIBS)" $(PERL_EXTRA_OPTS)) && \ + cd ..; \ + done + Added: csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-common-Makefile.PL.in =================================================================== --- csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-common-Makefile.PL.in (rev 0) +++ csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-common-Makefile.PL.in 2010-02-25 17:47:24 UTC (rev 8827) @@ -0,0 +1,10 @@ +--- pidgin-2.6.6.orig/pidgin/plugins/perl/common/Makefile.PL.in 2010-02-16 10:34:06.000000000 +0100 ++++ pidgin-2.6.6/pidgin/plugins/perl/common/Makefile.PL.in 2010-02-25 18:10:57.385636308 +0100 +@@ -10,6 +10,7 @@ + 'AUTHOR' => 'Pidgin ') : ()), + 'DEFINE' => '@DEBUG_CFLAGS@', + 'INC' => '-I. -I at srcdir@ -I at top_srcdir@ -I at top_srcdir@/libpurple -I at top_srcdir@/pidgin @GTK_CFLAGS@', ++ 'LIBS' => '@PERL_LIBS@', + 'OBJECT' => '$(O_FILES)', # link all the C files too + 'TYPEMAPS' => ["@top_srcdir@/libpurple/plugins/perl/common/typemap"], + # 'OPTIMIZE' => '-g', # For debugging. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Thu Feb 25 18:49:11 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Thu, 25 Feb 2010 17:49:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8828] csw/mgar/pkg/pidgin/trunk/files/fixme.sh Message-ID: Revision: 8828 http://gar.svn.sourceforge.net/gar/?rev=8828&view=rev Author: bensons Date: 2010-02-25 17:49:11 +0000 (Thu, 25 Feb 2010) Log Message: ----------- pidgin: remove fixme.sh, its included in GAR Removed Paths: ------------- csw/mgar/pkg/pidgin/trunk/files/fixme.sh Deleted: csw/mgar/pkg/pidgin/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/pidgin/trunk/files/fixme.sh 2010-02-25 17:47:24 UTC (rev 8827) +++ csw/mgar/pkg/pidgin/trunk/files/fixme.sh 2010-02-25 17:49:11 UTC (rev 8828) @@ -1,49 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme.sh -# Intended to remove the use of libtool's -# pseudo-libraries for opencsw builds. -# -# Author: Mike Watters mwatters_at_opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix Makefiles -for mk in $(gfind ${BASEPATH} -name Makefile -print); do - LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ - gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") - - for file in ${LT_FILES}; do - LIB_NAME=$(ggrep 'dlname=' ${file} | \ - gsed -e "s/.*'\(.*\)'/\1/" \ - -e "s/^lib//" \ - -e "s/\.so.*$//") - fixpath=$(gecho $file |gsed 's/\//\\\//g') - gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new - gmv Makefile.new ${mk} - done -done - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - gmv ${lt}.new ${lt} -done - -LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print) -if [ -f ${LTMAIN} ]; then - gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new - gmv ${LTMAIN}.new ${LTMAIN} -fi - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Feb 25 20:15:45 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 25 Feb 2010 19:15:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8829] csw/mgar/gar/v2/categories/python/category.mk Message-ID: Revision: 8829 http://gar.svn.sourceforge.net/gar/?rev=8829&view=rev Author: wahwah Date: 2010-02-25 19:15:45 +0000 (Thu, 25 Feb 2010) Log Message: ----------- mGAR v2: Include eggs by default in Python builds. Modified Paths: -------------- csw/mgar/gar/v2/categories/python/category.mk Modified: csw/mgar/gar/v2/categories/python/category.mk =================================================================== --- csw/mgar/gar/v2/categories/python/category.mk 2010-02-25 17:49:11 UTC (rev 8828) +++ csw/mgar/gar/v2/categories/python/category.mk 2010-02-25 19:15:45 UTC (rev 8829) @@ -1,8 +1,11 @@ # Add a dependency to CSWpython _EXTRA_GAR_PKGS += CSWpython -# Exclude egg-info files (only needed for easy_install) -_MERGE_EXCLUDE_CATEGORY += .*\.egg-info.* +# For the record, do not include the following line: +# _MERGE_EXCLUDE_CATEGORY += .*\.egg-info.* +# +# It breaks pysetuptools and trac. Here's a relevant reading: +# http://fedoraproject.org/wiki/Packaging:Python#Packaging_eggs_and_setuptools_concerns # Activate cswpycompile support to exclude .pyc and .pyo files from # the package and compile them on installation. File exclusion is 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 Feb 26 09:51:26 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Feb 2010 08:51:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[8830] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8830 http://gar.svn.sourceforge.net/gar/?rev=8830&view=rev Author: dmichelsen Date: 2010-02-26 08:51:26 +0000 (Fri, 26 Feb 2010) Log Message: ----------- mGAR v2: Bail out if given alternative is empty Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-02-25 19:15:45 UTC (rev 8829) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-26 08:51:26 UTC (rev 8830) @@ -692,8 +692,11 @@ merge-alternatives-%: @echo "[ Generating alternatives for package $* ]" $(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/alternatives - $(_DBG)($(foreach A,$(or $(ALTERNATIVES_$*),$(ALTERNATIVES)),echo "$(ALTERNATIVE_$A)";)) \ - > $(PKGROOT)/opt/csw/share/alternatives/$(call catalogname,$*) + $(_DBG)($(foreach A,$(or $(ALTERNATIVES_$*),$(ALTERNATIVES)), \ + $(if $(ALTERNATIVE_$A), \ + echo "$(ALTERNATIVE_$A)";, \ + $(error The variable 'ALTERNATIVE_$A' is empty, but must contain an alternative) \ + ))) > $(PKGROOT)/opt/csw/share/alternatives/$(call catalogname,$*) @$(MAKECOOKIE) merge-alternatives: $(foreach S,$(SPKG_SPECS),$(if $(or $(ALTERNATIVES_$S),$(ALTERNATIVES)),merge-alternatives-$S)) 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 Feb 26 09:51:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Feb 2010 08:51:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8831] csw/mgar/pkg/tcpwrappers/trunk/Makefile Message-ID: Revision: 8831 http://gar.svn.sourceforge.net/gar/?rev=8831&view=rev Author: dmichelsen Date: 2010-02-26 08:51:47 +0000 (Fri, 26 Feb 2010) Log Message: ----------- tcpwrappers: Fix typo Modified Paths: -------------- csw/mgar/pkg/tcpwrappers/trunk/Makefile Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/Makefile 2010-02-26 08:51:26 UTC (rev 8830) +++ csw/mgar/pkg/tcpwrappers/trunk/Makefile 2010-02-26 08:51:47 UTC (rev 8831) @@ -67,10 +67,10 @@ MIGRATE_FILES = hosts.allow hosts.deny ALTERNATIVES = std ext -ALTERNATIVES_std = $(libdir)/libwrap.so.1 tcpwrappers $(libdir)/libwrap-std.so.1 200 -ALTERNATIVES_std += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-std.so.1 -ALTERNATIVES_ext = $(libdir)/libwrap.so.1 tcpwrappers $(libdir)/libwrap-ext.so.1 100 -ALTERNATIVES_ext += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-ext.so.1 +ALTERNATIVE_std = $(libdir)/libwrap.so.1 tcpwrappers $(libdir)/libwrap-std.so.1 200 +ALTERNATIVE_std += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-std.so.1 +ALTERNATIVE_ext = $(libdir)/libwrap.so.1 tcpwrappers $(libdir)/libwrap-ext.so.1 100 +ALTERNATIVE_ext += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-ext.so.1 POSTMSG = $(docdir)/$(CATALOGNAME)/CSWtcpwrap.postmsg 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 Feb 26 10:28:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Feb 2010 09:28:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8832] csw/mgar/pkg/cpan/XML-Parser/trunk Message-ID: Revision: 8832 http://gar.svn.sourceforge.net/gar/?rev=8832&view=rev Author: dmichelsen Date: 2010-02-26 09:28:02 +0000 (Fri, 26 Feb 2010) Log Message: ----------- cpan/XML-Parser: Add license Modified Paths: -------------- csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile csw/mgar/pkg/cpan/XML-Parser/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/XML-Parser/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile 2010-02-26 08:51:47 UTC (rev 8831) +++ csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile 2010-02-26 09:28:02 UTC (rev 8832) @@ -15,6 +15,8 @@ options given at XML::Parser creation time. endef +DISTFILES = COPYING + PACKAGES = CSWpmxmlparser CATALOGNAME = pm_xmlparser Modified: csw/mgar/pkg/cpan/XML-Parser/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-Parser/trunk/checksums 2010-02-26 08:51:47 UTC (rev 8831) +++ csw/mgar/pkg/cpan/XML-Parser/trunk/checksums 2010-02-26 09:28:02 UTC (rev 8832) @@ -1 +1,2 @@ +a6b84b59a404d69e75ad416993ad9724 COPYING 1b868962b658bd87e1563ecd56498ded XML-Parser-2.36.tar.gz Added: csw/mgar/pkg/cpan/XML-Parser/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/XML-Parser/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/XML-Parser/trunk/files/COPYING 2010-02-26 09:28:02 UTC (rev 8832) @@ -0,0 +1,4 @@ +Copyright (c) 1998-2000 Larry Wall and Clark Cooper. +All rights reserved. +This program is free software; you can redistribute it and/or modify it +under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Feb 26 12:35:11 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 26 Feb 2010 11:35:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8833] csw/mgar/pkg/pidgin/trunk Message-ID: Revision: 8833 http://gar.svn.sourceforge.net/gar/?rev=8833&view=rev Author: bensons Date: 2010-02-26 11:35:11 +0000 (Fri, 26 Feb 2010) Log Message: ----------- pidgin: fixed build. removed unnecessary patches Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile csw/mgar/pkg/pidgin/trunk/checksums csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-common-Makefile.PL.in csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-common-Makefile.PL.in Removed Paths: ------------- csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-Makefile.in csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-Makefile.in Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2010-02-26 09:28:02 UTC (rev 8832) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2010-02-26 11:35:11 UTC (rev 8833) @@ -27,9 +27,6 @@ CONFIGURE_ARGS += --disable-vv -EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so PATH = $(SOS11_CC_HOME)/bin:$(PATH) EXTRA_EXPORTS = PATH @@ -40,8 +37,9 @@ SED=/opt/csw/bin/gsed X11_CFLAGS=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DXTHREADS -DXUSE_MTSAFE_API X11_LIBS=-lX11 +LIBS=-lm EXTRA_CONFIGURE_EXPORTS = DOT XGETTEXT MSGFMT MSGMERGE SED PKG_CONFIG_PATH -EXTRA_CONFIGURE_EXPORTS += X11_CFLAGS X11_LIBS +EXTRA_CONFIGURE_EXPORTS += X11_CFLAGS X11_LIBS LIBS EXTRA_INC = /opt/csw/include/ncurses TEST_TARGET = check TEST_SCRIPTS = @@ -51,6 +49,9 @@ EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib EXTRA_LDFLAGS = -R $(prefix)/X11/lib +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod @@ -66,9 +67,7 @@ PATCHFILES += patch-pidgin-Makefile.in PATCHFILES += patch-pidgin-plugin.c -PATCHFILES += patch-pidgin-plugins-perl-Makefile.in PATCHFILES += patch-pidgin-plugins-perl-common-Makefile.PL.in -PATCHFILES += patch-libpurple-plugins-perl-Makefile.in PATCHFILES += patch-libpurple-plugins-perl-common-Makefile.PL.in include gar/category.mk Modified: csw/mgar/pkg/pidgin/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin/trunk/checksums 2010-02-26 09:28:02 UTC (rev 8832) +++ csw/mgar/pkg/pidgin/trunk/checksums 2010-02-26 11:35:11 UTC (rev 8833) @@ -1,7 +1,5 @@ -5043a5a5a6fd671631782a4562add729 patch-libpurple-plugins-perl-Makefile.in -685473080941d793ab08338c66a81e71 patch-libpurple-plugins-perl-common-Makefile.PL.in +23e1ef54d5f0c555764d5c4093ba243c patch-libpurple-plugins-perl-common-Makefile.PL.in 99f3067ed65d2003f48629ebba5acc3d patch-pidgin-Makefile.in 37b9ed69736f803cc30eadc562d4b61c patch-pidgin-plugin.c -21aa84e80b62704aef90d90bb075f083 patch-pidgin-plugins-perl-Makefile.in -c643897c7eef3aefd713db4fa99e64e4 patch-pidgin-plugins-perl-common-Makefile.PL.in +a3b5a3ad53033dc1432562ca72fc0760 patch-pidgin-plugins-perl-common-Makefile.PL.in 29109672ea90e901b6bbebb09487e50f pidgin-2.6.6.tar.gz Deleted: csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-Makefile.in =================================================================== --- csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-Makefile.in 2010-02-26 09:28:02 UTC (rev 8832) +++ csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-Makefile.in 2010-02-26 11:35:11 UTC (rev 8833) @@ -1,25 +0,0 @@ ---- pidgin-2.6.6.orig/libpurple/plugins/perl/Makefile.in 2010-02-16 10:34:23.000000000 +0100 -+++ pidgin-2.6.6/libpurple/plugins/perl/Makefile.in 2010-02-25 17:26:31.537969797 +0100 -@@ -798,7 +798,7 @@ - ${LN_S} -f $$srcloc/$$f $$f; \ - done; \ - fi -- @cd common && $(perlpath) Makefile.PL -+ @cd common && $(perlpath) Makefile.PL INSTALLDIRS=vendor - - common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -@@ -807,10 +807,10 @@ - @for dir in $(perl_dirs); do \ - cd $$dir && \ - if [ ! -f Makefile ]; then \ -- $(perlpath) Makefile.PL; \ -+ $(perlpath) Makefile.PL INSTALLDIRS=vendor; \ - fi && \ -- ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \ -- $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \ -+ ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS) $(PERL_LIBS)" $(PERL_EXTRA_OPTS) || \ -+ $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS) $(PERL_LIBS)" $(PERL_EXTRA_OPTS)) && \ - cd ..; \ - done - Modified: csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-common-Makefile.PL.in =================================================================== --- csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-common-Makefile.PL.in 2010-02-26 09:28:02 UTC (rev 8832) +++ csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-common-Makefile.PL.in 2010-02-26 11:35:11 UTC (rev 8833) @@ -1,10 +1,18 @@ --- pidgin-2.6.6.orig/libpurple/plugins/perl/common/Makefile.PL.in 2010-02-16 10:34:06.000000000 +0100 -+++ pidgin-2.6.6/libpurple/plugins/perl/common/Makefile.PL.in 2010-02-25 18:18:46.653361400 +0100 -@@ -11,6 +11,7 @@ ++++ pidgin-2.6.6/libpurple/plugins/perl/common/Makefile.PL.in 2010-02-26 10:04:39.981704542 +0100 +@@ -11,11 +11,14 @@ AUTHOR => 'Purple ') : ()), 'DEFINE' => '@DEBUG_CFLAGS@', 'INC' => '-I. -I at srcdir@ -I at top_srcdir@ -I at top_srcdir@/libpurple @GLIB_CFLAGS@', -+ 'LIBS' => '@PERL_LIBS@', ++ 'LIBS' => '@PERL_LIBS@ -lglib-2.0', 'OBJECT' => '$(O_FILES)', # link all the C files too # 'OPTIMIZE' => '-g', # For debugging 'INSTALLDIRS' => 'vendor', + 'INSTALL_BASE' => '$(prefix)', +- 'INSTALLVENDORARCH' => '$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/perl', ++ 'INSTALLVENDORARCH' => '$(libdir)/perl/csw', ++ 'INSTALLVENDORLIB' => '$(libdir)/perl/csw', ++ 'INSTALLARCHLIB' => '$(libdir)/perl/csw', + 'INSTALLVENDORMAN3DIR' => '$(mandir)/man3', + 'macro' => { + 'prefix' => '@prefix@', Deleted: csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-Makefile.in =================================================================== --- csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-Makefile.in 2010-02-26 09:28:02 UTC (rev 8832) +++ csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-Makefile.in 2010-02-26 11:35:11 UTC (rev 8833) @@ -1,25 +0,0 @@ ---- pidgin-2.6.6.orig/pidgin/plugins/perl/Makefile.in 2010-02-16 10:34:32.000000000 +0100 -+++ pidgin-2.6.6/pidgin/plugins/perl/Makefile.in 2010-02-25 17:25:56.810869007 +0100 -@@ -604,7 +604,7 @@ - ${LN_S} -f $$srcloc/$$f $$f; \ - done; \ - fi -- @cd common && $(perlpath) Makefile.PL -+ @cd common && $(perlpath) Makefile.PL INSTALLDIRS=vendor - - common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -@@ -613,10 +613,10 @@ - @for dir in $(perl_dirs); do \ - cd $$dir && \ - if [ ! -f Makefile ]; then \ -- $(perlpath) Makefile.PL; \ -+ $(perlpath) Makefile.PL INSTALLDIRS=vendor; \ - fi && \ -- ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \ -- $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \ -+ ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS) $(PERL_LIBS)" $(PERL_EXTRA_OPTS) || \ -+ $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS) $(PERL_LIBS)" $(PERL_EXTRA_OPTS)) && \ - cd ..; \ - done - Modified: csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-common-Makefile.PL.in =================================================================== --- csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-common-Makefile.PL.in 2010-02-26 09:28:02 UTC (rev 8832) +++ csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-common-Makefile.PL.in 2010-02-26 11:35:11 UTC (rev 8833) @@ -1,10 +1,19 @@ --- pidgin-2.6.6.orig/pidgin/plugins/perl/common/Makefile.PL.in 2010-02-16 10:34:06.000000000 +0100 -+++ pidgin-2.6.6/pidgin/plugins/perl/common/Makefile.PL.in 2010-02-25 18:10:57.385636308 +0100 -@@ -10,6 +10,7 @@ ++++ pidgin-2.6.6/pidgin/plugins/perl/common/Makefile.PL.in 2010-02-26 09:59:56.721552783 +0100 +@@ -10,12 +10,15 @@ 'AUTHOR' => 'Pidgin ') : ()), 'DEFINE' => '@DEBUG_CFLAGS@', 'INC' => '-I. -I at srcdir@ -I at top_srcdir@ -I at top_srcdir@/libpurple -I at top_srcdir@/pidgin @GTK_CFLAGS@', -+ 'LIBS' => '@PERL_LIBS@', ++ 'LIBS' => '@PERL_LIBS@ -lglib-2.0', 'OBJECT' => '$(O_FILES)', # link all the C files too 'TYPEMAPS' => ["@top_srcdir@/libpurple/plugins/perl/common/typemap"], # 'OPTIMIZE' => '-g', # For debugging. + 'INSTALLDIRS' => 'vendor', + 'INSTALL_BASE' => '$(prefix)', +- 'INSTALLVENDORARCH' => '$(libdir)/pidgin/perl', ++ 'INSTALLVENDORARCH' => '$(libdir)/perl/csw', ++ 'INSTALLVENDORLIB' => '$(libdir)/perl/csw', ++ 'INSTALLARCHLIB' => '$(libdir)/perl/csw', + 'INSTALLVENDORMAN3DIR' => '$(mandir)/man3', + 'macro' => { + 'prefix' => '@prefix@', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Feb 26 15:09:51 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Feb 2010 14:09:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[8834] csw/mgar/pkg/setoolkit/trunk/checksums Message-ID: Revision: 8834 http://gar.svn.sourceforge.net/gar/?rev=8834&view=rev Author: dmichelsen Date: 2010-02-26 14:09:51 +0000 (Fri, 26 Feb 2010) Log Message: ----------- setoolkit: Update 3.5.1 sources Modified Paths: -------------- csw/mgar/pkg/setoolkit/trunk/checksums Modified: csw/mgar/pkg/setoolkit/trunk/checksums =================================================================== --- csw/mgar/pkg/setoolkit/trunk/checksums 2010-02-26 11:35:11 UTC (rev 8833) +++ csw/mgar/pkg/setoolkit/trunk/checksums 2010-02-26 14:09:51 UTC (rev 8834) @@ -1 +1 @@ -42f6f22d03ce2fc4ac145c816af56f59 setoolkit-3.5.1.tar.gz +8e592c0b09260597a85b9f325dcdfc33 setoolkit-3.5.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Feb 26 15:12:03 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 26 Feb 2010 14:12:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[8835] csw/mgar/pkg/pylxml/trunk Message-ID: Revision: 8835 http://gar.svn.sourceforge.net/gar/?rev=8835&view=rev Author: skayser Date: 2010-02-26 14:12:03 +0000 (Fri, 26 Feb 2010) Log Message: ----------- pylxml: version bump, pkgname tweak, include license Modified Paths: -------------- csw/mgar/pkg/pylxml/trunk/Makefile csw/mgar/pkg/pylxml/trunk/checksums csw/mgar/pkg/pylxml/trunk/files/changelog.CSW Modified: csw/mgar/pkg/pylxml/trunk/Makefile =================================================================== --- csw/mgar/pkg/pylxml/trunk/Makefile 2010-02-26 14:09:51 UTC (rev 8834) +++ csw/mgar/pkg/pylxml/trunk/Makefile 2010-02-26 14:12:03 UTC (rev 8835) @@ -2,7 +2,7 @@ # - Move this to a pymodules/ subdirectory with the rest of the # python modules (similar to the cpan directory). GARNAME = pylxml -GARVERSION = 2.2.2 +GARVERSION = 2.2.4 CATEGORIES = python DESCRIPTION = Pythonic binding for the libxml2 and libxslt libraries @@ -13,13 +13,16 @@ but superior to the well-known ElementTree API. endef -SPKG_SOURCEURL = http://codespeak.net/lxml/ +VENDOR_URL = http://codespeak.net/lxml/ MASTER_SITES = http://pypi.python.org/packages/source/l/lxml/ -DISTNAME = lxml-$(GARVERSION) -DISTFILES = $(DISTNAME).tar.gz +DISTNAME = lxml-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz UFILES_REGEX = lxml-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWpylxml +# See http://codespeak.net/lxml/index.html#license +LICENSE = doc/licenses/BSD.txt + +PACKAGES = CSWpy-lxml CATALOGNAME = py_lxml RUNTIME_DEP_PKGS = CSWlibxml2 CSWlibxslt CSWzlib Modified: csw/mgar/pkg/pylxml/trunk/checksums =================================================================== --- csw/mgar/pkg/pylxml/trunk/checksums 2010-02-26 14:09:51 UTC (rev 8834) +++ csw/mgar/pkg/pylxml/trunk/checksums 2010-02-26 14:12:03 UTC (rev 8835) @@ -1 +1 @@ -2f2fcb6aae51b5b417a3c0a6b256ec56 download/lxml-2.2.2.tar.gz +077841e74ee728e7746b65d8483274be lxml-2.2.4.tar.gz Modified: csw/mgar/pkg/pylxml/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/pylxml/trunk/files/changelog.CSW 2010-02-26 14:09:51 UTC (rev 8834) +++ csw/mgar/pkg/pylxml/trunk/files/changelog.CSW 2010-02-26 14:12:03 UTC (rev 8835) @@ -1,5 +1,5 @@ -py_lxml (2.2.2,REV=2009.10.02) +pylxml (2.2.4,REV=2010.02.26) * Initial release. - -- Sebastian Kayser Fri, 2 Oct 2009 23:31:04 +0200 + -- Sebastian Kayser Fri, 26 Feb 2010 15:05:38 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Feb 26 15:26:35 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 26 Feb 2010 14:26:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[8836] csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Message-ID: Revision: 8836 http://gar.svn.sourceforge.net/gar/?rev=8836&view=rev Author: wahwah Date: 2010-02-26 14:26:35 +0000 (Fri, 26 Feb 2010) Log Message: ----------- mGAR v2: submitpkg, a better help message Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-02-26 14:12:03 UTC (rev 8835) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-02-26 14:26:35 UTC (rev 8836) @@ -90,7 +90,8 @@ parser = optparse.OptionParser() parser.add_option("-p", "--pkgnames", dest="pkgnames", - help="A comma-separated list of pkgnames") + help="A comma-separated list of pkgnames: " + "cups,cupsdevel,libcups") parser.add_option("-d", "--debug", dest="debug", default=False, action="store_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 Fri Feb 26 15:37:15 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 26 Feb 2010 14:37:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[8837] csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Message-ID: Revision: 8837 http://gar.svn.sourceforge.net/gar/?rev=8837&view=rev Author: wahwah Date: 2010-02-26 14:37:15 +0000 (Fri, 26 Feb 2010) Log Message: ----------- mGAR v2: submitpkg, rename pkgnames to catalognames Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-02-26 14:26:35 UTC (rev 8836) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-02-26 14:37:15 UTC (rev 8837) @@ -88,9 +88,12 @@ raise ConfigurationError("Option %s is missing from the configuration." % repr(opt_name)) parser = optparse.OptionParser() - parser.add_option("-p", "--pkgnames", + parser.add_option("-p", dest="pkgnames", - help="A comma-separated list of pkgnames: " + help="A deprecated options. Please use --catalognames.") + parser.add_option("-c", "--catalognames", + dest="catalognames", + help="A comma-separated list of catalog names: " "cups,cupsdevel,libcups") parser.add_option("-d", "--debug", dest="debug", default=False, @@ -101,7 +104,15 @@ if options.debug: level = logging.DEBUG logging.basicConfig(level=level) - if not options.pkgnames: + if options.pkgnames: + logging.warn("The -p option is deprecated. Please use " + "--catalognames or -c") + if options.catalognames: + options.catalognames = ",".join([options.catalognames, + options.pkgnames]) + else: + options.catalognames = options.pkgnames + if not options.catalognames: parser.print_help() raise ConfigurationError("You need to specify a package name or names.") if config.has_option(CONFIG_RELEASE_SECTION, "release cc"): @@ -113,11 +124,11 @@ print CONFIG_INFO print e sys.exit(1) - pkgnames = options.pkgnames.split(",") + catalognames = options.catalognames.split(",") package_files = [] staging_dir = opencsw.StagingDir(config.get(CONFIG_RELEASE_SECTION, "package dir")) - for p in pkgnames: + for p in catalognames: package_files.extend(staging_dir.GetLatest(p)) logging.debug("Copying files to the target host:dir") remote_package_files = [] @@ -140,11 +151,12 @@ "Couldn't run %s, is the binary " "in the $PATH? The error was: %s" % (repr(args[0]), e)) if ret: - msg = "Copying %s to %s has failed." % (p, dst_arg) + msg = ("Copying %s to %s has failed. " + "Are you on the login host?" % (p, dst_arg)) logging.error(msg) raise PackageSubmissionError(msg) nm = opencsw.NewpkgMailer( - pkgnames, remote_package_references, + catalognames, remote_package_references, release_mgr_name=config.get(CONFIG_RELEASE_SECTION, "release manager name"), release_mgr_email=config.get(CONFIG_RELEASE_SECTION, "release manager email"), sender_name=config.get(CONFIG_RELEASE_SECTION, "sender name"), 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 Feb 26 15:39:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Feb 2010 14:39:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[8838] csw/mgar/pkg/lynx/trunk Message-ID: Revision: 8838 http://gar.svn.sourceforge.net/gar/?rev=8838&view=rev Author: dmichelsen Date: 2010-02-26 14:39:27 +0000 (Fri, 26 Feb 2010) Log Message: ----------- lynx: Update to mGAR v2 and 2.8.7 Modified Paths: -------------- csw/mgar/pkg/lynx/trunk/Makefile csw/mgar/pkg/lynx/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lynx/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/lynx/trunk/files/CSWlynx.depend csw/mgar/pkg/lynx/trunk/files/CSWlynx.gspec csw/mgar/pkg/lynx/trunk/files/CSWlynx.prototype Property Changed: ---------------- csw/mgar/pkg/lynx/trunk/ Property changes on: csw/mgar/pkg/lynx/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/lynx/trunk/Makefile =================================================================== --- csw/mgar/pkg/lynx/trunk/Makefile 2010-02-26 14:37:15 UTC (rev 8837) +++ csw/mgar/pkg/lynx/trunk/Makefile 2010-02-26 14:39:27 UTC (rev 8838) @@ -1,5 +1,5 @@ GARNAME = lynx -GARVERSION = 2.8.6 +GARVERSION = 2.8.7 CATEGORIES = net DESCRIPTION = lynx - text browser for the World Wide Web @@ -13,14 +13,16 @@ MASTER_SITES = http://lynx.isc.org/release/ DISTFILES = $(GARNAME)$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWlynx,depend) +DISTFILES += COPYING +DEP_PKGS = CSWbzip2 CSWncurses CSWosslrt CSWzlib + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 WORKSRC = $(WORKDIR)/$(subst .,-,$(GARNAME)$(GARVERSION)) -#LIBDEPS += lib/ncurses lib/openssl +sysconfdir = /etc/opt/csw CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-screen=ncurses --enable-default-colors @@ -28,16 +30,14 @@ CONFIGURE_ARGS += --disable-finger --disable-gopher --disable-news CONFIGURE_ARGS += --enable-cgi-links --enable-exec-links --enable-exec-scripts +MIGRATE_FILES = lynx.lss lynx.cfg +PRESERVECONF = /etc/opt/csw/lynx.lss +PRESERVECONF += /etc/opt/csw/lynx.cfg + # This ensures that Lynx picks up its own entities.h, not the one installed # in one of the system directories, i. e. /opt/csw (that one's part of GD). SUN_CPP_FLAGS = -I./chrtrans -#CONFIGURE_ARGS = --prefix=/opt/csw \ -# --libdir=/opt/csw/share/lynx \ -# --mandir=/opt/csw/share/man \ -# --infodir=/opt/csw/share/info \ -# --with-nls-datadir=/opt/csw/share \ -# --with-ssl=/opt/csw \ # --enable-prettysrc \ # --with-zlib \ # --enable-gzip-help \ Modified: csw/mgar/pkg/lynx/trunk/checksums =================================================================== --- csw/mgar/pkg/lynx/trunk/checksums 2010-02-26 14:37:15 UTC (rev 8837) +++ csw/mgar/pkg/lynx/trunk/checksums 2010-02-26 14:39:27 UTC (rev 8838) @@ -1,3 +1,2 @@ -ec2186504f6141e87bac3783b1208db1 download/lynx2.8.6.tar.bz2 -64b0af38bea081ad0ec099405b5957b9 download/CSWlynx.gspec -96e6a2f626bdea332a17a0b0e9213cc2 download/CSWlynx.depend +8d3f03612be5f6b135124e4c06573e94 COPYING +493af4c77ef6761e3f0157cd1be033a0 lynx2.8.7.tar.bz2 Added: csw/mgar/pkg/lynx/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/lynx/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/lynx/trunk/files/COPYING 2010-02-26 14:39:27 UTC (rev 8838) @@ -0,0 +1,14 @@ + Lynx is distributed under the GNU General Public License (GPL) without + restrictions on usage or redistribution. The Lynx copyright statement, + "COPYHEADER", and GNU GPL, "COPYING", are included in the top-level + directory of the distribution. Lynx is supported by the Lynx user + community, an entirely volunteer (and unofficial) organization. + + Certain portions of the Lynx source distribution were originally + created by CERN and have been modified during the development of + Lynx. See WWW/FreeofCharge.html for copyright info regarding CERN + products used in Lynx. + + Note that Lynx is not self-contained; typically it is built with a + variety of add-on libraries, including those for compression, IPv6, + SOCKS and SSL support. Deleted: csw/mgar/pkg/lynx/trunk/files/CSWlynx.depend =================================================================== --- csw/mgar/pkg/lynx/trunk/files/CSWlynx.depend 2010-02-26 14:37:15 UTC (rev 8837) +++ csw/mgar/pkg/lynx/trunk/files/CSWlynx.depend 2010-02-26 14:39:27 UTC (rev 8838) @@ -1,4 +0,0 @@ -P CSWbzip2 bzip2 - a high-quality block-sorting file compressor -P CSWncurses ncurses - ncurses library and utilities -P CSWosslrt openssl_rt - Openssl runtime libraries -P CSWzlib zlib - Zlib Data Compression Library Deleted: csw/mgar/pkg/lynx/trunk/files/CSWlynx.gspec =================================================================== --- csw/mgar/pkg/lynx/trunk/files/CSWlynx.gspec 2010-02-26 14:37:15 UTC (rev 8837) +++ csw/mgar/pkg/lynx/trunk/files/CSWlynx.gspec 2010-02-26 14:39:27 UTC (rev 8838) @@ -1,4 +0,0 @@ -%var bitname lynx -%var pkgname CSWlynx -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/lynx/trunk/files/CSWlynx.prototype =================================================================== --- csw/mgar/pkg/lynx/trunk/files/CSWlynx.prototype 2010-02-26 14:37:15 UTC (rev 8837) +++ csw/mgar/pkg/lynx/trunk/files/CSWlynx.prototype 2010-02-26 14:39:27 UTC (rev 8838) @@ -1,26 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/lynx 0755 root bin -d none /opt/csw/etc 0755 root bin -f none /opt/csw/etc/lynx.cfg 0644 root bin -f none /opt/csw/etc/lynx.lss 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/locale 0755 root bin -d none /opt/csw/share/locale/de 0755 root bin -d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/et 0755 root bin -d none /opt/csw/share/locale/et/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/fr 0755 root bin -d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/ru 0755 root bin -d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/sv 0755 root bin -d none /opt/csw/share/locale/sv/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/tr 0755 root bin -d none /opt/csw/share/locale/tr/LC_MESSAGES 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/lynx.1 0644 root bin -d none /opt/csw/share/man/man5 0755 root bin -i copyright=CSWlynx.copyright -i depend=CSWlynx.depend -i pkginfo=CSWlynx.pkginfo 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 Feb 26 16:01:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Feb 2010 15:01:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[8839] csw/mgar/pkg Message-ID: Revision: 8839 http://gar.svn.sourceforge.net/gar/?rev=8839&view=rev Author: dmichelsen Date: 2010-02-26 15:01:28 +0000 (Fri, 26 Feb 2010) Log Message: ----------- argtable: Initial commit Added Paths: ----------- csw/mgar/pkg/argtable/ csw/mgar/pkg/argtable/branches/ csw/mgar/pkg/argtable/tags/ csw/mgar/pkg/argtable/trunk/ csw/mgar/pkg/argtable/trunk/Makefile csw/mgar/pkg/argtable/trunk/checksums csw/mgar/pkg/argtable/trunk/files/ Property changes on: csw/mgar/pkg/argtable/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/argtable/trunk/Makefile =================================================================== --- csw/mgar/pkg/argtable/trunk/Makefile (rev 0) +++ csw/mgar/pkg/argtable/trunk/Makefile 2010-02-26 15:01:28 UTC (rev 8839) @@ -0,0 +1,32 @@ +GARNAME = argtable +GARVERSION = 2.12 +CATEGORIES = utils + +DESCRIPTION = Parsing GNU style command line options with a minimum of fuss +define BLURB + Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss. + It enables a program's command line syntax to be defined in the source code as an array of argtable + structs. The command line is then parsed according to that specification and the resulting values + are returned in those same structs where they are accessible to the main program. Both tagged + (-v, --verbose, --foo=bar) and untagged arguments are supported, as are multiple instances of + each argument. Syntax error handling is automatic and the library also provides the means for + generating a textual description of the command line syntax. +endef + +MASTER_SITES = $(SF_MIRROR) +DISTNAME = $(GARNAME)$(subst .,-,$(GARVERSION)) +DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +VENDOR_URL = http://argtable.sourceforge.net/ + +EXTRA_LDFLAGS = -lintl + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/argtable/trunk/checksums =================================================================== --- csw/mgar/pkg/argtable/trunk/checksums (rev 0) +++ csw/mgar/pkg/argtable/trunk/checksums 2010-02-26 15:01:28 UTC (rev 8839) @@ -0,0 +1 @@ +291e249ea60f4d0637e467356a8ae41a argtable2-12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Feb 26 16:56:08 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 26 Feb 2010 15:56:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8841] csw/mgar/pkg/tiff/trunk/Makefile Message-ID: Revision: 8841 http://gar.svn.sourceforge.net/gar/?rev=8841&view=rev Author: hson Date: 2010-02-26 15:56:07 +0000 (Fri, 26 Feb 2010) Log Message: ----------- tiff: Checkpkg overrides syntax change Modified Paths: -------------- csw/mgar/pkg/tiff/trunk/Makefile Modified: csw/mgar/pkg/tiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tiff/trunk/Makefile 2010-02-26 15:54:08 UTC (rev 8840) +++ csw/mgar/pkg/tiff/trunk/Makefile 2010-02-26 15:56:07 UTC (rev 8841) @@ -32,7 +32,53 @@ ARCHALL_CSWtiffdoc = 1 -CHECKPKG_OVERRIDES += CSWtiffdevel|missing-dependency|CSWtiff +CHECKPKG_OVERRIDES_CSWtiffdevel += missing-dependency|CSWtiff +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffcmp +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|pal2rgb +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|fax2tiff +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffcp +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|ppm2tiff +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffmedian +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|raw2tiff +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|thumbnail +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiff2ps +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|bmp2tiff +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|ras2tiff +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|rgb2ycbcr +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiff2bw +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffcrop +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffset +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|fax2ps +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffinfo +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffdump +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiff2rgba +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|gif2tiff +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffdither +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffsplit +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffinfo +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiff2bw +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffdump +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffset +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffcp +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|gif2tiff +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffcrop +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|thumbnail +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffmedian +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|ppm2tiff +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|pal2rgb +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffcmp +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|rgb2ycbcr +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|raw2tiff +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|bmp2tiff +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|ras2tiff +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffdither +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|fax2ps +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|fax2tiff +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiff2ps +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffsplit +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiff2rgba +CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiff2pdf + LICENSE = COPYRIGHT UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Feb 26 16:58:59 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 26 Feb 2010 15:58:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8843] csw/mgar/pkg/djvulibre/trunk/Makefile Message-ID: Revision: 8843 http://gar.svn.sourceforge.net/gar/?rev=8843&view=rev Author: hson Date: 2010-02-26 15:58:59 +0000 (Fri, 26 Feb 2010) Log Message: ----------- djvulibre: Checkpkg overrides syntax change Modified Paths: -------------- csw/mgar/pkg/djvulibre/trunk/Makefile Modified: csw/mgar/pkg/djvulibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile 2010-02-26 15:56:55 UTC (rev 8842) +++ csw/mgar/pkg/djvulibre/trunk/Makefile 2010-02-26 15:58:59 UTC (rev 8843) @@ -19,13 +19,34 @@ SPKG_DESC_CSWdjvulibrert += DjVu standalone viewer, browser plug-in, command line tools - runtime package SPKG_DESC_CSWdjvulibredevel += DjVu standalone viewer, browser plug-in, commandline tools - developer package -RUNTIME_DEP_PKGS_CSWdjvulibre += CSWdjvulibrert CSWjpeg CSWtiff CSWzlib +RUNTIME_DEP_PKGS_CSWdjvulibre += CSWdjvulibrert CSWjpeg CSWzlib +RUNTIME_DEP_PKGS_CSWdjvulibre += CSWtiffrt RUNTIME_DEP_PKGS_CSWdjvulibrert += CSWjpeg RUNTIME_DEP_PKGS_CSWdjvulibredevel += CSWdjvulibrert PKGFILES_CSWdjvulibrert = $(PKGFILES_RT) PKGFILES_CSWdjvulibredevel = $(PKGFILES_DEVEL) + +CHECKPKG_OVERRIDES_CSWdjvulibredevel += missing-dependency|CSWdjvulibre +CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvm +CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvused +CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvups +CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvuserve +CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|cpaldjvu +CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|csepdjvu +CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvuextract +CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvutxt +CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|cjb2 +CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvutoxml +CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|c44 +CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvuxmlparser +CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvumake +CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvudump +CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|bzz +CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvmcvt +CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|ddjvu + SPKG_SOURCEURL = http://djvu.sourceforge.net/ LICENSE = COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Feb 26 16:59:55 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 26 Feb 2010 15:59:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[8844] csw/mgar/pkg/ghostscript/trunk/Makefile Message-ID: Revision: 8844 http://gar.svn.sourceforge.net/gar/?rev=8844&view=rev Author: hson Date: 2010-02-26 15:59:53 +0000 (Fri, 26 Feb 2010) Log Message: ----------- ghostscript: Checkpkg overrides syntax change Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2010-02-26 15:58:59 UTC (rev 8843) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2010-02-26 15:59:53 UTC (rev 8844) @@ -20,8 +20,8 @@ # Pending release of libpaper #RUNTIME_DEP_PKGS_CSWgs += CSWlibpaper -CHECKPKG_OVERRIDES += CSWgs|symbol-not-found|gsc -CHECKPKG_OVERRIDES += CSWgs|symbol-not-found|gsx +CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsc +CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsx SPKG_SOURCEURL = http://www.ghostscript.com This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Feb 26 17:02:04 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 26 Feb 2010 16:02:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[8845] csw/mgar/pkg/lcms/trunk/Makefile Message-ID: Revision: 8845 http://gar.svn.sourceforge.net/gar/?rev=8845&view=rev Author: hson Date: 2010-02-26 16:01:56 +0000 (Fri, 26 Feb 2010) Log Message: ----------- lcms: Checkpkg overrides syntax change and split python stuff in separate module Modified Paths: -------------- csw/mgar/pkg/lcms/trunk/Makefile Modified: csw/mgar/pkg/lcms/trunk/Makefile =================================================================== --- csw/mgar/pkg/lcms/trunk/Makefile 2010-02-26 15:59:53 UTC (rev 8844) +++ csw/mgar/pkg/lcms/trunk/Makefile 2010-02-26 16:01:56 UTC (rev 8845) @@ -18,21 +18,36 @@ DISTFILES = $(GARNAME)-$(GARVERSION)$(GARSUBREV).tar.gz #DISTFILES = $(GARNAME)-$(GARVERSION)$(GARSUBREV).tar.gz -PACKAGES = CSWlcms CSWlcmsrt CSWlcmsdevel +PACKAGES = CSWlcms CSWlcmsrt CSWlcmsdevel CSWpy-lcms CATALOGNAME_CSWlcms = lcms CATALOGNAME_CSWlcmsrt = lcms_rt CATALOGNAME_CSWlcmsdevel = lcms_devel +CATALOGNAME_CSWpy-lcms = py_lcms SPKG_DESC_CSWlcms += The little color management system and tools SPKG_DESC_CSWlcmsrt += The little color management system and tools - runtime package SPKG_DESC_CSWlcmsdevel += The little color management system and tools - developer package +SPKG_DESC_CSWpy-lcms += The little color management system and tools - python bindings -RUNTIME_DEP_PKGS_CSWlcms += CSWlcmsrt CSWjpeg CSWtiff CSWzlib +RUNTIME_DEP_PKGS_CSWlcms += CSWlcmsrt CSWjpeg CSWzlib +RUNTIME_DEP_PKGS_CSWlcms += CSWtiffrt RUNTIME_DEP_PKGS_CSWlcmsrt += -RUNTIME_DEP_PKGS_CSWlcmsdevel += CSWlcms +RUNTIME_DEP_PKGS_CSWlcmsdevel += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWpy-lcms += CSWlcmsrt CSWpython +CHECKPKG_OVERRIDES_CSWlcms += symbol-not-found|icclink +CHECKPKG_OVERRIDES_CSWlcms += symbol-not-found|tiffdiff +CHECKPKG_OVERRIDES_CSWlcms += symbol-not-found|icc2ps +CHECKPKG_OVERRIDES_CSWlcms += symbol-not-found|tifficc +CHECKPKG_OVERRIDES_CSWlcms += symbol-not-found|wtpt +CHECKPKG_OVERRIDES_CSWlcms += symbol-not-found|jpegicc +CHECKPKG_OVERRIDES_CSWlcms += symbol-not-found|icctrans +CHECKPKG_OVERRIDES_CSWlcmsdevel += missing-dependency|CSWlcms +CHECKPKG_OVERRIDES_CSWpy-lcms += symbol-not-found|_lcms.so + PKGFILES_CSWlcmsrt = $(PKGFILES_RT) PKGFILES_CSWlcmsdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWpy-lcms = $(libdir).*/python/site-packages/.* SPKG_SOURCEURL = http://www.littlecms.com @@ -52,3 +67,4 @@ include gar/category.mk +CXXFLAGS += -D_RWSTD_NO_WSTR=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 Feb 26 16:54:08 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 26 Feb 2010 15:54:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8840] csw/mgar/pkg/cx-oracle/trunk/Makefile Message-ID: Revision: 8840 http://gar.svn.sourceforge.net/gar/?rev=8840&view=rev Author: wahwah Date: 2010-02-26 15:54:08 +0000 (Fri, 26 Feb 2010) Log Message: ----------- cx-oracle: Updated build, using overrides Modified Paths: -------------- csw/mgar/pkg/cx-oracle/trunk/Makefile Modified: csw/mgar/pkg/cx-oracle/trunk/Makefile =================================================================== --- csw/mgar/pkg/cx-oracle/trunk/Makefile 2010-02-26 15:01:28 UTC (rev 8839) +++ csw/mgar/pkg/cx-oracle/trunk/Makefile 2010-02-26 15:54:08 UTC (rev 8840) @@ -2,33 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## GARNAME = cx-oracle GARVERSION = 5.0.2 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra CATEGORIES = python -## -## A one-line description of the package, which will appear in the pkginfo. DESCRIPTION = a Python db API conforming module for Oracle database access -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. define BLURB cx_Oracle is a Python extension module that allows access to Oracle databases and conforms to the Python database API specification. This module is @@ -37,149 +14,18 @@ build and install the module which makes use of the DistUtils module made available in Python 2.0 and up. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = http://cx-oracle.sourceforge.net/ -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). +CATALOGNAME = py_cx_oracle MASTER_SITES = $(SF_MIRRORS) -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). DL_NAME = cx_Oracle DISTNAME = $(DL_NAME)-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz -## UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +BUILD_DEP_PKGS = $(REQUIRED_PKGS) CSWpython-devel +TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## +ORACLE_HOME ?= /opt/oracle/product/10.2.0/Db_1 +LICENSE = LICENSE.txt +CHECKPKG_OVERRIDES_CSWcx-oracle += orphan-soname|libclntsh.so.10.1 +export ORACLE_HOME include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Feb 26 16:56:56 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 26 Feb 2010 15:56:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[8842] csw/mgar/pkg/wmf/trunk/Makefile Message-ID: Revision: 8842 http://gar.svn.sourceforge.net/gar/?rev=8842&view=rev Author: hson Date: 2010-02-26 15:56:55 +0000 (Fri, 26 Feb 2010) Log Message: ----------- wmf: Checkpkg overrides syntax change Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2010-02-26 15:56:07 UTC (rev 8841) +++ csw/mgar/pkg/wmf/trunk/Makefile 2010-02-26 15:56:55 UTC (rev 8842) @@ -54,13 +54,13 @@ ARCHALL_CSWwmfdoc = 1 ARCHALL_CSWwmffonts = 1 -CHECKPKG_OVERRIDES += CSWlibwmf|symbol-not-found|libwmf-0.2.so.7.1.0 -CHECKPKG_OVERRIDES += CSWwmf|symbol-not-found|io-wmf.so -CHECKPKG_OVERRIDES += CSWwmf|symbol-not-found|wmf2gd -CHECKPKG_OVERRIDES += CSWwmf|symbol-not-found|wmf2x -CHECKPKG_OVERRIDES += CSWwmf|symbol-not-found|wmf2fig -CHECKPKG_OVERRIDES += CSWwmf|symbol-not-found|wmf2svg -CHECKPKG_OVERRIDES += CSWwmf|symbol-not-found|wmf2eps +CHECKPKG_OVERRIDES_CSWlibwmf += symbol-not-found|libwmf-0.2.so.7.1.0 +CHECKPKG_OVERRIDES_CSWwmf += symbol-not-found|io-wmf.so +CHECKPKG_OVERRIDES_CSWwmf += symbol-not-found|wmf2gd +CHECKPKG_OVERRIDES_CSWwmf += symbol-not-found|wmf2x +CHECKPKG_OVERRIDES_CSWwmf += symbol-not-found|wmf2fig +CHECKPKG_OVERRIDES_CSWwmf += symbol-not-found|wmf2svg +CHECKPKG_OVERRIDES_CSWwmf += symbol-not-found|wmf2eps BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Feb 26 17:19:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Feb 2010 16:19:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8846] csw/mgar/pkg/tcpwrappers/trunk/Makefile Message-ID: Revision: 8846 http://gar.svn.sourceforge.net/gar/?rev=8846&view=rev Author: dmichelsen Date: 2010-02-26 16:19:00 +0000 (Fri, 26 Feb 2010) Log Message: ----------- tcpwrappers: Make sure the library SONAME is registered for the package Modified Paths: -------------- csw/mgar/pkg/tcpwrappers/trunk/Makefile Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/Makefile 2010-02-26 16:01:56 UTC (rev 8845) +++ csw/mgar/pkg/tcpwrappers/trunk/Makefile 2010-02-26 16:19:00 UTC (rev 8846) @@ -110,6 +110,11 @@ ginstall $(WORKDIR)/$(notdir $(POSTMSG)) $(PKGROOT)$(POSTMSG) ln -s libwrap.so.1 $(PKGROOT)$(libdir)/libwrap.so ln -s libwrap.so.1 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so + @# As libwrap.so.1 is the SONAME to be bound against we must register it with the package + @# to allow chkpkg to look up the pkgname for the library. This is rewritten by alternatives + @# on installation and is solely to register the link path, the destination doesn't matter. + ln -s libwrap-std.so.1 $(PKGROOT)$(libdir)/libwrap.so.1 + ln -s libwrap-std.so.1 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 @$(MAKECOOKIE) SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) 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 Feb 26 17:30:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Feb 2010 16:30:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[8847] csw/mgar/pkg/tcpwrappers/trunk/Makefile Message-ID: Revision: 8847 http://gar.svn.sourceforge.net/gar/?rev=8847&view=rev Author: dmichelsen Date: 2010-02-26 16:30:56 +0000 (Fri, 26 Feb 2010) Log Message: ----------- tcpwrappers: Fix link to conform to preinitialized alternative Modified Paths: -------------- csw/mgar/pkg/tcpwrappers/trunk/Makefile Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/Makefile 2010-02-26 16:19:00 UTC (rev 8846) +++ csw/mgar/pkg/tcpwrappers/trunk/Makefile 2010-02-26 16:30:56 UTC (rev 8847) @@ -113,8 +113,8 @@ @# As libwrap.so.1 is the SONAME to be bound against we must register it with the package @# to allow chkpkg to look up the pkgname for the library. This is rewritten by alternatives @# on installation and is solely to register the link path, the destination doesn't matter. - ln -s libwrap-std.so.1 $(PKGROOT)$(libdir)/libwrap.so.1 - ln -s libwrap-std.so.1 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 + ln -s /etc/opt/csw/alternatives/tcpwrappers $(PKGROOT)$(libdir)/libwrap.so.1 + ln -s /etc/opt/csw/alternatives/tcpwrappers64 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 @$(MAKECOOKIE) SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) 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 Feb 26 19:17:19 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 26 Feb 2010 18:17:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8848] csw/mgar/pkg/nss/trunk/Makefile Message-ID: Revision: 8848 http://gar.svn.sourceforge.net/gar/?rev=8848&view=rev Author: wahwah Date: 2010-02-26 18:17:18 +0000 (Fri, 26 Feb 2010) Log Message: ----------- nss: Splitting it up into 3 packages and renaming to libnss3. Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2010-02-26 16:30:56 UTC (rev 8847) +++ csw/mgar/pkg/nss/trunk/Makefile 2010-02-26 18:17:18 UTC (rev 8848) @@ -14,29 +14,12 @@ # TODO: nss-config # TODO: a better nss.pc -# For DBG builds -PATCHFILES = whoami.patch - -# Required patches. -PATCHFILES += include.patch -PATCHFILES += ld-options.patch -PATCHFILES += platlibs-sqlite3.patch -PATCHFILES_isa-sparcv8 = sqlite3-32.patch -PATCHFILES_isa-i386 = sqlite3-32.patch -PATCHFILES_isa-sparcv9 = sqlite3-64.patch -PATCHFILES_isa-sparcv9 += platlibs-sqlite3-64.patch -PATCHFILES_isa-amd64 = sqlite3-64.patch -PATCHFILES_isa-amd64 += platlibs-sqlite3-64.patch - - - GARNAME = nss MAJOR_VERSION = 3 MINOR_VERSION = 12 PATCHLEVEL = 4 GARVERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL) CATEGORIES = lib -DESCRIPTION = Network Security Services library, implements crypto, PKI, SSL, and S/MIME support define BLURB Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server @@ -51,7 +34,23 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += mpl-tri-license-txt UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS = CSWnspr CSWsqlite3rt + +PACKAGES = CSWlibnss3 CSWlibnss3-devel CSWlibnss3-tools + +SPKG_DESC_CSWlibnss3 = Network Security Services library, implements crypto, PKI, SSL, and S/MIME support +SPKG_DESC_CSWlibnss3-devel = libnss3 development files +SPKG_DESC_CSWlibnss3-tools = libnss3 command-line utilities + +PKGFILES_CSWlibnss3-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibnss3-tools = $(bindir).* + +CATALOGNAME_CSWlibnss3-devel = libnss3_devel +CATALOGNAME_CSWlibnss3-tools = libnss3_tools + +RUNTIME_DEP_PKGS_CSWlibnss3 = CSWnspr CSWsqlite3rt +RUNTIME_DEP_PKGS_CSWlibnss3-devel += CSWlibnss3 +RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibnss3 +RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWnspr BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWnspr-devel CSWsqlite3devel CONFIGURE_SCRIPTS = BUILD_SCRIPTS = nss @@ -110,6 +109,20 @@ LICENSE = mpl-tri-license-txt +# For DBG builds +PATCHFILES = whoami.patch + +# Required patches. +PATCHFILES += include.patch +PATCHFILES += ld-options.patch +PATCHFILES += platlibs-sqlite3.patch +PATCHFILES_isa-sparcv8 = sqlite3-32.patch +PATCHFILES_isa-i386 = sqlite3-32.patch +PATCHFILES_isa-sparcv9 = sqlite3-64.patch +PATCHFILES_isa-sparcv9 += platlibs-sqlite3-64.patch +PATCHFILES_isa-amd64 = sqlite3-64.patch +PATCHFILES_isa-amd64 += platlibs-sqlite3-64.patch + include gar/category.mk build-nss: build-coreconf build-dbm build-nss-compile @@ -169,8 +182,11 @@ && \ false \ ) - ginstall -d -m 755 $(DESTDIR)$(prefix)/lib/pkgconfig + ginstall -d -m 755 $(DESTDIR)$(libdir)/pkgconfig ginstall -m 644 \ $(FILEDIR)/nss.pc \ - $(DESTDIR)$(prefix)/lib/pkgconfig + $(DESTDIR)$(libdir)/pkgconfig + if [ $(MEMORYMODEL) = 64 ]; then \ + gsed -i -e 's+/lib$$+lib/64+' $(DESTDIR)$(libdir)/pkgconfig/nss.pc ; \ + fi @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Feb 26 19:44:24 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 26 Feb 2010 18:44:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8849] csw/mgar/pkg/rrdtool/branches Message-ID: Revision: 8849 http://gar.svn.sourceforge.net/gar/?rev=8849&view=rev Author: bensons Date: 2010-02-26 18:44:24 +0000 (Fri, 26 Feb 2010) Log Message: ----------- rrdtool: added branch Added Paths: ----------- csw/mgar/pkg/rrdtool/branches/benny/ csw/mgar/pkg/rrdtool/branches/benny/Makefile csw/mgar/pkg/rrdtool/branches/benny/checksums csw/mgar/pkg/rrdtool/branches/benny/files/ csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-Makefile.in csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-bindings-Makefile.in csw/mgar/pkg/rrdtool/branches/benny/files/patch-src-Makefile.in csw/mgar/pkg/rrdtool/branches/benny/files/patch-src-rrd_open.c csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c csw/mgar/pkg/rrdtool/branches/benny/files/s_round.h csw/mgar/pkg/rrdtool/branches/benny/gar Added: csw/mgar/pkg/rrdtool/branches/benny/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/Makefile (rev 0) +++ csw/mgar/pkg/rrdtool/branches/benny/Makefile 2010-02-26 18:44:24 UTC (rev 8849) @@ -0,0 +1,89 @@ +GARNAME = rrdtool +GARVERSION = 1.4.2 +CATEGORIES = utils + +DESCRIPTION = time-series data logging and graphing. +define BLURB + RRDtool is basically the time-series graphing and data storage/management + component of MRTG, broken out and `done right'. `done right' means that + RRDtool is magnitudes faster than MRTG and extremely configurable. +endef + +MASTER_SITES = http://oss.oetiker.ch/$(GARNAME)/pub/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWrrd +CATALOGNAME = rrdtool + +#GARCOMPILER = SOS12 +#GARCOMPILER = GCC4 +#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 + +RUNTIME_DEP_PKGS = CSWggettextrt +RUNTIME_DEP_PKGS += CSWglib2 +RUNTIME_DEP_PKGS += CSWiconv +RUNTIME_DEP_PKGS += CSWlibcairo +# RUNTIME_DEP_PKGS += CSWlibxml2 +RUNTIME_DEP_PKGS += CSWpango +RUNTIME_DEP_PKGS += CSWpng +RUNTIME_DEP_PKGS += CSWsunmath +RUNTIME_DEP_PKGS += CSWzlib +RUNTIME_DEP_PKGS += CSWperl +RUNTIME_DEP_PKGS += CSWruby + +EXTRA_INC = $(prefix)/include/cairo +EXTRA_INC += $(prefix)/include/libxml2 +EXTRA_INC += $(prefix)/X11/include + +EXTRA_LIB = $(prefix)/X11/lib + +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +CONFIGURE_ARS = $(DIRPATHS) +CONFIGURE_ARGS += --with-docdir=$(sharedstatedir)/doc/$(GARNAME) +CONFIGURE_ARGS += --disable-python +CONFIGURE_ARGS += --enable-ruby +CONFIGURE_ARGS += --disable-libintl +CONFIGURE_ARGS += --enable-perl +CONFIGURE_ARGS += --with-perl-options=INSTALLDIRS=vendor +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod + +TEST_TARGET = check + +PATCHFILES += patch-src-Makefile.in +PATCHFILES += patch-src-rrd_open.c + +BUILD64 = 1 + +STRIP_LIBTOOL = 1 + +# ugly fix to fix doc path +#post-install-modulated: + #@echo " ==> Fixing doc path" + #@mv $(DESTDIR)$(prefix)/share/doc/rrdtool-$(GARVERSION) $(DESTDIR)$(prefix)/share/doc/rrdtool + +include gar/category.mk + +pre-build-modulated: + cp $(FILEDIR)/s_round.c $(WORKSRC)/src + cp $(FILEDIR)/s_round.h $(WORKSRC)/src + @$(MAKECOOKIE) + +pre-build-isa-amd64: + @# since our perl is 32bit, we need to patch away the module build + gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-amd64-Makefile.in + gpatch -d$(WORKSRC) -p1 -F2 < \ + $(FILEDIR)/patch-amd64-bindings-Makefile.in + @$(MAKECOOKIE) + +env: + @echo "PKG_CONFIG_PATH: $(PKG_CONFIG_PATH)" Added: csw/mgar/pkg/rrdtool/branches/benny/checksums =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/checksums (rev 0) +++ csw/mgar/pkg/rrdtool/branches/benny/checksums 2010-02-26 18:44:24 UTC (rev 8849) @@ -0,0 +1,4 @@ +48a9b258cf8b4b943dbaf30ea939c315 CSWrrdtool.gspec +20e58c7facf2687037288c157c32df1a patch-src-Makefile.in +47709778545eec2e8c5c3b38f9c94fcd patch-src-rrd_open.c +9318d3b4016dd9dd9897f1eac7548032 rrdtool-1.4.2.tar.gz Added: csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-Makefile.in =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-Makefile.in (rev 0) +++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-Makefile.in 2010-02-26 18:44:24 UTC (rev 8849) @@ -0,0 +1,75 @@ +--- rrdtool-1.4.2.orig/Makefile.in 2009-11-15 12:55:05.000000000 +0100 ++++ rrdtool-1.4.2/Makefile.in 2010-02-26 19:19:42.923524958 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -222,6 +222,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +@@ -427,7 +428,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -452,7 +453,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -616,7 +617,8 @@ + fi; \ + done + -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ || find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ +@@ -660,17 +662,17 @@ + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ +- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ ++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac +@@ -867,7 +869,7 @@ + + # $(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi at ipn.caida.org:/ipn/web/Tools/RRDtool/pub/ + +-site-perl-inst: site-perl-install ++site-perl-inst: echo skipping 64bit perl module install + + site-perl-install: all bindings/perl-piped/Makefile bindings/perl-shared/Makefile + cd bindings/perl-piped && $(MAKE) install Added: csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-bindings-Makefile.in =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-bindings-Makefile.in (rev 0) +++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-bindings-Makefile.in 2010-02-26 18:44:24 UTC (rev 8849) @@ -0,0 +1,43 @@ +--- rrdtool-1.4.2.orig/bindings/Makefile.in 2009-11-15 12:55:04.000000000 +0100 ++++ rrdtool-1.4.2/bindings/Makefile.in 2010-02-26 19:19:41.514583447 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -205,6 +205,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +@@ -374,7 +375,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -399,7 +400,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -676,7 +677,7 @@ + .PHONY: python ruby + + # add the following to the all target +-all-local: @COMP_PERL@ @COMP_RUBY@ @COMP_PYTHON@ ++all-local: @COMP_RUBY@ @COMP_PYTHON@ + + install-data-local: + $(AM_V_GEN)test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true Added: csw/mgar/pkg/rrdtool/branches/benny/files/patch-src-Makefile.in =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/patch-src-Makefile.in (rev 0) +++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-src-Makefile.in 2010-02-26 18:44:24 UTC (rev 8849) @@ -0,0 +1,152 @@ +--- rrdtool-1.4.2.orig/src/Makefile.in 2009-11-15 12:55:05.000000000 +0100 ++++ rrdtool-1.4.2/src/Makefile.in 2010-02-26 18:36:02.892925252 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -105,14 +105,14 @@ + "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)" + LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) + am__DEPENDENCIES_1 = +-am__librrd_la_SOURCES_DIST = hash_32.c pngsize.c rrd_create.c \ +- rrd_graph.c rrd_graph_helper.c rrd_version.c rrd_last.c \ +- rrd_lastupdate.c rrd_first.c rrd_restore.c rrd_xport.c \ +- rrd_gfx.c rrd_dump.c rrd_flushcached.c rrd_fetch.c \ ++am__librrd_la_SOURCES_DIST = hash_32.c pngsize.c s_round.c \ ++ rrd_create.c rrd_graph.c rrd_graph_helper.c rrd_version.c \ ++ rrd_last.c rrd_lastupdate.c rrd_first.c rrd_restore.c \ ++ rrd_xport.c rrd_gfx.c rrd_dump.c rrd_flushcached.c rrd_fetch.c \ + rrd_resize.c rrd_tune.c rrd_fetch_libdbi.c + @BUILD_LIBDBI_TRUE at am__objects_1 = rrd_fetch_libdbi.lo +-am__objects_2 = hash_32.lo pngsize.lo rrd_create.lo rrd_graph.lo \ +- rrd_graph_helper.lo rrd_version.lo rrd_last.lo \ ++am__objects_2 = hash_32.lo pngsize.lo s_round.lo rrd_create.lo \ ++ rrd_graph.lo rrd_graph_helper.lo rrd_version.lo rrd_last.lo \ + rrd_lastupdate.lo rrd_first.lo rrd_restore.lo rrd_xport.lo \ + rrd_gfx.lo rrd_dump.lo rrd_flushcached.lo rrd_fetch.lo \ + rrd_resize.lo rrd_tune.lo $(am__objects_1) +@@ -128,9 +128,9 @@ + rrd_hw_update.c rrd_diff.c rrd_format.c rrd_info.c rrd_error.c \ + rrd_open.c rrd_client.c rrd_nan_inf.c rrd_rpncalc.c \ + rrd_utils.c rrd_update.c rrd_getopt.c rrd_getopt1.c hash_32.c \ +- pngsize.c rrd_create.c rrd_graph.c rrd_graph_helper.c \ +- rrd_version.c rrd_last.c rrd_lastupdate.c rrd_first.c \ +- rrd_restore.c rrd_xport.c rrd_gfx.c rrd_dump.c \ ++ pngsize.c s_round.c rrd_create.c rrd_graph.c \ ++ rrd_graph_helper.c rrd_version.c rrd_last.c rrd_lastupdate.c \ ++ rrd_first.c rrd_restore.c rrd_xport.c rrd_gfx.c rrd_dump.c \ + rrd_flushcached.c rrd_fetch.c rrd_resize.c rrd_tune.c \ + rrd_fetch_libdbi.c rrd_thread_safe.c + @BUILD_GETOPT_TRUE at am__objects_3 = librrd_th_la-rrd_getopt.lo \ +@@ -145,14 +145,15 @@ + $(am__objects_3) + @BUILD_LIBDBI_TRUE at am__objects_5 = librrd_th_la-rrd_fetch_libdbi.lo + am__objects_6 = librrd_th_la-hash_32.lo librrd_th_la-pngsize.lo \ +- librrd_th_la-rrd_create.lo librrd_th_la-rrd_graph.lo \ +- librrd_th_la-rrd_graph_helper.lo librrd_th_la-rrd_version.lo \ +- librrd_th_la-rrd_last.lo librrd_th_la-rrd_lastupdate.lo \ +- librrd_th_la-rrd_first.lo librrd_th_la-rrd_restore.lo \ +- librrd_th_la-rrd_xport.lo librrd_th_la-rrd_gfx.lo \ +- librrd_th_la-rrd_dump.lo librrd_th_la-rrd_flushcached.lo \ +- librrd_th_la-rrd_fetch.lo librrd_th_la-rrd_resize.lo \ +- librrd_th_la-rrd_tune.lo $(am__objects_5) ++ librrd_th_la-s_round.lo librrd_th_la-rrd_create.lo \ ++ librrd_th_la-rrd_graph.lo librrd_th_la-rrd_graph_helper.lo \ ++ librrd_th_la-rrd_version.lo librrd_th_la-rrd_last.lo \ ++ librrd_th_la-rrd_lastupdate.lo librrd_th_la-rrd_first.lo \ ++ librrd_th_la-rrd_restore.lo librrd_th_la-rrd_xport.lo \ ++ librrd_th_la-rrd_gfx.lo librrd_th_la-rrd_dump.lo \ ++ librrd_th_la-rrd_flushcached.lo librrd_th_la-rrd_fetch.lo \ ++ librrd_th_la-rrd_resize.lo librrd_th_la-rrd_tune.lo \ ++ $(am__objects_5) + am_librrd_th_la_OBJECTS = $(am__objects_4) $(am__objects_6) \ + librrd_th_la-rrd_thread_safe.lo + librrd_th_la_OBJECTS = $(am_librrd_th_la_OBJECTS) +@@ -160,7 +161,8 @@ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(librrd_th_la_CFLAGS) \ + $(CFLAGS) $(librrd_th_la_LDFLAGS) $(LDFLAGS) -o $@ + @BUILD_MULTITHREAD_TRUE at am_librrd_th_la_rpath = -rpath $(libdir) +-librrdupd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) ++librrdupd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + am__librrdupd_la_SOURCES_DIST = rrd_parsetime.c rrd_hw.c rrd_hw_math.c \ + rrd_hw_update.c rrd_diff.c rrd_format.c rrd_info.c rrd_error.c \ + rrd_open.c rrd_client.c rrd_nan_inf.c rrd_rpncalc.c \ +@@ -219,7 +221,7 @@ + $(am__librrdupd_la_SOURCES_DIST) $(rrdcached_SOURCES) \ + $(rrdcgi_SOURCES) $(rrdtool_SOURCES) $(rrdupdate_SOURCES) + DATA = $(pkgconfig_DATA) +-am__noinst_HEADERS_DIST = unused.h gettext.h rrd_getopt.h \ ++am__noinst_HEADERS_DIST = unused.h gettext.h s_round.h rrd_getopt.h \ + rrd_parsetime.h rrd_config_bottom.h rrd_i18n.h rrd_format.h \ + rrd_tool.h rrd_xport.h rrd.h rrd_rpncalc.h rrd_hw.h \ + rrd_hw_math.h rrd_hw_update.h fnv.h rrd_graph.h \ +@@ -322,6 +324,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +@@ -442,20 +445,20 @@ + rrd_diff.c rrd_format.c rrd_info.c rrd_error.c rrd_open.c \ + rrd_client.c rrd_nan_inf.c rrd_rpncalc.c rrd_utils.c \ + rrd_update.c $(am__append_3) +-RRD_C_FILES = hash_32.c pngsize.c rrd_create.c rrd_graph.c \ ++RRD_C_FILES = hash_32.c pngsize.c s_round.c rrd_create.c rrd_graph.c \ + rrd_graph_helper.c rrd_version.c rrd_last.c rrd_lastupdate.c \ + rrd_first.c rrd_restore.c rrd_xport.c rrd_gfx.c rrd_dump.c \ + rrd_flushcached.c rrd_fetch.c rrd_resize.c rrd_tune.c \ + $(am__append_1) +-noinst_HEADERS = unused.h gettext.h rrd_getopt.h rrd_parsetime.h \ +- rrd_config_bottom.h rrd_i18n.h rrd_format.h rrd_tool.h \ +- rrd_xport.h rrd.h rrd_rpncalc.h rrd_hw.h rrd_hw_math.h \ +- rrd_hw_update.h fnv.h rrd_graph.h rrd_is_thread_safe.h \ +- $(am__append_2) ++noinst_HEADERS = unused.h gettext.h s_round.h rrd_getopt.h \ ++ rrd_parsetime.h rrd_config_bottom.h rrd_i18n.h rrd_format.h \ ++ rrd_tool.h rrd_xport.h rrd.h rrd_rpncalc.h rrd_hw.h \ ++ rrd_hw_math.h rrd_hw_update.h fnv.h rrd_graph.h \ ++ rrd_is_thread_safe.h $(am__append_2) + noinst_LTLIBRARIES = librrdupd.la + lib_LTLIBRARIES = librrd.la $(am__append_4) + librrdupd_la_SOURCES = $(UPD_C_FILES) rrd_not_thread_safe.c +-librrdupd_la_LIBADD = $(CORE_LIBS) ++librrdupd_la_LIBADD = $(CORE_LIBS) $(LTLIBINTL) + librrd_la_SOURCES = $(RRD_C_FILES) + librrd_la_DEPENDENCIES = librrdupd.la librrd.sym + librrd_la_LIBADD = librrdupd.la $(ALL_LIBS) +@@ -668,6 +671,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/librrd_th_la-rrd_utils.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/librrd_th_la-rrd_version.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/librrd_th_la-rrd_xport.Plo at am__quote@ ++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/librrd_th_la-s_round.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pngsize.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rrd_cgi.Po at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rrd_client.Plo at am__quote@ +@@ -706,6 +710,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rrd_xport.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rrdcached-rrd_daemon.Po at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rrdupdate.Po at am__quote@ ++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/s_round.Plo at am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@@ -875,6 +880,14 @@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(librrd_th_la_CFLAGS) $(CFLAGS) -c -o librrd_th_la-pngsize.lo `test -f 'pngsize.c' || echo '$(srcdir)/'`pngsize.c + ++librrd_th_la-s_round.lo: s_round.c ++ at am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(librrd_th_la_CFLAGS) $(CFLAGS) -MT librrd_th_la-s_round.lo -MD -MP -MF $(DEPDIR)/librrd_th_la-s_round.Tpo -c -o librrd_th_la-s_round.lo `test -f 's_round.c' || echo '$(srcdir)/'`s_round.c ++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/librrd_th_la-s_round.Tpo $(DEPDIR)/librrd_th_la-s_round.Plo ++ at am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='s_round.c' object='librrd_th_la-s_round.lo' libtool=yes @AMDEPBACKSLASH@ ++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ at am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(librrd_th_la_CFLAGS) $(CFLAGS) -c -o librrd_th_la-s_round.lo `test -f 's_round.c' || echo '$(srcdir)/'`s_round.c ++ + librrd_th_la-rrd_create.lo: rrd_create.c + @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(librrd_th_la_CFLAGS) $(CFLAGS) -MT librrd_th_la-rrd_create.lo -MD -MP -MF $(DEPDIR)/librrd_th_la-rrd_create.Tpo -c -o librrd_th_la-rrd_create.lo `test -f 'rrd_create.c' || echo '$(srcdir)/'`rrd_create.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/librrd_th_la-rrd_create.Tpo $(DEPDIR)/librrd_th_la-rrd_create.Plo Added: csw/mgar/pkg/rrdtool/branches/benny/files/patch-src-rrd_open.c =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/patch-src-rrd_open.c (rev 0) +++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-src-rrd_open.c 2010-02-26 18:44:24 UTC (rev 8849) @@ -0,0 +1,37 @@ +--- rrdtool-1.4.2.orig/src/rrd_open.c 2009-11-15 12:54:23.000000000 +0100 ++++ rrdtool-1.4.2/src/rrd_open.c 2010-02-26 15:18:37.546048288 +0100 +@@ -683,7 +683,7 @@ + /* this is a leftover from the old days, it serves no purpose + and is therefore turned into a no-op */ + void rrd_flush( +- rrd_file_t *rrd_file __attribute__((unused))) ++ rrd_file_t *rrd_file) + { + } + +@@ -745,10 +745,10 @@ + * aligning RRAs within stripes, or other performance enhancements + */ + void rrd_notify_row( +- rrd_file_t *rrd_file __attribute__((unused)), +- int rra_idx __attribute__((unused)), +- unsigned long rra_row __attribute__((unused)), +- time_t rra_time __attribute__((unused))) ++ rrd_file_t *rrd_file, ++ int rra_idx, ++ unsigned long rra_row, ++ time_t rra_time) + { + } + +@@ -760,8 +760,8 @@ + * don't change to a new disk block at the same time + */ + unsigned long rrd_select_initial_row( +- rrd_file_t *rrd_file __attribute__((unused)), +- int rra_idx __attribute__((unused)), ++ rrd_file_t *rrd_file, ++ int rra_idx, + rra_def_t *rra + ) + { Added: csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c (rev 0) +++ csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c 2010-02-26 18:44:24 UTC (rev 8849) @@ -0,0 +1,48 @@ +/*- + * Copyright (c) 2003, Steven G. Kargl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include + +double +round(double x) +{ + double t; +/* + if (!isfinite(x)) + return (x); +*/ + if (x >= 0.0) { + t = floor(x); + if (t - x <= -0.5) + t += 1.0; + return (t); + } else { + t = floor(-x); + if (t + x <= -0.5) + t += 1.0; + return (-t); + } +} Added: csw/mgar/pkg/rrdtool/branches/benny/files/s_round.h =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/s_round.h (rev 0) +++ csw/mgar/pkg/rrdtool/branches/benny/files/s_round.h 2010-02-26 18:44:24 UTC (rev 8849) @@ -0,0 +1,27 @@ +/*- + * Copyright (c) 2003, Steven G. Kargl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +double round(double); Added: csw/mgar/pkg/rrdtool/branches/benny/gar =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/gar (rev 0) +++ csw/mgar/pkg/rrdtool/branches/benny/gar 2010-02-26 18:44:24 UTC (rev 8849) @@ -0,0 +1 @@ +link ../../../../gar/v2 \ No newline at end of file Property changes on: csw/mgar/pkg/rrdtool/branches/benny/gar ___________________________________________________________________ Added: svn:special + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Feb 26 20:09:11 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 26 Feb 2010 19:09:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8850] csw/mgar/pkg/wmf/trunk/Makefile Message-ID: Revision: 8850 http://gar.svn.sourceforge.net/gar/?rev=8850&view=rev Author: hson Date: 2010-02-26 19:09:10 +0000 (Fri, 26 Feb 2010) Log Message: ----------- Put GTK loader in separate package Make use of ful configure options Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2010-02-26 18:44:24 UTC (rev 8849) +++ csw/mgar/pkg/wmf/trunk/Makefile 2010-02-26 19:09:10 UTC (rev 8850) @@ -17,31 +17,40 @@ SPKG_SOURCEURL = http://wvware.sourceforge.net -PACKAGES = CSWwmf CSWlibwmfdevel CSWlibwmfdoc CSWwmffonts CSWlibwmf +PACKAGES = CSWwmf CSWlibwmf CSWlibwmfdevel CSWlibwmfdoc CSWwmffonts CSWlibwmfgtk CATALOGNAME_CSWwmf = wmf CATALOGNAME_CSWlibwmf = libwmf CATALOGNAME_CSWlibwmfdevel = libwmf_devel CATALOGNAME_CSWlibwmfdoc = wmf_doc +CATALOGNAME_CSWlibwmfgtk = libwmf_gtk CATALOGNAME_CSWwmffonts = wmf_fonts SPKG_DESC_CSWwmf += Library and tools for manipulating Windows metafiles SPKG_DESC_CSWlibwmf += Library and tools for manipulating Windows metafiles - runtime package SPKG_DESC_CSWlibwmfdevel += Library and tools for manipulating Windows metafiles - developer package SPKG_DESC_CSWlibwmfdoc += Library and tools for manipulating Windows metafiles - documentation +SPKG_DESC_CSWlibwmfgtk += Library and tools for manipulating Windows metafiles - GTK loader SPKG_DESC_CSWwmffonts += Library and tools for manipulating Windows metafiles - fonts -RUNTIME_DEP_PKGS_CSWwmf += CSWexpat CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 +RUNTIME_DEP_PKGS_CSWwmf += CSWftype2 RUNTIME_DEP_PKGS_CSWwmf += CSWjpeg CSWlibx11 CSWpng CSWzlib RUNTIME_DEP_PKGS_CSWwmf += CSWwmffonts CSWlibwmf +RUNTIME_DEP_PKGS_CSWwmf += CSWiconv +RUNTIME_DEP_PKGS_CSWwmf += CSWlibxml2 RUNTIME_DEP_PKGS_CSWlibwmf += CSWwmffonts -RUNTIME_DEP_PKGS_CSWlibwmf += CSWexpat RUNTIME_DEP_PKGS_CSWlibwmf += CSWftype2 RUNTIME_DEP_PKGS_CSWlibwmf += CSWjpeg RUNTIME_DEP_PKGS_CSWlibwmf += CSWlibx11 RUNTIME_DEP_PKGS_CSWlibwmf += CSWpng RUNTIME_DEP_PKGS_CSWlibwmf += CSWzlib +RUNTIME_DEP_PKGS_CSWlibwmf += CSWiconv +RUNTIME_DEP_PKGS_CSWlibwmf += CSWlibxml2 RUNTIME_DEP_PKGS_CSWlibwmfdevel += CSWlibwmf -RUNTIME_DEP_PKGS_CSWlibwmfdoc += CSWwmf +RUNTIME_DEP_PKGS_CSWlibwmfdoc += +RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWlibwmf +RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWgtk2 RUNTIME_DEP_PKGS_CSWwmffonts += BUILD_DEP_PKGS += CSWgtk2devel @@ -49,6 +58,7 @@ PKGFILES_CSWlibwmf = $(PKGFILES_RT) PKGFILES_CSWlibwmfdevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibwmfdoc = $(sharedstatedir)/doc/.* +PKGFILES_CSWlibwmfgtk = $(libdir).*/io-wmf.so PKGFILES_CSWwmffonts = $(sharedstatedir)/libwmf/fonts/.* ARCHALL_CSWwmfdoc = 1 @@ -73,7 +83,19 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-x +#CONFIGURE_ARGS += --with-expat=$(prefix) +CONFIGURE_ARGS += --with-libxml2=$(prefix) +CONFIGURE_ARGS += --with-freetype=$(prefix) +CONFIGURE_ARGS += --with-zlib=$(prefix) +CONFIGURE_ARGS += --with-png=$(prefix) +CONFIGURE_ARGS += --with-jpeg=$(prefix) +CONFIGURE_ARGS += --with-sys-gd=$(prefix) +CONFIGURE_ARGS += --with-sysfontmap=$(datadir)/fonts/fontmap +#CONFIGURE_ARGS += --with-xtrafontmap= +CONFIGURE_ARGS += --with-gsfontmap=$(datadir)/ghostscript/Resource/Init/Fontmap.GS +CONFIGURE_ARGS += --with-gsfontdir=$(datadir)/ghostscript/fonts CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) @@ -82,4 +104,5 @@ STRIP_LIBTOOL = 1 include gar/category.mk + PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Feb 26 21:55:41 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 26 Feb 2010 20:55:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[8851] csw/mgar/pkg/wmf/trunk/Makefile Message-ID: Revision: 8851 http://gar.svn.sourceforge.net/gar/?rev=8851&view=rev Author: hson Date: 2010-02-26 20:55:41 +0000 (Fri, 26 Feb 2010) Log Message: ----------- wmf: Change catalogname for doc package Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2010-02-26 19:09:10 UTC (rev 8850) +++ csw/mgar/pkg/wmf/trunk/Makefile 2010-02-26 20:55:41 UTC (rev 8851) @@ -21,7 +21,7 @@ CATALOGNAME_CSWwmf = wmf CATALOGNAME_CSWlibwmf = libwmf CATALOGNAME_CSWlibwmfdevel = libwmf_devel -CATALOGNAME_CSWlibwmfdoc = wmf_doc +CATALOGNAME_CSWlibwmfdoc = libwmf_doc CATALOGNAME_CSWlibwmfgtk = libwmf_gtk CATALOGNAME_CSWwmffonts = wmf_fonts 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 Feb 26 22:13:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Feb 2010 21:13:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8852] csw/mgar/pkg/freetype/tags/freetype-2.3.9, REV=2009. 09.11/ Message-ID: Revision: 8852 http://gar.svn.sourceforge.net/gar/?rev=8852&view=rev Author: dmichelsen Date: 2010-02-26 21:13:54 +0000 (Fri, 26 Feb 2010) Log Message: ----------- freetype: Tag freetype-2.3.9,REV=2009.09.11 Added Paths: ----------- csw/mgar/pkg/freetype/tags/freetype-2.3.9,REV=2009.09.11/ 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 Feb 26 22:27:23 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Feb 2010 21:27:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8853] csw/mgar/pkg/freetype/trunk Message-ID: Revision: 8853 http://gar.svn.sourceforge.net/gar/?rev=8853&view=rev Author: dmichelsen Date: 2010-02-26 21:27:22 +0000 (Fri, 26 Feb 2010) Log Message: ----------- freetype: Update to 2.3.12 Modified Paths: -------------- csw/mgar/pkg/freetype/trunk/Makefile csw/mgar/pkg/freetype/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/freetype/trunk/files/COPYING Modified: csw/mgar/pkg/freetype/trunk/Makefile =================================================================== --- csw/mgar/pkg/freetype/trunk/Makefile 2010-02-26 21:13:54 UTC (rev 8852) +++ csw/mgar/pkg/freetype/trunk/Makefile 2010-02-26 21:27:22 UTC (rev 8853) @@ -1,5 +1,5 @@ GARNAME = freetype -GARVERSION = 2.3.9 +GARVERSION = 2.3.12 CATEGORIES = lib DESCRIPTION = A free and portable TrueType font rendering engine @@ -16,12 +16,13 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += COPYING # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) +LICENSE = docs/LICENSE.TXT + PACKAGES = CSWftype2 CATALOGNAME_CSWftype2 = freetype2 SPKG_SOURCEURL = http://www.freetype.org/ Modified: csw/mgar/pkg/freetype/trunk/checksums =================================================================== --- csw/mgar/pkg/freetype/trunk/checksums 2010-02-26 21:13:54 UTC (rev 8852) +++ csw/mgar/pkg/freetype/trunk/checksums 2010-02-26 21:27:22 UTC (rev 8853) @@ -1,2 +1 @@ -d76233108aca9c9606cdbd341562ad9a download/freetype-2.3.9.tar.bz2 -4155af32f82cb784be209147eb8b67ee download/COPYING +e974a82e5939be8e05ee65f07275d7c5 freetype-2.3.12.tar.bz2 Deleted: csw/mgar/pkg/freetype/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/freetype/trunk/files/COPYING 2010-02-26 21:13:54 UTC (rev 8852) +++ csw/mgar/pkg/freetype/trunk/files/COPYING 2010-02-26 21:27:22 UTC (rev 8853) @@ -1,537 +0,0 @@ - -The FreeType 2 font engine is copyrighted work and cannot be used -legally without a software license. In order to make this project -usable to a vast majority of developers, we distribute it under two -mutually exclusive open-source licenses. - -This means that *you* must choose *one* of the two licenses described -below, then obey all its terms and conditions when using FreeType 2 in -any of your projects or products. - - - The FreeType License, found in the file `FTL.TXT', which is similar - to the original BSD license *with* an advertising clause that forces - you to explicitly cite the FreeType project in your product's - documentation. All details are in the license file. This license - is suited to products which don't use the GNU General Public - License. - - - The GNU General Public License version 2, found in `GPL.TXT' (any - later version can be used also), for programs which already use the - GPL. Note that the FTL is incompatible with the GPL due to its - advertisement clause. - -The contributed PCF driver comes with a license similar to that of the X -Window System. It is compatible to the above two licenses (see file -src/pcf/readme). - - ---- end of LICENSE.TXT --- - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. - The FreeType Project LICENSE - ---------------------------- - - 2006-Jan-27 - - Copyright 1996-2002, 2006 by - David Turner, Robert Wilhelm, and Werner Lemberg - - - -Introduction -============ - - The FreeType Project is distributed in several archive packages; - some of them may contain, in addition to the FreeType font engine, - various tools and contributions which rely on, or relate to, the - FreeType Project. - - This license applies to all files found in such packages, and - which do not fall under their own explicit license. The license - affects thus the FreeType font engine, the test programs, - documentation and makefiles, at the very least. - - This license was inspired by the BSD, Artistic, and IJG - (Independent JPEG Group) licenses, which all encourage inclusion - and use of free software in commercial and freeware products - alike. As a consequence, its main points are that: - - o We don't promise that this software works. However, we will be - interested in any kind of bug reports. (`as is' distribution) - - o You can use this software for whatever you want, in parts or - full form, without having to pay us. (`royalty-free' usage) - - o You may not pretend that you wrote this software. If you use - it, or only parts of it, in a program, you must acknowledge - somewhere in your documentation that you have used the - FreeType code. (`credits') - - We specifically permit and encourage the inclusion of this - software, with or without modifications, in commercial products. - We disclaim all warranties covering The FreeType Project and - assume no liability related to The FreeType Project. - - - Finally, many people asked us for a preferred form for a - credit/disclaimer to use in compliance with this license. We thus - encourage you to use the following text: - - """ - Portions of this software are copyright \xA9 The FreeType - Project (www.freetype.org). All rights reserved. - """ - - Please replace with the value from the FreeType version you - actually use. - - -Legal Terms -=========== - -0. Definitions --------------- - - Throughout this license, the terms `package', `FreeType Project', - and `FreeType archive' refer to the set of files originally - distributed by the authors (David Turner, Robert Wilhelm, and - Werner Lemberg) as the `FreeType Project', be they named as alpha, - beta or final release. - - `You' refers to the licensee, or person using the project, where - `using' is a generic term including compiling the project's source - code as well as linking it to form a `program' or `executable'. - This program is referred to as `a program using the FreeType - engine'. - - This license applies to all files distributed in the original - FreeType Project, including all source code, binaries and - documentation, unless otherwise stated in the file in its - original, unmodified form as distributed in the original archive. - If you are unsure whether or not a particular file is covered by - this license, you must contact us to verify this. - - The FreeType Project is copyright (C) 1996-2000 by David Turner, - Robert Wilhelm, and Werner Lemberg. All rights reserved except as - specified below. - -1. No Warranty --------------- - - THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY - KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS - BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OR THE INABILITY TO - USE, OF THE FREETYPE PROJECT. - -2. Redistribution ------------------ - - This license grants a worldwide, royalty-free, perpetual and - irrevocable right and license to use, execute, perform, compile, - display, copy, create derivative works of, distribute and - sublicense the FreeType Project (in both source and object code - forms) and derivative works thereof for any purpose; and to - authorize others to exercise some or all of the rights granted - herein, subject to the following conditions: - - o Redistribution of source code must retain this license file - (`FTL.TXT') unaltered; any additions, deletions or changes to - the original files must be clearly indicated in accompanying - documentation. The copyright notices of the unaltered, - original files must be preserved in all copies of source - files. - - o Redistribution in binary form must provide a disclaimer that - states that the software is based in part of the work of the - FreeType Team, in the distribution documentation. We also - encourage you to put an URL to the FreeType web page in your - documentation, though this isn't mandatory. - - These conditions apply to any software derived from or based on - the FreeType Project, not just the unmodified files. If you use - our work, you must acknowledge us. However, no fee need be paid - to us. - -3. Advertising --------------- - - Neither the FreeType authors and contributors nor you shall use - the name of the other for commercial, advertising, or promotional - purposes without specific prior written permission. - - We suggest, but do not require, that you use one or more of the - following phrases to refer to this software in your documentation - or advertising materials: `FreeType Project', `FreeType Engine', - `FreeType library', or `FreeType Distribution'. - - As you have not signed this license, you are not required to - accept it. However, as the FreeType Project is copyrighted - material, only this license, or another one contracted with the - authors, grants you the right to use, distribute, and modify it. - Therefore, by using, distributing, or modifying the FreeType - Project, you indicate that you understand and accept all the terms - of this license. - -4. Contacts ------------ - - There are two mailing lists related to FreeType: - - o freetype at nongnu.org - - Discusses general use and applications of FreeType, as well as - future and wanted additions to the library and distribution. - If you are looking for support, start in this list if you - haven't found anything to help you in the documentation. - - o freetype-devel at nongnu.org - - Discusses bugs, as well as engine internals, design issues, - specific licenses, porting, etc. - - Our home page can be found at - - http://www.freetype.org - - ---- end of FTL.TXT --- 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 Feb 26 22:33:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Feb 2010 21:33:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8854] csw/mgar/pkg/lzip/trunk/Makefile Message-ID: Revision: 8854 http://gar.svn.sourceforge.net/gar/?rev=8854&view=rev Author: dmichelsen Date: 2010-02-26 21:33:33 +0000 (Fri, 26 Feb 2010) Log Message: ----------- lzip: Fix vendor URL Modified Paths: -------------- csw/mgar/pkg/lzip/trunk/Makefile Modified: csw/mgar/pkg/lzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzip/trunk/Makefile 2010-02-26 21:27:22 UTC (rev 8853) +++ csw/mgar/pkg/lzip/trunk/Makefile 2010-02-26 21:33:33 UTC (rev 8854) @@ -21,7 +21,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -VENDOR_URL = http://www.nongnu.org/lzip/clzip.html +VENDOR_URL = http://www.nongnu.org/lzip/lzip.html NODIRPATHS = --includedir CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Feb 26 22:37:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Feb 2010 21:37:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8855] csw/mgar/pkg Message-ID: Revision: 8855 http://gar.svn.sourceforge.net/gar/?rev=8855&view=rev Author: dmichelsen Date: 2010-02-26 21:37:57 +0000 (Fri, 26 Feb 2010) Log Message: ----------- clzip: Initial commit, stdbool missing, doesn't compile yet Added Paths: ----------- csw/mgar/pkg/clzip/ csw/mgar/pkg/clzip/branches/ csw/mgar/pkg/clzip/tags/ csw/mgar/pkg/clzip/trunk/ csw/mgar/pkg/clzip/trunk/Makefile csw/mgar/pkg/clzip/trunk/checksums csw/mgar/pkg/clzip/trunk/files/ csw/mgar/pkg/clzip/trunk/files/0001-Do-not-use-gcc-CFLAGS.patch csw/mgar/pkg/clzip/trunk/files/0002-Do-not-use-gcc-CFLAGS.patch csw/mgar/pkg/clzip/trunk/files/0003-Use-inttypes-instead-of-stdint.patch csw/mgar/pkg/clzip/trunk/files/0004-Use-ucb-echo-for-n.patch Property changes on: csw/mgar/pkg/clzip/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/clzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/clzip/trunk/Makefile (rev 0) +++ csw/mgar/pkg/clzip/trunk/Makefile 2010-02-26 21:37:57 UTC (rev 8855) @@ -0,0 +1,33 @@ +GARNAME = clzip +GARVERSION = 1.0-rc2 +CATEGORIES = utils + +DESCRIPTION = a lossless data compressor based on the LZMA algorithm +define BLURB +endef + +MASTER_SITES = http://mirrors.zerg.biz/nongnu/lzip/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Do-not-use-gcc-CFLAGS.patch +PATCHFILES += 0002-Do-not-use-gcc-CFLAGS.patch +PATCHFILES += 0003-Use-inttypes-instead-of-stdint.patch +PATCHFILES += 0004-Use-ucb-echo-for-n.patch + +SPKG_VERSION = $(subst -,,$(GARVERSION)) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +NODIRPATHS = --includedir +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += CXX="$(CXX)" +CONFIGURE_ARGS += CPPFLAGS="$(CPPFLAGS)" +CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)" +CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)" + +TEST_TARGET = check + +INSTALL_OVERRIDE_VARS = INSTALL +INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall + +include gar/category.mk Added: csw/mgar/pkg/clzip/trunk/checksums =================================================================== --- csw/mgar/pkg/clzip/trunk/checksums (rev 0) +++ csw/mgar/pkg/clzip/trunk/checksums 2010-02-26 21:37:57 UTC (rev 8855) @@ -0,0 +1,5 @@ +11dfe47b102267e6c070699b0a92b741 0001-Do-not-use-gcc-CFLAGS.patch +3db9d95c5cac0ee16f762e3c65ce3336 0002-Do-not-use-gcc-CFLAGS.patch +2a1badc5ef23643659843f9a557afb13 0003-Use-inttypes-instead-of-stdint.patch +782315357fca676b888181ee0992e5ba 0004-Use-ucb-echo-for-n.patch +94c29caf7ded781280b4b0261bbf1b80 clzip-1.0-rc2.tar.gz Added: csw/mgar/pkg/clzip/trunk/files/0001-Do-not-use-gcc-CFLAGS.patch =================================================================== --- csw/mgar/pkg/clzip/trunk/files/0001-Do-not-use-gcc-CFLAGS.patch (rev 0) +++ csw/mgar/pkg/clzip/trunk/files/0001-Do-not-use-gcc-CFLAGS.patch 2010-02-26 21:37:57 UTC (rev 8855) @@ -0,0 +1,25 @@ +From 546e169ba5421d3c9a28a1e7e232c698992d9c5f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 26 Feb 2010 22:34:20 +0100 +Subject: [PATCH 1/4] Do not use gcc CFLAGS + +--- + Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index 802fa80..d602669 100644 +--- a/Makefile ++++ b/Makefile +@@ -18,7 +18,7 @@ mandir = /opt/csw/share/man + sysconfdir = /opt/csw/etc + CC = cc + CPPFLAGS = +-CFLAGS = -Wall -W -O2 -std=gnu99 ++CFLAGS = + LDFLAGS = + + DISTNAME = $(pkgname)-$(pkgversion) +-- +1.6.6 + Added: csw/mgar/pkg/clzip/trunk/files/0002-Do-not-use-gcc-CFLAGS.patch =================================================================== --- csw/mgar/pkg/clzip/trunk/files/0002-Do-not-use-gcc-CFLAGS.patch (rev 0) +++ csw/mgar/pkg/clzip/trunk/files/0002-Do-not-use-gcc-CFLAGS.patch 2010-02-26 21:37:57 UTC (rev 8855) @@ -0,0 +1,25 @@ +From 925f3889c4e6f2738c874a91dc6d077c27552eaa Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 26 Feb 2010 22:34:25 +0100 +Subject: [PATCH 2/4] Do not use gcc CFLAGS + +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index 5ebfe51..224c7ed 100755 +--- a/configure ++++ b/configure +@@ -27,7 +27,7 @@ mandir='$(datadir)/man' + sysconfdir='$(prefix)/etc' + CC= + CPPFLAGS= +-CFLAGS='-Wall -W -O2 -std=gnu99' ++CFLAGS= + LDFLAGS= + + # Loop over all args +-- +1.6.6 + Added: csw/mgar/pkg/clzip/trunk/files/0003-Use-inttypes-instead-of-stdint.patch =================================================================== --- csw/mgar/pkg/clzip/trunk/files/0003-Use-inttypes-instead-of-stdint.patch (rev 0) +++ csw/mgar/pkg/clzip/trunk/files/0003-Use-inttypes-instead-of-stdint.patch 2010-02-26 21:37:57 UTC (rev 8855) @@ -0,0 +1,53 @@ +From c4d441c054c664391797c6019232fd174adadd7a Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 26 Feb 2010 22:34:48 +0100 +Subject: [PATCH 3/4] Use inttypes instead of stdint + +--- + decoder.c | 2 +- + encoder.c | 2 +- + main.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/decoder.c b/decoder.c +index 20799a3..bfe82eb 100644 +--- a/decoder.c ++++ b/decoder.c +@@ -19,7 +19,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/encoder.c b/encoder.c +index a46893a..90215a4 100644 +--- a/encoder.c ++++ b/encoder.c +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + + #include "clzip.h" + #include "encoder.h" +diff --git a/main.c b/main.c +index 3eb7c87..c1ab889 100644 +--- a/main.c ++++ b/main.c +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +-- +1.6.6 + Added: csw/mgar/pkg/clzip/trunk/files/0004-Use-ucb-echo-for-n.patch =================================================================== --- csw/mgar/pkg/clzip/trunk/files/0004-Use-ucb-echo-for-n.patch (rev 0) +++ csw/mgar/pkg/clzip/trunk/files/0004-Use-ucb-echo-for-n.patch 2010-02-26 21:37:57 UTC (rev 8855) @@ -0,0 +1,27 @@ +From ebbffb3199cc4f9cd1fd0a429f3eac19a4570f06 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 26 Feb 2010 22:35:01 +0100 +Subject: [PATCH 4/4] Use ucb echo for -n + +--- + testsuite/check.sh | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/testsuite/check.sh b/testsuite/check.sh +index a57224d..77eb0ec 100755 +--- a/testsuite/check.sh ++++ b/testsuite/check.sh +@@ -5,6 +5,10 @@ + # This script is free software: you have unlimited permission + # to copy, distribute and modify it. + ++# Only ucb echo has -n ++PATH=/usr/ucb:$PATH ++export PATH ++ + LC_ALL=C + export LC_ALL + objdir=`pwd` +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Feb 27 01:07:45 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 27 Feb 2010 00:07:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8856] csw/mgar/pkg/gnome-icon-theme Message-ID: Revision: 8856 http://gar.svn.sourceforge.net/gar/?rev=8856&view=rev Author: wahwah Date: 2010-02-27 00:07:45 +0000 (Sat, 27 Feb 2010) Log Message: ----------- gnome-icon-theme: The garification. Added Paths: ----------- csw/mgar/pkg/gnome-icon-theme/branches/ csw/mgar/pkg/gnome-icon-theme/branches/legacy/ csw/mgar/pkg/gnome-icon-theme/trunk/Makefile csw/mgar/pkg/gnome-icon-theme/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/gnome-icon-theme/trunk/legacy/ Property Changed: ---------------- csw/mgar/pkg/gnome-icon-theme/trunk/ Property changes on: csw/mgar/pkg/gnome-icon-theme/trunk ___________________________________________________________________ Added: svn:ignore + work gar Added: csw/mgar/pkg/gnome-icon-theme/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-icon-theme/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnome-icon-theme/trunk/Makefile 2010-02-27 00:07:45 UTC (rev 8856) @@ -0,0 +1,22 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 8335 2010-02-03 18:36:29Z wahwah $ + +GARNAME = gnome-icon-theme +GNOME_VERSION = 2.22 +GARVERSION = $(GNOME_VERSION).0 +CATEGORIES = gnome +DESCRIPTION = GNOME icon theme +define BLURB +endef +SPKG_SOURCEURL = http://ftp.gnome.org/pub/GNOME/sources/$(GARNAME)/ +MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(GARNAME)/$(GNOME_VERSION)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +CATALOGNAME = gnome_icon_theme +RUNTIME_DEP_PKGS = CSWicon-naming-utils +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +TEST_TARGET = check +CONFIGURE_ARGS = $(DIRPATHS) +ARCHALL_CSWgnome-icon-theme = 1 +include gar/category.mk Added: csw/mgar/pkg/gnome-icon-theme/trunk/checksums =================================================================== --- csw/mgar/pkg/gnome-icon-theme/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnome-icon-theme/trunk/checksums 2010-02-27 00:07:45 UTC (rev 8856) @@ -0,0 +1 @@ +271b0b12b41539c7ca9bb5f19ced8a38 gnome-icon-theme-2.22.0.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 Feb 27 01:20:05 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 27 Feb 2010 00:20:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[8857] csw/mgar/pkg/gnome-icon-theme/trunk/Makefile Message-ID: Revision: 8857 http://gar.svn.sourceforge.net/gar/?rev=8857&view=rev Author: wahwah Date: 2010-02-27 00:20:05 +0000 (Sat, 27 Feb 2010) Log Message: ----------- gnome-icon-theme: Updating the pkgname to match the existing one. Modified Paths: -------------- csw/mgar/pkg/gnome-icon-theme/trunk/Makefile Modified: csw/mgar/pkg/gnome-icon-theme/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-icon-theme/trunk/Makefile 2010-02-27 00:07:45 UTC (rev 8856) +++ csw/mgar/pkg/gnome-icon-theme/trunk/Makefile 2010-02-27 00:20:05 UTC (rev 8857) @@ -13,9 +13,10 @@ MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(GARNAME)/$(GNOME_VERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CATALOGNAME = gnome_icon_theme -RUNTIME_DEP_PKGS = CSWicon-naming-utils -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +PACKAGES = CSWgnomeicontheme +CATALOGNAME_CSWgnomeicontheme = gnome_icon_theme +RUNTIME_DEP_PKGS_CSWgnomeicontheme = CSWicon-naming-utils +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWgnomeicontheme) TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) ARCHALL_CSWgnome-icon-theme = 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 Sat Feb 27 02:09:37 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 27 Feb 2010 01:09:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8858] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 8858 http://gar.svn.sourceforge.net/gar/?rev=8858&view=rev Author: wahwah Date: 2010-02-27 01:09:37 +0000 (Sat, 27 Feb 2010) Log Message: ----------- nspr: Adding 64-bit pkgconfig file Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2010-02-27 00:20:05 UTC (rev 8857) +++ csw/mgar/pkg/nspr/trunk/Makefile 2010-02-27 01:09:37 UTC (rev 8858) @@ -29,12 +29,11 @@ PKGFILES_CSWnspr-devel += .*/nspr\.pc PKGFILES_CSWnspr-devel += .*compile-et\.pl -ARCHALL_CSWnspr-devel = 1 - SPKG_DESC_CSWnspr = Netscape Portable Runtime SPKG_DESC_CSWnspr-devel = Netscape Portable Runtime header files CATALOGNAME_CSWnspr-devel = nspr_devel -RUNTIME_DEP_PKGS_CSWnspr-devel = CSWnspr +RUNTIME_DEP_PKGS_CSWnspr-devel = CSWnspr +RUNTIME_DEP_PKGS_CSWnspr-devel += CSWperl UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -68,6 +67,8 @@ BUILD64 = 1 +LICENSE = LICENSE + include gar/category.mk configure-nspr: @@ -98,9 +99,12 @@ ginstall -m 755 -d $(DESTDIR)$(bindir) ginstall -m 755 $(WORKSRC)/build/config/nspr-config \ $(DESTDIR)$(bindir) - ginstall -m 755 -d $(DESTDIR)$(prefix)/lib/pkgconfig + ginstall -m 755 -d $(DESTDIR)$(libdir)/pkgconfig ginstall -m 644 $(WORKSRC)/build/config/nspr.pc \ - $(DESTDIR)$(prefix)/lib/pkgconfig + $(DESTDIR)$(libdir)/pkgconfig + if [ $(MEMORYMODEL) = 64 ]; then \ + gsed -i -e 's+/lib$$+lib/64+' $(DESTDIR)$(libdir)/pkgconfig/nspr.pc ; \ + fi rm -f $(DESTDIR)$(bindir)/prerr.properties rm -f $(DESTDIR)$(bindir)/nspr.pc @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Feb 27 13:59:35 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 27 Feb 2010 12:59:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[8859] csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng Message-ID: Revision: 8859 http://gar.svn.sourceforge.net/gar/?rev=8859&view=rev Author: wahwah Date: 2010-02-27 12:59:35 +0000 (Sat, 27 Feb 2010) Log Message: ----------- syslog_ng: startup script will now exit with exit code zero. Fixes http://www.opencsw.org/bugtrack/view.php?id=4308 Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng Modified: csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng 2010-02-27 01:09:37 UTC (rev 8858) +++ csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng 2010-02-27 12:59:35 UTC (rev 8859) @@ -38,7 +38,8 @@ stop) if [ -f ${PID_FILE} ]; then syspid=`/usr/bin/cat ${PID_FILE}` - [ "$syspid" -gt 0 ] && kill -15 $syspid && rm ${PID_FILE} + # The -f flag is used because the PID_FILE might be gone. + [ "$syspid" -gt 0 ] && kill -15 $syspid && rm -f ${PID_FILE} fi ;; *) @@ -46,3 +47,6 @@ exit 1 ;; esac + +# Don't exit with the status of the last command. +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Feb 27 14:04:44 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 27 Feb 2010 13:04:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8860] csw/mgar/pkg/syslog_ng/trunk Message-ID: Revision: 8860 http://gar.svn.sourceforge.net/gar/?rev=8860&view=rev Author: wahwah Date: 2010-02-27 13:04:44 +0000 (Sat, 27 Feb 2010) Log Message: ----------- syslog_ng: Version bump to 3.0.5 Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile csw/mgar/pkg/syslog_ng/trunk/checksums Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2010-02-27 12:59:35 UTC (rev 8859) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2010-02-27 13:04:44 UTC (rev 8860) @@ -1,5 +1,5 @@ GARNAME = syslog-ng -GARVERSION = 3.0.4 +GARVERSION = 3.0.5 CATEGORIES = server DESCRIPTION = A powerful syslogd replacement Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2010-02-27 12:59:35 UTC (rev 8859) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2010-02-27 13:04:44 UTC (rev 8860) @@ -1,5 +1,5 @@ ab950f80af5ca165ef3f5ba2df04f9be CSWsyslogng.postremove d58b011085f44206053562078c012857 CSWsyslogng.preinstall -fcd5effdaa96da8abf9788bc5745bda3 cswsyslog_ng +b7a833c17d8b1f53528b35d169354f73 cswsyslog_ng 69bad95775b98d26e52db8a8292e2790 syslog-ng.conf.CSW -86c39779261545d2289e9c309e262b8d syslog-ng_3.0.4.tar.gz +28f0d9ff2243b330e8cd6311ef9b2f12 syslog-ng_3.0.5.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 Sat Feb 27 14:09:49 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 27 Feb 2010 13:09:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[8861] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 8861 http://gar.svn.sourceforge.net/gar/?rev=8861&view=rev Author: chninkel Date: 2010-02-27 13:09:49 +0000 (Sat, 27 Feb 2010) Log Message: ----------- openssl: updated to 0.9.8m Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2010-02-27 13:04:44 UTC (rev 8860) +++ csw/mgar/pkg/openssl/trunk/Makefile 2010-02-27 13:09:49 UTC (rev 8861) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = openssl -GARVERSION = 0.9.8l +GARVERSION = 0.9.8m CATEGORIES = lib DESCRIPTION = The Open Source toolkit for SSL and TLS Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2010-02-27 13:04:44 UTC (rev 8860) +++ csw/mgar/pkg/openssl/trunk/checksums 2010-02-27 13:09:49 UTC (rev 8861) @@ -8,6 +8,6 @@ 521028d0016ae5a4cc8fd5e0b0add53f CSWosslrt.prototype-sparc 88634d81695a173bdb35df1a80cc9761 CSWosslutils.prototype b78faa440d6f6a2a07663de331678648 README.CSW -28a305623ad6de6f8370e36482716873 changelog.CSW +87a4157f907147ec2c8319698c8ab111 changelog.CSW 64f7c3f3a6cae483209b69c31c82557d more_configure_targets.patch -05a0ece1372392a2cf310ebb96333025 openssl-0.9.8l.tar.gz +898bf125370926d5f692a2201124f8ec openssl-0.9.8m.tar.gz Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2010-02-27 13:04:44 UTC (rev 8860) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2010-02-27 13:09:49 UTC (rev 8861) @@ -1,3 +1,9 @@ +openssl (0.9.8m,REV=2010.02.27) unstable + + * New upstream version. + + -- Yann Rouillard Sat, 27 Feb 2010 11:30:08 +0100 + openssl (0.9.8l,REV=2009.12.08) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Feb 27 15:26:04 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 27 Feb 2010 14:26:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[8862] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 8862 http://gar.svn.sourceforge.net/gar/?rev=8862&view=rev Author: wahwah Date: 2010-02-27 14:26:03 +0000 (Sat, 27 Feb 2010) Log Message: ----------- mysql-5.0.x: Adding overrides, making the devel package depend on *rt only. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-02-27 13:09:49 UTC (rev 8861) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-02-27 14:26:03 UTC (rev 8862) @@ -33,8 +33,12 @@ INITSMF = $(global_sysconfdir)/init\.d/csw$(GARNAME) -PACKAGES = CSW$(GARNAME) CSW$(GARNAME)bench CSW$(GARNAME)client CSW$(GARNAME)devel -PACKAGES += CSW$(GARNAME)rt CSW$(GARNAME)test +PACKAGES = CSW$(GARNAME) +PACKAGES += CSW$(GARNAME)bench +PACKAGES += CSW$(GARNAME)client +PACKAGES += CSW$(GARNAME)devel +PACKAGES += CSW$(GARNAME)rt +PACKAGES += CSW$(GARNAME)test PATCHFILES = 0001-Use-libc-not-libcrypt.patch PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch @@ -115,17 +119,14 @@ RUNTIME_DEP_PKGS_CSW$(GARNAME) = CSW$(GARNAME)client RUNTIME_DEP_PKGS_CSW$(GARNAME) += CSW$(GARNAME)rt -# RUNTIME_DEP_PKGS_CSW$(GARNAME) += CSWosslrt RUNTIME_DEP_PKGS_CSW$(GARNAME) += CSWzlib -# RUNTIME_DEP_PKGS_CSW$(GARNAME)rt = CSWosslrt RUNTIME_DEP_PKGS_CSW$(GARNAME)rt += CSWzlib RUNTIME_DEP_PKGS_CSW$(GARNAME)bench = CSW$(GARNAME) RUNTIME_DEP_PKGS_CSW$(GARNAME)bench += CSWperl RUNTIME_DEP_PKGS_CSW$(GARNAME)client = CSW$(GARNAME)rt -# RUNTIME_DEP_PKGS_CSW$(GARNAME)client += CSWosslrt RUNTIME_DEP_PKGS_CSW$(GARNAME)client += CSWncurses RUNTIME_DEP_PKGS_CSW$(GARNAME)client += CSWzlib -RUNTIME_DEP_PKGS_CSW$(GARNAME)devel = CSW$(GARNAME) +RUNTIME_DEP_PKGS_CSW$(GARNAME)devel = CSW$(GARNAME)rt RUNTIME_DEP_PKGS_CSW$(GARNAME)test = CSW$(GARNAME) RUNTIME_DEP_PKGS_CSW$(GARNAME)test += CSWperl @@ -177,6 +178,13 @@ CFLAGS := $(filter-out -I%,$(CFLAGS)) +# CSWmysql5 contains no files +CHECKPKG_OVERRIDES_CSWmysql5 += license-missing +CHECKPKG_OVERRIDES_CSWmysql5 += action-class-only-in-pkginfo|none + +# Until the dependency guessed gets better at guessing +CHECKPKG_OVERRIDES_CSWmysql5devel += missing-dependency|CSWmysql5 + pre-configure-modulated: # To work around the following libtool version mismatch problem: # libtool: Version mismatch error. This is libtool 2.2.6, but the 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 Feb 27 16:08:16 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 27 Feb 2010 15:08:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8863] csw/mgar/gar/v2/lib/python/checkpkg.py Message-ID: Revision: 8863 http://gar.svn.sourceforge.net/gar/?rev=8863&view=rev Author: wahwah Date: 2010-02-27 15:08:15 +0000 (Sat, 27 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, since missing symbols checking is disabled, let's save time on gathering the data. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-27 14:26:03 UTC (rev 8862) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-27 15:08:15 UTC (rev 8863) @@ -849,10 +849,10 @@ "basic_stats", "binaries", "binaries_dump_info", - "defined_symbols", + # "defined_symbols", "depends", "isalist", - "ldd_dash_r", + # "ldd_dash_r", "overrides", "pkginfo", "pkgmap", @@ -1064,8 +1064,10 @@ self.DumpObject(self.GetOverrides(), "overrides") self.DumpObject(dir_pkg.GetParsedPkginfo(), "pkginfo") self.DumpObject(dir_pkg.GetPkgmap().entries, "pkgmap") - self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") - self.DumpObject(self.GetDefinedSymbols(), "defined_symbols") + # This check is currently disabled, let's save time by not collecting + # these data. + # self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") + # self.DumpObject(self.GetDefinedSymbols(), "defined_symbols") logging.debug("Statistics collected.") def GetAllStats(self): 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 Feb 27 16:21:08 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 27 Feb 2010 15:21:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8864] csw/mgar/gar/v2/lib/python Message-ID: Revision: 8864 http://gar.svn.sourceforge.net/gar/?rev=8864&view=rev Author: wahwah Date: 2010-02-27 15:21:04 +0000 (Sat, 27 Feb 2010) Log Message: ----------- mGAR v2: submitpkg, accept also filenames as arguments Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-27 15:08:15 UTC (rev 8863) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-27 15:21:04 UTC (rev 8864) @@ -257,6 +257,8 @@ def __init__(self, dir_path): self.dir_path = dir_path + def __repr__(self): + return u"StagingDir(%s)" % repr(self.dir_path) def GetLatest(self, software, architectures=ARCHITECTURES): files = os.listdir(self.dir_path) package_files = [] @@ -268,7 +270,8 @@ if relevant_pkgs: package_files.append(relevant_pkgs[-1]) if not package_files: - raise PackageError("Could not find %s in %s" % (software, self.dir_path)) + raise PackageError("Could not find %s in %s" + % (repr(software), repr(self.dir_path))) logging.debug("The latest packages %s in %s are %s", repr(software), repr(self.dir_path), Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-02-27 15:08:15 UTC (rev 8863) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-02-27 15:21:04 UTC (rev 8864) @@ -87,7 +87,8 @@ repr(opt_name)) raise ConfigurationError("Option %s is missing from the configuration." % repr(opt_name)) - parser = optparse.OptionParser() + usage = """%s [options] [file1 file2 ...]""" % sys.argv[0] + parser = optparse.OptionParser(usage) parser.add_option("-p", dest="pkgnames", help="A deprecated options. Please use --catalognames.") @@ -100,7 +101,8 @@ action="store_true", help="Print debugging messages") (options, args) = parser.parse_args() - level = logging.WARN + file_names = args + level = logging.INFO if options.debug: level = logging.DEBUG logging.basicConfig(level=level) @@ -112,9 +114,6 @@ options.pkgnames]) else: options.catalognames = options.pkgnames - if not options.catalognames: - parser.print_help() - raise ConfigurationError("You need to specify a package name or names.") if config.has_option(CONFIG_RELEASE_SECTION, "release cc"): release_cc = config.get(CONFIG_RELEASE_SECTION, "release cc") else: @@ -124,10 +123,28 @@ print CONFIG_INFO print e sys.exit(1) - catalognames = options.catalognames.split(",") - package_files = [] staging_dir = opencsw.StagingDir(config.get(CONFIG_RELEASE_SECTION, "package dir")) + if options.catalognames: + catalognames = options.catalognames.split(",") + else: + catalognames = [] + if file_names: + for file_name in file_names: + base_name = os.path.basename(file_name) + if base_name != file_name: + logging.warn("Removing %s, using only %s" + % (repr(os.path.dirname(file_name)), repr(base_name))) + logging.warn("Only %s will be searched for packages." + % repr(staging_dir)) + parsed_file_name = opencsw.ParsePackageFileName(base_name) + catalognames.append(parsed_file_name["catalogname"]) + catalognames = sorted(set(catalognames)) + if not catalognames: + parser.print_help() + raise ConfigurationError("You need to specify a package name or names.") + + package_files = [] for p in catalognames: package_files.extend(staging_dir.GetLatest(p)) logging.debug("Copying files to the target host:dir") 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 Feb 27 16:29:24 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 27 Feb 2010 15:29:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8865] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswmigrateconf Message-ID: Revision: 8865 http://gar.svn.sourceforge.net/gar/?rev=8865&view=rev Author: wahwah Date: 2010-02-27 15:29:24 +0000 (Sat, 27 Feb 2010) Log Message: ----------- cswclassutils: cswmigrateconf, these don't have to be configuration files. Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2010-02-27 15:21:04 UTC (rev 8864) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2010-02-27 15:29:24 UTC (rev 8865) @@ -59,8 +59,8 @@ echo "----8<---- migration configuration end ----8<----" echo echo "*******************************************************************" - echo "* Configuration files are going to be migrated from the deprecated " - echo "* location (/opt/csw/etc) to the new location (/etc/opt/csw). " + echo "* Files will be now migrated from the deprecated location " + echo "* (e.g. /opt/csw/etc) to the new location (e.g. /etc/opt/csw). " echo "* " echo "* Migration will continue in 10 seconds. " echo "* Press CTRL+C if you want to stop now. " 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 Feb 27 16:56:57 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 27 Feb 2010 15:56:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8866] csw/mgar/pkg/cswclassutils/trunk/checksums Message-ID: Revision: 8866 http://gar.svn.sourceforge.net/gar/?rev=8866&view=rev Author: wahwah Date: 2010-02-27 15:56:57 +0000 (Sat, 27 Feb 2010) Log Message: ----------- cswclassutils: updating checsums Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2010-02-27 15:29:24 UTC (rev 8865) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2010-02-27 15:56:57 UTC (rev 8866) @@ -4,7 +4,7 @@ 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices 4f2e9de463cb4b17ba6e1b3dfdf18913 CSWcswclassutils.i.cswinetd 6abb13158fee906870d1d68dc0fae6f3 CSWcswclassutils.i.cswinitsmf -17382424148caa223f161ddfd2fb427a CSWcswclassutils.i.cswmigrateconf +a667515489aafc81d41159765faf698f CSWcswclassutils.i.cswmigrateconf 8ab721535d43dcef702538d394e7a2ce CSWcswclassutils.i.cswpostmsg 0fc6128391af4c9aebf72b84755532cb CSWcswclassutils.i.cswpreserveconf 9018419febe06c12e89d66cc76e7261f CSWcswclassutils.i.cswpycompile 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 Feb 27 19:54:10 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 27 Feb 2010 18:54:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[8867] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 8867 http://gar.svn.sourceforge.net/gar/?rev=8867&view=rev Author: rthurner Date: 2010-02-27 18:54:10 +0000 (Sat, 27 Feb 2010) Log Message: ----------- svn-1.6.9 does NOT depend on perl, ruby and python Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-02-27 15:56:57 UTC (rev 8866) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-02-27 18:54:10 UTC (rev 8867) @@ -211,6 +211,11 @@ CHECKPKG_OVERRIDES_CSWpythonsvn = symbol-not-found CHECKPKG_OVERRIDES_CSWpmsvn = symbol-not-found +CHECKPKG_OVERRIDES_CSWsvn += missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWsvn += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWsvn += missing-dependency|CSWpython + + include gar/category.mk BINDING_LANGS = java perl python ruby This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Feb 27 21:15:45 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 27 Feb 2010 20:15:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8868] csw/mgar/pkg/orbit2/trunk/Makefile Message-ID: Revision: 8868 http://gar.svn.sourceforge.net/gar/?rev=8868&view=rev Author: hson Date: 2010-02-27 20:15:42 +0000 (Sat, 27 Feb 2010) Log Message: ----------- orbit2: Include static library libname-server-2.a in package Modified Paths: -------------- csw/mgar/pkg/orbit2/trunk/Makefile Modified: csw/mgar/pkg/orbit2/trunk/Makefile =================================================================== --- csw/mgar/pkg/orbit2/trunk/Makefile 2010-02-27 18:54:10 UTC (rev 8867) +++ csw/mgar/pkg/orbit2/trunk/Makefile 2010-02-27 20:15:42 UTC (rev 8868) @@ -35,4 +35,11 @@ TEST_TARGET = check +EXTRA_MERGE_INCLUDE_FILES = $(libdir)/libname-server-2.a + +CPP = /usr/lib/cpp +EXTRA_COMMON_EXPORTS += CPP +CXXCPP = /usr/lib/cpp +EXTRA_COMMON_EXPORTS += CXXCPP + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Feb 27 22:22:30 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 27 Feb 2010 21:22:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8869] csw/mgar/pkg/nss/trunk/Makefile Message-ID: Revision: 8869 http://gar.svn.sourceforge.net/gar/?rev=8869&view=rev Author: wahwah Date: 2010-02-27 21:22:30 +0000 (Sat, 27 Feb 2010) Log Message: ----------- nss: Disabling isaexec, that's what reading coffee grounds is apparently telling us. Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2010-02-27 20:15:42 UTC (rev 8868) +++ csw/mgar/pkg/nss/trunk/Makefile 2010-02-27 21:22:30 UTC (rev 8869) @@ -123,6 +123,9 @@ PATCHFILES_isa-amd64 = sqlite3-64.patch PATCHFILES_isa-amd64 += platlibs-sqlite3-64.patch +# http://lists.opencsw.org/pipermail/pkgsubmissions/2010-February/000167.html +NOISAEXEC = 1 + include gar/category.mk build-nss: build-coreconf build-dbm build-nss-compile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Feb 27 23:02:13 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 27 Feb 2010 22:02:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8870] csw/mgar/pkg/wmf/trunk/Makefile Message-ID: Revision: 8870 http://gar.svn.sourceforge.net/gar/?rev=8870&view=rev Author: hson Date: 2010-02-27 22:02:12 +0000 (Sat, 27 Feb 2010) Log Message: ----------- wmf: Fix package rename bug Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2010-02-27 21:22:30 UTC (rev 8869) +++ csw/mgar/pkg/wmf/trunk/Makefile 2010-02-27 22:02:12 UTC (rev 8870) @@ -61,7 +61,7 @@ PKGFILES_CSWlibwmfgtk = $(libdir).*/io-wmf.so PKGFILES_CSWwmffonts = $(sharedstatedir)/libwmf/fonts/.* -ARCHALL_CSWwmfdoc = 1 +ARCHALL_CSWlibwmfdoc = 1 ARCHALL_CSWwmffonts = 1 CHECKPKG_OVERRIDES_CSWlibwmf += symbol-not-found|libwmf-0.2.so.7.1.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Feb 27 23:07:35 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 27 Feb 2010 22:07:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[8871] csw/mgar/pkg/expect/trunk/Makefile Message-ID: Revision: 8871 http://gar.svn.sourceforge.net/gar/?rev=8871&view=rev Author: hson Date: 2010-02-27 22:07:35 +0000 (Sat, 27 Feb 2010) Log Message: ----------- expect: Fix tcl and tk include paths Modified Paths: -------------- csw/mgar/pkg/expect/trunk/Makefile Modified: csw/mgar/pkg/expect/trunk/Makefile =================================================================== --- csw/mgar/pkg/expect/trunk/Makefile 2010-02-27 22:02:12 UTC (rev 8870) +++ csw/mgar/pkg/expect/trunk/Makefile 2010-02-27 22:07:35 UTC (rev 8871) @@ -32,8 +32,8 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --with-tcl=/opt/csw/lib --with-tk=/opt/csw/lib -CONFIGURE_ARGS += --with-tclinclude=/export/home/hson/dev/mgar/pkg/tcl/trunk/work/solaris8-sparc/./build-isa-sparcv8/tcl8.5.7/generic/ -CONFIGURE_ARGS += --with-tkinclude=/export/home/hson/dev/mgar/pkg/tk/trunk/work/solaris8-sparc/./build-isa-sparcv8/tk8.5.7/generic/ +CONFIGURE_ARGS += --with-tclinclude=$(WORKSRC)/../tcl8.5.7/generic/ +CONFIGURE_ARGS += --with-tkinclude=$(WORKSRC)/../tk8.5.7/generic/ TEST_TARGET = @@ -64,8 +64,3 @@ ) # @( cd $(WORKSRC); aclocal;autoconf) @$(MAKECOOKIE) - -configure-%/configure: - @echo " ==> Running configure in $*" - cd $* && $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) - @$(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 Feb 27 23:14:55 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 27 Feb 2010 22:14:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[8872] csw/mgar/pkg Message-ID: Revision: 8872 http://gar.svn.sourceforge.net/gar/?rev=8872&view=rev Author: dmichelsen Date: 2010-02-27 22:14:55 +0000 (Sat, 27 Feb 2010) Log Message: ----------- z: Initial commit Added Paths: ----------- csw/mgar/pkg/z/ csw/mgar/pkg/z/branches/ csw/mgar/pkg/z/tags/ csw/mgar/pkg/z/trunk/ csw/mgar/pkg/z/trunk/Makefile csw/mgar/pkg/z/trunk/checksums csw/mgar/pkg/z/trunk/files/ Property changes on: csw/mgar/pkg/z/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/z/trunk/Makefile =================================================================== --- csw/mgar/pkg/z/trunk/Makefile (rev 0) +++ csw/mgar/pkg/z/trunk/Makefile 2010-02-27 22:14:55 UTC (rev 8872) @@ -0,0 +1,32 @@ +GARNAME = z +GARVERSION = 2.6.1 +CATEGORIES = utils + +DESCRIPTION = A simple, safe and convenient front-end for various compression programs +define BLURB + Z is a simple, safe and convenient front-end for the compress(1), uncompress(1), + gzip(1), bzip2(1), lzip(1), tar(1), zip(1) and unzip(1) utilities for compressing + and uncompressing files and directories. See the included man page for full details. +endef + +MASTER_SITES = http://www.cs.indiana.edu/~kinzler/z/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = + +INSTALL_OVERRIDE_DIRS = BINDIR MANDIR +BINDIR = $(bindir) +MANDIR = $(mandir) +INSTALL_ARGS = install install.man + +include gar/category.mk + +pre-install-modulated: + mkdir -p $(DESTDIR)$(bindir) + mkdir -p $(DESTDIR)$(mandir)/man1 + @$(MAKECOOKIE) Added: csw/mgar/pkg/z/trunk/checksums =================================================================== --- csw/mgar/pkg/z/trunk/checksums (rev 0) +++ csw/mgar/pkg/z/trunk/checksums 2010-02-27 22:14:55 UTC (rev 8872) @@ -0,0 +1 @@ +3ce878079a7a0d204f97c903a8cc4530 z-2.6.1.tgz 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 Feb 27 23:18:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 27 Feb 2010 22:18:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[8873] csw/mgar/pkg/z/trunk/Makefile Message-ID: Revision: 8873 http://gar.svn.sourceforge.net/gar/?rev=8873&view=rev Author: dmichelsen Date: 2010-02-27 22:18:56 +0000 (Sat, 27 Feb 2010) Log Message: ----------- z: Make package ARCHALL Modified Paths: -------------- csw/mgar/pkg/z/trunk/Makefile Modified: csw/mgar/pkg/z/trunk/Makefile =================================================================== --- csw/mgar/pkg/z/trunk/Makefile 2010-02-27 22:14:55 UTC (rev 8872) +++ csw/mgar/pkg/z/trunk/Makefile 2010-02-27 22:18:56 UTC (rev 8873) @@ -24,6 +24,8 @@ MANDIR = $(mandir) INSTALL_ARGS = install install.man +ARCHALL = 1 + include gar/category.mk pre-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 Sat Feb 27 23:42:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 27 Feb 2010 22:42:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8874] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 8874 http://gar.svn.sourceforge.net/gar/?rev=8874&view=rev Author: dmichelsen Date: 2010-02-27 22:42:32 +0000 (Sat, 27 Feb 2010) Log Message: ----------- mysql-5.0.x: Move CHECKPKG_OVERRIDES before category-include Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-02-27 22:18:56 UTC (rev 8873) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-02-27 22:42:32 UTC (rev 8874) @@ -174,10 +174,6 @@ PROTOTYPE_PERMS_dbdir = 0700 PROTOTYPE_CLASS_dbdir = ugfiles -include gar/category.mk - -CFLAGS := $(filter-out -I%,$(CFLAGS)) - # CSWmysql5 contains no files CHECKPKG_OVERRIDES_CSWmysql5 += license-missing CHECKPKG_OVERRIDES_CSWmysql5 += action-class-only-in-pkginfo|none @@ -185,6 +181,10 @@ # Until the dependency guessed gets better at guessing CHECKPKG_OVERRIDES_CSWmysql5devel += missing-dependency|CSWmysql5 +include gar/category.mk + +CFLAGS := $(filter-out -I%,$(CFLAGS)) + pre-configure-modulated: # To work around the following libtool version mismatch problem: # libtool: Version mismatch error. This is libtool 2.2.6, but the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Feb 28 00:23:43 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 27 Feb 2010 23:23:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8875] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 8875 http://gar.svn.sourceforge.net/gar/?rev=8875&view=rev Author: wahwah Date: 2010-02-27 23:23:43 +0000 (Sat, 27 Feb 2010) Log Message: ----------- mysql-5.0.x: Removing unnecessary overrides. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-02-27 22:42:32 UTC (rev 8874) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-02-27 23:23:43 UTC (rev 8875) @@ -174,10 +174,6 @@ PROTOTYPE_PERMS_dbdir = 0700 PROTOTYPE_CLASS_dbdir = ugfiles -# CSWmysql5 contains no files -CHECKPKG_OVERRIDES_CSWmysql5 += license-missing -CHECKPKG_OVERRIDES_CSWmysql5 += action-class-only-in-pkginfo|none - # Until the dependency guessed gets better at guessing CHECKPKG_OVERRIDES_CSWmysql5devel += missing-dependency|CSWmysql5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Feb 28 03:09:37 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 28 Feb 2010 02:09:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8876] csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile Message-ID: Revision: 8876 http://gar.svn.sourceforge.net/gar/?rev=8876&view=rev Author: wbonnet Date: 2010-02-28 02:09:37 +0000 (Sun, 28 Feb 2010) Log Message: ----------- Fix dependencies Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2010-02-27 23:23:43 UTC (rev 8875) +++ csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2010-02-28 02:09:37 UTC (rev 8876) @@ -26,7 +26,6 @@ BUILD_DEP_PKGS = CSWxv RUNTIME_DEP_PKGS_CSWlibxvmc = CSWlibx11 CSWlibxext CSWlibxv -RUNTIME_DEP_PKGS_CSWlibxvmc += CSWxv RUNTIME_DEP_PKGS_CSWlibxvmcdevel += CSWlibxvmc BUILD_DEP_PKGS_CSWlibxvmc += CSWlibxv This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Feb 28 03:46:38 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 28 Feb 2010 02:46:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8877] csw/mgar/pkg Message-ID: Revision: 8877 http://gar.svn.sourceforge.net/gar/?rev=8877&view=rev Author: hson Date: 2010-02-28 02:46:14 +0000 (Sun, 28 Feb 2010) Log Message: ----------- liblqr: Initial commit Added Paths: ----------- csw/mgar/pkg/liblqr/ csw/mgar/pkg/liblqr/Makefile csw/mgar/pkg/liblqr/branches/ csw/mgar/pkg/liblqr/tags/ csw/mgar/pkg/liblqr/trunk/ csw/mgar/pkg/liblqr/trunk/Makefile csw/mgar/pkg/liblqr/trunk/checksums csw/mgar/pkg/liblqr/trunk/files/ Added: csw/mgar/pkg/liblqr/Makefile =================================================================== --- csw/mgar/pkg/liblqr/Makefile (rev 0) +++ csw/mgar/pkg/liblqr/Makefile 2010-02-28 02:46:14 UTC (rev 8877) @@ -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/liblqr/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/liblqr/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblqr/trunk/Makefile (rev 0) +++ csw/mgar/pkg/liblqr/trunk/Makefile 2010-02-28 02:46:14 UTC (rev 8877) @@ -0,0 +1,46 @@ +GARNAME = liblqr +GARVERSION = 0.4.1 +CATEGORIES = lib + +DESCRIPTION = A seam-carving C/C++ library called Liquid Rescale. +define BLURB +endef + +MASTER_SITES = http://liblqr.wikidot.com/local--files/en:download-page/ +DISTNAME = $(GARNAME)-1-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.bz2 + +PACKAGES = CSWliblqr CSWliblqrdevel +CATALOGNAME_CSWliblqr = liblqr +CATALOGNAME_CSWliblqrdevel = liblqr_devel + +SPKG_DESC_CSWliblqr += A seam-carving C/C++ library called Liquid Rescale +SPKG_DESC_CSWliblqrdevel += A seam-carving C/C++ library called Liquid Rescale - developer package + +RUNTIME_DEP_PKGS_CSWliblqr += CSWggettextrt +RUNTIME_DEP_PKGS_CSWliblqr += CSWglib2 +RUNTIME_DEP_PKGS_CSWliblqrdevel += CSWliblqr + +PKGFILES_CSWliblqrdevel = $(PKGFILES_DEVEL) + +# Some symbols seems to be missing for some strange reason +CHECKPKG_OVERRIDES_CSWliblqr += symbol-not-found|liblqr-1.so.0.3.1 +CHECKPKG_OVERRIDES_CSWliblqr += symbol-not-found|liblqr-1.so.0.3.1 + +SPKG_SOURCEURL = http://liblqr.wikidot.com/ + +#LICENSE = flashpix.h + +#DOCFILES = AUTHORS ChangeLog NEWS README + +UFILES_REGEX = $(GARNAME)-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +STRIP_LIBTOOL=1 + +TEST_TARGET = check + +BUILD64 = 1 + +include gar/category.mk Added: csw/mgar/pkg/liblqr/trunk/checksums =================================================================== --- csw/mgar/pkg/liblqr/trunk/checksums (rev 0) +++ csw/mgar/pkg/liblqr/trunk/checksums 2010-02-28 02:46:14 UTC (rev 8877) @@ -0,0 +1 @@ +0e24ed3c9fcdcb111062640764d7b87a liblqr-1-0.4.1.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 Feb 28 06:24:41 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 28 Feb 2010 05:24:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[8878] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 8878 http://gar.svn.sourceforge.net/gar/?rev=8878&view=rev Author: rthurner Date: 2010-02-28 05:24:41 +0000 (Sun, 28 Feb 2010) Log Message: ----------- svn-1.6.9 - revert checkpackage ignores Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-02-28 02:46:14 UTC (rev 8877) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-02-28 05:24:41 UTC (rev 8878) @@ -211,11 +211,6 @@ CHECKPKG_OVERRIDES_CSWpythonsvn = symbol-not-found CHECKPKG_OVERRIDES_CSWpmsvn = symbol-not-found -CHECKPKG_OVERRIDES_CSWsvn += missing-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWsvn += missing-dependency|CSWruby -CHECKPKG_OVERRIDES_CSWsvn += missing-dependency|CSWpython - - include gar/category.mk BINDING_LANGS = java perl python ruby 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 Feb 28 06:44:51 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 28 Feb 2010 05:44:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[8879] csw/mgar/pkg/subversion/tags/subversion-1.6.9, REV= 2010.02.27/ Message-ID: Revision: 8879 http://gar.svn.sourceforge.net/gar/?rev=8879&view=rev Author: rthurner Date: 2010-02-28 05:44:50 +0000 (Sun, 28 Feb 2010) Log Message: ----------- subversion: Tag as release 1.6.9,REV=2010.02.27 Added Paths: ----------- csw/mgar/pkg/subversion/tags/subversion-1.6.9,REV=2010.02.27/ 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 Feb 28 07:05:23 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 28 Feb 2010 06:05:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8880] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 8880 http://gar.svn.sourceforge.net/gar/?rev=8880&view=rev Author: rthurner Date: 2010-02-28 06:05:23 +0000 (Sun, 28 Feb 2010) Log Message: ----------- libserf-0.3.1 - upgrade from 0.3.0 Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2010-02-28 05:44:50 UTC (rev 8879) +++ csw/mgar/pkg/libserf/trunk/Makefile 2010-02-28 06:05:23 UTC (rev 8880) @@ -1,5 +1,5 @@ GARNAME = libserf -GARVERSION = 0.3.0 +GARVERSION = 0.3.1 DISTNAME = serf-$(GARVERSION) CATEGORIES = lib 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 Feb 28 07:06:14 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 28 Feb 2010 06:06:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8881] csw/mgar/pkg/libserf/trunk/checksums Message-ID: Revision: 8881 http://gar.svn.sourceforge.net/gar/?rev=8881&view=rev Author: rthurner Date: 2010-02-28 06:06:14 +0000 (Sun, 28 Feb 2010) Log Message: ----------- libserf-0.3.1 - upgrade from 0.3.0 checksums as well Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/checksums Modified: csw/mgar/pkg/libserf/trunk/checksums =================================================================== --- csw/mgar/pkg/libserf/trunk/checksums 2010-02-28 06:05:23 UTC (rev 8880) +++ csw/mgar/pkg/libserf/trunk/checksums 2010-02-28 06:06:14 UTC (rev 8881) @@ -1 +1 @@ -d5c7f41d1c9f1589b98affc1fa029982 download/serf-0.3.0.tar.bz2 +7d211539bf698de2a79062ba314e7a3e serf-0.3.1.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 Feb 28 07:24:33 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 28 Feb 2010 06:24:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8882] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 8882 http://gar.svn.sourceforge.net/gar/?rev=8882&view=rev Author: rthurner Date: 2010-02-28 06:24:32 +0000 (Sun, 28 Feb 2010) Log Message: ----------- libserf - prevent missing-license checkpkg error *grml* Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2010-02-28 06:06:14 UTC (rev 8881) +++ csw/mgar/pkg/libserf/trunk/Makefile 2010-02-28 06:24:32 UTC (rev 8882) @@ -25,6 +25,10 @@ CONFIGURE_ARGS += --with-apr-util=$(prefix)/apache2/bin/apu-config TEST_TARGET = check + +CHECKPKG_OVERRIDES_CSWlibserf += license-missing + + include gar/category.mk #EXTRA_LDFLAGS = -R/opt/csw/bdb44/lib 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 Feb 28 07:31:39 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 28 Feb 2010 06:31:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8883] csw/mgar/pkg/libserf/tags/libserf-0.3.1, REV=2010.02. 28/ Message-ID: Revision: 8883 http://gar.svn.sourceforge.net/gar/?rev=8883&view=rev Author: rthurner Date: 2010-02-28 06:31:38 +0000 (Sun, 28 Feb 2010) Log Message: ----------- libserf: Tag as release 0.3.1,REV=2010.02.28 Added Paths: ----------- csw/mgar/pkg/libserf/tags/libserf-0.3.1,REV=2010.02.28/ 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 Feb 28 10:53:07 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 28 Feb 2010 09:53:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[8884] csw/mgar/pkg Message-ID: Revision: 8884 http://gar.svn.sourceforge.net/gar/?rev=8884&view=rev Author: dmichelsen Date: 2010-02-28 09:53:07 +0000 (Sun, 28 Feb 2010) Log Message: ----------- achievo: Initial commit of stub Added Paths: ----------- csw/mgar/pkg/achievo/ csw/mgar/pkg/achievo/branches/ csw/mgar/pkg/achievo/tags/ csw/mgar/pkg/achievo/trunk/ csw/mgar/pkg/achievo/trunk/Makefile csw/mgar/pkg/achievo/trunk/checksums csw/mgar/pkg/achievo/trunk/files/ Property changes on: csw/mgar/pkg/achievo/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/achievo/trunk/Makefile =================================================================== --- csw/mgar/pkg/achievo/trunk/Makefile (rev 0) +++ csw/mgar/pkg/achievo/trunk/Makefile 2010-02-28 09:53:07 UTC (rev 8884) @@ -0,0 +1,22 @@ +GARNAME = achievo +GARVERSION = 1.4.3 +CATEGORIES = apps + +DESCRIPTION = A flexible web-based resource management tool for business environments +define BLURB + Achievo is a flexible web-based resource management tool for business environments. + Achievo's resource management capabilities will enable organisations to support their + business processes in a simple, but effective manner. +endef + +MASTER_SITES = http://www.achievo.org/downloads/achievo/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +VENDOR_URL = http://www.achievo.org + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/achievo/trunk/checksums =================================================================== --- csw/mgar/pkg/achievo/trunk/checksums (rev 0) +++ csw/mgar/pkg/achievo/trunk/checksums 2010-02-28 09:53:07 UTC (rev 8884) @@ -0,0 +1 @@ +dea1e5097bd4afb0eca3f178f8aaf4ea achievo-1.4.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Feb 28 10:54:44 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 28 Feb 2010 09:54:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8885] csw/mgar/gar/v2 Message-ID: Revision: 8885 http://gar.svn.sourceforge.net/gar/?rev=8885&view=rev Author: wahwah Date: 2010-02-28 09:54:43 +0000 (Sun, 28 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, ports a number of tests from Korn shell to Python. Modified Paths: -------------- csw/mgar/gar/v2/bin/analyze_module_results.py csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/opencsw_test.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/bin/analyze_module_results.py =================================================================== --- csw/mgar/gar/v2/bin/analyze_module_results.py 2010-02-28 09:53:07 UTC (rev 8884) +++ csw/mgar/gar/v2/bin/analyze_module_results.py 2010-02-28 09:54:43 UTC (rev 8885) @@ -34,18 +34,21 @@ pkgname, tag_name, tag_info = checkpkg.ParseTagLine(line) error_tags.append(checkpkg.CheckpkgTag(pkgname, tag_name, tag_info)) overrides = reduce(lambda x, y: x + y, overrides_list) - tags_after_overrides = checkpkg.ApplyOverrides(error_tags, overrides) + (tags_after_overrides, + unapplied_overrides) = checkpkg.ApplyOverrides(error_tags, overrides) exit_code = bool(tags_after_overrides) if tags_after_overrides: print "There were errors reported." print "If you know they are false positives, you can override them:" for tag in tags_after_overrides: - if tag.tag_info: - tag_postfix = "|%s" % tag.tag_info.replace(" ", "|") - else: - tag_postfix = "" - print ("CHECKPKG_OVERRIDES_%s += %s%s" - % (tag.pkgname, tag.tag_name, tag_postfix)) + print tag.ToGarSyntax() + if unapplied_overrides: + print "WARNING: Some overrides did not match any errors." + print " They can be removed, as they don't take any effect anyway." + print " If you're getting errors at the same time, maybe you didn't" + print " specify the overrides correctly." + for override in unapplied_overrides: + print "* %s" % override sys.exit(exit_code) Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-02-28 09:53:07 UTC (rev 8884) +++ csw/mgar/gar/v2/bin/checkpkg 2010-02-28 09:54:43 UTC (rev 8885) @@ -91,8 +91,10 @@ print ERROR: $* >/dev/fd/2 cleanup cleanupset - print "To run checkpkg in the debug mode, add the '-d' flag:" + print "To run checkpkg in the debug mode, add the '-d' flag, for example:" print "${selfpath} -d ${selfargs}" + print "After you modify any overrides, you need to do gmake remerge repackage" + print "or gmake platforms-remerge platforms-repackage." exit 1 } @@ -216,109 +218,12 @@ basedir=`sed -n 's/^BASEDIR=//p' $TMPFILE` pkgarch=`sed -n 's/^ARCH=//p' $TMPFILE|head -1` -case `basename $f` in - ${software}-${version}-*) - # file name looks okay - ;; - ${software}-*) - print ERROR: filename missing full version field $version - rm -rf $EXTRACTDIR $TMPARCHIVE - exit 1 - ;; - *) - print ERROR: filename should start with $software-$version- - rm -rf $EXTRACTDIR $TMPARCHIVE - exit 1 -esac - - - -if [ "$maintname" = "" ] ; then - # the old format, in the DESC field - maintname=`sed -n 's/^DESC=.*for CSW by //p' $TMPFILE` - - # Since the DESC field has been coopted, take - # description from second half of NAME field now. - desc=`sed -n 's/^NAME=[^ -]* - //p' $TMPFILE` -else - if [ "$desc" = "" ] ; then - desc=`sed -n 's/^NAME=[^ -]* - //p' $TMPFILE` - fi -fi - rm $TMPFILE # strip out '' chars, because it interferes with mysql desc=`print $desc | sed "s/'//g"` -print Info for pkg $pkgname - -print software= "'$software'" -print arch= "'$pkgarch'" -print desc="'$desc'" -print pkgname="'$pkgname'" -print version="'$version'" -print maintainer name="'$maintname'" -print maint email="'$email'" -print hotline="'$hotline'" -if [ "$basedir" != "" ] ; then - print basedir="'$basedir'" -fi - -if [[ ${#software} -gt ${NAME_MAX_LENGTH} ]] ; then - errmsg "$f: software name longer than ${NAME_MAX_LENGTH} chars" -fi -if [[ ${#pkgname} -gt ${NAME_MAX_LENGTH} ]] ; then - errmsg "$f: pkg name longer than ${NAME_MAX_LENGTH} chars" -fi - -if [ "$software" = "" ] ; then errmsg $f: software field not set properly in NAME ; fi -if [ "$pkgname" = "" ] ; then errmsg $f: pkgname field blank ; fi -if [ "$desc" = "" ] ; then errmsg $f: no description in either NAME or DESC field ; fi -if [ ${#desc} -gt 100 ] ; then errmsg $f: description greater than 100 chars ; fi -if [ "$version" = "" ] ; then errmsg $f: VERSION field blank ; fi -if [ "$maintname" = "" ] ; then errmsg $f: maintainer name not detected. Fill out VENDOR field properly ; fi -if [ "$email" = "" ] ; then errmsg $f: EMAIL field blank ; fi -if [ "$hotline" = "" ] ; then errmsg $f: HOTLINE field blank ; fi - - -case $version in - *-*) - errmsg "VERSION field not allowed to have \"-\" in it" - ;; - *,REV=20[01][0-9].[0-9][0-9].[0-9][0-9]*) - : - ;; - *) - print ERROR: no REV=YYYY.MM.DD field in VERSION - exit 1 - ;; -esac - -case $pkgarch in - sparc|i386|all) - ;; - sparc.*|i386.*) - ;; - - *) - print ERROR: non-standard ARCH def in package: $pkgarch - rm -rf $EXTRACTDIR $TMPARCHIVE - exit 1 -esac - -case $f in - *${pkgarch}*) - print "f: $f, pkgarch: $pkgarch" - ;; - *) - print "The file name is '$f'." - print "The pkgarch is '$pkgarch'." - errmsg "ERROR: package file name and pkgarch don't match." - ;; -esac - goodarch=yes case $f in *${LOCAL_ARCH}*) @@ -575,7 +480,8 @@ plugin_name="`echo ${plugin} | sed -e 's+.*/checkpkg-++' | sed -e 's+\.py$++'`" error_tag_file="tags.${plugin_name}" printf "${BOLD}${module_name_format}${COLOR_RESET} running..." "${plugin_name}" - debugmsg "Executing: ${plugin} $extra_options -b \"${checkpkg_stats_basedir}\" -o \"${EXTRACTDIR}/${error_tag_file}\" ${md5sums}" + debugmsg "Executing: ${plugin} $extra_options -b \"${checkpkg_stats_basedir}\"" \ + "-o \"${EXTRACTDIR}/${error_tag_file}\" `echo ${md5sums}`" ${plugin} \ $extra_options \ -b "${checkpkg_stats_basedir}" \ @@ -597,7 +503,9 @@ fi for log_file in ${log_files}; do - if [[ `gwc -c "${log_file}" | awk '{print $1}'` -gt 1 ]]; then + log_len=`gsed -e 's/\s\+//g' "${log_file}" | gtr -s '\n' | gwc -c | awk '{print $1}'` + if [[ "${log_len}" -gt 1 ]]; then + print "printing ${log_file}..." debugmsg ">> LOG START: ${log_file}" cat "${log_file}" debugmsg "<< LOG END: ${log_file}" Modified: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py 2010-02-28 09:53:07 UTC (rev 8884) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py 2010-02-28 09:54:43 UTC (rev 8885) @@ -31,6 +31,7 @@ # Registering functions defined above. check_manager.RegisterIndividualCheck(package_checks.CatalognameLowercase) check_manager.RegisterIndividualCheck(package_checks.FileNameSanity) + check_manager.RegisterIndividualCheck(package_checks.PkginfoSanity) # Running the checks, reporting and exiting. exit_code, screen_report, tags_report = check_manager.Run() f = open(options.output, "w") Modified: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py 2010-02-28 09:53:07 UTC (rev 8884) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py 2010-02-28 09:54:43 UTC (rev 8885) @@ -124,7 +124,7 @@ for checker in pkgs_data: pkgname = checker["basic_stats"]["pkgname"] declared_dependencies = checker["depends"] - if debug: + if debug and False: sanitized_pkgname = pkgname.replace("-", "_") data_file_name = "/var/tmp/checkpkg_test_data_%s.py" % sanitized_pkgname logging.warn("Saving test data to %s." % repr(data_file_name)) Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-28 09:53:07 UTC (rev 8884) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-28 09:54:43 UTC (rev 8885) @@ -15,6 +15,7 @@ import socket import sqlite3 import subprocess +import textwrap import yaml from Cheetah import Template import opencsw @@ -92,6 +93,9 @@ # Tags reported by $name module #for $pkgname in $errors #for $tag in $errors[$pkgname] +#if $tag.msg +$textwrap.fill($tag.msg, 70, initial_indent="# ", subsequent_indent="# ") +#end if $pkgname: ${tag.tag_name}#if $tag.tag_info# $tag.tag_info#end if# #end for #end for @@ -146,6 +150,18 @@ return unicode(t) +def ExtractDescription(pkginfo): + desc_re = re.compile(r"^[\w_]+ - (.*)$") + m = re.match(desc_re, pkginfo["NAME"]) + return m.group(1) if m else None + + +def ExtractMaintainerName(pkginfo): + maint_re = re.compile("^.*for CSW by (.*)$") + m = re.match(maint_re, pkginfo["VENDOR"]) + return m.group(1) if m else None + + class SystemPkgmap(object): """A class to hold and manipulate the /var/sadm/install/contents file. @@ -666,10 +682,28 @@ self.msg = msg def __repr__(self): - return (u"CheckpkgTag(%s, %s, %s, ...)" - % (repr(self.pkgname), repr(self.tag_name), repr(self.tag_info))) + return (u"CheckpkgTag(%s, %s, %s, %s)" + % (repr(self.pkgname), + repr(self.tag_name), + repr(self.tag_info), + repr(self.msg))) + def ToGarSyntax(self): + msg_lines = [] + if self.msg: + msg_lines.extend(textwrap(self.msg, 70, + initial_indent="# ", + subsequent_indent="# ")) + if self.tag_info: + tag_postfix = "|%s" % self.tag_info.replace(" ", "|") + else: + tag_postfix = "" + msg_lines.append(u"CHECKPKG_OVERRIDES_%s += %s%s" + % (self.pkgname, self.tag_name, tag_postfix)) + return "\n".join(msg_lines) + + class CheckpkgManager(object): """Takes care of calling checking functions""" @@ -726,6 +760,7 @@ "name": self.name, "errors": errors, "debug": self.debug, + "textwrap": textwrap, } screen_t = Template.Template(SCREEN_ERROR_REPORT_TMPL, searchList=[namespace]) tags_report_t = Template.Template(TAG_REPORT_TMPL, searchList=[namespace]) @@ -779,7 +814,7 @@ def __repr__(self): return (u"Override(%s, %s, %s)" - % (self.pkgname, self.tag_name, self.tag_info)) + % (repr(self.pkgname), repr(self.tag_name), repr(self.tag_info))) def DoesApply(self, tag): """Figures out if this override applies to the given tag.""" @@ -795,6 +830,7 @@ basket_b["tag_name"] = tag.tag_name return basket_a == basket_b + def ParseOverrideLine(line): level_1 = line.split(":") if len(level_1) > 1: @@ -819,14 +855,18 @@ O(N * M), but N and M are always small. """ tags_after_overrides = [] + applied_overrides = set([]) + provided_overrides = set(copy.copy(overrides)) for tag in error_tags: override_applies = False for override in overrides: if override.DoesApply(tag): override_applies = True + applied_overrides.add(override) if not override_applies: tags_after_overrides.append(tag) - return tags_after_overrides + unapplied_overrides = provided_overrides.difference(applied_overrides) + return tags_after_overrides, unapplied_overrides def GetIsalist(): Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-28 09:53:07 UTC (rev 8884) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-02-28 09:54:43 UTC (rev 8885) @@ -708,47 +708,47 @@ """One tag, no overrides.""" tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag")] overrides = [] - self.assertEqual(tags, checkpkg.ApplyOverrides(tags, overrides)) + self.assertEqual((tags, set([])), checkpkg.ApplyOverrides(tags, overrides)) def test_1b(self): """One override, matching by tag name only.""" tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag")] overrides = [checkpkg.Override(None, "foo-tag", None)] - self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) + self.assertEqual(([], set([])), checkpkg.ApplyOverrides(tags, overrides)) def test_1c(self): """One override, matching by tag name only, no pkgname.""" tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag")] overrides = [checkpkg.Override(None, "foo-tag", None)] - self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) + self.assertEqual(([], set([])), checkpkg.ApplyOverrides(tags, overrides)) def test_2(self): """One override, matching by tag name and tag info, no pkgname.""" tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag")] overrides = [checkpkg.Override(None, "foo-tag", None)] - self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) + self.assertEqual(([], set([])), checkpkg.ApplyOverrides(tags, overrides)) def test_3(self): """One override, matching by tag name, mismatching tag info, no pkgname.""" tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")] overrides = [checkpkg.Override(None, "foo-tag", "tag-info-2")] - self.assertEqual(tags, checkpkg.ApplyOverrides(tags, overrides)) + self.assertEqual((tags, set(overrides)), checkpkg.ApplyOverrides(tags, overrides)) def test_4(self): tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")] overrides = [checkpkg.Override(None, "foo-tag", "tag-info-1")] - self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) + self.assertEqual(([], set([])), checkpkg.ApplyOverrides(tags, overrides)) def test_5(self): tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")] overrides = [checkpkg.Override("CSWfoo", "foo-tag", "tag-info-1")] - self.assertEqual([], checkpkg.ApplyOverrides(tags, overrides)) + self.assertEqual(([], set([])), checkpkg.ApplyOverrides(tags, overrides)) def test_6(self): """Pkgname mismatch.""" tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")] overrides = [checkpkg.Override("CSWbar", "foo-tag", "tag-info-1")] - self.assertEqual(tags, checkpkg.ApplyOverrides(tags, overrides)) + self.assertEqual((tags, set(overrides)), checkpkg.ApplyOverrides(tags, overrides)) class SystemPkgmapUnitTest(unittest.TestCase): @@ -826,5 +826,20 @@ parsed = self.pkgstats._ParseLddDashRline(line) +class ExtractorsUnitTest(unittest.TestCase): + + def testExtractDescription_1(self): + data = {"NAME": "nspr_devel - Netscape Portable Runtime header files"} + result = "Netscape Portable Runtime header files" + self.assertEqual(result, checkpkg.ExtractDescription(data)) + + def testExtractMaintainerName(self): + data = {"VENDOR": "https://ftp.mozilla.org/pub/mozilla.org/" + "nspr/releases/v4.8/src/ packaged for CSW by " + "Maciej Blizinski"} + result = "Maciej Blizinski" + self.assertEqual(result, checkpkg.ExtractMaintainerName(data)) + + if __name__ == '__main__': unittest.main() Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-28 09:53:07 UTC (rev 8884) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-02-28 09:54:43 UTC (rev 8885) @@ -93,15 +93,27 @@ def ParsePackageFileName(p): + if p.endswith(".gz"): + p = p[:-3] + if p.endswith(".pkg"): + p = p[:-4] bits = p.split("-") catalogname = bits[0] version, version_info, revision_info = ParseVersionString(bits[1]) + if len(bits) == 5: + osrel, arch, vendortag = bits[2:5] + else: + arch, vendortag = bits[2:4] + osrel = "unspecified" data = { 'catalogname': catalogname, 'full_version_string': bits[1], 'version': version, 'version_info': version_info, 'revision_info': revision_info, + 'osrel': osrel, + 'arch': arch, + 'vendortag': vendortag, } return data Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-02-28 09:53:07 UTC (rev 8884) +++ csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-02-28 09:54:43 UTC (rev 8885) @@ -118,18 +118,45 @@ self.assertEqual(pkg_version, compiled["full_version_string"]) +class ParsePackageFileNameTest_2(unittest.TestCase): + + def setUp(self): + self.file_name = 'mysql5client-5.0.87,REV=2010.02.28-SunOS5.8-i386-CSW.pkg.gz' + self.parsed = opencsw.ParsePackageFileName(self.file_name) + + def testParsePackageFileName_2_1(self): + self.assertTrue("arch" in self.parsed) + self.assertEqual(self.parsed["arch"], "i386") + + def testParsePackageFileName_2_2(self): + self.assertTrue("osrel" in self.parsed) + self.assertEqual(self.parsed["osrel"], "SunOS5.8") + + def testParsePackageFileName_2_3(self): + self.assertTrue("vendortag" in self.parsed) + self.assertEqual(self.parsed["vendortag"], "CSW") + + def testParsePackageFileName_OldFormat(self): + """Old srv4 file name.""" + file_name = "achievo-0.8.4-all-CSW.pkg.gz" + parsed = opencsw.ParsePackageFileName(file_name) + self.assertEqual("unspecified", parsed["osrel"]) + + class UpgradeTypeTest(unittest.TestCase): def testUpgradeType_1(self): pkg = opencsw.CatalogBasedOpencswPackage("analog") pkg.LazyDownloadCatalogData(CATALOG_DATA_1.splitlines()) expected_data = { - 'catalogname': 'analog', + 'version': '5.32', 'full_version_string': '5.32,REV=2003.9.12', - 'version': '5.32', - 'version_info': {opencsw.MAJOR_VERSION: '5', - opencsw.MINOR_VERSION: '32'}, + 'version_info': {'minor version': '32', 'major version': '5'}, + 'vendortag': 'CSW', 'revision_info': {'REV': '2003.9.12'}, + 'arch': 'sparc', + 'osrel': 'SunOS5.8', + 'catalogname': 'analog' } self.assertEqual(expected_data, pkg.GetCatalogPkgData()) Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-02-28 09:53:07 UTC (rev 8884) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-02-28 09:54:43 UTC (rev 8885) @@ -76,6 +76,12 @@ ARCH_RE = re.compile(r"(sparcv(8|9)|i386|amd64)") +MAX_CATALOGNAME_LENGTH = 20 +MAX_PKGNAME_LENGTH = 20 +MAX_DESCRIPTION_LENGTH = 100 +ARCH_LIST = ["sparc", "i386", "all"] +VERSION_RE = r".*,REV=(20[01][0-9]\.[0-9][0-9]\.[0-9][0-9]).*" + def CatalognameLowercase(pkg_data, debug): errors = [] # Here's how to report an error: @@ -93,17 +99,123 @@ def FileNameSanity(pkg_data, debug): errors = [] - # Here's how to report an error: basic_stats = pkg_data["basic_stats"] revision_info = basic_stats["parsed_basename"]["revision_info"] catalogname = pkg_data["basic_stats"]["catalogname"] + pkgname = pkg_data["basic_stats"]["pkgname"] if "REV" not in revision_info: errors.append(checkpkg.CheckpkgTag( - pkg_data["basic_stats"]["pkgname"], - "rev-tag-missing-in-filename")) + pkgname, "rev-tag-missing-in-filename")) + if len(catalogname) > MAX_CATALOGNAME_LENGTH: + errors.append(checkpkg.CheckpkgTag( + pkgname, "catalogname-too-long")) + if len(pkgname) > MAX_PKGNAME_LENGTH: + errors.append(checkpkg.CheckpkgTag( + pkgname, "pkgname-too-long")) + if basic_stats["parsed_basename"]["osrel"] == "unspecified": + errors.append(checkpkg.CheckpkgTag( + pkgname, "osrel-tag-not-specified")) return errors +def PkginfoSanity(pkg_data, debug): + """pkginfo sanity checks. + +if [ "$maintname" = "" ] ; then + # the old format, in the DESC field + maintname=`sed -n 's/^DESC=.*for CSW by //p' $TMPFILE` + + # Since the DESC field has been coopted, take + # description from second half of NAME field now. + desc=`sed -n 's/^NAME=[^ -]* - //p' $TMPFILE` +else + if [ "$desc" = "" ] ; then + desc=`sed -n 's/^NAME=[^ -]* - //p' $TMPFILE` + fi +fi + +software=`sed -n 's/^NAME=\([^ -]*\) -.*$/\1/p' $TMPFILE` +version=`sed -n 's/^VERSION=//p' $TMPFILE` +desc=`sed -n 's/^DESC=//p' $TMPFILE` +email=`sed -n 's/^EMAIL=//p' $TMPFILE` +maintname=`sed -n 's/^VENDOR=.*for CSW by //p' $TMPFILE` +hotline=`sed -n 's/^HOTLINE=//p' $TMPFILE` +basedir=`sed -n 's/^BASEDIR=//p' $TMPFILE` +pkgarch=`sed -n 's/^ARCH=//p' $TMPFILE|head -1` + +if [ "$software" = "" ] ; then errmsg $f: software field not set properly in NAME ; fi +if [ "$pkgname" = "" ] ; then errmsg $f: pkgname field blank ; fi +if [ "$desc" = "" ] ; then errmsg $f: no description in either NAME or DESC field ; fi +if [ ${#desc} -gt 100 ] ; then errmsg $f: description greater than 100 chars ; fi +if [ "$version" = "" ] ; then errmsg $f: VERSION field blank ; fi +if [ "$maintname" = "" ] ; then errmsg $f: maintainer name not detected. Fill out VENDOR field properly ; fi +if [ "$email" = "" ] ; then errmsg $f: EMAIL field blank ; fi +if [ "$hotline" = "" ] ; then errmsg $f: HOTLINE field blank ; fi + """ + errors = [] + catalogname = pkg_data["basic_stats"]["catalogname"] + pkgname = pkg_data["basic_stats"]["pkgname"] + pkginfo = pkg_data["pkginfo"] + if not catalogname: + errors.append(checkpkg.CheckpkgTag( + pkgname, "empty-catalogname")) + if not pkgname: + errors.append(checkpkg.CheckpkgTag( + pkgname, "empty-pkgname")) + if not "VERSION" in pkginfo or not pkginfo["VERSION"]: + errors.append(checkpkg.CheckpkgTag( + pkgname, "pkginfo-version-field-missing")) + desc = checkpkg.ExtractDescription(pkginfo) + if not desc: + errors.append(checkpkg.CheckpkgTag( + pkgname, "description-missing")) + if len(desc) > MAX_DESCRIPTION_LENGTH: + errors.append(checkpkg.CheckpkgTag( + pkgname, "description-too-long")) + # maintname=`sed -n 's/^VENDOR=.*for CSW by //p' $TMPFILE` + maintname = checkpkg.ExtractMaintainerName(pkginfo) + if not maintname: + errors.append(checkpkg.CheckpkgTag( + pkgname, "maintainer-name-not-set")) + # email + if not pkginfo["EMAIL"]: + errors.append(checkpkg.CheckpkgTag( + pkgname, "email-blank")) + # hotline + if not pkginfo["HOTLINE"]: + errors.append(checkpkg.CheckpkgTag( + pkgname, "hotline-blank")) + pkginfo_version = pkg_data["basic_stats"]["parsed_basename"]["full_version_string"] + if pkginfo_version != pkginfo["VERSION"]: + errors.append(checkpkg.CheckpkgTag( + pkgname, "filename-version-does-not-match-pkginfo-version")) + if re.search(r"-", pkginfo["VERSION"]): + errors.append(checkpkg.CheckpkgTag( + pkgname, "minus-not-allowed-in-version")) + if not re.match(VERSION_RE, pkginfo["VERSION"]): + msg = ("Version regex: %s, version value: %s." + % (repr(VERSION_RE), repr(pkginfo["VERSION"]))) + errors.append(checkpkg.CheckpkgTag( + pkgname, "version-does-not-match-regex", msg=msg)) + if pkginfo["ARCH"] not in ARCH_LIST: + errors.append(checkpkg.CheckpkgTag( + pkgname, "non-standard-architecture", pkginfo["ARCH"])) + return errors + + +def ArchitectureSanity(pkg_data, debug): + errors = [] + basic_stats = pkg_data["basic_stats"] + pkgname = basic_stats["pkgname"] + pkginfo = pkg_data["pkginfo"] + filename = basic_stats["pkg_basename"] + arch = pkginfo["ARCH"] + filename_re = r"-%s-" % arch + if not re.search(filename_re, filename): + errors.append(checkpkg.CheckpkgTag( + pkgname, "srv4-filename-architecture-mismatch", arch)) + + def CheckArchitectureVsContents(pkg_data, debug): """Verifies the relationship between package contents and architecture.""" errors = [] Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-02-28 09:53:07 UTC (rev 8884) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-02-28 09:54:43 UTC (rev 8885) @@ -112,5 +112,12 @@ self.failUnless(errors) + def testArchitectureSanity(self): + self.pkg_data_2["pkginfo"] = {} + self.pkg_data_2["pkginfo"]["ARCH"] = "i386" + errors = pc.ArchitectureSanity(self.pkg_data_2, False) + self.failUnless(errors) + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Feb 28 11:10:21 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 28 Feb 2010 10:10:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8886] csw/mgar/pkg Message-ID: Revision: 8886 http://gar.svn.sourceforge.net/gar/?rev=8886&view=rev Author: dmichelsen Date: 2010-02-28 10:10:21 +0000 (Sun, 28 Feb 2010) Log Message: ----------- augeas: Initial commit, doesn't build yet Added Paths: ----------- csw/mgar/pkg/augeas/ csw/mgar/pkg/augeas/branches/ csw/mgar/pkg/augeas/tags/ csw/mgar/pkg/augeas/trunk/ csw/mgar/pkg/augeas/trunk/Makefile csw/mgar/pkg/augeas/trunk/checksums csw/mgar/pkg/augeas/trunk/files/ Property changes on: csw/mgar/pkg/augeas/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/augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/augeas/trunk/Makefile (rev 0) +++ csw/mgar/pkg/augeas/trunk/Makefile 2010-02-28 10:10:21 UTC (rev 8886) @@ -0,0 +1,22 @@ +GARNAME = augeas +GARVERSION = 0.7.0 +CATEGORIES = lib + +DESCRIPTION = A configuration editing tool +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. +endef + +MASTER_SITES = http://augeas.net/download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +VENDOR_URL = http://augeas.net + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/augeas/trunk/checksums =================================================================== --- csw/mgar/pkg/augeas/trunk/checksums (rev 0) +++ csw/mgar/pkg/augeas/trunk/checksums 2010-02-28 10:10:21 UTC (rev 8886) @@ -0,0 +1 @@ +a6a6a5515d7bbebe61c1e90db12eef72 augeas-0.7.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Feb 28 14:05:47 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 28 Feb 2010 13:05:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[8887] csw/mgar/pkg/dbus/trunk Message-ID: Revision: 8887 http://gar.svn.sourceforge.net/gar/?rev=8887&view=rev Author: wbonnet Date: 2010-02-28 13:05:47 +0000 (Sun, 28 Feb 2010) Log Message: ----------- Upgrade to 1.3.0 Modified Paths: -------------- csw/mgar/pkg/dbus/trunk/Makefile csw/mgar/pkg/dbus/trunk/checksums Modified: csw/mgar/pkg/dbus/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus/trunk/Makefile 2010-02-28 10:10:21 UTC (rev 8886) +++ csw/mgar/pkg/dbus/trunk/Makefile 2010-02-28 13:05:47 UTC (rev 8887) @@ -1,5 +1,5 @@ GARNAME = dbus -GARVERSION = 1.2.12 +GARVERSION = 1.3.0 CATEGORIES = lib DESCRIPTION = DBus Message Bus System Modified: csw/mgar/pkg/dbus/trunk/checksums =================================================================== --- csw/mgar/pkg/dbus/trunk/checksums 2010-02-28 10:10:21 UTC (rev 8886) +++ csw/mgar/pkg/dbus/trunk/checksums 2010-02-28 13:05:47 UTC (rev 8887) @@ -1,6 +1,3 @@ -3b3e5d4ea2722ae6258c8ee0f7688c95 download/CSWdbus.gspec -6e26e51243c4551ac222112edf67b5db download/CSWdbus.preinstall -00bb177908f6107ef2f6caa082475f34 download/CSWlibdbus.gspec -1d5dad88ae16c76d47398f8e9c2e09a0 download/CSWlibdbusdev.gspec -9222a44088c837eba62822e330de713f download/cswdbus -39bd582c3b06a261cac44d4cab6fd60b download/dbus-1.2.12.tar.gz +6e26e51243c4551ac222112edf67b5db CSWdbus.preinstall +9222a44088c837eba62822e330de713f cswdbus +b3298d5ce0e4ad4731b1e4e1787d56bb dbus-1.3.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Feb 28 14:06:27 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 28 Feb 2010 13:06:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[8888] csw/mgar/pkg/dbus/trunk/Makefile Message-ID: Revision: 8888 http://gar.svn.sourceforge.net/gar/?rev=8888&view=rev Author: wbonnet Date: 2010-02-28 13:06:27 +0000 (Sun, 28 Feb 2010) Log Message: ----------- Upgrade to 1.3.0 Modified Paths: -------------- csw/mgar/pkg/dbus/trunk/Makefile Modified: csw/mgar/pkg/dbus/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus/trunk/Makefile 2010-02-28 13:05:47 UTC (rev 8887) +++ csw/mgar/pkg/dbus/trunk/Makefile 2010-02-28 13:06:27 UTC (rev 8888) @@ -36,7 +36,7 @@ PKGFILES_CSWlibdbus = $(PKGFILES_RT) # Dependencies tracking -RUNTIME_DEP_PKGS_CSWdbus = CSWexpat CSWlibdbus CSWcswclassutils +RUNTIME_DEP_PKGS_CSWdbus = CSWexpat CSWlibdbus CSWcswclassutils RUNTIME_DEP_PKGS_CSWlibdbusdev = CSWlibdbus # SMF support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Feb 28 15:48:10 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 28 Feb 2010 14:48:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[8889] csw/mgar/pkg/python-suds/trunk Message-ID: Revision: 8889 http://gar.svn.sourceforge.net/gar/?rev=8889&view=rev Author: wahwah Date: 2010-02-28 14:48:10 +0000 (Sun, 28 Feb 2010) Log Message: ----------- python-suds: Version bump to 0.3.9 Modified Paths: -------------- csw/mgar/pkg/python-suds/trunk/Makefile csw/mgar/pkg/python-suds/trunk/checksums Modified: csw/mgar/pkg/python-suds/trunk/Makefile =================================================================== --- csw/mgar/pkg/python-suds/trunk/Makefile 2010-02-28 13:06:27 UTC (rev 8888) +++ csw/mgar/pkg/python-suds/trunk/Makefile 2010-02-28 14:48:10 UTC (rev 8889) @@ -3,7 +3,7 @@ # $Id$ GARNAME = python-suds -GARVERSION = 0.3.8 +GARVERSION = 0.3.9 CATEGORIES = python DESCRIPTION = lightweight SOAP python client for consuming Web Services define BLURB Modified: csw/mgar/pkg/python-suds/trunk/checksums =================================================================== --- csw/mgar/pkg/python-suds/trunk/checksums 2010-02-28 13:06:27 UTC (rev 8888) +++ csw/mgar/pkg/python-suds/trunk/checksums 2010-02-28 14:48:10 UTC (rev 8889) @@ -1 +1 @@ -74122f391f73e91dfee5b5435aa51a38 python-suds-0.3.8.tar.gz +420ac4b6ba788e43631b74719a470bf7 python-suds-0.3.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Feb 28 15:56:34 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 28 Feb 2010 14:56:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8890] csw/mgar/pkg/python-suds/trunk/Makefile Message-ID: Revision: 8890 http://gar.svn.sourceforge.net/gar/?rev=8890&view=rev Author: wahwah Date: 2010-02-28 14:56:34 +0000 (Sun, 28 Feb 2010) Log Message: ----------- python-suds: Adding license Modified Paths: -------------- csw/mgar/pkg/python-suds/trunk/Makefile Modified: csw/mgar/pkg/python-suds/trunk/Makefile =================================================================== --- csw/mgar/pkg/python-suds/trunk/Makefile 2010-02-28 14:48:10 UTC (rev 8889) +++ csw/mgar/pkg/python-suds/trunk/Makefile 2010-02-28 14:56:34 UTC (rev 8890) @@ -15,4 +15,5 @@ PACKAGES = CSWpy-suds CATALOGNAME_CSWpy-suds = py_suds ARCHALL_CSWpy-suds = 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 wbonnet at users.sourceforge.net Sun Feb 28 17:35:23 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 28 Feb 2010 16:35:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8891] csw/mgar/pkg/dbus/trunk Message-ID: Revision: 8891 http://gar.svn.sourceforge.net/gar/?rev=8891&view=rev Author: wbonnet Date: 2010-02-28 16:35:23 +0000 (Sun, 28 Feb 2010) Log Message: ----------- Fix 1.3.0 compilation Modified Paths: -------------- csw/mgar/pkg/dbus/trunk/Makefile csw/mgar/pkg/dbus/trunk/checksums Added Paths: ----------- csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff Removed Paths: ------------- csw/mgar/pkg/dbus/trunk/files/CSWdbus.gspec csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.gspec csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.gspec Modified: csw/mgar/pkg/dbus/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus/trunk/Makefile 2010-02-28 14:56:34 UTC (rev 8890) +++ csw/mgar/pkg/dbus/trunk/Makefile 2010-02-28 16:35:23 UTC (rev 8891) @@ -22,9 +22,6 @@ CATALOGNAME_CSWdbus = dbus CATALOGNAME_CSWlibdbus = libdbus CATALOGNAME_CSWlibdbusdev = libdbusdev -#DISTFILES += $(call admfiles,CSWdbus, preinstall, ) -#DISTFILES += $(call admfiles,CSWlibdbusdev, ) -#DISTFILES += $(call admfiles,CSWlibdbus, ) DISTFILES += CSWdbus.preinstall DISTFILES += cswdbus @@ -36,7 +33,8 @@ PKGFILES_CSWlibdbus = $(PKGFILES_RT) # Dependencies tracking -RUNTIME_DEP_PKGS_CSWdbus = CSWexpat CSWlibdbus CSWcswclassutils +RUNTIME_DEP_PKGS_CSWdbus = CSWexpat CSWlibdbus CSWlibsm CSWlibice CSWlibx11 +RUNTIME_DEP_PKGS_CSWlibdbus = CSWexpat CSWlibdbus CSWlibsm CSWlibice CSWlibx11 RUNTIME_DEP_PKGS_CSWlibdbusdev = CSWlibdbus # SMF support @@ -46,8 +44,12 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-tests --with-xml=expat +EXTRA_CPPFLAGS = -D_XPG4_2 + BUILD64 = 1 +PATCHFILES += dbus-sysdeps-unix.c.diff + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/dbus/trunk/checksums =================================================================== --- csw/mgar/pkg/dbus/trunk/checksums 2010-02-28 14:56:34 UTC (rev 8890) +++ csw/mgar/pkg/dbus/trunk/checksums 2010-02-28 16:35:23 UTC (rev 8891) @@ -1,3 +1,4 @@ 6e26e51243c4551ac222112edf67b5db CSWdbus.preinstall 9222a44088c837eba62822e330de713f cswdbus b3298d5ce0e4ad4731b1e4e1787d56bb dbus-1.3.0.tar.gz +dafb8ca4f0001dbed5334a9913781942 dbus-sysdeps-unix.c.diff Deleted: csw/mgar/pkg/dbus/trunk/files/CSWdbus.gspec =================================================================== --- csw/mgar/pkg/dbus/trunk/files/CSWdbus.gspec 2010-02-28 14:56:34 UTC (rev 8890) +++ csw/mgar/pkg/dbus/trunk/files/CSWdbus.gspec 2010-02-28 16:35:23 UTC (rev 8891) @@ -1,6 +0,0 @@ -%var bitname dbus -%var pkgname CSWdbus -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/%{GARNAME}/license for license information Deleted: csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.gspec =================================================================== --- csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.gspec 2010-02-28 14:56:34 UTC (rev 8890) +++ csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.gspec 2010-02-28 16:35:23 UTC (rev 8891) @@ -1,6 +0,0 @@ -%var bitname libdbus -%var pkgname CSWlibdbus -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/lib%{GARNAME}/license for license information Deleted: csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.gspec =================================================================== --- csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.gspec 2010-02-28 14:56:34 UTC (rev 8890) +++ csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.gspec 2010-02-28 16:35:23 UTC (rev 8891) @@ -1,6 +0,0 @@ -%var bitname libdbusdev -%var pkgname CSWlibdbusdev -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/lib%{GARNAME}dev/license for license information Added: csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff =================================================================== --- csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff (rev 0) +++ csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff 2010-02-28 16:35:23 UTC (rev 8891) @@ -0,0 +1,11 @@ +--- dbus-1.3.0.orig/dbus/dbus-sysdeps-unix.c 2009-07-16 16:04:55.000000000 +0200 ++++ dbus-1.3.0/dbus/dbus-sysdeps-unix.c 2010-02-28 16:49:51.561773000 +0100 +@@ -3043,7 +3043,7 @@ + return -1; + } + +-#ifndef F_DUPFD_CLOEXEC ++#ifdef F_DUPFD_CLOEXEC + if (!cloexec_done) + #endif + { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Feb 28 17:58:21 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 28 Feb 2010 16:58:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8892] csw/mgar/gar/v2 Message-ID: Revision: 8892 http://gar.svn.sourceforge.net/gar/?rev=8892&view=rev Author: wahwah Date: 2010-02-28 16:58:21 +0000 (Sun, 28 Feb 2010) Log Message: ----------- mGAR v2: checkpkg, implemented the new API, ready to start porting checks. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-archall.py csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-missing-symbols.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/tests/run_tests.py Added Paths: ----------- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-auto.py csw/mgar/gar/v2/lib/python/package_checks_old.py csw/mgar/gar/v2/lib/python/package_checks_old_test.py Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-02-28 16:35:23 UTC (rev 8891) +++ csw/mgar/gar/v2/bin/checkpkg 2010-02-28 16:58:21 UTC (rev 8892) @@ -262,15 +262,6 @@ # Check for some common errors if [[ $pkgname != "CSWcommon" ]] ; then - if [[ $LOGNAME != "root" ]] ; then - nawk '$6 == "'$LOGNAME'" {print; exit 1}' $EXTRACTDIR/$pkgname/pkgmap - if [[ $? -eq 1 ]] ; then - print ERROR: files owned by $LOGNAME in prototype file - rm -rf $EXTRACTDIR $TMPARCHIVE - exit 1 - fi - fi - egrep 'd none /opt ' $EXTRACTDIR/$pkgname/pkgmap if [[ $? -eq 0 ]] ; then errmsg You should not have an entry for /opt in your prototype file Modified: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-archall.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-archall.py 2010-02-28 16:35:23 UTC (rev 8891) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-archall.py 2010-02-28 16:58:21 UTC (rev 8892) @@ -16,7 +16,7 @@ "..", "..", "lib", "python"] sys.path.append(os.path.join(*path_list)) import checkpkg -import package_checks +import package_checks_old def main(): options, args = checkpkg.GetOptions() @@ -29,7 +29,7 @@ options.debug) check_manager.RegisterIndividualCheck( - package_checks.CheckArchitectureVsContents) + package_checks_old.CheckArchitectureVsContents) exit_code, screen_report, tags_report = check_manager.Run() f = open(options.output, "w") f.write(tags_report) Added: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-auto.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-auto.py (rev 0) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-auto.py 2010-02-28 16:58:21 UTC (rev 8892) @@ -0,0 +1,48 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""This is a dummy check. You can use it as a boilerplate for your own checks. + +Copy it and modify. +""" + +import logging +import os.path +import sys +import re + +CHECKPKG_MODULE_NAME = "Second checkpkg API version" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + + +def main(): + options, args = checkpkg.GetOptions() + if options.debug: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.INFO) + md5sums = args + # CheckpkgManager2 class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager2(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-auto.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id Modified: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py 2010-02-28 16:35:23 UTC (rev 8891) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py 2010-02-28 16:58:21 UTC (rev 8892) @@ -17,7 +17,7 @@ "..", "..", "lib", "python"] sys.path.append(os.path.join(*path_list)) import checkpkg -import package_checks +import package_checks_old def main(): options, args = checkpkg.GetOptions() @@ -29,9 +29,12 @@ md5sums, options.debug) # Registering functions defined above. - check_manager.RegisterIndividualCheck(package_checks.CatalognameLowercase) - check_manager.RegisterIndividualCheck(package_checks.FileNameSanity) - check_manager.RegisterIndividualCheck(package_checks.PkginfoSanity) + check_manager.RegisterIndividualCheck(package_checks_old.CatalognameLowercase) + check_manager.RegisterIndividualCheck(package_checks_old.FileNameSanity) + check_manager.RegisterIndividualCheck(package_checks_old.PkginfoSanity) + check_manager.RegisterIndividualCheck(package_checks_old.ArchitectureSanity) + check_manager.RegisterIndividualCheck(package_checks_old.CheckBuildingUser) + check_manager.RegisterIndividualCheck(package_checks_old.CheckPkgmapPaths) # Running the checks, reporting and exiting. exit_code, screen_report, tags_report = check_manager.Run() f = open(options.output, "w") Modified: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-missing-symbols.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-missing-symbols.py 2010-02-28 16:35:23 UTC (rev 8891) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-missing-symbols.py 2010-02-28 16:58:21 UTC (rev 8892) @@ -19,7 +19,7 @@ "..", "..", "lib", "python"] sys.path.append(os.path.join(*path_list)) import checkpkg -import package_checks +import package_checks_old # Defining checking functions. @@ -33,7 +33,7 @@ md5sums, options.debug) # Registering functions defined above. - check_manager.RegisterSetCheck(package_checks.CheckForMissingSymbols) + check_manager.RegisterSetCheck(package_checks_old.CheckForMissingSymbols) # Running the checks, reporting and exiting. exit_code, screen_report, tags_report = check_manager.Run() f = open(options.output, "w") Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-28 16:35:23 UTC (rev 8891) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-02-28 16:58:21 UTC (rev 8892) @@ -19,6 +19,7 @@ import yaml from Cheetah import Template import opencsw +import package_checks SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") @@ -30,6 +31,7 @@ DO_NOT_REPORT_MISSING = set([]) DO_NOT_REPORT_MISSING_RE = [r"SUNW.*", r"\*SUNW.*"] DUMP_BIN = "/usr/ccs/bin/dump" +PSTAMP_RE = r"(?P\w)+@(?P\w+)-(?P\d+)" SYSTEM_SYMLINKS = ( ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), @@ -162,6 +164,14 @@ return m.group(1) if m else None +def ExtractBuildUsername(pkginfo): + m = re.match(PSTAMP_RE, pkginfo["PSTAMP"]) + if m: + return m.group("username") + else: + return None + + class SystemPkgmap(object): """A class to hold and manipulate the /var/sadm/install/contents file. @@ -704,8 +714,8 @@ -class CheckpkgManager(object): - """Takes care of calling checking functions""" +class CheckpkgManagerBase(object): + """Common functions between the older and newer calling functions.""" def __init__(self, name, stats_basedir, md5sum_list, debug=False): self.debug = debug @@ -717,44 +727,12 @@ self.set_checks = [] self.packages = [] - def RegisterIndividualCheck(self, function): - self.individual_checks.append(function) - - def RegisterSetCheck(self, function): - self.set_checks.append(function) - def GetPackageStatsList(self): stats_list = [] for md5sum in self.md5sum_list: stats_list.append(PackageStats(None, self.stats_basedir, md5sum)) return stats_list - def GetAllTags(self, packages_data): - errors = {} - for pkg_data in packages_data: - for function in self.individual_checks: - all_stats = pkg_data.GetAllStats() - errors_for_pkg = function(all_stats, debug=self.debug) - if errors_for_pkg: - errors[all_stats["basic_stats"]["pkgname"]] = errors_for_pkg - # Set checks - for function in self.set_checks: - set_errors = function([x.GetAllStats() for x in packages_data], - debug=self.debug) - if set_errors: - # These were generated by a set, but are likely to be bound to specific - # packages. We'll try to preserve the package assignments. - for tag in set_errors: - if tag.pkgname: - if not tag.pkgname in errors: - errors[tag.pkgname] = [] - errors[tag.pkgname].append(tag) - else: - if "package-set" not in errors: - errors["package-set"] = [] - errors["package-set"].append(error) - return errors - def FormatReports(self, errors): namespace = { "name": self.name, @@ -780,6 +758,131 @@ return (exit_code, screen_report, tags_report) +class CheckpkgManager(CheckpkgManagerBase): + """Takes care of calling checking functions. + + This is an old API as of 2010-02-28. + """ + def RegisterIndividualCheck(self, function): + self.individual_checks.append(function) + + def RegisterSetCheck(self, function): + self.set_checks.append(function) + + def SetErrorsToDict(self, set_errors, a_dict): + # These were generated by a set, but are likely to be bound to specific + # packages. We'll try to preserve the package assignments. + for tag in set_errors: + if tag.pkgname: + if not tag.pkgname in errors: + errors[tag.pkgname] = [] + errors[tag.pkgname].append(tag) + else: + if "package-set" not in errors: + errors["package-set"] = [] + errors["package-set"].append(error) + return a_dict + + def GetAllTags(self, packages_data): + errors = {} + for pkg_data in packages_data: + for function in self.individual_checks: + all_stats = pkg_data.GetAllStats() + errors_for_pkg = function(all_stats, debug=self.debug) + if errors_for_pkg: + errors[all_stats["basic_stats"]["pkgname"]] = errors_for_pkg + # Set checks + for function in self.set_checks: + set_errors = function([x.GetAllStats() for x in packages_data], + debug=self.debug) + if set_errors: + errors = self.SetErrorsToDict(set_errors, errors) + return errors + + +class CheckpkgManager2(CheckpkgManagerBase): + """The second incarnation of the checkpkg manager. + + Implements the API to be used by checking functions. + + Its purpose is to reduce the amount of boilerplate code and allow for easier + unit test writing. + """ + class IndividualErrorGatherer(object): + """To be passed to the checking functions. + + Wraps the creation of CheckpkgTag objects. + """ + + def __init__(self, pkgname): + self.pkgname = pkgname + self.errors = [] + + def ReportError(self, tag_name, tag_info=None, msg=None): + self.errors.append( + CheckpkgTag(self.pkgname, tag_name, tag_info, msg)) + + def SetErrorGatherer(object): + """To be bassed to set checking functions.""" + def __init__(self): + self.errors = [] + + def ReportError(self, pkgname, tag_name, tag_info=None, msg=None): + self.errors.append( + CheckpkgTag(pkgname, tag_name, tag_info, msg)) + + def _RegisterIndividualCheck(self, function): + self.individual_checks.append(function) + + def _RegisterSetCheck(self, function): + self.set_checks.append(function) + + def _AutoregisterChecks(self): + """Autodetects all defined checks.""" + logging.debug("CheckpkgManager2._AutoregisterChecks()") + checkpkg_module = package_checks + members = dir(checkpkg_module) + for member_name in members: + logging.debug("member_name: %s", repr(member_name)) + member = getattr(checkpkg_module, member_name) + if callable(member): + if member_name.startswith("Check"): + logging.debug("Registering individual check %s", repr(member_name)) + self._RegisterIndividualCheck(member) + elif member_name.startswith("SetCheck"): + logging.debug("Registering set check %s", repr(member_name)) + self._RegisterIndividualCheck(member) + + def GetAllTags(self, packages_data): + errors = {} + logging_level = logging.INFO + if self.debug: + logging_level = logging.DEBUG + # Individual checks + for pkg_data in packages_data: + for function in self.individual_checks: + all_stats = pkg_data.GetAllStats() + pkgname = all_stats["basic_stats"]["pkgname"] + error_mgr = self.IndividualErrorGatherer(pkgname) + logger = logging.getLogger(pkgname) + function(all_stats, error_mgr, logger=logger) + if error_mgr.errors: + errors[pkgname] = error_mgr.errors + # Set checks + for function in self.set_checks: + pkgs_data = [x.GetAllStats() for x in packages_data] + logger = logging.getLogger("SetCheck %s" % function) + error_mgr = self.SetErrorGatherer() + function(pkgs_data, error_mgr, logger) + if error_mgr.errors: + errors = self.SetErrorsToDict(error_mgr.errors, errors) + return errors + + def Run(self): + self._AutoregisterChecks() + return super(CheckpkgManager2, self).Run() + + def ParseTagLine(line): """Parses a line from the tag.${module} file. @@ -1142,18 +1245,18 @@ in_file_name = os.path.join(stats_path, "%s.yml" % name) in_file_name_pickle = os.path.join(stats_path, "%s.pickle" % name) if os.path.exists(in_file_name_pickle): - logging.debug("ReadObject(): reading %s", repr(in_file_name_pickle)) + # logging.debug("ReadObject(): reading %s", repr(in_file_name_pickle)) f = open(in_file_name_pickle, "r") obj = cPickle.load(f) f.close() - logging.debug("ReadObject(): finished reading %s", - repr(in_file_name_pickle)) + # logging.debug("ReadObject(): finished reading %s", + # repr(in_file_name_pickle)) else: - logging.debug("ReadObject(): reading %s", repr(in_file_name)) + # logging.debug("ReadObject(): reading %s", repr(in_file_name)) f = open(in_file_name, "r") obj = yaml.safe_load(f) f.close() - logging.debug("ReadObject(): finished reading %s", repr(in_file_name)) + # logging.debug("ReadObject(): finished reading %s", repr(in_file_name)) return obj def ReadSavedStats(self): Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-02-28 16:35:23 UTC (rev 8891) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-02-28 16:58:21 UTC (rev 8892) @@ -4,286 +4,13 @@ # - individual package checks # - set checks # -# Some ideas for the future development of the checks. Here's what a check -# could look like: +# Individual checks need to be named "Check", while set checks are named +# "SetCheck". # -# class FooCheck(checkpkg.IndividualCheck): -# """Simplest check for an individual package.""" -# -# def CheckExampleOne(self): -# """First idea, with an ReportError method.""" -# if self.catalogname != self.catalogname.lower(): -# self.ReportError("catalogname-not-lowercase") -# -# def CheckExampleTwo(self): -# """Second idea, more similar to a unit test.""" -# self.checkEqual(self.catalogname, -# self.catalogname.lower(), -# "catalogname-not-lowercase") -# -# What would be needed to do that: -# -# - Have a class that looks for classes derived from checkpkg.IndividualCheck, -# run SetUp on them (which sets things such as self.catalogname) and then -# Check(). -# - Read all the data and set appropriate member names. -# -# Set checks would be slightly more complicated. -# -# class BarCheck(checkpkg.SetCheck): -# """More complex check for multiple packages. -# -# We cannot have package data as class members any more, we have to use -# a class member with a list of objects containing packages' data. -# -# In this class, checkEqual() methods needs one more parameter, denoting -# the package to assign the error to. -# """ -# -# def Check(self): -# for pkg in self.pkgs: -# self.checkEqual(pkg.catalogname, -# pkg.catalogname.lower(), -# pkg, -# "catalogname-not-lowercase") -# -# A question: What would unit tests of these checks look like? -# -# Alternately, a function-based approach is possible: -# -# def IndividualCheckCatalogname(pkg_data, checkpkg_mgr, debug): -# catalogname = pkg_data["basic_stats"]["catalogname"] -# if catalogname != catalogname.lower(): -# checkpkg_mgr.ReportError("catalogname-not-lowercase") -# -# Here, unit testing of these functions would always require mock objects. But -# overall it looks like a simpler approach. -# -# Instead of the debug flag, a logger could be used, although it would make -# testing slightly annoying, since it would be necessary to mock -# all the calls to the logger. -# -# def IndividualCheckCatalogname(pkg_data, checkpkg_mgr, logger): -# catalogname = pkg_data["basic_stats"]["catalogname"] -# logger.debug("catalogname: %s", catalogname) -# if catalogname != catalogname.lower(): -# checkpkg_mgr.ReportError("catalogname-not-lowercase") -# -# +# def CheckSomething(pkg_data, error_mgr, logger): +# logger.debug("Checking something.") +# error_mgr.ReportError("something-is-wrong") -import checkpkg -import re - -ARCH_RE = re.compile(r"(sparcv(8|9)|i386|amd64)") - -MAX_CATALOGNAME_LENGTH = 20 -MAX_PKGNAME_LENGTH = 20 -MAX_DESCRIPTION_LENGTH = 100 -ARCH_LIST = ["sparc", "i386", "all"] -VERSION_RE = r".*,REV=(20[01][0-9]\.[0-9][0-9]\.[0-9][0-9]).*" - -def CatalognameLowercase(pkg_data, debug): - errors = [] - # Here's how to report an error: - catalogname = pkg_data["basic_stats"]["catalogname"] - if catalogname != catalogname.lower(): - errors.append(checkpkg.CheckpkgTag( - pkg_data["basic_stats"]["pkgname"], - "catalogname-not-lowercase")) - if not re.match(r"^\w+$", catalogname): - errors.append(checkpkg.CheckpkgTag( - pkg_data["basic_stats"]["pkgname"], - "catalogname-is-not-a-simple-word")) - return errors - - -def FileNameSanity(pkg_data, debug): - errors = [] - basic_stats = pkg_data["basic_stats"] - revision_info = basic_stats["parsed_basename"]["revision_info"] - catalogname = pkg_data["basic_stats"]["catalogname"] - pkgname = pkg_data["basic_stats"]["pkgname"] - if "REV" not in revision_info: - errors.append(checkpkg.CheckpkgTag( - pkgname, "rev-tag-missing-in-filename")) - if len(catalogname) > MAX_CATALOGNAME_LENGTH: - errors.append(checkpkg.CheckpkgTag( - pkgname, "catalogname-too-long")) - if len(pkgname) > MAX_PKGNAME_LENGTH: - errors.append(checkpkg.CheckpkgTag( - pkgname, "pkgname-too-long")) - if basic_stats["parsed_basename"]["osrel"] == "unspecified": - errors.append(checkpkg.CheckpkgTag( - pkgname, "osrel-tag-not-specified")) - return errors - - -def PkginfoSanity(pkg_data, debug): - """pkginfo sanity checks. - -if [ "$maintname" = "" ] ; then - # the old format, in the DESC field - maintname=`sed -n 's/^DESC=.*for CSW by //p' $TMPFILE` - - # Since the DESC field has been coopted, take - # description from second half of NAME field now. - desc=`sed -n 's/^NAME=[^ -]* - //p' $TMPFILE` -else - if [ "$desc" = "" ] ; then - desc=`sed -n 's/^NAME=[^ -]* - //p' $TMPFILE` - fi -fi - -software=`sed -n 's/^NAME=\([^ -]*\) -.*$/\1/p' $TMPFILE` -version=`sed -n 's/^VERSION=//p' $TMPFILE` -desc=`sed -n 's/^DESC=//p' $TMPFILE` -email=`sed -n 's/^EMAIL=//p' $TMPFILE` -maintname=`sed -n 's/^VENDOR=.*for CSW by //p' $TMPFILE` -hotline=`sed -n 's/^HOTLINE=//p' $TMPFILE` -basedir=`sed -n 's/^BASEDIR=//p' $TMPFILE` -pkgarch=`sed -n 's/^ARCH=//p' $TMPFILE|head -1` - -if [ "$software" = "" ] ; then errmsg $f: software field not set properly in NAME ; fi -if [ "$pkgname" = "" ] ; then errmsg $f: pkgname field blank ; fi -if [ "$desc" = "" ] ; then errmsg $f: no description in either NAME or DESC field ; fi -if [ ${#desc} -gt 100 ] ; then errmsg $f: description greater than 100 chars ; fi -if [ "$version" = "" ] ; then errmsg $f: VERSION field blank ; fi -if [ "$maintname" = "" ] ; then errmsg $f: maintainer name not detected. Fill out VENDOR field properly ; fi -if [ "$email" = "" ] ; then errmsg $f: EMAIL field blank ; fi -if [ "$hotline" = "" ] ; then errmsg $f: HOTLINE field blank ; fi - """ - errors = [] - catalogname = pkg_data["basic_stats"]["catalogname"] - pkgname = pkg_data["basic_stats"]["pkgname"] - pkginfo = pkg_data["pkginfo"] - if not catalogname: - errors.append(checkpkg.CheckpkgTag( - pkgname, "empty-catalogname")) - if not pkgname: - errors.append(checkpkg.CheckpkgTag( - pkgname, "empty-pkgname")) - if not "VERSION" in pkginfo or not pkginfo["VERSION"]: - errors.append(checkpkg.CheckpkgTag( - pkgname, "pkginfo-version-field-missing")) - desc = checkpkg.ExtractDescription(pkginfo) - if not desc: - errors.append(checkpkg.CheckpkgTag( - pkgname, "description-missing")) - if len(desc) > MAX_DESCRIPTION_LENGTH: - errors.append(checkpkg.CheckpkgTag( - pkgname, "description-too-long")) - # maintname=`sed -n 's/^VENDOR=.*for CSW by //p' $TMPFILE` - maintname = checkpkg.ExtractMaintainerName(pkginfo) - if not maintname: - errors.append(checkpkg.CheckpkgTag( - pkgname, "maintainer-name-not-set")) - # email - if not pkginfo["EMAIL"]: - errors.append(checkpkg.CheckpkgTag( - pkgname, "email-blank")) - # hotline - if not pkginfo["HOTLINE"]: - errors.append(checkpkg.CheckpkgTag( - pkgname, "hotline-blank")) - pkginfo_version = pkg_data["basic_stats"]["parsed_basename"]["full_version_string"] - if pkginfo_version != pkginfo["VERSION"]: - errors.append(checkpkg.CheckpkgTag( - pkgname, "filename-version-does-not-match-pkginfo-version")) - if re.search(r"-", pkginfo["VERSION"]): - errors.append(checkpkg.CheckpkgTag( - pkgname, "minus-not-allowed-in-version")) - if not re.match(VERSION_RE, pkginfo["VERSION"]): - msg = ("Version regex: %s, version value: %s." - % (repr(VERSION_RE), repr(pkginfo["VERSION"]))) - errors.append(checkpkg.CheckpkgTag( - pkgname, "version-does-not-match-regex", msg=msg)) - if pkginfo["ARCH"] not in ARCH_LIST: - errors.append(checkpkg.CheckpkgTag( - pkgname, "non-standard-architecture", pkginfo["ARCH"])) - return errors - - -def ArchitectureSanity(pkg_data, debug): - errors = [] - basic_stats = pkg_data["basic_stats"] - pkgname = basic_stats["pkgname"] - pkginfo = pkg_data["pkginfo"] - filename = basic_stats["pkg_basename"] - arch = pkginfo["ARCH"] - filename_re = r"-%s-" % arch - if not re.search(filename_re, filename): - errors.append(checkpkg.CheckpkgTag( - pkgname, "srv4-filename-architecture-mismatch", arch)) - - -def CheckArchitectureVsContents(pkg_data, debug): - """Verifies the relationship between package contents and architecture.""" - errors = [] - binaries = pkg_data["binaries"] - pkginfo = pkg_data["pkginfo"] - pkgmap = pkg_data["pkgmap"] - arch = pkginfo["ARCH"] - pkgname = pkg_data["basic_stats"]["pkgname"] - reasons_to_be_arch_specific = [] - pkgmap_paths = [x["path"] for x in pkgmap] - for pkgmap_path in pkgmap_paths: - if re.search(ARCH_RE, str(pkgmap_path)): - reasons_to_be_arch_specific.append(( - "archall-with-arch-paths", - pkgmap_path, - "path %s looks arch-specific" % pkgmap_path)) - for binary in binaries: - reasons_to_be_arch_specific.append(( - "archall-with-binaries", - binary, - "package contains binary %s" % binary)) - if arch == "all": - for tag, param, desc in reasons_to_be_arch_specific: - errors.append(checkpkg.CheckpkgTag(pkgname, tag, param)) - elif not reasons_to_be_arch_specific: - # This is not a clean way of handling messages for the user, but there's - # not better way at the moment. - print "Package %s does not contain any binaries." % pkgname - print "Consider making it ARCHALL = 1 instead of %s:" % arch - print "ARCHALL_%s = 1" % pkgname - print ("However, be aware that there might be other reasons " - "to keep it architecture-specific.") - return errors - - -def CheckForMissingSymbols(pkgs_data, debug): - """Analyzes missing symbols reported by ldd -r. - - 1. Collect triplets: pkgname, binary, missing symbol - 2. If there are any missing symbols, collect all the symbols that are provided - by the set of packages. - 3. From the list of missing symbols, remove all symbols that are provided - by the set of packages. - 4. Report any remaining symbols as errors. - - What indexes do we need? - - symbol -> (pkgname, binary) - set(allsymbols) - """ - errors = [] - missing_symbols = [] - all_symbols = set() - for pkg_data in pkgs_data: - pkgname = pkg_data["basic_stats"]["pkgname"] - binaries = pkg_data["binaries"] - for binary in binaries: - for ldd_elem in pkg_data["ldd_dash_r"][binary]: - if ldd_elem["state"] == "symbol-not-found": - missing_symbols.append((pkgname, - binary, - ldd_elem["symbol"])) - for symbol in pkg_data["defined_symbols"][binary]: - all_symbols.add(symbol) - # Remove symbols defined elsewhere. - while missing_symbols: - ms_pkgname, ms_binary, ms_symbol = missing_symbols.pop() - if ms_symbol not in all_symbols: - errors.append(checkpkg.CheckpkgTag( - ms_pkgname, "symbol-not-found", "%s %s" % (ms_binary, ms_symbol))) - return errors +def CheckPkgmap(pkg_data, error_mgr, logger): + # error_mgr.ReportError("foo") + pass Copied: csw/mgar/gar/v2/lib/python/package_checks_old.py (from rev 8886, csw/mgar/gar/v2/lib/python/package_checks.py) =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_old.py (rev 0) +++ csw/mgar/gar/v2/lib/python/package_checks_old.py 2010-02-28 16:58:21 UTC (rev 8892) @@ -0,0 +1,258 @@ +#!/opt/csw/bin/python2.6 +# coding=utf-8 +# $Id$ + +import checkpkg +import re + +ARCH_RE = re.compile(r"(sparcv(8|9)|i386|amd64)") + +MAX_CATALOGNAME_LENGTH = 20 +MAX_PKGNAME_LENGTH = 20 +MAX_DESCRIPTION_LENGTH = 100 +ARCH_LIST = ["sparc", "i386", "all"] +VERSION_RE = r".*,REV=(20[01][0-9]\.[0-9][0-9]\.[0-9][0-9]).*" +ONLY_ALLOWED_IN_PKG = { + "CSWcommon": ("/opt", "",) +} + +def CatalognameLowercase(pkg_data, debug): + errors = [] + # Here's how to report an error: + catalogname = pkg_data["basic_stats"]["catalogname"] + if catalogname != catalogname.lower(): + errors.append(checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "catalogname-not-lowercase")) + if not re.match(r"^\w+$", catalogname): + errors.append(checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "catalogname-is-not-a-simple-word")) + return errors + + +def FileNameSanity(pkg_data, debug): + errors = [] + basic_stats = pkg_data["basic_stats"] + revision_info = basic_stats["parsed_basename"]["revision_info"] + catalogname = pkg_data["basic_stats"]["catalogname"] + pkgname = pkg_data["basic_stats"]["pkgname"] + if "REV" not in revision_info: + errors.append(checkpkg.CheckpkgTag( + pkgname, "rev-tag-missing-in-filename")) + if len(catalogname) > MAX_CATALOGNAME_LENGTH: + errors.append(checkpkg.CheckpkgTag( + pkgname, "catalogname-too-long")) + if len(pkgname) > MAX_PKGNAME_LENGTH: + errors.append(checkpkg.CheckpkgTag( + pkgname, "pkgname-too-long")) + if basic_stats["parsed_basename"]["osrel"] == "unspecified": + errors.append(checkpkg.CheckpkgTag( + pkgname, "osrel-tag-not-specified")) + return errors + + +def PkginfoSanity(pkg_data, debug): + """pkginfo sanity checks. + +if [ "$maintname" = "" ] ; then + # the old format, in the DESC field + maintname=`sed -n 's/^DESC=.*for CSW by //p' $TMPFILE` + + # Since the DESC field has been coopted, take + # description from second half of NAME field now. + desc=`sed -n 's/^NAME=[^ -]* - //p' $TMPFILE` +else + if [ "$desc" = "" ] ; then + desc=`sed -n 's/^NAME=[^ -]* - //p' $TMPFILE` + fi +fi + +software=`sed -n 's/^NAME=\([^ -]*\) -.*$/\1/p' $TMPFILE` +version=`sed -n 's/^VERSION=//p' $TMPFILE` +desc=`sed -n 's/^DESC=//p' $TMPFILE` +email=`sed -n 's/^EMAIL=//p' $TMPFILE` +maintname=`sed -n 's/^VENDOR=.*for CSW by //p' $TMPFILE` +hotline=`sed -n 's/^HOTLINE=//p' $TMPFILE` +basedir=`sed -n 's/^BASEDIR=//p' $TMPFILE` +pkgarch=`sed -n 's/^ARCH=//p' $TMPFILE|head -1` + +if [ "$software" = "" ] ; then errmsg $f: software field not set properly in NAME ; fi +if [ "$pkgname" = "" ] ; then errmsg $f: pkgname field blank ; fi +if [ "$desc" = "" ] ; then errmsg $f: no description in either NAME or DESC field ; fi +if [ ${#desc} -gt 100 ] ; then errmsg $f: description greater than 100 chars ; fi +if [ "$version" = "" ] ; then errmsg $f: VERSION field blank ; fi +if [ "$maintname" = "" ] ; then errmsg $f: maintainer name not detected. Fill out VENDOR field properly ; fi +if [ "$email" = "" ] ; then errmsg $f: EMAIL field blank ; fi +if [ "$hotline" = "" ] ; then errmsg $f: HOTLINE field blank ; fi + """ + errors = [] + catalogname = pkg_data["basic_stats"]["catalogname"] + pkgname = pkg_data["basic_stats"]["pkgname"] + pkginfo = pkg_data["pkginfo"] + if not catalogname: + errors.append(checkpkg.CheckpkgTag( + pkgname, "empty-catalogname")) + if not pkgname: + errors.append(checkpkg.CheckpkgTag( + pkgname, "empty-pkgname")) + if not "VERSION" in pkginfo or not pkginfo["VERSION"]: + errors.append(checkpkg.CheckpkgTag( + pkgname, "pkginfo-version-field-missing")) + desc = checkpkg.ExtractDescription(pkginfo) + if not desc: + errors.append(checkpkg.CheckpkgTag( + pkgname, "description-missing")) + if len(desc) > MAX_DESCRIPTION_LENGTH: + errors.append(checkpkg.CheckpkgTag( + pkgname, "description-too-long")) + # maintname=`sed -n 's/^VENDOR=.*for CSW by //p' $TMPFILE` + maintname = checkpkg.ExtractMaintainerName(pkginfo) + if not maintname: + errors.append(checkpkg.CheckpkgTag( + pkgname, "maintainer-name-not-set")) + # email + if not pkginfo["EMAIL"]: + errors.append(checkpkg.CheckpkgTag( + pkgname, "email-blank")) + # hotline + if not pkginfo["HOTLINE"]: + errors.append(checkpkg.CheckpkgTag( + pkgname, "hotline-blank")) + pkginfo_version = pkg_data["basic_stats"]["parsed_basename"]["full_version_string"] + if pkginfo_version != pkginfo["VERSION"]: + errors.append(checkpkg.CheckpkgTag( + pkgname, "filename-version-does-not-match-pkginfo-version")) + if re.search(r"-", pkginfo["VERSION"]): + errors.append(checkpkg.CheckpkgTag( + pkgname, "minus-not-allowed-in-version")) + if not re.match(VERSION_RE, pkginfo["VERSION"]): + msg = ("Version regex: %s, version value: %s." + % (repr(VERSION_RE), repr(pkginfo["VERSION"]))) + errors.append(checkpkg.CheckpkgTag( + pkgname, "version-does-not-match-regex", msg=msg)) + if pkginfo["ARCH"] not in ARCH_LIST: + errors.append(checkpkg.CheckpkgTag( + pkgname, "non-standard-architecture", pkginfo["ARCH"])) + if "PSTAMP" in pkginfo: + if not re.match(checkpkg.PSTAMP_RE, pkginfo["PSTAMP"]): + errors.append(checkpkg.CheckpkgTag( + pkgname, "pkginfo-pkstamp-in-wrong-format", + msg=("It should be 'username at hostname-timestamp', " + "but it's %s." % repr(pkginfo["PSTAMP"])))) + else: + errors.append(checkpkg.CheckpkgTag( + pkgname, "pkginfo-pstamp-missing")) + return errors + + +def ArchitectureSanity(pkg_data, debug): + errors = [] + basic_stats = pkg_data["basic_stats"] + pkgname = basic_stats["pkgname"] + pkginfo = pkg_data["pkginfo"] + filename = basic_stats["pkg_basename"] + arch = pkginfo["ARCH"] + filename_re = r"-%s-" % arch + if not re.search(filename_re, filename): + errors.append(checkpkg.CheckpkgTag( + pkgname, "srv4-filename-architecture-mismatch", arch)) + return errors + + +def CheckArchitectureVsContents(pkg_data, debug): + """Verifies the relationship between package contents and architecture.""" + errors = [] + binaries = pkg_data["binaries"] + pkginfo = pkg_data["pkginfo"] + pkgmap = pkg_data["pkgmap"] + arch = pkginfo["ARCH"] + pkgname = pkg_data["basic_stats"]["pkgname"] + reasons_to_be_arch_specific = [] + pkgmap_paths = [x["path"] for x in pkgmap] + for pkgmap_path in pkgmap_paths: + if re.search(ARCH_RE, str(pkgmap_path)): + reasons_to_be_arch_specific.append(( + "archall-with-arch-paths", + pkgmap_path, + "path %s looks arch-specific" % pkgmap_path)) + for binary in binaries: + reasons_to_be_arch_specific.append(( + "archall-with-binaries", + binary, + "package contains binary %s" % binary)) + if arch == "all": + for tag, param, desc in reasons_to_be_arch_specific: + errors.append(checkpkg.CheckpkgTag(pkgname, tag, param)) + elif not reasons_to_be_arch_specific: + # This is not a clean way of handling messages for the user, but there's + # not better way at the moment. + print "Package %s does not contain any binaries." % pkgname + print "Consider making it ARCHALL = 1 instead of %s:" % arch + print "ARCHALL_%s = 1" % pkgname + print ("However, be aware that there might be other reasons " + "to keep it architecture-specific.") + return errors + + +def CheckForMissingSymbols(pkgs_data, debug): + """Analyzes missing symbols reported by ldd -r. + + 1. Collect triplets: pkgname, binary, missing symbol + 2. If there are any missing symbols, collect all the symbols that are provided + by the set of packages. + 3. From the list of missing symbols, remove all symbols that are provided + by the set of packages. + 4. Report any remaining symbols as errors. + + What indexes do we need? + + symbol -> (pkgname, binary) + set(allsymbols) + """ + errors = [] + missing_symbols = [] + all_symbols = set() + for pkg_data in pkgs_data: + pkgname = pkg_data["basic_stats"]["pkgname"] + binaries = pkg_data["binaries"] + for binary in binaries: + for ldd_elem in pkg_data["ldd_dash_r"][binary]: + if ldd_elem["state"] == "symbol-not-found": + missing_symbols.append((pkgname, + binary, + ldd_elem["symbol"])) + for symbol in pkg_data["defined_symbols"][binary]: + all_symbols.add(symbol) + # Remove symbols defined elsewhere. + while missing_symbols: + ms_pkgname, ms_binary, ms_symbol = missing_symbols.pop() + if ms_symbol not in all_symbols: + errors.append(checkpkg.CheckpkgTag( + ms_pkgname, "symbol-not-found", "%s %s" % (ms_binary, ms_symbol))) + return errors + + +def CheckBuildingUser(pkg_data, debug): + errors = [] + pkgname = pkg_data["basic_stats"]["pkgname"] + username = checkpkg.ExtractBuildUsername(pkg_data["pkginfo"]) + for entry in pkg_data["pkgmap"]: + if entry["user"] and entry["user"] == username: + errors.append(checkpkg.CheckpkgTag( + pkgname, + "file-owned-by-building-user", + "%s, %s" % (entry["path"], entry["user"]))) + return errors + +def CheckPkgmapPaths(pkg_data, debug): + errors = [] + username = checkpkg.ExtractBuildUsername(pkg_data["pkginfo"]) + for entry in pkg_data["pkgmap"]: + file_path = entry["path"] + if file_path == "/opt": + errors.append(checkpkg.CheckpkgTag( + pkgname, + ("wrong-path-in-pkgmap", file_path))) + return errors + Copied: csw/mgar/gar/v2/lib/python/package_checks_old_test.py (from rev 8886, csw/mgar/gar/v2/lib/python/package_checks_test.py) =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_old_test.py (rev 0) +++ csw/mgar/gar/v2/lib/python/package_checks_old_test.py 2010-02-28 16:58:21 UTC (rev 8892) @@ -0,0 +1,129 @@ +#!/opt/csw/bin/python2.6 +# coding=utf-8 +# $Id$ + +import unittest +import package_checks_old as pc +import yaml +import os.path + +BASE_DIR = os.path.dirname(__file__) +TESTDATA_DIR = os.path.join(BASE_DIR, "testdata") + +class PackageChecksUnitTest(unittest.TestCase): + + def setUp(self): + self.pkg_data_1 = { + "basic_stats": { + "pkgname": "CSWfoo" + } + } + self.pkg_data_2 = { + 'basic_stats': { + 'parsed_basename': + {'revision_info': {'REV': '2010.02.15'}, + 'catalogname': 'python_tk', + 'full_version_string': '2.6.4,REV=2010.02.15', + 'version': '2.6.4', + 'version_info': { + 'minor version': '6', + 'major version': '2', + 'patchlevel': '4'}, + 'osrel': 'SunOS5.8', + 'arch': 'sparc', + 'vendortag': 'CSW', + }, + 'pkgname': 'CSWpython-tk', + 'stats_version': 1, + 'pkg_basename': 'python_tk-2.6.4,REV=2010.02.15-SunOS5.8-sparc-CSW.pkg.gz', + 'pkg_path': '/tmp/pkg_lL0HDH/python_tk-2.6.4,REV=2010.02.15-SunOS5.8-sparc-CSW.pkg.gz', + 'catalogname': 'python_tk'}} + + def LoadData(self, name): + file_name = os.path.join(TESTDATA_DIR, "%s.yml" % name) + f = open(file_name, "rb") + data = yaml.safe_load(f) + f.close() + return data + + def testCatalogName_1(self): + self.pkg_data_1["basic_stats"]["catalogname"] = "Foo" + errors = pc.CatalognameLowercase(self.pkg_data_1, False) + self.failUnless(errors) + + def testCatalogName_2(self): + self.pkg_data_1["basic_stats"]["catalogname"] = "foo" + errors = pc.CatalognameLowercase(self.pkg_data_1, False) + self.failIf(errors) + + def testCatalogNameSpecialCharacters(self): + self.pkg_data_1["basic_stats"]["catalogname"] = "foo+abc&123" + errors = pc.CatalognameLowercase(self.pkg_data_1, False) + self.failUnless(errors) + + def testFileNameSanity(self): + del(self.pkg_data_2["basic_stats"]["parsed_basename"]["revision_info"]["REV"]) + errors = pc.FileNameSanity(self.pkg_data_2, False) + self.failUnless(errors) + + def testCheckArchitectureVsContents(self): + self.pkg_data_2["pkgmap"] = self.LoadData("example-1-pkgmap") + self.pkg_data_2["binaries"] = [] + self.pkg_data_2["pkginfo"] = self.LoadData("example-1-pkginfo") + errors = pc.CheckArchitectureVsContents(self.pkg_data_2, False) + self.failIf(errors) + + def testCheckForMissingSymbols(self): + ldd_dash_r_yml = """opt/csw/lib/postgresql/8.4/_int.so: +- {path: /usr/lib/libc.so.1, soname: libc.so.1, state: OK, symbol: null} +- {path: /usr/lib/libdl.so.1, soname: libdl.so.1, state: OK, symbol: null} +- {path: /tmp/pkg_W8UcnK/CSWlibpq-84/root/opt/csw/lib/postgresql/8.4/_int.so, soname: null, + state: symbol-not-found, symbol: CurrentMemoryContext} +- {path: /tmp/pkg_W8UcnK/CSWlibpq-84/root/opt/csw/lib/postgresql/8.4/_int.so, soname: null, + state: symbol-not-found, symbol: MemoryContextAlloc} +- {path: /tmp/pkg_W8UcnK/CSWlibpq-84/root/opt/csw/lib/postgresql/8.4/_int.so, soname: null, + state: symbol-not-found, symbol: errstart} +- {path: /tmp/pkg_W8UcnK/CSWlibpq-84/root/opt/csw/lib/postgresql/8.4/_int.so, soname: null, + state: symbol-not-found, symbol: errcode} +opt/csw/lib/postgresql/8.4/_int2.so: +- {path: /usr/lib/libdl.so.1, soname: libdl.so.1, state: OK, symbol: null}""" + defined_symbols_yml = """opt/csw/lib/postgresql/8.4/_int.so: [Pg_magic_func, _fini, _init, _int_contained, + _int_contains, _int_different, _int_inter, _int_overlap, _int_same, _int_union, + _int_unique, _intbig_in, _intbig_out, boolop, bqarr_in, bqarr_out, compASC, compDESC, + copy_intArrayType, execconsistent, g_int_compress, g_int_consistent, g_int_decompress, + g_int_penalty, g_int_picksplit, g_int_same, g_int_union, g_intbig_compress, g_intbig_consistent, + g_intbig_decompress, g_intbig_penalty, g_intbig_picksplit, g_intbig_same, g_intbig_union, + gensign, ginconsistent, ginint4_consistent, ginint4_queryextract, icount, idx, inner_int_contains, + inner_int_inter, inner_int_overlap, inner_int_union, int_to_intset, intarray_add_elem, + intarray_concat_arrays, intarray_del_elem, intarray_match_first, intarray_push_array, + intarray_push_elem, internal_size, intset, intset_subtract, intset_union_elem, isort, + new_intArrayType, pg_finfo__int_contained, pg_finfo__int_contains, pg_finfo__int_different, + pg_finfo__int_inter, pg_finfo__int_overlap, pg_finfo__int_same, pg_finfo__int_union, + pg_finfo__intbig_in, pg_finfo__intbig_out, pg_finfo_boolop, pg_finfo_bqarr_in, pg_finfo_bqarr_out, + pg_finfo_g_int_compress, pg_finfo_g_int_consistent, pg_finfo_g_int_decompress, pg_finfo_g_int_penalty, + pg_finfo_g_int_picksplit, pg_finfo_g_int_same, pg_finfo_g_int_union, pg_finfo_g_intbig_compress, + pg_finfo_g_intbig_consistent, pg_finfo_g_intbig_decompress, pg_finfo_g_intbig_penalty, + pg_finfo_g_intbig_picksplit, pg_finfo_g_intbig_same, pg_finfosc, subarray, uniq] +opt/csw/lib/postgresql/8.4/adminpack.so: [Pg_magic_func, _fini, _init, pg_file_rename, + pg_file_unlink, pg_file_write, pg_finfo_pg_file_rename, pg_finfo_pg_file_unlink, + pg_finfo_pg_file_write, pg_finfo_pg_logdir_ls, pg_logdir_ls] +opt/csw/lib/postgresql/8.4/_int2.so: [] + """ + + self.pkg_data_2["ldd_dash_r"] = yaml.safe_load(ldd_dash_r_yml) + self.pkg_data_2["defined_symbols"] = yaml.safe_load(defined_symbols_yml) + self.pkg_data_2["binaries"] = ["opt/csw/lib/postgresql/8.4/_int.so", + "opt/csw/lib/postgresql/8.4/_int2.so"] + errors = pc.CheckForMissingSymbols([self.pkg_data_2], False) + self.failUnless(errors) + + + def testArchitectureSanity(self): + self.pkg_data_2["pkginfo"] = {} + self.pkg_data_2["pkginfo"]["ARCH"] = "i386" + errors = pc.ArchitectureSanity(self.pkg_data_2, False) + self.failUnless(errors) + + +if __name__ == '__main__': + unittest.main() Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-02-28 16:35:23 UTC (rev 8891) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-02-28 16:58:21 UTC (rev 8892) @@ -10,114 +10,5 @@ BASE_DIR = os.path.dirname(__file__) TESTDATA_DIR = os.path.join(BASE_DIR, "testdata") -class PackageChecksUnitTest(unittest.TestCase): - - def setUp(self): - self.pkg_data_1 = { - "basic_stats": { - "pkgname": "CSWfoo" - } - } - self.pkg_data_2 = { - 'basic_stats': { - 'parsed_basename': - {'revision_info': {'REV': '2010.02.15'}, - 'catalogname': 'python_tk', - 'full_version_string': '2.6.4,REV=2010.02.15', - 'version': '2.6.4', - 'version_info': { - 'minor version': '6', - 'major version': '2', - 'patchlevel': '4'}}, - 'pkgname': 'CSWpython-tk', - 'stats_version': 1, - 'pkg_basename': 'python_tk-2.6.4,REV=2010.02.15-SunOS5.8-sparc-CSW.pkg.gz', - 'pkg_path': '/tmp/pkg_lL0HDH/python_tk-2.6.4,REV=2010.02.15-SunOS5.8-sparc-CSW.pkg.gz', - 'catalogname': 'python_tk'}} - - def LoadData(self, name): - file_name = os.path.join(TESTDATA_DIR, "%s.yml" % name) - f = open(file_name, "rb") - data = yaml.safe_load(f) - f.close() - return data - - def testCatalogName_1(self): - self.pkg_data_1["basic_stats"]["catalogname"] = "Foo" - errors = pc.CatalognameLowercase(self.pkg_data_1, False) - self.failUnless(errors) - - def testCatalogName_2(self): - self.pkg_data_1["basic_stats"]["catalogname"] = "foo" - errors = pc.CatalognameLowercase(self.pkg_data_1, False) - self.failIf(errors) - - def testCatalogNameSpecialCharacters(self): - self.pkg_data_1["basic_stats"]["catalogname"] = "foo+abc&123" - errors = pc.CatalognameLowercase(self.pkg_data_1, False) - self.failUnless(errors) - - def testFileNameSanity(self): - del(self.pkg_data_2["basic_stats"]["parsed_basename"]["revision_info"]["REV"]) - errors = pc.FileNameSanity(self.pkg_data_2, False) - self.failUnless(errors) - - def testCheckArchitectureVsContents(self): - self.pkg_data_2["pkgmap"] = self.LoadData("example-1-pkgmap") - self.pkg_data_2["binaries"] = [] - self.pkg_data_2["pkginfo"] = self.LoadData("example-1-pkginfo") - errors = pc.CheckArchitectureVsContents(self.pkg_data_2, False) - self.failIf(errors) - - def testCheckForMissingSymbols(self): - ldd_dash_r_yml = """opt/csw/lib/postgresql/8.4/_int.so: -- {path: /usr/lib/libc.so.1, soname: libc.so.1, state: OK, symbol: null} -- {path: /usr/lib/libdl.so.1, soname: libdl.so.1, state: OK, symbol: null} -- {path: /tmp/pkg_W8UcnK/CSWlibpq-84/root/opt/csw/lib/postgresql/8.4/_int.so, soname: null, - state: symbol-not-found, symbol: CurrentMemoryContext} -- {path: /tmp/pkg_W8UcnK/CSWlibpq-84/root/opt/csw/lib/postgresql/8.4/_int.so, soname: null, - state: symbol-not-found, symbol: MemoryContextAlloc} -- {path: /tmp/pkg_W8UcnK/CSWlibpq-84/root/opt/csw/lib/postgresql/8.4/_int.so, soname: null, - state: symbol-not-found, symbol: errstart} -- {path: /tmp/pkg_W8UcnK/CSWlibpq-84/root/opt/csw/lib/postgresql/8.4/_int.so, soname: null, - state: symbol-not-found, symbol: errcode} -opt/csw/lib/postgresql/8.4/_int2.so: -- {path: /usr/lib/libdl.so.1, soname: libdl.so.1, state: OK, symbol: null}""" - defined_symbols_yml = """opt/csw/lib/postgresql/8.4/_int.so: [Pg_magic_func, _fini, _init, _int_contained, - _int_contains, _int_different, _int_inter, _int_overlap, _int_same, _int_union, - _int_unique, _intbig_in, _intbig_out, boolop, bqarr_in, bqarr_out, compASC, compDESC, - copy_intArrayType, execconsistent, g_int_compress, g_int_consistent, g_int_decompress, - g_int_penalty, g_int_picksplit, g_int_same, g_int_union, g_intbig_compress, g_intbig_consistent, - g_intbig_decompress, g_intbig_penalty, g_intbig_picksplit, g_intbig_same, g_intbig_union, - gensign, ginconsistent, ginint4_consistent, ginint4_queryextract, icount, idx, inner_int_contains, - inner_int_inter, inner_int_overlap, inner_int_union, int_to_intset, intarray_add_elem, - intarray_concat_arrays, intarray_del_elem, intarray_match_first, intarray_push_array, - intarray_push_elem, internal_size, intset, intset_subtract, intset_union_elem, isort, - new_intArrayType, pg_finfo__int_contained, pg_finfo__int_contains, pg_finfo__int_different, - pg_finfo__int_inter, pg_finfo__int_overlap, pg_finfo__int_same, pg_finfo__int_union, - pg_finfo__intbig_in, pg_finfo__intbig_out, pg_finfo_boolop, pg_finfo_bqarr_in, pg_finfo_bqarr_out, - pg_finfo_g_int_compress, pg_finfo_g_int_consistent, pg_finfo_g_int_decompress, pg_finfo_g_int_penalty, - pg_finfo_g_int_picksplit, pg_finfo_g_int_same, pg_finfo_g_int_union, pg_finfo_g_intbig_compress, - pg_finfo_g_intbig_consistent, pg_finfo_g_intbig_decompress, pg_finfo_g_intbig_penalty, - pg_finfo_g_intbig_picksplit, pg_finfo_g_intbig_same, pg_finfosc, subarray, uniq] -opt/csw/lib/postgresql/8.4/adminpack.so: [Pg_magic_func, _fini, _init, pg_file_rename, - pg_file_unlink, pg_file_write, pg_finfo_pg_file_rename, pg_finfo_pg_file_unlink, - pg_finfo_pg_file_write, pg_finfo_pg_logdir_ls, pg_logdir_ls]""" - - self.pkg_data_2["ldd_dash_r"] = yaml.safe_load(ldd_dash_r_yml) - self.pkg_data_2["defined_symbols"] = yaml.safe_load(defined_symbols_yml) - self.pkg_data_2["binaries"] = ["opt/csw/lib/postgresql/8.4/_int.so", - "opt/csw/lib/postgresql/8.4/_int2.so"] - errors = pc.CheckForMissingSymbols([self.pkg_data_2], False) - self.failUnless(errors) - - - def testArchitectureSanity(self): - self.pkg_data_2["pkginfo"] = {} - self.pkg_data_2["pkginfo"]["ARCH"] = "i386" - errors = pc.ArchitectureSanity(self.pkg_data_2, False) - self.failUnless(errors) - - -if __name__ == '__main__': - unittest.main() +class Foo(unittest.TestCase): + pass Modified: csw/mgar/gar/v2/tests/run_tests.py =================================================================== --- csw/mgar/gar/v2/tests/run_tests.py 2010-02-28 16:35:23 UTC (rev 8891) +++ csw/mgar/gar/v2/tests/run_tests.py 2010-02-28 16:58:21 UTC (rev 8892) @@ -10,11 +10,12 @@ # To add more test files, create .py file and add a corresponding line # here: -from checkpkg_test import * -from example_test import * -from opencsw_test import * -from overrides_test import * -from package_checks_test import * +from checkpkg_test import * +from example_test import * +from opencsw_test import * +from overrides_test import * +from package_checks_test import * +from package_checks_old_test import * if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Feb 28 18:02:05 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 28 Feb 2010 17:02:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[8893] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 8893 http://gar.svn.sourceforge.net/gar/?rev=8893&view=rev Author: chninkel Date: 2010-02-28 17:02:05 +0000 (Sun, 28 Feb 2010) Log Message: ----------- openssh: added ssh-copy-id Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype csw/mgar/pkg/openssh/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2010-02-28 16:58:21 UTC (rev 8892) +++ csw/mgar/pkg/openssh/trunk/Makefile 2010-02-28 17:02:05 UTC (rev 8893) @@ -124,8 +124,12 @@ @$(MAKECOOKIE) # adding documentation files -post-merge: merge-config-files merge-doc-files merge-init-files +post-merge: merge-config-files merge-doc-files merge-init-files merge-contrib-files +merge-contrib-files: + ginstall -D "$(WORKSRC_FIRSTMOD)/contrib/ssh-copy-id" "$(PKGROOT)/$(bindir)/ssh-copy-id" + ginstall -D "$(WORKSRC_FIRSTMOD)/contrib/ssh-copy-id.1" "$(PKGROOT)/$(mandir)/man1/ssh-copy-id.1" + merge-init-files: ginstall -D "$(WORKDIR_FIRSTMOD)/cswopenssh" "$(PKGROOT)/etc/opt/csw/init.d/cswopenssh" ginstall -D "$(WORKDIR_FIRSTMOD)/cswopenssh.xml" "$(PKGROOT)/var/opt/csw/svc/manifest/network/cswopenssh.xml" Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2010-02-28 16:58:21 UTC (rev 8892) +++ csw/mgar/pkg/openssh/trunk/checksums 2010-02-28 17:02:05 UTC (rev 8893) @@ -1,11 +1,11 @@ 1d3d6d477c09e59c514e637fa3a2f7a4 CSWossh.checkinstall 0993813fa5c752215f892cb67c86816f CSWossh.preinstall 59bf25f92d3660aa7e65fb6bdc85e72f CSWossh.prototype -cbe3d9921fca3130e42db09914c6ea07 CSWosshclient.prototype +c0782f6ddcddf2ba7e9635a41a3a0166 CSWosshclient.prototype 1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall 0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall 22ffa2a9b7bf310d58d3b299805a41b1 CSWosshlpk.prototype -5323516aa6c7714d03473a0879599fc5 changelog.CSW +2d1343a75521f5db657da9ad5a6d8dca changelog.CSW 9153031524651a18e7edaed4637aa769 contrib-openssh-lpk-5.2p1-0.3.9.patch a5ebb2e3fdaa06c3c9edba55aac5f83b cswopenssh 8e765642349b6321d01b33e95304e113 cswopenssh.xml Modified: csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype 2010-02-28 16:58:21 UTC (rev 8892) +++ csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype 2010-02-28 17:02:05 UTC (rev 8893) @@ -4,6 +4,7 @@ f none /opt/csw/bin/ssh 0755 root bin f none /opt/csw/bin/ssh-add 0755 root bin f none /opt/csw/bin/ssh-agent 0755 root bin +f none /opt/csw/bin/ssh-copy-id 0755 root bin f none /opt/csw/bin/ssh-keygen 0755 root bin f none /opt/csw/bin/ssh-keyscan 0755 root bin d none /opt/csw/etc/ssh 0755 root bin @@ -31,6 +32,7 @@ s none /opt/csw/share/man/man1/slogin.1=./ssh.1 f none /opt/csw/share/man/man1/ssh-add.1 0644 root bin f none /opt/csw/share/man/man1/ssh-agent.1 0644 root bin +f none /opt/csw/share/man/man1/ssh-copy-id.1 0644 root bin f none /opt/csw/share/man/man1/ssh-keygen.1 0644 root bin f none /opt/csw/share/man/man1/ssh-keyscan.1 0644 root bin f none /opt/csw/share/man/man1/ssh.1 0644 root bin Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2010-02-28 16:58:21 UTC (rev 8892) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2010-02-28 17:02:05 UTC (rev 8893) @@ -1,5 +1,11 @@ -openssh (5.3p1,REV=2008.12.16) unstable +openssh (5.3p1,REV=2010.02.28) unstable + * Added ssh-copy-id contrib script (Closes: #4306) + + -- Yann Rouillard Sun, 28 Feb 2010 17:03:52 +0100 + +openssh (5.3p1,REV=2009.12.14) unstable + * Package rebuild to solve an incorrect upload in the repository tree. * Changed package version numbering scheme. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Feb 28 19:45:47 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 28 Feb 2010 18:45:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[8894] csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c. diff Message-ID: Revision: 8894 http://gar.svn.sourceforge.net/gar/?rev=8894&view=rev Author: wbonnet Date: 2010-02-28 18:45:47 +0000 (Sun, 28 Feb 2010) Log Message: ----------- Fix alloca compilation issue Modified Paths: -------------- csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff Modified: csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff =================================================================== --- csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff 2010-02-28 17:02:05 UTC (rev 8893) +++ csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff 2010-02-28 18:45:47 UTC (rev 8894) @@ -1,5 +1,13 @@ --- dbus-1.3.0.orig/dbus/dbus-sysdeps-unix.c 2009-07-16 16:04:55.000000000 +0200 +++ dbus-1.3.0/dbus/dbus-sysdeps-unix.c 2010-02-28 16:49:51.561773000 +0100 +@@ -54,6 +54,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_ERRNO_H + #include @@ -3043,7 +3043,7 @@ return -1; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Feb 28 19:52:31 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 28 Feb 2010 18:52:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[8895] csw/mgar/pkg/dbus/trunk/checksums Message-ID: Revision: 8895 http://gar.svn.sourceforge.net/gar/?rev=8895&view=rev Author: wbonnet Date: 2010-02-28 18:52:26 +0000 (Sun, 28 Feb 2010) Log Message: ----------- Fix checksum Modified Paths: -------------- csw/mgar/pkg/dbus/trunk/checksums Modified: csw/mgar/pkg/dbus/trunk/checksums =================================================================== --- csw/mgar/pkg/dbus/trunk/checksums 2010-02-28 18:45:47 UTC (rev 8894) +++ csw/mgar/pkg/dbus/trunk/checksums 2010-02-28 18:52:26 UTC (rev 8895) @@ -1,4 +1,4 @@ 6e26e51243c4551ac222112edf67b5db CSWdbus.preinstall 9222a44088c837eba62822e330de713f cswdbus b3298d5ce0e4ad4731b1e4e1787d56bb dbus-1.3.0.tar.gz -dafb8ca4f0001dbed5334a9913781942 dbus-sysdeps-unix.c.diff +93b5c6010c99156785f4cbffbd116827 dbus-sysdeps-unix.c.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Feb 28 20:56:50 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 28 Feb 2010 19:56:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8896] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 8896 http://gar.svn.sourceforge.net/gar/?rev=8896&view=rev Author: chninkel Date: 2010-02-28 19:56:50 +0000 (Sun, 28 Feb 2010) Log Message: ----------- openssh: added license file in prototype Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2010-02-28 18:52:26 UTC (rev 8895) +++ csw/mgar/pkg/openssh/trunk/checksums 2010-02-28 19:56:50 UTC (rev 8896) @@ -1,10 +1,10 @@ 1d3d6d477c09e59c514e637fa3a2f7a4 CSWossh.checkinstall 0993813fa5c752215f892cb67c86816f CSWossh.preinstall -59bf25f92d3660aa7e65fb6bdc85e72f CSWossh.prototype -c0782f6ddcddf2ba7e9635a41a3a0166 CSWosshclient.prototype +2d0c92b03003215df91957cb51732bdb CSWossh.prototype +100436e85373a723db3b27c5fd02ee34 CSWosshclient.prototype 1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall 0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall -22ffa2a9b7bf310d58d3b299805a41b1 CSWosshlpk.prototype +8918d3ebf02704b65e11e82f1db10cd5 CSWosshlpk.prototype 2d1343a75521f5db657da9ad5a6d8dca changelog.CSW 9153031524651a18e7edaed4637aa769 contrib-openssh-lpk-5.2p1-0.3.9.patch a5ebb2e3fdaa06c3c9edba55aac5f83b cswopenssh Modified: csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2010-02-28 18:52:26 UTC (rev 8895) +++ csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2010-02-28 19:56:50 UTC (rev 8896) @@ -15,6 +15,7 @@ f none /opt/csw/share/doc/openssh/ChangeLog.gssapi 0644 root bin f none /opt/csw/share/doc/openssh/INSTALL 0644 root bin f none /opt/csw/share/doc/openssh/LICENCE 0644 root bin +f none /opt/csw/share/doc/openssh/license 0644 root bin f none /opt/csw/share/doc/openssh/OVERVIEW 0644 root bin f none /opt/csw/share/doc/openssh/README 0644 root bin f none /opt/csw/share/doc/openssh/README.dns 0644 root bin Modified: csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype 2010-02-28 18:52:26 UTC (rev 8895) +++ csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype 2010-02-28 19:56:50 UTC (rev 8896) @@ -18,6 +18,7 @@ f none /opt/csw/share/doc/openssh_client/ChangeLog.gssapi 0644 root bin f none /opt/csw/share/doc/openssh_client/INSTALL 0644 root bin f none /opt/csw/share/doc/openssh_client/LICENCE 0644 root bin +f none /opt/csw/share/doc/openssh_client/license 0644 root bin f none /opt/csw/share/doc/openssh_client/OVERVIEW 0644 root bin f none /opt/csw/share/doc/openssh_client/README 0644 root bin f none /opt/csw/share/doc/openssh_client/README.dns 0644 root bin Modified: csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype 2010-02-28 18:52:26 UTC (rev 8895) +++ csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype 2010-02-28 19:56:50 UTC (rev 8896) @@ -14,6 +14,7 @@ f none /opt/csw/share/doc/openssh_lpk/ChangeLog.gssapi 0644 root bin f none /opt/csw/share/doc/openssh_lpk/INSTALL 0644 root bin f none /opt/csw/share/doc/openssh_lpk/LICENCE 0644 root bin +f none /opt/csw/share/doc/openssh_lpk/license 0644 root bin f none /opt/csw/share/doc/openssh_lpk/OVERVIEW 0644 root bin f none /opt/csw/share/doc/openssh_lpk/README 0644 root bin f none /opt/csw/share/doc/openssh_lpk/README.dns 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Feb 28 21:44:45 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 28 Feb 2010 20:44:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8897] csw/mgar/pkg/dbus/trunk Message-ID: Revision: 8897 http://gar.svn.sourceforge.net/gar/?rev=8897&view=rev Author: wbonnet Date: 2010-02-28 20:44:45 +0000 (Sun, 28 Feb 2010) Log Message: ----------- Fix patchfile Modified Paths: -------------- csw/mgar/pkg/dbus/trunk/Makefile csw/mgar/pkg/dbus/trunk/checksums csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff Modified: csw/mgar/pkg/dbus/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus/trunk/Makefile 2010-02-28 19:56:50 UTC (rev 8896) +++ csw/mgar/pkg/dbus/trunk/Makefile 2010-02-28 20:44:45 UTC (rev 8897) @@ -34,7 +34,6 @@ # Dependencies tracking RUNTIME_DEP_PKGS_CSWdbus = CSWexpat CSWlibdbus CSWlibsm CSWlibice CSWlibx11 -RUNTIME_DEP_PKGS_CSWlibdbus = CSWexpat CSWlibdbus CSWlibsm CSWlibice CSWlibx11 RUNTIME_DEP_PKGS_CSWlibdbusdev = CSWlibdbus # SMF support Modified: csw/mgar/pkg/dbus/trunk/checksums =================================================================== --- csw/mgar/pkg/dbus/trunk/checksums 2010-02-28 19:56:50 UTC (rev 8896) +++ csw/mgar/pkg/dbus/trunk/checksums 2010-02-28 20:44:45 UTC (rev 8897) @@ -1,4 +1,4 @@ 6e26e51243c4551ac222112edf67b5db CSWdbus.preinstall 9222a44088c837eba62822e330de713f cswdbus b3298d5ce0e4ad4731b1e4e1787d56bb dbus-1.3.0.tar.gz -93b5c6010c99156785f4cbffbd116827 dbus-sysdeps-unix.c.diff +3b5c099d55cca083d873ccf29adac63f dbus-sysdeps-unix.c.diff Modified: csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff =================================================================== --- csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff 2010-02-28 19:56:50 UTC (rev 8896) +++ csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff 2010-02-28 20:44:45 UTC (rev 8897) @@ -1,10 +1,18 @@ --- dbus-1.3.0.orig/dbus/dbus-sysdeps-unix.c 2009-07-16 16:04:55.000000000 +0200 +++ dbus-1.3.0/dbus/dbus-sysdeps-unix.c 2010-02-28 16:49:51.561773000 +0100 -@@ -54,6 +54,7 @@ +@@ -54,6 +54,15 @@ #include #include #include ++#ifndef sun +#include ++#ifndef CMSG_SPACE ++#define CMSG_SPACE(l) ((size_t)_CMSG_HDR_ALIGN(sizeof (struct cmsghdr) + (l))) ++#endif ++#ifndef CMSG_LEN ++#define CMSG_LEN(l) ((size_t)_CMSG_DATA_ALIGN(sizeof (struct cmsghdr)) + (l)) ++#endif ++#endif #ifdef HAVE_ERRNO_H #include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Feb 28 22:10:30 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 28 Feb 2010 21:10:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8898] csw/mgar/pkg/dbus/trunk Message-ID: Revision: 8898 http://gar.svn.sourceforge.net/gar/?rev=8898&view=rev Author: wbonnet Date: 2010-02-28 21:10:30 +0000 (Sun, 28 Feb 2010) Log Message: ----------- Fix patchfile Modified Paths: -------------- csw/mgar/pkg/dbus/trunk/checksums csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff Modified: csw/mgar/pkg/dbus/trunk/checksums =================================================================== --- csw/mgar/pkg/dbus/trunk/checksums 2010-02-28 20:44:45 UTC (rev 8897) +++ csw/mgar/pkg/dbus/trunk/checksums 2010-02-28 21:10:30 UTC (rev 8898) @@ -1,4 +1,4 @@ 6e26e51243c4551ac222112edf67b5db CSWdbus.preinstall 9222a44088c837eba62822e330de713f cswdbus b3298d5ce0e4ad4731b1e4e1787d56bb dbus-1.3.0.tar.gz -3b5c099d55cca083d873ccf29adac63f dbus-sysdeps-unix.c.diff +be9b69b240bb99b4d71d643a77ad10e6 dbus-sysdeps-unix.c.diff Modified: csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff =================================================================== --- csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff 2010-02-28 20:44:45 UTC (rev 8897) +++ csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff 2010-02-28 21:10:30 UTC (rev 8898) @@ -1,18 +1,12 @@ --- dbus-1.3.0.orig/dbus/dbus-sysdeps-unix.c 2009-07-16 16:04:55.000000000 +0200 +++ dbus-1.3.0/dbus/dbus-sysdeps-unix.c 2010-02-28 16:49:51.561773000 +0100 -@@ -54,6 +54,15 @@ +@@ -54,6 +54,9 @@ #include #include #include -+#ifndef sun +#include -+#ifndef CMSG_SPACE +#define CMSG_SPACE(l) ((size_t)_CMSG_HDR_ALIGN(sizeof (struct cmsghdr) + (l))) -+#endif -+#ifndef CMSG_LEN +#define CMSG_LEN(l) ((size_t)_CMSG_DATA_ALIGN(sizeof (struct cmsghdr)) + (l)) -+#endif -+#endif #ifdef HAVE_ERRNO_H #include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Feb 28 22:36:03 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 28 Feb 2010 21:36:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[8899] csw/mgar/pkg/dbus/trunk/Makefile Message-ID: Revision: 8899 http://gar.svn.sourceforge.net/gar/?rev=8899&view=rev Author: wbonnet Date: 2010-02-28 21:36:03 +0000 (Sun, 28 Feb 2010) Log Message: ----------- Fix patchfile Modified Paths: -------------- csw/mgar/pkg/dbus/trunk/Makefile Modified: csw/mgar/pkg/dbus/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus/trunk/Makefile 2010-02-28 21:10:30 UTC (rev 8898) +++ csw/mgar/pkg/dbus/trunk/Makefile 2010-02-28 21:36:03 UTC (rev 8899) @@ -14,16 +14,16 @@ PKGDIST = $(DISTFILE) # Generate description fields -SPKG_DESC_CSWdbus = $(DESCRIPTION) -SPKG_DESC_CSWlibdbus = $(DESCRIPTION) libraries -SPKG_DESC_CSWlibdbusdev = $(DESCRIPTION) development package +SPKG_DESC_CSWdbus = $(DESCRIPTION) +SPKG_DESC_CSWlibdbus = $(DESCRIPTION) libraries +SPKG_DESC_CSWlibdbusdev = $(DESCRIPTION) development package -PACKAGES = CSWdbus CSWlibdbus CSWlibdbusdev -CATALOGNAME_CSWdbus = dbus -CATALOGNAME_CSWlibdbus = libdbus -CATALOGNAME_CSWlibdbusdev = libdbusdev -DISTFILES += CSWdbus.preinstall -DISTFILES += cswdbus +PACKAGES = CSWdbus CSWlibdbus CSWlibdbusdev +CATALOGNAME_CSWdbus = dbus +CATALOGNAME_CSWlibdbus = libdbus +CATALOGNAME_CSWlibdbusdev = libdbusdev +DISTFILES += CSWdbus.preinstall +DISTFILES += cswdbus # Dynamic CSWlibdbusdev prototype PKGFILES_CSWlibdbusdev = $(PKGFILES_DEVEL) @@ -33,7 +33,7 @@ PKGFILES_CSWlibdbus = $(PKGFILES_RT) # Dependencies tracking -RUNTIME_DEP_PKGS_CSWdbus = CSWexpat CSWlibdbus CSWlibsm CSWlibice CSWlibx11 +RUNTIME_DEP_PKGS_CSWdbus = CSWexpat CSWlibdbus CSWlibsm CSWlibice CSWlibx11 CSWcswclassutils RUNTIME_DEP_PKGS_CSWlibdbusdev = CSWlibdbus # SMF support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Feb 28 23:09:11 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 28 Feb 2010 22:09:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8900] csw/mgar/pkg/rlwrap/trunk Message-ID: Revision: 8900 http://gar.svn.sourceforge.net/gar/?rev=8900&view=rev Author: chninkel Date: 2010-02-28 22:09:10 +0000 (Sun, 28 Feb 2010) Log Message: ----------- rlwrap: updated to 0.36 Modified Paths: -------------- csw/mgar/pkg/rlwrap/trunk/Makefile csw/mgar/pkg/rlwrap/trunk/checksums csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW Modified: csw/mgar/pkg/rlwrap/trunk/Makefile =================================================================== --- csw/mgar/pkg/rlwrap/trunk/Makefile 2010-02-28 21:36:03 UTC (rev 8899) +++ csw/mgar/pkg/rlwrap/trunk/Makefile 2010-02-28 22:09:10 UTC (rev 8900) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = rlwrap -GARVERSION = 0.35 +GARVERSION = 0.36 CATEGORIES = utils DESCRIPTION = A readline wrapper Modified: csw/mgar/pkg/rlwrap/trunk/checksums =================================================================== --- csw/mgar/pkg/rlwrap/trunk/checksums 2010-02-28 21:36:03 UTC (rev 8899) +++ csw/mgar/pkg/rlwrap/trunk/checksums 2010-02-28 22:09:10 UTC (rev 8900) @@ -1,2 +1,2 @@ -055ee01142d68026506ec4cd991d65b4 changelog.CSW -d9459defe4dbfb191d9332386141952d rlwrap-0.35.tar.gz +538d73ab962d40b5fe42d94dedde1a17 changelog.CSW +f3d687658336789d5155322abcc84a7f rlwrap-0.36.tar.gz Modified: csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2010-02-28 21:36:03 UTC (rev 8899) +++ csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2010-02-28 22:09:10 UTC (rev 8900) @@ -1,3 +1,9 @@ +rlwrap (0.36,REV=2010.02.28) unstable + + * New upstream release. + + -- Yann Rouillard Sun, 28 Feb 2010 21:10:25 +0100 + rlwrap (0.35,REV=2010.01.09) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.