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 ===================================================================