From wahwah at users.sourceforge.net Sat Dec 1 01:41:20 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 01 Dec 2012 00:41:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[19791] csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py Message-ID: Revision: 19791 http://gar.svn.sourceforge.net/gar/?rev=19791&view=rev Author: wahwah Date: 2012-12-01 00:41:20 +0000 (Sat, 01 Dec 2012) Log Message: ----------- csw-upload-pkg: Unit test fix RestClient uses credentials. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2012-11-30 18:19:53 UTC (rev 19790) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2012-12-01 00:41:20 UTC (rev 19791) @@ -98,7 +98,7 @@ def test_MatchSrv4ToCatalogsSame(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -121,7 +121,7 @@ def test_MatchSrv4ToCatalogsDifferent(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -144,7 +144,7 @@ # uploading a 5.10 package. rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.10', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -164,7 +164,7 @@ def test_MatchSrv4ToCatalogsSameSpecificOsrel(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -185,7 +185,7 @@ def test_MatchSrv4ToCatalogsAbsentFromAll(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(None) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -208,7 +208,7 @@ def test_MatchSrv4ToCatalogsSameSpecificOsrelAlreadyPresent(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -229,7 +229,7 @@ def test_MatchSrv4ToCatalogsNotPresent(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -250,7 +250,7 @@ def test_MatchSrv4ToCatalogsFirstNotPresent(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(None) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -271,7 +271,7 @@ def test_MatchSrv4ToCatalogsSolaris8(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_8) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -340,7 +340,7 @@ } rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) for i, os_n in enumerate(in_catalog, 3 - len(in_catalog)): pkg_struct = pkg_struct_map[os_n] rest_client_mock.Srv4ByCatalogAndCatalogname( 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 Dec 1 01:42:00 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 01 Dec 2012 00:42:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[19792] csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py Message-ID: Revision: 19792 http://gar.svn.sourceforge.net/gar/?rev=19792&view=rev Author: wahwah Date: 2012-12-01 00:41:59 +0000 (Sat, 01 Dec 2012) Log Message: ----------- csw-upload-pkg: Unit test fix after refactoring Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2012-12-01 00:41:20 UTC (rev 19791) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2012-12-01 00:41:59 UTC (rev 19792) @@ -416,7 +416,6 @@ import_metadata_mock = self.mox.StubOutWithMock(su, '_GetFileMd5sum') import_metadata_mock = self.mox.StubOutWithMock(su, '_ImportMetadata') import_metadata_mock = self.mox.StubOutWithMock(su, '_InsertIntoCatalog') - import_metadata_mock = self.mox.StubOutWithMock(su, '_RemoveFromCatalog') import_metadata_mock = self.mox.StubOutWithMock(su, '_PostFile') import_metadata_mock = self.mox.StubOutWithMock(su, '_GetSrv4FileMetadata') import_metadata_mock = self.mox.StubOutWithMock(su, '_MatchSrv4ToCatalogs') 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 Dec 1 01:42:17 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 01 Dec 2012 00:42:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[19793] csw/mgar/gar/v2/lib/python/system_pkgmap_test.py Message-ID: Revision: 19793 http://gar.svn.sourceforge.net/gar/?rev=19793&view=rev Author: wahwah Date: 2012-12-01 00:42:16 +0000 (Sat, 01 Dec 2012) Log Message: ----------- system_pkgmap_test: Fix for a unit test Modified Paths: -------------- csw/mgar/gar/v2/lib/python/system_pkgmap_test.py Modified: csw/mgar/gar/v2/lib/python/system_pkgmap_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/system_pkgmap_test.py 2012-12-01 00:41:59 UTC (rev 19792) +++ csw/mgar/gar/v2/lib/python/system_pkgmap_test.py 2012-12-01 00:42:16 UTC (rev 19793) @@ -1,6 +1,6 @@ #!/usr/bin/env python2.6 -import unittest +import unittest2 as unittest import system_pkgmap import test_base import models @@ -45,6 +45,10 @@ class IndexerUnitTest(unittest.TestCase): + def setUp(self): + super(IndexerUnitTest, self).setUp() + self.maxDiff = None + def test_ParseSrv4PkginfoLine(self): spi = system_pkgmap.Indexer() expected = ('SUNWwpau', 'Wireless WPA Supplicant, (Usr)') @@ -274,8 +278,8 @@ 'path': '/bin', 'pkgnames': ['SUNWsystem-core-os'], 'target': './usr/bin', 'type': 's'}, {'group': 'sys', 'line': 'dev\tdir\tsystem/core-os\t\t0755\troot\tsys', 'mode': '0755', 'owner': 'root', 'path': '/dev', 'pkgnames': ['SUNWsystem-core-os'], 'target': None, 'type': 'd'}], - 'pkginfo': {'SUNWbin': u'link system/core-os ./usr/bin', - 'SUNWdev': u'dir system/core-os 0755 root sys', + 'pkginfo': {'SUNWdeveloper-solarisstudio-122-c': u'C++ Compilers', + 'SUNWdeveloper-versioning-sccs': u'Source Code Control System', 'SUNWpcan': u'Cisco-Aironet 802.11b driver', 'SUNWwpau': u'Wireless WPA Supplicant, (Usr)'} } 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 Dec 1 01:42:34 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 01 Dec 2012 00:42:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[19794] csw/mgar/gar/v2/lib/python/inspective_package_test. py Message-ID: Revision: 19794 http://gar.svn.sourceforge.net/gar/?rev=19794&view=rev Author: wahwah Date: 2012-12-01 00:42:34 +0000 (Sat, 01 Dec 2012) Log Message: ----------- inspective_package_test: unit test fix Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package_test.py Modified: csw/mgar/gar/v2/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package_test.py 2012-12-01 00:42:16 UTC (rev 19793) +++ csw/mgar/gar/v2/lib/python/inspective_package_test.py 2012-12-01 00:42:34 UTC (rev 19794) @@ -1,6 +1,6 @@ #!/usr/bin/env python2.6 -import unittest +import unittest2 as unittest import inspective_package import mox import hachoir_parser @@ -66,7 +66,7 @@ ip.pkginfo_dict = { "BASEDIR": "", } - self.assertEqual([u'/fake/path/CSWfoo/root/foo-file'], ip.ListBinaries()) + self.assertEqual([u'foo-file'], ip.ListBinaries()) class PackageStatsUnitTest(unittest.TestCase): 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 Dec 1 09:53:56 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 01 Dec 2012 08:53:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[19795] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 19795 http://gar.svn.sourceforge.net/gar/?rev=19795&view=rev Author: bdwalton Date: 2012-12-01 08:53:56 +0000 (Sat, 01 Dec 2012) Log Message: ----------- php5/trunk: update the postgresql build dep to target the -dev package Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-12-01 00:42:34 UTC (rev 19794) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-12-01 08:53:56 UTC (rev 19795) @@ -56,7 +56,7 @@ BUILD_DEP_PKGS += CSWopenldap-dev CSWlibkrb5-dev CSWsasl CSWlibltdl7 BUILD_DEP_PKGS += CSWmcrypt-dev CSWfreetds CSWmysql-dev CSWunixodbc BUILD_DEP_PKGS += CSWlibreadline-dev CSWlibncurses-dev CSWnetsnmp-dev -BUILD_DEP_PKGS += CSWlibsqlite3-dev CSWaspell CSWtidy-dev CSWpostgresql +BUILD_DEP_PKGS += CSWlibsqlite3-dev CSWaspell CSWtidy-dev CSWpostgresql-dev BUILD_DEP_PKGS += CSWlibfreetype-dev BUILD_DEP_PKGS += CSWlibxpm-dev BUILD_DEP_PKGS += CSWlibsqlite3-0 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 Dec 1 10:01:23 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 01 Dec 2012 09:01:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19796] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 19796 http://gar.svn.sourceforge.net/gar/?rev=19796&view=rev Author: bdwalton Date: 2012-12-01 09:01:22 +0000 (Sat, 01 Dec 2012) Log Message: ----------- php5/trunk: drop the now-useless CATEGORY setting Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-12-01 08:53:56 UTC (rev 19795) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-12-01 09:01:22 UTC (rev 19796) @@ -1,6 +1,5 @@ NAME = php5 VERSION = 5.3.18 -CATEGORIES = lang GARTYPE = v2 SF_PROJECT = $(shell echo $(NAME) | sed -e 's/[0-9]//g') DISTNAME = $(SF_PROJECT)-$(VERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Dec 1 11:13:46 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sat, 01 Dec 2012 10:13:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[19797] csw/mgar/pkg/dovecot/trunk Message-ID: Revision: 19797 http://gar.svn.sourceforge.net/gar/?rev=19797&view=rev Author: wilbury Date: 2012-12-01 10:13:43 +0000 (Sat, 01 Dec 2012) Log Message: ----------- dovecot/trunk: Version bump Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/checksums Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2012-12-01 09:01:22 UTC (rev 19796) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2012-12-01 10:13:43 UTC (rev 19797) @@ -2,7 +2,7 @@ # - SSL certs to /etc/opt/csw/ssl? # - /var/run/dovecot instead of /var/opt/csw/run? NAME = dovecot -VERSION = 2.1.11 +VERSION = 2.1.12 GARTYPE = v2 DESCRIPTION = Secure IMAP server Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2012-12-01 09:01:22 UTC (rev 19796) +++ csw/mgar/pkg/dovecot/trunk/checksums 2012-12-01 10:13:43 UTC (rev 19797) @@ -1 +1 @@ -28443208243171423437daaf89db7e18 dovecot-2.1.11.tar.gz +b575dfb5db954132f41e7c390e7e11ff dovecot-2.1.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Dec 1 17:04:46 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 01 Dec 2012 16:04:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[19798] csw/mgar/gar/v2-yann/lib/python/inspective_package. py Message-ID: Revision: 19798 http://gar.svn.sourceforge.net/gar/?rev=19798&view=rev Author: chninkel Date: 2012-12-01 16:04:46 +0000 (Sat, 01 Dec 2012) Log Message: ----------- gar/v2-yann: handle unsorted version needed section Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/inspective_package.py Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-12-01 10:13:43 UTC (rev 19797) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-12-01 16:04:46 UTC (rev 19798) @@ -287,6 +287,7 @@ else: binary_info[cur_section].append(elf_info) + # elfdump doesn't repeat the name of the soname in the version section # if it's the same on two contiguous line, so we have to make sure # the information is present in each entry @@ -294,11 +295,19 @@ if not version['soname']: version['soname'] = binary_info['version needed'][i]['soname'] + # soname version needed are usually displayed sorted by index ... + # but that's not always the case :( so we have to reorder + # the list by index + binary_info['version needed'].sort(key = lambda m: m['index']) + for version in binary_info['version needed']: + del version['index'] + # if it exists, the first "version definition" entry is the base soname # we don't need this information if binary_info['version definition']: binary_info['version definition'].pop(0) + binary_info['symbol table'] = symbols.values() binary_info['symbol table'].sort(key=lambda m: m['symbol']) # To not rely of the section order output of elfdump, we resolve @@ -386,8 +395,8 @@ (?P
Version\sNeeded|Symbol\sTable # Section header |Version\sDefinition|Syminfo) \sSection: - \s+(?:\.SUNW_version|\.dynsym - |\.SUNW_syminfo|.symtab)\s*$ + \s+(?:\.SUNW_version|\.gnu\.version_[rd] + |\.dynsym|\.SUNW_syminfo|.symtab)\s*$ |\s*(?:index\s+)?version\s+dependency\s*$ # Version needed header @@ -411,7 +420,7 @@ (?:\s+\[\s(?:BASE)\s\])?\s*$ """), 'version needed': (r""" - \s*(?:\[\d+\]\s+)? # index: might be not present if + \s*(?:\[(?P\d+)\]\s+)? # index: might be not present if # no version binding is enabled (?:(?P\S+)\s+ # file: can be absent if the same as (?!\[\s(?:INFO|WEAK)\s\]))? # the previous line, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Dec 1 17:05:48 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 01 Dec 2012 16:05:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[19799] csw/mgar/gar/v2-yann/lib/python/package_stats.py Message-ID: Revision: 19799 http://gar.svn.sourceforge.net/gar/?rev=19799&view=rev Author: chninkel Date: 2012-12-01 16:05:47 +0000 (Sat, 01 Dec 2012) Log Message: ----------- gar/v2-yann: temporary workaround for unicode problem Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/package_stats.py Modified: csw/mgar/gar/v2-yann/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/package_stats.py 2012-12-01 16:04:46 UTC (rev 19798) +++ csw/mgar/gar/v2-yann/lib/python/package_stats.py 2012-12-01 16:05:47 UTC (rev 19799) @@ -381,7 +381,12 @@ line_u = pkgmap_entry["line"].decode("latin1") f_path, basename = os.path.split( pkgmap_entry["path"].decode('latin1')) + except UnicodeEncodeError, e: + # the line was already in unicode + line_u = pkgmap_entry['line'] + f_path, basename = os.path.split(pkgmap_entry["path"]) # If this fails too, code change will be needed. + f = m.CswFile( basename=basename, path=f_path, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Dec 1 22:08:52 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 01 Dec 2012 21:08:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[19800] csw/mgar/gar/v2/bin/cswproto Message-ID: Revision: 19800 http://gar.svn.sourceforge.net/gar/?rev=19800&view=rev Author: dmichelsen Date: 2012-12-01 21:08:52 +0000 (Sat, 01 Dec 2012) Log Message: ----------- mGAR v2: Speed up cswproto Modified Paths: -------------- csw/mgar/gar/v2/bin/cswproto Modified: csw/mgar/gar/v2/bin/cswproto =================================================================== --- csw/mgar/gar/v2/bin/cswproto 2012-12-01 16:05:47 UTC (rev 19799) +++ csw/mgar/gar/v2/bin/cswproto 2012-12-01 21:08:52 UTC (rev 19800) @@ -20,7 +20,7 @@ use POSIX; use vars qw/ - @XFORMS @Common $StdOwn $StdGrp $StdDirPerm $common $stamp $root + @XFORMS $Common $StdOwn $StdGrp $StdDirPerm $common $stamp $root /; # atime=8,mtime=9,ctime=10 @@ -69,9 +69,7 @@ # Check whether a path is a 'common' file, defined in __DATA__ sub is_common { my $path = shift; - foreach my $pat (@Common) { - return 1 if $path =~ m!^$pat$!; - } + return 1 if $path =~ /$Common/; return 0; } @@ -108,7 +106,7 @@ if( $common ) { # Load common path contents - my %alldirs; + my %alldirs = ('/' => 1); open F, $common || die "Couldn't open $common"; while () { chomp; next if /^\s*$/ or /^#/; @@ -119,7 +117,8 @@ $alldirs{$_} = 1 foreach (@pc); } close F; - @Common = map { qr#$_$# } ('/', keys %alldirs); + my $re = '^(' . join( '|', keys %alldirs ) . ')$'; + $Common = qr /$re/; } my @prototype; @@ -160,7 +159,7 @@ next unless $F[2]; # Then process any excludes - next SPECLINE if( is_common( $F[2] ) ); + next SPECLINE if( $F[2] =~ /$Common/ ); next if exclude($realpath); # Fix up dir permissions/file ownership. 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 Dec 2 14:43:06 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 02 Dec 2012 13:43:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[19801] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers Message-ID: Revision: 19801 http://gar.svn.sourceforge.net/gar/?rev=19801&view=rev Author: wahwah Date: 2012-12-02 13:43:05 +0000 (Sun, 02 Dec 2012) Log Message: ----------- opencsw-manual: About package naming In response to: http://lists.opencsw.org/pipermail/maintainers/2012-December/017401.html Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst Added Paths: ----------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/package-naming.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst 2012-12-01 21:08:52 UTC (rev 19800) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst 2012-12-02 13:43:05 UTC (rev 19801) @@ -11,3 +11,4 @@ filesystem-layout building-a-catalog shared-libraries + package-naming Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/package-naming.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/package-naming.rst (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/package-naming.rst 2012-12-02 13:43:05 UTC (rev 19801) @@ -0,0 +1,47 @@ +-------------- +Package naming +-------------- + +.. highlight:: text + +We are paying attention to package naming, so we can maintain consistency across +the catalog. For example, we have special rules about how to name packages with +shared libraries, or development packages. In general, we often find ourselves +following Debian, so if you're in doubt, consulting the Debian package +repository is a good idea. + +pkgname vs catalogname +---------------------- + +pkgname is also known as pkginst. It's a name of a package in the Solaris +packaging system. These package names start with the company ticker (e.g. +SUNW). OpenCSW package start with ?CSW?. + +Catalognames on the other hand, are names used in the catalog index. This means +that one package has two names, for example ?CSWfoo? (pkgname) and ?foo? +(catalogname). + +Applications and named projects +------------------------------- + +Use the project name, keep it short and simple. If the name consists of many +words, separate words. Use dashes to separate words in the pkgname (CSWfoo-bar) +and underscores in the catalogname (foo_bar). + +Shared libraries +---------------- + +Shared libraries follow a special naming convention. In short, if you're +packaging libfoo.so.1, there should be a package containing just that library, +and the package should be named CSWlibfoo1. See the shared libraries article for +more information. + +Development packages +-------------------- + +Software name plus the ?-dev? suffix. For example: CSWfoo-dev and foo_dev. + +Perl, Python, Ruby +------------------ + +Prepend packages with pm\_, py\_ and rb\_, respectively. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Dec 2 21:19:08 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 02 Dec 2012 20:19:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[19802] csw/mgar/gar/v2-yann/lib/python/inspective_package. py Message-ID: Revision: 19802 http://gar.svn.sourceforge.net/gar/?rev=19802&view=rev Author: chninkel Date: 2012-12-02 20:19:08 +0000 (Sun, 02 Dec 2012) Log Message: ----------- gar/v2-yann: handles more error cases Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/inspective_package.py Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-12-02 13:43:05 UTC (rev 19801) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-12-02 20:19:08 UTC (rev 19802) @@ -263,8 +263,26 @@ args = [common_constants.ELFDUMP_BIN, "-svy", binary_abspath] retcode, stdout, stderr = ShellCommand(args) if retcode or stderr: - logging.error("%s returned one or more errors: %s", args, stderr) - continue + # we ignore for now these elfdump errors which can be catched + # later by check functions, + ignored_error_re = re.compile(r"""[^:]+:\s\.((SUNW_l)?dynsym|symtab):\s + (index\[\d+\]:\s + (suspicious\s(local|global)\ssymbol\sentry:\s[^:]+:\s + lies\swithin\s(local|global)\ssymbol\srange\s\(index\s[<>=]+\s\d+\) + + |bad\ssymbol\sentry:\s[^:]+:\ssection\[\d+\]\ssize:\s0(x[0-9a-f]+)?:\s + symbol\s\(address\s0x[0-9a-f]+,\ssize\s0x[0-9a-f]+\) + \slies\soutside\sof\scontaining\ssection + + |bad\ssymbol\sentry:\s:\sinvalid\sshndx:\s\d+) + + |invalid\ssh_link:\s0)\n""", + re.VERBOSE) + + stderr = re.sub(ignored_error_re, "", stderr) + if stderr: + logging.error("%s returned one or more errors: %s", args, stderr) + continue elfdump_out = stdout.splitlines() symbols = {} @@ -289,8 +307,10 @@ # elfdump doesn't repeat the name of the soname in the version section - # if it's the same on two contiguous line, so we have to make sure - # the information is present in each entry + # if it's the same on two contiguous line, e.g.: + # libc.so.1 SUNW_1.1 + # SUNWprivate_1.1 + # so we have to make sure the information is present in each entry for i, version in enumerate(binary_info['version needed'][1:]): if not version['soname']: version['soname'] = binary_info['version needed'][i]['soname'] @@ -417,7 +437,7 @@ # no version binding is enabled (?P\S+) # version (?:\s+(?P\S+))? # dependency - (?:\s+\[\s(?:BASE)\s\])?\s*$ + (?:\s+\[\s(?:BASE|WEAK)\s\])?\s*$ """), 'version needed': (r""" \s*(?:\[(?P\d+)\]\s+)? # index: might be not present if @@ -492,12 +512,16 @@ move_offset_error = (r'^\tmove (?P\d+) offset invalid: \(unknown\): ' r'offset=(?P0x[0-9a-f]+) lies outside memory image; ' r'move discarded') + relocation_error = (r'relocation R_386_COPY sizes differ: (?P.*)' + r'|\t\t\(file .* size=0(?:x[0-9a-f]+)?; file .* size=0x(?:[0-9a-f]+)?\)' + r'|\t.* size used; possible data truncation') blank_line = (r'^\s*$') - common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s)" + common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s)" % (found_re, symbol_not_found_re, only_so, version_so, stv_protected, sizes_differ, sizes_info, sizes_one_used, unreferenced_object, unused_object, - unused_search_path, blank_line, move_offset_error)) + unused_search_path, blank_line, move_offset_error, + relocation_error)) m = re.match(common_re, line) response = None if m: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Dec 3 09:50:55 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 03 Dec 2012 08:50:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[19803] csw/mgar/pkg/davical/trunk/Makefile Message-ID: Revision: 19803 http://gar.svn.sourceforge.net/gar/?rev=19803&view=rev Author: cgrzemba Date: 2012-12-03 08:50:54 +0000 (Mon, 03 Dec 2012) Log Message: ----------- davical/trunk: add checkpkg override Modified Paths: -------------- csw/mgar/pkg/davical/trunk/Makefile Modified: csw/mgar/pkg/davical/trunk/Makefile =================================================================== --- csw/mgar/pkg/davical/trunk/Makefile 2012-12-02 20:19:08 UTC (rev 19802) +++ csw/mgar/pkg/davical/trunk/Makefile 2012-12-03 08:50:54 UTC (rev 19803) @@ -52,6 +52,7 @@ CHECKPKG_OVERRIDES_CSWdavical += surplus-dependency|CSWpostgresql84 CHECKPKG_OVERRIDES_CSWdavical += surplus-dependency|CSWpm-dbd-pg CHECKPKG_OVERRIDES_CSWdavical += surplus-dependency|CSWpm-yaml +CHECKPKG_OVERRIDES_CSWdavical += unidentified-dependency|CSWphp5-awl CHECKPKG_OVERRIDES_CSWdavical += surplus-dependency|CSWphp5-awl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Dec 3 14:44:54 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 03 Dec 2012 13:44:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[19804] csw/mgar/pkg/auctex/trunk Message-ID: Revision: 19804 http://gar.svn.sourceforge.net/gar/?rev=19804&view=rev Author: pfelecan Date: 2012-12-03 13:44:53 +0000 (Mon, 03 Dec 2012) Log Message: ----------- new upstream release Modified Paths: -------------- csw/mgar/pkg/auctex/trunk/Makefile csw/mgar/pkg/auctex/trunk/checksums Modified: csw/mgar/pkg/auctex/trunk/Makefile =================================================================== --- csw/mgar/pkg/auctex/trunk/Makefile 2012-12-03 08:50:54 UTC (rev 19803) +++ csw/mgar/pkg/auctex/trunk/Makefile 2012-12-03 13:44:53 UTC (rev 19804) @@ -1,7 +1,7 @@ # $Id$ # NAME = auctex -VERSION = 11.86 +VERSION = 11.87 GARTYPE = v2 DESCRIPTION = A much enhanced TeX/LaTeX mode for Emacs Modified: csw/mgar/pkg/auctex/trunk/checksums =================================================================== --- csw/mgar/pkg/auctex/trunk/checksums 2012-12-03 08:50:54 UTC (rev 19803) +++ csw/mgar/pkg/auctex/trunk/checksums 2012-12-03 13:44:53 UTC (rev 19804) @@ -1 +1 @@ -6bc33a67b6ac59db1aa238f3693b36d2 auctex-11.86.tar.gz +a594682c60f1d895b3600a728672459d auctex-11.87.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 3 16:20:39 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 03 Dec 2012 15:20:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[19805] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 19805 http://gar.svn.sourceforge.net/gar/?rev=19805&view=rev Author: wahwah Date: 2012-12-03 15:20:39 +0000 (Mon, 03 Dec 2012) Log Message: ----------- gcc4/trunk: removing CATEGORIES Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-03 13:44:53 UTC (rev 19804) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-03 15:20:39 UTC (rev 19805) @@ -2,7 +2,6 @@ NAME = gcc VERSION = 4.7.2 -CATEGORIES = lang GARTYPE = v2 BASE_VERSION = $(shell echo $(VERSION) | gsed -e 's/^\([0-9]\+\.[0-9]\+\)\(.*\)/\1/') PKG_VERSION_TOKEN = gcc4 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 Dec 3 17:13:23 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 03 Dec 2012 16:13:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19806] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 19806 http://gar.svn.sourceforge.net/gar/?rev=19806&view=rev Author: wahwah Date: 2012-12-03 16:13:22 +0000 (Mon, 03 Dec 2012) Log Message: ----------- gcc4/trunk: set the linker map to U8 Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-03 15:20:39 UTC (rev 19805) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-03 16:13:22 UTC (rev 19806) @@ -515,6 +515,9 @@ # CHECKPKG_OVERRIDES_CSWlibssp0 += binary-architecture-does-not-match-placement # CHECKPKG_OVERRIDES_CSWlibstdc++6 += binary-architecture-does-not-match-placement +# Otherwise it won't run on older Solaris 10 releases. +LINKER_MAP_RELEASE=solaris10u8 + include files/scripts.mk include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Dec 4 08:27:39 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 04 Dec 2012 07:27:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[19807] csw/mgar/pkg/gdb/trunk Message-ID: Revision: 19807 http://gar.svn.sourceforge.net/gar/?rev=19807&view=rev Author: pfelecan Date: 2012-12-04 07:27:39 +0000 (Tue, 04 Dec 2012) Log Message: ----------- new upstream release Modified Paths: -------------- csw/mgar/pkg/gdb/trunk/Makefile csw/mgar/pkg/gdb/trunk/checksums Modified: csw/mgar/pkg/gdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdb/trunk/Makefile 2012-12-03 16:13:22 UTC (rev 19806) +++ csw/mgar/pkg/gdb/trunk/Makefile 2012-12-04 07:27:39 UTC (rev 19807) @@ -1,7 +1,7 @@ # $Id$ NAME = gdb -VERSION = 7.5 +VERSION = 7.5.1 GARTYPE = v2 DESCRIPTION = The GNU Debugger Modified: csw/mgar/pkg/gdb/trunk/checksums =================================================================== --- csw/mgar/pkg/gdb/trunk/checksums 2012-12-03 16:13:22 UTC (rev 19806) +++ csw/mgar/pkg/gdb/trunk/checksums 2012-12-04 07:27:39 UTC (rev 19807) @@ -1 +1 @@ -c9f5ed81008194f8f667f131234f3ef0 gdb-7.5.tar.gz +b1519bf899890d21d4774845a6e602fe gdb-7.5.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Dec 4 10:28:45 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 04 Dec 2012 09:28:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[19808] csw/mgar/pkg/binutils/trunk Message-ID: Revision: 19808 http://gar.svn.sourceforge.net/gar/?rev=19808&view=rev Author: janholzh Date: 2012-12-04 09:28:44 +0000 (Tue, 04 Dec 2012) Log Message: ----------- binutils/trunk: update to 2.23.1 and build on Soalris10 Modified Paths: -------------- csw/mgar/pkg/binutils/trunk/Makefile csw/mgar/pkg/binutils/trunk/checksums Modified: csw/mgar/pkg/binutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/binutils/trunk/Makefile 2012-12-04 07:27:39 UTC (rev 19807) +++ csw/mgar/pkg/binutils/trunk/Makefile 2012-12-04 09:28:44 UTC (rev 19808) @@ -1,5 +1,5 @@ NAME = binutils -VERSION = 2.22 +VERSION = 2.23.1 GARTYPE = v2 DESCRIPTION = GNU binary utilities: gas, gld, gprof, and others @@ -28,7 +28,7 @@ # Do not run tests until this is fixed: # -SKIPTEST ?= 1 +#SKIPTEST ?= 1 GARCOMPILER = GNU @@ -36,5 +36,9 @@ RUNTIME_DEP_PKGS_CSWbinutils += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbinutils += CSWlibz1 CHECKPKG_OVERRIDES_CSWbinutils += file-with-bad-content +#Until removed from GDB: +CHECKPKG_OVERRIDES_CSWbinutils += file-collision|/opt/csw/share/locale/uk/LC_MESSAGES/bfd.mo|CSWbinutils|CSWgdb +CHECKPKG_OVERRIDES_CSWbinutils += file-collision|/opt/csw/share/locale/it/LC_MESSAGES/opcodes.mo|CSWbinutils|CSWgdb + include gar/category.mk Modified: csw/mgar/pkg/binutils/trunk/checksums =================================================================== --- csw/mgar/pkg/binutils/trunk/checksums 2012-12-04 07:27:39 UTC (rev 19807) +++ csw/mgar/pkg/binutils/trunk/checksums 2012-12-04 09:28:44 UTC (rev 19808) @@ -1 +1 @@ -ee0f10756c84979622b992a4a61ea3f5 binutils-2.22.tar.bz2 +33adb18c3048d057ac58d07a3f1adb38 binutils-2.23.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Dec 4 11:30:28 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 04 Dec 2012 10:30:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[19809] csw/mgar/pkg/binutils/trunk/Makefile Message-ID: Revision: 19809 http://gar.svn.sourceforge.net/gar/?rev=19809&view=rev Author: janholzh Date: 2012-12-04 10:30:28 +0000 (Tue, 04 Dec 2012) Log Message: ----------- binutils/trunk: add ggrep to fix some scripts Modified Paths: -------------- csw/mgar/pkg/binutils/trunk/Makefile Modified: csw/mgar/pkg/binutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/binutils/trunk/Makefile 2012-12-04 09:28:44 UTC (rev 19808) +++ csw/mgar/pkg/binutils/trunk/Makefile 2012-12-04 10:30:28 UTC (rev 19809) @@ -28,7 +28,7 @@ # Do not run tests until this is fixed: # -#SKIPTEST ?= 1 +SKIPTEST ?= 1 GARCOMPILER = GNU @@ -42,3 +42,5 @@ include gar/category.mk +# We need GNU grep +PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Dec 4 11:38:30 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 04 Dec 2012 10:38:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[19810] csw/mgar/pkg/gdb/trunk/Makefile Message-ID: Revision: 19810 http://gar.svn.sourceforge.net/gar/?rev=19810&view=rev Author: pfelecan Date: 2012-12-04 10:38:29 +0000 (Tue, 04 Dec 2012) Log Message: ----------- exclude files conflicting with binutils package Modified Paths: -------------- csw/mgar/pkg/gdb/trunk/Makefile Modified: csw/mgar/pkg/gdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdb/trunk/Makefile 2012-12-04 10:30:28 UTC (rev 19809) +++ csw/mgar/pkg/gdb/trunk/Makefile 2012-12-04 10:38:29 UTC (rev 19810) @@ -116,6 +116,7 @@ EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/ga/LC_MESSAGES/opcodes.mo EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/id/LC_MESSAGES/bfd.mo EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/id/LC_MESSAGES/opcodes.mo +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/it/LC_MESSAGES/opcodes.mo EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/ja/LC_MESSAGES/bfd.mo EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/ja/LC_MESSAGES/opcodes.mo EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/nl/LC_MESSAGES/bfd.mo @@ -131,6 +132,7 @@ EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/sv/LC_MESSAGES/bfd.mo EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/sv/LC_MESSAGES/opcodes.mo EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/tr/LC_MESSAGES/bfd.mo +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/uk/LC_MESSAGES/bfd.mo EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/tr/LC_MESSAGES/opcodes.mo EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/vi/LC_MESSAGES/bfd.mo EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/vi/LC_MESSAGES/opcodes.mo 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 Dec 4 17:01:06 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Dec 2012 16:01:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[19811] csw/mgar/gar/v2/bin/pathfilter Message-ID: Revision: 19811 http://gar.svn.sourceforge.net/gar/?rev=19811&view=rev Author: dmichelsen Date: 2012-12-04 16:01:05 +0000 (Tue, 04 Dec 2012) Log Message: ----------- mGAR v2: Fix error when no selector is given Modified Paths: -------------- csw/mgar/gar/v2/bin/pathfilter Modified: csw/mgar/gar/v2/bin/pathfilter =================================================================== --- csw/mgar/gar/v2/bin/pathfilter 2012-12-04 10:38:29 UTC (rev 19810) +++ csw/mgar/gar/v2/bin/pathfilter 2012-12-04 16:01:05 UTC (rev 19811) @@ -14,6 +14,7 @@ # excluded also. use strict; +use Carp; use Getopt::Long qw(:config no_ignore_case); use Pod::Usage; @@ -53,8 +54,11 @@ push @seltemp, $re; } -my $mre = '^(' . join( '|', @seltemp ) . ')$'; -push @selection, [ $mode, qr/$mre/ ]; +# If @selection_args is empty the @selection must also be empty +if( defined $mode ) { + my $mre = '^(' . join( '|', @seltemp ) . ')$'; + push @selection, [ $mode, qr/$mre/ ]; +} pod2usage(-verbose => 2) if $help; 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 Dec 4 17:19:05 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Dec 2012 16:19:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[19812] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 19812 http://gar.svn.sourceforge.net/gar/?rev=19812&view=rev Author: dmichelsen Date: 2012-12-04 16:19:05 +0000 (Tue, 04 Dec 2012) Log Message: ----------- nginx/trunk: Courtesy to 1.2.5, enable additional modules 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 2012-12-04 16:01:05 UTC (rev 19811) +++ csw/mgar/pkg/nginx/trunk/Makefile 2012-12-04 16:19:05 UTC (rev 19812) @@ -1,5 +1,5 @@ NAME = nginx -VERSION = 1.1.8 +VERSION = 1.2.5 GARTYPE = v2 GARCOMPILER = SOS11 @@ -19,11 +19,19 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz -BUILD_DEP_PKGS = CSWlibz-dev -RUNTIME_DEP_PKGS = CSWosslrt CSWlibpcre0 CSWlibz1 CSWperl +BUILD_DEP_PKGS += CSWlibz-dev -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGES += CSWnginx +SPKG_DESC_CSWnginx = HTTP server and mail proxy server +RUNTIME_DEP_PKGS_CSWnginx += CSWlibexslt0 +RUNTIME_DEP_PKGS_CSWnginx += CSWlibgeoip1 +RUNTIME_DEP_PKGS_CSWnginx += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWnginx += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWnginx += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWnginx += CSWlibgd2 +RUNTIME_DEP_PKGS_CSWnginx += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWnginx += CSWlibz1 +RUNTIME_DEP_PKGS_CSWnginx += CSWperl # default sparc arch is set to sparcv8plus because nginx contains # assembler parts specific to v8plus and v9 arches: @@ -35,12 +43,15 @@ # casxa [%o2] 0x80, %o1, %o0 # .end -ISAEXEC = 1 -ISA_DEFAULT_sparc = sparcv8plus -EXTRA_BUILD_ISAS_i386 = amd64 -EXTRA_BUILD_ISAS_sparc = sparcv9 +# These are the default now -NGINXCPU_i386 = pentium3 +#ISA_DEFAULT_sparc = sparcv8plus +#EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 +#EXTRA_BUILD_ISAS_sparc = sparcv9 + +ISAEXEC = 1 + +NGINXCPU_i386 = pentium NGINXCPU_pentium_pro = pentium3 NGINXCPU_sparcv8plus = sparc32 NGINXCPU_sparcv9 = sparc64 @@ -49,9 +60,6 @@ CFLAGS = -sysconfdir=/etc/opt/csw -localstatedir=/var/opt/csw - #CONFIGURE_ARGS += --with-debug CONFIGURE_ARGS += --with-cpu-opt=$(NGINXCPU) CONFIGURE_ARGS += --with-cc-opt="-I$(includedir) -I$(includedir)/openssl" @@ -72,15 +80,34 @@ CONFIGURE_ARGS += --with-http_addition_module CONFIGURE_ARGS += --with-http_dav_module CONFIGURE_ARGS += --with-http_flv_module +CONFIGURE_ARGS += --with-http_mp4_module CONFIGURE_ARGS += --with-http_realip_module CONFIGURE_ARGS += --with-http_secure_link_module CONFIGURE_ARGS += --with-http_ssl_module CONFIGURE_ARGS += --with-http_stub_status_module +CONFIGURE_ARGS += --with-http_gzip_static_module +CONFIGURE_ARGS += --with-http_geoip_module +CONFIGURE_ARGS += --with-http_xslt_module +CONFIGURE_ARGS += --with-http_image_filter_module +CONFIGURE_ARGS += --with-http_sub_module +CONFIGURE_ARGS += --with-http_random_index_module +CONFIGURE_ARGS += --with-http_secure_link_module +CONFIGURE_ARGS += --with-http_degradation_module +CONFIGURE_ARGS += --with-http_stub_status_module +# Enable when we have 64 bit perl +# CONFIGURE_ARGS += --with-http_perl_module TEST_SCRIPTS = INITSMF = $(sysconfdir)/init.d/cswnginx -PRESERVECONF = $(sysconfdir)/nginx/fastcgi.conf $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf $(sysconfdir)/nginx/scgi_params $(sysconfdir)/nginx/uwsgi_params $(localstatedir)/nginx/html/50x.html $(localstatedir)/nginx/html/index.html +PRESERVECONF += $(sysconfdir)/nginx/fastcgi.conf +PRESERVECONF += $(sysconfdir)/nginx/fastcgi_params +PRESERVECONF += $(sysconfdir)/nginx/mime.types +PRESERVECONF += $(sysconfdir)/nginx/nginx.conf +PRESERVECONF += $(sysconfdir)/nginx/scgi_params +PRESERVECONF += $(sysconfdir)/nginx/uwsgi_params +PRESERVECONF += $(localstatedir)/nginx/html/50x.html +PRESERVECONF += $(localstatedir)/nginx/html/index.html NGINXDOCS = CHANGES CHANGES.ru LICENSE README @@ -90,7 +117,7 @@ post-configure-modulated: gsed -i s#/...ISALIST#/'$$ISALIST'# $(WORKSRC)/objs/ngx_auto_config.h gsed -i 's# pause# rep; nop#' $(WORKSRC)/src/os/unix/ngx_sunpro_amd64.il - $(MAKECOOKIE) + @$(MAKECOOKIE) post-install-modulated: ginstall -d $(DESTDIR)$(sysconfdir)/init.d @@ -109,4 +136,4 @@ cp -r contrib/* $(DESTDIR)$(sharedstatedir)/nginx/contrib; \ cp $(NGINXDOCS) $(DESTDIR)$(docdir)/nginx rm -rf $(DESTDIR)/var/run/nginx - $(MAKECOOKIE) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2012-12-04 16:01:05 UTC (rev 19811) +++ csw/mgar/pkg/nginx/trunk/checksums 2012-12-04 16:19:05 UTC (rev 19812) @@ -1 +1 @@ -f9f3e60f498b7ffac778ee72ea7db309 nginx-1.1.8.tar.gz +4f5a55187a3d45fa37d99d07ddd90800 nginx-1.2.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 4 18:08:27 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Dec 2012 17:08:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[19813] csw/mgar/gar/v2/bin/cswproto Message-ID: Revision: 19813 http://gar.svn.sourceforge.net/gar/?rev=19813&view=rev Author: dmichelsen Date: 2012-12-04 17:08:27 +0000 (Tue, 04 Dec 2012) Log Message: ----------- mGAR v2: Fix case when there are no common directories Modified Paths: -------------- csw/mgar/gar/v2/bin/cswproto Modified: csw/mgar/gar/v2/bin/cswproto =================================================================== --- csw/mgar/gar/v2/bin/cswproto 2012-12-04 16:19:05 UTC (rev 19812) +++ csw/mgar/gar/v2/bin/cswproto 2012-12-04 17:08:27 UTC (rev 19813) @@ -66,13 +66,6 @@ exit 1; } -# Check whether a path is a 'common' file, defined in __DATA__ -sub is_common { - my $path = shift; - return 1 if $path =~ /$Common/; - return 0; -} - # Returns true if the file should be excluded, false otherwise. sub exclude { my $path = shift; @@ -159,7 +152,7 @@ next unless $F[2]; # Then process any excludes - next SPECLINE if( $F[2] =~ /$Common/ ); + next SPECLINE if( $Common && $F[2] =~ /$Common/ ); next if exclude($realpath); # Fix up dir permissions/file ownership. 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 Dec 4 19:29:18 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Dec 2012 18:29:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[19814] csw/mgar/gar Message-ID: Revision: 19814 http://gar.svn.sourceforge.net/gar/?rev=19814&view=rev Author: dmichelsen Date: 2012-12-04 18:29:17 +0000 (Tue, 04 Dec 2012) Log Message: ----------- mGAR bts: Make new branch for world-bootstrappable bratislava-release Modified Paths: -------------- csw/mgar/gar/bts/gar.conf.mk csw/mgar/gar/bts/gar.mk csw/mgar/gar/bts/gar.pkg.mk Added Paths: ----------- csw/mgar/gar/bts/ csw/mgar/gar/bts/bin/cswproto Removed Paths: ------------- csw/mgar/gar/bts/bin/cswproto Deleted: csw/mgar/gar/bts/bin/cswproto =================================================================== --- csw/mgar/gar/v2/bin/cswproto 2012-12-04 16:19:05 UTC (rev 19812) +++ csw/mgar/gar/bts/bin/cswproto 2012-12-04 18:29:17 UTC (rev 19814) @@ -1,176 +0,0 @@ -#!/opt/csw/bin/perl -lw -# -# $Id$ -# -# Copyright 2006 Cory Omand -# All rights reserved. Use is subject to license terms. -# -# Redistribution and/or use, with or without modification, is -# permitted. This software is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. -# -# cswproto - Create package prototypes which adhere to CSW standards. -# - -use strict; -use File::Basename; -use File::Spec::Functions qw/catfile/; -use Getopt::Long qw/:config no_ignore_case/; -use POSIX; - -use vars qw/ - @XFORMS $Common $StdOwn $StdGrp $StdDirPerm $common $stamp $root - /; - -# atime=8,mtime=9,ctime=10 -use constant TIME_FIELD => 10; - -# Prototype defaults -$StdOwn = 'root'; -$StdGrp = 'bin'; -$StdDirPerm = '0755'; - -# Path transforms - at XFORMS = ( - [ qr{^/opt/csw/man$}, q{/opt/csw/share/man} ], - [ qr{^/opt/csw/doc$}, q{/opt/csw/share/doc} ], - [ qr{^/opt/csw/info$}, q{/opt/csw/share/info} ], -); - -# Print usage information and exit -sub usage { - print join(" ", @_) if @_; - - my $program = basename $0; - print <<"_USAGE_"; -Usage: $program [-c ] [-h] [-s ] path1[=path1] ... pathN[=pathN] - - -c Filename containing common pathes not to include in the package - - -s Timestamp source. - The path to a file to be used as the base timestamp for prototype - operations. If this is specified, all source file creation times - are compared to the creation time of this file. Files created - *before* this time will be excluded from the prototype. - - -h Display brief usage. - - pathN The remainder of arguments to this command will be specified - directly to pkgproto. These arguments specify which paths are to - be included in the prototype. This can be specified as - pathX=pathY to use a different prefix for files in the prototype - than were present on the build system. -_USAGE_ - - exit 1; -} - -# Check whether a path is a 'common' file, defined in __DATA__ -sub is_common { - my $path = shift; - return 1 if $path =~ /$Common/; - return 0; -} - -# Returns true if the file should be excluded, false otherwise. -sub exclude { - my $path = shift; - - return 0 unless $stamp; - return 1 unless $path; - - die "Path $path is not readable by current user!\n" unless -r $path or -l $path; - - my $time = (lstat($path))[TIME_FIELD]; - return ($time >= $stamp) ? 0 : 1; -} - -# -# MAIN EXECUTION -# - -# Process command line arguments -my $test; -GetOptions( - 'root=s' => \$root, - 'stamp=s' => \$stamp, - 'common=s' => \$common, - 'help' => \&usage, -) or usage; - -usage "Error: timestamp '$stamp' not readable" if $stamp and not -r $stamp; -usage "Error: one or more pkgproto patterns required" unless @ARGV; - -$stamp = $stamp ? (stat($stamp))[TIME_FIELD] : 0; - -if( $common ) { - # Load common path contents - my %alldirs = ('/' => 1); - open F, $common || die "Couldn't open $common"; - while () { - chomp; next if /^\s*$/ or /^#/; - s/\+/\\+/g; - s/\-/\\-/g; - my @c = split( m!/! ); - my @pc = map { join( '/', @c[0..$_] ) } 1..$#c; - $alldirs{$_} = 1 foreach (@pc); - } - close F; - my $re = '^(' . join( '|', keys %alldirs ) . ')$'; - $Common = qr /$re/; -} - -my @prototype; - -foreach my $protopat (@ARGV) { - my ($actual, $virtual) = split /=/, $protopat; - - my @pproto = `/usr/bin/pkgproto $protopat`; - die "Failed to generate prototype" - unless WIFEXITED($?) and WEXITSTATUS($?) == 0; - -SPECLINE: - foreach my $entry (@pproto) { - chomp $entry; - do { print $entry; next } if $entry =~ /^(?:i|\!)/; - - my @F = split /\s+/, $entry; - my ($lhs, $rhs) = split /=/, $F[2]; - - # Find the real path - my $realpath; - if ($F[0] eq 's' or $F[0] eq 'l') { - $realpath = substr($lhs, 0, 1) ne '/' - ? catfile($actual, $lhs) - : $lhs; - - } - else { - $F[2] = $lhs if $lhs and $rhs; - $realpath = $rhs - ? $rhs - : (substr($lhs, 0, 1) ne '/' ? catfile($actual, $lhs) : $lhs); - } - - # Then do path transforms - foreach my $xform (@XFORMS) { $F[2] =~ s/$xform->[0]/$xform->[1]/g } - $F[2] =~ s/$root// if $root; - next unless $F[2]; - - # Then process any excludes - next SPECLINE if( $F[2] =~ /$Common/ ); - next if exclude($realpath); - - # Fix up dir permissions/file ownership. - $F[3] = $StdDirPerm if $F[0] eq 'd'; - ($F[4], $F[5]) = ( $StdOwn, $StdGrp ) - unless $F[0] eq 's' or $F[0] eq 'l'; - - push @prototype, [ grep { defined $_ } @F ]; - } -} - -print join " " => @$_ foreach (sort { $a->[2] cmp $b->[2] } @prototype); - -# End of file Copied: csw/mgar/gar/bts/bin/cswproto (from rev 19813, csw/mgar/gar/v2/bin/cswproto) =================================================================== --- csw/mgar/gar/bts/bin/cswproto (rev 0) +++ csw/mgar/gar/bts/bin/cswproto 2012-12-04 18:29:17 UTC (rev 19814) @@ -0,0 +1,169 @@ +#!/opt/csw/bin/perl -lw +# +# $Id$ +# +# Copyright 2006 Cory Omand +# All rights reserved. Use is subject to license terms. +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +# +# cswproto - Create package prototypes which adhere to CSW standards. +# + +use strict; +use File::Basename; +use File::Spec::Functions qw/catfile/; +use Getopt::Long qw/:config no_ignore_case/; +use POSIX; + +use vars qw/ + @XFORMS $Common $StdOwn $StdGrp $StdDirPerm $common $stamp $root + /; + +# atime=8,mtime=9,ctime=10 +use constant TIME_FIELD => 10; + +# Prototype defaults +$StdOwn = 'root'; +$StdGrp = 'bin'; +$StdDirPerm = '0755'; + +# Path transforms + at XFORMS = ( + [ qr{^/opt/csw/man$}, q{/opt/csw/share/man} ], + [ qr{^/opt/csw/doc$}, q{/opt/csw/share/doc} ], + [ qr{^/opt/csw/info$}, q{/opt/csw/share/info} ], +); + +# Print usage information and exit +sub usage { + print join(" ", @_) if @_; + + my $program = basename $0; + print <<"_USAGE_"; +Usage: $program [-c ] [-h] [-s ] path1[=path1] ... pathN[=pathN] + + -c Filename containing common pathes not to include in the package + + -s Timestamp source. + The path to a file to be used as the base timestamp for prototype + operations. If this is specified, all source file creation times + are compared to the creation time of this file. Files created + *before* this time will be excluded from the prototype. + + -h Display brief usage. + + pathN The remainder of arguments to this command will be specified + directly to pkgproto. These arguments specify which paths are to + be included in the prototype. This can be specified as + pathX=pathY to use a different prefix for files in the prototype + than were present on the build system. +_USAGE_ + + exit 1; +} + +# Returns true if the file should be excluded, false otherwise. +sub exclude { + my $path = shift; + + return 0 unless $stamp; + return 1 unless $path; + + die "Path $path is not readable by current user!\n" unless -r $path or -l $path; + + my $time = (lstat($path))[TIME_FIELD]; + return ($time >= $stamp) ? 0 : 1; +} + +# +# MAIN EXECUTION +# + +# Process command line arguments +my $test; +GetOptions( + 'root=s' => \$root, + 'stamp=s' => \$stamp, + 'common=s' => \$common, + 'help' => \&usage, +) or usage; + +usage "Error: timestamp '$stamp' not readable" if $stamp and not -r $stamp; +usage "Error: one or more pkgproto patterns required" unless @ARGV; + +$stamp = $stamp ? (stat($stamp))[TIME_FIELD] : 0; + +if( $common ) { + # Load common path contents + my %alldirs = ('/' => 1); + open F, $common || die "Couldn't open $common"; + while () { + chomp; next if /^\s*$/ or /^#/; + s/\+/\\+/g; + s/\-/\\-/g; + my @c = split( m!/! ); + my @pc = map { join( '/', @c[0..$_] ) } 1..$#c; + $alldirs{$_} = 1 foreach (@pc); + } + close F; + my $re = '^(' . join( '|', keys %alldirs ) . ')$'; + $Common = qr /$re/; +} + +my @prototype; + +foreach my $protopat (@ARGV) { + my ($actual, $virtual) = split /=/, $protopat; + + my @pproto = `/usr/bin/pkgproto $protopat`; + die "Failed to generate prototype" + unless WIFEXITED($?) and WEXITSTATUS($?) == 0; + +SPECLINE: + foreach my $entry (@pproto) { + chomp $entry; + do { print $entry; next } if $entry =~ /^(?:i|\!)/; + + my @F = split /\s+/, $entry; + my ($lhs, $rhs) = split /=/, $F[2]; + + # Find the real path + my $realpath; + if ($F[0] eq 's' or $F[0] eq 'l') { + $realpath = substr($lhs, 0, 1) ne '/' + ? catfile($actual, $lhs) + : $lhs; + + } + else { + $F[2] = $lhs if $lhs and $rhs; + $realpath = $rhs + ? $rhs + : (substr($lhs, 0, 1) ne '/' ? catfile($actual, $lhs) : $lhs); + } + + # Then do path transforms + foreach my $xform (@XFORMS) { $F[2] =~ s/$xform->[0]/$xform->[1]/g } + $F[2] =~ s/$root// if $root; + next unless $F[2]; + + # Then process any excludes + next SPECLINE if( $Common && $F[2] =~ /$Common/ ); + next if exclude($realpath); + + # Fix up dir permissions/file ownership. + $F[3] = $StdDirPerm if $F[0] eq 'd'; + ($F[4], $F[5]) = ( $StdOwn, $StdGrp ) + unless $F[0] eq 's' or $F[0] eq 'l'; + + push @prototype, [ grep { defined $_ } @F ]; + } +} + +print join " " => @$_ foreach (sort { $a->[2] cmp $b->[2] } @prototype); + +# End of file Modified: csw/mgar/gar/bts/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2012-12-04 16:19:05 UTC (rev 19812) +++ csw/mgar/gar/bts/gar.conf.mk 2012-12-04 18:29:17 UTC (rev 19814) @@ -116,9 +116,23 @@ # makefiles. They're also used by autoconf, and can be adapted # for a variety of build systems. +# The name of the system, used to parametrize several scripts and pathes +PKG_SYSTEM ?= csw +# This is the prefix of all packages built +PKG_STEM ?= CSW +# This is user to form /opt/xxx, /etc/opt/xxx and /var/opt/xxx +PKG_SUBDIRECTORY ?= csw +# This is the default ownership of files in the packages +PKG_DEFAULT_USER ?= root +PKG_DEFAULT_GROUP ?= bin + +# This is the prefix where the environment used to bootstrap the new world is located and how the packages are named +BOOTSTRAP_PKG_STEM ?= CSW +BOOTSTRAP_PREFIX ?= /opt/csw + # This is the general prefix for "world". Don't change it in a package and # if you change it in .garrc keep in mind to rebuild the world from scratch. -BUILD_PREFIX ?= /opt/csw +BUILD_PREFIX ?= /opt/$(PKG_SUBDIRECTORY) prefix ?= $(BUILD_PREFIX) exec_prefix ?= $(prefix) @@ -143,7 +157,7 @@ sourcedir ?= $(BUILD_PREFIX)/src sharedperl ?= $(sharedstatedir)/perl perllib ?= $(libdir)/perl -perlcswlib ?= $(perllib)/csw +perlcswlib ?= $(perllib)/$(PKG_SUBDIRECTORY) perlpackroot ?= $(perlcswlib)/auto texmfdir ?= $(sharedstatedir)/texmf texmfconfigdir ?= $(texmfdir)-config @@ -183,7 +197,7 @@ DESTIMG ?= $(LOGNAME)-$(shell hostname) # A default list of packages that everyone will depend on -COMMON_PKG_DEPENDS ?= CSWcommon +COMMON_PKG_DEPENDS ?= $(PKG_STEM)common # These are the core packages which must be installed for GAR to function correctly @@ -733,7 +747,7 @@ # 2. Allow us to use programs we just built. This is a bit complicated, # but we want PATH to be a recursive variable, or 'gmake isaenv' won't work # /usr/openwin/bin is needed for xmkmf used in gar.lib.mk -PATH = $(if $(filter SOS12,$(GARCOMPILER)),$(abspath $(GARBIN)/sos12-wrappers):)$(if $(IGNORE_DESTDIR),,$(abspath $(DESTDIR)$(binpath_install)/$(MM_BINDIR)):$(DESTDIR)$(binpath_install):$(abspath $(DESTDIR)$(sbinpath_install)/$(MM_BINDIR)):$(DESTDIR)$(sbinpath_install):)$(abspath $(binpath_install)/$(MM_BINDIR)):$(binpath_install):$(abspath $(sbinpath_install)/$(MM_BINDIR)):$(sbinpath_install):$(CC_HOME)/bin:$(abspath $(GARBIN)):/usr/bin:/usr/sbin:/usr/java/bin:/usr/ccs/bin:/usr/openwin/bin +PATH = $(if $(filter SOS12,$(GARCOMPILER)),$(abspath $(GARBIN)/sos12-wrappers):)$(if $(IGNORE_DESTDIR),,$(abspath $(DESTDIR)$(binpath_install)/$(MM_BINDIR)):$(DESTDIR)$(binpath_install):$(abspath $(DESTDIR)$(sbinpath_install)/$(MM_BINDIR)):$(DESTDIR)$(sbinpath_install):)$(abspath $(binpath_install)/$(MM_BINDIR)):$(binpath_install):$(abspath $(sbinpath_install)/$(MM_BINDIR)):$(sbinpath_install):$(CC_HOME)/bin:$(abspath $(GARBIN)):$(BOOTSTRAP_PREFIX)/bin:/usr/bin:/usr/sbin:/usr/java/bin:/usr/ccs/bin:/usr/openwin/bin # This is for foo-config chaos PKG_CONFIG_DIRS ?= $(EXTRA_PKG_CONFIG_DIRS) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install) Modified: csw/mgar/gar/bts/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2012-12-04 16:19:05 UTC (rev 19812) +++ csw/mgar/gar/bts/gar.mk 2012-12-04 18:29:17 UTC (rev 19814) @@ -783,6 +783,7 @@ MERGE_DIRS_$(MODULATION) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSED)) MERGE_SCRIPTS_isa-default ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) +#MERGE_SCRIPTS_isa-default64 ?= $(if $(BUILD64_ONLY),copy-relocate,copy-relocated-only copy-config-only splice-include64) $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS_isa-default64) $(EXTRA_MERGE_SCRIPTS) MERGE_SCRIPTS_isa-default64 ?= $(if $(BUILD64_ONLY),copy-relocate,copy-relocated-only copy-config-only) $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS_isa-default64) $(EXTRA_MERGE_SCRIPTS) MERGE_SCRIPTS_isa-extra ?= copy-relocated-only copy-config-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS_isa-extra) $(EXTRA_MERGE_SCRIPTS) MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSEDEXTRA)) @@ -964,6 +965,16 @@ ) @$(MAKECOOKIE) +# Splice include to have conditional selection of 32 and 64 bit. This requires +# to have the 32 bit includes already in place. The includes from 64 bit are inspected +# if they differ, and if they do they are conditionally spliced in the standard include location. +# Making a direct unification of 32 and 64 bit would require knowledge of install directories +# which we don't have at this point and exclusion of include files during regular merge phases. +merge-splice-include64: + $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && splice \ + "defined __amd64 || defined __x86_64 || defined __sparcv9" ./$(includedir) $(PKGROOT)$(includedir) + @$(MAKECOOKIE) + .PHONY: remerge reset-merge reset-merge-modulated remerge: reset-merge merge Modified: csw/mgar/gar/bts/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2012-12-04 16:19:05 UTC (rev 19812) +++ csw/mgar/gar/bts/gar.pkg.mk 2012-12-04 18:29:17 UTC (rev 19814) @@ -31,13 +31,13 @@ # SRCPACKAGE is the name of the package containing the sources ifeq ($(origin PACKAGES), undefined) -PACKAGES = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(NAME)) +PACKAGES = $(if $(filter %.gspec,$(DISTFILES)),,$(PKG_STEM)$(NAME)) CATALOGNAME ?= $(if $(filter %.gspec,$(DISTFILES)),,$(subst -,_,$(NAME))) SRCPACKAGE_BASE = $(firstword $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES)) SRCPACKAGE ?= $(SRCPACKAGE_BASE)-src SPKG_SPECS ?= $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE)) else -CATALOGNAME ?= $(if $(filter-out $(firstword $(PACKAGES)),$(PACKAGES)),,$(subst -,_,$(patsubst CSW%,%,$(PACKAGES)))) +CATALOGNAME ?= $(if $(filter-out $(firstword $(PACKAGES)),$(PACKAGES)),,$(subst -,_,$(patsubst $(PKG_STEM)%,%,$(PACKAGES)))) SRCPACKAGE_BASE = $(firstword $(PACKAGES)) SRCPACKAGE ?= $(SRCPACKAGE_BASE)-src OBSOLETING_PKGS ?= $(sort $(PACKAGES) $(FOREIGN_PACKAGES)) @@ -46,16 +46,16 @@ endif # For creating default pkgnames, e.g. CSWpy-$(DASHED_NAME) -DASHED_NAME ?= $(subst _,-,$(patsubst CSW%,%,$(NAME))) +DASHED_NAME ?= $(subst _,-,$(patsubst $(PKG_STEM)%,%,$(NAME))) # Automatic definitions for source package -CATALOGNAME_$(SRCPACKAGE) ?= $(patsubst CSW%,%,$(SRCPACKAGE_BASE))_src +CATALOGNAME_$(SRCPACKAGE) ?= $(patsubst $(PKG_STEM)%,%,$(SRCPACKAGE_BASE))_src SPKG_DESC_$(SRCPACKAGE) ?= $(SPKG_DESC_$(SRCPACKAGE_BASE)) Source Package ARCHALL_$(SRCPACKAGE) ?= 1 # XXX: Use Repository Root instead of fixed URL as base 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 +GARPKG_v1 = $(PKG_STEM)gar-v1 +GARPKG_v2 = $(PKG_STEM)gar-v2 RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) # Set the catalog release based on hostname. E.g. building on current9s will @@ -69,7 +69,7 @@ define obsoleted_pkg # function 'catalogname' must not be used due to recursive calls to CATALOGNAME_* -CATALOGNAME_$(1) ?= $(subst -,_,$(patsubst CSW%,%,$(1)))_stub +CATALOGNAME_$(1) ?= $(subst -,_,$(patsubst $(PKG_STEM)%,%,$(1)))_stub # The length of the description has been limited to 100 characters, # the string is cut (no longer on word boundaries). SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETED_BY_$P)),$P)) | perl -npe 's/(.{100}).+/substr($$1,0,96) . " ..."/e') @@ -99,12 +99,12 @@ SRCPACKAGE_BASE = $(if $(PACKAGES),$(firstword $(PACKAGES)),$(firstword $(SPKG_SPECS))) SRCPACKAGE ?= $(SRCPACKAGE_BASE)-src -CATALOGNAME_$(SRCPACKAGE) ?= $(patsubst CSW%,%,$(SRCPACKAGE_BASE))_src +CATALOGNAME_$(SRCPACKAGE) ?= $(patsubst $(PKG_STEM)%,%,$(SRCPACKAGE_BASE))_src SPKG_DESC_$(SRCPACKAGE) ?= $(SPKG_DESC_$(SRCPACKAGE_BASE)) Source Package ARCHALL_$(SRCPACKAGE) ?= 1 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 +GARPKG_v1 = $(PKG_STEM)gar-v1 +GARPKG_v2 = $(PKG_STEM)gar-v2 RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) # Sanity checks for r8335 @@ -148,7 +148,7 @@ $(if $(CATALOGNAME), $(CATALOGNAME), $(if $(filter $(1),$(PACKAGES) $(OBSOLETED_PKGS)), - $(subst -,_,$(patsubst CSW%,%,$(1))), + $(subst -,_,$(patsubst $(PKG_STEM)%,%,$(1))), $(if $(realpath files/$(1).gspec), $(shell perl -F'\s+' -ane 'print "$$F[2]" if( $$F[0] eq "%var" && $$F[1] eq "bitname")' files/$(1).gspec), $(error The catalog name for the package '$1' could not be determined, because it was neither in PACKAGES nor was there a gspec-file) @@ -200,7 +200,7 @@ $(if $(filter $(GNU_MIRROR),$(MASTER_SITES)),http://www.gnu.org/software/$(GNU_PROJ)) \ $(MASTER_SITES) \ $(GIT_REPOS)) -SPKG_VENDOR ?= $(SPKG_SOURCEURL) packaged for CSW by $(SPKG_PACKAGER) +SPKG_VENDOR ?= $(SPKG_SOURCEURL) packaged for $(PKG_STEM) by $(SPKG_PACKAGER) SPKG_PSTAMP ?= $(LOGNAME)@$(shell hostname)-$(call _REVISION)-$(shell date '+%Y%m%d%H%M%S') SPKG_BASEDIR ?= $(prefix) SPKG_CLASSES ?= none @@ -216,7 +216,7 @@ SPKG_DEPEND_DB = $(GARDIR)/csw/depend.db -SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg +SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),$(PKG_STEM)).pkg MIGRATECONF ?= $(strip $(foreach S,$(filter-out $(OBSOLETED_PKGS),$(SPKG_SPECS)),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf))) @@ -241,23 +241,24 @@ PHP5_EXTFILES ?= *so $(EXTRA_PHP5_EXTFILES) # - set class for all config files +# BTS: apache, php, templates need further consideration _CSWCLASS_FILTER = | perl -ane '\ - $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ - $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ - $(foreach FILE,$(PRESERVECONF:%\.CSW=%),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ - $(foreach FILE,$(ETCSERVICES),$$F[1] = "cswetcservices" if( $$F[2] =~ m(^$(FILE)$$) );)\ - $(foreach FILE,$(INETDCONF),$$F[1] = "cswinetd" if( $$F[2] =~ m(^$(FILE)$$) );)\ - $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ - $(foreach FILE,$(ETCSHELLS),$$F[1] = "cswetcshells" if( $$F[2] =~ m(^$(FILE)$$) );)\ - $(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\ - $(foreach FILE,$(CRONTABS),$$F[1] = "cswcrontab" if( $$F[2] =~ m(^$(FILE)$$) );)\ - $(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\ - $(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\ - $(foreach FILE,$(TEXHASH),$$F[1] = "cswtexhash" if( $$F[2] =~ m(^$(FILE)$$) );)\ - $(foreach FILE,$(SSLCERT),$$F[1] = "cswsslcert" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(MIGRATECONF),$$F[1] = "$(PKG_SYSTEM)migrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "$(PKG_SYSTEM)cpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ + $(foreach FILE,$(PRESERVECONF:%\.CSW=%),$$F[1] = "$(PKG_SYSTEM)preserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ + $(foreach FILE,$(ETCSERVICES),$$F[1] = "$(PKG_SYSTEM)etcservices" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(INETDCONF),$$F[1] = "$(PKG_SYSTEM)inetd" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(INITSMF),$$F[1] = "$(PKG_SYSTEM)initsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(ETCSHELLS),$$F[1] = "$(PKG_SYSTEM)etcshells" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(USERGROUP),$$F[1] = "$(PKG_SYSTEM)usergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(CRONTABS),$$F[1] = "$(PKG_SYSTEM)crontab" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "$(PKG_SYSTEM)pycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\ + $(foreach FILE,$(TEXINFO),$$F[1] = "$(PKG_SYSTEM)texinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(TEXHASH),$$F[1] = "$(PKG_SYSTEM)texhash" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(SSLCERT),$$F[1] = "$(PKG_SYSTEM)sslcert" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(if $(AP2_MODS), at F = ("e", "build", $$F[2], "?", "?", "?") if ($$F[2] =~ m(^/opt/csw/apache2/ap2mod/.*));) \ $(if $(PHP5_EXT), at F = ("e", "build", $$F[2], "?", "?", "?") if ($$F[2] =~ m(^/opt/csw/php5/extensions/.*));) \ - $$F[1] = "cswcptemplates" if( $$F[2] =~ m(^/opt/csw/etc/templates/.+$$) and $$F[0] eq "f" ); \ + $$F[1] = "$(PKG_SYSTEM)cptemplates" if( $$F[2] =~ m(^/opt/csw/etc/templates/.+$$) and $$F[0] eq "f" ); \ print join(" ", at F),"\n";' # If you add another filter above, also add the class to this list. It is used @@ -294,7 +295,7 @@ # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. -_EXTRA_PAX_ARGS += $(foreach FILE,$(SAMPLECONF:%\.CSW=%) $(PRESERVECONF:%\.CSW=%),-s ",^\.\($(FILE)\)$$,.\1\.CSW,p") +_EXTRA_PAX_ARGS += $(foreach FILE,$(SAMPLECONF:%\.$(PKG_STEM)=%) $(PRESERVECONF:%\.$(PKG_STEM)=%),-s ",^\.\($(FILE)\)$$,.\1\.$(PKG_STEM),p") PKGGET_DESTDIR ?= @@ -556,9 +557,9 @@ # actually matching the _TEXINFO_FILTER. This is done at the prototype-level. $(WORKDIR)/%.depend: $(WORKDIR)/$*.prototype $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(_CATEGORY_RUNTIME_DEP_PKGS) -$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach I,$(ISAEXEC_FILES),print "yes" if( $$F[2] =~ m(^\Q$I\E(=.*)?$$));)')),CSWisaexec) -$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswalternatives")')),CSWalternatives) -$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(foreach P,$(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(filter-out ugfiles,$(_CSWCLASSES)),print "$C " if( $$F[1] eq "$C");)')),CSWcas-$(subst csw,,$(P))) +$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach I,$(ISAEXEC_FILES),print "yes" if( $$F[2] =~ m(^\Q$I\E(=.*)?$$));)')),$(PKG_STEM)isaexec) +$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswalternatives")')),$(PKG_STEM)alternatives) +$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(foreach P,$(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(filter-out ugfiles,$(_CSWCLASSES)),print "$C " if( $$F[1] eq "$C");)')),$(PKG_STEM)cas-$(subst csw,,$(P))) $(WORKDIR)/%.depend: _DEP_PKGS=$(or $(RUNTIME_DEP_PKGS_ONLY_$*),$(RUNTIME_DEP_PKGS_ONLY),$(sort $(_EXTRA_GAR_PKGS)) $(or $(RUNTIME_DEP_PKGS_$*),$(RUNTIME_DEP_PKGS),$(DEP_PKGS_$*),$(DEP_PKGS))) $(WORKDIR)/%.depend: $(WORKDIR) # The final "true" is for packages without dependencies to make the shell happy as "( )" is not allowed. @@ -757,9 +758,9 @@ @rm -f $(COOKIEDIR)/merge-license $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-license-$(SPEC)) merge-README.CSW: $(WORKDIR) - $(_DBG)if test -f $(WORKDIR)/README.CSW; then \ + $(_DBG)if test -f $(WORKDIR)/README.$(PKG_STEM); then \ $(foreach P,$(_PKG_SPECS),mkdir -p $(PKGROOT)$(docdir)/$(call catalogname,$P);) \ - $(foreach P,$(_PKG_SPECS),cp $(WORKDIR)/README.CSW $(PKGROOT)$(docdir)/$(call catalogname,$P)/README.CSW;) \ + $(foreach P,$(_PKG_SPECS),cp $(WORKDIR)/README.$(PKG_STEM) $(PKGROOT)$(docdir)/$(call catalogname,$P)/README.$(PKG_STEM);) \ merge-distfile-%: $(DOWNLOADDIR) $(_DBG_MERGE)if test -f $(DOWNLOADDIR)/$*; then \ 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 Dec 4 19:59:19 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Dec 2012 18:59:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[19815] csw/mgar/pkg/gperf/branches Message-ID: Revision: 19815 http://gar.svn.sourceforge.net/gar/?rev=19815&view=rev Author: dmichelsen Date: 2012-12-04 18:59:19 +0000 (Tue, 04 Dec 2012) Log Message: ----------- gperf/bratislava: Initial commit Modified Paths: -------------- csw/mgar/pkg/gperf/branches/bratislava/Makefile Added Paths: ----------- csw/mgar/pkg/gperf/branches/bratislava/ Modified: csw/mgar/pkg/gperf/branches/bratislava/Makefile =================================================================== --- csw/mgar/pkg/gperf/trunk/Makefile 2012-12-03 16:13:22 UTC (rev 19806) +++ csw/mgar/pkg/gperf/branches/bratislava/Makefile 2012-12-04 18:59:19 UTC (rev 19815) @@ -1,7 +1,17 @@ NAME = gperf VERSION = 3.0.4 -GARTYPE = v2 +GARTYPE = bts +GARCOMPILER = GNU +COMMON_PKG_DEPENDS = +INCLUDE_COMMONDIRS = 1 +CATALOG_RELEASE = bratislava +CHECKPKG_OVERRIDES_CSWgperf += bad-location-of-file +CHECKPKG_OVERRIDES_CSWgperf += disallowed-path +RUNTIME_DEP_PKGS_CSWgperf += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWgperf += CSWlibstdc++6 + + DESCRIPTION = A perfect hash function generator define BLURB GNU gperf is a perfect hash function generator. For a given list of strings, 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 Dec 4 21:36:56 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 04 Dec 2012 20:36:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[19816] csw/mgar/pkg/bind/trunk Message-ID: Revision: 19816 http://gar.svn.sourceforge.net/gar/?rev=19816&view=rev Author: bonivart Date: 2012-12-04 20:36:56 +0000 (Tue, 04 Dec 2012) Log Message: ----------- bind/trunk: update to 9.8.4-P1 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2012-12-04 18:59:19 UTC (rev 19815) +++ csw/mgar/pkg/bind/trunk/Makefile 2012-12-04 20:36:56 UTC (rev 19816) @@ -8,12 +8,12 @@ # Enable these for Px-releases #RELEASE = rc1 -#RELEASE = P4 -#DISTVERSION = $(VERSION)-$(RELEASE) -#SPKG_VERSION = $(VERSION)$(RELEASE) -#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) -##DISTNAME = $(NAME)-$(VERSION)$(RELEASE) -#WORKSRC = $(WORKDIR)/$(DISTNAME) +RELEASE = P1 +DISTVERSION = $(VERSION)-$(RELEASE) +SPKG_VERSION = $(VERSION)$(RELEASE) +DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +#DISTNAME = $(NAME)-$(VERSION)$(RELEASE) +WORKSRC = $(WORKDIR)/$(DISTNAME) DESCRIPTION = ISC BIND DNS reference implementation define BLURB @@ -24,13 +24,13 @@ endef # Enable these for Px-releases -#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ -##MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)$(RELEASE)/ -#DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ +#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)$(RELEASE)/ +DISTFILES = $(DISTNAME).tar.gz # Disable these for Px-releases -MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ +#DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWbindchroot.postinstall Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2012-12-04 18:59:19 UTC (rev 19815) +++ csw/mgar/pkg/bind/trunk/checksums 2012-12-04 20:36:56 UTC (rev 19816) @@ -1 +1 @@ -7d991ec73b625b9f071afa3759411f52 bind-9.8.4.tar.gz +08b5fc744c58cadbecf06c38db7cae36 bind-9.8.4-P1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Wed Dec 5 10:15:48 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 05 Dec 2012 09:15:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[19817] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 19817 http://gar.svn.sourceforge.net/gar/?rev=19817&view=rev Author: janholzh Date: 2012-12-05 09:15:48 +0000 (Wed, 05 Dec 2012) Log Message: ----------- gcc4/trunk: move back to use as and not gas Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-04 20:36:56 UTC (rev 19816) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-05 09:15:48 UTC (rev 19817) @@ -60,10 +60,12 @@ CONFIGURE_ARGS += --enable-objc-gc CONFIGURE_ARGS += --enable-threads=posix CONFIGURE_ARGS += --program-suffix=$(PROGRAM_SUFFIX) -CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas +#CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas +CONFIGURE_ARGS += --with-as=/usr/ccs/bin/as CONFIGURE_ARGS += --with-cloog=$(BUILD_PREFIX) CONFIGURE_ARGS += --with-gmp=$(BUILD_PREFIX) -CONFIGURE_ARGS += --with-gnu-as +#CONFIGURE_ARGS += --with-gnu-as +CONFIGURE_ARGS += --without-gnu-as CONFIGURE_ARGS += --with-included-gettext CONFIGURE_ARGS += --with-ld=/usr/ccs/bin/ld CONFIGURE_ARGS += --without-gnu-ld This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Dec 5 14:50:13 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 05 Dec 2012 13:50:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[19818] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 19818 http://gar.svn.sourceforge.net/gar/?rev=19818&view=rev Author: pfelecan Date: 2012-12-05 13:50:13 +0000 (Wed, 05 Dec 2012) Log Message: ----------- texlive/trunk: removed categories macro Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-12-05 09:15:48 UTC (rev 19817) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-12-05 13:50:13 UTC (rev 19818) @@ -4,7 +4,6 @@ YEAR = 2012 VERSION = $(YEAR)0701 GARTYPE = v2 -CATEGORIES = apps DESCRIPTION = TeX Live define BLURB 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 Dec 5 16:05:28 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Dec 2012 15:05:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[19819] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 19819 http://gar.svn.sourceforge.net/gar/?rev=19819&view=rev Author: dmichelsen Date: 2012-12-05 15:05:25 +0000 (Wed, 05 Dec 2012) Log Message: ----------- mGAR v2: Put filename statically in gspec Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2012-12-05 13:50:13 UTC (rev 19818) +++ csw/mgar/gar/v2/gar.pkg.mk 2012-12-05 15:05:25 UTC (rev 19819) @@ -216,8 +216,16 @@ SPKG_DEPEND_DB = $(GARDIR)/csw/depend.db -SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg +# This is the old specification being evaluated during mkpackage. The expansion of the SPKG_REVSTAMP leads to +# problems later on when need the filename for checkpkg again and too much time has passed. In the new approach +# the packagename is directly put in the gspec. +# SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg +# The filename for a package +define _pkgfile +$(call catalogname,$(1))-$(call pkgvar,SPKG_VERSION,$(1)),$(call pkgvar,SPKG_REVSTAMP,$(1))-$(call pkgvar,SPKG_OSNAME,$(1))-$(if $(or $(ARCHALL),$(ARCHALL_$(1))),all,$(GARCH))-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg +endef + MIGRATECONF ?= $(strip $(foreach S,$(filter-out $(OBSOLETED_PKGS),$(SPKG_SPECS)),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf))) # It is NOT sufficient to change the pathes here, they must be adjusted in merge-* also @@ -314,6 +322,7 @@ # Where we find our mkpackage global templates PKGLIB = $(GARDIR)/pkglib +# These variables are for mkpackage and the gspec expansion PKG_EXPORTS = NAME VERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN PKG_EXPORTS += CURDIR WORKDIR WORKDIR_FIRSTMOD WORKSRC WORKSRC_FIRSTMOD PKGROOT PKG_EXPORTS += SPKG_REVSTAMP SPKG_PKGNAME SPKG_DESC SPKG_VERSION SPKG_CATEGORY @@ -596,6 +605,7 @@ $(_DBG)$(if $(filter $*.gspec,$(DISTFILES)),,\ (echo "%var bitname $(call catalogname,$*)"; \ echo "%var pkgname $*"; \ + echo "%var pkgfile $(call _pkgfile,$*)"; \ $(if $(or $(ARCHALL),$(ARCHALL_$*)),echo "%var arch all";) \ $(if $(_CATEGORY_GSPEC_INCLUDE),echo "%include url file://%{PKGLIB}/$(_CATEGORY_GSPEC_INCLUDE)")) >$@\ ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 5 20:59:19 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 05 Dec 2012 19:59:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[19820] csw/mgar/gar/v2-yann/lib/python/inspective_package. py Message-ID: Revision: 19820 http://gar.svn.sourceforge.net/gar/?rev=19820&view=rev Author: chninkel Date: 2012-12-05 19:59:18 +0000 (Wed, 05 Dec 2012) Log Message: ----------- gar/v2-yann: handles still more error cases Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/inspective_package.py Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-12-05 15:05:25 UTC (rev 19819) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-12-05 19:59:18 UTC (rev 19820) @@ -350,20 +350,27 @@ args = ["ldd", "-Ur", binary_abspath] retcode, stdout, stderr = ShellCommand(args) if retcode: + # There three cases where we will ignore an ldd error + # - if we are trying to analyze a 64 bits binary on a Solaris 9 x86 + # solaris 9 exists only in 32 bits, so we can't do this + # We ignore the error as it is likely that the ldd infos will be + # the same on the 32 bits binaries + # - if we are trying to analyze a binary from another architecture + # we ignore this error as it will be caught by another checkpkg test + # - if we are trying to analyze a statically linked binaries + # we care only about dynamic binary so we ignore the error + # uname_info = os.uname() - if (uname_info[2] == '5.9' and uname_info[4] == 'i86pc' and - '/amd64/' in binary_abspath and - 'has wrong class or data encoding' in stderr): - # we are trying to analyze a 64 bits binary on a Solaris 9 x86 - # which exists only in 32 bits, that's not possible - # we ignore the error and return no information as it is likely - # that the ldd infos will be the same on the 32 bits binaries - # analyzed + if ((uname_info[2] == '5.9' and uname_info[4] == 'i86pc' and + '/amd64/' in binary_abspath and + 'has wrong class or data encoding' in stderr) or + re.search(r'ELF machine type: EM_\w+: is incompatible with system', stderr) or + 'file is not a dynamic executable or shared object' in stderr): ldd_output[binary] = [] continue - else: - logging.error("%s returned an error: %s", args, stderr) + logging.error("%s returned an error: %s", args, stderr) + ldd_info = [] for line in stdout.splitlines(): result = self._ParseLddDashRline(line, binary_abspath) @@ -575,13 +582,19 @@ response["path"] = "%s" % (d["sizediffused_file"]) response["symbol"] = None elif d["move_offset"]: - response["state"] = 'move_offset_error' + response["state"] = 'move-offset-error' response["soname"] = None response["path"] = None response["symbol"] = None response["move_offset"] = d['move_offset'] response["move_index"] = d['move_index'] + elif d["reloc_symbol"]: + response["state"] = 'relocation-issue' + response["soname"] = None + response["path"] = None + response["symbol"] = d['reloc_symbol'] + else: raise package.StdoutSyntaxError("Could not parse %s with %s" % (repr(line), common_re)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 5 21:51:12 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 05 Dec 2012 20:51:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[19821] csw/mgar/gar/v2-yann/lib/python/inspective_package. py Message-ID: Revision: 19821 http://gar.svn.sourceforge.net/gar/?rev=19821&view=rev Author: chninkel Date: 2012-12-05 20:51:12 +0000 (Wed, 05 Dec 2012) Log Message: ----------- gar/v2-yann: pep8 compliance fixes Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/inspective_package.py Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-12-05 19:59:18 UTC (rev 19820) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-12-05 20:51:12 UTC (rev 19821) @@ -265,19 +265,20 @@ if retcode or stderr: # we ignore for now these elfdump errors which can be catched # later by check functions, - ignored_error_re = re.compile(r"""[^:]+:\s\.((SUNW_l)?dynsym|symtab):\s - (index\[\d+\]:\s - (suspicious\s(local|global)\ssymbol\sentry:\s[^:]+:\s - lies\swithin\s(local|global)\ssymbol\srange\s\(index\s[<>=]+\s\d+\) + ignored_error_re = re.compile( + r"""[^:]+:\s\.((SUNW_l)?dynsym|symtab):\s + (index\[\d+\]:\s + (suspicious\s(local|global)\ssymbol\sentry:\s[^:]+:\slies + \swithin\s(local|global)\ssymbol\srange\s\(index\s[<>=]+\s\d+\) - |bad\ssymbol\sentry:\s[^:]+:\ssection\[\d+\]\ssize:\s0(x[0-9a-f]+)?:\s - symbol\s\(address\s0x[0-9a-f]+,\ssize\s0x[0-9a-f]+\) - \slies\soutside\sof\scontaining\ssection + |bad\ssymbol\sentry:\s[^:]+:\ssection\[\d+\]\ssize:\s0(x[0-9a-f]+)? + :\ssymbol\s\(address\s0x[0-9a-f]+,\ssize\s0x[0-9a-f]+\) + \slies\soutside\sof\scontaining\ssection - |bad\ssymbol\sentry:\s:\sinvalid\sshndx:\s\d+) + |bad\ssymbol\sentry:\s:\sinvalid\sshndx:\s\d+) - |invalid\ssh_link:\s0)\n""", - re.VERBOSE) + |invalid\ssh_link:\s0)\n""", + re.VERBOSE) stderr = re.sub(ignored_error_re, "", stderr) if stderr: @@ -305,7 +306,6 @@ else: binary_info[cur_section].append(elf_info) - # elfdump doesn't repeat the name of the soname in the version section # if it's the same on two contiguous line, e.g.: # libc.so.1 SUNW_1.1 @@ -318,7 +318,7 @@ # soname version needed are usually displayed sorted by index ... # but that's not always the case :( so we have to reorder # the list by index - binary_info['version needed'].sort(key = lambda m: m['index']) + binary_info['version needed'].sort(key=lambda m: m['index']) for version in binary_info['version needed']: del version['index'] @@ -327,7 +327,6 @@ if binary_info['version definition']: binary_info['version definition'].pop(0) - binary_info['symbol table'] = symbols.values() binary_info['symbol table'].sort(key=lambda m: m['symbol']) # To not rely of the section order output of elfdump, we resolve @@ -362,10 +361,11 @@ # uname_info = os.uname() if ((uname_info[2] == '5.9' and uname_info[4] == 'i86pc' and - '/amd64/' in binary_abspath and - 'has wrong class or data encoding' in stderr) or - re.search(r'ELF machine type: EM_\w+: is incompatible with system', stderr) or - 'file is not a dynamic executable or shared object' in stderr): + '/amd64/' in binary_abspath and + 'has wrong class or data encoding' in stderr) or + re.search(r'ELF machine type: EM_\w+: ' + r'is incompatible with system', stderr) + or 'file is not a dynamic executable or shared object' in stderr): ldd_output[binary] = [] continue @@ -440,15 +440,15 @@ re_by_section = { 'version definition': (r""" - \s*(?:\[\d+\]\s+)? # index: might be not present if - # no version binding is enabled + \s*(?:\[\d+\]\s+)? # index: might be not present if no + # version binding is enabled (?P\S+) # version (?:\s+(?P\S+))? # dependency (?:\s+\[\s(?:BASE|WEAK)\s\])?\s*$ """), 'version needed': (r""" - \s*(?:\[(?P\d+)\]\s+)? # index: might be not present if - # no version binding is enabled + \s*(?:\[(?P\d+)\]\s+)? # index: might be not present if no + # version binding is enabled (?:(?P\S+)\s+ # file: can be absent if the same as (?!\[\s(?:INFO|WEAK)\s\]))? # the previous line, # we make sure there is no @@ -471,10 +471,10 @@ \s*(?:\[\d+\]) # index \s+(?P[ABCDFILNPS]+) # flags - \s+(?:(?:\[\d+\] # bound to: contains a library index - \s+(?P\S+)|)\s+)? # and the library name - # or fon non external - # symbols + \s+(?:(?:\[\d+\] # bound to: contains either + \s+(?P\S+)|)\s+)? # - library index and library name + # - for non external symbols + (?P\S+)\s* # symbol """)} @@ -507,20 +507,22 @@ sizes_differ = (r'^\trelocation \S+ sizes differ: ' r'(?P\S+)$') sizes_info = (r'^\t\t\(file (?P\S+)' - ' size=(?P0x\w+); ' + r' size=(?P0x\w+); ' r'file (?P\S+) size=(?P0x\w+)\)$') sizes_one_used = (r'^\t\t(?P\S+) size used; ' r'possible insufficient data copied$') unreferenced_object = (r'^\s*unreferenced object=(?P.*);' - ' unused dependency of (?P.*)$') + r' unused dependency of (?P.*)$') unused_object = (r'^\s*unused object=.*$') unused_search_path = (r'^\s*unused search path=.*' - ' \(RUNPATH/RPATH from file .*\)$') - move_offset_error = (r'^\tmove (?P\d+) offset invalid: \(unknown\): ' - r'offset=(?P0x[0-9a-f]+) lies outside memory image; ' - r'move discarded') - relocation_error = (r'relocation R_386_COPY sizes differ: (?P.*)' - r'|\t\t\(file .* size=0(?:x[0-9a-f]+)?; file .* size=0x(?:[0-9a-f]+)?\)' + r' \(RUNPATH/RPATH from file .*\)$') + move_offset_error = (r'^\tmove (?P\d+) offset invalid: ' + r'\(unknown\): offset=(?P0x[0-9a-f]+) ' + 'lies outside memory image; move discarded') + relocation_error = (r'relocation R_(386|AMD64|X86_64|SPARC)_\w+ ' + r'sizes differ: (?P.*)' + r'|\t\t\(file .* size=0(?:x[0-9a-f]+)?; file .*' + r'size=0x(?:[0-9a-f]+)?\)' r'|\t.* size used; possible data truncation') blank_line = (r'^\s*$') common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s)" @@ -594,7 +596,6 @@ response["path"] = None response["symbol"] = d['reloc_symbol'] - else: raise package.StdoutSyntaxError("Could not parse %s with %s" % (repr(line), common_re)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 5 21:58:41 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 05 Dec 2012 20:58:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[19822] csw/mgar/gar/v2-yann/lib/python Message-ID: Revision: 19822 http://gar.svn.sourceforge.net/gar/?rev=19822&view=rev Author: chninkel Date: 2012-12-05 20:58:41 +0000 (Wed, 05 Dec 2012) Log Message: ----------- gar/v2-yann: fixed version sorting Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/inspective_package.py csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-12-05 20:51:12 UTC (rev 19821) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-12-05 20:58:41 UTC (rev 19822) @@ -318,7 +318,7 @@ # soname version needed are usually displayed sorted by index ... # but that's not always the case :( so we have to reorder # the list by index - binary_info['version needed'].sort(key=lambda m: m['index']) + binary_info['version needed'].sort(key=lambda m: int(m['index'])) for version in binary_info['version needed']: del version['index'] Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py 2012-12-05 20:51:12 UTC (rev 19821) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py 2012-12-05 20:58:41 UTC (rev 19822) @@ -165,6 +165,7 @@ def test_ParseElfdumpLineVersionNeeded(self): line = '[13] SUNW_0.9 [ INFO ]' expected = { + 'index': '13', 'version': 'SUNW_0.9', 'soname': None } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 5 21:59:16 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 05 Dec 2012 20:59:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[19823] csw/mgar/gar/v2-yann/lib/python/testdata/ vsftpd_stats.py Message-ID: Revision: 19823 http://gar.svn.sourceforge.net/gar/?rev=19823&view=rev Author: chninkel Date: 2012-12-05 20:59:16 +0000 (Wed, 05 Dec 2012) Log Message: ----------- gar/v2-yann: added stats test data Added Paths: ----------- csw/mgar/gar/v2-yann/lib/python/testdata/vsftpd_stats.py Added: csw/mgar/gar/v2-yann/lib/python/testdata/vsftpd_stats.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/testdata/vsftpd_stats.py (rev 0) +++ csw/mgar/gar/v2-yann/lib/python/testdata/vsftpd_stats.py 2012-12-05 20:59:16 UTC (rev 19823) @@ -0,0 +1,10486 @@ +import datetime +pkgstats = [{'bad_paths': { '/usr/local': [ 'root/opt/csw/share/doc/vsftpd/INSTALL', + 'root/opt/csw/share/doc/vsftpd/Changelog', + 'root/opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.xinetd', + 'root/opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/README'], + '/usr/share': [ 'root/var/opt/csw/svc/manifest/network/cswvsftpd.xml', + 'root/opt/csw/share/doc/vsftpd/INSTALL', + 'root/opt/csw/share/doc/vsftpd/README.ssl']}, + 'basic_stats': { 'catalogname': 'vsftpd', + 'md5_sum': '23b5b5b7ca124e77e73489e09db922d4', + 'parsed_basename': { 'arch': 'sparc', + 'catalogname': 'vsftpd', + 'full_version_string': '3.0.0,REV=2012.08.25', + 'osrel': 'SunOS5.10', + 'revision_info': { 'REV': '2012.08.25'}, + 'vendortag': 'CSW', + 'version': '3.0.0', + 'version_info': { 'major version': '3', + 'minor version': '0', + 'patchlevel': '0'}}, + 'pkg_basename': 'vsftpd-3.0.0,REV=2012.08.25-SunOS5.10-sparc-CSW.pkg.gz', + 'pkg_path': '/tmp/pkg_vB6MQU/vsftpd-3.0.0,REV=2012.08.25-SunOS5.10-sparc-CSW.pkg.gz', + 'pkgname': 'CSWvsftpd', + 'size': 142963L, + 'stats_version': 12L}, + 'binaries': ['opt/csw/sbin/vsftpd'], + 'binaries_dump_info': [ { 'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'vsftpd', + 'needed sonames': ( 'libnsl.so.1', + 'libpam.so.1', + 'libsocket.so.1', + 'librt.so.1', + 'libsendfile.so.1', + 'libssl.so.1.0.0', + 'libcrypto.so.1.0.0', + 'libc.so.1'), + 'path': 'opt/csw/sbin/vsftpd', + 'runpath': ( '/opt/csw/lib/$ISALIST', + '/opt/csw/lib')}], + 'depends': [ ( 'CSWcas-initsmf', + 'CSWcas-initsmf cas_initsmf - Class action script initsmf '), + ( 'CSWcas-migrateconf', + 'CSWcas-migrateconf cas_migrateconf - Class action script migrateconf '), + ( 'CSWcas-preserveconf', + 'CSWcas-preserveconf cas_preserveconf - Class action script preserveconf '), + ( 'CSWcas-usergroup', + 'CSWcas-usergroup cas_usergroup - Class action script usergroup '), + ( 'CSWcommon', + 'CSWcommon common - common files and dirs for CSW packages '), + ( 'CSWlibssl1-0-0', + 'CSWlibssl1-0-0 libssl1_0_0 - Openssl 1.0 runtime libraries ')], + 'files_metadata': [ { 'mime_type': 'application/xml; charset=us-ascii', + 'path': 'var/opt/csw/svc/manifest/network/cswvsftpd.xml'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/LICENSE'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/README'}, + { 'mime_type': 'text/x-pascal; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/SIZE'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/FAQ'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/changelog.CSW'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/AUDIT'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/README.security'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/BUGS'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/README.CSW'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/TUNING'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/INSTALL'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/REWARD'}, + { 'mime_type': 'text/x-c++; charset=iso-8859-1', + 'path': 'opt/csw/share/doc/vsftpd/Changelog'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/REFS'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/TODO'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/BENCHMARKS'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/SPEED'}, + { 'mime_type': 'text/x-pascal; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/COPYING'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/README.ssl'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/COPYRIGHT'}, + { 'mime_type': 'text/x-pascal; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/license'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/SECURITY/OVERVIEW'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/SECURITY/IMPLEMENTATION'}, + { 'mime_type': 'text/x-pascal; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/SECURITY/TRUST'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/SECURITY/DESIGN'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_HOSTS/README'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD/README'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.xinetd'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/README'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.conf'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS/logins.txt'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS/vsftpd.pam'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS/vsftpd.conf'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/EXAMPLE/PER_IP_CONFIG/README'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/EXAMPLE/PER_IP_CONFIG/hosts.allow'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS_2/README'}, + { 'mime_type': 'text/troff; charset=us-ascii', + 'path': 'opt/csw/share/man/man5/vsftpd.conf.5'}, + { 'mime_type': 'text/troff; charset=us-ascii', + 'path': 'opt/csw/share/man/man8/vsftpd.8'}, + { 'endian': 'Big endian', + 'machine_id': 18, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/sbin/vsftpd'}, + { 'mime_type': 'text/x-shellscript; charset=us-ascii', + 'path': 'opt/csw/sbin/vsftpd.smf_wrapper'}, + { 'mime_type': 'text/x-shellscript; charset=us-ascii', + 'path': 'etc/opt/csw/init.d/cswvsftpd'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'etc/opt/csw/pkg/CSWvsftpd/cswmigrateconf'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'etc/opt/csw/pkg/CSWvsftpd/cswusergroup'}, + { 'mime_type': 'text/x-asm; charset=us-ascii', + 'path': 'etc/opt/csw/vsftpd/vsftpd.conf.CSW'}, + { 'mime_type': 'text/plain; charset=us-ascii', + 'path': 'etc/opt/csw/vsftpd/vsftpd.userlist.CSW'}], + 'i_depends': [], + 'isalist': frozenset([ 'sparc', + 'sparcv7', + 'sparcv8', + 'sparcv8-fsmuld', + 'sparcv8plus', + 'sparcv8plus+vis', + 'sparcv8plus+vis2', + 'sparcv9', + 'sparcv9+vis', + 'sparcv9+vis2']), + 'ldd_info': { 'opt/csw/sbin/vsftpd': [ { 'path': '/lib/libnsl.so.1', + 'soname': 'libnsl.so.1', + 'state': 'OK', + 'symbol': None}, + { 'path': '/lib/libpam.so.1', + 'soname': 'libpam.so.1', + 'state': 'OK', + 'symbol': None}, + { 'path': '/lib/libsocket.so.1', + 'soname': 'libsocket.so.1', + 'state': 'OK', + 'symbol': None}, + { 'path': '/lib/librt.so.1', + 'soname': 'librt.so.1', + 'state': 'OK', + 'symbol': None}, + { 'path': '/lib/libsendfile.so.1', + 'soname': 'libsendfile.so.1', + 'state': 'OK', + 'symbol': None}, + { 'path': '/opt/csw/lib/sparcv8plus+vis/libssl.so.1.0.0', + 'soname': 'libssl.so.1.0.0', + 'state': 'OK', + 'symbol': None}, + { 'path': '/opt/csw/lib/sparcv8plus+vis/libcrypto.so.1.0.0', + 'soname': 'libcrypto.so.1.0.0', + 'state': 'OK', + 'symbol': None}, + { 'path': '/lib/libc.so.1', + 'soname': 'libc.so.1', + 'state': 'OK', + 'symbol': None}, + { 'path': '/lib/libmp.so.2', + 'soname': 'libmp.so.2', + 'state': 'OK', + 'symbol': None}, + { 'path': '/lib/libmd.so.1', + 'soname': 'libmd.so.1', + 'state': 'OK', + 'symbol': None}, + { 'path': '/lib/libscf.so.1', + 'soname': 'libscf.so.1', + 'state': 'OK', + 'symbol': None}, + { 'path': '/lib/libcmd.so.1', + 'soname': 'libcmd.so.1', + 'state': 'OK', + 'symbol': None}, + { 'path': '/lib/libaio.so.1', + 'soname': 'libaio.so.1', + 'state': 'OK', + 'symbol': None}, + { 'path': '/lib/libdl.so.1', + 'soname': 'libdl.so.1', + 'state': 'OK', + 'symbol': None}, + { 'path': '/lib/libdoor.so.1', + 'soname': 'libdoor.so.1', + 'state': 'OK', + 'symbol': None}, + { 'path': '/lib/libuutil.so.1', + 'soname': 'libuutil.so.1', + 'state': 'OK', + 'symbol': None}, + { 'path': '/lib/libgen.so.1', + 'soname': 'libgen.so.1', + 'state': 'OK', + 'symbol': None}, + { 'path': '/lib/libm.so.2', + 'soname': 'libm.so.2', + 'state': 'OK', + 'symbol': None}]}, + 'mtime': datetime.datetime(2012, 8, 25, 12, 4, 51), + 'binaries_elf_info': { 'opt/csw/sbin/vsftpd': { 'symbol table': [ + { 'bind': 'LOCL', + 'shndx': 'UNDEF', + 'flags': None, + 'soname': None, + 'symbol': None, + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_two_process_listen', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libsocket.so.1', + 'symbol': '__xnet_bind', + 'version': 'SUNW_1.1'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'str_locate_text_reverse', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'priv_sock_get_result', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'ftp_getline', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_statbuf_get_date', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'ptrace_sandbox_permit_read', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_wait_reap_one', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_log_line', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_anon_max_rate', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_CTX_load_verify_locations', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_lock_file_write', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_install_async_sighandler', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_get_error', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_seteuid', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'gmtime', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_shutdown_failok', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_CTX_use_certificate_chain_file', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'ptrace_sandbox_alloc', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_connect_timeout', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_statbuf_get_links', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'str_equal', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'ssl_write_str', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'str_netfd_write', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_lseek_to', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'setgroups', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_check_pending_actions', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': '.st_double_foreff', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'str_contains_unprintable', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_write_enable', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'ptrace_sandbox_permit_readlink', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_dual_log_enable', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_free', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'str_get_char_at', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'str_locate_str', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'ssl_read', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_ftruncate', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_priv_parent_postlogin', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': '.st_int', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_CTX_set_verify', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_send_fd', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'gettimeofday', + 'version': 'SISCD_2.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_activate_noblock', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_set_no_fds', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_statbuf_get_uid', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_seteuid_numeric', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_memclr', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_fchmod', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_allow_writeable_chroot', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_background', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_map_anon_pages', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_ftpdataio_transfer_file', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_ftpdataio_dispose_transfer_fd', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'pututxline', + 'version': 'SUNW_0.7'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'ptrace_sandbox_set_getsockopt_validator', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_ls_recurse_enable', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_log_init', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_strict_ssl_write_shutdown', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libsocket.so.1', + 'symbol': 'shutdown', + 'version': 'SISCD_2.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_get_random_byte', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_chroot_local_user', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_set_exit_func', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_read', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_recv_fd', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'getpid', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'str_strcmp', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'hash_get_bucket', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_unix_stream_socketpair', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_parseconf_load_setting', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_two_process_pasv_active', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'opendir', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libsendfile.so.1', + 'symbol': 'sendfilev64', + 'version': 'SUNW_1.1'}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'sigaction', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'sigemptyset', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_require_ssl_reuse', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libcrypto.so.1.0.0', + 'symbol': 'ERR_get_error', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'ptrace_sandbox_permit_getdents', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_syslog_enable', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'str_free', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_activate_reuseaddr', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_ascii_upload_enable', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_getuid', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'putenv', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'ptrace_sandbox_permit_unlink', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_wait_get_exitcode', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'ssl_read_into_str', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_getpwuid', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_ctrl', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'getgrgid', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_default_sig', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'lstat64', + 'version': 'SUNW_1.1'}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libpam.so.1', + 'symbol': 'pam_authenticate', + 'version': 'SUNW_1.1'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'ptrace_sandbox_permit_fchown', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'ptrace_sandbox_permit_getsockopt', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': '.st_float', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'priv_sock_get_int', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_CIPHER_get_name', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'localtime', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'str_replace_unprintable', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'librt.so.1', + 'symbol': 'nanosleep', + 'version': 'SUNW_0.7'}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_set_fd', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_dirlist_enable', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_get_rbio', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_geteuid', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_rename', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'atoi', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'fchown', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_ftp_username', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': '_environ', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_make_session_leader', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'setregid', + 'version': 'SUNW_0.9'}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_CTX_set_cipher_list', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'ptrace_sandbox_permit_ftruncate', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_bind', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'sigprocmask', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': '.ld_double', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'handle_opts', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_dir_stat', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_user_get_homedir', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'srand', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'str_append_str', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_ulong_to_str', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'strncpy', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'N', + 'soname': None, + 'symbol': '_PROCEDURE_LINKAGE_TABLE_', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'rand', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'endutxent', + 'version': 'SUNW_0.7'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_initgroups', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_lock_file_read', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'priv_sock_get_cmd', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_log_ftp_protocol', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_xferlog_enable', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': '__fsr_init_value', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DL', + 'soname': 'librt.so.1', + 'symbol': 'close', + 'version': 'SUNW_1.2'}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'read', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_cmds_denied', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_cmdio_set_alarm', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libcrypto.so.1.0.0', + 'symbol': 'RAND_load_file', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'str_split_text', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_require_cert', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'closelog', + 'version': 'SUNW_0.7'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_connect_timeout', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libsocket.so.1', + 'symbol': 'getsockname', + 'version': 'SISCD_2.3'}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'getpwuid', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_memcmp', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_cmdio_write_str', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'strdup', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_secbuf_alloc', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunables_load_defaults', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_activate_keepalive', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_rsa_private_key_file', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'ptrace_sandbox_permit_alarm', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libcrypto.so.1.0.0', + 'symbol': 'EVP_sha256', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_banner_write', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_getsockname', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'chmod', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_banned_email_file', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_one_process_start', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_set_address_space_limit', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'tzset', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_sockaddr_get_raw_addr', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': '__xargv', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_chroot_list_enable', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'ptrace_sandbox_permit_recv', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'str_reserve', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'malloc', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'ptrace_sandbox_free', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_open_file', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_ssl_request_cert', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_chroot_list_file', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'str_locate_chars', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_trans_chunk_size', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'vsf_sysutil_clear_supp_groups', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'strftime', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'N', + 'soname': None, + 'symbol': '_end', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'getcwd', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL', + 'soname': 'libsocket.so.1', + 'symbol': 'recv', + 'version': 'SISCD_2.3'}, + { 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'D', + 'soname': 'libc.so.1', + 'symbol': 'chroot', + 'version': 'SYSVABI_1.3'}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'str_open', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'private_str_alloc_memchunk', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'hash_alloc', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_secure_chroot_dir', + 'version': None}, + { 'bind': 'GLOB', + 'shndx': '.text', + 'flags': 'DB', + 'soname': None, + 'symbol': 'tunable_ftp_enable', + 'version': None}, + { 'bind': 'GLOB', @@ 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 wilbury at users.sourceforge.net Wed Dec 5 23:37:42 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 05 Dec 2012 22:37:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[19824] csw/mgar/pkg/courier-imap/trunk Message-ID: Revision: 19824 http://gar.svn.sourceforge.net/gar/?rev=19824&view=rev Author: wilbury Date: 2012-12-05 22:37:42 +0000 (Wed, 05 Dec 2012) Log Message: ----------- courier-imap/trunk: Move further. Modified Paths: -------------- csw/mgar/pkg/courier-imap/trunk/Makefile csw/mgar/pkg/courier-imap/trunk/checksums Modified: csw/mgar/pkg/courier-imap/trunk/Makefile =================================================================== --- csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-05 20:59:16 UTC (rev 19823) +++ csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-05 22:37:42 UTC (rev 19824) @@ -4,26 +4,47 @@ NAME = courier-imap VERSION = 4.11.0 GARTYPE = v2 -CATEGORIES = category -DESCRIPTION = Brief description +DESCRIPTION = Courier IMAP define BLURB - Long description + Courier IMAP endef -MASTER_SITES = -DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = $(SF_MIRRORS) +SF_PROJECT = courier/imap +DISTFILES = $(DISTNAME).tar.bz2 -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc -# 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) +PACKAGES = CSWcourier-imap +SPKG_DESC_CSWcourier-imap = Courier IMAP +BUILD_DEP_PKGS_CSWcourier-imap += CSWmysql-dev +BUILD_DEP_PKGS_CSWcourier-imap += CSWpostgresql-dev +BUILD_DEP_PKGS_CSWcourier-imap += CSWopenldap-dev +RUNTIME_DEP_PKGS_CSWcourier-imap += CSWlibmysqlclient18 +RUNTIME_DEP_PKGS_CSWcourier-imap += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWcourier-imap += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWcourier-imap += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWcourier-imap += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWcourier-imap += CSWlibgdbm4 +RUNTIME_DEP_PKGS_CSWcourier-imap += CSWlibldap2-4-2 +OBSOLETED_BY_CSWcourier-imap += CSWcourierauth + +MIGRATE_SOURCE_DIR_CSWcourier-imap = $(prefix)/etc/courier-imap +MIGRATE_DEST_DIR_CSWcourier-imap = $(sysconfdir)/courier-imap + +PRESERVECONF += imapd +PRESERVECONF += pop3d +PRESERVECONF += imapd-ssl +PRESERVECONF += pop3d-ssl +PRESERVECONF += imapd.cnf +PRESERVECONF += pop3d.cnf + +PACKAGES += CSWcourier-imap-dev +SPKG_DESC_CSWcourier-imap-dev = Courier IMAP development files +PKGFILES_CSWcourier-imap-dev = $(PKGFILES_DEVEL) + include gar/category.mk Modified: csw/mgar/pkg/courier-imap/trunk/checksums =================================================================== --- csw/mgar/pkg/courier-imap/trunk/checksums 2012-12-05 20:59:16 UTC (rev 19823) +++ csw/mgar/pkg/courier-imap/trunk/checksums 2012-12-05 22:37:42 UTC (rev 19824) @@ -0,0 +1 @@ +6aa9a3487e1c255d1826833af362d1f7 courier-imap-4.11.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Dec 6 00:11:27 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 05 Dec 2012 23:11:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[19825] csw/mgar/pkg/courier-authlib/trunk/Makefile Message-ID: Revision: 19825 http://gar.svn.sourceforge.net/gar/?rev=19825&view=rev Author: wilbury Date: 2012-12-05 23:11:26 +0000 (Wed, 05 Dec 2012) Log Message: ----------- courier-authlib/trunk: Use gdbm explicitly. Modified Paths: -------------- csw/mgar/pkg/courier-authlib/trunk/Makefile Modified: csw/mgar/pkg/courier-authlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/courier-authlib/trunk/Makefile 2012-12-05 22:37:42 UTC (rev 19824) +++ csw/mgar/pkg/courier-authlib/trunk/Makefile 2012-12-05 23:11:26 UTC (rev 19825) @@ -24,6 +24,7 @@ CONFIGURE_ARGS += --with-mysql-includes=/opt/csw/include CONFIGURE_ARGS += --with-pgsql-lib=/opt/csw/lib CONFIGURE_ARGS += --with-pgsql-includes=/opt/csw/include/postgresql +CONFIGURE_ARGS += --with-db=gdbm PACKAGES = CSWcourier-authlib SPKG_DESC_CSWcourier-authlib = Courier auth library 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 Dec 6 10:22:50 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Dec 2012 09:22:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[19826] csw/mgar/gar/v2/lib/python/package.py Message-ID: Revision: 19826 http://gar.svn.sourceforge.net/gar/?rev=19826&view=rev Author: wahwah Date: 2012-12-06 09:22:49 +0000 (Thu, 06 Dec 2012) Log Message: ----------- checkpkg: use 'with' to open .pkg files Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package.py Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2012-12-05 23:11:26 UTC (rev 19825) +++ csw/mgar/gar/v2/lib/python/package.py 2012-12-06 09:22:49 UTC (rev 19826) @@ -190,10 +190,9 @@ def GetMd5sum(self): if not self.md5sum: logging.debug("GetMd5sum() reading file %s", repr(self.pkg_path)) - fp = open(self.pkg_path) hash = hashlib.md5() - hash.update(fp.read()) - fp.close() + with open(self.pkg_path) as fp: + hash.update(fp.read()) self.md5sum = hash.hexdigest() return self.md5sum 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 Dec 6 10:25:08 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Dec 2012 09:25:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[19827] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 19827 http://gar.svn.sourceforge.net/gar/?rev=19827&view=rev Author: wahwah Date: 2012-12-06 09:25:07 +0000 (Thu, 06 Dec 2012) Log Message: ----------- checkpkg: better deal with 'maybe unicode' pkgmap Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2012-12-06 09:22:49 UTC (rev 19826) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2012-12-06 09:25:07 UTC (rev 19827) @@ -503,7 +503,10 @@ pkgmap_paths = [x["path"] for x in pkgmap] for pkgmap_path in pkgmap_paths: try: - path_str = str(pkgmap_path) + if type(pkgmap_path) is unicode: + path_str = pkgmap_path.encode("utf-8") + else: + path_str = str(pkgmap_path) if re.search(ARCH_RE, path_str): reasons_to_be_arch_specific.append(( "archall-with-arch-paths", 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 Dec 6 11:02:36 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Dec 2012 10:02:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[19828] csw/mgar/pkg/libmhash/trunk/Makefile Message-ID: Revision: 19828 http://gar.svn.sourceforge.net/gar/?rev=19828&view=rev Author: dmichelsen Date: 2012-12-06 10:02:36 +0000 (Thu, 06 Dec 2012) Log Message: ----------- libmhash/trunk: Split packages Modified Paths: -------------- csw/mgar/pkg/libmhash/trunk/Makefile Modified: csw/mgar/pkg/libmhash/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmhash/trunk/Makefile 2012-12-06 09:25:07 UTC (rev 19827) +++ csw/mgar/pkg/libmhash/trunk/Makefile 2012-12-06 10:02:36 UTC (rev 19828) @@ -14,7 +14,7 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 -SPKG_SOURCEURL = http://mhash.sourceforge.net/ +VENDOR_URL = http://mhash.sourceforge.net/ EXTRA_CPPFLAGS = -D__const=const @@ -31,8 +31,17 @@ CONFIGURE_ARGS = $(DIRPATHS) # Always run testsuite as the code is prone to optimization errors -PACKAGES = CSWlibmhash +PACKAGES += CSWlibmhash2 +SPKG_DESC_CSWlibmhash2 = A uniform interface to a large number of hash algorithms, libmhash.so.2 +PKGFILES_CSWlibmhash2 += $(call pkgfiles_lib,libmhash.so.2) +OBSOLETED_BY_CSWlibmhash2 += CSWlibmhash + +PACKAGES += CSWlibmhash-dev +SPKG_DESC_CSWlibmhash-dev = Development files for libmash.so.2 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibmhash-dev += CSWlibmhash2 + include gar/category.mk # Don't include the most common defines. In general it is a bad idea to include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 6 11:32:36 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Dec 2012 10:32:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[19829] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 19829 http://gar.svn.sourceforge.net/gar/?rev=19829&view=rev Author: dmichelsen Date: 2012-12-06 10:32:36 +0000 (Thu, 06 Dec 2012) Log Message: ----------- mGAR v2: Fixate package output directory for long running builds Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2012-12-06 10:02:36 UTC (rev 19828) +++ csw/mgar/gar/v2/gar.pkg.mk 2012-12-06 10:32:36 UTC (rev 19829) @@ -208,7 +208,14 @@ SPKG_SPOOLROOT ?= $(DESTROOT) SPKG_SPOOLDIR ?= $(SPKG_SPOOLROOT)/spool.$(GAROSREL)-$(GARCH) -SPKG_EXPORT ?= $(HOME)/staging/build-$(shell date '+%d.%b.%Y') +ifdef SPKG_EXPORT +# The definition may include variable parts like a call to "date". This would lead to different directory names +# for multiple invocation in longs builds and a failing checkpkg due to lookup in wrong directories, so fixate +# once what we have. +SPKG_EXPORT := $(SPKG_EXPORT) +else +SPKG_EXPORT := $(HOME)/staging/build-$(shell date '+%d.%b.%Y') +endif SPKG_PKGROOT ?= $(PKGROOT) SPKG_PKGBASE ?= $(PKGROOT) SPKG_WORKDIR ?= $(CURDIR)/$(WORKDIR) @@ -216,6 +223,10 @@ SPKG_DEPEND_DB = $(GARDIR)/csw/depend.db +# These variables could change value transiently and need to be passed to subinvocations of GAR +_PASS_GAR_SUBINVOCATION_EXPORTS += SPKG_EXPORT +_PASS_GAR_ENV = $(foreach V,$(_PASS_GAR_SUBINVOCATION_EXPORTS),$V=$($V)) + # This is the old specification being evaluated during mkpackage. The expansion of the SPKG_REVSTAMP leads to # problems later on when need the filename for checkpkg again and too much time has passed. In the new approach # the packagename is directly put in the gspec. @@ -959,7 +970,7 @@ @echo @echo "The following packages have been built:" @echo - @$(MAKE) -s GAR_PLATFORM=$(GAR_PLATFORM) _pkgshow + @$(MAKE) -s $(_PASS_GAR_ENV) GAR_PLATFORM=$(GAR_PLATFORM) _pkgshow @echo @$(DONADA) @@ -968,7 +979,7 @@ dirpackage: _package @echo "The following packages have been built:" @echo - @$(MAKE) -s GAR_PLATFORM=$(GAR_PLATFORM) _dirpkgshow + @$(MAKE) -s $(_PASS_GAR_ENV) GAR_PLATFORM=$(GAR_PLATFORM) _dirpkgshow @echo @$(DONADA) @@ -1047,8 +1058,8 @@ $(foreach P,$(_PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) GAR_PLATFORM=$P _package && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "$(foreach V,$(_PROPAGATE_ENV),$(if $($V),$V=$($V))) $(MAKE) -I $(GARDIR) -C $(CURDIR) GAR_PLATFORM=$P _package" && \ + $(MAKE) $(_PASS_GAR_ENV) GAR_PLATFORM=$P _package && ,\ + $(SSH) -t $(PACKAGING_HOST_$P) "$(foreach V,$(_PROPAGATE_ENV),$(if $($V),$V=$($V))) $(MAKE) -I $(GARDIR) -C $(CURDIR) $(_PASS_GAR_ENV) GAR_PLATFORM=$P _package" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ @@ -1061,9 +1072,9 @@ $(if $(ARCHALL),echo " (suitable for all architectures)\c";) \ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ echo " (built on this host)";\ - $(MAKE) -s GAR_PLATFORM=$P _pkgshow;echo;,\ + $(MAKE) -s $(_PASS_GAR_ENV) GAR_PLATFORM=$P _pkgshow;echo;,\ echo " (built on host '$(PACKAGING_HOST_$P)')";\ - $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -I $(GARDIR) -C $(CURDIR) -s GAR_PLATFORM=$P _pkgshow";echo;\ + $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -I $(GARDIR) -C $(CURDIR) -s $(_PASS_GAR_ENV) GAR_PLATFORM=$P _pkgshow";echo;\ )\ ) @$(MAKECOOKIE) @@ -1073,8 +1084,8 @@ $(foreach P,$(_PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) -s GAR_PLATFORM=$P $* && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -I $(GARDIR) -C $(CURDIR) GAR_PLATFORM=$P $*" && \ + $(MAKE) -s $(_PASS_GAR_ENV) GAR_PLATFORM=$P $* && ,\ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -I $(GARDIR) -C $(CURDIR) $(_PASS_GAR_ENV) GAR_PLATFORM=$P $*" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Dec 6 13:00:33 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 06 Dec 2012 12:00:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[19830] csw/mgar/pkg/courier-imap/trunk/Makefile Message-ID: Revision: 19830 http://gar.svn.sourceforge.net/gar/?rev=19830&view=rev Author: wilbury Date: 2012-12-06 12:00:33 +0000 (Thu, 06 Dec 2012) Log Message: ----------- courier-imap/trunk: Builds cleanly, more work needed on SMF and probably others. Modified Paths: -------------- csw/mgar/pkg/courier-imap/trunk/Makefile Modified: csw/mgar/pkg/courier-imap/trunk/Makefile =================================================================== --- csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-06 10:32:36 UTC (rev 19829) +++ csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-06 12:00:33 UTC (rev 19830) @@ -17,21 +17,31 @@ PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-root-check +CONFIGURE_ARGS += --with-waitfunc=wait3 +CONFIGURE_ARGS += --enable-unicode +CONFIGURE_ARGS += --with-db=gdbm +CONFIGURE_ARGS += --with-userdb=/etc/opt/csw/authlib/userdb +CONFIGURE_ARGS += --with-certsdir=$(sysconfdir)/courier-imap +CONFIGURE_ARGS += --with-certdb=/etc/opt/csw/ssl/certs/ca-certificates.crt +REINPLACE_USRLOCAL += $(mandir)/man1/maildirmake.1 +REINPLACE_WHEN_USRLOCAL = postinstall + PACKAGES = CSWcourier-imap SPKG_DESC_CSWcourier-imap = Courier IMAP -BUILD_DEP_PKGS_CSWcourier-imap += CSWmysql-dev -BUILD_DEP_PKGS_CSWcourier-imap += CSWpostgresql-dev -BUILD_DEP_PKGS_CSWcourier-imap += CSWopenldap-dev -RUNTIME_DEP_PKGS_CSWcourier-imap += CSWlibmysqlclient18 -RUNTIME_DEP_PKGS_CSWcourier-imap += CSWlibpq5 -RUNTIME_DEP_PKGS_CSWcourier-imap += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWcourier-imap += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWcourier-imap += CSWlibsqlite3-0 +BUILD_DEP_PKGS_CSWcourier-imap += CSWcourier-authlib-dev +RUNTIME_DEP_PKGS_CSWcourier-imap += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWcourier-imap += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWcourier-imap += CSWlibfam0 RUNTIME_DEP_PKGS_CSWcourier-imap += CSWlibgdbm4 -RUNTIME_DEP_PKGS_CSWcourier-imap += CSWlibldap2-4-2 -OBSOLETED_BY_CSWcourier-imap += CSWcourierauth +RUNTIME_DEP_PKGS_CSWcourier-imap += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWcourier-imap += CSWcourier-authlib +OBSOLETED_BY_CSWcourier-imap += CSWcourierimap +EXTRA_LIB = $(prefix)/lib/courier-authlib +TEST_SCRIPTS = + MIGRATE_SOURCE_DIR_CSWcourier-imap = $(prefix)/etc/courier-imap MIGRATE_DEST_DIR_CSWcourier-imap = $(sysconfdir)/courier-imap @@ -42,9 +52,5 @@ PRESERVECONF += imapd.cnf PRESERVECONF += pop3d.cnf -PACKAGES += CSWcourier-imap-dev -SPKG_DESC_CSWcourier-imap-dev = Courier IMAP development files -PKGFILES_CSWcourier-imap-dev = $(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 Thu Dec 6 17:00:54 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Dec 2012 16:00:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[19831] csw/mgar/pkg/nasm/trunk Message-ID: Revision: 19831 http://gar.svn.sourceforge.net/gar/?rev=19831&view=rev Author: dmichelsen Date: 2012-12-06 16:00:54 +0000 (Thu, 06 Dec 2012) Log Message: ----------- nasm/trunk: Update to 2.10.06 and 64 bit Modified Paths: -------------- csw/mgar/pkg/nasm/trunk/Makefile csw/mgar/pkg/nasm/trunk/checksums Modified: csw/mgar/pkg/nasm/trunk/Makefile =================================================================== --- csw/mgar/pkg/nasm/trunk/Makefile 2012-12-06 12:00:33 UTC (rev 19830) +++ csw/mgar/pkg/nasm/trunk/Makefile 2012-12-06 16:00:54 UTC (rev 19831) @@ -1,6 +1,6 @@ # : Makefile 9089 2010-03-11 08:34:46Z wahwah $ NAME = nasm -VERSION = 2.10.05 +VERSION = 2.10.06 GARTYPE = v2 DESCRIPTION = The Netwide Assembler @@ -8,7 +8,7 @@ endef MASTER_SITES = http://www.nasm.us/pub/nasm/releasebuilds/$(VERSION)/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES = $(NAME)-$(VERSION).tar.xz # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -17,7 +17,8 @@ VENDOR_URL = http://www.nasm.us/ -CONFIGURE_ARGS = $(DIRPATHS) +BUILD64 = 1 +ISAEXEC = 1 TEST_TARGET = test Modified: csw/mgar/pkg/nasm/trunk/checksums =================================================================== --- csw/mgar/pkg/nasm/trunk/checksums 2012-12-06 12:00:33 UTC (rev 19830) +++ csw/mgar/pkg/nasm/trunk/checksums 2012-12-06 16:00:54 UTC (rev 19831) @@ -1 +1 @@ -d3c50875fd923b782749f883294336ed nasm-2.10.05.tar.bz2 +a5553fb4644dba74d02beaed6fd9e20e nasm-2.10.06.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Dec 7 00:32:39 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Thu, 06 Dec 2012 23:32:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[19832] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 19832 http://gar.svn.sourceforge.net/gar/?rev=19832&view=rev Author: claudio_sf Date: 2012-12-06 23:32:39 +0000 (Thu, 06 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: Perl 5.16.1 passing all tests. 5.16.2 and 64-bit to follow Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2012-12-06 16:00:54 UTC (rev 19831) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-12-06 23:32:39 UTC (rev 19832) @@ -1,5 +1,6 @@ NAME = perl -VERSION = 5.12.4 +VERSION = 5.16.1 +CATEGORIES = lang GARTYPE = v2 DESCRIPTION = A high-level, general-purpose programming language @@ -12,18 +13,20 @@ libraries. endef -MASTER_SITES = http://www.cpan.org/src/ -SPKG_SOURCEURL = http://www.cpan.org/src +#MASTER_SITES = http://www.cpan.org/src/ +#SPKG_SOURCEURL = http://www.cpan.org/src +MASTER_SITES = manual:// +DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz -DISTFILES = $(NAME)-$(VERSION).tar.gz - # Make extra Solaris 10 package with DTrace support -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS += solaris10-sparc PACKAGES += CSWperl SPKG_DESC_CSWperl = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 +#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 +RUNTIME_DEP_PKGS_CSWperl = INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags PACKAGES += CSWperldoc @@ -45,15 +48,21 @@ DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) +# GCC build (Sunstudio is problematic) # claudio +GARCOMPILER = GCC4 + + # Custom configure CONFIGURE_SCRIPTS = perl # Compatable with all prior patch revs -INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 +INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 # Force use of db-4.8 # TBD: Reinsert libperl.so, see below. -PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc +#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc +#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt +PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) #BUILD64 = 1 @@ -97,7 +106,7 @@ CONFIGURE_ARGS-32 += -Duselargefiles CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) -CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw +#CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw CONFIGURE_ARGS += -Dvendorprefix=$(prefix) CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" @@ -119,8 +128,9 @@ # embedding perl will have problems with duplicated static variables. # XXX Investigate further after 64 bit has built #EXTRA_LDFLAGS-32 = -L$(libdir) -lperl -EXTRA_LDFLAGS-32 = -L$(libdir) -EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) +EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib +EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib # We want 64 bit binaries #MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) @@ -153,8 +163,8 @@ # Splitting of a separate libperl.so requires more work and careful planning. # Override for now. -CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so -CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.12.4|soname=libperl.so.5.12.4|pkgname=CSWperl|expected=CSWlibperl5-12-4 +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 include gar/category.mk @@ -163,7 +173,7 @@ # TBD: Investigate post-extract-modulated: mkdir -p $(WORKSRC) - gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so + #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so @$(MAKECOOKIE) ifneq ($(CORE_UPDATES),) @@ -175,7 +185,7 @@ #configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS configure-perl: ARGS-64 = -dusedtrace configure-perl: - (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -des) + (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) #cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be @# 64 bit: -Duse64bitall @$(MAKECOOKIE) @@ -194,45 +204,46 @@ @$(MAKECOOKIE) # Make links to libperl -POST_TARGETS += libperl -LIB_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) -LIB_PATH = $(libdir)/perl/$(VERSION)/CORE -libperl: - @( cd $(DESTDIR)$(libdir) ; \ - mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ - $(DESTDIR)$(libdir) ; \ - chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ - ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) ; \ - ln -s libperl.so.$(VERSION) libperl.so ) - @$(MAKECOOKIE) +#POST_TARGETS += libperl +#LIB_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) +#LIB_PATH = $(libdir)/perl/$(VERSION)/CORE +#libperl: +# @( cd $(DESTDIR)$(libdir) ; \ +# mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ +# $(DESTDIR)$(libdir) ; \ +# chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ +# ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) +# #; \ +# #ln -s libperl.so.$(VERSION) libperl.so ) +# @$(MAKECOOKIE) # Remove build paths from Config -POST_TARGETS += perlconf -perlconf: - @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ - /bin/perl -i -lne "\ - next if /config_arg[1-9]/; \ - s/^config_args=.+$$/config_args=''/; \ - s/^config_argc=.+$$/config_argc='0'/; \ - s,-I$(DESTDIR)$(includedir),,g; \ - s,-[LR]$(DESTDIR)$(libdir),,g; \ - s,( -I$(includedir))+,\$$1,g; \ - s,( -[LR]$(libdir))+,\$$1,g; \ - s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ - s, (-L)?$(CC_HOME)\S+,,g; \ - if (/^\w+=/) { \ - s/\s{2,}(\-)/ \-/g; \ - s/(^\w+=.) /\$$1/; \ - s/ (.)$$/\$$1/g; \ - } \ - print \ - " Config.pm Config_heavy.pl ) - @$(MAKECOOKIE) +#POST_TARGETS += perlconf +#perlconf: +# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ +# /bin/perl -i -lne "\ +# next if /config_arg[1-9]/; \ +# s/^config_args=.+$$/config_args=''/; \ +# s/^config_argc=.+$$/config_argc='0'/; \ +# s,-I$(DESTDIR)$(includedir),,g; \ +# s,-[LR]$(DESTDIR)$(libdir),,g; \ +# s,( -I$(includedir))+,\$$1,g; \ +# s,( -[LR]$(libdir))+,\$$1,g; \ +# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ +# s, (-L)?$(CC_HOME)\S+,,g; \ +# if (/^\w+=/) { \ +# s/\s{2,}(\-)/ \-/g; \ +# s/(^\w+=.) /\$$1/; \ +# s/ (.)$$/\$$1/g; \ +# } \ +# print \ +# " Config.pm Config_heavy.pl ) +# @$(MAKECOOKIE) -POST_TARGETS += CSWperl.cswperlincpath -CSWperl.cswperlincpath: - LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath +#POST_TARGETS += CSWperl.cswperlincpath +#CSWperl.cswperlincpath: +# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath # Invoke post-install targets -post-install-modulated: $(POST_TARGETS) - @$(MAKECOOKIE) +#post-install-modulated: $(POST_TARGETS) +# @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Dec 7 08:31:24 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 07 Dec 2012 07:31:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[19833] csw/mgar/pkg/librecad/trunk/Makefile Message-ID: Revision: 19833 http://gar.svn.sourceforge.net/gar/?rev=19833&view=rev Author: cgrzemba Date: 2012-12-07 07:31:22 +0000 (Fri, 07 Dec 2012) Log Message: ----------- librecad/trunk: version bump 2.0 - files below libdir will not packaged, why??? Modified Paths: -------------- csw/mgar/pkg/librecad/trunk/Makefile Modified: csw/mgar/pkg/librecad/trunk/Makefile =================================================================== --- csw/mgar/pkg/librecad/trunk/Makefile 2012-12-06 23:32:39 UTC (rev 19832) +++ csw/mgar/pkg/librecad/trunk/Makefile 2012-12-07 07:31:22 UTC (rev 19833) @@ -1,9 +1,10 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # -NAME = LibreCAD -VERSION = 1.0.2 -GIT_VERSION = 216dc66b2a +NAME = libreCAD +GITNAME = LibreCAD +VERSION = 2.0.0alpha4 +# GIT_VERSION = 216dc66b2a GARTYPE = v2 CATEGORIES = gnome @@ -22,7 +23,7 @@ # https://github.com/LibreCAD/LibreCAD/tarball/master MASTER_SITES = # DISTFILES = $(DISTNAME).tar.gz -GIT_REPOS = http://github.com/$(NAME)/$(NAME).git +GIT_REPOS = http://github.com/$(GITNAME)/$(GITNAME).git GIT_USE_PROXY = 1 # GIT_TREEISH_LibreCAD.git = $(GIT_VERSION) @@ -39,8 +40,9 @@ BUILD_DEP_PKGS += CSWboost-gcc-dev BUILD_DEP_PKGS += CSWlibfreetype-dev -PACKAGES += CSWlibreCAD -CATALOGNAME_CSWlibreCAD = libreCAD +PACKAGES = CSWlibreCAD +CATALOGNAME_CSWlibreCAD = librecad +SPKG_DESC_CSWlibreCAD = $(DESCRIPTION) PKGFILES_CSWlibreCAD += $(call baseisadirs,$(bindir),.*) PKGFILES_CSWlibreCAD += $(datadir)/$(call tolower,$(NAME))/.* RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqthelp4-gxx @@ -52,10 +54,10 @@ RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibmuparser2-gxx # RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtsql4-gxx -CHECKPKG_OVERRIDES_CSWlibreCAD += file-with-bad-content|/usr/share|root/opt/csw/gxx/bin/librecad -CHECKPKG_OVERRIDES_CSWlibreCAD += catalogname-not-lowercase +# it had never exists: remove that as soon checkpkg could forget this +OBSOLETED_BY_CSWlibreCAD = CSWLibreCAD +CHECKPKG_OVERRIDES_CSWLibreCAD += catalogname-not-lowercase - CONFIGURE_ARGS = $(DIRPATHS) 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 Dec 7 10:14:43 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 07 Dec 2012 09:14:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[19834] csw/mgar/pkg/libcurl4/trunk Message-ID: Revision: 19834 http://gar.svn.sourceforge.net/gar/?rev=19834&view=rev Author: dmichelsen Date: 2012-12-07 09:14:43 +0000 (Fri, 07 Dec 2012) Log Message: ----------- libcurl4/trunk: Update to 7.28.1, add devel-dep to libidn-dev, simplify aux building target Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile csw/mgar/pkg/libcurl4/trunk/checksums Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2012-12-07 07:31:22 UTC (rev 19833) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2012-12-07 09:14:43 UTC (rev 19834) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.28.0 +VERSION = 7.28.1 GARTYPE = v2 DESCRIPTION = Command line tool and library for client-side URL transfers @@ -14,7 +14,7 @@ endef MASTER_SITES = http://curl.haxx.se/download/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES += $(NAME)-$(VERSION).tar.lzma # Because of OpenSSL 1.0 update PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -63,7 +63,8 @@ CATALOGNAME_CSWlibcurl-dev = libcurl_dev SPKG_DESC_CSWlibcurl-dev = Development files for libcurl.so.4 PKGFILES_CSWlibcurl-dev = $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibcurl-dev = CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWlibcurl-dev += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWlibcurl-dev += CSWlibidn-dev OBSOLETED_BY_CSWlibcurl-dev = CSWcurldevel CATALOGNAME_CSWcurldevel = curl_devel_stub @@ -88,6 +89,7 @@ BUILD_DEP_PKGS += CSWlibssh2-dev BUILD_DEP_PKGS += CSWlibfbopenssl-dev BUILD_DEP_PKGS += CSWlibrtmp-dev +BUILD_DEP_PKGS += CSWlibidn-dev VENDOR_URL = http://curl.haxx.se @@ -146,10 +148,12 @@ $(GARCOMPILER)_LD_FLAGS := # Rebuild the minimal library with AUX linkage to feature library -post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: EXTRA_LD_OPTIONS = -f libcurl-feature.so.4 -post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: - rm -f $(WORKSRC)/lib/libcurl.la - $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(WORKSRC)/lib $(BUILD_ARGS) +post-build-modulated: EXTRA_LD_OPTIONS = -f libcurl-feature.so.4 +post-build-modulated: + $(if $(filter minimal,$(FEATURES)),\ + rm -f $(WORKSRC)/lib/libcurl.la; \ + $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(WORKSRC)/lib $(BUILD_ARGS); \ + ) @$(MAKECOOKIE) post-merge: Modified: csw/mgar/pkg/libcurl4/trunk/checksums =================================================================== --- csw/mgar/pkg/libcurl4/trunk/checksums 2012-12-07 07:31:22 UTC (rev 19833) +++ csw/mgar/pkg/libcurl4/trunk/checksums 2012-12-07 09:14:43 UTC (rev 19834) @@ -1 +1 @@ -7fc605a13d1420b16bd03a2a6b5d7e8e curl-7.28.0.tar.bz2 +b716ab1103fd4bef99b98f5ff2c7b638 curl-7.28.1.tar.lzma 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 Dec 7 10:18:36 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 07 Dec 2012 09:18:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[19835] csw/mgar/pkg/libcurl4/trunk/Makefile Message-ID: Revision: 19835 http://gar.svn.sourceforge.net/gar/?rev=19835&view=rev Author: dmichelsen Date: 2012-12-07 09:18:36 +0000 (Fri, 07 Dec 2012) Log Message: ----------- libcurl4/trunk: Fix symlink to 4.3.0 soname Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2012-12-07 09:14:43 UTC (rev 19834) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2012-12-07 09:18:36 UTC (rev 19835) @@ -160,9 +160,9 @@ @# This is needed because the substitutions from pax args do not change the @# contents of the symlink rm -f $(PKGROOT)$(libdir)/libcurl-feature.so.4 - ln -s libcurl-feature.so.4.2.0 $(PKGROOT)$(libdir)/libcurl-feature.so.4 + ln -s libcurl-feature.so.4.3.0 $(PKGROOT)$(libdir)/libcurl-feature.so.4 rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libcurl-feature.so.4 - ln -s libcurl-feature.so.4.2.0 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libcurl-feature.so.4 + ln -s libcurl-feature.so.4.3.0 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libcurl-feature.so.4 pwd gdiff -D 64bit \ $(WORKROOTDIR)/install-isa-$(ISA_DEFAULT64)-features-minimal$(includedir)/curl/curlbuild.h \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Dec 7 10:25:18 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 07 Dec 2012 09:25:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[19836] csw/mgar/pkg/librecad/trunk/Makefile Message-ID: Revision: 19836 http://gar.svn.sourceforge.net/gar/?rev=19836&view=rev Author: cgrzemba Date: 2012-12-07 09:25:17 +0000 (Fri, 07 Dec 2012) Log Message: ----------- librecad/trunk: fix package content Modified Paths: -------------- csw/mgar/pkg/librecad/trunk/Makefile Modified: csw/mgar/pkg/librecad/trunk/Makefile =================================================================== --- csw/mgar/pkg/librecad/trunk/Makefile 2012-12-07 09:18:36 UTC (rev 19835) +++ csw/mgar/pkg/librecad/trunk/Makefile 2012-12-07 09:25:17 UTC (rev 19836) @@ -43,8 +43,8 @@ PACKAGES = CSWlibreCAD CATALOGNAME_CSWlibreCAD = librecad SPKG_DESC_CSWlibreCAD = $(DESCRIPTION) -PKGFILES_CSWlibreCAD += $(call baseisadirs,$(bindir),.*) -PKGFILES_CSWlibreCAD += $(datadir)/$(call tolower,$(NAME))/.* +# PKGFILES_CSWlibreCAD += $(call baseisadirs,$(bindir),.*) +# PKGFILES_CSWlibreCAD += $(datadir)/$(call tolower,$(NAME))/.* RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqthelp4-gxx RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtcore4-gxx RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibstdc++6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Dec 7 10:27:32 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 07 Dec 2012 09:27:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[19837] csw/mgar/pkg/perl/trunk Message-ID: Revision: 19837 http://gar.svn.sourceforge.net/gar/?rev=19837&view=rev Author: claudio_sf Date: 2012-12-07 09:27:32 +0000 (Fri, 07 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: 5.16.1/2 Makefiles Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile csw/mgar/pkg/perl/trunk/checksums Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2012-12-07 09:25:17 UTC (rev 19836) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-12-07 09:27:32 UTC (rev 19837) @@ -1,6 +1,6 @@ NAME = perl -VERSION = 5.16.1 -CATEGORIES = lang +VERSION = 5.16.2 +#CATEGORIES = lang GARTYPE = v2 DESCRIPTION = A high-level, general-purpose programming language Modified: csw/mgar/pkg/perl/trunk/checksums =================================================================== --- csw/mgar/pkg/perl/trunk/checksums 2012-12-07 09:25:17 UTC (rev 19836) +++ csw/mgar/pkg/perl/trunk/checksums 2012-12-07 09:27:32 UTC (rev 19837) @@ -1 +1 @@ -fd22aba88e4e27ab879f142eec6452a0 perl-5.12.4.tar.gz +7f6ebc2a7f80a43e6f1ecfb88b61a82d perl-5.16.2-patched.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Dec 7 10:31:00 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 07 Dec 2012 09:31:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[19838] csw/mgar/pkg/perl/trunk Message-ID: Revision: 19838 http://gar.svn.sourceforge.net/gar/?rev=19838&view=rev Author: claudio_sf Date: 2012-12-07 09:31:00 +0000 (Fri, 07 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: 5.16.1/2 Makefiles Added Paths: ----------- csw/mgar/pkg/perl/trunk/Makefile_5.16.1 csw/mgar/pkg/perl/trunk/Makefile_5.16.2 Added: csw/mgar/pkg/perl/trunk/Makefile_5.16.1 =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.1 (rev 0) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.1 2012-12-07 09:31:00 UTC (rev 19838) @@ -0,0 +1,249 @@ +NAME = perl +VERSION = 5.16.1 +#CATEGORIES = lang +GARTYPE = v2 + +DESCRIPTION = A high-level, general-purpose programming language +define BLURB + Perl is a high-level, general-purpose programming language that makes easy + things easy and hard things possible. It is optimized for scanning arbitrary + text files and system administration. It has built-in extended regular + expression matching and replacement, a dataflow mechanism to improve security + with setuid scripts and is extendable via modules that can interface to C + libraries. +endef + +#MASTER_SITES = http://www.cpan.org/src/ +#SPKG_SOURCEURL = http://www.cpan.org/src +MASTER_SITES = manual:// +DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz + +# Make extra Solaris 10 package with DTrace support +#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS += solaris10-sparc + +PACKAGES += CSWperl +SPKG_DESC_CSWperl = $(DESCRIPTION) +#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 +RUNTIME_DEP_PKGS_CSWperl = +INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags + +PACKAGES += CSWperldoc +SPKG_DESC_CSWperldoc = Perl documentation +RUNTIME_DEP_PKGS_CSWperldoc = CSWperl +ARCHALL_CSWperldoc = 1 + +LICENSE = Copying + +CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl + +# Core module updates +# Not used at the moment, leave one as example +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ +#CORE_UPDATES += PathTools-3.30 +#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd + +DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) + +# GCC build (Sunstudio is problematic) # claudio +GARCOMPILER = GCC4 + + +# Custom configure +CONFIGURE_SCRIPTS = perl + +# Compatable with all prior patch revs +INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 + +# Force use of db-4.8 +# TBD: Reinsert libperl.so, see below. +#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc +#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt +PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt +PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) + +#BUILD64 = 1 + +# Configuration flags +CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) +CONFIGURE_ARGS += -Dcc=$(CC) +CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" +CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" +CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) +CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" +CONFIGURE_ARGS += -Dld=$(CC) +CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" +CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) +CONFIGURE_ARGS += -Dlocincpth=$(includedir) +CONFIGURE_ARGS += -Dloclibpth=$(libdir) +CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 +CONFIGURE_ARGS += -Dman1ext=1 +CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 +CONFIGURE_ARGS += -Dman3ext=3perl +CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" +CONFIGURE_ARGS += -Dperladmin="root at localhost" +CONFIGURE_ARGS += -Dprefix=$(prefix) +CONFIGURE_ARGS += -Dbin=$(bindir) +CONFIGURE_ARGS += -Dscriptdir=$(bindir) +CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) +CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl +CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl +CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 +CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 +CONFIGURE_ARGS += -Dsiteprefix=/usr +CONFIGURE_ARGS += -Duseshrplib +CONFIGURE_ARGS += -Dusesitecustomize +CONFIGURE_ARGS += -Dusethreads + +# When built on Solaris 10, enable DTrace support +CONFIGURE_ARGS-5.10 = -Dusedtrace +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) + +# Largefiles is on by default for 64 bit +CONFIGURE_ARGS-32 += -Duselargefiles +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) + +#CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw +CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw +CONFIGURE_ARGS += -Dvendorprefix=$(prefix) +CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" +CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" +CONFIGURE_ARGS += -Dsed=$(bindir)/gsed + +EXTRA_LIB += $(prefix)/bdb48/lib +EXTRA_INC += $(prefix)/bdb48/include + +# Somehow the CPPFLAGS do not make it into the compile environment. +# Add them explicitly here, otherwise specifically the bdb48/include will +# not make it resulting in db.h not to be found and DB_File.pm not to be built +# as reported here: +# https://www.opencsw.org/mantis/view.php?id=4544 +EXTRA_CFLAGS = $(CPPFLAGS) + +# Adding -lperl requires that libperl.so is available during compilation, which is not +# the case on bootstrapping. However, we require explicit libperl linkage or programs +# embedding perl will have problems with duplicated static variables. +# XXX Investigate further after 64 bit has built +#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl +EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib +EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib + +# We want 64 bit binaries +#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) + +EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod +PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* + +# The diagnostics.pm module needs the podfile to output its messages. +# That means it must be included in the main package, not the docs. +EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod +EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod + +# Tests take a long time, run once for every release +TEST_SCRIPTS = + +BUILD_SCRIPTS = perl + +TEST_SCRIPTS = perl + +# Make sure we don't include the path to the newly built perl as the +# library is not in place yet. +IGNORE_DESTDIR = 1 + +# Do not exclude static libs as at least DynaLoader.a is needed for XS compilation +MERGE_EXCLUDE_STATICLIBS = + +# This is for the communication with checkpkg. These pathes are searched for modules +# when resolving dependencies. +PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") + +# Splitting of a separate libperl.so requires more work and careful planning. +# Override for now. +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 + +include gar/category.mk + +# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and +# the one in $WORKSRC has not been built yet +# TBD: Investigate +post-extract-modulated: + mkdir -p $(WORKSRC) + #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so + @$(MAKECOOKIE) + +ifneq ($(CORE_UPDATES),) +POST_TARGETS = install-core-updates +include files/updatecore.mk +endif + +# How to configure Perl +#configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS +configure-perl: ARGS-64 = -dusedtrace +configure-perl: + (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) + #cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be + @# 64 bit: -Duse64bitall + @$(MAKECOOKIE) + +build-perl: BUILD_EXPORTS = LD_OPTIONS +build-perl: + @echo " ==> Running make in $*" + @#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) + cd $(WORKSRC) && $(BUILD_ENV) gmake + @$(MAKECOOKIE) + +test-perl: + @echo " ==> Running make $(TEST_TARGET) in $*" + @#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) + cd $(WORKSRC) && gmake check + @$(MAKECOOKIE) + +# Make links to libperl +#POST_TARGETS += libperl +#LIB_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) +#LIB_PATH = $(libdir)/perl/$(VERSION)/CORE +#libperl: +# @( cd $(DESTDIR)$(libdir) ; \ +# mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ +# $(DESTDIR)$(libdir) ; \ +# chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ +# ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) +# #; \ +# #ln -s libperl.so.$(VERSION) libperl.so ) +# @$(MAKECOOKIE) + +# Remove build paths from Config +#POST_TARGETS += perlconf +#perlconf: +# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ +# /bin/perl -i -lne "\ +# next if /config_arg[1-9]/; \ +# s/^config_args=.+$$/config_args=''/; \ +# s/^config_argc=.+$$/config_argc='0'/; \ +# s,-I$(DESTDIR)$(includedir),,g; \ +# s,-[LR]$(DESTDIR)$(libdir),,g; \ +# s,( -I$(includedir))+,\$$1,g; \ +# s,( -[LR]$(libdir))+,\$$1,g; \ +# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ +# s, (-L)?$(CC_HOME)\S+,,g; \ +# if (/^\w+=/) { \ +# s/\s{2,}(\-)/ \-/g; \ +# s/(^\w+=.) /\$$1/; \ +# s/ (.)$$/\$$1/g; \ +# } \ +# print \ +# " Config.pm Config_heavy.pl ) +# @$(MAKECOOKIE) + +#POST_TARGETS += CSWperl.cswperlincpath +#CSWperl.cswperlincpath: +# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath + +# Invoke post-install targets +#post-install-modulated: $(POST_TARGETS) +# @$(MAKECOOKIE) Added: csw/mgar/pkg/perl/trunk/Makefile_5.16.2 =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2 (rev 0) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2 2012-12-07 09:31:00 UTC (rev 19838) @@ -0,0 +1,249 @@ +NAME = perl +VERSION = 5.16.2 +#CATEGORIES = lang +GARTYPE = v2 + +DESCRIPTION = A high-level, general-purpose programming language +define BLURB + Perl is a high-level, general-purpose programming language that makes easy + things easy and hard things possible. It is optimized for scanning arbitrary + text files and system administration. It has built-in extended regular + expression matching and replacement, a dataflow mechanism to improve security + with setuid scripts and is extendable via modules that can interface to C + libraries. +endef + +#MASTER_SITES = http://www.cpan.org/src/ +#SPKG_SOURCEURL = http://www.cpan.org/src +MASTER_SITES = manual:// +DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz + +# Make extra Solaris 10 package with DTrace support +#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS += solaris10-sparc + +PACKAGES += CSWperl +SPKG_DESC_CSWperl = $(DESCRIPTION) +#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 +RUNTIME_DEP_PKGS_CSWperl = +INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags + +PACKAGES += CSWperldoc +SPKG_DESC_CSWperldoc = Perl documentation +RUNTIME_DEP_PKGS_CSWperldoc = CSWperl +ARCHALL_CSWperldoc = 1 + +LICENSE = Copying + +CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl + +# Core module updates +# Not used at the moment, leave one as example +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ +#CORE_UPDATES += PathTools-3.30 +#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd + +DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) + +# GCC build (Sunstudio is problematic) # claudio +GARCOMPILER = GCC4 + + +# Custom configure +CONFIGURE_SCRIPTS = perl + +# Compatable with all prior patch revs +INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 + +# Force use of db-4.8 +# TBD: Reinsert libperl.so, see below. +#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc +#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt +PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt +PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) + +#BUILD64 = 1 + +# Configuration flags +CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) +CONFIGURE_ARGS += -Dcc=$(CC) +CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" +CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" +CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) +CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" +CONFIGURE_ARGS += -Dld=$(CC) +CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" +CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) +CONFIGURE_ARGS += -Dlocincpth=$(includedir) +CONFIGURE_ARGS += -Dloclibpth=$(libdir) +CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 +CONFIGURE_ARGS += -Dman1ext=1 +CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 +CONFIGURE_ARGS += -Dman3ext=3perl +CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" +CONFIGURE_ARGS += -Dperladmin="root at localhost" +CONFIGURE_ARGS += -Dprefix=$(prefix) +CONFIGURE_ARGS += -Dbin=$(bindir) +CONFIGURE_ARGS += -Dscriptdir=$(bindir) +CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) +CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl +CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl +CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 +CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 +CONFIGURE_ARGS += -Dsiteprefix=/usr +CONFIGURE_ARGS += -Duseshrplib +CONFIGURE_ARGS += -Dusesitecustomize +CONFIGURE_ARGS += -Dusethreads + +# When built on Solaris 10, enable DTrace support +CONFIGURE_ARGS-5.10 = -Dusedtrace +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) + +# Largefiles is on by default for 64 bit +CONFIGURE_ARGS-32 += -Duselargefiles +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) + +#CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw +CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw +CONFIGURE_ARGS += -Dvendorprefix=$(prefix) +CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" +CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" +CONFIGURE_ARGS += -Dsed=$(bindir)/gsed + +EXTRA_LIB += $(prefix)/bdb48/lib +EXTRA_INC += $(prefix)/bdb48/include + +# Somehow the CPPFLAGS do not make it into the compile environment. +# Add them explicitly here, otherwise specifically the bdb48/include will +# not make it resulting in db.h not to be found and DB_File.pm not to be built +# as reported here: +# https://www.opencsw.org/mantis/view.php?id=4544 +EXTRA_CFLAGS = $(CPPFLAGS) + +# Adding -lperl requires that libperl.so is available during compilation, which is not +# the case on bootstrapping. However, we require explicit libperl linkage or programs +# embedding perl will have problems with duplicated static variables. +# XXX Investigate further after 64 bit has built +#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl +EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib +EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib + +# We want 64 bit binaries +#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) + +EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod +PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* + +# The diagnostics.pm module needs the podfile to output its messages. +# That means it must be included in the main package, not the docs. +EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod +EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod + +# Tests take a long time, run once for every release +TEST_SCRIPTS = + +BUILD_SCRIPTS = perl + +TEST_SCRIPTS = perl + +# Make sure we don't include the path to the newly built perl as the +# library is not in place yet. +IGNORE_DESTDIR = 1 + +# Do not exclude static libs as at least DynaLoader.a is needed for XS compilation +MERGE_EXCLUDE_STATICLIBS = + +# This is for the communication with checkpkg. These pathes are searched for modules +# when resolving dependencies. +PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") + +# Splitting of a separate libperl.so requires more work and careful planning. +# Override for now. +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 + +include gar/category.mk + +# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and +# the one in $WORKSRC has not been built yet +# TBD: Investigate +post-extract-modulated: + mkdir -p $(WORKSRC) + #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so + @$(MAKECOOKIE) + +ifneq ($(CORE_UPDATES),) +POST_TARGETS = install-core-updates +include files/updatecore.mk +endif + +# How to configure Perl +#configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS +configure-perl: ARGS-64 = -dusedtrace +configure-perl: + (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) + #cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be + @# 64 bit: -Duse64bitall + @$(MAKECOOKIE) + +build-perl: BUILD_EXPORTS = LD_OPTIONS +build-perl: + @echo " ==> Running make in $*" + @#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) + cd $(WORKSRC) && $(BUILD_ENV) gmake + @$(MAKECOOKIE) + +test-perl: + @echo " ==> Running make $(TEST_TARGET) in $*" + @#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) + cd $(WORKSRC) && gmake check + @$(MAKECOOKIE) + +# Make links to libperl +#POST_TARGETS += libperl +#LIB_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) +#LIB_PATH = $(libdir)/perl/$(VERSION)/CORE +#libperl: +# @( cd $(DESTDIR)$(libdir) ; \ +# mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ +# $(DESTDIR)$(libdir) ; \ +# chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ +# ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) +# #; \ +# #ln -s libperl.so.$(VERSION) libperl.so ) +# @$(MAKECOOKIE) + +# Remove build paths from Config +#POST_TARGETS += perlconf +#perlconf: +# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ +# /bin/perl -i -lne "\ +# next if /config_arg[1-9]/; \ +# s/^config_args=.+$$/config_args=''/; \ +# s/^config_argc=.+$$/config_argc='0'/; \ +# s,-I$(DESTDIR)$(includedir),,g; \ +# s,-[LR]$(DESTDIR)$(libdir),,g; \ +# s,( -I$(includedir))+,\$$1,g; \ +# s,( -[LR]$(libdir))+,\$$1,g; \ +# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ +# s, (-L)?$(CC_HOME)\S+,,g; \ +# if (/^\w+=/) { \ +# s/\s{2,}(\-)/ \-/g; \ +# s/(^\w+=.) /\$$1/; \ +# s/ (.)$$/\$$1/g; \ +# } \ +# print \ +# " Config.pm Config_heavy.pl ) +# @$(MAKECOOKIE) + +#POST_TARGETS += CSWperl.cswperlincpath +#CSWperl.cswperlincpath: +# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath + +# Invoke post-install targets +#post-install-modulated: $(POST_TARGETS) +# @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Dec 7 10:52:01 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 07 Dec 2012 09:52:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[19839] csw/mgar/pkg Message-ID: Revision: 19839 http://gar.svn.sourceforge.net/gar/?rev=19839&view=rev Author: cgrzemba Date: 2012-12-07 09:52:01 +0000 (Fri, 07 Dec 2012) Log Message: ----------- gocr/trunk: Initial commit: bring it to gar Added Paths: ----------- csw/mgar/pkg/gocr/ csw/mgar/pkg/gocr/Makefile csw/mgar/pkg/gocr/branches/ csw/mgar/pkg/gocr/tags/ csw/mgar/pkg/gocr/trunk/ csw/mgar/pkg/gocr/trunk/Makefile csw/mgar/pkg/gocr/trunk/checksums csw/mgar/pkg/gocr/trunk/files/ Added: csw/mgar/pkg/gocr/Makefile =================================================================== --- csw/mgar/pkg/gocr/Makefile (rev 0) +++ csw/mgar/pkg/gocr/Makefile 2012-12-07 09:52:01 UTC (rev 19839) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/gocr/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/gocr/trunk/Makefile =================================================================== --- csw/mgar/pkg/gocr/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gocr/trunk/Makefile 2012-12-07 09:52:01 UTC (rev 19839) @@ -0,0 +1,29 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = gocr +VERSION = 0.49 +GARTYPE = v2 + +DESCRIPTION = GOCR is Optical Character Recognition +define BLURB + GOCR is an OCR (Optical Character Recognition) program, developed under the GNU Public License. It converts scanned images of text back to text files. Joerg Schulenburg started the program, and now leads a team of developers. +GOCR can be used with different front-ends, which makes it very easy to port to different OSes and architectures. It can open many different image formats, and its quality have been improving in a daily basis. +endef + +MASTER_SITES = http://www-e.uni-magdeburg.de/jschulen/ocr/ +DISTFILES = $(DISTNAME).tar.gz +LICENSE = CREDITS + +GARCOMPILER = GCC4 +# no target +SKIPTEST = 1 + +RUNTIME_DEP_PKGS_CSWgocr += CSWlibnetpbm10 +CHECKPKG_OVERRIDES_CSWgocr += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/gocr.1 + + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/gocr/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/gocr/trunk/checksums =================================================================== --- csw/mgar/pkg/gocr/trunk/checksums (rev 0) +++ csw/mgar/pkg/gocr/trunk/checksums 2012-12-07 09:52:01 UTC (rev 19839) @@ -0,0 +1 @@ +4e527bc4bdd97c2be15fdd818857507f gocr-0.49.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 7 12:53:14 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 07 Dec 2012 11:53:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[19840] csw/mgar/pkg/ngrep/trunk Message-ID: Revision: 19840 http://gar.svn.sourceforge.net/gar/?rev=19840&view=rev Author: dmichelsen Date: 2012-12-07 11:53:13 +0000 (Fri, 07 Dec 2012) Log Message: ----------- ngrep/trunk: Update to latest standards, enable pcre Modified Paths: -------------- csw/mgar/pkg/ngrep/trunk/Makefile csw/mgar/pkg/ngrep/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/ngrep/trunk/files/CSWngrep.depend csw/mgar/pkg/ngrep/trunk/files/CSWngrep.gspec Modified: csw/mgar/pkg/ngrep/trunk/Makefile =================================================================== --- csw/mgar/pkg/ngrep/trunk/Makefile 2012-12-07 09:52:01 UTC (rev 19839) +++ csw/mgar/pkg/ngrep/trunk/Makefile 2012-12-07 11:53:13 UTC (rev 19840) @@ -1,6 +1,5 @@ NAME = ngrep VERSION = 1.45 -GARTYPE = v1 DESCRIPTION = Network grep define BLURB @@ -15,17 +14,24 @@ endef MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWngrep,depend) -PATCHFILES = gar-base.diff +DISTFILES += $(NAME)-$(VERSION).tar.bz2 +PATCHFILES += gar-base.diff + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10752 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -CONFIGURE_ARGS = $(DIRPATHS) +LICENSE = LICENSE.txt +RUNTIME_DEP_PKGS_CSWngrep += CSWlibpcap1 + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --enable-ipv6 +CONFIGURE_ARGS += --enable-pcre + +# There is no testsuite TEST_TARGET = include gar/category.mk Modified: csw/mgar/pkg/ngrep/trunk/checksums =================================================================== --- csw/mgar/pkg/ngrep/trunk/checksums 2012-12-07 09:52:01 UTC (rev 19839) +++ csw/mgar/pkg/ngrep/trunk/checksums 2012-12-07 11:53:13 UTC (rev 19840) @@ -1,4 +1 @@ -bc8150331601f3b869549c94866b4f1c download/ngrep-1.45.tar.bz2 -5e2237028f0a10737c9f43d9238d0e45 download/CSWngrep.gspec -3e26b12ebf786b56e8ed1f5192734784 download/CSWngrep.depend -5141640525e886b99f408836c06eb02c download/gar-base.diff +bc8150331601f3b869549c94866b4f1c ngrep-1.45.tar.bz2 Deleted: csw/mgar/pkg/ngrep/trunk/files/CSWngrep.depend =================================================================== --- csw/mgar/pkg/ngrep/trunk/files/CSWngrep.depend 2012-12-07 09:52:01 UTC (rev 19839) +++ csw/mgar/pkg/ngrep/trunk/files/CSWngrep.depend 2012-12-07 11:53:13 UTC (rev 19840) @@ -1 +0,0 @@ -P CSWlibpcap libpcap - Libpcap is a system-independent interface for user-level packet capture Deleted: csw/mgar/pkg/ngrep/trunk/files/CSWngrep.gspec =================================================================== --- csw/mgar/pkg/ngrep/trunk/files/CSWngrep.gspec 2012-12-07 09:52:01 UTC (rev 19839) +++ csw/mgar/pkg/ngrep/trunk/files/CSWngrep.gspec 2012-12-07 11:53:13 UTC (rev 19840) @@ -1,4 +0,0 @@ -%var bitname ngrep -%var pkgname CSWngrep -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 7 13:30:16 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 07 Dec 2012 12:30:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[19841] csw/mgar/pkg Message-ID: Revision: 19841 http://gar.svn.sourceforge.net/gar/?rev=19841&view=rev Author: dmichelsen Date: 2012-12-07 12:30:15 +0000 (Fri, 07 Dec 2012) Log Message: ----------- epstool: Initial commit, more work needed Added Paths: ----------- csw/mgar/pkg/epstool/ csw/mgar/pkg/epstool/Makefile csw/mgar/pkg/epstool/branches/ csw/mgar/pkg/epstool/tags/ csw/mgar/pkg/epstool/trunk/ csw/mgar/pkg/epstool/trunk/Makefile csw/mgar/pkg/epstool/trunk/checksums csw/mgar/pkg/epstool/trunk/files/ Added: csw/mgar/pkg/epstool/Makefile =================================================================== --- csw/mgar/pkg/epstool/Makefile (rev 0) +++ csw/mgar/pkg/epstool/Makefile 2012-12-07 12:30:15 UTC (rev 19841) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/epstool/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/epstool/trunk/Makefile =================================================================== --- csw/mgar/pkg/epstool/trunk/Makefile (rev 0) +++ csw/mgar/pkg/epstool/trunk/Makefile 2012-12-07 12:30:15 UTC (rev 19841) @@ -0,0 +1,23 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = epstool +VERSION = 3.08 + +DESCRIPTION = Utility to create or extract preview images in EPS files, fix bounding boxes and convert + +MASTER_SITES += http://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/ +MASTER_SITES += http://ctan.org/tex-archive/support/ghostscript/ghostgum/ +DISTFILES += $(DISTNAME).tar.gz + +VENDOR_URL = http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm + +LICENCE = LICENCE + +# There is no configure +CONFIGURE_SCRIPTS = + +BUILD_SCRIPTS = $(WORKSRC)/makefile + +include gar/category.mk + Property changes on: csw/mgar/pkg/epstool/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/epstool/trunk/checksums =================================================================== --- csw/mgar/pkg/epstool/trunk/checksums (rev 0) +++ csw/mgar/pkg/epstool/trunk/checksums 2012-12-07 12:30:15 UTC (rev 19841) @@ -0,0 +1 @@ +465a57a598dbef411f4ecbfbd7d4c8d7 epstool-3.08.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 7 14:23:55 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 07 Dec 2012 13:23:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[19842] csw/mgar/pkg Message-ID: Revision: 19842 http://gar.svn.sourceforge.net/gar/?rev=19842&view=rev Author: dmichelsen Date: 2012-12-07 13:23:55 +0000 (Fri, 07 Dec 2012) Log Message: ----------- pnp4nagios: Initial commit, some more fixes for install required Added Paths: ----------- csw/mgar/pkg/pnp4nagios/ csw/mgar/pkg/pnp4nagios/Makefile csw/mgar/pkg/pnp4nagios/branches/ csw/mgar/pkg/pnp4nagios/tags/ csw/mgar/pkg/pnp4nagios/trunk/ csw/mgar/pkg/pnp4nagios/trunk/Makefile csw/mgar/pkg/pnp4nagios/trunk/checksums csw/mgar/pkg/pnp4nagios/trunk/files/ csw/mgar/pkg/pnp4nagios/trunk/files/0001-Solaris-fixes.patch Added: csw/mgar/pkg/pnp4nagios/Makefile =================================================================== --- csw/mgar/pkg/pnp4nagios/Makefile (rev 0) +++ csw/mgar/pkg/pnp4nagios/Makefile 2012-12-07 13:23:55 UTC (rev 19842) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/pnp4nagios/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/pnp4nagios/trunk/Makefile =================================================================== --- csw/mgar/pkg/pnp4nagios/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pnp4nagios/trunk/Makefile 2012-12-07 13:23:55 UTC (rev 19842) @@ -0,0 +1,30 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = pnp4nagios +VERSION = 0.6.19 +GARTYPE = v2 + +DESCRIPTION = abc +define BLURB + Long description +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES += $(DISTNAME).tar.gz + +PATCHFILES += 0001-Solaris-fixes.patch + +BUILD_ARGS = all + +# There is no testsuite +TEST_SCRIPTS = + +# Do not install as nagios:nagios +INSTALL_OVERRIDE_VARS += INSTALL_OPTS +INSTALL_OVERRIDE_VAR_INSTALL_OPTS = + +INSTALL_ARGS = fullinstall + +include gar/category.mk + Property changes on: csw/mgar/pkg/pnp4nagios/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/pnp4nagios/trunk/checksums =================================================================== --- csw/mgar/pkg/pnp4nagios/trunk/checksums (rev 0) +++ csw/mgar/pkg/pnp4nagios/trunk/checksums 2012-12-07 13:23:55 UTC (rev 19842) @@ -0,0 +1 @@ +37d69974e088a7010b7e27434b95a12d pnp4nagios-0.6.19.tar.gz Added: csw/mgar/pkg/pnp4nagios/trunk/files/0001-Solaris-fixes.patch =================================================================== --- csw/mgar/pkg/pnp4nagios/trunk/files/0001-Solaris-fixes.patch (rev 0) +++ csw/mgar/pkg/pnp4nagios/trunk/files/0001-Solaris-fixes.patch 2012-12-07 13:23:55 UTC (rev 19842) @@ -0,0 +1,39 @@ +From 47b12201d03d30098d1813994ad347350e0b9425 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 6 Dec 2012 17:16:02 +0100 +Subject: [PATCH] Solaris fixes + +--- + src/Makefile.in | 2 +- + src/npcdmod.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index b4323b4..3b2fc9e 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -91,7 +91,7 @@ npcd: npcd.c $(NPCDOBJS) $(NPCDHEAD) + # + ############################### + npcdmod.o: npcdmod.c +- $(CC) $(MOD_CFLAGS) $(CFLAGS) -o npcdmod.o npcdmod.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) -fPIC ++ $(CC) $(MOD_CFLAGS) $(CFLAGS) -c -o npcdmod.o npcdmod.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) -fPIC + + ############################### + # +diff --git a/src/npcdmod.c b/src/npcdmod.c +index cfd2565..53f36e4 100644 +--- a/src/npcdmod.c ++++ b/src/npcdmod.c +@@ -38,7 +38,7 @@ + #include "../include/npcdmod.h" + + /* specify event broker API version (required) */ +-NEB_API_VERSION(CURRENT_NEB_API_VERSION); ++NEB_API_VERSION(CURRENT_NEB_API_VERSION) + + extern int process_performance_data; + +-- +1.8.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Fri Dec 7 15:02:27 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Fri, 07 Dec 2012 14:02:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[19843] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 19843 http://gar.svn.sourceforge.net/gar/?rev=19843&view=rev Author: janholzh Date: 2012-12-07 14:02:27 +0000 (Fri, 07 Dec 2012) Log Message: ----------- gcc4/trunk: move other binutils tools back to Solaris version Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-07 13:23:55 UTC (rev 19842) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-07 14:02:27 UTC (rev 19843) @@ -534,8 +534,17 @@ @$(MAKECOOKIE) # We need GNU find as find -PATH := /opt/csw/gnu:$(PATH) +#PATH := /opt/csw/gnu:$(PATH) +#We need some more exports: +AR=/usr/ccs/bin/ar +AS=/usr/ccs/bin/as +NM=/usr/ccs/bin/nm +RANLIB=/usr/ccs/bin/ranlib +STRIP=/usr/css/bin/strip +OBJCOPY=/opt/csw/bin/gobjcopy +OBJDUMP=/opt/csw/bin/gobjdump +READELF=/opt/csw/bin/greadelf -CONFIGURE_ENV := PATH=$(PATH) CC=$(CC) LD_OPTIONS="$(LD_OPTIONS)" -BUILD_ENV := PATH=$(PATH) LD_OPTIONS="$(LD_OPTIONS)" -INSTALL_ENV := PATH=$(PATH) +CONFIGURE_ENV := PATH=$(PATH) CC=$(CC) LD_OPTIONS="$(LD_OPTIONS)" AR=$(AR) AS=$(AS) NM=$(NM) RANLIB=$(RANLIB) STRIP=$(STRIP) OBJCOPY=$(OBJCOPY) OBJDUMP=$(OBJDUMP) READELF=$(READELF) +BUILD_ENV := PATH=$(PATH) LD_OPTIONS="$(LD_OPTIONS)" AR=$(AR) AS=$(AS) NM=$(NM) RANLIB=$(RANLIB) STRIP=$(STRIP) OBJCOPY=$(OBJCOPY) OBJDUMP=$(OBJDUMP) READELF=$(READELF) +INSTALL_ENV := PATH=$(PATH) AR=$(AR) AS=$(AS) NM=$(NM) RANLIB=$(RANLIB) STRIP=$(STRIP) OBJCOPY=$(OBJCOPY) OBJDUMP=$(OBJDUMP) READELF=$(READELF) 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 Dec 7 15:11:30 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 07 Dec 2012 14:11:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[19844] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 19844 http://gar.svn.sourceforge.net/gar/?rev=19844&view=rev Author: wahwah Date: 2012-12-07 14:11:30 +0000 (Fri, 07 Dec 2012) Log Message: ----------- gcc4/trunk: style changes Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-07 14:02:27 UTC (rev 19843) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-07 14:11:30 UTC (rev 19844) @@ -518,7 +518,7 @@ # CHECKPKG_OVERRIDES_CSWlibstdc++6 += binary-architecture-does-not-match-placement # Otherwise it won't run on older Solaris 10 releases. -LINKER_MAP_RELEASE=solaris10u8 +LINKER_MAP_RELEASE = solaris10u8 include files/scripts.mk include gar/category.mk @@ -533,17 +533,15 @@ bash $(FILEDIR)/customize_specs.sh $(DESTDIR) $(PROGRAM_SUFFIX) $(VERSION) @$(MAKECOOKIE) -# We need GNU find as find -#PATH := /opt/csw/gnu:$(PATH) -#We need some more exports: -AR=/usr/ccs/bin/ar -AS=/usr/ccs/bin/as -NM=/usr/ccs/bin/nm -RANLIB=/usr/ccs/bin/ranlib -STRIP=/usr/css/bin/strip -OBJCOPY=/opt/csw/bin/gobjcopy -OBJDUMP=/opt/csw/bin/gobjdump -READELF=/opt/csw/bin/greadelf +# Use CSW or Solaris tools explicitly: +AR = /usr/ccs/bin/ar +AS = /usr/ccs/bin/as +NM = /usr/ccs/bin/nm +RANLIB = /usr/ccs/bin/ranlib +STRIP = /usr/css/bin/strip +OBJCOPY = /opt/csw/bin/gobjcopy +OBJDUMP = /opt/csw/bin/gobjdump +READELF = /opt/csw/bin/greadelf CONFIGURE_ENV := PATH=$(PATH) CC=$(CC) LD_OPTIONS="$(LD_OPTIONS)" AR=$(AR) AS=$(AS) NM=$(NM) RANLIB=$(RANLIB) STRIP=$(STRIP) OBJCOPY=$(OBJCOPY) OBJDUMP=$(OBJDUMP) READELF=$(READELF) BUILD_ENV := PATH=$(PATH) LD_OPTIONS="$(LD_OPTIONS)" AR=$(AR) AS=$(AS) NM=$(NM) RANLIB=$(RANLIB) STRIP=$(STRIP) OBJCOPY=$(OBJCOPY) OBJDUMP=$(OBJDUMP) READELF=$(READELF) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Dec 7 15:40:42 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 07 Dec 2012 14:40:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[19845] csw/mgar/pkg/librecad/trunk/Makefile Message-ID: Revision: 19845 http://gar.svn.sourceforge.net/gar/?rev=19845&view=rev Author: cgrzemba Date: 2012-12-07 14:40:42 +0000 (Fri, 07 Dec 2012) Log Message: ----------- librecad/trunk: adjust version Modified Paths: -------------- csw/mgar/pkg/librecad/trunk/Makefile Modified: csw/mgar/pkg/librecad/trunk/Makefile =================================================================== --- csw/mgar/pkg/librecad/trunk/Makefile 2012-12-07 14:11:30 UTC (rev 19844) +++ csw/mgar/pkg/librecad/trunk/Makefile 2012-12-07 14:40:42 UTC (rev 19845) @@ -3,7 +3,7 @@ # NAME = libreCAD GITNAME = LibreCAD -VERSION = 2.0.0alpha4 +VERSION = 2.0.0beta1 # GIT_VERSION = 216dc66b2a GARTYPE = v2 CATEGORIES = gnome This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Fri Dec 7 15:43:37 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 07 Dec 2012 14:43:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[19846] csw/mgar/pkg/courier-imap/trunk Message-ID: Revision: 19846 http://gar.svn.sourceforge.net/gar/?rev=19846&view=rev Author: wilbury Date: 2012-12-07 14:43:37 +0000 (Fri, 07 Dec 2012) Log Message: ----------- courier-imap/trunk: Add manifest, take one. Modified Paths: -------------- csw/mgar/pkg/courier-imap/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap.xml Modified: csw/mgar/pkg/courier-imap/trunk/Makefile =================================================================== --- csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-07 14:40:42 UTC (rev 19845) +++ csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-07 14:43:37 UTC (rev 19846) @@ -13,16 +13,19 @@ MASTER_SITES = $(SF_MIRRORS) SF_PROJECT = courier/imap DISTFILES = $(DISTNAME).tar.bz2 +DISTFILES += cswcourier-imap.xml PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc +sysconfdir = /etc/opt/csw/courier-imap + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-root-check CONFIGURE_ARGS += --with-waitfunc=wait3 CONFIGURE_ARGS += --enable-unicode CONFIGURE_ARGS += --with-db=gdbm CONFIGURE_ARGS += --with-userdb=/etc/opt/csw/authlib/userdb -CONFIGURE_ARGS += --with-certsdir=$(sysconfdir)/courier-imap +CONFIGURE_ARGS += --with-certsdir=$(sysconfdir) CONFIGURE_ARGS += --with-certdb=/etc/opt/csw/ssl/certs/ca-certificates.crt REINPLACE_USRLOCAL += $(mandir)/man1/maildirmake.1 Added: csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap.xml =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap.xml ___________________________________________________________________ Added: svn:mime-type + application/xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Dec 8 00:13:35 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 07 Dec 2012 23:13:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[19847] csw/mgar/pkg/courier-imap/trunk Message-ID: Revision: 19847 http://gar.svn.sourceforge.net/gar/?rev=19847&view=rev Author: wilbury Date: 2012-12-07 23:13:35 +0000 (Fri, 07 Dec 2012) Log Message: ----------- courier-imap/trunk: Add SMF, some minor tweaks Modified Paths: -------------- csw/mgar/pkg/courier-imap/trunk/Makefile csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap.xml Added Paths: ----------- csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap Modified: csw/mgar/pkg/courier-imap/trunk/Makefile =================================================================== --- csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-07 14:43:37 UTC (rev 19846) +++ csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-07 23:13:35 UTC (rev 19847) @@ -14,10 +14,13 @@ SF_PROJECT = courier/imap DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += cswcourier-imap.xml +DISTFILES += svc-cswcourier-imap PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc sysconfdir = /etc/opt/csw/courier-imap +localstatedir = /var/opt/csw/courier-imap +datadir = /opt/csw/share/courier-imap CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-root-check @@ -43,10 +46,12 @@ OBSOLETED_BY_CSWcourier-imap += CSWcourierimap EXTRA_LIB = $(prefix)/lib/courier-authlib +INITSMF = /etc/opt/csw/init.d/cswcourier-imap + TEST_SCRIPTS = MIGRATE_SOURCE_DIR_CSWcourier-imap = $(prefix)/etc/courier-imap -MIGRATE_DEST_DIR_CSWcourier-imap = $(sysconfdir)/courier-imap +MIGRATE_DEST_DIR_CSWcourier-imap = $(sysconfdir) PRESERVECONF += imapd PRESERVECONF += pop3d @@ -57,3 +62,11 @@ include gar/category.mk +post-install-modulated: + @/opt/csw/bin/ginstall -d -m 755 $(DESTDIR)/etc/opt/csw/init.d + @/opt/csw/bin/ginstall -d -m 755 $(DESTDIR)/var/opt/csw/svc/manifest/network + @/opt/csw/bin/ginstall -d -m 755 $(DESTDIR)/etc/opt/csw/pkg/CSW$(NAME) + @/opt/csw/bin/ginstall -m 755 $(FILEDIR)/cswcourier-imap $(DESTDIR)/$(INITSMF) + @/opt/csw/bin/ginstall -m 644 $(FILEDIR)/cswcourier-imap.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/cswcourier-imap.xml + @$(MAKECOOKIE) + Added: csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap =================================================================== --- csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap (rev 0) +++ csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap 2012-12-07 23:13:35 UTC (rev 19847) @@ -0,0 +1,127 @@ +#!/bin/sh +# +# This is the /etc/init.d file for Courier-IMAP +# Modified for CSW +# +# description: Courier-IMAP - IMAP server +# + +if [ -f /lib/svc/share/smf_include.sh ] +then +. /lib/svc/share/smf_include.sh +fi + +prefix=/opt/csw +exec_prefix=/opt/csw +bindir=${exec_prefix}/bin +sbindir=${exec_prefix}/sbin + +case "$1" in +start) + cd / + . /etc/opt/csw/courier-imap/imapd + + printf "Starting Courier-IMAP server:" + + case x$IMAPDSTART in + x[yY]*) + # Start daemons. + /opt/csw/libexec/courier-imap/imapd.rc start + printf "\n imap" + ;; + esac + + . /etc/opt/csw/courier-imap/imapd-ssl + case x$IMAPDSSLSTART in + x[yY]*) + if test -x $COURIERTLS + then + + # First time we start this, generate a dummy SSL certificate. + + if test ! -f $TLS_CERTFILE + then + printf "\n generating-SSL-certificate..." + /opt/csw/share/courier-imap/mkimapdcert >/dev/null 2>&1 + fi + /opt/csw/libexec/courier-imap/imapd-ssl.rc start + printf "\n imap-ssl" + fi + ;; + esac + + POP3DSTART="" + POP3DSSLSTART="" + + if test -f /etc/opt/csw/courier-imap/pop3d + then + . /etc/opt/csw/courier-imap/pop3d + fi + + case x$POP3DSTART in + x[yY]*) + # Start daemons. + /opt/csw/libexec/courier-imap/pop3d.rc start + printf "\n pop3" + ;; + esac + + if test -f /etc/opt/csw/courier-imap/pop3d-ssl + then + . /etc/opt/csw/courier-imap/pop3d-ssl + fi + + case x$POP3DSSLSTART in + x[yY]*) + if test -x $COURIERTLS + then + + # First time we start this, generate a dummy SSL certificate. + + if test ! -f $TLS_CERTFILE + then + printf "\n generating-SSL-certificate..." + /opt/csw/share/courier-imap/mkpop3dcert >/dev/null 2>&1 + fi + /opt/csw/libexec/courier-imap/pop3d-ssl.rc start + printf "\n pop3-ssl" + fi + ;; + esac + + echo "" + ;; +stop) + printf "Stopping Courier-IMAP server:" + . /etc/opt/csw/courier-imap/imapd + . /etc/opt/csw/courier-imap/imapd-ssl + /opt/csw/libexec/courier-imap/imapd.rc stop + printf "\n imap" + if test -x $COURIERTLS + then + /opt/csw/libexec/courier-imap/imapd-ssl.rc stop + printf "\n imap-ssl" + fi + + if test -f /etc/opt/csw/courier-imap/pop3d + then + /opt/csw/libexec/courier-imap/pop3d.rc stop + printf "\n pop3" + + if test -x $COURIERTLS + then + /opt/csw/libexec/courier-imap/pop3d-ssl.rc stop + printf "\n pop3-ssl" + fi + fi + + echo "" + ;; +restart) + $0 stop + sleep 3 + $0 start + ;; +esac +exit 0 + Modified: csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap.xml =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Dec 8 00:16:22 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 07 Dec 2012 23:16:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[19848] csw/mgar/pkg/courier-imap/trunk/Makefile Message-ID: Revision: 19848 http://gar.svn.sourceforge.net/gar/?rev=19848&view=rev Author: wilbury Date: 2012-12-07 23:16:22 +0000 (Fri, 07 Dec 2012) Log Message: ----------- courier-imap/trunk: Add SMF, some minor tweaks, take two. Modified Paths: -------------- csw/mgar/pkg/courier-imap/trunk/Makefile Modified: csw/mgar/pkg/courier-imap/trunk/Makefile =================================================================== --- csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-07 23:13:35 UTC (rev 19847) +++ csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-07 23:16:22 UTC (rev 19848) @@ -14,7 +14,7 @@ SF_PROJECT = courier/imap DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += cswcourier-imap.xml -DISTFILES += svc-cswcourier-imap +DISTFILES += cswcourier-imap PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Dec 8 00:18:50 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 07 Dec 2012 23:18:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[19849] csw/mgar/pkg/courier-imap/trunk/Makefile Message-ID: Revision: 19849 http://gar.svn.sourceforge.net/gar/?rev=19849&view=rev Author: wilbury Date: 2012-12-07 23:18:49 +0000 (Fri, 07 Dec 2012) Log Message: ----------- courier-imap/trunk: Modify libexecdir. Modified Paths: -------------- csw/mgar/pkg/courier-imap/trunk/Makefile Modified: csw/mgar/pkg/courier-imap/trunk/Makefile =================================================================== --- csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-07 23:16:22 UTC (rev 19848) +++ csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-07 23:18:49 UTC (rev 19849) @@ -21,6 +21,7 @@ sysconfdir = /etc/opt/csw/courier-imap localstatedir = /var/opt/csw/courier-imap datadir = /opt/csw/share/courier-imap +libexecdir = /opt/csw/libexec/courier-imap CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-root-check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Dec 8 00:41:45 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 07 Dec 2012 23:41:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[19850] csw/mgar/pkg/courier-imap/trunk/files/ cswcourier-imap Message-ID: Revision: 19850 http://gar.svn.sourceforge.net/gar/?rev=19850&view=rev Author: wilbury Date: 2012-12-07 23:41:45 +0000 (Fri, 07 Dec 2012) Log Message: ----------- courier-imap/trunk: Modify method script. Modified Paths: -------------- csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap Modified: csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap =================================================================== --- csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap 2012-12-07 23:18:49 UTC (rev 19849) +++ csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap 2012-12-07 23:41:45 UTC (rev 19850) @@ -5,7 +5,19 @@ # # description: Courier-IMAP - IMAP server # +### OpenCSW BEGIN +# +#MANIFEST /var/opt/csw/svc/manifest/network/cswcourier-imap.xml +#RC_KNUM 20 +#RC_SNUM 80 +#RC_KLEV 0,1,2,S +#RC_SLEV 3 +#FMRI application +#AUTOENABLE no +# +### OpenCSW END + if [ -f /lib/svc/share/smf_include.sh ] then . /lib/svc/share/smf_include.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Dec 8 00:52:51 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 07 Dec 2012 23:52:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[19851] csw/mgar/pkg/courier-imap/trunk/files/ cswcourier-imap Message-ID: Revision: 19851 http://gar.svn.sourceforge.net/gar/?rev=19851&view=rev Author: wilbury Date: 2012-12-07 23:52:50 +0000 (Fri, 07 Dec 2012) Log Message: ----------- courier-imap/trunk: Modify method script. Modified Paths: -------------- csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap Modified: csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap =================================================================== --- csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap 2012-12-07 23:41:45 UTC (rev 19850) +++ csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap 2012-12-07 23:52:50 UTC (rev 19851) @@ -12,7 +12,7 @@ #RC_SNUM 80 #RC_KLEV 0,1,2,S #RC_SLEV 3 -#FMRI application +#FMRI network #AUTOENABLE no # ### OpenCSW END 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 Dec 8 01:03:44 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 08 Dec 2012 00:03:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[19852] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 19852 http://gar.svn.sourceforge.net/gar/?rev=19852&view=rev Author: wahwah Date: 2012-12-08 00:03:44 +0000 (Sat, 08 Dec 2012) Log Message: ----------- pkgdb-web: Allow making queries from web pages For Ben's application. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-12-07 23:52:50 UTC (rev 19851) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-12-08 00:03:44 UTC (rev 19852) @@ -434,6 +434,7 @@ srv4 = res.getOne() mimetype, data = srv4.GetRestRepr() web.header('Content-type', mimetype) + web.header('Access-Control-Allow-Origin', '*') return cjson.encode(data) except sqlobject.main.SQLObjectNotFound: return cjson.encode(None) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Dec 8 10:07:13 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sat, 08 Dec 2012 09:07:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[19853] csw/mgar/pkg/courier-imap/trunk/Makefile Message-ID: Revision: 19853 http://gar.svn.sourceforge.net/gar/?rev=19853&view=rev Author: wilbury Date: 2012-12-08 09:07:13 +0000 (Sat, 08 Dec 2012) Log Message: ----------- courier-imap/trunk: Add override. Modified Paths: -------------- csw/mgar/pkg/courier-imap/trunk/Makefile Modified: csw/mgar/pkg/courier-imap/trunk/Makefile =================================================================== --- csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-08 00:03:44 UTC (rev 19852) +++ csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-08 09:07:13 UTC (rev 19853) @@ -61,6 +61,9 @@ PRESERVECONF += imapd.cnf PRESERVECONF += pop3d.cnf +# SMF override +CHECKPKG_OVERRIDES_CSWcourier-imap += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswcourier-imap.xml + 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 wilbury at users.sourceforge.net Sat Dec 8 19:15:31 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sat, 08 Dec 2012 18:15:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[19854] csw/mgar/pkg/courier-imap/trunk/Makefile Message-ID: Revision: 19854 http://gar.svn.sourceforge.net/gar/?rev=19854&view=rev Author: wilbury Date: 2012-12-08 18:15:29 +0000 (Sat, 08 Dec 2012) Log Message: ----------- courier-imap/trunk: Preserve also eventual .pem files Modified Paths: -------------- csw/mgar/pkg/courier-imap/trunk/Makefile Modified: csw/mgar/pkg/courier-imap/trunk/Makefile =================================================================== --- csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-08 09:07:13 UTC (rev 19853) +++ csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-08 18:15:29 UTC (rev 19854) @@ -60,6 +60,8 @@ PRESERVECONF += pop3d-ssl PRESERVECONF += imapd.cnf PRESERVECONF += pop3d.cnf +PRESERVECONF += imapd.pem +PRESERVECONF += pop3d.pem # SMF override CHECKPKG_OVERRIDES_CSWcourier-imap += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswcourier-imap.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Sat Dec 8 21:03:31 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sat, 08 Dec 2012 20:03:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[19855] csw/mgar/pkg/perl/trunk Message-ID: Revision: 19855 http://gar.svn.sourceforge.net/gar/?rev=19855&view=rev Author: claudio_sf Date: 2012-12-08 20:03:30 +0000 (Sat, 08 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: Several Makefile scenario's Modified Paths: -------------- csw/mgar/pkg/perl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/perl/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/perl/trunk/Makefile Deleted: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2012-12-08 18:15:29 UTC (rev 19854) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-12-08 20:03:30 UTC (rev 19855) @@ -1,249 +0,0 @@ -NAME = perl -VERSION = 5.16.2 -#CATEGORIES = lang -GARTYPE = v2 - -DESCRIPTION = A high-level, general-purpose programming language -define BLURB - Perl is a high-level, general-purpose programming language that makes easy - things easy and hard things possible. It is optimized for scanning arbitrary - text files and system administration. It has built-in extended regular - expression matching and replacement, a dataflow mechanism to improve security - with setuid scripts and is extendable via modules that can interface to C - libraries. -endef - -#MASTER_SITES = http://www.cpan.org/src/ -#SPKG_SOURCEURL = http://www.cpan.org/src -MASTER_SITES = manual:// -DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz - -# Make extra Solaris 10 package with DTrace support -#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PACKAGING_PLATFORMS += solaris10-sparc - -PACKAGES += CSWperl -SPKG_DESC_CSWperl = $(DESCRIPTION) -#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 -RUNTIME_DEP_PKGS_CSWperl = -INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags - -PACKAGES += CSWperldoc -SPKG_DESC_CSWperldoc = Perl documentation -RUNTIME_DEP_PKGS_CSWperldoc = CSWperl -ARCHALL_CSWperldoc = 1 - -LICENSE = Copying - -CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl - -# Core module updates -# Not used at the moment, leave one as example -#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ -#CORE_UPDATES += PathTools-3.30 -#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd - -DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) - -# GCC build (Sunstudio is problematic) # claudio -GARCOMPILER = GCC4 - - -# Custom configure -CONFIGURE_SCRIPTS = perl - -# Compatable with all prior patch revs -INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 - -# Force use of db-4.8 -# TBD: Reinsert libperl.so, see below. -#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt -PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt -PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) - -#BUILD64 = 1 - -# Configuration flags -CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) -CONFIGURE_ARGS += -Dcc=$(CC) -CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" -CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" -CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) -CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" -CONFIGURE_ARGS += -Dld=$(CC) -CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" -CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) -CONFIGURE_ARGS += -Dlocincpth=$(includedir) -CONFIGURE_ARGS += -Dloclibpth=$(libdir) -CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dman1ext=1 -CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dman3ext=3perl -CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" -CONFIGURE_ARGS += -Dperladmin="root at localhost" -CONFIGURE_ARGS += -Dprefix=$(prefix) -CONFIGURE_ARGS += -Dbin=$(bindir) -CONFIGURE_ARGS += -Dscriptdir=$(bindir) -CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) -CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl -CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl -CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dsiteprefix=/usr -CONFIGURE_ARGS += -Duseshrplib -CONFIGURE_ARGS += -Dusesitecustomize -CONFIGURE_ARGS += -Dusethreads - -# When built on Solaris 10, enable DTrace support -CONFIGURE_ARGS-5.10 = -Dusedtrace -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) - -# Largefiles is on by default for 64 bit -CONFIGURE_ARGS-32 += -Duselargefiles -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) - -#CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw -CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw -CONFIGURE_ARGS += -Dvendorprefix=$(prefix) -CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" -CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" -CONFIGURE_ARGS += -Dsed=$(bindir)/gsed - -EXTRA_LIB += $(prefix)/bdb48/lib -EXTRA_INC += $(prefix)/bdb48/include - -# Somehow the CPPFLAGS do not make it into the compile environment. -# Add them explicitly here, otherwise specifically the bdb48/include will -# not make it resulting in db.h not to be found and DB_File.pm not to be built -# as reported here: -# https://www.opencsw.org/mantis/view.php?id=4544 -EXTRA_CFLAGS = $(CPPFLAGS) - -# Adding -lperl requires that libperl.so is available during compilation, which is not -# the case on bootstrapping. However, we require explicit libperl linkage or programs -# embedding perl will have problems with duplicated static variables. -# XXX Investigate further after 64 bit has built -#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl -EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib -EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib - -# We want 64 bit binaries -#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) - -EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod -PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* - -# The diagnostics.pm module needs the podfile to output its messages. -# That means it must be included in the main package, not the docs. -EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod -EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod - -# Tests take a long time, run once for every release -TEST_SCRIPTS = - -BUILD_SCRIPTS = perl - -TEST_SCRIPTS = perl - -# Make sure we don't include the path to the newly built perl as the -# library is not in place yet. -IGNORE_DESTDIR = 1 - -# Do not exclude static libs as at least DynaLoader.a is needed for XS compilation -MERGE_EXCLUDE_STATICLIBS = - -# This is for the communication with checkpkg. These pathes are searched for modules -# when resolving dependencies. -PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") - -# Splitting of a separate libperl.so requires more work and careful planning. -# Override for now. -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 - -include gar/category.mk - -# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and -# the one in $WORKSRC has not been built yet -# TBD: Investigate -post-extract-modulated: - mkdir -p $(WORKSRC) - #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so - @$(MAKECOOKIE) - -ifneq ($(CORE_UPDATES),) -POST_TARGETS = install-core-updates -include files/updatecore.mk -endif - -# How to configure Perl -#configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS -configure-perl: ARGS-64 = -dusedtrace -configure-perl: - (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) - #cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be - @# 64 bit: -Duse64bitall - @$(MAKECOOKIE) - -build-perl: BUILD_EXPORTS = LD_OPTIONS -build-perl: - @echo " ==> Running make in $*" - @#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) - cd $(WORKSRC) && $(BUILD_ENV) gmake - @$(MAKECOOKIE) - -test-perl: - @echo " ==> Running make $(TEST_TARGET) in $*" - @#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) - cd $(WORKSRC) && gmake check - @$(MAKECOOKIE) - -# Make links to libperl -#POST_TARGETS += libperl -#LIB_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) -#LIB_PATH = $(libdir)/perl/$(VERSION)/CORE -#libperl: -# @( cd $(DESTDIR)$(libdir) ; \ -# mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ -# $(DESTDIR)$(libdir) ; \ -# chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ -# ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) -# #; \ -# #ln -s libperl.so.$(VERSION) libperl.so ) -# @$(MAKECOOKIE) - -# Remove build paths from Config -#POST_TARGETS += perlconf -#perlconf: -# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ -# /bin/perl -i -lne "\ -# next if /config_arg[1-9]/; \ -# s/^config_args=.+$$/config_args=''/; \ -# s/^config_argc=.+$$/config_argc='0'/; \ -# s,-I$(DESTDIR)$(includedir),,g; \ -# s,-[LR]$(DESTDIR)$(libdir),,g; \ -# s,( -I$(includedir))+,\$$1,g; \ -# s,( -[LR]$(libdir))+,\$$1,g; \ -# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ -# s, (-L)?$(CC_HOME)\S+,,g; \ -# if (/^\w+=/) { \ -# s/\s{2,}(\-)/ \-/g; \ -# s/(^\w+=.) /\$$1/; \ -# s/ (.)$$/\$$1/g; \ -# } \ -# print \ -# " Config.pm Config_heavy.pl ) -# @$(MAKECOOKIE) - -#POST_TARGETS += CSWperl.cswperlincpath -#CSWperl.cswperlincpath: -# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath - -# Invoke post-install targets -#post-install-modulated: $(POST_TARGETS) -# @$(MAKECOOKIE) Added: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-12-08 20:03:30 UTC (rev 19855) @@ -0,0 +1 @@ +link Makefile_5.16.1_64b \ No newline at end of file Property changes on: csw/mgar/pkg/perl/trunk/Makefile ___________________________________________________________________ Added: svn:special + * Modified: csw/mgar/pkg/perl/trunk/checksums =================================================================== --- csw/mgar/pkg/perl/trunk/checksums 2012-12-08 18:15:29 UTC (rev 19854) +++ csw/mgar/pkg/perl/trunk/checksums 2012-12-08 20:03:30 UTC (rev 19855) @@ -1 +1 @@ -7f6ebc2a7f80a43e6f1ecfb88b61a82d perl-5.16.2-patched.tar.gz +6846e50c800ce047a56f5b90205b0b64 perl-5.16.1-patched.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Sat Dec 8 21:06:30 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sat, 08 Dec 2012 20:06:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[19856] csw/mgar/pkg/perl/trunk Message-ID: Revision: 19856 http://gar.svn.sourceforge.net/gar/?rev=19856&view=rev Author: claudio_sf Date: 2012-12-08 20:06:29 +0000 (Sat, 08 Dec 2012) Log Message: ----------- Added Paths: ----------- csw/mgar/pkg/perl/trunk/Makefile_5.16.1_32b csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b Removed Paths: ------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.1 Deleted: csw/mgar/pkg/perl/trunk/Makefile_5.16.1 =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.1 2012-12-08 20:03:30 UTC (rev 19855) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.1 2012-12-08 20:06:29 UTC (rev 19856) @@ -1,249 +0,0 @@ -NAME = perl -VERSION = 5.16.1 -#CATEGORIES = lang -GARTYPE = v2 - -DESCRIPTION = A high-level, general-purpose programming language -define BLURB - Perl is a high-level, general-purpose programming language that makes easy - things easy and hard things possible. It is optimized for scanning arbitrary - text files and system administration. It has built-in extended regular - expression matching and replacement, a dataflow mechanism to improve security - with setuid scripts and is extendable via modules that can interface to C - libraries. -endef - -#MASTER_SITES = http://www.cpan.org/src/ -#SPKG_SOURCEURL = http://www.cpan.org/src -MASTER_SITES = manual:// -DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz - -# Make extra Solaris 10 package with DTrace support -#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PACKAGING_PLATFORMS += solaris10-sparc - -PACKAGES += CSWperl -SPKG_DESC_CSWperl = $(DESCRIPTION) -#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 -RUNTIME_DEP_PKGS_CSWperl = -INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags - -PACKAGES += CSWperldoc -SPKG_DESC_CSWperldoc = Perl documentation -RUNTIME_DEP_PKGS_CSWperldoc = CSWperl -ARCHALL_CSWperldoc = 1 - -LICENSE = Copying - -CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl - -# Core module updates -# Not used at the moment, leave one as example -#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ -#CORE_UPDATES += PathTools-3.30 -#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd - -DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) - -# GCC build (Sunstudio is problematic) # claudio -GARCOMPILER = GCC4 - - -# Custom configure -CONFIGURE_SCRIPTS = perl - -# Compatable with all prior patch revs -INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 - -# Force use of db-4.8 -# TBD: Reinsert libperl.so, see below. -#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt -PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt -PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) - -#BUILD64 = 1 - -# Configuration flags -CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) -CONFIGURE_ARGS += -Dcc=$(CC) -CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" -CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" -CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) -CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" -CONFIGURE_ARGS += -Dld=$(CC) -CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" -CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) -CONFIGURE_ARGS += -Dlocincpth=$(includedir) -CONFIGURE_ARGS += -Dloclibpth=$(libdir) -CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dman1ext=1 -CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dman3ext=3perl -CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" -CONFIGURE_ARGS += -Dperladmin="root at localhost" -CONFIGURE_ARGS += -Dprefix=$(prefix) -CONFIGURE_ARGS += -Dbin=$(bindir) -CONFIGURE_ARGS += -Dscriptdir=$(bindir) -CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) -CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl -CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl -CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dsiteprefix=/usr -CONFIGURE_ARGS += -Duseshrplib -CONFIGURE_ARGS += -Dusesitecustomize -CONFIGURE_ARGS += -Dusethreads - -# When built on Solaris 10, enable DTrace support -CONFIGURE_ARGS-5.10 = -Dusedtrace -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) - -# Largefiles is on by default for 64 bit -CONFIGURE_ARGS-32 += -Duselargefiles -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) - -#CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw -CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw -CONFIGURE_ARGS += -Dvendorprefix=$(prefix) -CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" -CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" -CONFIGURE_ARGS += -Dsed=$(bindir)/gsed - -EXTRA_LIB += $(prefix)/bdb48/lib -EXTRA_INC += $(prefix)/bdb48/include - -# Somehow the CPPFLAGS do not make it into the compile environment. -# Add them explicitly here, otherwise specifically the bdb48/include will -# not make it resulting in db.h not to be found and DB_File.pm not to be built -# as reported here: -# https://www.opencsw.org/mantis/view.php?id=4544 -EXTRA_CFLAGS = $(CPPFLAGS) - -# Adding -lperl requires that libperl.so is available during compilation, which is not -# the case on bootstrapping. However, we require explicit libperl linkage or programs -# embedding perl will have problems with duplicated static variables. -# XXX Investigate further after 64 bit has built -#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl -EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib -EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib - -# We want 64 bit binaries -#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) - -EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod -PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* - -# The diagnostics.pm module needs the podfile to output its messages. -# That means it must be included in the main package, not the docs. -EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod -EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod - -# Tests take a long time, run once for every release -TEST_SCRIPTS = - -BUILD_SCRIPTS = perl - -TEST_SCRIPTS = perl - -# Make sure we don't include the path to the newly built perl as the -# library is not in place yet. -IGNORE_DESTDIR = 1 - -# Do not exclude static libs as at least DynaLoader.a is needed for XS compilation -MERGE_EXCLUDE_STATICLIBS = - -# This is for the communication with checkpkg. These pathes are searched for modules -# when resolving dependencies. -PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") - -# Splitting of a separate libperl.so requires more work and careful planning. -# Override for now. -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 - -include gar/category.mk - -# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and -# the one in $WORKSRC has not been built yet -# TBD: Investigate -post-extract-modulated: - mkdir -p $(WORKSRC) - #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so - @$(MAKECOOKIE) - -ifneq ($(CORE_UPDATES),) -POST_TARGETS = install-core-updates -include files/updatecore.mk -endif - -# How to configure Perl -#configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS -configure-perl: ARGS-64 = -dusedtrace -configure-perl: - (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) - #cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be - @# 64 bit: -Duse64bitall - @$(MAKECOOKIE) - -build-perl: BUILD_EXPORTS = LD_OPTIONS -build-perl: - @echo " ==> Running make in $*" - @#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) - cd $(WORKSRC) && $(BUILD_ENV) gmake - @$(MAKECOOKIE) - -test-perl: - @echo " ==> Running make $(TEST_TARGET) in $*" - @#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) - cd $(WORKSRC) && gmake check - @$(MAKECOOKIE) - -# Make links to libperl -#POST_TARGETS += libperl -#LIB_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) -#LIB_PATH = $(libdir)/perl/$(VERSION)/CORE -#libperl: -# @( cd $(DESTDIR)$(libdir) ; \ -# mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ -# $(DESTDIR)$(libdir) ; \ -# chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ -# ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) -# #; \ -# #ln -s libperl.so.$(VERSION) libperl.so ) -# @$(MAKECOOKIE) - -# Remove build paths from Config -#POST_TARGETS += perlconf -#perlconf: -# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ -# /bin/perl -i -lne "\ -# next if /config_arg[1-9]/; \ -# s/^config_args=.+$$/config_args=''/; \ -# s/^config_argc=.+$$/config_argc='0'/; \ -# s,-I$(DESTDIR)$(includedir),,g; \ -# s,-[LR]$(DESTDIR)$(libdir),,g; \ -# s,( -I$(includedir))+,\$$1,g; \ -# s,( -[LR]$(libdir))+,\$$1,g; \ -# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ -# s, (-L)?$(CC_HOME)\S+,,g; \ -# if (/^\w+=/) { \ -# s/\s{2,}(\-)/ \-/g; \ -# s/(^\w+=.) /\$$1/; \ -# s/ (.)$$/\$$1/g; \ -# } \ -# print \ -# " Config.pm Config_heavy.pl ) -# @$(MAKECOOKIE) - -#POST_TARGETS += CSWperl.cswperlincpath -#CSWperl.cswperlincpath: -# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath - -# Invoke post-install targets -#post-install-modulated: $(POST_TARGETS) -# @$(MAKECOOKIE) Added: csw/mgar/pkg/perl/trunk/Makefile_5.16.1_32b =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.1_32b (rev 0) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.1_32b 2012-12-08 20:06:29 UTC (rev 19856) @@ -0,0 +1,249 @@ +NAME = perl +VERSION = 5.16.1 +#CATEGORIES = lang +GARTYPE = v2 + +DESCRIPTION = A high-level, general-purpose programming language +define BLURB + Perl is a high-level, general-purpose programming language that makes easy + things easy and hard things possible. It is optimized for scanning arbitrary + text files and system administration. It has built-in extended regular + expression matching and replacement, a dataflow mechanism to improve security + with setuid scripts and is extendable via modules that can interface to C + libraries. +endef + +#MASTER_SITES = http://www.cpan.org/src/ +#SPKG_SOURCEURL = http://www.cpan.org/src +MASTER_SITES = manual:// +DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz + +# Make extra Solaris 10 package with DTrace support +#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS += solaris10-sparc + +PACKAGES += CSWperl +SPKG_DESC_CSWperl = $(DESCRIPTION) +#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 +RUNTIME_DEP_PKGS_CSWperl = +INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags + +PACKAGES += CSWperldoc +SPKG_DESC_CSWperldoc = Perl documentation +RUNTIME_DEP_PKGS_CSWperldoc = CSWperl +ARCHALL_CSWperldoc = 1 + +LICENSE = Copying + +CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl + +# Core module updates +# Not used at the moment, leave one as example +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ +#CORE_UPDATES += PathTools-3.30 +#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd + +DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) + +# GCC build (Sunstudio is problematic) # claudio +GARCOMPILER = GCC4 + + +# Custom configure +CONFIGURE_SCRIPTS = perl + +# Compatable with all prior patch revs +INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 + +# Force use of db-4.8 +# TBD: Reinsert libperl.so, see below. +#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc +#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt +PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt +PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) + +#BUILD64 = 1 + +# Configuration flags +CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) +CONFIGURE_ARGS += -Dcc=$(CC) +CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" +CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" +CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) +CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" +CONFIGURE_ARGS += -Dld=$(CC) +CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" +CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) +CONFIGURE_ARGS += -Dlocincpth=$(includedir) +CONFIGURE_ARGS += -Dloclibpth=$(libdir) +CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 +CONFIGURE_ARGS += -Dman1ext=1 +CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 +CONFIGURE_ARGS += -Dman3ext=3perl +CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" +CONFIGURE_ARGS += -Dperladmin="root at localhost" +CONFIGURE_ARGS += -Dprefix=$(prefix) +CONFIGURE_ARGS += -Dbin=$(bindir) +CONFIGURE_ARGS += -Dscriptdir=$(bindir) +CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) +CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl +CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl +CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 +CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 +CONFIGURE_ARGS += -Dsiteprefix=/usr +CONFIGURE_ARGS += -Duseshrplib +CONFIGURE_ARGS += -Dusesitecustomize +CONFIGURE_ARGS += -Dusethreads + +# When built on Solaris 10, enable DTrace support +CONFIGURE_ARGS-5.10 = -Dusedtrace +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) + +# Largefiles is on by default for 64 bit +CONFIGURE_ARGS-32 += -Duselargefiles +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) + +#CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw +CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw +CONFIGURE_ARGS += -Dvendorprefix=$(prefix) +CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" +CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" +CONFIGURE_ARGS += -Dsed=$(bindir)/gsed + +EXTRA_LIB += $(prefix)/bdb48/lib +EXTRA_INC += $(prefix)/bdb48/include + +# Somehow the CPPFLAGS do not make it into the compile environment. +# Add them explicitly here, otherwise specifically the bdb48/include will +# not make it resulting in db.h not to be found and DB_File.pm not to be built +# as reported here: +# https://www.opencsw.org/mantis/view.php?id=4544 +EXTRA_CFLAGS = $(CPPFLAGS) + +# Adding -lperl requires that libperl.so is available during compilation, which is not +# the case on bootstrapping. However, we require explicit libperl linkage or programs +# embedding perl will have problems with duplicated static variables. +# XXX Investigate further after 64 bit has built +#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl +EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib +EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib + +# We want 64 bit binaries +#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) + +EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod +PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* + +# The diagnostics.pm module needs the podfile to output its messages. +# That means it must be included in the main package, not the docs. +EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod +EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod + +# Tests take a long time, run once for every release +TEST_SCRIPTS = + +BUILD_SCRIPTS = perl + +TEST_SCRIPTS = perl + +# Make sure we don't include the path to the newly built perl as the +# library is not in place yet. +IGNORE_DESTDIR = 1 + +# Do not exclude static libs as at least DynaLoader.a is needed for XS compilation +MERGE_EXCLUDE_STATICLIBS = + +# This is for the communication with checkpkg. These pathes are searched for modules +# when resolving dependencies. +PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") + +# Splitting of a separate libperl.so requires more work and careful planning. +# Override for now. +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 + +include gar/category.mk + +# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and +# the one in $WORKSRC has not been built yet +# TBD: Investigate +post-extract-modulated: + mkdir -p $(WORKSRC) + #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so + @$(MAKECOOKIE) + +ifneq ($(CORE_UPDATES),) +POST_TARGETS = install-core-updates +include files/updatecore.mk +endif + +# How to configure Perl +#configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS +configure-perl: ARGS-64 = -dusedtrace +configure-perl: + (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) + #cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be + @# 64 bit: -Duse64bitall + @$(MAKECOOKIE) + +build-perl: BUILD_EXPORTS = LD_OPTIONS +build-perl: + @echo " ==> Running make in $*" + @#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) + cd $(WORKSRC) && $(BUILD_ENV) gmake + @$(MAKECOOKIE) + +test-perl: + @echo " ==> Running make $(TEST_TARGET) in $*" + @#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) + cd $(WORKSRC) && gmake check + @$(MAKECOOKIE) + +# Make links to libperl +#POST_TARGETS += libperl +#LIB_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) +#LIB_PATH = $(libdir)/perl/$(VERSION)/CORE +#libperl: +# @( cd $(DESTDIR)$(libdir) ; \ +# mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ +# $(DESTDIR)$(libdir) ; \ +# chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ +# ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) +# #; \ +# #ln -s libperl.so.$(VERSION) libperl.so ) +# @$(MAKECOOKIE) + +# Remove build paths from Config +#POST_TARGETS += perlconf +#perlconf: +# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ +# /bin/perl -i -lne "\ +# next if /config_arg[1-9]/; \ +# s/^config_args=.+$$/config_args=''/; \ +# s/^config_argc=.+$$/config_argc='0'/; \ +# s,-I$(DESTDIR)$(includedir),,g; \ +# s,-[LR]$(DESTDIR)$(libdir),,g; \ +# s,( -I$(includedir))+,\$$1,g; \ +# s,( -[LR]$(libdir))+,\$$1,g; \ +# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ +# s, (-L)?$(CC_HOME)\S+,,g; \ +# if (/^\w+=/) { \ +# s/\s{2,}(\-)/ \-/g; \ +# s/(^\w+=.) /\$$1/; \ +# s/ (.)$$/\$$1/g; \ +# } \ +# print \ +# " Config.pm Config_heavy.pl ) +# @$(MAKECOOKIE) + +#POST_TARGETS += CSWperl.cswperlincpath +#CSWperl.cswperlincpath: +# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath + +# Invoke post-install targets +#post-install-modulated: $(POST_TARGETS) +# @$(MAKECOOKIE) Added: csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b (rev 0) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b 2012-12-08 20:06:29 UTC (rev 19856) @@ -0,0 +1,249 @@ +NAME = perl +VERSION = 5.16.1 +#CATEGORIES = lang +GARTYPE = v2 + +DESCRIPTION = A high-level, general-purpose programming language +define BLURB + Perl is a high-level, general-purpose programming language that makes easy + things easy and hard things possible. It is optimized for scanning arbitrary + text files and system administration. It has built-in extended regular + expression matching and replacement, a dataflow mechanism to improve security + with setuid scripts and is extendable via modules that can interface to C + libraries. +endef + +#MASTER_SITES = http://www.cpan.org/src/ +#SPKG_SOURCEURL = http://www.cpan.org/src +MASTER_SITES = manual:// +DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz + +# Make extra Solaris 10 package with DTrace support +#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS += solaris10-sparc +BUILD64_ONLY = 1 +PACKAGES += CSWperl +SPKG_DESC_CSWperl = $(DESCRIPTION) +#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 +RUNTIME_DEP_PKGS_CSWperl = +INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags + +PACKAGES += CSWperldoc +SPKG_DESC_CSWperldoc = Perl documentation +RUNTIME_DEP_PKGS_CSWperldoc = CSWperl +ARCHALL_CSWperldoc = 1 + +LICENSE = Copying + +CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl + +# Core module updates +# Not used at the moment, leave one as example +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ +#CORE_UPDATES += PathTools-3.30 +#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd + +DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) + +# GCC build (Sunstudio is problematic) # claudio +GARCOMPILER = GCC4 + + +# Custom configure +CONFIGURE_SCRIPTS = perl + +# Compatable with all prior patch revs +INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 + +# Force use of db-4.8 +# TBD: Reinsert libperl.so, see below. +#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc +#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt +PERL_LIBS-64 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt +#PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) + +#BUILD64 = 1 + +# Configuration flags +CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) +CONFIGURE_ARGS += -Dcc=$(CC) +CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" +CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" +CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) +CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" +CONFIGURE_ARGS += -Dld=$(CC) +CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" +CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) +CONFIGURE_ARGS += -Dlocincpth=$(includedir) +CONFIGURE_ARGS += -Dloclibpth=$(libdir) +CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 +CONFIGURE_ARGS += -Dman1ext=1 +CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 +CONFIGURE_ARGS += -Dman3ext=3perl +CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" +CONFIGURE_ARGS += -Dperladmin="root at localhost" +CONFIGURE_ARGS += -Dprefix=$(prefix) +CONFIGURE_ARGS += -Dbin=$(bindir) +CONFIGURE_ARGS += -Dscriptdir=$(bindir) +CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) +CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl +CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl +CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 +CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 +CONFIGURE_ARGS += -Dsiteprefix=/usr +CONFIGURE_ARGS += -Duseshrplib +CONFIGURE_ARGS += -Dusesitecustomize +CONFIGURE_ARGS += -Dusethreads + +# When built on Solaris 10, enable DTrace support +CONFIGURE_ARGS-5.10 = -Dusedtrace +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) + +# Largefiles is on by default for 64 bit +#CONFIGURE_ARGS-32 += -Duselargefiles +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) + +#CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw +CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw +CONFIGURE_ARGS += -Dvendorprefix=$(prefix) +CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" +CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" +CONFIGURE_ARGS += -Dsed=$(bindir)/gsed + +EXTRA_LIB += $(prefix)/bdb48/lib +EXTRA_INC += $(prefix)/bdb48/include + +# Somehow the CPPFLAGS do not make it into the compile environment. +# Add them explicitly here, otherwise specifically the bdb48/include will +# not make it resulting in db.h not to be found and DB_File.pm not to be built +# as reported here: +# https://www.opencsw.org/mantis/view.php?id=4544 +EXTRA_CFLAGS = $(CPPFLAGS) + +# Adding -lperl requires that libperl.so is available during compilation, which is not +# the case on bootstrapping. However, we require explicit libperl linkage or programs +# embedding perl will have problems with duplicated static variables. +# XXX Investigate further after 64 bit has built +#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl +#EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib +EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib + +# We want 64 bit binaries +#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) + +EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod +PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* + +# The diagnostics.pm module needs the podfile to output its messages. +# That means it must be included in the main package, not the docs. +EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod +EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod + +# Tests take a long time, run once for every release +TEST_SCRIPTS = + +BUILD_SCRIPTS = perl + +TEST_SCRIPTS = perl + +# Make sure we don't include the path to the newly built perl as the +# library is not in place yet. +IGNORE_DESTDIR = 1 + +# Do not exclude static libs as at least DynaLoader.a is needed for XS compilation +MERGE_EXCLUDE_STATICLIBS = + +# This is for the communication with checkpkg. These pathes are searched for modules +# when resolving dependencies. +PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") + +# Splitting of a separate libperl.so requires more work and careful planning. +# Override for now. +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 + +include gar/category.mk + +# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and +# the one in $WORKSRC has not been built yet +# TBD: Investigate +post-extract-modulated: + mkdir -p $(WORKSRC) + #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so + @$(MAKECOOKIE) + +ifneq ($(CORE_UPDATES),) +POST_TARGETS = install-core-updates +include files/updatecore.mk +endif + +# How to configure Perl +#configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS +configure-perl: ARGS-64 = -dusedtrace +configure-perl: + (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) + #cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be + @# 64 bit: -Duse64bitall + @$(MAKECOOKIE) + +build-perl: BUILD_EXPORTS = LD_OPTIONS +build-perl: + @echo " ==> Running make in $*" + @#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) + cd $(WORKSRC) && $(BUILD_ENV) gmake + @$(MAKECOOKIE) + +test-perl: + @echo " ==> Running make $(TEST_TARGET) in $*" + @#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) + cd $(WORKSRC) && gmake check + @$(MAKECOOKIE) + +# Make links to libperl +#POST_TARGETS += libperl +#LIB_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) +#LIB_PATH = $(libdir)/perl/$(VERSION)/CORE +#libperl: +# @( cd $(DESTDIR)$(libdir) ; \ +# mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ +# $(DESTDIR)$(libdir) ; \ +# chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ +# ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) +# #; \ +# #ln -s libperl.so.$(VERSION) libperl.so ) +# @$(MAKECOOKIE) + +# Remove build paths from Config +#POST_TARGETS += perlconf +#perlconf: +# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ +# /bin/perl -i -lne "\ +# next if /config_arg[1-9]/; \ +# s/^config_args=.+$$/config_args=''/; \ +# s/^config_argc=.+$$/config_argc='0'/; \ +# s,-I$(DESTDIR)$(includedir),,g; \ +# s,-[LR]$(DESTDIR)$(libdir),,g; \ +# s,( -I$(includedir))+,\$$1,g; \ +# s,( -[LR]$(libdir))+,\$$1,g; \ +# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ +# s, (-L)?$(CC_HOME)\S+,,g; \ +# if (/^\w+=/) { \ +# s/\s{2,}(\-)/ \-/g; \ +# s/(^\w+=.) /\$$1/; \ +# s/ (.)$$/\$$1/g; \ +# } \ +# print \ +# " Config.pm Config_heavy.pl ) +# @$(MAKECOOKIE) + +#POST_TARGETS += CSWperl.cswperlincpath +#CSWperl.cswperlincpath: +# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath + +# Invoke post-install targets +#post-install-modulated: $(POST_TARGETS) +# @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Dec 8 22:16:22 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sat, 08 Dec 2012 21:16:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[19857] csw/mgar/pkg/courier-authlib/trunk/files/ cswusergroup Message-ID: Revision: 19857 http://gar.svn.sourceforge.net/gar/?rev=19857&view=rev Author: wilbury Date: 2012-12-08 21:16:21 +0000 (Sat, 08 Dec 2012) Log Message: ----------- courier-authlib/trunk: Specify and create authlib homedir Modified Paths: -------------- csw/mgar/pkg/courier-authlib/trunk/files/cswusergroup Modified: csw/mgar/pkg/courier-authlib/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/courier-authlib/trunk/files/cswusergroup 2012-12-08 20:06:29 UTC (rev 19856) +++ csw/mgar/pkg/courier-authlib/trunk/files/cswusergroup 2012-12-08 21:16:21 UTC (rev 19857) @@ -1 +1 @@ -authlib:authlib:Courier authentication daemon:::: +authlib:authlib:Courier authentication daemon:/var/opt/csw/authlib::m:r:N This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Dec 8 22:21:17 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sat, 08 Dec 2012 21:21:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[19858] csw/mgar/pkg/courier-authlib/trunk/files/ cswcourier-authlib Message-ID: Revision: 19858 http://gar.svn.sourceforge.net/gar/?rev=19858&view=rev Author: wilbury Date: 2012-12-08 21:21:17 +0000 (Sat, 08 Dec 2012) Log Message: ----------- courier-authlib/trunk: Start authdaemon in authlib's homedir Modified Paths: -------------- csw/mgar/pkg/courier-authlib/trunk/files/cswcourier-authlib Modified: csw/mgar/pkg/courier-authlib/trunk/files/cswcourier-authlib =================================================================== --- csw/mgar/pkg/courier-authlib/trunk/files/cswcourier-authlib 2012-12-08 21:16:21 UTC (rev 19857) +++ csw/mgar/pkg/courier-authlib/trunk/files/cswcourier-authlib 2012-12-08 21:21:17 UTC (rev 19858) @@ -36,7 +36,7 @@ case "$1" in start) - cd / + cd /var/opt/csw/authlib # Start daemons. printf "Starting Courier authentication services:" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Dec 8 22:32:17 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sat, 08 Dec 2012 21:32:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[19859] csw/mgar/pkg/courier-imap/trunk Message-ID: Revision: 19859 http://gar.svn.sourceforge.net/gar/?rev=19859&view=rev Author: wilbury Date: 2012-12-08 21:32:16 +0000 (Sat, 08 Dec 2012) Log Message: ----------- courier-imap/trunk: Some minor tweaks Modified Paths: -------------- csw/mgar/pkg/courier-imap/trunk/Makefile csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap.xml Modified: csw/mgar/pkg/courier-imap/trunk/Makefile =================================================================== --- csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-08 21:21:17 UTC (rev 19858) +++ csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-08 21:32:16 UTC (rev 19859) @@ -30,7 +30,7 @@ CONFIGURE_ARGS += --with-db=gdbm CONFIGURE_ARGS += --with-userdb=/etc/opt/csw/authlib/userdb CONFIGURE_ARGS += --with-certsdir=$(sysconfdir) -CONFIGURE_ARGS += --with-certdb=/etc/opt/csw/ssl/certs/ca-certificates.crt +CONFIGURE_ARGS += --with-certdb=/etc/opt/csw/ssl/certs REINPLACE_USRLOCAL += $(mandir)/man1/maildirmake.1 REINPLACE_WHEN_USRLOCAL = postinstall @@ -49,10 +49,12 @@ INITSMF = /etc/opt/csw/init.d/cswcourier-imap -TEST_SCRIPTS = - MIGRATE_SOURCE_DIR_CSWcourier-imap = $(prefix)/etc/courier-imap MIGRATE_DEST_DIR_CSWcourier-imap = $(sysconfdir) +MIGRATE_FILES_CSWcourier-imap += imapd +MIGRATE_FILES_CSWcourier-imap += pop3d +MIGRATE_FILES_CSWcourier-imap += imapd-ssl +MIGRATE_FILES_CSWcourier-imap += pop3d-ssl PRESERVECONF += imapd PRESERVECONF += pop3d @@ -66,6 +68,8 @@ # SMF override CHECKPKG_OVERRIDES_CSWcourier-imap += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswcourier-imap.xml +TEST_SCRIPTS = + include gar/category.mk post-install-modulated: Modified: csw/mgar/pkg/courier-imap/trunk/files/cswcourier-imap.xml =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Dec 8 22:32:50 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sat, 08 Dec 2012 21:32:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[19860] csw/mgar/pkg/courier-authlib/trunk/Makefile Message-ID: Revision: 19860 http://gar.svn.sourceforge.net/gar/?rev=19860&view=rev Author: wilbury Date: 2012-12-08 21:32:50 +0000 (Sat, 08 Dec 2012) Log Message: ----------- courier-authlib/trunk: Run ugfiles upon proper set of files. Modified Paths: -------------- csw/mgar/pkg/courier-authlib/trunk/Makefile Modified: csw/mgar/pkg/courier-authlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/courier-authlib/trunk/Makefile 2012-12-08 21:32:16 UTC (rev 19859) +++ csw/mgar/pkg/courier-authlib/trunk/Makefile 2012-12-08 21:32:50 UTC (rev 19860) @@ -66,7 +66,7 @@ PROTOTYPE_PERMS_1 = 755 PROTOTYPE_CLASS_2 = ugfiles -PROTOTYPE_FILES_2 = \/etc\/opt\/csw\/authlib\/auth.*\.dist +PROTOTYPE_FILES_2 = \/etc\/opt\/csw\/authlib\/auth.* PROTOTYPE_USER_2 = authlib PROTOTYPE_GROUP_2 = authlib PROTOTYPE_PERMS_2 = 640 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 9 10:51:19 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 09 Dec 2012 09:51:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[19861] csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Message-ID: Revision: 19861 http://gar.svn.sourceforge.net/gar/?rev=19861&view=rev Author: guengel Date: 2012-12-09 09:51:18 +0000 (Sun, 09 Dec 2012) Log Message: ----------- gdk-pixbuf/trunk: Bumped to 2.24.1. Updated dependencies. Modified Paths: -------------- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2012-12-08 21:32:50 UTC (rev 19860) +++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2012-12-09 09:51:18 UTC (rev 19861) @@ -24,19 +24,14 @@ # To retain backwards compatibility with gdk pixbuf package 0.22 CATALOGNAME_CSWgdkpixbuf = gdk_pixbuf SPKG_DESC_CSWgdkpixbuf = $(DESCRIPTION) -PKGFILES_CSWlibgdk-pixbuf2-0-0 += $(call pkgfiles_lib,gdk-pixbuf-2.0/.*) -RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk-pixbuf2-0-0 -# RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk-pixbuf-xlib2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf = CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk-pixbuf-xlib2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibtiff3 -RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgio2-0-0 - +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibpng15-15 # I assume if one installs CSWgdkpixbuf, one wants all the stuff # except -dev CHECKPKG_OVERRIDES_CSWgdkpixbuf += surplus-dependency|CSWlibgdk-pixbuf-xlib2-0-0 @@ -52,34 +47,25 @@ PACKAGES += CSWlibgdk-pixbuf2-0-0 SPKG_DESC_CSWlibgdk-pixbuf2-0-0 = $(DESCRIPTION), libgdk_pixbuf-2.0.so.0 -PKGFILES_CSWlibgdk-pixbuf2-0-0 += $(call baseisadirs,$(libdir),libgdk_pixbuf-2\.0\.so\.0(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 = CSWlibgio2-0-0 +PKGFILES_CSWlibgdk-pixbuf2-0-0 = $(call pkgfiles_lib,libgdk_pixbuf-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 = CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibpng12-0 PACKAGES += CSWlibgdk-pixbuf-xlib2-0-0 SPKG_DESC_CSWlibgdk-pixbuf-xlib2-0-0 = $(DESCRIPTION), libgdk_pixbuf_xlib-2.0.so.0 PKGFILES_CSWlibgdk-pixbuf-xlib2-0-0 = $(call pkgfiles_lib,libgdk_pixbuf_xlib-2.0.so.0) -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 = CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibglib2-0-0 PACKAGES += CSWlibgdk-pixbuf-dev SPKG_DESC_CSWlibgdk-pixbuf-dev = Developtment files $(DESCRIPTION) PKGFILES_CSWlibgdk-pixbuf-dev = $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev = CSWgdkpixbuf -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev += CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev += CSWlibgdk-pixbuf-xlib2-0-0 +# CSWgdkpixbuf is supposed to pull in all deps. +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev = missing-dependency|CSWlibgdk-pixbuf2-0-0 + BUILD_DEP_PKGS = CSWggettext-dev BUILD_DEP_PKGS += CSWjbigkit BUILD_DEP_PKGS += CSWlibglib2-dev @@ -91,10 +77,12 @@ BUILD64 = 1 +# We need the binaries to query 64 bit modules +MERGE_DIRS_isa-extra = $(bindir) $(libdir) + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-x11 -# CONFIGURE_ARGS += --with-libiconv-prefix -# CONFIGURE_ARGS += --with-libintl-prefix +CONFIGURE_ARGS += --with-libiconv-prefix +CONFIGURE_ARGS += --with-libintl-prefix include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sun Dec 9 12:37:45 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 09 Dec 2012 11:37:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[19862] csw/mgar/pkg/courier-imap/trunk/Makefile Message-ID: Revision: 19862 http://gar.svn.sourceforge.net/gar/?rev=19862&view=rev Author: wilbury Date: 2012-12-09 11:37:45 +0000 (Sun, 09 Dec 2012) Log Message: ----------- courier-imap/trunk: Specify piddir explicitly Modified Paths: -------------- csw/mgar/pkg/courier-imap/trunk/Makefile Modified: csw/mgar/pkg/courier-imap/trunk/Makefile =================================================================== --- csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-09 09:51:18 UTC (rev 19861) +++ csw/mgar/pkg/courier-imap/trunk/Makefile 2012-12-09 11:37:45 UTC (rev 19862) @@ -31,6 +31,7 @@ CONFIGURE_ARGS += --with-userdb=/etc/opt/csw/authlib/userdb CONFIGURE_ARGS += --with-certsdir=$(sysconfdir) CONFIGURE_ARGS += --with-certdb=/etc/opt/csw/ssl/certs +CONFIGURE_ARGS += --with-piddir=/var/opt/csw/run/courier-imap REINPLACE_USRLOCAL += $(mandir)/man1/maildirmake.1 REINPLACE_WHEN_USRLOCAL = postinstall @@ -73,9 +74,10 @@ include gar/category.mk post-install-modulated: + @/opt/csw/bin/ginstall -d -m 755 $(DESTDIR)/etc/opt/csw/pkg/CSW$(NAME) @/opt/csw/bin/ginstall -d -m 755 $(DESTDIR)/etc/opt/csw/init.d @/opt/csw/bin/ginstall -d -m 755 $(DESTDIR)/var/opt/csw/svc/manifest/network - @/opt/csw/bin/ginstall -d -m 755 $(DESTDIR)/etc/opt/csw/pkg/CSW$(NAME) + @/opt/csw/bin/ginstall -d -m 755 $(DESTDIR)/var/opt/csw/run/courier-imap @/opt/csw/bin/ginstall -m 755 $(FILEDIR)/cswcourier-imap $(DESTDIR)/$(INITSMF) @/opt/csw/bin/ginstall -m 644 $(FILEDIR)/cswcourier-imap.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/cswcourier-imap.xml @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 9 15:06:46 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 09 Dec 2012 14:06:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[19863] csw/mgar/pkg/postgresql/branches/postgresql-8.3 Message-ID: Revision: 19863 http://gar.svn.sourceforge.net/gar/?rev=19863&view=rev Author: guengel Date: 2012-12-09 14:06:45 +0000 (Sun, 09 Dec 2012) Log Message: ----------- postgresql/branches/postgresql-8.3: New upstream release. Fixed bug 5025 (https://www.opencsw.org/mantis/view.php?id=5025) Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/0004-Filter-out-compiler-optimization-for-pg_config.patch Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2012-12-09 11:37:45 UTC (rev 19862) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2012-12-09 14:06:45 UTC (rev 19863) @@ -90,7 +90,7 @@ BASE_VERSION = 8.3 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 21 +PATCHLEVEL = 22 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps @@ -225,6 +225,8 @@ # By default, src/makefiles/Makefile.solaris uses -Wl,-R'$(rpathdir)' # which isn't properly digested by Sun's ld PATCHFILES += 0000-Use-plain-rpath.patch +# Please see comment in the patch. +PATCHFILES += 0004-Filter-out-compiler-optimization-for-pg_config.patch INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED) USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums 2012-12-09 11:37:45 UTC (rev 19862) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums 2012-12-09 14:06:45 UTC (rev 19863) @@ -1 +1 @@ -3ac75d74a1cc7a6c442f1652f73e1d56 postgresql-8.3.21.tar.bz2 +d72e9d6681ff2a18ff19ad587236d098 postgresql-8.3.22.tar.bz2 Added: csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/0004-Filter-out-compiler-optimization-for-pg_config.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/0004-Filter-out-compiler-optimization-for-pg_config.patch (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/0004-Filter-out-compiler-optimization-for-pg_config.patch 2012-12-09 14:06:45 UTC (rev 19863) @@ -0,0 +1,52 @@ +From c361ec294277bfb36aac652bf6f5b6cdd415ba88 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 9 Dec 2012 12:03:33 +0100 +Subject: [PATCH] Filter out compiler optimization for pg_config + +For more information, see comments in this patch and +https://www.opencsw.org/mantis/view.php?id=5025 +--- + src/bin/pg_config/Makefile | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile +index befb8d8..7b73239 100644 +--- a/src/bin/pg_config/Makefile ++++ b/src/bin/pg_config/Makefile +@@ -8,6 +8,21 @@ + # + #------------------------------------------------------------------------- + ++ ++# pg_config has CFLAGS and LDFLAGS hardcoded, including compiler optimization. ++# This doesn't pan out if PostgreSQL is compiled with compiler A, but ++# pg_config is called to compile software with compiler B. So, we filter out ++# known compiler optimization flags (SunStudio and GCC, so far). ++# ++# This var holds all the compiler optimizations that will be filtered out. ++# Please be aware, that this filtering has only been tested with GMAKE. ++# ++# See also ++# https://www.opencsw.org/mantis/view.php?id=5025 ++# ++# --raos ++__compiler_opts = -march=% -mtune=% -xchip=% -xarch=% -xO% ++ + PGFILEDESC = "pg_config - report configuration information" + subdir = src/bin/pg_config + top_builddir = ../../.. +@@ -22,9 +37,9 @@ STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS)) + override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\"" + override CPPFLAGS += -DVAL_CC="\"$(CC)\"" + override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\"" +-override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\"" ++override CPPFLAGS += -DVAL_CFLAGS="\"$(filter-out $(__compiler_opts),$(CFLAGS))\"" + override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\"" +-override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\"" ++override CPPFLAGS += -DVAL_LDFLAGS="\"$(filter-out $(__compiler_opts),$(STD_LDFLAGS))\"" + override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\"" + override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\"" + +-- +1.8.0 + Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW 2012-12-09 11:37:45 UTC (rev 19862) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW 2012-12-09 14:06:45 UTC (rev 19863) @@ -1,3 +1,13 @@ +postgresql83 (8.3.22,REV=2012.12.09) + + * New upstream release 8.3.22. + + * pg_config: do not emit compiler optimization flags (see + https://www.opencsw.org/mantis/view.php?id=5025) + + -- Rafael Ostertag Sun, 09 Dec 2012 10:02:08 +0100 + + postgresql83 (8.3.21,REV=2012.10.02) * New upstream release 8.3.21. @@ -16,7 +26,7 @@ * Dropped support for Solaris 9 - * Include changelog.CSW in all packages, thus removing the clustering of + * Include changelog.CSW in all packages, thus removing the clustering of changelog.CSW files in CSWpostgresql -- Rafael Ostertag Tue, 12 June 2012 16:55:57+0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 9 15:07:17 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 09 Dec 2012 14:07:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[19864] csw/mgar/pkg/postgresql/branches/postgresql-8.4 Message-ID: Revision: 19864 http://gar.svn.sourceforge.net/gar/?rev=19864&view=rev Author: guengel Date: 2012-12-09 14:07:16 +0000 (Sun, 09 Dec 2012) Log Message: ----------- postgresql/branches/postgresql-8.4: New upstream release. Fixed bug 5025 (https://www.opencsw.org/mantis/view.php?id=5025) Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/0004-Filter-out-compiler-optimization-for-pg_config.patch Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2012-12-09 14:06:45 UTC (rev 19863) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2012-12-09 14:07:16 UTC (rev 19864) @@ -90,7 +90,7 @@ BASE_VERSION = 8.4 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 14 +PATCHLEVEL = 15 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps @@ -227,6 +227,8 @@ # By default, src/makefiles/Makefile.solaris uses -Wl,-R'$(rpathdir)' # which isn't properly digested by Sun's ld PATCHFILES += 0000-Use-plain-rpath.patch +# Please see comment in the patch. +PATCHFILES += 0004-Filter-out-compiler-optimization-for-pg_config.patch INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED) USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums 2012-12-09 14:06:45 UTC (rev 19863) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums 2012-12-09 14:07:16 UTC (rev 19864) @@ -1 +1 @@ -f35bb3698bade8065dc53ac15f00214d postgresql-8.4.14.tar.bz2 +8363dd4b1629094dcb9134075eee134b postgresql-8.4.15.tar.bz2 Added: csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/0004-Filter-out-compiler-optimization-for-pg_config.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/0004-Filter-out-compiler-optimization-for-pg_config.patch (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/0004-Filter-out-compiler-optimization-for-pg_config.patch 2012-12-09 14:07:16 UTC (rev 19864) @@ -0,0 +1,52 @@ +From c361ec294277bfb36aac652bf6f5b6cdd415ba88 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 9 Dec 2012 12:03:33 +0100 +Subject: [PATCH] Filter out compiler optimization for pg_config + +For more information, see comments in this patch and +https://www.opencsw.org/mantis/view.php?id=5025 +--- + src/bin/pg_config/Makefile | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile +index befb8d8..7b73239 100644 +--- a/src/bin/pg_config/Makefile ++++ b/src/bin/pg_config/Makefile +@@ -8,6 +8,21 @@ + # + #------------------------------------------------------------------------- + ++ ++# pg_config has CFLAGS and LDFLAGS hardcoded, including compiler optimization. ++# This doesn't pan out if PostgreSQL is compiled with compiler A, but ++# pg_config is called to compile software with compiler B. So, we filter out ++# known compiler optimization flags (SunStudio and GCC, so far). ++# ++# This var holds all the compiler optimizations that will be filtered out. ++# Please be aware, that this filtering has only been tested with GMAKE. ++# ++# See also ++# https://www.opencsw.org/mantis/view.php?id=5025 ++# ++# --raos ++__compiler_opts = -march=% -mtune=% -xchip=% -xarch=% -xO% ++ + PGFILEDESC = "pg_config - report configuration information" + subdir = src/bin/pg_config + top_builddir = ../../.. +@@ -22,9 +37,9 @@ STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS)) + override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\"" + override CPPFLAGS += -DVAL_CC="\"$(CC)\"" + override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\"" +-override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\"" ++override CPPFLAGS += -DVAL_CFLAGS="\"$(filter-out $(__compiler_opts),$(CFLAGS))\"" + override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\"" +-override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\"" ++override CPPFLAGS += -DVAL_LDFLAGS="\"$(filter-out $(__compiler_opts),$(STD_LDFLAGS))\"" + override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\"" + override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\"" + +-- +1.8.0 + Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2012-12-09 14:06:45 UTC (rev 19863) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2012-12-09 14:07:16 UTC (rev 19864) @@ -1,3 +1,13 @@ +postgresql84 (8.4.15,REV=2012.12.09) + + * New upstream release 8.4.15. + + * pg_config: do not emit compiler optimization flags (see + https://www.opencsw.org/mantis/view.php?id=5025) + + -- Rafael Ostertag Sun, 09 Dec 2012 10:02:08 +0100 + + postgresql84 (8.4.14,REV=2012.10.02) * New upstream release 8.4.14. @@ -16,7 +26,7 @@ * Dropped support for Solaris 9 - * Include changelog.CSW in all packages, thus removing the clustering of + * Include changelog.CSW in all packages, thus removing the clustering of changelog.CSW files in CSWpostgresql -- Rafael Ostertag Tue, 12 June 2012 19:30:57+0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 9 15:07:45 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 09 Dec 2012 14:07:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[19865] csw/mgar/pkg/postgresql/branches/postgresql-9.0 Message-ID: Revision: 19865 http://gar.svn.sourceforge.net/gar/?rev=19865&view=rev Author: guengel Date: 2012-12-09 14:07:45 +0000 (Sun, 09 Dec 2012) Log Message: ----------- postgresql/branches/postgresql-9.0: New upstream release. Fixed bug 5025 (https://www.opencsw.org/mantis/view.php?id=5025) Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0004-Filter-out-compiler-optimization-for-pg_config.patch Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2012-12-09 14:07:16 UTC (rev 19864) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2012-12-09 14:07:45 UTC (rev 19865) @@ -90,7 +90,7 @@ BASE_VERSION = 9.0 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 10 +PATCHLEVEL = 11 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps @@ -229,6 +229,8 @@ # By default, src/makefiles/Makefile.solaris uses -Wl,-R'$(rpathdir)' # which isn't properly digested by Sun's ld PATCHFILES += 0000-Use-plain-rpath.patch +# Please see comment in the patch. +PATCHFILES += 0004-Filter-out-compiler-optimization-for-pg_config.patch INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED) USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums 2012-12-09 14:07:16 UTC (rev 19864) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums 2012-12-09 14:07:45 UTC (rev 19865) @@ -1 +1 @@ -d2c9ad7267d83ff373cb92eb4807386a postgresql-9.0.10.tar.bz2 +b6080b9d902126e452249aa750ef10cd postgresql-9.0.11.tar.bz2 Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0004-Filter-out-compiler-optimization-for-pg_config.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0004-Filter-out-compiler-optimization-for-pg_config.patch (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0004-Filter-out-compiler-optimization-for-pg_config.patch 2012-12-09 14:07:45 UTC (rev 19865) @@ -0,0 +1,49 @@ +From 296c0619ac60d01ae5cf7207dd51794671c98a15 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 9 Dec 2012 13:53:33 +0100 +Subject: [PATCH] Filter out compiler optimization for pg_config + +For more information, see comments in this patch and +https://www.opencsw.org/mantis/view.php?id=5025 +--- + src/bin/pg_config/Makefile | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile +index b9ca579..7840d04 100644 +--- a/src/bin/pg_config/Makefile ++++ b/src/bin/pg_config/Makefile +@@ -8,6 +8,18 @@ + # + #------------------------------------------------------------------------- + ++# pg_config has CFLAGS and LDFLAGS hardcoded, including compiler optimization. ++# This doesn't pan out if PostgreSQL is compiled with compiler A, but ++# pg_config is called to compile software with compiler B. So, we filter out ++# known compiler optimization flags (SunStudio and GCC, so far). ++# ++# This var holds all the compiler optimizations that will be filtered out. ++# Please be aware, that this filtering has only been tested with GMAKE. ++# ++# See also ++# https://www.opencsw.org/mantis/view.php?id=5025 ++__compiler_opts = -march=% -mtune=% -xchip=% -xarch=% -xO% ++ + PGFILEDESC = "pg_config - report configuration information" + PGAPPICON=win32 + +@@ -24,9 +36,9 @@ STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS)) + override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\"" + override CPPFLAGS += -DVAL_CC="\"$(CC)\"" + override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\"" +-override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\"" ++override CPPFLAGS += -DVAL_CFLAGS="\"$(filter-out $(__compiler_opts),$(CFLAGS))\"" + override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\"" +-override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\"" ++override CPPFLAGS += -DVAL_LDFLAGS="\"$(filter-out $(__compiler_opts),$(STD_LDFLAGS))\"" + override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\"" + override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\"" + override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\"" +-- +1.8.0 + Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW 2012-12-09 14:07:16 UTC (rev 19864) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW 2012-12-09 14:07:45 UTC (rev 19865) @@ -1,3 +1,13 @@ +postgresql90 (9.0.11,REV=2012.12.09) + + * New upstream release 9.0.11. + + * pg_config: do not emit compiler optimization flags (see + https://www.opencsw.org/mantis/view.php?id=5025) + + -- Rafael Ostertag Sun, 09 Dec 2012 10:02:08 +0100 + + postgresql90 (9.0.10,REV=2012.10.02) * New upstream release 9.0.10. @@ -18,7 +28,7 @@ * Dropped support for Solaris 9 - * Include changelog.CSW in all packages, thus removing the clustering of + * Include changelog.CSW in all packages, thus removing the clustering of changelog.CSW files in CSWpostgresql -- Rafael Ostertag Mon, 13 June 2012 07:26:57+0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 9 15:08:38 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 09 Dec 2012 14:08:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[19866] csw/mgar/pkg/postgresql/branches/postgresql-9.1 Message-ID: Revision: 19866 http://gar.svn.sourceforge.net/gar/?rev=19866&view=rev Author: guengel Date: 2012-12-09 14:08:37 +0000 (Sun, 09 Dec 2012) Log Message: ----------- postgresql/branches/postgresql-9.1: New upstream release. Fixed bug 5025 (https://www.opencsw.org/mantis/view.php?id=5025) Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/0004-Filter-out-compiler-optimization-for-pg_config.patch Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile 2012-12-09 14:07:45 UTC (rev 19865) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile 2012-12-09 14:08:37 UTC (rev 19866) @@ -90,7 +90,7 @@ BASE_VERSION = 9.1 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 6 +PATCHLEVEL = 7 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps GARTYPE = v2 @@ -276,6 +276,8 @@ # By default, src/makefiles/Makefile.solaris uses -Wl,-R'$(rpathdir)' # which isn't properly digested by Sun's ld PATCHFILES += 0000-Use-plain-rpath.patch +# Please see comment in the patch. +PATCHFILES += 0004-Filter-out-compiler-optimization-for-pg_config.patch INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED) USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums 2012-12-09 14:07:45 UTC (rev 19865) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums 2012-12-09 14:08:37 UTC (rev 19866) @@ -1 +1 @@ -000755f66c0de58bbd4cd2b89b45b8e2 postgresql-9.1.6.tar.bz2 +eaf7b67493d59d1a60767ffdfbd65ce9 postgresql-9.1.7.tar.bz2 Added: csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/0004-Filter-out-compiler-optimization-for-pg_config.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/0004-Filter-out-compiler-optimization-for-pg_config.patch (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/0004-Filter-out-compiler-optimization-for-pg_config.patch 2012-12-09 14:08:37 UTC (rev 19866) @@ -0,0 +1,49 @@ +From 296c0619ac60d01ae5cf7207dd51794671c98a15 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 9 Dec 2012 13:53:33 +0100 +Subject: [PATCH] Filter out compiler optimization for pg_config + +For more information, see comments in this patch and +https://www.opencsw.org/mantis/view.php?id=5025 +--- + src/bin/pg_config/Makefile | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile +index b9ca579..7840d04 100644 +--- a/src/bin/pg_config/Makefile ++++ b/src/bin/pg_config/Makefile +@@ -8,6 +8,18 @@ + # + #------------------------------------------------------------------------- + ++# pg_config has CFLAGS and LDFLAGS hardcoded, including compiler optimization. ++# This doesn't pan out if PostgreSQL is compiled with compiler A, but ++# pg_config is called to compile software with compiler B. So, we filter out ++# known compiler optimization flags (SunStudio and GCC, so far). ++# ++# This var holds all the compiler optimizations that will be filtered out. ++# Please be aware, that this filtering has only been tested with GMAKE. ++# ++# See also ++# https://www.opencsw.org/mantis/view.php?id=5025 ++__compiler_opts = -march=% -mtune=% -xchip=% -xarch=% -xO% ++ + PGFILEDESC = "pg_config - report configuration information" + PGAPPICON=win32 + +@@ -24,9 +36,9 @@ STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS)) + override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\"" + override CPPFLAGS += -DVAL_CC="\"$(CC)\"" + override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\"" +-override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\"" ++override CPPFLAGS += -DVAL_CFLAGS="\"$(filter-out $(__compiler_opts),$(CFLAGS))\"" + override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\"" +-override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\"" ++override CPPFLAGS += -DVAL_LDFLAGS="\"$(filter-out $(__compiler_opts),$(STD_LDFLAGS))\"" + override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\"" + override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\"" + override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\"" +-- +1.8.0 + Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW 2012-12-09 14:07:45 UTC (rev 19865) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW 2012-12-09 14:08:37 UTC (rev 19866) @@ -1,3 +1,13 @@ +postgresql91 (9.1.7,REV=2012.12.09) + + * New upstream release 9.1.7. + + * pg_config: do not emit compiler optimization flags (see + https://www.opencsw.org/mantis/view.php?id=5025) + + -- Rafael Ostertag Sun, 09 Dec 2012 10:02:08 +0100 + + postgresql91 (9.1.6,REV=2012.10.03) * New upstream release 9.1.6. @@ -18,7 +28,7 @@ * Dropped support for Solaris 9 - * Include changelog.CSW in all packages, thus removing the clustering of + * Include changelog.CSW in all packages, thus removing the clustering of changelog.CSW files in CSWpostgresql -- Rafael Ostertag Wed, 13 June 2012 15:46:57+0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 9 15:10:05 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 09 Dec 2012 14:10:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[19867] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 19867 http://gar.svn.sourceforge.net/gar/?rev=19867&view=rev Author: guengel Date: 2012-12-09 14:10:05 +0000 (Sun, 09 Dec 2012) Log Message: ----------- postgresql/trunk: New upstream release. Fixed bug 5025 (https://www.opencsw.org/mantis/view.php?id=5025) Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/checksums csw/mgar/pkg/postgresql/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/postgresql/trunk/files/0004-Filter-out-compiler-optimization-for-pg_config.patch Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2012-12-09 14:08:37 UTC (rev 19866) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2012-12-09 14:10:05 UTC (rev 19867) @@ -90,7 +90,7 @@ BASE_VERSION = 9.2 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 1 +PATCHLEVEL = 2 VERSION = $(BASE_VERSION).$(PATCHLEVEL) GARTYPE = v2 @@ -280,6 +280,8 @@ # By default, src/makefiles/Makefile.solaris uses -Wl,-R'$(rpathdir)' # which isn't properly digested by Sun's ld PATCHFILES += 0002-Use-plain-rpath.patch +# Please see comment in the patch. +PATCHFILES += 0004-Filter-out-compiler-optimization-for-pg_config.patch INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED) USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2012-12-09 14:08:37 UTC (rev 19866) +++ csw/mgar/pkg/postgresql/trunk/checksums 2012-12-09 14:10:05 UTC (rev 19867) @@ -1 +1 @@ -c0b4799ea9850eae3ead14f0a60e9418 postgresql-9.2.1.tar.bz2 +1cc388988e69bf75c6b55d59070100f6 postgresql-9.2.2.tar.bz2 Added: csw/mgar/pkg/postgresql/trunk/files/0004-Filter-out-compiler-optimization-for-pg_config.patch =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/0004-Filter-out-compiler-optimization-for-pg_config.patch (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/0004-Filter-out-compiler-optimization-for-pg_config.patch 2012-12-09 14:10:05 UTC (rev 19867) @@ -0,0 +1,49 @@ +From 59e93fbc61cbd54fe79db5abf061c27e8e83bf09 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 9 Dec 2012 14:14:02 +0100 +Subject: [PATCH] Filter out compiler optimization for pg_config + +For more information, see comments in this patch and +https://www.opencsw.org/mantis/view.php?id=5025 +--- + src/bin/pg_config/Makefile | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile +index e9aa0a7..8a0c895 100644 +--- a/src/bin/pg_config/Makefile ++++ b/src/bin/pg_config/Makefile +@@ -8,6 +8,18 @@ + # + #------------------------------------------------------------------------- + ++# pg_config has CFLAGS and LDFLAGS hardcoded, including compiler optimization. ++# This doesn't pan out if PostgreSQL is compiled with compiler A, but ++# pg_config is called to compile software with compiler B. So, we filter out ++# known compiler optimization flags (SunStudio and GCC, so far). ++# ++# This var holds all the compiler optimizations that will be filtered out. ++# Please be aware, that this filtering has only been tested with GMAKE. ++# ++# See also ++# https://www.opencsw.org/mantis/view.php?id=5025 ++__compiler_opts = -march=% -mtune=% -xchip=% -xarch=% -xO% ++ + PGFILEDESC = "pg_config - report configuration information" + PGAPPICON=win32 + +@@ -24,9 +36,9 @@ STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS)) + override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\"" + override CPPFLAGS += -DVAL_CC="\"$(CC)\"" + override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\"" +-override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\"" ++override CPPFLAGS += -DVAL_CFLAGS="\"$(filter-out $(__compiler_opts),$(CFLAGS))\"" + override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\"" +-override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\"" ++override CPPFLAGS += -DVAL_LDFLAGS="\"$(filter-out $(__compiler_opts),$(STD_LDFLAGS))\"" + override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\"" + override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\"" + override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\"" +-- +1.8.0 + Modified: csw/mgar/pkg/postgresql/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2012-12-09 14:08:37 UTC (rev 19866) +++ csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2012-12-09 14:10:05 UTC (rev 19867) @@ -1,3 +1,13 @@ +postgresql92 (9.2.2,REV=2012.12.09) + + * New upstream release 9.2.2. + + * pg_config: do not emit compiler optimization flags (see + https://www.opencsw.org/mantis/view.php?id=5025) + + -- Rafael Ostertag Sun, 09 Dec 2012 10:02:08 +0100 + + postgresql92 (9.2.1,REV=2012.10.03) * New upstream release 9.2.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 9 15:28:42 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 09 Dec 2012 14:28:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[19868] csw/mgar/pkg/cfengine3/trunk Message-ID: Revision: 19868 http://gar.svn.sourceforge.net/gar/?rev=19868&view=rev Author: guengel Date: 2012-12-09 14:28:41 +0000 (Sun, 09 Dec 2012) Log Message: ----------- cfengine3/trunk: New upstream release 3.4.1 Modified Paths: -------------- csw/mgar/pkg/cfengine3/trunk/Makefile csw/mgar/pkg/cfengine3/trunk/checksums csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/cfengine3/trunk/files/0001-Fix-preprocessor-macro-FUNC_DEPRECATED-to-avoid-synt.patch csw/mgar/pkg/cfengine3/trunk/files/0002-Remove-unsupported-compiler-flags.patch csw/mgar/pkg/cfengine3/trunk/files/0003-Fix-empty-initializer.-Add-mkdtemp.patch csw/mgar/pkg/cfengine3/trunk/files/0003-Remove-unsupported-compiler-flags.-Add-z-interpose-w.patch Removed Paths: ------------- csw/mgar/pkg/cfengine3/trunk/files/0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch csw/mgar/pkg/cfengine3/trunk/files/0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch csw/mgar/pkg/cfengine3/trunk/files/0002-Add-include-alloca.h-in-gcov-stub.c.patch csw/mgar/pkg/cfengine3/trunk/files/0005-Remove-unsupported-compiler-options.patch csw/mgar/pkg/cfengine3/trunk/files/0006-Fix-empty-initializer.-Add-mkdtemp.patch Modified: csw/mgar/pkg/cfengine3/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine3/trunk/Makefile 2012-12-09 14:10:05 UTC (rev 19867) +++ csw/mgar/pkg/cfengine3/trunk/Makefile 2012-12-09 14:28:41 UTC (rev 19868) @@ -1,9 +1,9 @@ # $Id$ # NAME = cfengine3 -VERSION = 3.3.9 +VERSION = 3.4.1 GARTYPE = v2 -GARCOMPILER = SOS12U1 +GARCOMPILER = SOS12U2 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -38,14 +38,12 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -PATCHFILES = 0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch -#PATCHFILES += 0001-Remove-unsupported-compiler-options.patch -PATCHFILES += 0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch # See comment in patch PATCHFILES += 0000-Do-not-perform-acceptance-test.patch -PATCHFILES += 0002-Add-include-alloca.h-in-gcov-stub.c.patch -PATCHFILES += 0005-Remove-unsupported-compiler-options.patch -PATCHFILES += 0006-Fix-empty-initializer.-Add-mkdtemp.patch +# Make build and tests work +PATCHFILES += 0001-Fix-preprocessor-macro-FUNC_DEPRECATED-to-avoid-synt.patch +PATCHFILES += 0003-Fix-empty-initializer.-Add-mkdtemp.patch +PATCHFILES += 0003-Remove-unsupported-compiler-flags.-Add-z-interpose-w.patch # # CUSTOM VARIABLES @@ -62,6 +60,8 @@ RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibpcre1 CHECKPKG_OVERRIDES_CSW$(NAME)utils += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)utils|catalogname=$(NAME)_utils|expected-catalogname=$(NAME)utils +CHECKPKG_OVERRIDES_CSW$(NAME)utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/$(NAME)_utils/CoreBase/failsafe/failsafe.cf +CHECKPKG_OVERRIDES_CSW$(NAME)utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/$(NAME)_utils/ChangeLog OBSOLETED_BY_CSW$(NAME)utils = CSWlibpromises1 CSW$(NAME)rt CATALOGNAME_CSWlibpromises1 = libpromises1_stub CATALOGNAME_CSW$(NAME)rt = $(NAME)_rt_stub @@ -84,6 +84,8 @@ SPKG_DESC_CSW$(NAME)client = CFEngine 3 client binaries RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSW$(NAME)utils +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibxml2-2 PKGFILES_CSW$(NAME)client += $(sbindir)/cf-agent PKGFILES_CSW$(NAME)client += $(sbindir)/cf-execd PKGFILES_CSW$(NAME)client += $(sbindir)/cf-monitord @@ -112,6 +114,7 @@ BUILD_DEP_PKGS = CSWlibssl-dev BUILD_DEP_PKGS += CSWlibpcre-dev +BUILD_DEP_PKGS += CSWlibxml2-dev BUILD_DEP_PKGS += CSWlibtokyocabinet-dev BUILD_DEP_PKGS += CSWflex BUILD_DEP_PKGS += CSWbison @@ -127,7 +130,8 @@ CONFIGURE_ARGS += --without-mysql EXTRA_CPPFLAGS = -xc99=all -EXTRA_CFLAGS = -xc99=all +# -features=extensions is needed since some void functions return values... +EXTRA_CFLAGS = -xc99=all -features=extensions # We use this because libpromises will be moved to this private # directory (see also move-libpromises:) Modified: csw/mgar/pkg/cfengine3/trunk/checksums =================================================================== --- csw/mgar/pkg/cfengine3/trunk/checksums 2012-12-09 14:10:05 UTC (rev 19867) +++ csw/mgar/pkg/cfengine3/trunk/checksums 2012-12-09 14:28:41 UTC (rev 19868) @@ -1 +1 @@ -1df1365264a88770a84e18df3e688dbe cfengine-3.3.9.tar.gz +96e2221ca0e1341f4abacde81df41ac2 cfengine-3.4.1.tar.gz Deleted: csw/mgar/pkg/cfengine3/trunk/files/0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch 2012-12-09 14:10:05 UTC (rev 19867) +++ csw/mgar/pkg/cfengine3/trunk/files/0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch 2012-12-09 14:28:41 UTC (rev 19868) @@ -1,34 +0,0 @@ -From 52fbe289f9e86c525aae84eba5035b581c04c712 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 17 Jun 2012 10:31:12 +0200 -Subject: [PATCH] Avoid passing NULL pointer to CfOut in - FnCallHostInNetgroup() - ---- - src/evalfunction.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/evalfunction.c b/src/evalfunction.c -index f310d7c..92d8bd5 100644 ---- a/src/evalfunction.c -+++ b/src/evalfunction.c -@@ -2183,14 +2183,14 @@ FnCallResult FnCallHostInNetgroup(FnCall *fp, Rlist *finalargs) - { - if (host == NULL || strcmp(host, VUQNAME) == 0) - { -- CfOut(cf_verbose, "", "Matched %s in netgroup %s\n", host, ScalarValue(finalargs)); -+ CfOut(cf_verbose, "", "Matched %s in netgroup %s\n", host == NULL ? "(nil)" : host, ScalarValue(finalargs)); - strcpy(buffer, "any"); - break; - } - - if (host == NULL || strcmp(host, VFQNAME) == 0) - { -- CfOut(cf_verbose, "", "Matched %s in netgroup %s\n", host, ScalarValue(finalargs)); -+ CfOut(cf_verbose, "", "Matched %s in netgroup %s\n", host == NULL ? "(nil)" : host, ScalarValue(finalargs)); - strcpy(buffer, "any"); - break; - } --- -1.7.10.3 - Deleted: csw/mgar/pkg/cfengine3/trunk/files/0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch 2012-12-09 14:10:05 UTC (rev 19867) +++ csw/mgar/pkg/cfengine3/trunk/files/0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch 2012-12-09 14:28:41 UTC (rev 19868) @@ -1,28 +0,0 @@ -From 4ab202a1367d352937b101c7994cd99100950822 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 17 Jun 2012 10:46:20 +0200 -Subject: [PATCH] Optimization/debug flags adjusted for use with SunStudio - ---- - configure | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index d8df74d..c929f0a 100755 ---- a/configure -+++ b/configure -@@ -13685,9 +13685,9 @@ fi - - - if test x"$debug" = x"yes"; then -- CFLAGS="$CFLAGS -g3 -O0" -+ CFLAGS="$CFLAGS -g -xO0" - else -- CFLAGS="$CFLAGS -O2 -DNDEBUG" -+ CFLAGS="$CFLAGS -xO3 -DNDEBUG" - fi - - --- -1.7.10.3 - Added: csw/mgar/pkg/cfengine3/trunk/files/0001-Fix-preprocessor-macro-FUNC_DEPRECATED-to-avoid-synt.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0001-Fix-preprocessor-macro-FUNC_DEPRECATED-to-avoid-synt.patch (rev 0) +++ csw/mgar/pkg/cfengine3/trunk/files/0001-Fix-preprocessor-macro-FUNC_DEPRECATED-to-avoid-synt.patch 2012-12-09 14:28:41 UTC (rev 19868) @@ -0,0 +1,26 @@ +From 6301179ba982f8a6f4d0f28e8dd70952d449ca54 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 9 Dec 2012 12:23:07 +0100 +Subject: [PATCH] Fix preprocessor macro FUNC_DEPRECATED to avoid syntax + errors + +--- + src/compiler.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/compiler.h b/src/compiler.h +index 16987c7..32db658 100644 +--- a/src/compiler.h ++++ b/src/compiler.h +@@ -49,7 +49,7 @@ + # define FUNC_DEPRECATED \ + __attribute__((deprecated)) + #else +-# define FUNC_DEPRECATED(warning_text) ++# define FUNC_DEPRECATED + #endif + + #endif +-- +1.8.0 + Deleted: csw/mgar/pkg/cfengine3/trunk/files/0002-Add-include-alloca.h-in-gcov-stub.c.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0002-Add-include-alloca.h-in-gcov-stub.c.patch 2012-12-09 14:10:05 UTC (rev 19867) +++ csw/mgar/pkg/cfengine3/trunk/files/0002-Add-include-alloca.h-in-gcov-stub.c.patch 2012-12-09 14:28:41 UTC (rev 19868) @@ -1,23 +0,0 @@ -From 9063c218bfd3fcdeeeab7a2f40d46312bb3d5f23 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sat, 16 Jun 2012 21:15:44 +0200 -Subject: [PATCH] Add include alloca.h in gcov-stub.c - ---- - tests/unit/gcov-stub.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/unit/gcov-stub.c b/tests/unit/gcov-stub.c -index 39cfd00..241b92a 100644 ---- a/tests/unit/gcov-stub.c -+++ b/tests/unit/gcov-stub.c -@@ -1,5 +1,6 @@ - #include "cf3.defs.h" - #include "cf3.extern.h" -+#include - - /* - * Stubs which allow CFEngine compiled with gcov support to link against unit --- -1.7.10.3 - Added: csw/mgar/pkg/cfengine3/trunk/files/0002-Remove-unsupported-compiler-flags.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0002-Remove-unsupported-compiler-flags.patch (rev 0) +++ csw/mgar/pkg/cfengine3/trunk/files/0002-Remove-unsupported-compiler-flags.patch 2012-12-09 14:28:41 UTC (rev 19868) @@ -0,0 +1,39 @@ +From c7e663d95a14ce859c5475d36db52127ffdc75f4 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 9 Dec 2012 13:15:36 +0100 +Subject: [PATCH] Remove unsupported compiler flags + +--- + tests/unit/Makefile.am | 2 +- + tests/unit/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am +index a136082..a29890d 100644 +--- a/tests/unit/Makefile.am ++++ b/tests/unit/Makefile.am +@@ -88,7 +88,7 @@ xml_writer_test_LDADD = libtest.la libstr.la + # instrumentation code uses fclose(3). + # + file_writer_test_SOURCES = file_writer_test.c gcov-stub.c +-file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage ++file_writer_test_CFLAGS = $(AM_CFLAGS) + file_writer_test_LDADD = libstr.la + file_writer_test_LDLFAGS = + +diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in +index 59b91dd..77df470 100644 +--- a/tests/unit/Makefile.in ++++ b/tests/unit/Makefile.in +@@ -601,7 +601,7 @@ xml_writer_test_LDADD = libtest.la libstr.la + # instrumentation code uses fclose(3). + # + file_writer_test_SOURCES = file_writer_test.c gcov-stub.c +-file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage ++file_writer_test_CFLAGS = $(AM_CFLAGS) + file_writer_test_LDADD = libstr.la + file_writer_test_LDLFAGS = + db_test_SOURCES = db_test.c +-- +1.8.0 + Added: csw/mgar/pkg/cfengine3/trunk/files/0003-Fix-empty-initializer.-Add-mkdtemp.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0003-Fix-empty-initializer.-Add-mkdtemp.patch (rev 0) +++ csw/mgar/pkg/cfengine3/trunk/files/0003-Fix-empty-initializer.-Add-mkdtemp.patch 2012-12-09 14:28:41 UTC (rev 19868) @@ -0,0 +1,330 @@ +From 8e25bfc31a6342071ba7a483ca333211491160c0 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 9 Dec 2012 13:49:49 +0100 +Subject: [PATCH] Fix empty initializer. Add mkdtemp(). + +--- + tests/load/db_load.c | 20 ++++++++++++++++++-- + tests/load/lastseen_load.c | 22 +++++++++++++++++++--- + tests/unit/db_test.c | 20 ++++++++++++++++++-- + tests/unit/dbm_migration_bundles_test.c | 20 ++++++++++++++++++-- + tests/unit/files_interfaces_test.c | 16 ++++++++++++++++ + tests/unit/files_lib_test.c | 16 ++++++++++++++++ + tests/unit/lastseen_migration_test.c | 22 +++++++++++++++++++--- + tests/unit/lastseen_test.c | 22 +++++++++++++++++++--- + tests/unit/persistent_lock_test.c | 16 ++++++++++++++++ + 9 files changed, 159 insertions(+), 15 deletions(-) + +diff --git a/tests/load/db_load.c b/tests/load/db_load.c +index 1860ae6..8998bff 100644 +--- a/tests/load/db_load.c ++++ b/tests/load/db_load.c +@@ -2,6 +2,22 @@ + #include "dbm_api.h" + #include + ++#include ++#include ++ ++static char* mkdtemp(char *template) { ++ char *tmp; ++ int retval; ++ ++ tmp = mktemp(template); ++ if (tmp == NULL) return NULL; ++ ++ if ( !(retval = mkdir(tmp, S_IRWXU)) ) ++ return NULL; ++ ++ return tmp; ++} ++ + #define MAX_THREADS 10000 + #define DB_ID dbid_classes + +@@ -347,5 +363,5 @@ int ThreadUnlock(pthread_mutex_t *t) + pthread_mutex_t *cft_dbhandle; + #endif + +-const char *DAY_TEXT[] = {}; +-const char *MONTH_TEXT[] = {}; ++const char *DAY_TEXT[] = {NULL}; ++const char *MONTH_TEXT[] = {NULL}; +diff --git a/tests/load/lastseen_load.c b/tests/load/lastseen_load.c +index 22d4cf3..07c718d 100644 +--- a/tests/load/lastseen_load.c ++++ b/tests/load/lastseen_load.c +@@ -2,6 +2,22 @@ + #include "dbm_api.h" + #include "lastseen.h" + ++#include ++#include ++ ++static char* mkdtemp(char *template) { ++ char *tmp; ++ int retval; ++ ++ tmp = mktemp(template); ++ if (tmp == NULL) return NULL; ++ ++ if ( !(retval = mkdir(tmp, S_IRWXU)) ) ++ return NULL; ++ ++ return tmp; ++} ++ + char CFWORKDIR[CF_BUFSIZE] = "/tmp"; + + +@@ -59,9 +75,9 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...) + } + + enum cfhashes CF_DEFAULT_DIGEST; +-const char *DAY_TEXT[] = {}; +-const char *MONTH_TEXT[] = {}; +-const char *SHIFT_TEXT[] = {}; ++const char *DAY_TEXT[] = {NULL}; ++const char *MONTH_TEXT[] = {NULL}; ++const char *SHIFT_TEXT[] = {NULL}; + pthread_mutex_t *cft_output; + char VIPADDRESS[18]; + RSA *PUBKEY; +diff --git a/tests/unit/db_test.c b/tests/unit/db_test.c +index 40c8957..c94a3a7 100644 +--- a/tests/unit/db_test.c ++++ b/tests/unit/db_test.c +@@ -3,6 +3,22 @@ + #include "cf3.defs.h" + #include "dbm_api.h" + ++#include ++#include ++ ++static char* mkdtemp(char *template) { ++ char *tmp; ++ int retval; ++ ++ tmp = mktemp(template); ++ if (tmp == NULL) return NULL; ++ ++ if ( !(retval = mkdir(tmp, S_IRWXU)) ) ++ return NULL; ++ ++ return tmp; ++} ++ + char CFWORKDIR[CF_BUFSIZE]; + + void tests_setup(void) +@@ -148,6 +164,6 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...) + fprintf(stderr, "\n"); + } + +-const char *DAY_TEXT[] = {}; +-const char *MONTH_TEXT[] = {}; ++const char *DAY_TEXT[] = {NULL}; ++const char *MONTH_TEXT[] = {NULL}; + +diff --git a/tests/unit/dbm_migration_bundles_test.c b/tests/unit/dbm_migration_bundles_test.c +index 279ce45..c7afc92 100644 +--- a/tests/unit/dbm_migration_bundles_test.c ++++ b/tests/unit/dbm_migration_bundles_test.c +@@ -6,6 +6,22 @@ + #include + #include + ++#include ++#include ++ ++static char* mkdtemp(char *template) { ++ char *tmp; ++ int retval; ++ ++ tmp = mktemp(template); ++ if (tmp == NULL) return NULL; ++ ++ if ( !(retval = mkdir(tmp, S_IRWXU)) ) ++ return NULL; ++ ++ return tmp; ++} ++ + char CFWORKDIR[CF_BUFSIZE]; + + static void tests_setup(void) +@@ -166,8 +182,8 @@ int main() + } + + /* STUBS */ +-const char *DAY_TEXT[] = {}; +-const char *MONTH_TEXT[] = {}; ++const char *DAY_TEXT[] = {NULL}; ++const char *MONTH_TEXT[] = {NULL}; + + void FatalError(char *s, ...) + { +diff --git a/tests/unit/files_interfaces_test.c b/tests/unit/files_interfaces_test.c +index c2f5266..605f42a 100644 +--- a/tests/unit/files_interfaces_test.c ++++ b/tests/unit/files_interfaces_test.c +@@ -1,6 +1,22 @@ + #include "test.h" + #include "files_interfaces.h" + ++#include ++#include ++ ++static char* mkdtemp(char *template) { ++ char *tmp; ++ int retval; ++ ++ tmp = mktemp(template); ++ if (tmp == NULL) return NULL; ++ ++ if ( !(retval = mkdir(tmp, S_IRWXU)) ) ++ return NULL; ++ ++ return tmp; ++} ++ + #define FILE_SIZE (sizeof(FILE_CONTENTS) - 1) + #define FILE_LINE "some garbage!" + #define FILE_CORRUPTED_LINE "some \0 , gar\0bage!" +diff --git a/tests/unit/files_lib_test.c b/tests/unit/files_lib_test.c +index 642d073..0f24d71 100644 +--- a/tests/unit/files_lib_test.c ++++ b/tests/unit/files_lib_test.c +@@ -6,6 +6,22 @@ + #include + #include + ++#include ++#include ++ ++static char* mkdtemp(char *template) { ++ char *tmp; ++ int retval; ++ ++ tmp = mktemp(template); ++ if (tmp == NULL) return NULL; ++ ++ if ( !(retval = mkdir(tmp, S_IRWXU)) ) ++ return NULL; ++ ++ return tmp; ++} ++ + #define FILE_CONTENTS "8aysd9a8ydhsdkjnaldn12lk\njndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljew\nnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1l\rkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1\r\nlkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn3" + #define FILE_SIZE (sizeof(FILE_CONTENTS) - 1) + +diff --git a/tests/unit/lastseen_migration_test.c b/tests/unit/lastseen_migration_test.c +index f0f285f..79c0f42 100644 +--- a/tests/unit/lastseen_migration_test.c ++++ b/tests/unit/lastseen_migration_test.c +@@ -6,6 +6,22 @@ + #include + #include + ++#include ++#include ++ ++static char* mkdtemp(char *template) { ++ char *tmp; ++ int retval; ++ ++ tmp = mktemp(template); ++ if (tmp == NULL) return NULL; ++ ++ if ( !(retval = mkdir(tmp, S_IRWXU)) ) ++ return NULL; ++ ++ return tmp; ++} ++ + typedef struct + { + char address[128]; +@@ -258,9 +274,9 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...) + } + + enum cfhashes CF_DEFAULT_DIGEST; +-const char *DAY_TEXT[] = {}; +-const char *MONTH_TEXT[] = {}; +-const char *SHIFT_TEXT[] = {}; ++const char *DAY_TEXT[] = {NULL}; ++const char *MONTH_TEXT[] = {NULL}; ++const char *SHIFT_TEXT[] = {NULL}; + pthread_mutex_t *cft_output; + char VIPADDRESS[18]; + RSA *PUBKEY; +diff --git a/tests/unit/lastseen_test.c b/tests/unit/lastseen_test.c +index 27f7b96..e91d675 100644 +--- a/tests/unit/lastseen_test.c ++++ b/tests/unit/lastseen_test.c +@@ -6,6 +6,22 @@ + #include + #include + ++#include ++#include ++ ++static char* mkdtemp(char *template) { ++ char *tmp; ++ int retval; ++ ++ tmp = mktemp(template); ++ if (tmp == NULL) return NULL; ++ ++ if ( !(retval = mkdir(tmp, S_IRWXU)) ) ++ return NULL; ++ ++ return tmp; ++} ++ + char CFWORKDIR[CF_BUFSIZE]; + + void UpdateLastSawHost(const char *hostkey, const char *address, +@@ -200,9 +216,9 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...) + } + + enum cfhashes CF_DEFAULT_DIGEST; +-const char *DAY_TEXT[] = {}; +-const char *MONTH_TEXT[] = {}; +-const char *SHIFT_TEXT[] = {}; ++const char *DAY_TEXT[] = {NULL}; ++const char *MONTH_TEXT[] = {NULL}; ++const char *SHIFT_TEXT[] = {NULL}; + pthread_mutex_t *cft_output; + char VIPADDRESS[18]; + RSA *PUBKEY; +diff --git a/tests/unit/persistent_lock_test.c b/tests/unit/persistent_lock_test.c +index 71219e8..b556555 100644 +--- a/tests/unit/persistent_lock_test.c ++++ b/tests/unit/persistent_lock_test.c +@@ -5,6 +5,22 @@ + #include + #include + ++#include ++#include ++ ++static char* mkdtemp(char *template) { ++ char *tmp; ++ int retval; ++ ++ tmp = mktemp(template); ++ if (tmp == NULL) return NULL; ++ ++ if ( !(retval = mkdir(tmp, S_IRWXU)) ) ++ return NULL; ++ ++ return tmp; ++} ++ + static void tests_setup(void) + { + snprintf(CFWORKDIR, CF_BUFSIZE, "/tmp/persistent_lock_test.XXXXXX"); +-- +1.8.0 + Added: csw/mgar/pkg/cfengine3/trunk/files/0003-Remove-unsupported-compiler-flags.-Add-z-interpose-w.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0003-Remove-unsupported-compiler-flags.-Add-z-interpose-w.patch (rev 0) +++ csw/mgar/pkg/cfengine3/trunk/files/0003-Remove-unsupported-compiler-flags.-Add-z-interpose-w.patch 2012-12-09 14:28:41 UTC (rev 19868) @@ -0,0 +1,58 @@ +From d90241098cefd342803b862c301757e222883404 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 9 Dec 2012 14:49:02 +0100 +Subject: [PATCH] Remove unsupported compiler flags. Add -z interpose where + necessary + +--- + tests/unit/Makefile.am | 2 +- + tests/unit/Makefile.in | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am +index a136082..a29890d 100644 +--- a/tests/unit/Makefile.am ++++ b/tests/unit/Makefile.am +@@ -88,7 +88,7 @@ xml_writer_test_LDADD = libtest.la libstr.la + # instrumentation code uses fclose(3). + # + file_writer_test_SOURCES = file_writer_test.c gcov-stub.c +-file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage ++file_writer_test_CFLAGS = $(AM_CFLAGS) + file_writer_test_LDADD = libstr.la + file_writer_test_LDLFAGS = + +diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in +index 59b91dd..926d960 100644 +--- a/tests/unit/Makefile.in ++++ b/tests/unit/Makefile.in +@@ -151,7 +151,7 @@ domainname_test_LDADD = $(LDADD) + domainname_test_DEPENDENCIES = ../../src/libpromises.la libtest.la + evalfunction_test_SOURCES = evalfunction_test.c + evalfunction_test_OBJECTS = evalfunction_test.$(OBJEXT) +-evalfunction_test_LDADD = $(LDADD) ++evalfunction_test_LDADD = $(LDADD) -z interpose + evalfunction_test_DEPENDENCIES = ../../src/libpromises.la libtest.la + file_name_test_SOURCES = file_name_test.c + file_name_test_OBJECTS = file_name_test.$(OBJEXT) +@@ -199,7 +199,7 @@ lastseen_test_OBJECTS = $(am_lastseen_test_OBJECTS) + lastseen_test_DEPENDENCIES = libdb.la + logging_test_SOURCES = logging_test.c + logging_test_OBJECTS = logging_test.$(OBJEXT) +-logging_test_LDADD = $(LDADD) ++logging_test_LDADD = $(LDADD) -z interpose + logging_test_DEPENDENCIES = ../../src/libpromises.la libtest.la + map_test_SOURCES = map_test.c + map_test_OBJECTS = map_test.$(OBJEXT) +@@ -601,7 +601,7 @@ xml_writer_test_LDADD = libtest.la libstr.la + # instrumentation code uses fclose(3). + # + file_writer_test_SOURCES = file_writer_test.c gcov-stub.c +-file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage ++file_writer_test_CFLAGS = $(AM_CFLAGS) + file_writer_test_LDADD = libstr.la + file_writer_test_LDLFAGS = + db_test_SOURCES = db_test.c +-- +1.8.0 + Deleted: csw/mgar/pkg/cfengine3/trunk/files/0005-Remove-unsupported-compiler-options.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0005-Remove-unsupported-compiler-options.patch 2012-12-09 14:10:05 UTC (rev 19867) +++ csw/mgar/pkg/cfengine3/trunk/files/0005-Remove-unsupported-compiler-options.patch 2012-12-09 14:28:41 UTC (rev 19868) @@ -1,49 +0,0 @@ -From 008e0369d158cb20703097a4e1e5239048e9d7f8 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Tue, 9 Oct 2012 14:29:23 +0200 -Subject: [PATCH] Remove unsupported compiler options - -Remove unsupported compiler options. Also set -z interpose on evalfunction_test, since it overwrites functions. ---- - tests/unit/Makefile.am | 2 +- - tests/unit/Makefile.in | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am -index 86f52d0..176ccfc 100644 ---- a/tests/unit/Makefile.am -+++ b/tests/unit/Makefile.am -@@ -68,7 +68,7 @@ xml_writer_test_LDADD = libtest.la - # - file_writer_test_SOURCES = file_writer_test.c gcov-stub.c \ - ../../src/writer.c --file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage -+file_writer_test_CFLAGS = $(AM_CFLAGS) - file_writer_test_LDADD = libtest.la - file_writer_test_LDLFAGS = - -diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in -index 71e500e..b972a4d 100644 ---- a/tests/unit/Makefile.in -+++ b/tests/unit/Makefile.in -@@ -123,7 +123,7 @@ domainname_test_LDADD = $(LDADD) - domainname_test_DEPENDENCIES = ../../src/libpromises.la libtest.la - evalfunction_test_SOURCES = evalfunction_test.c - evalfunction_test_OBJECTS = evalfunction_test.$(OBJEXT) --evalfunction_test_LDADD = $(LDADD) -+evalfunction_test_LDADD = $(LDADD) -z interpose - evalfunction_test_DEPENDENCIES = ../../src/libpromises.la libtest.la - am_file_writer_test_OBJECTS = \ - file_writer_test-file_writer_test.$(OBJEXT) \ -@@ -467,7 +467,7 @@ xml_writer_test_LDADD = libtest.la - file_writer_test_SOURCES = file_writer_test.c gcov-stub.c \ - ../../src/writer.c - --file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage -+file_writer_test_CFLAGS = $(AM_CFLAGS) - file_writer_test_LDADD = libtest.la - file_writer_test_LDLFAGS = - db_test_SOURCES = db_test.c --- -1.7.12 - Deleted: csw/mgar/pkg/cfengine3/trunk/files/0006-Fix-empty-initializer.-Add-mkdtemp.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0006-Fix-empty-initializer.-Add-mkdtemp.patch 2012-12-09 14:10:05 UTC (rev 19867) +++ csw/mgar/pkg/cfengine3/trunk/files/0006-Fix-empty-initializer.-Add-mkdtemp.patch 2012-12-09 14:28:41 UTC (rev 19868) @@ -1,211 +0,0 @@ -From d6836425f064562bb968f63b455c2442f12ad2f8 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sat, 10 Nov 2012 14:19:38 +0100 -Subject: [PATCH] Fix empty initializer. Add mkdtemp(). - ---- - tests/load/db_load.c | 21 +++++++++++++++++++-- - tests/load/lastseen_load.c | 22 +++++++++++++++++++--- - tests/unit/db_test.c | 21 +++++++++++++++++++-- - tests/unit/lastseen_migration_test.c | 23 ++++++++++++++++++++--- - tests/unit/lastseen_test.c | 23 ++++++++++++++++++++--- - 5 files changed, 97 insertions(+), 13 deletions(-) - -diff --git a/tests/load/db_load.c b/tests/load/db_load.c -index 69f2cf8..a330140 100644 ---- a/tests/load/db_load.c -+++ b/tests/load/db_load.c -@@ -3,6 +3,23 @@ - #include "dbm_api.h" - #include - -+#include -+#include -+ -+static char* mkdtemp(char *template) { -+ char *tmp; -+ int retval; -+ -+ tmp = mktemp(template); -+ if (tmp == NULL) return NULL; -+ -+ if ( !(retval = mkdir(tmp, S_IRWXU)) ) -+ return NULL; -+ -+ return tmp; -+} -+ -+ - #define MAX_THREADS 10000 - #define DB_ID dbid_classes - -@@ -348,5 +365,5 @@ int ThreadUnlock(pthread_mutex_t *t) - pthread_mutex_t *cft_dbhandle; - #endif - --const char *DAY_TEXT[] = {}; --const char *MONTH_TEXT[] = {}; -+const char *DAY_TEXT[] = { NULL }; -+const char *MONTH_TEXT[] = { NULL }; -diff --git a/tests/load/lastseen_load.c b/tests/load/lastseen_load.c -index 6a39fa0..950f2bc 100644 ---- a/tests/load/lastseen_load.c -+++ b/tests/load/lastseen_load.c -@@ -2,6 +2,22 @@ - #include "dbm_api.h" - #include "lastseen.h" - -+#include -+#include -+ -+static char* mkdtemp(char *template) { -+ char *tmp; -+ int retval; -+ -+ tmp = mktemp(template); -+ if (tmp == NULL) return NULL; -+ -+ if ( !(retval = mkdir(tmp, S_IRWXU)) ) -+ return NULL; -+ -+ return tmp; -+} -+ - char CFWORKDIR[CF_BUFSIZE] = "/tmp"; - - -@@ -59,9 +75,9 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...) - } - - enum cfhashes CF_DEFAULT_DIGEST; --const char *DAY_TEXT[] = {}; --const char *MONTH_TEXT[] = {}; --const char *SHIFT_TEXT[] = {}; -+const char *DAY_TEXT[] = { NULL }; -+const char *MONTH_TEXT[] = { NULL }; -+const char *SHIFT_TEXT[] = { NULL }; - pthread_mutex_t *cft_output; - char VIPADDRESS[18]; - RSA *PUBKEY; -diff --git a/tests/unit/db_test.c b/tests/unit/db_test.c -index df98a3c..95f29cc 100644 ---- a/tests/unit/db_test.c -+++ b/tests/unit/db_test.c -@@ -4,6 +4,23 @@ - #include - #include - -+#include -+#include -+ -+static char* mkdtemp(char *template) { -+ char *tmp; -+ int retval; -+ -+ tmp = mktemp(template); -+ if (tmp == NULL) return NULL; -+ -+ if ( !(retval = mkdir(tmp, S_IRWXU)) ) -+ return NULL; -+ -+ return tmp; -+} -+ -+ - char CFWORKDIR[CF_BUFSIZE]; - - void tests_setup(void) -@@ -148,6 +165,6 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...) - fprintf(stderr, "\n"); - } - --const char *DAY_TEXT[] = {}; --const char *MONTH_TEXT[] = {}; -+const char *DAY_TEXT[] = { NULL }; -+const char *MONTH_TEXT[] = { NULL }; - -diff --git a/tests/unit/lastseen_migration_test.c b/tests/unit/lastseen_migration_test.c -index b58e1de..9e580ee 100644 ---- a/tests/unit/lastseen_migration_test.c -+++ b/tests/unit/lastseen_migration_test.c -@@ -6,6 +6,23 @@ - #include - #include - -+#include -+#include -+ -+static char* mkdtemp(char *template) { -+ char *tmp; -+ int retval; -+ -+ tmp = mktemp(template); -+ if (tmp == NULL) return NULL; -+ -+ if ( !(retval = mkdir(tmp, S_IRWXU)) ) -+ return NULL; -+ -+ return tmp; -+} -+ -+ - typedef struct - { - char address[128]; -@@ -257,9 +274,9 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...) - } - - enum cfhashes CF_DEFAULT_DIGEST; --const char *DAY_TEXT[] = {}; --const char *MONTH_TEXT[] = {}; --const char *SHIFT_TEXT[] = {}; -+const char *DAY_TEXT[] = { NULL }; -+const char *MONTH_TEXT[] = { NULL }; -+const char *SHIFT_TEXT[] = { NULL }; - pthread_mutex_t *cft_output; - char VIPADDRESS[18]; - RSA *PUBKEY; -diff --git a/tests/unit/lastseen_test.c b/tests/unit/lastseen_test.c -index 8bfc6f8..183285f 100644 ---- a/tests/unit/lastseen_test.c -+++ b/tests/unit/lastseen_test.c -@@ -6,6 +6,23 @@ - #include - #include - -+#include -+#include -+ -+static char* mkdtemp(char *template) { -+ char *tmp; -+ int retval; -+ -+ tmp = mktemp(template); -+ if (tmp == NULL) return NULL; -+ -+ if ( !(retval = mkdir(tmp, S_IRWXU)) ) -+ return NULL; -+ -+ return tmp; -+} -+ -+ - char CFWORKDIR[CF_BUFSIZE]; - - void UpdateLastSawHost(const char *hostkey, const char *address, -@@ -199,9 +216,9 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...) - } - - enum cfhashes CF_DEFAULT_DIGEST; --const char *DAY_TEXT[] = {}; --const char *MONTH_TEXT[] = {}; --const char *SHIFT_TEXT[] = {}; -+const char *DAY_TEXT[] = { NULL }; -+const char *MONTH_TEXT[] = { NULL }; -+const char *SHIFT_TEXT[] = { NULL }; - pthread_mutex_t *cft_output; - char VIPADDRESS[18]; - RSA *PUBKEY; --- -1.8.0 - Modified: csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2012-12-09 14:10:05 UTC (rev 19867) +++ csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2012-12-09 14:28:41 UTC (rev 19868) @@ -1,3 +1,10 @@ +cfengine3 (3.4.1,REV=2012.12.09) + + * New upstream release 3.4.1. + + -- Rafael Ostertag Sun, 09 Dec 2012 10:12:11 +0100 + + cfengine3 (3.3.9,REV=2012.11.10) * New upstream release 3.3.9. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Dec 10 09:41:16 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 10 Dec 2012 08:41:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[19869] csw/mgar/pkg/librecad/trunk/Makefile Message-ID: Revision: 19869 http://gar.svn.sourceforge.net/gar/?rev=19869&view=rev Author: cgrzemba Date: 2012-12-10 08:41:15 +0000 (Mon, 10 Dec 2012) Log Message: ----------- librecad/trunk: use lowercase in package name Modified Paths: -------------- csw/mgar/pkg/librecad/trunk/Makefile Modified: csw/mgar/pkg/librecad/trunk/Makefile =================================================================== --- csw/mgar/pkg/librecad/trunk/Makefile 2012-12-09 14:28:41 UTC (rev 19868) +++ csw/mgar/pkg/librecad/trunk/Makefile 2012-12-10 08:41:15 UTC (rev 19869) @@ -40,23 +40,22 @@ BUILD_DEP_PKGS += CSWboost-gcc-dev BUILD_DEP_PKGS += CSWlibfreetype-dev -PACKAGES = CSWlibreCAD -CATALOGNAME_CSWlibreCAD = librecad -SPKG_DESC_CSWlibreCAD = $(DESCRIPTION) -# PKGFILES_CSWlibreCAD += $(call baseisadirs,$(bindir),.*) -# PKGFILES_CSWlibreCAD += $(datadir)/$(call tolower,$(NAME))/.* -RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqthelp4-gxx -RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtcore4-gxx -RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtgui4-gxx -RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtsvg4-gxx -RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibmuparser2-gxx -# RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtsql4-gxx +PACKAGES = CSWlibrecad +CATALOGNAME_CSWlibrecad = librecad +SPKG_DESC_CSWlibrecad = $(DESCRIPTION) +# PKGFILES_CSWlibrecad += $(call baseisadirs,$(bindir),.*) +# PKGFILES_CSWlibrecad += $(datadir)/$(call tolower,$(NAME))/.* +RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqthelp4-gxx +RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtcore4-gxx +RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtgui4-gxx +RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtsvg4-gxx +RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibmuparser2-gxx +# RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtsql4-gxx # it had never exists: remove that as soon checkpkg could forget this -OBSOLETED_BY_CSWlibreCAD = CSWLibreCAD -CHECKPKG_OVERRIDES_CSWLibreCAD += catalogname-not-lowercase +OBSOLETED_BY_CSWlibrecad = CSWLibreCAD CONFIGURE_ARGS = $(DIRPATHS) @@ -74,8 +73,8 @@ ginstall -d $(DESTDIR)$(libdir)/$(call tolower, $(NAME))/resources gcp -rfp $(WORKSRC)/unix/resources/* \ $(DESTDIR)$(libdir)/$(call tolower, $(NAME))/resources - ginstall -d $(DESTDIR)$(subst gxx/,,$(docdir))/$(CATALOGNAME_CSWlibreCAD) - $(foreach L,$(EXTRA_LICENSE),gcp $(WORKSRC)/$L $(DESTDIR)$(subst gxx/,,$(docdir))/$(CATALOGNAME_CSWlibreCAD);) + ginstall -d $(DESTDIR)$(subst gxx/,,$(docdir))/$(CATALOGNAME_CSWlibrecad) + $(foreach L,$(EXTRA_LICENSE),gcp $(WORKSRC)/$L $(DESTDIR)$(subst gxx/,,$(docdir))/$(CATALOGNAME_CSWlibrecad);) @$(MAKECOOKIE) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Dec 10 11:50:47 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 10 Dec 2012 10:50:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[19870] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 19870 http://gar.svn.sourceforge.net/gar/?rev=19870&view=rev Author: pfelecan Date: 2012-12-10 10:50:47 +0000 (Mon, 10 Dec 2012) Log Message: ----------- texlive/trunk: verified and validated checkpkg proposed dependencies Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-12-10 08:41:15 UTC (rev 19869) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-12-10 10:50:47 UTC (rev 19870) @@ -132,6 +132,24 @@ SPKG_DESC_CSWtexlive-common += $(DESCRIPTION), common OBSOLETED_BY_CSWtexlive-common = CSWtetex ARCHALL_CSWtexlive-common = 1 +# TODO these are probably a sign that the content is to encompassing! +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWtexlive-extra-utils +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibptexenc1 +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWtexlive-binaries +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibz1 +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWpython +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWgs +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWruby +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibkpathsea6 +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWemacscommon +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibgd2 +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWperl +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWtexlive-font-utils +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibt1-5 PACKAGES += CSWtexlive-dev CATALOGNAME_CSWtexlive-dev += texlive_dev @@ -142,6 +160,8 @@ PKGFILES_CSWtexlive-dev += $(PKGFILES_DEVEL) ARCHALL_CSWtexlive-dev = 1 CHECKPKG_OVERRIDES_CSWtexlive-dev += archall-devel-package +RUNTIME_DEP_PKGS_CSWtexlive-dev += CSWlibkpathsea6 +RUNTIME_DEP_PKGS_CSWtexlive-dev += CSWlibptexenc1 PACKAGES += CSWlibkpathsea6 CATALOGNAME_CSWlibkpathsea6 = libkpathsea6 @@ -157,6 +177,7 @@ PKGFILES_CSWlibptexenc1 += $(call baseisadirs,$(libdir),libptexenc\.so\.1\.3\.0) PKGFILES_CSWlibptexenc1 += $(call baseisadirs,$(libdir),libptexenc\.so\.1(\.\d+)*) RUNTIME_DEP_PKGS_CSWlibptexenc1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibptexenc1 += CSWlibkpathsea6 PACKAGES += CSWtexlive-base CATALOGNAME_CSWtexlive-base = texlive_base @@ -252,6 +273,9 @@ PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/texdoctk/.* PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/web2c/.* ARCHALL_CSWtexlive-base = 1 +RUNTIME_DEP_PKGS_CSWtexlive-base += CSWpython +RUNTIME_DEP_PKGS_CSWtexlive-base += CSWtexlive-common +RUNTIME_DEP_PKGS_CSWtexlive-base += CSWperl PACKAGES += CSWtexlive-bibtex-extra CATALOGNAME_CSWtexlive-bibtex-extra = texlive_bibtex_extra @@ -478,6 +502,18 @@ PKGFILES_CSWtexlive-binaries += /opt/csw/bin/xdvipdfmx PKGFILES_CSWtexlive-binaries += /opt/csw/bin/xetex RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWtexlive-common +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibptexenc1 +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibt1-5 +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibz1 +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibkpathsea6 +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWtexlive-base +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibxpm4 PACKAGES += CSWtexlive-doc-base CATALOGNAME_CSWtexlive-doc-base = texlive_doc_base @@ -486,6 +522,7 @@ PKGFILES_CSWtexlive-doc-base += $(PKGFILES_DOC) PKGFILES_CSWtexlive-doc-base += /opt/csw/share/texmf/doc/texlive/texlive-en/.* ARCHALL_CSWtexlive-doc-base = 1 +RUNTIME_DEP_PKGS_CSWtexlive-doc-base += CSWperl PACKAGES += CSWtexlive-doc-bg CATALOGNAME_CSWtexlive-doc-bg = texlive_doc_bg @@ -564,6 +601,8 @@ PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/plain/texbytopic/.* PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/xetex/xetexref/.* ARCHALL_CSWtexlive-doc-en = 1 +RUNTIME_DEP_PKGS_CSWtexlive-doc-en += CSWemacscommon +RUNTIME_DEP_PKGS_CSWtexlive-doc-en += CSWperl PACKAGES += CSWtexlive-doc-es CATALOGNAME_CSWtexlive-doc-es = texlive_doc_es @@ -574,6 +613,7 @@ PKGFILES_CSWtexlive-doc-es += /opt/csw/share/texmf-dist/doc/latex/l2tabu-spanish/.* PKGFILES_CSWtexlive-doc-es += /opt/csw/share/texmf-dist/doc/latex/lshort-spanish/.* ARCHALL_CSWtexlive-doc-es = 1 +RUNTIME_DEP_PKGS_CSWtexlive-doc-es += CSWperl PACKAGES += CSWtexlive-doc-fi CATALOGNAME_CSWtexlive-doc-fi = texlive_doc_fi @@ -608,6 +648,7 @@ PKGFILES_CSWtexlive-doc-it += /opt/csw/share/texmf-dist/doc/latex/psfrag-italian/.* PKGFILES_CSWtexlive-doc-it += /opt/csw/share/texmf/doc/texlive/texlive-it/.* ARCHALL_CSWtexlive-doc-it = 1 +RUNTIME_DEP_PKGS_CSWtexlive-doc-it += CSWperl PACKAGES += CSWtexlive-doc-ja CATALOGNAME_CSWtexlive-doc-ja = texlive_doc_ja @@ -632,6 +673,7 @@ PKGFILES_CSWtexlive-doc-mn += $(PKGFILES_DOC) PKGFILES_CSWtexlive-doc-mn += /opt/csw/share/texmf-dist/doc/latex/lshort-mongol/.* ARCHALL_CSWtexlive-doc-mn = 1 +RUNTIME_DEP_PKGS_CSWtexlive-doc-mn += CSWperl PACKAGES += CSWtexlive-doc-nl CATALOGNAME_CSWtexlive-doc-nl = texlive_doc_nl @@ -782,6 +824,9 @@ PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf/scripts/a2ping/.* PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf/scripts/tetex/e2pall.pl ARCHALL_CSWtexlive-extra-utils = 1 +RUNTIME_DEP_PKGS_CSWtexlive-extra-utils += CSWpython +RUNTIME_DEP_PKGS_CSWtexlive-extra-utils += CSWemacscommon +RUNTIME_DEP_PKGS_CSWtexlive-extra-utils += CSWperl PACKAGES += CSWtexlive-font-utils CATALOGNAME_CSWtexlive-font-utils = texlive_font_utils @@ -1631,6 +1676,8 @@ PKGFILES_CSWtexlive-formats-extra += /opt/csw/share/texmf-dist/tex/texsis/base/.* PKGFILES_CSWtexlive-formats-extra += /opt/csw/share/texmf-dist/tex/texsis/config/.* ARCHALL_CSWtexlive-formats-extra = 1 +RUNTIME_DEP_PKGS_CSWtexlive-formats-extra += CSWemacscommon +RUNTIME_DEP_PKGS_CSWtexlive-formats-extra += CSWtexlive-binaries PACKAGES += CSWtexlive-games CATALOGNAME_CSWtexlive-games = texlive_games @@ -1736,6 +1783,7 @@ PKGFILES_CSWtexlive-generic-extra += /opt/csw/share/texmf-dist/tex/plain/encxvlna/.* PKGFILES_CSWtexlive-generic-extra += /opt/csw/share/texmf-dist/tex/plain/metatex/.* ARCHALL_CSWtexlive-generic-extra = 1 +RUNTIME_DEP_PKGS_CSWtexlive-generic-extra += CSWpython PACKAGES += CSWtexlive-generic-recommended CATALOGNAME_CSWtexlive-generic-recommended = texlive_generic_recommended @@ -1962,6 +2010,7 @@ PKGFILES_CSWtexlive-lang-czechslovak += /opt/csw/share/texmf-dist/tex/latex/cslatex/.* PKGFILES_CSWtexlive-lang-czechslovak += /opt/csw/share/texmf/doc/vlna/.* ARCHALL_CSWtexlive-lang-czechslovak = 1 +RUNTIME_DEP_PKGS_CSWtexlive-lang-czechslovak += CSWtexlive-binaries PACKAGES += CSWtexlive-lang-finnish CATALOGNAME_CSWtexlive-lang-finnish = texlive_lang_finnish @@ -2131,6 +2180,7 @@ PKGFILES_CSWtexlive-lang-hungarian += /opt/csw/share/texmf-dist/doc/latex/magyar/.* PKGFILES_CSWtexlive-lang-hungarian += /opt/csw/share/texmf/doc/generic/huhyphen/.* ARCHALL_CSWtexlive-lang-hungarian = 1 +RUNTIME_DEP_PKGS_CSWtexlive-lang-hungarian += CSWruby PACKAGES += CSWtexlive-lang-indic CATALOGNAME_CSWtexlive-lang-indic = texlive_lang_indic @@ -2159,6 +2209,7 @@ PKGFILES_CSWtexlive-lang-indic += /opt/csw/share/texmf-dist/tex/latex/bengali/.* PKGFILES_CSWtexlive-lang-indic += /opt/csw/share/texmf-dist/tex/latex/burmese/.* ARCHALL_CSWtexlive-lang-indic = 1 +RUNTIME_DEP_PKGS_CSWtexlive-lang-indic += CSWtexlive-common PACKAGES += CSWtexlive-lang-italian CATALOGNAME_CSWtexlive-lang-italian = texlive_lang_italian @@ -2245,6 +2296,9 @@ PKGFILES_CSWtexlive-lang-polish += /opt/csw/share/texmf-dist/tex/plain/gustlib/map/.* PKGFILES_CSWtexlive-lang-polish += /opt/csw/share/texmf-dist/tex/plain/gustlib/.* ARCHALL_CSWtexlive-lang-polish = 1 +RUNTIME_DEP_PKGS_CSWtexlive-lang-polish += CSWemacscommon +RUNTIME_DEP_PKGS_CSWtexlive-lang-polish += CSWtexlive-binaries +RUNTIME_DEP_PKGS_CSWtexlive-lang-polish += CSWperl PACKAGES += CSWtexlive-lang-portuguese CATALOGNAME_CSWtexlive-lang-portuguese = texlive_lang_portuguese @@ -2380,6 +2434,9 @@ PKGFILES_CSWtexlive-latex-base += /opt/csw/share/texmf-dist/tex/latex/pspicture/.* PKGFILES_CSWtexlive-latex-base += /opt/csw/share/texmf-dist/tex/latex/tools/.* ARCHALL_CSWtexlive-latex-base = 1 +RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWtexlive-common +RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWtexlive-binaries +RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWperl PACKAGES += CSWtexlive-latex-base-doc CATALOGNAME_CSWtexlive-latex-base-doc = texlive_latex_base_doc @@ -3069,6 +3126,8 @@ PKGFILES_CSWtexlive-latex-extra += /opt/csw/share/texmf-dist/tex/plain/esint-type1/.* PKGFILES_CSWtexlive-latex-extra += /opt/csw/share/texmf-dist/tex/xmltex/xmlplay/.* ARCHALL_CSWtexlive-latex-extra = 1 +RUNTIME_DEP_PKGS_CSWtexlive-latex-extra += CSWtexlive-common +RUNTIME_DEP_PKGS_CSWtexlive-latex-extra += CSWperl PACKAGES += CSWtexlive-latex-extra-doc CATALOGNAME_CSWtexlive-latex-extra-doc = texlive_latex_extra_doc @@ -3626,6 +3685,10 @@ PKGFILES_CSWtexlive-latex-extra-doc += /opt/csw/share/texmf-dist/doc/metapost/makecirc/.* PKGFILES_CSWtexlive-latex-extra-doc += /opt/csw/share/texmf-dist/doc/otherformats/xmltex/xmlplay/.* ARCHALL_CSWtexlive-latex-extra-doc = 1 +RUNTIME_DEP_PKGS_CSWtexlive-latex-extra-doc += CSWemacscommon +RUNTIME_DEP_PKGS_CSWtexlive-fonts-extra-doc += CSWpython +RUNTIME_DEP_PKGS_CSWtexlive-fonts-extra-doc += CSWperl +RUNTIME_DEP_PKGS_CSWtexlive-latex-extra-doc += CSWruby PACKAGES += CSWtexlive-latex-recommended CATALOGNAME_CSWtexlive-latex-recommended = texlive_latex_recommended @@ -3680,6 +3743,10 @@ PKGFILES_CSWtexlive-latex-recommended += /opt/csw/share/texmf-dist/tex/latex/xkeyval/.* PKGFILES_CSWtexlive-latex-recommended += /opt/csw/share/texmf-dist/tex/plain/fp/.* ARCHALL_CSWtexlive-latex-recommended = 1 +RUNTIME_DEP_PKGS_CSWtexlive-latex-recommended += CSWperl +RUNTIME_DEP_PKGS_CSWtexlive-xetex += CSWpython +RUNTIME_DEP_PKGS_CSWtexlive-xetex += CSWtexlive-binaries +RUNTIME_DEP_PKGS_CSWtexlive-xetex += CSWperl PACKAGES += CSWtexlive-latex-recommended-doc CATALOGNAME_CSWtexlive-latex-recommended-doc = texlive_latex_recommended_doc @@ -3826,6 +3893,7 @@ PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/tex/latex/turnstile/.* PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/tex/latex/yhmath/.* ARCHALL_CSWtexlive-math-extra = 1 +RUNTIME_DEP_PKGS_CSWtexlive-math-extra += CSWtexlive-binaries PACKAGES += CSWtexlive-metapost CATALOGNAME_CSWtexlive-metapost = texlive_metapost @@ -3842,6 +3910,7 @@ PKGFILES_CSWtexlive-metapost += /opt/csw/share/texmf-dist/tex/latex/mfpic4ode/.* PKGFILES_CSWtexlive-metapost += /opt/csw/share/texmf-dist/tex/latex/textpath/.* ARCHALL_CSWtexlive-metapost = 1 +RUNTIME_DEP_PKGS_CSWtexlive-metapost += CSWtexlive-binaries PACKAGES += CSWtexlive-metapost-doc CATALOGNAME_CSWtexlive-metapost-doc = texlive_metapost_doc @@ -3854,6 +3923,7 @@ PKGFILES_CSWtexlive-metapost-doc += /opt/csw/share/texmf-dist/doc/latex/mfpic4ode/.* PKGFILES_CSWtexlive-metapost-doc += /opt/csw/share/texmf-dist/doc/metapost/.* ARCHALL_CSWtexlive-metapost-doc = 1 +RUNTIME_DEP_PKGS_CSWtexlive-metapost-doc += CSWperl PACKAGES += CSWtexlive-music CATALOGNAME_CSWtexlive-music = texlive_music @@ -3907,6 +3977,7 @@ PKGFILES_CSWtexlive-omega += /opt/csw/share/texmf-dist/tex/latex/mxedruli/.* PKGFILES_CSWtexlive-omega += /opt/csw/share/texmf-dist/tex/plain/omega/.* ARCHALL_CSWtexlive-omega = 1 +RUNTIME_DEP_PKGS_CSWtexlive-omega += CSWtexlive-binaries PACKAGES += CSWtexlive-pictures CATALOGNAME_CSWtexlive-pictures = texlive_pictures @@ -3966,6 +4037,7 @@ PKGFILES_CSWtexlive-pictures += /opt/csw/share/texmf-dist/tex/latex/tufte-latex/.* PKGFILES_CSWtexlive-pictures += /opt/csw/share/texmf-dist/tex/plain/pgfplots/.* ARCHALL_CSWtexlive-pictures = 1 + RUNTIME_DEP_PKGS_CSWtexlive-pictures += CSWruby PACKAGES += CSWtexlive-pictures-doc CATALOGNAME_CSWtexlive-pictures-doc = texlive_pictures_doc @@ -4016,6 +4088,8 @@ PKGFILES_CSWtexlive-pictures-doc += /opt/csw/share/texmf-dist/doc/support/fig4latex/.* PKGFILES_CSWtexlive-pictures-doc += /opt/csw/share/texmf-dist/doc/support/texdraw/.* ARCHALL_CSWtexlive-pictures-doc = 1 +RUNTIME_DEP_PKGS_CSWtexlive-pictures-doc += CSWemacscommon +RUNTIME_DEP_PKGS_CSWtexlive-pictures-doc += CSWperl PACKAGES += CSWtexlive-plain-extra CATALOGNAME_CSWtexlive-plain-extra = texlive_plain_extra @@ -4190,6 +4264,8 @@ PKGFILES_CSWtexlive-pstricks += /opt/csw/share/texmf-dist/tex/latex/pstricks/.* PKGFILES_CSWtexlive-pstricks += /opt/csw/share/texmf-dist/tex/latex/uml/.* ARCHALL_CSWtexlive-pstricks = 1 +RUNTIME_DEP_PKGS_CSWtexlive-pstricks += CSWpython +RUNTIME_DEP_PKGS_CSWtexlive-pstricks += CSWtexlive-common PACKAGES += CSWtexlive-pstricks-doc CATALOGNAME_CSWtexlive-pstricks-doc = texlive_pstricks_doc @@ -4261,6 +4337,7 @@ PKGFILES_CSWtexlive-pstricks-doc += /opt/csw/share/texmf-dist/doc/latex/pst2pdf/.* PKGFILES_CSWtexlive-pstricks-doc += /opt/csw/share/texmf-dist/doc/latex/uml/.* ARCHALL_CSWtexlive-pstricks-doc = 1 +RUNTIME_DEP_PKGS_CSWtexlive-pstricks-doc += CSWperl PACKAGES += CSWtexlive-publishers CATALOGNAME_CSWtexlive-publishers = texlive_publishers @@ -4440,6 +4517,8 @@ PKGFILES_CSWtexlive-publishers-doc += /opt/csw/share/texmf-dist/doc/latex/york-thesis/.* PKGFILES_CSWtexlive-publishers-doc += /opt/csw/share/texmf-dist/doc/plain/tugboat-plain/.* ARCHALL_CSWtexlive-publishers-doc = 1 +RUNTIME_DEP_PKGS_CSWtexlive-publishers-doc += CSWemacscommon +RUNTIME_DEP_PKGS_CSWtexlive-publishers-doc += CSWperl PACKAGES += CSWtexlive-science CATALOGNAME_CSWtexlive-science = texlive_science @@ -4555,6 +4634,8 @@ PKGFILES_CSWtexlive-science-doc += /opt/csw/share/texmf-dist/doc/latex/ulqda/.* PKGFILES_CSWtexlive-science-doc += /opt/csw/share/texmf-dist/doc/latex/unitsdef/.* ARCHALL_CSWtexlive-science-doc = 1 +RUNTIME_DEP_PKGS_CSWtexlive-science += CSWperl +RUNTIME_DEP_PKGS_CSWtexlive-science-doc += CSWemacscommon PACKAGES += CSWtexlive-xetex CATALOGNAME_CSWtexlive-xetex = texlive_xetex 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 Dec 10 12:45:37 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 10 Dec 2012 11:45:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[19871] csw/mgar/pkg Message-ID: Revision: 19871 http://gar.svn.sourceforge.net/gar/?rev=19871&view=rev Author: dmichelsen Date: 2012-12-10 11:45:36 +0000 (Mon, 10 Dec 2012) Log Message: ----------- gnuchess: Initial commit Added Paths: ----------- csw/mgar/pkg/gnuchess/ csw/mgar/pkg/gnuchess/Makefile csw/mgar/pkg/gnuchess/branches/ csw/mgar/pkg/gnuchess/tags/ csw/mgar/pkg/gnuchess/trunk/ csw/mgar/pkg/gnuchess/trunk/Makefile csw/mgar/pkg/gnuchess/trunk/checksums csw/mgar/pkg/gnuchess/trunk/files/ Added: csw/mgar/pkg/gnuchess/Makefile =================================================================== --- csw/mgar/pkg/gnuchess/Makefile (rev 0) +++ csw/mgar/pkg/gnuchess/Makefile 2012-12-10 11:45:36 UTC (rev 19871) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/gnuchess/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/gnuchess/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnuchess/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnuchess/trunk/Makefile 2012-12-10 11:45:36 UTC (rev 19871) @@ -0,0 +1,29 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = gnuchess +VERSION = 6.0.2 + +DESCRIPTION = GNU Chess + +GNU_PROJECT = chess +MASTER_SITES = $(GNU_MIRROR) +DISTFILES += $(DISTNAME).tar.gz +DISTFILES += book_1.02.pgn.gz + +GARCOMPILER = GCC4 + +BUILD64 = 1 +ISAEXEC = 1 + +PACKAGES += CSWgnuchess +SPKG_DESC_CSWgnuchess = GNU Chess +RUNTIME_DEP_PKGS_CSWgnuchess += CSWlibgcc-s1 +OBSOLETED_BY_CSWgnuchess += CSWchss +CATALOGNAME_CSWchss = gnuchess_stub + +include gar/category.mk + +post-merge: + cd $(PKGROOT)$(sharedstatedir)/gnuchess && $(PKGROOT)$(bindir)/gnuchess -a $(abspath $(WORKDIR_FIRSTMOD)/book_1.02.pgn) + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/gnuchess/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/gnuchess/trunk/checksums =================================================================== --- csw/mgar/pkg/gnuchess/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnuchess/trunk/checksums 2012-12-10 11:45:36 UTC (rev 19871) @@ -0,0 +1,2 @@ +e382f5774f050efc79a08baa083eba79 book_1.02.pgn.gz +566a145479c47f2f9d7d9b7b8119e1b0 gnuchess-6.0.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Dec 10 12:49:17 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 10 Dec 2012 11:49:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[19872] csw/mgar/pkg/xboard/trunk Message-ID: Revision: 19872 http://gar.svn.sourceforge.net/gar/?rev=19872&view=rev Author: dmichelsen Date: 2012-12-10 11:49:17 +0000 (Mon, 10 Dec 2012) Log Message: ----------- xboard/trunk: Update to 4.6.2, deprecate CSW X11, still does not compile Modified Paths: -------------- csw/mgar/pkg/xboard/trunk/Makefile csw/mgar/pkg/xboard/trunk/checksums Modified: csw/mgar/pkg/xboard/trunk/Makefile =================================================================== --- csw/mgar/pkg/xboard/trunk/Makefile 2012-12-10 11:45:36 UTC (rev 19871) +++ csw/mgar/pkg/xboard/trunk/Makefile 2012-12-10 11:49:17 UTC (rev 19872) @@ -1,6 +1,5 @@ NAME = xboard -VERSION = 4.4.1 -GARTYPE = v2 +VERSION = 4.6.2 DESCRIPTION = X graphical chessboard define BLURB @@ -12,17 +11,12 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += $(NAME)-$(VERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +VERNDOR_URL = http://www.gnu.org/software/xboard/ -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +# EXTRA_LINKER_FLAGS = -lm -EXTRA_LDFLAGS = -lm /usr/openwin/lib/libXext.so +# CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS = $(DIRPATHS) - include gar/category.mk Modified: csw/mgar/pkg/xboard/trunk/checksums =================================================================== --- csw/mgar/pkg/xboard/trunk/checksums 2012-12-10 11:45:36 UTC (rev 19871) +++ csw/mgar/pkg/xboard/trunk/checksums 2012-12-10 11:49:17 UTC (rev 19872) @@ -1 +1 @@ -4623a83fdd43f410bfcc8a20e2eb1474 xboard-4.4.1.tar.gz +6e6d119fac60d68139d7836426212efb xboard-4.6.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Dec 10 14:02:26 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 10 Dec 2012 13:02:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[19873] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 19873 http://gar.svn.sourceforge.net/gar/?rev=19873&view=rev Author: pfelecan Date: 2012-12-10 13:02:26 +0000 (Mon, 10 Dec 2012) Log Message: ----------- texlive/trunk: resolve files collisions in documentation packages (don't use the PKGFILES_DOC macro as there are many documentation packages for this project and we must discriminate) Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-12-10 11:49:17 UTC (rev 19872) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-12-10 13:02:26 UTC (rev 19873) @@ -183,7 +183,7 @@ CATALOGNAME_CSWtexlive-base = texlive_base SPKG_DESC_CSWtexlive-base += $(DESCRIPTION), base OBSOLETED_BY_CSWtexlive-base = CSWtetex -PKGFILES_CSWtexlive-base += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-base += $(docdir)/$(CATALOGNAME_CSWtexlive-base)/.* PKGFILES_CSWtexlive-base += /opt/csw/bin/dviluatex PKGFILES_CSWtexlive-base += /opt/csw/bin/simpdftex PKGFILES_CSWtexlive-base += /opt/csw/bin/texdoc @@ -277,11 +277,11 @@ RUNTIME_DEP_PKGS_CSWtexlive-base += CSWtexlive-common RUNTIME_DEP_PKGS_CSWtexlive-base += CSWperl -PACKAGES += CSWtexlive-bibtex-extra +PACKAGES += CSWtexlive-bibtex-extra CATALOGNAME_CSWtexlive-bibtex-extra = texlive_bibtex_extra SPKG_DESC_CSWtexlive-bibtex-extra += $(DESCRIPTION), bibtex extra OBSOLETED_BY_CSWtexlive-bibtex-extra = CSWtetex -PKGFILES_CSWtexlive-bibtex-extra += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-bibtex-extra += $(docdir)/$(CATALOGNAME_CSWtexlive-bibtex-extra)/.* PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bib/amsrefs/.* PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bib/beebe/.* PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bib/dk-bib/.* @@ -376,11 +376,11 @@ PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/plain/harvmac/.* ARCHALL_CSWtexlive-bibtex-extra = 1 -PACKAGES += CSWtexlive-binaries +PACKAGES += CSWtexlive-binaries CATALOGNAME_CSWtexlive-binaries = texlive_binaries SPKG_DESC_CSWtexlive-binaries += $(DESCRIPTION), binaries OBSOLETED_BY_CSWtexlive-binaries = CSWtetex -PKGFILES_CSWtexlive-binaries += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-binaries += $(docdir)/$(CATALOGNAME_CSWtexlive-binaries)/.* PKGFILES_CSWtexlive-binaries += /opt/csw/bin/afm2pl PKGFILES_CSWtexlive-binaries += /opt/csw/bin/afm2tfm PKGFILES_CSWtexlive-binaries += /opt/csw/bin/aleph @@ -515,11 +515,11 @@ RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibxpm4 -PACKAGES += CSWtexlive-doc-base +PACKAGES += CSWtexlive-doc-base CATALOGNAME_CSWtexlive-doc-base = texlive_doc_base SPKG_DESC_CSWtexlive-doc-base += $(DESCRIPTION), doc base OBSOLETED_BY_CSWtexlive-doc-base = CSWtetex -PKGFILES_CSWtexlive-doc-base += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-base += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-base)/.* PKGFILES_CSWtexlive-doc-base += /opt/csw/share/texmf/doc/texlive/texlive-en/.* ARCHALL_CSWtexlive-doc-base = 1 RUNTIME_DEP_PKGS_CSWtexlive-doc-base += CSWperl @@ -528,7 +528,7 @@ CATALOGNAME_CSWtexlive-doc-bg = texlive_doc_bg SPKG_DESC_CSWtexlive-doc-bg += $(DESCRIPTION), doc bg OBSOLETED_BY_CSWtexlive-doc-bg = CSWtetex -PKGFILES_CSWtexlive-doc-bg += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-bg += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-bg)/.* PKGFILES_CSWtexlive-doc-bg += /opt/csw/share/texmf-dist/doc/latex/lshort-bulgarian/.* ARCHALL_CSWtexlive-doc-bg = 1 @@ -536,7 +536,7 @@ CATALOGNAME_CSWtexlive-doc-cs+sk = texlive_doc_cs+sk SPKG_DESC_CSWtexlive-doc-cs+sk += $(DESCRIPTION), doc cs+sk OBSOLETED_BY_CSWtexlive-doc-cs+sk = CSWtetex -PKGFILES_CSWtexlive-doc-cs_sk += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-cs_sk += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-cs+sk)/.* PKGFILES_CSWtexlive-doc-cs+sk += /opt/csw/share/texmf-dist/doc/latex/lshort-slovak/.* PKGFILES_CSWtexlive-doc-cs+sk += /opt/csw/share/texmf/doc/texlive/texlive-cz/.* ARCHALL_CSWtexlive-doc-cs+sk = 1 @@ -545,7 +545,7 @@ CATALOGNAME_CSWtexlive-doc-de = texlive_doc_de SPKG_DESC_CSWtexlive-doc-de += $(DESCRIPTION), doc de OBSOLETED_BY_CSWtexlive-doc-de = CSWtetex -PKGFILES_CSWtexlive-doc-de += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-de += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-de)/.* PKGFILES_CSWtexlive-doc-de += /opt/csw/share/texmf-dist/doc/generic/voss-de/.* PKGFILES_CSWtexlive-doc-de += /opt/csw/share/texmf-dist/doc/latex/kopka/uebungen/.* PKGFILES_CSWtexlive-doc-de += /opt/csw/share/texmf-dist/doc/latex/l2picfaq/.* @@ -560,7 +560,7 @@ CATALOGNAME_CSWtexlive-doc-en = texlive_doc_en SPKG_DESC_CSWtexlive-doc-en += $(DESCRIPTION), doc en OBSOLETED_BY_CSWtexlive-doc-en = CSWtetex -PKGFILES_CSWtexlive-doc-en += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-en += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-en)/.* PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/bibtex/tamethebeast/.* PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/fonts/Type1fonts/README PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/fonts/Type1fonts/fontinstallationguide.pdf @@ -608,7 +608,7 @@ CATALOGNAME_CSWtexlive-doc-es = texlive_doc_es SPKG_DESC_CSWtexlive-doc-es += $(DESCRIPTION), doc es OBSOLETED_BY_CSWtexlive-doc-es = CSWtetex -PKGFILES_CSWtexlive-doc-es += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-es += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-es)/.* PKGFILES_CSWtexlive-doc-es += /opt/csw/share/texmf-dist/doc/generic/es-tex-faq/.* PKGFILES_CSWtexlive-doc-es += /opt/csw/share/texmf-dist/doc/latex/l2tabu-spanish/.* PKGFILES_CSWtexlive-doc-es += /opt/csw/share/texmf-dist/doc/latex/lshort-spanish/.* @@ -619,7 +619,7 @@ CATALOGNAME_CSWtexlive-doc-fi = texlive_doc_fi SPKG_DESC_CSWtexlive-doc-fi += $(DESCRIPTION), doc fi OBSOLETED_BY_CSWtexlive-doc-fi = CSWtetex -PKGFILES_CSWtexlive-doc-fi += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-fi += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-fi)/.* PKGFILES_CSWtexlive-doc-fi += /opt/csw/share/texmf-dist/doc/latex/lshort-finnish/.* ARCHALL_CSWtexlive-doc-fi = 1 @@ -627,7 +627,7 @@ CATALOGNAME_CSWtexlive-doc-fr = texlive_doc_fr SPKG_DESC_CSWtexlive-doc-fr += $(DESCRIPTION), doc fr OBSOLETED_BY_CSWtexlive-doc-fr = CSWtetex -PKGFILES_CSWtexlive-doc-fr += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-fr += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-fr)/.* PKGFILES_CSWtexlive-doc-fr += /opt/csw/share/texmf-dist/doc/latex/epslatex-fr/.* PKGFILES_CSWtexlive-doc-fr += /opt/csw/share/texmf-dist/doc/latex/l2tabu-french/.* PKGFILES_CSWtexlive-doc-fr += /opt/csw/share/texmf-dist/doc/latex/lshort-french/.* @@ -639,7 +639,7 @@ CATALOGNAME_CSWtexlive-doc-it = texlive_doc_it SPKG_DESC_CSWtexlive-doc-it += $(DESCRIPTION), doc it OBSOLETED_BY_CSWtexlive-doc-it = CSWtetex -PKGFILES_CSWtexlive-doc-it += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-it += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-it)/.* PKGFILES_CSWtexlive-doc-it += /opt/csw/share/texmf-dist/doc/latex/amsldoc-it/.* PKGFILES_CSWtexlive-doc-it += /opt/csw/share/texmf-dist/doc/latex/amsmath-it/.* PKGFILES_CSWtexlive-doc-it += /opt/csw/share/texmf-dist/doc/latex/amsthdoc-it/.* @@ -654,7 +654,7 @@ CATALOGNAME_CSWtexlive-doc-ja = texlive_doc_ja SPKG_DESC_CSWtexlive-doc-ja += $(DESCRIPTION), doc ja OBSOLETED_BY_CSWtexlive-doc-ja = CSWtetex -PKGFILES_CSWtexlive-doc-ja += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-ja += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-ja)/.* PKGFILES_CSWtexlive-doc-ja += /opt/csw/share/texmf-dist/doc/latex/lshort-japanese/.* ARCHALL_CSWtexlive-doc-ja = 1 @@ -662,7 +662,7 @@ CATALOGNAME_CSWtexlive-doc-ko = texlive_doc_ko SPKG_DESC_CSWtexlive-doc-ko += $(DESCRIPTION), doc ko OBSOLETED_BY_CSWtexlive-doc-ko = CSWtetex -PKGFILES_CSWtexlive-doc-ko += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-ko += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-ko)/.* PKGFILES_CSWtexlive-doc-ko += /opt/csw/share/texmf-dist/doc/latex/lshort-korean/.* ARCHALL_CSWtexlive-doc-ko = 1 @@ -670,7 +670,7 @@ CATALOGNAME_CSWtexlive-doc-mn = texlive_doc_mn SPKG_DESC_CSWtexlive-doc-mn += $(DESCRIPTION), doc mn OBSOLETED_BY_CSWtexlive-doc-mn = CSWtetex -PKGFILES_CSWtexlive-doc-mn += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-mn += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-mn)/.* PKGFILES_CSWtexlive-doc-mn += /opt/csw/share/texmf-dist/doc/latex/lshort-mongol/.* ARCHALL_CSWtexlive-doc-mn = 1 RUNTIME_DEP_PKGS_CSWtexlive-doc-mn += CSWperl @@ -679,7 +679,7 @@ CATALOGNAME_CSWtexlive-doc-nl = texlive_doc_nl SPKG_DESC_CSWtexlive-doc-nl += $(DESCRIPTION), doc nl OBSOLETED_BY_CSWtexlive-doc-nl = CSWtetex -PKGFILES_CSWtexlive-doc-nl += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-nl += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-nl)/.* PKGFILES_CSWtexlive-doc-nl += /opt/csw/share/texmf-dist/doc/latex/lshort-dutch/.* ARCHALL_CSWtexlive-doc-nl = 1 @@ -687,7 +687,7 @@ CATALOGNAME_CSWtexlive-doc-pl = texlive_doc_pl SPKG_DESC_CSWtexlive-doc-pl += $(DESCRIPTION), doc pl OBSOLETED_BY_CSWtexlive-doc-pl = CSWtetex -PKGFILES_CSWtexlive-doc-pl += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-pl += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-pl)/.* PKGFILES_CSWtexlive-doc-pl += /opt/csw/share/texmf-dist/doc/generic/tex-virtual-academy-pl/.* PKGFILES_CSWtexlive-doc-pl += /opt/csw/share/texmf-dist/doc/latex/lshort-polish/.* PKGFILES_CSWtexlive-doc-pl += /opt/csw/share/texmf/doc/texlive/texlive-pl/.* @@ -697,7 +697,7 @@ CATALOGNAME_CSWtexlive-doc-pt = texlive_doc_pt SPKG_DESC_CSWtexlive-doc-pt += $(DESCRIPTION), doc pt OBSOLETED_BY_CSWtexlive-doc-pt = CSWtetex -PKGFILES_CSWtexlive-doc-pt += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-pt += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-pt)/.* PKGFILES_CSWtexlive-doc-pt += /opt/csw/share/texmf-dist/doc/generic/xypic-tut-pt/.* PKGFILES_CSWtexlive-doc-pt += /opt/csw/share/texmf-dist/doc/latex/beamer-tut-pt/.* PKGFILES_CSWtexlive-doc-pt += /opt/csw/share/texmf-dist/doc/latex/cursolatex/README @@ -709,7 +709,7 @@ CATALOGNAME_CSWtexlive-doc-ru = texlive_doc_ru SPKG_DESC_CSWtexlive-doc-ru += $(DESCRIPTION), doc ru OBSOLETED_BY_CSWtexlive-doc-ru = CSWtetex -PKGFILES_CSWtexlive-doc-ru += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-ru += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-ru)/.* PKGFILES_CSWtexlive-doc-ru += /opt/csw/share/texmf-dist/doc/latex/lshort-russian/.* PKGFILES_CSWtexlive-doc-ru += /opt/csw/share/texmf-dist/doc/metapost/mpman-ru/.* PKGFILES_CSWtexlive-doc-ru += /opt/csw/share/texmf/doc/texlive/texlive-ru/.* @@ -719,7 +719,7 @@ CATALOGNAME_CSWtexlive-doc-si = texlive_doc_si SPKG_DESC_CSWtexlive-doc-si += $(DESCRIPTION), doc si OBSOLETED_BY_CSWtexlive-doc-si = CSWtetex -PKGFILES_CSWtexlive-doc-si += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-si += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-si)/.* PKGFILES_CSWtexlive-doc-si += /opt/csw/share/texmf-dist/doc/latex/lshort-slovenian/.* ARCHALL_CSWtexlive-doc-si = 1 @@ -727,7 +727,7 @@ CATALOGNAME_CSWtexlive-doc-th = texlive_doc_th SPKG_DESC_CSWtexlive-doc-th += $(DESCRIPTION), doc th OBSOLETED_BY_CSWtexlive-doc-th = CSWtetex -PKGFILES_CSWtexlive-doc-th += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-th += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-th)/.* PKGFILES_CSWtexlive-doc-th += /opt/csw/share/texmf-dist/doc/latex/lshort-thai/.* ARCHALL_CSWtexlive-doc-th = 1 @@ -735,7 +735,7 @@ CATALOGNAME_CSWtexlive-doc-tr = texlive_doc_tr SPKG_DESC_CSWtexlive-doc-tr += $(DESCRIPTION), doc tr OBSOLETED_BY_CSWtexlive-doc-tr = CSWtetex -PKGFILES_CSWtexlive-doc-tr += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-tr += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-tr)/.* PKGFILES_CSWtexlive-doc-tr += /opt/csw/share/texmf-dist/doc/latex/lshort-turkish/.* ARCHALL_CSWtexlive-doc-tr = 1 @@ -743,7 +743,7 @@ CATALOGNAME_CSWtexlive-doc-uk = texlive_doc_uk SPKG_DESC_CSWtexlive-doc-uk += $(DESCRIPTION), doc uk OBSOLETED_BY_CSWtexlive-doc-uk = CSWtetex -PKGFILES_CSWtexlive-doc-uk += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-uk += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-uk)/.* PKGFILES_CSWtexlive-doc-uk += /opt/csw/share/texmf-dist/doc/latex/lshort-ukr/.* ARCHALL_CSWtexlive-doc-uk = 1 @@ -751,7 +751,7 @@ CATALOGNAME_CSWtexlive-doc-vi = texlive_doc_vi SPKG_DESC_CSWtexlive-doc-vi += $(DESCRIPTION), doc vi OBSOLETED_BY_CSWtexlive-doc-vi = CSWtetex -PKGFILES_CSWtexlive-doc-vi += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-vi += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-vi)/.* PKGFILES_CSWtexlive-doc-vi += /opt/csw/share/texmf-dist/doc/latex/amsldoc-vn/.* PKGFILES_CSWtexlive-doc-vi += /opt/csw/share/texmf-dist/doc/latex/lshort-vietnamese/.* PKGFILES_CSWtexlive-doc-vi += /opt/csw/share/texmf-dist/doc/latex/ntheorem-vn/.* @@ -761,7 +761,7 @@ CATALOGNAME_CSWtexlive-doc-zh = texlive_doc_zh SPKG_DESC_CSWtexlive-doc-zh += $(DESCRIPTION), doc zh OBSOLETED_BY_CSWtexlive-doc-zh = CSWtetex -PKGFILES_CSWtexlive-doc-zh += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-zh += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-zh)/.* PKGFILES_CSWtexlive-doc-zh += /opt/csw/share/texmf-dist/doc/generic/latex-notes-zh-cn/.* PKGFILES_CSWtexlive-doc-zh += /opt/csw/share/texmf-dist/doc/latex/ctex-faq/.* PKGFILES_CSWtexlive-doc-zh += /opt/csw/share/texmf-dist/doc/latex/lshort-chinese/.* @@ -775,7 +775,7 @@ CATALOGNAME_CSWtexlive-extra-utils = texlive_extra_utils SPKG_DESC_CSWtexlive-extra-utils += $(DESCRIPTION), extra utils OBSOLETED_BY_CSWtexlive-extra-utils = CSWtetex -PKGFILES_CSWtexlive-extra-utils += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-extra-utils += $(docdir)/$(CATALOGNAME_CSWtexlive-extra-utils)/.* PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/a2ping PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/dviasm PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/e2pall @@ -832,7 +832,7 @@ CATALOGNAME_CSWtexlive-font-utils = texlive_font_utils SPKG_DESC_CSWtexlive-font-utils += $(DESCRIPTION), font utils OBSOLETED_BY_CSWtexlive-font-utils = CSWtetex -PKGFILES_CSWtexlive-font-utils += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-font-utils += $(docdir)/$(CATALOGNAME_CSWtexlive-font-utils)/.* PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/afm2afm PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/autoinst PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/epstopdf @@ -872,7 +872,7 @@ CATALOGNAME_CSWtexlive-fonts-extra = texlive_fonts_extra SPKG_DESC_CSWtexlive-fonts-extra += $(DESCRIPTION), fonts extra OBSOLETED_BY_CSWtexlive-fonts-extra = CSWtetex -PKGFILES_CSWtexlive-fonts-extra += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-fonts-extra += $(docdir)/$(CATALOGNAME_CSWtexlive-fonts-extra)/.* PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/dvips/brushscr/.* PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/dvips/gothic/.* PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/dvips/grotesq/.* @@ -1356,7 +1356,7 @@ CATALOGNAME_CSWtexlive-fonts-extra-doc = texlive_fonts_extra_doc SPKG_DESC_CSWtexlive-fonts-extra-doc += $(DESCRIPTION), fonts extra doc OBSOLETED_BY_CSWtexlive-fonts-extra-doc = CSWtetex -PKGFILES_CSWtexlive-fonts-extra-doc += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-fonts-extra-doc += $(docdir)/$(CATALOGNAME_CSWtexlive-fonts-extra-doc)/.* PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/allrunes/.* PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/antiqua/.* PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/antt/.* @@ -1457,7 +1457,7 @@ CATALOGNAME_CSWtexlive-fonts-recommended = texlive_fonts_recommended SPKG_DESC_CSWtexlive-fonts-recommended += $(DESCRIPTION), fonts recommended OBSOLETED_BY_CSWtexlive-fonts-recommended = CSWtetex -PKGFILES_CSWtexlive-fonts-recommended += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-fonts-recommended += $(docdir)/$(CATALOGNAME_CSWtexlive-fonts-recommended)/.* PKGFILES_CSWtexlive-fonts-recommended += /opt/csw/share/texmf-dist/dvips/avantgar/.* PKGFILES_CSWtexlive-fonts-recommended += /opt/csw/share/texmf-dist/dvips/bookman/.* PKGFILES_CSWtexlive-fonts-recommended += /opt/csw/share/texmf-dist/dvips/courier/.* @@ -1633,7 +1633,7 @@ CATALOGNAME_CSWtexlive-fonts-recommended-doc = texlive_fonts_recommended_doc SPKG_DESC_CSWtexlive-fonts-recommended-doc += $(DESCRIPTION), fonts recommended doc OBSOLETED_BY_CSWtexlive-fonts-recommended-doc = CSWtetex -PKGFILES_CSWtexlive-fonts-recommended-doc += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-fonts-recommended-doc += $(docdir)/$(CATALOGNAME_CSWtexlive-fonts-recommended-doc)/.* PKGFILES_CSWtexlive-fonts-recommended-doc += /opt/csw/share/texmf-dist/doc/fonts/charter/.* PKGFILES_CSWtexlive-fonts-recommended-doc += /opt/csw/share/texmf-dist/doc/fonts/euro-ce/.* PKGFILES_CSWtexlive-fonts-recommended-doc += /opt/csw/share/texmf-dist/doc/fonts/eurosym/.* @@ -1653,7 +1653,7 @@ CATALOGNAME_CSWtexlive-formats-extra = texlive_formats_extra SPKG_DESC_CSWtexlive-formats-extra += $(DESCRIPTION), formats extra OBSOLETED_BY_CSWtexlive-formats-extra = CSWtetex -PKGFILES_CSWtexlive-fonts-extra += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-fonts-extra += $(docdir)/$(CATALOGNAME_CSWtexlive-formats-extra)/.* PKGFILES_CSWtexlive-formats-extra += /opt/csw/bin/eplain PKGFILES_CSWtexlive-formats-extra += /opt/csw/bin/mllatex PKGFILES_CSWtexlive-formats-extra += /opt/csw/bin/mltex @@ -1683,7 +1683,7 @@ CATALOGNAME_CSWtexlive-games = texlive_games SPKG_DESC_CSWtexlive-games += $(DESCRIPTION), games OBSOLETED_BY_CSWtexlive-games = CSWtetex -PKGFILES_CSWtexlive-games += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-games += $(docdir)/$(CATALOGNAME_CSWtexlive-games)/.* PKGFILES_CSWtexlive-games += /opt/csw/share/texmf-dist/doc/fonts/skaknew/.* PKGFILES_CSWtexlive-games += /opt/csw/share/texmf-dist/doc/fonts/xq/.* PKGFILES_CSWtexlive-games += /opt/csw/share/texmf-dist/doc/latex/chess-problem-diagrams/.* @@ -1738,7 +1738,7 @@ CATALOGNAME_CSWtexlive-generic-extra = texlive_generic_extra SPKG_DESC_CSWtexlive-generic-extra += $(DESCRIPTION), generic extra OBSOLETED_BY_CSWtexlive-generic-extra = CSWtetex -PKGFILES_CSWtexlive-generic-extra += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-generic-extra += $(docdir)/$(CATALOGNAME_CSWtexlive-generic-extra)/.* PKGFILES_CSWtexlive-generic-extra += /opt/csw/share/texmf-dist/bibtex/bib/abstyles/.* PKGFILES_CSWtexlive-generic-extra += /opt/csw/share/texmf-dist/bibtex/bst/abstyles/.* PKGFILES_CSWtexlive-generic-extra += /opt/csw/share/texmf-dist/bibtex/bst/dinat/.* @@ -1789,7 +1789,7 @@ CATALOGNAME_CSWtexlive-generic-recommended = texlive_generic_recommended SPKG_DESC_CSWtexlive-generic-recommended += $(DESCRIPTION), generic recommended OBSOLETED_BY_CSWtexlive-generic-recommended = CSWtetex -PKGFILES_CSWtexlive-generic-recommended += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-generic-recommended += $(docdir)/$(CATALOGNAME_CSWtexlive-generic-recommended)/.* PKGFILES_CSWtexlive-generic-recommended += /opt/csw/share/texmf-dist/doc/fonts/fontname/.* PKGFILES_CSWtexlive-generic-recommended += /opt/csw/share/texmf-dist/doc/generic/epsf/.* PKGFILES_CSWtexlive-generic-recommended += /opt/csw/share/texmf-dist/doc/generic/multido/.* @@ -1808,7 +1808,7 @@ CATALOGNAME_CSWtexlive-humanities = texlive_humanities SPKG_DESC_CSWtexlive-humanities += $(DESCRIPTION), humanities OBSOLETED_BY_CSWtexlive-humanities = CSWtetex -PKGFILES_CSWtexlive-humanities += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-humanities += $(docdir)/$(CATALOGNAME_CSWtexlive-humanities)/.* PKGFILES_CSWtexlive-humanities += /opt/csw/share/texmf-dist/bibtex/bst/jurarsp/.* PKGFILES_CSWtexlive-humanities += /opt/csw/share/texmf-dist/makeindex/juraabbrev/.* PKGFILES_CSWtexlive-humanities += /opt/csw/share/texmf-dist/tex/latex/alnumsec/.* @@ -1849,7 +1849,7 @@ CATALOGNAME_CSWtexlive-humanities-doc = texlive_humanities_doc SPKG_DESC_CSWtexlive-humanities-doc += $(DESCRIPTION), humanities doc OBSOLETED_BY_CSWtexlive-humanities-doc = CSWtetex -PKGFILES_CSWtexlive-humanities-doc += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-humanities-doc += $(docdir)/$(CATALOGNAME_CSWtexlive-humanities-doc)/.* PKGFILES_CSWtexlive-humanities-doc += /opt/csw/share/texmf-dist/doc/latex/alnumsec/.* PKGFILES_CSWtexlive-humanities-doc += /opt/csw/share/texmf-dist/doc/latex/arydshln/.* PKGFILES_CSWtexlive-humanities-doc += /opt/csw/share/texmf-dist/doc/latex/bibleref/.* @@ -1888,7 +1888,7 @@ CATALOGNAME_CSWtexlive-lang-african = texlive_lang_african SPKG_DESC_CSWtexlive-lang-african += $(DESCRIPTION), lang african OBSOLETED_BY_CSWtexlive-lang-african = CSWtetex -PKGFILES_CSWtexlive-lang-african += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-african += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-african)/.* PKGFILES_CSWtexlive-lang-african += /opt/csw/share/texmf-dist/doc/fonts/fc/.* PKGFILES_CSWtexlive-lang-african += /opt/csw/share/texmf-dist/doc/latex/ethiop-t1/.* PKGFILES_CSWtexlive-lang-african += /opt/csw/share/texmf-dist/doc/latex/ethiop/.* @@ -1911,7 +1911,7 @@ CATALOGNAME_CSWtexlive-lang-arabic = texlive_lang_arabic SPKG_DESC_CSWtexlive-lang-arabic += $(DESCRIPTION), lang arabic OBSOLETED_BY_CSWtexlive-lang-arabic = CSWtetex -PKGFILES_CSWtexlive-lang-arabic += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-arabic += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-arabic)/.* PKGFILES_CSWtexlive-lang-arabic += /opt/csw/share/texmf-dist/doc/latex/arabi/.* PKGFILES_CSWtexlive-lang-arabic += /opt/csw/share/texmf-dist/doc/latex/arabtex/.* PKGFILES_CSWtexlive-lang-arabic += /opt/csw/share/texmf-dist/fonts/afm/arabi/arabeyes/.* @@ -1933,7 +1933,7 @@ CATALOGNAME_CSWtexlive-lang-croatian = texlive_lang_croatian SPKG_DESC_CSWtexlive-lang-croatian += $(DESCRIPTION), lang croatian OBSOLETED_BY_CSWtexlive-lang-croatian = CSWtetex -PKGFILES_CSWtexlive-lang-croatian += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-croatian += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-croatian)/.* PKGFILES_CSWtexlive-lang-croatian += /opt/csw/share/texmf-dist/doc/latex/hrlatex/.* ARCHALL_CSWtexlive-lang-croatian = 1 @@ -1941,7 +1941,7 @@ CATALOGNAME_CSWtexlive-lang-cyrillic = texlive_lang_cyrillic SPKG_DESC_CSWtexlive-lang-cyrillic += $(DESCRIPTION), lang cyrillic OBSOLETED_BY_CSWtexlive-lang-cyrillic = CSWtetex -PKGFILES_CSWtexlive-lang-cyrillic += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-cyrillic += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-cyrillic)/.* PKGFILES_CSWtexlive-lang-cyrillic += /opt/csw/share/texmf-dist/bibtex/bst/gost/.* PKGFILES_CSWtexlive-lang-cyrillic += /opt/csw/share/texmf-dist/doc/bibtex/gost/.* PKGFILES_CSWtexlive-lang-cyrillic += /opt/csw/share/texmf-dist/doc/fonts/cmcyr/.* @@ -1991,7 +1991,7 @@ CATALOGNAME_CSWtexlive-lang-czechslovak = texlive_lang_czechslovak SPKG_DESC_CSWtexlive-lang-czechslovak += $(DESCRIPTION), lang czechslovak OBSOLETED_BY_CSWtexlive-lang-czechslovak = CSWtetex -PKGFILES_CSWtexlive-lang-czechslovak += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-czechslovak += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-czechslovak)/.* PKGFILES_CSWtexlive-lang-czechslovak += /opt/csw/bin/cslatex PKGFILES_CSWtexlive-lang-czechslovak += /opt/csw/bin/csplain PKGFILES_CSWtexlive-lang-czechslovak += /opt/csw/bin/pdfcslatex @@ -2016,7 +2016,7 @@ CATALOGNAME_CSWtexlive-lang-finnish = texlive_lang_finnish SPKG_DESC_CSWtexlive-lang-finnish += $(DESCRIPTION), lang finnish OBSOLETED_BY_CSWtexlive-lang-finnish = CSWtetex -PKGFILES_CSWtexlive-lang-finish += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-finish += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-finnish)/.* PKGFILES_CSWtexlive-lang-finnish += /opt/csw/share/texmf-dist/bibtex/bst/finbib/.* ARCHALL_CSWtexlive-lang-finnish = 1 @@ -2024,7 +2024,7 @@ CATALOGNAME_CSWtexlive-lang-french = texlive_lang_french SPKG_DESC_CSWtexlive-lang-french += $(DESCRIPTION), lang french OBSOLETED_BY_CSWtexlive-lang-french = CSWtetex -PKGFILES_CSWtexlive-lang-french += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-french += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-french)/.* PKGFILES_CSWtexlive-lang-french += /opt/csw/share/texmf-dist/bibtex/bst/bib-fr/.* PKGFILES_CSWtexlive-lang-french += /opt/csw/share/texmf-dist/doc/bibtex/bib-fr/.* PKGFILES_CSWtexlive-lang-french += /opt/csw/share/texmf-dist/doc/generic/variations/.* @@ -2052,7 +2052,7 @@ CATALOGNAME_CSWtexlive-lang-german = texlive_lang_german SPKG_DESC_CSWtexlive-lang-german += $(DESCRIPTION), lang german OBSOLETED_BY_CSWtexlive-lang-german = CSWtetex -PKGFILES_CSWtexlive-lang-german += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-german += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-german)/.* PKGFILES_CSWtexlive-lang-german += /opt/csw/share/texmf-dist/bibtex/bst/germbib/.* PKGFILES_CSWtexlive-lang-german += /opt/csw/share/texmf-dist/doc/bibtex/germbib/.* PKGFILES_CSWtexlive-lang-german += /opt/csw/share/texmf-dist/doc/generic/dehyph-exptl/.* @@ -2075,7 +2075,7 @@ CATALOGNAME_CSWtexlive-lang-greek = texlive_lang_greek SPKG_DESC_CSWtexlive-lang-greek += $(DESCRIPTION), lang greek OBSOLETED_BY_CSWtexlive-lang-greek = CSWtetex -PKGFILES_CSWtexlive-lang-greek += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-greek += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-greek)/.* PKGFILES_CSWtexlive-lang-greek += /opt/csw/bin/mkgrkindex PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf-dist/doc/fonts/cbfonts/.* PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf-dist/doc/fonts/gfsbaskerville/.* @@ -2161,7 +2161,7 @@ CATALOGNAME_CSWtexlive-lang-hebrew = texlive_lang_hebrew SPKG_DESC_CSWtexlive-lang-hebrew += $(DESCRIPTION), lang hebrew OBSOLETED_BY_CSWtexlive-lang-hebrew = CSWtetex -PKGFILES_CSWtexlive-lang-hebrew += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-hebrew += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-hebrew)/.* PKGFILES_CSWtexlive-lang-hebrew += /opt/csw/share/texmf-dist/doc/fonts/cjhebrew/.* PKGFILES_CSWtexlive-lang-hebrew += /opt/csw/share/texmf-dist/fonts/afm/public/cjhebrew/.* PKGFILES_CSWtexlive-lang-hebrew += /opt/csw/share/texmf-dist/fonts/enc/dvips/cjhebrew/.* @@ -2176,7 +2176,7 @@ CATALOGNAME_CSWtexlive-lang-hungarian = texlive_lang_hungarian SPKG_DESC_CSWtexlive-lang-hungarian += $(DESCRIPTION), lang hungarian OBSOLETED_BY_CSWtexlive-lang-hungarian = CSWtetex -PKGFILES_CSWtexlive-lang-hungarian += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-hungarian += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-hungarian)/.* PKGFILES_CSWtexlive-lang-hungarian += /opt/csw/share/texmf-dist/doc/latex/magyar/.* PKGFILES_CSWtexlive-lang-hungarian += /opt/csw/share/texmf/doc/generic/huhyphen/.* ARCHALL_CSWtexlive-lang-hungarian = 1 @@ -2186,7 +2186,7 @@ CATALOGNAME_CSWtexlive-lang-indic = texlive_lang_indic SPKG_DESC_CSWtexlive-lang-indic += $(DESCRIPTION), lang indic OBSOLETED_BY_CSWtexlive-lang-indic = CSWtetex -PKGFILES_CSWtexlive-lang-indic += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-indic += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-indic)/.* PKGFILES_CSWtexlive-lang-indic += /opt/csw/bin/ebong PKGFILES_CSWtexlive-lang-indic += /opt/csw/share/texmf-dist/doc/fonts/burmese/.* PKGFILES_CSWtexlive-lang-indic += /opt/csw/share/texmf-dist/doc/fonts/malayalam/.* @@ -2215,7 +2215,7 @@ CATALOGNAME_CSWtexlive-lang-italian = texlive_lang_italian SPKG_DESC_CSWtexlive-lang-italian += $(DESCRIPTION), lang italian OBSOLETED_BY_CSWtexlive-lang-italian = CSWtetex -PKGFILES_CSWtexlive-lang-italian += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-italian += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-italian)/.* PKGFILES_CSWtexlive-lang-italian += /opt/csw/share/texmf-dist/doc/latex/frontespizio/.* PKGFILES_CSWtexlive-lang-italian += /opt/csw/share/texmf-dist/doc/latex/itnumpar/.* PKGFILES_CSWtexlive-lang-italian += /opt/csw/share/texmf-dist/tex/latex/frontespizio/.* @@ -2226,7 +2226,7 @@ CATALOGNAME_CSWtexlive-lang-lithuanian = texlive_lang_lithuanian SPKG_DESC_CSWtexlive-lang-lithuanian += $(DESCRIPTION), lang lithuanian OBSOLETED_BY_CSWtexlive-lang-lithuanian = CSWtetex -PKGFILES_CSWtexlive-lang-lithuanian += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-lithuanian += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-lithuanian)/.* PKGFILES_CSWtexlive-lang-lithuanian += /opt/csw/share/texmf-dist/doc/latex/lithuanian/.* PKGFILES_CSWtexlive-lang-lithuanian += /opt/csw/share/texmf-dist/fonts/enc/dvips/lithuanian/.* PKGFILES_CSWtexlive-lang-lithuanian += /opt/csw/share/texmf-dist/fonts/map/dvips/lithuanian/.* @@ -2238,7 +2238,7 @@ CATALOGNAME_CSWtexlive-lang-mongolian = texlive_lang_mongolian SPKG_DESC_CSWtexlive-lang-mongolian += $(DESCRIPTION), lang mongolian OBSOLETED_BY_CSWtexlive-lang-mongolian = CSWtetex -PKGFILES_CSWtexlive-lang-mongolian += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-mongolian += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-mongolian)/.* PKGFILES_CSWtexlive-lang-mongolian += /opt/csw/share/texmf-dist/doc/latex/mongolian-babel/.* PKGFILES_CSWtexlive-lang-mongolian += /opt/csw/share/texmf-dist/doc/latex/montex/.* PKGFILES_CSWtexlive-lang-mongolian += /opt/csw/share/texmf-dist/fonts/map/dvips/montex/.* @@ -2253,7 +2253,7 @@ CATALOGNAME_CSWtexlive-lang-polish = texlive_lang_polish SPKG_DESC_CSWtexlive-lang-polish += $(DESCRIPTION), lang polish OBSOLETED_BY_CSWtexlive-lang-polish = CSWtetex -PKGFILES_CSWtexlive-lang-polish += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-polish += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-polish)/.* PKGFILES_CSWtexlive-lang-polish += /opt/csw/bin/mex PKGFILES_CSWtexlive-lang-polish += /opt/csw/bin/pdfmex PKGFILES_CSWtexlive-lang-polish += /opt/csw/bin/utf8mex @@ -2304,7 +2304,7 @@ CATALOGNAME_CSWtexlive-lang-portuguese = texlive_lang_portuguese SPKG_DESC_CSWtexlive-lang-portuguese += $(DESCRIPTION), lang portuguese OBSOLETED_BY_CSWtexlive-lang-portuguese = CSWtetex -PKGFILES_CSWtexlive-lang-portuguese += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-portuguese += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-portuguese)/.* PKGFILES_CSWtexlive-lang-portuguese += /opt/csw/share/texmf-dist/doc/latex/ordinalpt/.* PKGFILES_CSWtexlive-lang-portuguese += /opt/csw/share/texmf-dist/tex/latex/ordinalpt/.* ARCHALL_CSWtexlive-lang-portuguese = 1 @@ -2313,7 +2313,7 @@ CATALOGNAME_CSWtexlive-lang-spanish = texlive_lang_spanish SPKG_DESC_CSWtexlive-lang-spanish += $(DESCRIPTION), lang spanish OBSOLETED_BY_CSWtexlive-lang-spanish = CSWtetex -PKGFILES_CSWtexlive-lang-spanish += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-spanish += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-spanish)/.* PKGFILES_CSWtexlive-lang-spanish += /opt/csw/share/texmf-dist/doc/latex/spanish-mx/.* PKGFILES_CSWtexlive-lang-spanish += /opt/csw/share/texmf-dist/doc/latex/spanish/.* PKGFILES_CSWtexlive-lang-spanish += /opt/csw/share/texmf-dist/tex/latex/spanish-mx/.* @@ -2323,7 +2323,7 @@ CATALOGNAME_CSWtexlive-lang-swedish = texlive_lang_swedish SPKG_DESC_CSWtexlive-lang-swedish += $(DESCRIPTION), lang swedish OBSOLETED_BY_CSWtexlive-lang-swedish = CSWtetex -PKGFILES_CSWtexlive-lang-swedish += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-swedish += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-swedish)/.* PKGFILES_CSWtexlive-lang-swedish += /opt/csw/share/texmf-dist/bibtex/bst/swebib/.* PKGFILES_CSWtexlive-lang-swedish += /opt/csw/share/texmf-dist/doc/latex/swebib/.* ARCHALL_CSWtexlive-lang-swedish = 1 @@ -2332,7 +2332,7 @@ CATALOGNAME_CSWtexlive-lang-tibetan = texlive_lang_tibetan SPKG_DESC_CSWtexlive-lang-tibetan += $(DESCRIPTION), lang tibetan OBSOLETED_BY_CSWtexlive-lang-tibetan = CSWtetex -PKGFILES_CSWtexlive-lang-tibetan += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-tibetan += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-tibetan)/.* PKGFILES_CSWtexlive-lang-tibetan += /opt/csw/share/texmf-dist/doc/latex/ctib/.* PKGFILES_CSWtexlive-lang-tibetan += /opt/csw/share/texmf-dist/doc/latex/otibet/.* PKGFILES_CSWtexlive-lang-tibetan += /opt/csw/share/texmf-dist/fonts/ofm/public/otibet/.* @@ -2352,7 +2352,7 @@ CATALOGNAME_CSWtexlive-lang-vietnamese = texlive_lang_vietnamese SPKG_DESC_CSWtexlive-lang-vietnamese += $(DESCRIPTION), lang vietnamese OBSOLETED_BY_CSWtexlive-lang-vietnamese = CSWtetex -PKGFILES_CSWtexlive-lang-vietnamese += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-lang-vietnamese += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-vietnamese)/.* PKGFILES_CSWtexlive-lang-vietnamese += /opt/csw/share/texmf-dist/doc/generic/vntex/.* PKGFILES_CSWtexlive-lang-vietnamese += /opt/csw/share/texmf-dist/fonts/afm/vntex/.* PKGFILES_CSWtexlive-lang-vietnamese += /opt/csw/share/texmf-dist/fonts/enc/dvips/vntex/.* @@ -2388,7 +2388,7 @@ CATALOGNAME_CSWtexlive-latex-base = texlive_latex_base SPKG_DESC_CSWtexlive-latex-base += $(DESCRIPTION), latex base OBSOLETED_BY_CSWtexlive-latex-base = CSWtetex -PKGFILES_CSWtexlive-latex-base += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-latex-base += $(docdir)/$(CATALOGNAME_CSWtexlive-latex-base)/.* PKGFILES_CSWtexlive-latex-base += /opt/csw/bin/dvilualatex PKGFILES_CSWtexlive-latex-base += /opt/csw/bin/latex PKGFILES_CSWtexlive-latex-base += /opt/csw/bin/lualatex @@ -2442,7 +2442,7 @@ CATALOGNAME_CSWtexlive-latex-base-doc = texlive_latex_base_doc SPKG_DESC_CSWtexlive-latex-base-doc += $(DESCRIPTION), latex base doc OBSOLETED_BY_CSWtexlive-latex-base-doc = CSWtetex -PKGFILES_CSWtexlive-latex-base-doc += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-latex-base-doc += $(docdir)/$(CATALOGNAME_CSWtexlive-latex-base-doc)/.* PKGFILES_CSWtexlive-latex-base-doc += /opt/csw/share/texmf-dist/doc/fonts/ae/.* PKGFILES_CSWtexlive-latex-base-doc += /opt/csw/share/texmf-dist/doc/generic/babel/.* PKGFILES_CSWtexlive-latex-base-doc += /opt/csw/share/texmf-dist/doc/latex/amscls/.* @@ -2466,7 +2466,7 @@ CATALOGNAME_CSWtexlive-latex-extra = texlive_latex_extra SPKG_DESC_CSWtexlive-latex-extra += $(DESCRIPTION), latex extra OBSOLETED_BY_CSWtexlive-latex-extra = CSWtetex -PKGFILES_CSWtexlive-latex-extra += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-latex-extra += $(docdir)/$(CATALOGNAME_CSWtexlive-latex-extra)/.* PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/makeglossaries PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/pdfannotextractor PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/perltex @@ -3133,7 +3133,7 @@ CATALOGNAME_CSWtexlive-latex-extra-doc = texlive_latex_extra_doc SPKG_DESC_CSWtexlive-latex-extra-doc += $(DESCRIPTION), latex extra doc OBSOLETED_BY_CSWtexlive-latex-extra-doc = CSWtetex -PKGFILES_CSWtexlive-latex-extra-doc += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-latex-extra-doc += $(docdir)/$(CATALOGNAME_CSWtexlive-latex-extra-doc)/.* PKGFILES_CSWtexlive-latex-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/esint-type1/.* PKGFILES_CSWtexlive-latex-extra-doc += /opt/csw/share/texmf-dist/doc/generic/kastrup/.* PKGFILES_CSWtexlive-latex-extra-doc += /opt/csw/share/texmf-dist/doc/generic/shapepar/.* @@ -3694,7 +3694,7 @@ CATALOGNAME_CSWtexlive-latex-recommended = texlive_latex_recommended SPKG_DESC_CSWtexlive-latex-recommended += $(DESCRIPTION), latex recommended OBSOLETED_BY_CSWtexlive-latex-recommended = CSWtetex -PKGFILES_CSWtexlive-latex-recommended += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-latex-recommended += $(docdir)/$(CATALOGNAME_CSWtexlive-latex-recommended)/.* PKGFILES_CSWtexlive-latex-recommended += /opt/csw/bin/thumbpdf PKGFILES_CSWtexlive-latex-recommended += /opt/csw/share/texmf-dist/bibtex/bst/index/.* PKGFILES_CSWtexlive-latex-recommended += /opt/csw/share/texmf-dist/doc/latex/koma-script/.* @@ -3752,7 +3752,7 @@ CATALOGNAME_CSWtexlive-latex-recommended-doc = texlive_latex_recommended_doc SPKG_DESC_CSWtexlive-latex-recommended-doc += $(DESCRIPTION), latex recommended doc OBSOLETED_BY_CSWtexlive-latex-recommended-doc = CSWtetex -PKGFILES_CSWtexlive-latex-recommended-doc += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-latex-recommended-doc += $(docdir)/$(CATALOGNAME_CSWtexlive-latex-recommended-doc)/.* PKGFILES_CSWtexlive-latex-recommended-doc += /opt/csw/share/texmf-dist/doc/fonts/ec/.* PKGFILES_CSWtexlive-latex-recommended-doc += /opt/csw/share/texmf-dist/doc/latex/anysize/.* PKGFILES_CSWtexlive-latex-recommended-doc += /opt/csw/share/texmf-dist/doc/latex/booktabs/.* @@ -3790,7 +3790,7 @@ CATALOGNAME_CSWtexlive-latex3 = texlive_latex3 SPKG_DESC_CSWtexlive-latex3 += $(DESCRIPTION), latex3 OBSOLETED_BY_CSWtexlive-latex3 = CSWtetex -PKGFILES_CSWtexlive-latex3 += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-latex3 += $(docdir)/$(CATALOGNAME_CSWtexlive-latex3)/.* PKGFILES_CSWtexlive-latex3 += /opt/csw/share/texmf-dist/doc/latex/mh/.* PKGFILES_CSWtexlive-latex3 += /opt/csw/share/texmf-dist/tex/latex/mh/.* ARCHALL_CSWtexlive-latex3 = 1 @@ -3799,7 +3799,7 @@ CATALOGNAME_CSWtexlive-luatex = texlive_luatex SPKG_DESC_CSWtexlive-luatex += $(DESCRIPTION), luatex OBSOLETED_BY_CSWtexlive-luatex = CSWtetex -PKGFILES_CSWtexlive-luatex += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-luatex += $(docdir)/$(CATALOGNAME_CSWtexlive-luatex)/.* PKGFILES_CSWtexlive-luatex += /opt/csw/share/texmf-dist/doc/lualatex/luainputenc/.* PKGFILES_CSWtexlive-luatex += /opt/csw/share/texmf-dist/doc/luatex/luamplib/.* PKGFILES_CSWtexlive-luatex += /opt/csw/share/texmf-dist/doc/luatex/luaotfload/.* @@ -3812,7 +3812,7 @@ CATALOGNAME_CSWtexlive-math-extra = texlive_math_extra SPKG_DESC_CSWtexlive-math-extra += $(DESCRIPTION), math extra OBSOLETED_BY_CSWtexlive-math-extra = CSWtetex -PKGFILES_CSWtexlive-math-extra += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-math-extra += $(docdir)/$(CATALOGNAME_CSWtexlive-math-extra)/.* PKGFILES_CSWtexlive-math-extra += /opt/csw/bin/amstex PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/doc/amstex/base/.* PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/doc/fonts/concmath/.* @@ -3899,7 +3899,7 @@ CATALOGNAME_CSWtexlive-metapost = texlive_metapost SPKG_DESC_CSWtexlive-metapost += $(DESCRIPTION), metapost OBSOLETED_BY_CSWtexlive-metapost = CSWtetex -PKGFILES_CSWtexlive-metapost += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-metapost += $(docdir)/$(CATALOGNAME_CSWtexlive-metapost)/.* PKGFILES_CSWtexlive-metapost += /opt/csw/bin/mfplain PKGFILES_CSWtexlive-metapost += /opt/csw/share/texmf-dist/metafont/mfpic/.* PKGFILES_CSWtexlive-metapost += /opt/csw/share/texmf-dist/metafont/roex/.* @@ -3916,7 +3916,7 @@ CATALOGNAME_CSWtexlive-metapost-doc = texlive_metapost_doc SPKG_DESC_CSWtexlive-metapost-doc += $(DESCRIPTION), metapost doc OBSOLETED_BY_CSWtexlive-metapost-doc = CSWtetex -PKGFILES_CSWtexlive-metapost-doc += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-metapost-doc += $(docdir)/$(CATALOGNAME_CSWtexlive-metapost-doc)/.* PKGFILES_CSWtexlive-metapost-doc += /opt/csw/share/texmf-dist/doc/generic/mfpic/.* PKGFILES_CSWtexlive-metapost-doc += /opt/csw/share/texmf-dist/doc/latex/emp/.* PKGFILES_CSWtexlive-metapost-doc += /opt/csw/share/texmf-dist/doc/latex/metaplot/.* @@ -3929,7 +3929,7 @@ CATALOGNAME_CSWtexlive-music = texlive_music SPKG_DESC_CSWtexlive-music += $(DESCRIPTION), music OBSOLETED_BY_CSWtexlive-music = CSWtetex -PKGFILES_CSWtexlive-music += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-music += $(docdir)/$(CATALOGNAME_CSWtexlive-music)/.* PKGFILES_CSWtexlive-music += /opt/csw/share/texmf-dist/doc/latex/abc/.* PKGFILES_CSWtexlive-music += /opt/csw/share/texmf-dist/doc/latex/gchords/.* PKGFILES_CSWtexlive-music += /opt/csw/share/texmf-dist/doc/latex/guitar/guitar.tex @@ -3952,7 +3952,7 @@ CATALOGNAME_CSWtexlive-omega = texlive_omega SPKG_DESC_CSWtexlive-omega += $(DESCRIPTION), omega OBSOLETED_BY_CSWtexlive-omega = CSWtetex -PKGFILES_CSWtexlive-omega += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-omega += $(docdir)/$(CATALOGNAME_CSWtexlive-omega)/.* PKGFILES_CSWtexlive-omega += /opt/csw/bin/lamed PKGFILES_CSWtexlive-omega += /opt/csw/share/texmf-dist/doc/aleph/base/.* PKGFILES_CSWtexlive-omega += /opt/csw/share/texmf-dist/doc/fonts/mxedruli/.* @@ -3983,7 +3983,7 @@ CATALOGNAME_CSWtexlive-pictures = texlive_pictures SPKG_DESC_CSWtexlive-pictures += $(DESCRIPTION), pictures OBSOLETED_BY_CSWtexlive-pictures = CSWtetex -PKGFILES_CSWtexlive-pictures += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-pictures += $(docdir)/$(CATALOGNAME_CSWtexlive-pictures)/.* PKGFILES_CSWtexlive-pictures += /opt/csw/bin/cachepic PKGFILES_CSWtexlive-pictures += /opt/csw/bin/epspdf PKGFILES_CSWtexlive-pictures += /opt/csw/bin/epspdftk @@ -4043,7 +4043,7 @@ CATALOGNAME_CSWtexlive-pictures-doc = texlive_pictures_doc SPKG_DESC_CSWtexlive-pictures-doc += $(DESCRIPTION), pictures doc OBSOLETED_BY_CSWtexlive-pictures-doc = CSWtetex -PKGFILES_CSWtexlive-pictures-doc += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-pictures-doc += $(docdir)/$(CATALOGNAME_CSWtexlive-pictures-doc)/.* PKGFILES_CSWtexlive-pictures-doc += /opt/csw/share/texmf-dist/doc/context/third/pgfplots/.* PKGFILES_CSWtexlive-pictures-doc += /opt/csw/share/texmf-dist/doc/generic/doc-pictex/.* PKGFILES_CSWtexlive-pictures-doc += /opt/csw/share/texmf-dist/doc/generic/dratex/.* @@ -4095,7 +4095,7 @@ CATALOGNAME_CSWtexlive-plain-extra = texlive_plain_extra SPKG_DESC_CSWtexlive-plain-extra += $(DESCRIPTION), plain extra OBSOLETED_BY_CSWtexlive-plain-extra = CSWtetex -PKGFILES_CSWtexlive-plain-extra += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-plain-extra += $(docdir)/$(CATALOGNAME_CSWtexlive-plain-extra)/.* PKGFILES_CSWtexlive-plain-extra += /opt/csw/share/texmf-dist/doc/plain/figflow/.* PKGFILES_CSWtexlive-plain-extra += /opt/csw/share/texmf-dist/doc/plain/font-change/.* PKGFILES_CSWtexlive-plain-extra += /opt/csw/share/texmf-dist/doc/plain/fontch/.* @@ -4125,7 +4125,7 @@ CATALOGNAME_CSWtexlive-pstricks = texlive_pstricks SPKG_DESC_CSWtexlive-pstricks += $(DESCRIPTION), pstricks OBSOLETED_BY_CSWtexlive-pstricks = CSWtetex -PKGFILES_CSWtexlive-pstricks += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-pstricks += $(docdir)/$(CATALOGNAME_CSWtexlive-pstricks)/.* PKGFILES_CSWtexlive-pstricks += /opt/csw/bin/pst2pdf PKGFILES_CSWtexlive-pstricks += /opt/csw/share/texmf-dist/dvips/pst-3dplot/.* PKGFILES_CSWtexlive-pstricks += /opt/csw/share/texmf-dist/dvips/pst-bar/.* @@ -4271,7 +4271,7 @@ CATALOGNAME_CSWtexlive-pstricks-doc = texlive_pstricks_doc SPKG_DESC_CSWtexlive-pstricks-doc += $(DESCRIPTION), pstricks doc OBSOLETED_BY_CSWtexlive-pstricks-doc = CSWtetex -PKGFILES_CSWtexlive-pstricks-doc += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-pstricks-doc += $(docdir)/$(CATALOGNAME_CSWtexlive-pstricks-doc)/.* PKGFILES_CSWtexlive-pstricks-doc += /opt/csw/share/texmf-dist/doc/generic/pst-2dplot/.* PKGFILES_CSWtexlive-pstricks-doc += /opt/csw/share/texmf-dist/doc/generic/pst-3d/.* PKGFILES_CSWtexlive-pstricks-doc += /opt/csw/share/texmf-dist/doc/generic/pst-3dplot/.* @@ -4343,7 +4343,7 @@ CATALOGNAME_CSWtexlive-publishers = texlive_publishers SPKG_DESC_CSWtexlive-publishers += $(DESCRIPTION), publishers OBSOLETED_BY_CSWtexlive-publishers = CSWtetex -PKGFILES_CSWtexlive-publishers += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-publishers += $(docdir)/$(CATALOGNAME_CSWtexlive-publishers)/.* PKGFILES_CSWtexlive-publishers += /opt/csw/share/texmf-dist/bibtex/bib/IEEEtran/.* PKGFILES_CSWtexlive-publishers += /opt/csw/share/texmf-dist/bibtex/bib/nostarch/.* PKGFILES_CSWtexlive-publishers += /opt/csw/share/texmf-dist/bibtex/bib/revtex4/.* @@ -4448,7 +4448,7 @@ CATALOGNAME_CSWtexlive-publishers-doc = texlive_publishers_doc SPKG_DESC_CSWtexlive-publishers-doc += $(DESCRIPTION), publishers doc OBSOLETED_BY_CSWtexlive-publishers-doc = CSWtetex -PKGFILES_CSWtexlive-publishers-doc += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-publishers-doc += $(docdir)/$(CATALOGNAME_CSWtexlive-publishers-doc)/.* PKGFILES_CSWtexlive-publishers-doc += /opt/csw/share/texmf-dist/doc/bibtex/economic/.* PKGFILES_CSWtexlive-publishers-doc += /opt/csw/share/texmf-dist/doc/bibtex/vancouver/.* PKGFILES_CSWtexlive-publishers-doc += /opt/csw/share/texmf-dist/doc/latex/IEEEconf/.* @@ -4524,7 +4524,7 @@ CATALOGNAME_CSWtexlive-science = texlive_science SPKG_DESC_CSWtexlive-science += $(DESCRIPTION), science OBSOLETED_BY_CSWtexlive-science = CSWtetex -PKGFILES_CSWtexlive-science += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-science += $(docdir)/$(CATALOGNAME_CSWtexlive-science)/.* PKGFILES_CSWtexlive-science += /opt/csw/bin/ulqda PKGFILES_CSWtexlive-science += /opt/csw/share/texmf-dist/bibtex/bib/computational-complexity/.* PKGFILES_CSWtexlive-science += /opt/csw/share/texmf-dist/bibtex/bst/computational-complexity/.* @@ -4588,7 +4588,7 @@ CATALOGNAME_CSWtexlive-science-doc = texlive_science_doc SPKG_DESC_CSWtexlive-science-doc += $(DESCRIPTION), science doc OBSOLETED_BY_CSWtexlive-science-doc = CSWtetex -PKGFILES_CSWtexlive-science-doc += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-science-doc += $(docdir)/$(CATALOGNAME_CSWtexlive-science-doc)/.* PKGFILES_CSWtexlive-science-doc += /opt/csw/share/texmf-dist/doc/fonts/chemarrow/.* PKGFILES_CSWtexlive-science-doc += /opt/csw/share/texmf-dist/doc/latex/SIstyle/.* PKGFILES_CSWtexlive-science-doc += /opt/csw/share/texmf-dist/doc/latex/SIunits/.* @@ -4641,7 +4641,7 @@ CATALOGNAME_CSWtexlive-xetex = texlive_xetex SPKG_DESC_CSWtexlive-xetex += $(DESCRIPTION), xetex OBSOLETED_BY_CSWtexlive-xetex = CSWtetex -PKGFILES_CSWtexlive-xetex += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-xetex += $(docdir)/$(CATALOGNAME_CSWtexlive-xetex)/.* PKGFILES_CSWtexlive-xetex += /opt/csw/bin/xelatex PKGFILES_CSWtexlive-xetex += /opt/csw/share/texmf-dist/doc/xelatex/.* PKGFILES_CSWtexlive-xetex += /opt/csw/share/texmf-dist/doc/xetex/.* @@ -4657,7 +4657,7 @@ PACKAGES += CSWtexlive-xindy CATALOGNAME_CSWtexlive-xindy = texlive_xindy SPKG_DESC_CSWtexlive-xindy += $(DESCRIPTION), index generator for structured documents like LaTeX or SGML -PKGFILES_CSWtexlive-xindy += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-xindy += $(docdir)/$(CATALOGNAME_CSWtexlive-xindy)/.* PKGFILES_CSWtexlive-xindy += /opt/csw//bin/tex2xindy PKGFILES_CSWtexlive-xindy += /opt/csw//bin/texindy PKGFILES_CSWtexlive-xindy += /opt/csw//bin/xindy This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Dec 10 14:15:17 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 10 Dec 2012 13:15:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[19874] csw/mgar/pkg/x264/trunk Message-ID: Revision: 19874 http://gar.svn.sourceforge.net/gar/?rev=19874&view=rev Author: janholzh Date: 2012-12-10 13:15:16 +0000 (Mon, 10 Dec 2012) Log Message: ----------- x264/trunk: update to newest version Modified Paths: -------------- csw/mgar/pkg/x264/trunk/Makefile csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch Modified: csw/mgar/pkg/x264/trunk/Makefile =================================================================== --- csw/mgar/pkg/x264/trunk/Makefile 2012-12-10 13:02:26 UTC (rev 19873) +++ csw/mgar/pkg/x264/trunk/Makefile 2012-12-10 13:15:16 UTC (rev 19874) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = x264 -VERSION = 999b753 +VERSION = 1cffe9f GARTYPE = v2 DESCRIPTION = x264 is encoding video streams into the H.264/MPEG-4 AVC format @@ -14,7 +14,7 @@ #MASTER_SITES = http://repo.or.cz/w/x264.git/snapshot/ #DISTFILES = c522ad1fed167d0e985e4f9dcdee042473cf74db.tar.gz GIT_REPOS = http://git.videolan.org/git/x264.git -GIT_TREEISH_tig.git = 198a7ea13ccb727d4ea24b29f5da9b0292387309 +GIT_TREEISH_tig.git = 1cffe9f406cc54f4759fc9eeb85598fb8cae66c7 # This Patch file needs to be updated on every new version! PATCHFILES += 0001-replace-version.sh.patch @@ -28,7 +28,6 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 GARCOMPILER = GCC4 SKIPTEST = 1 @@ -55,23 +54,23 @@ RUNTIME_DEP_PKGS_CSWx264 += CSWlibswscale2 RUNTIME_DEP_PKGS_CSWx264 += CSWlibavutil51 -PACKAGES += CSWlibx264-128 -CATALOGNAME_CSWlibx264-128 = libx264_128 -PKGFILES_CSWlibx264-128 += $(call baseisadirs,$(libdir),libx264\.so\.128) -PKGFILES_CSWlibx264-128 += $(call baseisadirs,$(libdir),libx264\.so\.128(\.\d+)*) -SPKG_DESC_CSWlibx264-128 += $(DESCRIPTION), libx264.so.128 -RUNTIME_DEP_PKGS_CSWlibx264-128 += CSWlibgcc-s1 +PACKAGES += CSWlibx264-129 +CATALOGNAME_CSWlibx264-129 = libx264_129 +PKGFILES_CSWlibx264-129 += $(call baseisadirs,$(libdir),libx264\.so\.129) +PKGFILES_CSWlibx264-129 += $(call baseisadirs,$(libdir),libx264\.so\.129(\.\d+)*) +SPKG_DESC_CSWlibx264-129 += $(DESCRIPTION), libx264.so.129 +RUNTIME_DEP_PKGS_CSWlibx264-129 += CSWlibgcc-s1 PACKAGES += CSWlibx264-dev CATALOGNAME_CSWlibx264-dev = libx264_dev SPKG_DESC_CSWlibx264-dev += $(DESCRIPTION), development files PKGFILES_CSWlibx264-dev += /opt/csw/lib/libx264.so PKGFILES_CSWlibx264-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibx264-dev += CSWlibx264-128 +RUNTIME_DEP_PKGS_CSWlibx264-dev += CSWlibx264-129 #Some overrides CHECKPKG_OVERRIDES += pkginfo-description-not-starting-with-uppercase -CHECKPKG_OVERRIDES_CSWlibx264-128 += pkginfo-description-not-starting-with-uppercase +CHECKPKG_OVERRIDES_CSWlibx264-129 += pkginfo-description-not-starting-with-uppercase Modified: csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch =================================================================== --- csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch 2012-12-10 13:02:26 UTC (rev 19873) +++ csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch 2012-12-10 13:15:16 UTC (rev 19874) @@ -37,10 +37,10 @@ -API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'` -echo "#define X264_POINTVER \"0.$API.$VER\"" + -+echo "#define X264_REV 2216" ++echo "#define X264_REV 2230" +echo "#define X264_REV_DIFF 0" -+echo '#define X264_VERSION " r2216 198a7ea"' -+echo '#define X264_POINTVER "0.128.2216 198a7ea"' ++echo '#define X264_VERSION " r2230 1cffe9f"' ++echo '#define X264_POINTVER "0.129.2230 1cffe9f"' +exit 0 -- 1.7.9 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 Dec 10 14:36:34 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 10 Dec 2012 13:36:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[19875] csw/mgar/pkg/cpan/IPC-Run/trunk Message-ID: Revision: 19875 http://gar.svn.sourceforge.net/gar/?rev=19875&view=rev Author: dmichelsen Date: 2012-12-10 13:36:34 +0000 (Mon, 10 Dec 2012) Log Message: ----------- cpan/IPC-Run/trunk: Update to 0.92 Modified Paths: -------------- csw/mgar/pkg/cpan/IPC-Run/trunk/Makefile csw/mgar/pkg/cpan/IPC-Run/trunk/checksums Modified: csw/mgar/pkg/cpan/IPC-Run/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IPC-Run/trunk/Makefile 2012-12-10 13:15:16 UTC (rev 19874) +++ csw/mgar/pkg/cpan/IPC-Run/trunk/Makefile 2012-12-10 13:36:34 UTC (rev 19875) @@ -1,5 +1,5 @@ NAME = IPC-Run -VERSION = 0.91 +VERSION = 0.92 CATEGORIES = cpan GARTYPE = v2 AUTHOR = TODDR Modified: csw/mgar/pkg/cpan/IPC-Run/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IPC-Run/trunk/checksums 2012-12-10 13:15:16 UTC (rev 19874) +++ csw/mgar/pkg/cpan/IPC-Run/trunk/checksums 2012-12-10 13:36:34 UTC (rev 19875) @@ -1 +1 @@ -8ecab27c7c99a1644de3b09db7da0e0e IPC-Run-0.91.tar.gz +9d209c8d4bda50bea5f5a09e03db173e IPC-Run-0.92.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Dec 10 15:23:50 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 10 Dec 2012 14:23:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[19876] csw/mgar/pkg/samba/trunk Message-ID: Revision: 19876 http://gar.svn.sourceforge.net/gar/?rev=19876&view=rev Author: janholzh Date: 2012-12-10 14:23:50 +0000 (Mon, 10 Dec 2012) Log Message: ----------- samba/trunk: update to 3.6.10 Modified Paths: -------------- csw/mgar/pkg/samba/trunk/Makefile csw/mgar/pkg/samba/trunk/checksums Modified: csw/mgar/pkg/samba/trunk/Makefile =================================================================== --- csw/mgar/pkg/samba/trunk/Makefile 2012-12-10 13:36:34 UTC (rev 19875) +++ csw/mgar/pkg/samba/trunk/Makefile 2012-12-10 14:23:50 UTC (rev 19876) @@ -2,7 +2,7 @@ # - Check http://src.opensolaris.org/source/xref/userland/src/components/samba/samba/ from time to time NAME = samba -VERSION = 3.6.9 +VERSION = 3.6.10 GARTYPE = v2 DESCRIPTION = Tools to access a servers filespace and printers via SMB (server) Modified: csw/mgar/pkg/samba/trunk/checksums =================================================================== --- csw/mgar/pkg/samba/trunk/checksums 2012-12-10 13:36:34 UTC (rev 19875) +++ csw/mgar/pkg/samba/trunk/checksums 2012-12-10 14:23:50 UTC (rev 19876) @@ -1 +1 @@ -0c48bbeb9549fcda37f108aa3c2a817f samba-3.6.9.tar.gz +b5f0560c216122529b1c3b7f41c62567 samba-3.6.10.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Dec 10 17:02:55 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 10 Dec 2012 16:02:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[19877] csw/mgar/pkg/ffmpeg/trunk Message-ID: Revision: 19877 http://gar.svn.sourceforge.net/gar/?rev=19877&view=rev Author: janholzh Date: 2012-12-10 16:02:54 +0000 (Mon, 10 Dec 2012) Log Message: ----------- ffmpeg/trunk: update to 1.0.1 Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile csw/mgar/pkg/ffmpeg/trunk/checksums Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-12-10 14:23:50 UTC (rev 19876) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-12-10 16:02:54 UTC (rev 19877) @@ -8,7 +8,7 @@ # Another thing is to see if it can be build with suncc see http://ftp.jaist.ac.jp/pub/pkgsrc/current/pkgsrc/multimedia/ffmpeg/Makefile.common NAME = ffmpeg -VERSION = 1.0 +VERSION = 1.0.1 GARTYPE = v2 DESCRIPTION = Very fast video and audio converter (includes libavcodec) @@ -46,7 +46,7 @@ RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibx264-128 +RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibx264-129 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibgcc-s1 PACKAGES += CSWlibavdevice54 @@ -66,7 +66,7 @@ RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibx264-128 +RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibx264-129 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibgcc-s1 PACKAGES += CSWlibavfilter3 Modified: csw/mgar/pkg/ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/checksums 2012-12-10 14:23:50 UTC (rev 19876) +++ csw/mgar/pkg/ffmpeg/trunk/checksums 2012-12-10 16:02:54 UTC (rev 19877) @@ -1 +1 @@ -3ed526cea20c1bffb5a37f7730f710bd ffmpeg-1.0.tar.bz2 +dbbb88ce5525dea22b24aaa098a9bcc2 ffmpeg-1.0.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 10 17:56:13 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 10 Dec 2012 16:56:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[19878] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 19878 http://gar.svn.sourceforge.net/gar/?rev=19878&view=rev Author: wahwah Date: 2012-12-10 16:56:12 +0000 (Mon, 10 Dec 2012) Log Message: ----------- gcc4/trunk: remove surplus dependencies Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-10 16:02:54 UTC (rev 19877) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-10 16:56:12 UTC (rev 19878) @@ -105,16 +105,12 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgcj-tools$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgij$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgmpxx4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgo0 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgomp1 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibisl7 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibitm1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibppl-c4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibppl9 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibpwl5 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibssp0 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibz1 @@ -303,13 +299,9 @@ PKGFILES_$(PKG_BASENAME)g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/ostream.* RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibcloog-isl2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibgmpxx4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibisl7 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibppl-c4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibppl9 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibpwl5 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibstdc++$(LIBSTDCXX_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibz1 @@ -334,13 +326,9 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibcloog-isl2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibgfortran3 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibgmpxx4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibisl7 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibppl-c4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibppl9 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibpwl5 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibz1 ALTERNATIVES_$(PKG_BASENAME)gfortran += gfortran @@ -354,13 +342,9 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgcj-tools$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgij$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgmpxx4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibisl7 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibppl-c4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibppl9 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibpwl5 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibz1 PKGFILES_$(PKG_BASENAME)java = $(foreach F,$(JAVA_BINARIES),$(bindir)/$(F)$(PROGRAM_SUFFIX)) @@ -436,15 +420,11 @@ PKGFILES_$(PKG_BASENAME)objc += $(call baseisadirs,$(libdir),libobjc_gc.so) RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibcloog-isl2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibgmpxx4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibisl7 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc$(LIBOBJC) RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc-gc$(LIBOBJC) RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibppl-c4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibppl9 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibpwl5 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibz1 # libiconv deps cropped up relatively late in the porting process. Perhaps @@ -474,14 +454,10 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibcloog-isl2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgcc-s1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgmpxx4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibiconv2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibisl7 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibppl-c4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibppl9 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibpwl5 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibz1 # This is an obsolete package. Nothing depends on it, so we can remove it. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Dec 11 10:45:32 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 11 Dec 2012 09:45:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[19879] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 19879 http://gar.svn.sourceforge.net/gar/?rev=19879&view=rev Author: pfelecan Date: 2012-12-11 09:45:30 +0000 (Tue, 11 Dec 2012) Log Message: ----------- texlive/trunk: refinement of the common package: better partition of binaries to their corresponding packages Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-12-10 16:56:12 UTC (rev 19878) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-12-11 09:45:30 UTC (rev 19879) @@ -122,6 +122,16 @@ EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/tex/latex/rcsinfo/* # provided by the tex_dirtree package EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/tex/generic/dirtree/* +# provided by tex4ht package +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/bin/mk4ht +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/bin/ht +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/bin/htcontext +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/bin/htlatex +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/bin/htmex +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/bin/httex +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/bin/httexi +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/bin/htxelatex +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/bin/htxetex DEBUG_PACKAGING = 1 SPKG_TMPDIR = $(HOME)/ocswtmp @@ -132,24 +142,6 @@ SPKG_DESC_CSWtexlive-common += $(DESCRIPTION), common OBSOLETED_BY_CSWtexlive-common = CSWtetex ARCHALL_CSWtexlive-common = 1 -# TODO these are probably a sign that the content is to encompassing! -RUNTIME_DEP_PKGS_CSWtexlive-common += CSWtexlive-extra-utils -RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibptexenc1 -RUNTIME_DEP_PKGS_CSWtexlive-common += CSWtexlive-binaries -RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibz1 -RUNTIME_DEP_PKGS_CSWtexlive-common += CSWpython -RUNTIME_DEP_PKGS_CSWtexlive-common += CSWgs -RUNTIME_DEP_PKGS_CSWtexlive-common += CSWruby -RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibkpathsea6 -RUNTIME_DEP_PKGS_CSWtexlive-common += CSWemacscommon -RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibgd2 -RUNTIME_DEP_PKGS_CSWtexlive-common += CSWperl -RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibpng15-15 -RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWtexlive-common += CSWtexlive-font-utils -RUNTIME_DEP_PKGS_CSWtexlive-common += CSWlibt1-5 PACKAGES += CSWtexlive-dev CATALOGNAME_CSWtexlive-dev += texlive_dev @@ -282,6 +274,8 @@ SPKG_DESC_CSWtexlive-bibtex-extra += $(DESCRIPTION), bibtex extra OBSOLETED_BY_CSWtexlive-bibtex-extra = CSWtetex PKGFILES_CSWtexlive-bibtex-extra += $(docdir)/$(CATALOGNAME_CSWtexlive-bibtex-extra)/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/bin/bibexport +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/bin/listbib PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bib/amsrefs/.* PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bib/beebe/.* PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bib/dk-bib/.* @@ -387,9 +381,14 @@ PKGFILES_CSWtexlive-binaries += /opt/csw/bin/allcm PKGFILES_CSWtexlive-binaries += /opt/csw/bin/allec PKGFILES_CSWtexlive-binaries += /opt/csw/bin/allneeded +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/bibtex PKGFILES_CSWtexlive-binaries += /opt/csw/bin/bibtex8 +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/bibtexu +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/context +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/convbkmk PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ctangle PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ctie +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ctxtools PKGFILES_CSWtexlive-binaries += /opt/csw/bin/cweave PKGFILES_CSWtexlive-binaries += /opt/csw/bin/detex PKGFILES_CSWtexlive-binaries += /opt/csw/bin/disdvi @@ -400,32 +399,44 @@ PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvibook PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dviconcat PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvicopy +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvidvi +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvigif PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvihp +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvilj PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvilj2p PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvilj4 PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvilj4l PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvilj6 -PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvilj PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvipdfm PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvipdfmx PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvipdft +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvipng PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvipos PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvips PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvired PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dviselect +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvisvgm PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvitodvi PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvitomp PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvitype PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ebb +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/eptex PKGFILES_CSWtexlive-binaries += /opt/csw/bin/etex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/euptex PKGFILES_CSWtexlive-binaries += /opt/csw/bin/extractbb +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/fmtutil PKGFILES_CSWtexlive-binaries += /opt/csw/bin/fmtutil-sys -PKGFILES_CSWtexlive-binaries += /opt/csw/bin/fmtutil PKGFILES_CSWtexlive-binaries += /opt/csw/bin/fontinst +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/gbklatex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/gbkpdflatex PKGFILES_CSWtexlive-binaries += /opt/csw/bin/gftodvi PKGFILES_CSWtexlive-binaries += /opt/csw/bin/gftopk PKGFILES_CSWtexlive-binaries += /opt/csw/bin/gftype PKGFILES_CSWtexlive-binaries += /opt/csw/bin/gsftopk +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/hbf2gf +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/inimf +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/initex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/jadetex PKGFILES_CSWtexlive-binaries += /opt/csw/bin/kpseaccess PKGFILES_CSWtexlive-binaries += /opt/csw/bin/kpsepath PKGFILES_CSWtexlive-binaries += /opt/csw/bin/kpsereadlink @@ -434,10 +445,13 @@ PKGFILES_CSWtexlive-binaries += /opt/csw/bin/kpsewhere PKGFILES_CSWtexlive-binaries += /opt/csw/bin/kpsewhich PKGFILES_CSWtexlive-binaries += /opt/csw/bin/kpsexpand +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/lacheck PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mag PKGFILES_CSWtexlive-binaries += /opt/csw/bin/makeindex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/makejvf +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mendex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mf PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mf-nowin -PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mf PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mft PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mkindex PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mkocp @@ -447,43 +461,71 @@ PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mktexmf PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mktexpk PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mktextfm +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mmafm +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mmpfb PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mpost +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mtxrun PKGFILES_CSWtexlive-binaries += /opt/csw/bin/odvicopy PKGFILES_CSWtexlive-binaries += /opt/csw/bin/odvitype PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ofm2opl PKGFILES_CSWtexlive-binaries += /opt/csw/bin/omfonts PKGFILES_CSWtexlive-binaries += /opt/csw/bin/opl2ofm PKGFILES_CSWtexlive-binaries += /opt/csw/bin/otangle +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/otfinfo +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/otftotfm PKGFILES_CSWtexlive-binaries += /opt/csw/bin/otp2ocp PKGFILES_CSWtexlive-binaries += /opt/csw/bin/outocp PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ovf2ovp PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ovp2ovf PKGFILES_CSWtexlive-binaries += /opt/csw/bin/patgen +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pbibtex PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pdfclose PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pdfetex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pdfjadetex PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pdfopen PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pdftex PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pdftosrc +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pdfxmltex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pdvitype PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pfb2pfa PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pk2bm PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pktogf PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pktype PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pltotf PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pooltype +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ppltotf PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ps2frag PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ps2pk PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pslatex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pstopdf +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ptex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ptftopl PKGFILES_CSWtexlive-binaries += /opt/csw/bin/rubibtex PKGFILES_CSWtexlive-binaries += /opt/csw/bin/rumakeindex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/sjisconv +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/sjislatex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/sjispdflatex PKGFILES_CSWtexlive-binaries += /opt/csw/bin/synctex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/t1ascii +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/t1asm +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/t1disasm +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/t1dotlessj +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/t1lint +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/t1mac +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/t1rawafm +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/t1reencode +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/t1testpage +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/t1unmac PKGFILES_CSWtexlive-binaries += /opt/csw/bin/tangle PKGFILES_CSWtexlive-binaries += /opt/csw/bin/teckit_compile PKGFILES_CSWtexlive-binaries += /opt/csw/bin/tex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/texconfig PKGFILES_CSWtexlive-binaries += /opt/csw/bin/texconfig-dialog PKGFILES_CSWtexlive-binaries += /opt/csw/bin/texconfig-sys -PKGFILES_CSWtexlive-binaries += /opt/csw/bin/texconfig +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/texexec PKGFILES_CSWtexlive-binaries += /opt/csw/bin/texhash PKGFILES_CSWtexlive-binaries += /opt/csw/bin/texlinks +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/texmfstart PKGFILES_CSWtexlive-binaries += /opt/csw/bin/tftopl PKGFILES_CSWtexlive-binaries += /opt/csw/bin/tie PKGFILES_CSWtexlive-binaries += /opt/csw/bin/tpic2pdftex @@ -491,16 +533,26 @@ PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ttf2pk PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ttf2tfm PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ttfdump +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ttftotype42 +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/upbibtex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/updmap +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/updmap-setup-kanji PKGFILES_CSWtexlive-binaries += /opt/csw/bin/updmap-sys -PKGFILES_CSWtexlive-binaries += /opt/csw/bin/updmap +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/updvitype +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/uplatex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/uppltotf +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/uptex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/uptftopl PKGFILES_CSWtexlive-binaries += /opt/csw/bin/vftovp PKGFILES_CSWtexlive-binaries += /opt/csw/bin/vlna PKGFILES_CSWtexlive-binaries += /opt/csw/bin/vptovf PKGFILES_CSWtexlive-binaries += /opt/csw/bin/weave +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/wovp2ovf +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/xdvi PKGFILES_CSWtexlive-binaries += /opt/csw/bin/xdvi-xaw -PKGFILES_CSWtexlive-binaries += /opt/csw/bin/xdvi PKGFILES_CSWtexlive-binaries += /opt/csw/bin/xdvipdfmx PKGFILES_CSWtexlive-binaries += /opt/csw/bin/xetex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/xmltex RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWtexlive-common RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibptexenc1 @@ -777,19 +829,41 @@ OBSOLETED_BY_CSWtexlive-extra-utils = CSWtetex PKGFILES_CSWtexlive-extra-utils += $(docdir)/$(CATALOGNAME_CSWtexlive-extra-utils)/.* PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/a2ping +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/cfftot1 +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/ctanify +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/ctanupload +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/de-macro PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/dviasm PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/e2pall PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/findhyph +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/fragmaster +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/installfont-tl PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/latex2man +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/listings-ext.sh +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/match_parens PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/mkjobtexmf +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pdf180 +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pdf270 +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pdf90 +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pdfbook PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pdfcrop +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pdfflip +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pdfjam +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pdfjam-pocketmod +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pdfjam-slides3up +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pdfjam-slides6up +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pdfjoin +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pdfnup +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pdfpun +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pkfix PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pkfix-helper -PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pkfix PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/rpdfcrop +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/rungs PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/texcount PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/texdiff PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/texdirflatten PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/texloganalyser +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/tlmgr PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/bibtex/csf/base/.* PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/bibtex/csf/polish-csf/.* PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/doc/generic/mkjobtexmf/.* @@ -823,10 +897,10 @@ PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf/doc/tpic2pdftex/.* PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf/scripts/a2ping/.* PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf/scripts/tetex/e2pall.pl -ARCHALL_CSWtexlive-extra-utils = 1 RUNTIME_DEP_PKGS_CSWtexlive-extra-utils += CSWpython RUNTIME_DEP_PKGS_CSWtexlive-extra-utils += CSWemacscommon RUNTIME_DEP_PKGS_CSWtexlive-extra-utils += CSWperl +ARCHALL_CSWtexlive-extra-utils = 1 PACKAGES += CSWtexlive-font-utils CATALOGNAME_CSWtexlive-font-utils = texlive_font_utils @@ -835,9 +909,12 @@ PKGFILES_CSWtexlive-font-utils += $(docdir)/$(CATALOGNAME_CSWtexlive-font-utils)/.* PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/afm2afm PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/autoinst +PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/dosepsbin PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/epstopdf +PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/mf2pt1 PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/mkt1font PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/ot2kpx +PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/repstopdf PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/vpl2ovp PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/vpl2vpl PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/doc/fonts/accfonts/.* @@ -1942,6 +2019,8 @@ SPKG_DESC_CSWtexlive-lang-cyrillic += $(DESCRIPTION), lang cyrillic OBSOLETED_BY_CSWtexlive-lang-cyrillic = CSWtetex PKGFILES_CSWtexlive-lang-cyrillic += $(docdir)/$(CATALOGNAME_CSWtexlive-lang-cyrillic)/.* +PKGFILES_CSWtexlive-lang-cyrillic += /opt/csw/bin/cyramstex +PKGFILES_CSWtexlive-lang-cyrillic += /opt/csw/bin/cyrtex PKGFILES_CSWtexlive-lang-cyrillic += /opt/csw/share/texmf-dist/bibtex/bst/gost/.* PKGFILES_CSWtexlive-lang-cyrillic += /opt/csw/share/texmf-dist/doc/bibtex/gost/.* PKGFILES_CSWtexlive-lang-cyrillic += /opt/csw/share/texmf-dist/doc/fonts/cmcyr/.* @@ -2389,7 +2468,10 @@ SPKG_DESC_CSWtexlive-latex-base += $(DESCRIPTION), latex base OBSOLETED_BY_CSWtexlive-latex-base = CSWtetex PKGFILES_CSWtexlive-latex-base += $(docdir)/$(CATALOGNAME_CSWtexlive-latex-base)/.* +PKGFILES_CSWtexlive-latex-base += /opt/csw/bin/arlatex +PKGFILES_CSWtexlive-latex-base += /opt/csw/bin/bundledoc PKGFILES_CSWtexlive-latex-base += /opt/csw/bin/dvilualatex +PKGFILES_CSWtexlive-latex-base += /opt/csw/bin/extconv PKGFILES_CSWtexlive-latex-base += /opt/csw/bin/latex PKGFILES_CSWtexlive-latex-base += /opt/csw/bin/lualatex PKGFILES_CSWtexlive-latex-base += /opt/csw/bin/pdfatfi @@ -3125,9 +3207,33 @@ PKGFILES_CSWtexlive-latex-extra += /opt/csw/share/texmf-dist/tex/latex/zwpagelayout/.* PKGFILES_CSWtexlive-latex-extra += /opt/csw/share/texmf-dist/tex/plain/esint-type1/.* PKGFILES_CSWtexlive-latex-extra += /opt/csw/share/texmf-dist/tex/xmltex/xmlplay/.* -ARCHALL_CSWtexlive-latex-extra = 1 +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/authorindex +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/bg5+latex +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/bg5+pdflatex +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/bg5conv +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/bg5latex +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/bg5pdflatex +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/cef5conv +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/cef5latex +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/cef5pdflatex +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/cefconv +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/ceflatex +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/cefpdflatex +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/cefsconv +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/cefslatex +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/cefspdflatex +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/chktex +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/chkweb +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/deweb +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/exceltex +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/latexdiff +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/latexdiff-vc +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/latexfileversion +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/latexmk +PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/latexrevise RUNTIME_DEP_PKGS_CSWtexlive-latex-extra += CSWtexlive-common RUNTIME_DEP_PKGS_CSWtexlive-latex-extra += CSWperl +ARCHALL_CSWtexlive-latex-extra = 1 PACKAGES += CSWtexlive-latex-extra-doc CATALOGNAME_CSWtexlive-latex-extra-doc = texlive_latex_extra_doc @@ -3800,6 +3906,12 @@ SPKG_DESC_CSWtexlive-luatex += $(DESCRIPTION), luatex OBSOLETED_BY_CSWtexlive-luatex = CSWtetex PKGFILES_CSWtexlive-luatex += $(docdir)/$(CATALOGNAME_CSWtexlive-luatex)/.* +PKGFILES_CSWtexlive-luatex += /opt/csw/bin/checkcites +PKGFILES_CSWtexlive-luatex += /opt/csw/bin/luatex +PKGFILES_CSWtexlive-luatex += /opt/csw/bin/luatools +PKGFILES_CSWtexlive-luatex += /opt/csw/bin/mkluatexfontdb +PKGFILES_CSWtexlive-luatex += /opt/csw/bin/texlua +PKGFILES_CSWtexlive-luatex += /opt/csw/bin/texluac PKGFILES_CSWtexlive-luatex += /opt/csw/share/texmf-dist/doc/lualatex/luainputenc/.* PKGFILES_CSWtexlive-luatex += /opt/csw/share/texmf-dist/doc/luatex/luamplib/.* PKGFILES_CSWtexlive-luatex += /opt/csw/share/texmf-dist/doc/luatex/luaotfload/.* @@ -3901,6 +4013,7 @@ OBSOLETED_BY_CSWtexlive-metapost = CSWtetex PKGFILES_CSWtexlive-metapost += $(docdir)/$(CATALOGNAME_CSWtexlive-metapost)/.* PKGFILES_CSWtexlive-metapost += /opt/csw/bin/mfplain +PKGFILES_CSWtexlive-metapost += /opt/csw/bin/mptopdf PKGFILES_CSWtexlive-metapost += /opt/csw/share/texmf-dist/metafont/mfpic/.* PKGFILES_CSWtexlive-metapost += /opt/csw/share/texmf-dist/metafont/roex/.* PKGFILES_CSWtexlive-metapost += /opt/csw/share/texmf-dist/metapost/.* @@ -3930,6 +4043,10 @@ SPKG_DESC_CSWtexlive-music += $(DESCRIPTION), music OBSOLETED_BY_CSWtexlive-music = CSWtetex PKGFILES_CSWtexlive-music += $(docdir)/$(CATALOGNAME_CSWtexlive-music)/.* +PKGFILES_CSWtexlive-music += /opt/csw/bin/m-tx +PKGFILES_CSWtexlive-music += /opt/csw/bin/musixflx +PKGFILES_CSWtexlive-music += /opt/csw/bin/musixtex +PKGFILES_CSWtexlive-music += /opt/csw/bin/prepmx PKGFILES_CSWtexlive-music += /opt/csw/share/texmf-dist/doc/latex/abc/.* PKGFILES_CSWtexlive-music += /opt/csw/share/texmf-dist/doc/latex/gchords/.* PKGFILES_CSWtexlive-music += /opt/csw/share/texmf-dist/doc/latex/guitar/guitar.tex @@ -4126,6 +4243,7 @@ SPKG_DESC_CSWtexlive-pstricks += $(DESCRIPTION), pstricks OBSOLETED_BY_CSWtexlive-pstricks = CSWtetex PKGFILES_CSWtexlive-pstricks += $(docdir)/$(CATALOGNAME_CSWtexlive-pstricks)/.* +PKGFILES_CSWtexlive-pstricks += /opt/csw/bin/pedigree PKGFILES_CSWtexlive-pstricks += /opt/csw/bin/pst2pdf PKGFILES_CSWtexlive-pstricks += /opt/csw/share/texmf-dist/dvips/pst-3dplot/.* PKGFILES_CSWtexlive-pstricks += /opt/csw/share/texmf-dist/dvips/pst-bar/.* @@ -4172,9 +4290,9 @@ PKGFILES_CSWtexlive-pstricks += /opt/csw/share/texmf-dist/tex/generic/pst-fun/.* PKGFILES_CSWtexlive-pstricks += /opt/csw/share/texmf-dist/tex/generic/pst-func/.* PKGFILES_CSWtexlive-pstricks += /opt/csw/share/texmf-dist/tex/generic/pst-gantt/.* +PKGFILES_CSWtexlive-pstricks += /opt/csw/share/texmf-dist/tex/generic/pst-geo/.* PKGFILES_CSWtexlive-pstricks += /opt/csw/share/texmf-dist/tex/generic/pst-geo/data/.* PKGFILES_CSWtexlive-pstricks += /opt/csw/share/texmf-dist/tex/generic/pst-geo/dataII/.* -PKGFILES_CSWtexlive-pstricks += /opt/csw/share/texmf-dist/tex/generic/pst-geo/.* PKGFILES_CSWtexlive-pstricks += /opt/csw/share/texmf-dist/tex/generic/pst-ghsb/.* PKGFILES_CSWtexlive-pstricks += /opt/csw/share/texmf-dist/tex/generic/pst-gr3d/.* PKGFILES_CSWtexlive-pstricks += /opt/csw/share/texmf-dist/tex/generic/pst-grad/.* @@ -4661,6 +4779,8 @@ PKGFILES_CSWtexlive-xindy += /opt/csw//bin/tex2xindy PKGFILES_CSWtexlive-xindy += /opt/csw//bin/texindy PKGFILES_CSWtexlive-xindy += /opt/csw//bin/xindy +PKGFILES_CSWtexlive-xindy += /opt/csw/bin/tex2xindy +PKGFILES_CSWtexlive-xindy += /opt/csw/bin/xindy PKGFILES_CSWtexlive-xindy += /opt/csw/bin/xindy.mem PKGFILES_CSWtexlive-xindy += /opt/csw/share/man/man1/tex2xindy.1 PKGFILES_CSWtexlive-xindy += /opt/csw/share/man/man1/texindy.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Dec 11 11:11:57 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 11 Dec 2012 10:11:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[19880] csw/mgar/pkg/qt4-gcc/trunk Message-ID: Revision: 19880 http://gar.svn.sourceforge.net/gar/?rev=19880&view=rev Author: cgrzemba Date: 2012-12-11 10:11:57 +0000 (Tue, 11 Dec 2012) Log Message: ----------- qt4-gcc/trunk: adjust versions of dependencies Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/qt4-gcc/trunk/files/0001-shapeinput.patch Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-12-11 09:45:30 UTC (rev 19879) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-12-11 10:11:57 UTC (rev 19880) @@ -19,11 +19,17 @@ LICENSE = README +NOGITPATCH = 1 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +REINPLACE_USRLOCAL += src/gui/kernel/qguiplatformplugin.cpp +REINPLACE_USRLOCAL += src/network/ssl/qsslsocket_openssl_symbols.cpp +REINPLACE_USRLOCAL += src/network/ssl/qsslsocket_openssl.cpp +REINPLACE_USRLOCAL += src/network/ssl/qsslsocket.cpp +REINPLACE_USRLOCAL += src/3rdparty/webkit/Source/WebCore/plugins/PluginDatabase.cpp PATCHFILES += mkspec-csw.patch -# Solaris10 XShape is too old, has no ShapeInput and QTBUG-25281 -PATCHFILES += no-xshape.patch +# bug in 4.8.1, see: https//bugreports.qt-project.org/browse/QTBUG-25281 +PATCHFILES += 0001-shapeinput.patch REINPLACE_USRLOCAL += src/gui/kernel/qguiplatformplugin.cpp REINPLACE_USRLOCAL += src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -38,6 +44,7 @@ CONFIGURE_ARGS += -opensource CONFIGURE_ARGS += -prefix $(prefix) CONFIGURE_ARGS += -no-qt3support +CONFIGURE_ARGS += -no-xshape CONFIGURE_ARGS += -webkit CONFIGURE_ARGS += -v -shared -stl -largefile -sm CONFIGURE_ARGS += -qt-libjpeg -qt-libpng -qt-libmng -qt-zlib @@ -76,10 +83,10 @@ RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibqtcore4-gxx -RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_sparc += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_sparc += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibfreetype6 -# RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += $(RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_$(GARCH)) +RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += $(RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_$(GARCH)) CHECKPKG_OVERRIDES_CSWlibqtgui4-gxx += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtGui.so.4.8.1 PACKAGES += CSWqt4-gxx-dev @@ -127,6 +134,7 @@ # RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibpq5 # RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibodbc2 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_sparc += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_sparc += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += $(RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_$(GARCH)) @@ -164,7 +172,6 @@ RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibqtcore4-gxx -# /usr/share is useless but ok CHECKPKG_OVERRIDES_CSWlibqtnetwork4-gxx += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtNetwork.so.4.8.1 PACKAGES += CSWlibqtopengl4-gxx Added: csw/mgar/pkg/qt4-gcc/trunk/files/0001-shapeinput.patch =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/files/0001-shapeinput.patch (rev 0) +++ csw/mgar/pkg/qt4-gcc/trunk/files/0001-shapeinput.patch 2012-12-11 10:11:57 UTC (rev 19880) @@ -0,0 +1,53 @@ +diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp +index c4d2469..5f77c14 100644 +--- a/src/gui/kernel/qdnd_x11.cpp ++++ b/src/gui/kernel/qdnd_x11.cpp +@@ -1421,7 +1421,7 @@ void QDragManager::cancel(bool deleteSource) + + global_accepted_action = Qt::IgnoreAction; + } +- ++#ifndef QT_NO_SHAPE + static + bool windowInteractsWithPosition(const QPoint & pos, Window w, int shapeType) + { +@@ -1436,6 +1436,7 @@ bool windowInteractsWithPosition(const QPoint & pos, Window w, int shapeType) + } + return interacts; + } ++#endif + + static + Window findRealWindow(const QPoint & pos, Window w, int md) +@@ -1462,6 +1463,8 @@ Window findRealWindow(const QPoint & pos, Window w, int md) + XGetWindowProperty(X11->display, w, ATOM(XdndAware), 0, 0, False, + AnyPropertyType, &type, &f,&n,&a,&data); + if (data) XFree(data); ++ ++#ifdef QT_NO_SHAPE + if (type) { + // When ShapeInput and ShapeBounding are not set they return a single rectangle with the geometry of the window, this is why we + // need an && here so that in the case one is set and the other is not we still get the correct result. +@@ -1469,6 +1472,9 @@ Window findRealWindow(const QPoint & pos, Window w, int md) + if (windowContainsMouse) + return w; + } ++#else ++ return w; ++#endif + } + + Window r, p; +@@ -1488,10 +1494,12 @@ Window findRealWindow(const QPoint & pos, Window w, int md) + // innermost window. + } + ++#ifdef QT_NO_SHAPE + // No children! + if (!windowContainsMouse) + return 0; + else ++#endif + return w; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Dec 11 11:13:45 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 11 Dec 2012 10:13:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[19881] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 19881 http://gar.svn.sourceforge.net/gar/?rev=19881&view=rev Author: cgrzemba Date: 2012-12-11 10:13:44 +0000 (Tue, 11 Dec 2012) Log Message: ----------- qt4-gcc/trunk: minor fix of configure args Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-12-11 10:11:57 UTC (rev 19880) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-12-11 10:13:44 UTC (rev 19881) @@ -50,8 +50,6 @@ CONFIGURE_ARGS += -qt-libjpeg -qt-libpng -qt-libmng -qt-zlib CONFIGURE_ARGS += -I/usr/include -I/usr/X11/include CONFIGURE_ARGS += -I/usr/X11/share/include -# Solaris10 XShape is too old, has no ShapeInput -CONFIGURE_ARGS += -no-xshape CONFIGURE_ARGS_sparc += -big-endian -host-big-endian # CONFIGURE_ARGS_i386 += -little-endian -host-big-endian CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) 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 Dec 12 12:34:27 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 12 Dec 2012 11:34:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[19882] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 19882 http://gar.svn.sourceforge.net/gar/?rev=19882&view=rev Author: wahwah Date: 2012-12-12 11:34:27 +0000 (Wed, 12 Dec 2012) Log Message: ----------- gcc4/trunk: use the default maps Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-11 10:13:44 UTC (rev 19881) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-12 11:34:27 UTC (rev 19882) @@ -493,8 +493,8 @@ # CHECKPKG_OVERRIDES_CSWlibssp0 += binary-architecture-does-not-match-placement # CHECKPKG_OVERRIDES_CSWlibstdc++6 += binary-architecture-does-not-match-placement -# Otherwise it won't run on older Solaris 10 releases. -LINKER_MAP_RELEASE = solaris10u8 +# We're building with the default GAR maps, currently U5. +# LINKER_MAP_RELEASE = solaris10u8 include files/scripts.mk include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Dec 12 13:14:38 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 12 Dec 2012 12:14:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[19883] csw/mgar/pkg/texlive/trunk Message-ID: Revision: 19883 http://gar.svn.sourceforge.net/gar/?rev=19883&view=rev Author: pfelecan Date: 2012-12-12 12:14:38 +0000 (Wed, 12 Dec 2012) Log Message: ----------- texlive/trunk: - fix a buffer overflow in div2tty revealed by check on the build farm where the directory tree is greater than usual - post-install change for scripts using shebang to use the environment for finding their command interpreter Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/texlive/trunk/files/0005-Fix-dvi2tty-buffer-overflow.patch Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-12-12 11:34:27 UTC (rev 19882) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-12-12 12:14:38 UTC (rev 19883) @@ -29,6 +29,7 @@ PATCHFILES += 0002-Fix-ICU-link-edit.patch PATCHFILES += 0003-Adapt-texmf-configuration.patch PATCHFILES += 0004-Activate-formats.patch +PATCHFILES += 0005-Fix-dvi2tty-buffer-overflow.patch PACKAGING_PLATFORMS = solaris10-sparc PACKAGING_PLATFORMS += solaris10-i386 @@ -4856,6 +4857,11 @@ cd $(DESTDIR)/$(bindir) && ln -s -f xetex xelatex cd $(DESTDIR)/$(bindir) && ln -s -f pdftex xmltex cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfxmltex + : replace references to interpreters + : Perl + cd $(DESTDIR)/$(prefix) && gfind . -type f | xargs ggrep -n '^#![[:space:]]*.*/perl[[:space:]]*' /dev/null | ggrep -v '/env ' | ggrep ':1:' | cut -d : -f 1 | xargs -l -i gsed --in-place --regexp-extended --expression 's;^#![[:space:]]*.*/perl[[:space:]]*;#!/usr/bin/env perl ;' {} + : Bourne Shell + cd $(DESTDIR)/$(prefix) && gfind . -type f | xargs ggrep -n '^#![[:space:]]*.*/sh[[:space:]]*' /dev/null | ggrep -v '/env ' | ggrep ':1:' | cut -d : -f 1 | xargs -l -i gsed --in-place --regexp-extended --expression 's;^#![[:space:]]*.*/sh[[:space:]]*;#!/usr/bin/env bash ;' {} $(MAKECOOKIE) # the texlive-common package is bigger than a trivially sized /tmp Added: csw/mgar/pkg/texlive/trunk/files/0005-Fix-dvi2tty-buffer-overflow.patch =================================================================== --- csw/mgar/pkg/texlive/trunk/files/0005-Fix-dvi2tty-buffer-overflow.patch (rev 0) +++ csw/mgar/pkg/texlive/trunk/files/0005-Fix-dvi2tty-buffer-overflow.patch 2012-12-12 12:14:38 UTC (rev 19883) @@ -0,0 +1,34 @@ +From 753507ba4ec5ab64b8e39a2636ae6db5664ad472 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 12 Dec 2012 11:50:43 +0100 +Subject: [PATCH] Fix dvi2tty buffer overflow + +--- + texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.c b/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.c +index a77000c..fd714d1 100644 +--- a/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.c ++++ b/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.c +@@ -31,7 +31,7 @@ + # include "macintosh.h" + #endif + +- ++#include + + /* + * Constant definitons +@@ -109,7 +109,7 @@ const char * path; /* name of the pager to run */ + char * progname; /* our name */ + int Argc; + char ** Argv; +-char DVIfilename[MAXLEN]; ++char DVIfilename[PATH_MAX + 1]; + const char * OUTfilename; + char optch; /* for option handling */ + +-- +1.7.12 + 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 Dec 12 13:32:33 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 12 Dec 2012 12:32:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[19884] csw/mgar/pkg Message-ID: Revision: 19884 http://gar.svn.sourceforge.net/gar/?rev=19884&view=rev Author: dmichelsen Date: 2012-12-12 12:32:33 +0000 (Wed, 12 Dec 2012) Log Message: ----------- mailman: Initial commit Added Paths: ----------- csw/mgar/pkg/mailman/ csw/mgar/pkg/mailman/Makefile csw/mgar/pkg/mailman/branches/ csw/mgar/pkg/mailman/tags/ csw/mgar/pkg/mailman/trunk/ csw/mgar/pkg/mailman/trunk/Makefile csw/mgar/pkg/mailman/trunk/checksums csw/mgar/pkg/mailman/trunk/files/ Added: csw/mgar/pkg/mailman/Makefile =================================================================== --- csw/mgar/pkg/mailman/Makefile (rev 0) +++ csw/mgar/pkg/mailman/Makefile 2012-12-12 12:32:33 UTC (rev 19884) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/mailman/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/mailman/trunk/Makefile =================================================================== --- csw/mgar/pkg/mailman/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mailman/trunk/Makefile 2012-12-12 12:32:33 UTC (rev 19884) @@ -0,0 +1,27 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = mailman +VERSION = 2.1.15 + +DESCRIPTION = Mailman mailing list software + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(DISTNAME).tgz + +PACKAGES += CSWmailman +SPKG_DESC_CSWmailman = Mailman mailing list software +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWmailman += CSWpython +RUNTIME_DEP_PKGS_CSWmailman += CSWperl + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --without-permcheck + +# There is no testsuite +TEST_SCRIPTS = + +PYCOMPILE = 1 + +include gar/category.mk + Property changes on: csw/mgar/pkg/mailman/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/mailman/trunk/checksums =================================================================== --- csw/mgar/pkg/mailman/trunk/checksums (rev 0) +++ csw/mgar/pkg/mailman/trunk/checksums 2012-12-12 12:32:33 UTC (rev 19884) @@ -0,0 +1 @@ +7d207489e8e9de0727cb334d46029833 mailman-2.1.15.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Dec 13 09:14:27 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 13 Dec 2012 08:14:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[19885] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 19885 http://gar.svn.sourceforge.net/gar/?rev=19885&view=rev Author: cgrzemba Date: 2012-12-13 08:14:26 +0000 (Thu, 13 Dec 2012) Log Message: ----------- qt4-gcc/trunk: refine runtime dependencies Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-12-12 12:32:33 UTC (rev 19884) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-12-13 08:14:26 UTC (rev 19885) @@ -48,6 +48,8 @@ CONFIGURE_ARGS += -webkit CONFIGURE_ARGS += -v -shared -stl -largefile -sm CONFIGURE_ARGS += -qt-libjpeg -qt-libpng -qt-libmng -qt-zlib +# compile error: error: 'QGtkStyle' has not been declared ??? since 10.12.2012 +CONFIGURE_ARGS += -no-gtkstyle CONFIGURE_ARGS += -I/usr/include -I/usr/X11/include CONFIGURE_ARGS += -I/usr/X11/share/include CONFIGURE_ARGS_sparc += -big-endian -host-big-endian @@ -127,10 +129,10 @@ # RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWgstplugins RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgcc-s1 -# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibsybdb5 +RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibsybdb5 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWsqlite -# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibpq5 -# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibodbc2 +RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibodbc2 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibtiff3 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_sparc += CSWlibfontconfig1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Thu Dec 13 14:38:39 2012 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Thu, 13 Dec 2012 13:38:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[19886] csw/mgar/pkg/cpan/LWP-Protocol-https/trunk/Makefile Message-ID: Revision: 19886 http://gar.svn.sourceforge.net/gar/?rev=19886&view=rev Author: guillomovitch Date: 2012-12-13 13:38:38 +0000 (Thu, 13 Dec 2012) Log Message: ----------- cpan/LWP-Protocol-https/trunk: arch-independant package Modified Paths: -------------- csw/mgar/pkg/cpan/LWP-Protocol-https/trunk/Makefile Modified: csw/mgar/pkg/cpan/LWP-Protocol-https/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/LWP-Protocol-https/trunk/Makefile 2012-12-13 08:14:26 UTC (rev 19885) +++ csw/mgar/pkg/cpan/LWP-Protocol-https/trunk/Makefile 2012-12-13 13:38:38 UTC (rev 19886) @@ -15,7 +15,7 @@ LICENSE_TEXT = This module is licensed under the perl license PACKAGES = CSWpm-lwp-protocol-https -CATALOGNAME = pm_lwp_protocol_https +ARCHALL = 1 RUNTIME_DEP_PKGS += CSWpm-io-socket-ssl RUNTIME_DEP_PKGS += CSWpm-libwww-perl RUNTIME_DEP_PKGS += CSWpm-net-http This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Dec 13 15:36:11 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 13 Dec 2012 14:36:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[19887] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 19887 http://gar.svn.sourceforge.net/gar/?rev=19887&view=rev Author: pfelecan Date: 2012-12-13 14:36:11 +0000 (Thu, 13 Dec 2012) Log Message: ----------- texlive/trunk: refinement for runtime dependencies and transform 2 packages to architecture dependent type Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-12-13 13:38:38 UTC (rev 19886) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-12-13 14:36:11 UTC (rev 19887) @@ -87,8 +87,6 @@ CONFIGURE_ARGS += --with-x CONFIGURE_ARGS += --with-xdvi-x-toolkit=xaw -RUNTIME_DEP_PKGS += CSWps2eps - EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf/doc/info/dir # these are provided by CSWasymptote EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf/asymptote/* @@ -143,6 +141,11 @@ SPKG_DESC_CSWtexlive-common += $(DESCRIPTION), common OBSOLETED_BY_CSWtexlive-common = CSWtetex ARCHALL_CSWtexlive-common = 1 +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWpython +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWemacscommon +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWruby +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWtexlive-binaries +RUNTIME_DEP_PKGS_CSWtexlive-common += CSWperl PACKAGES += CSWtexlive-dev CATALOGNAME_CSWtexlive-dev += texlive_dev @@ -269,6 +272,7 @@ RUNTIME_DEP_PKGS_CSWtexlive-base += CSWpython RUNTIME_DEP_PKGS_CSWtexlive-base += CSWtexlive-common RUNTIME_DEP_PKGS_CSWtexlive-base += CSWperl +RUNTIME_DEP_PKGS_CSWtexlive-base += CSWtexlive-luatex PACKAGES += CSWtexlive-bibtex-extra CATALOGNAME_CSWtexlive-bibtex-extra = texlive_bibtex_extra @@ -370,6 +374,7 @@ PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/splitbib/.* PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/plain/harvmac/.* ARCHALL_CSWtexlive-bibtex-extra = 1 +RUNTIME_DEP_PKGS_CSWtexlive-bibtex-extra += CSWtexlive-common PACKAGES += CSWtexlive-binaries CATALOGNAME_CSWtexlive-binaries = texlive_binaries @@ -555,7 +560,9 @@ PKGFILES_CSWtexlive-binaries += /opt/csw/bin/xetex PKGFILES_CSWtexlive-binaries += /opt/csw/bin/xmltex RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWgs RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWtexlive-common +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibgd2 RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibptexenc1 RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibt1-5 RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibz1 @@ -901,7 +908,9 @@ RUNTIME_DEP_PKGS_CSWtexlive-extra-utils += CSWpython RUNTIME_DEP_PKGS_CSWtexlive-extra-utils += CSWemacscommon RUNTIME_DEP_PKGS_CSWtexlive-extra-utils += CSWperl -ARCHALL_CSWtexlive-extra-utils = 1 +RUNTIME_DEP_PKGS_CSWtexlive-extra-utils += CSWtexlive-common +RUNTIME_DEP_PKGS_CSWtexlive-extra-utils += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWtexlive-extra-utils += CSWlibstdc++6 PACKAGES += CSWtexlive-font-utils CATALOGNAME_CSWtexlive-font-utils = texlive_font_utils @@ -945,6 +954,8 @@ PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf/tex/fontinst/afm2pl/.* PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf/ttf2pk/.* ARCHALL_CSWtexlive-font-utils = 1 +RUNTIME_DEP_PKGS_CSWtexlive-font-utils += CSWtexlive-common +RUNTIME_DEP_PKGS_CSWtexlive-font-utils += CSWperl PACKAGES += CSWtexlive-fonts-extra CATALOGNAME_CSWtexlive-fonts-extra = texlive_fonts_extra @@ -2066,6 +2077,8 @@ PKGFILES_CSWtexlive-lang-cyrillic += /opt/csw/share/texmf-dist/tex/plain/cyrplain/.* PKGFILES_CSWtexlive-lang-cyrillic += /opt/csw/share/texmf-dist/tex/plain/lh/.* ARCHALL_CSWtexlive-lang-cyrillic = 1 +RUNTIME_DEP_PKGS_CSWtexlive-lang-cyrillic += CSWtexlive-binaries +RUNTIME_DEP_PKGS_CSWtexlive-lang-cyrillic += CSWperl PACKAGES += CSWtexlive-lang-czechslovak CATALOGNAME_CSWtexlive-lang-czechslovak = texlive_lang_czechslovak @@ -2235,6 +2248,7 @@ PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf/tex/generic/hyphen/grmhyph5.tex PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf/tex/generic/hyphen/grphyph5.tex PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf/tex/generic/hyphen/ibyhyph.tex +RUNTIME_DEP_PKGS_CSWtexlive-lang-greek += CSWperl ARCHALL_CSWtexlive-lang-greek = 1 PACKAGES += CSWtexlive-lang-hebrew @@ -2327,6 +2341,7 @@ PKGFILES_CSWtexlive-lang-mongolian += /opt/csw/share/texmf-dist/fonts/type1/public/montex/.* PKGFILES_CSWtexlive-lang-mongolian += /opt/csw/share/texmf-dist/tex/latex/mongolian-babel/.* PKGFILES_CSWtexlive-lang-mongolian += /opt/csw/share/texmf-dist/tex/latex/montex/.* +RUNTIME_DEP_PKGS_CSWtexlive-lang-mongolian += CSWperl ARCHALL_CSWtexlive-lang-mongolian = 1 PACKAGES += CSWtexlive-lang-polish @@ -2520,6 +2535,7 @@ RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWtexlive-common RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWtexlive-binaries RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWperl +RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWtexlive-luatex PACKAGES += CSWtexlive-latex-base-doc CATALOGNAME_CSWtexlive-latex-base-doc = texlive_latex_base_doc @@ -3791,11 +3807,11 @@ PKGFILES_CSWtexlive-latex-extra-doc += /opt/csw/share/texmf-dist/doc/latex/zwpagelayout/.* PKGFILES_CSWtexlive-latex-extra-doc += /opt/csw/share/texmf-dist/doc/metapost/makecirc/.* PKGFILES_CSWtexlive-latex-extra-doc += /opt/csw/share/texmf-dist/doc/otherformats/xmltex/xmlplay/.* -ARCHALL_CSWtexlive-latex-extra-doc = 1 RUNTIME_DEP_PKGS_CSWtexlive-latex-extra-doc += CSWemacscommon -RUNTIME_DEP_PKGS_CSWtexlive-fonts-extra-doc += CSWpython -RUNTIME_DEP_PKGS_CSWtexlive-fonts-extra-doc += CSWperl +RUNTIME_DEP_PKGS_CSWtexlive-latex-extra-doc += CSWpython +RUNTIME_DEP_PKGS_CSWtexlive-latex-extra-doc += CSWperl RUNTIME_DEP_PKGS_CSWtexlive-latex-extra-doc += CSWruby +ARCHALL_CSWtexlive-latex-extra-doc = 1 PACKAGES += CSWtexlive-latex-recommended CATALOGNAME_CSWtexlive-latex-recommended = texlive_latex_recommended @@ -3851,9 +3867,6 @@ PKGFILES_CSWtexlive-latex-recommended += /opt/csw/share/texmf-dist/tex/plain/fp/.* ARCHALL_CSWtexlive-latex-recommended = 1 RUNTIME_DEP_PKGS_CSWtexlive-latex-recommended += CSWperl -RUNTIME_DEP_PKGS_CSWtexlive-xetex += CSWpython -RUNTIME_DEP_PKGS_CSWtexlive-xetex += CSWtexlive-binaries -RUNTIME_DEP_PKGS_CSWtexlive-xetex += CSWperl PACKAGES += CSWtexlive-latex-recommended-doc CATALOGNAME_CSWtexlive-latex-recommended-doc = texlive_latex_recommended_doc @@ -3919,7 +3932,12 @@ PKGFILES_CSWtexlive-luatex += /opt/csw/share/texmf-dist/tex/lualatex/luainputenc/.* PKGFILES_CSWtexlive-luatex += /opt/csw/share/texmf-dist/tex/luatex/luamplib/.* PKGFILES_CSWtexlive-luatex += /opt/csw/share/texmf-dist/tex/luatex/luaotfload/.* -ARCHALL_CSWtexlive-luatex = 1 +RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWtexlive-common +RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibz1 +RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibkpathsea6 +RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibgcc-s1 PACKAGES += CSWtexlive-math-extra CATALOGNAME_CSWtexlive-math-extra = texlive_math_extra @@ -4025,6 +4043,7 @@ PKGFILES_CSWtexlive-metapost += /opt/csw/share/texmf-dist/tex/latex/textpath/.* ARCHALL_CSWtexlive-metapost = 1 RUNTIME_DEP_PKGS_CSWtexlive-metapost += CSWtexlive-binaries +RUNTIME_DEP_PKGS_CSWtexlive-metapost += CSWtexlive-common PACKAGES += CSWtexlive-metapost-doc CATALOGNAME_CSWtexlive-metapost-doc = texlive_metapost_doc @@ -4065,6 +4084,7 @@ PKGFILES_CSWtexlive-music += /opt/csw/share/texmf-dist/tex/latex/harmony/.* PKGFILES_CSWtexlive-music += /opt/csw/share/texmf-dist/tex/latex/songbook/.* ARCHALL_CSWtexlive-music = 1 +RUNTIME_DEP_PKGS_CSWtexlive-music += CSWtexlive-common PACKAGES += CSWtexlive-omega CATALOGNAME_CSWtexlive-omega = texlive_omega @@ -4155,7 +4175,8 @@ PKGFILES_CSWtexlive-pictures += /opt/csw/share/texmf-dist/tex/latex/tufte-latex/.* PKGFILES_CSWtexlive-pictures += /opt/csw/share/texmf-dist/tex/plain/pgfplots/.* ARCHALL_CSWtexlive-pictures = 1 - RUNTIME_DEP_PKGS_CSWtexlive-pictures += CSWruby +RUNTIME_DEP_PKGS_CSWtexlive-pictures += CSWruby +RUNTIME_DEP_PKGS_CSWtexlive-pictures += CSWpython PACKAGES += CSWtexlive-pictures-doc CATALOGNAME_CSWtexlive-pictures-doc = texlive_pictures_doc @@ -4772,6 +4793,9 @@ PKGFILES_CSWtexlive-xetex += /opt/csw/share/texmf-dist/tex/xelatex/.* PKGFILES_CSWtexlive-xetex += /opt/csw/share/texmf-dist/tex/xetex/.* ARCHALL_CSWtexlive-xetex = 1 +RUNTIME_DEP_PKGS_CSWtexlive-xetex += CSWpython +RUNTIME_DEP_PKGS_CSWtexlive-xetex += CSWtexlive-binaries +RUNTIME_DEP_PKGS_CSWtexlive-xetex += CSWperl PACKAGES += CSWtexlive-xindy CATALOGNAME_CSWtexlive-xindy = texlive_xindy @@ -4792,6 +4816,7 @@ PKGFILES_CSWtexlive-xindy += /opt/csw/share/texmf/xindy/.* RUNTIME_DEP_PKGS_CSWtexlive-xindy += CSWperl RUNTIME_DEP_PKGS_CSWtexlive-xindy += CSWclisp +RUNTIME_DEP_PKGS_CSWtexlive-xindy += CSWtexlive-common ARCHALL_CSWtexlive-xindy = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Dec 14 14:18:47 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 14 Dec 2012 13:18:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[19888] csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b Message-ID: Revision: 19888 http://gar.svn.sourceforge.net/gar/?rev=19888&view=rev Author: claudio_sf Date: 2012-12-14 13:18:46 +0000 (Fri, 14 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: Fist 64-bit pass w/o 5.10 interference Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b 2012-12-13 14:36:11 UTC (rev 19887) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b 2012-12-14 13:18:46 UTC (rev 19888) @@ -21,24 +21,23 @@ # Make extra Solaris 10 package with DTrace support #PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 #PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PACKAGING_PLATFORMS += solaris10-sparc -BUILD64_ONLY = 1 +PACKAGING_PLATFORMS += solaris10-sparc +BUILD64_ONLY = 1 PACKAGES += CSWperl SPKG_DESC_CSWperl = $(DESCRIPTION) #RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 -RUNTIME_DEP_PKGS_CSWperl = INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags -PACKAGES += CSWperldoc -SPKG_DESC_CSWperldoc = Perl documentation -RUNTIME_DEP_PKGS_CSWperldoc = CSWperl -ARCHALL_CSWperldoc = 1 +#PACKAGES += CSWperldoc +#SPKG_DESC_CSWperldoc = Perl documentation +#RUNTIME_DEP_PKGS_CSWperldoc = CSWperl +#ARCHALL_CSWperldoc = 1 LICENSE = Copying -CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl +#CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content +#CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content +#CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl # Core module updates # Not used at the moment, leave one as example @@ -46,7 +45,7 @@ #CORE_UPDATES += PathTools-3.30 #CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd -DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) +#DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) # GCC build (Sunstudio is problematic) # claudio GARCOMPILER = GCC4 @@ -62,66 +61,73 @@ # TBD: Reinsert libperl.so, see below. #PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc #PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt -PERL_LIBS-64 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt +#PERL_LIBS-64 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt #PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) +#PERL_LIBS = -lsocket -lgdbm -ldl -lm -lpthread -lc -lcrypt #BUILD64 = 1 # Configuration flags -CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) +#CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) CONFIGURE_ARGS += -Dcc=$(CC) -CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" -CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" +#CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" +#CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) -CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" -CONFIGURE_ARGS += -Dld=$(CC) -CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" -CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) -CONFIGURE_ARGS += -Dlocincpth=$(includedir) -CONFIGURE_ARGS += -Dloclibpth=$(libdir) +#CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" +#CONFIGURE_ARGS += -Dld=$(CC) +#CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" +#CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) +#CONFIGURE_ARGS += -Dlocincpth=$(includedir) +#CONFIGURE_ARGS += -Dloclibpth=$(libdir) CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 CONFIGURE_ARGS += -Dman1ext=1 CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 CONFIGURE_ARGS += -Dman3ext=3perl -CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" +#CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" CONFIGURE_ARGS += -Dperladmin="root at localhost" CONFIGURE_ARGS += -Dprefix=$(prefix) CONFIGURE_ARGS += -Dbin=$(bindir) CONFIGURE_ARGS += -Dscriptdir=$(bindir) -CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) -CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl -CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl -CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dsiteprefix=/usr +#CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) +#CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl +#CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl +#CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 +#CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 +#CONFIGURE_ARGS += -Dsiteprefix=/usr CONFIGURE_ARGS += -Duseshrplib -CONFIGURE_ARGS += -Dusesitecustomize +#CONFIGURE_ARGS += -Dusesitecustomize CONFIGURE_ARGS += -Dusethreads +CONFIGURE_ARGS += -Dusedtrace +CONFIGURE_ARGS += -Duse64bitall +CONFIGURE_ARGS += -Duse64bitint +CONFIGURE_ARGS += -Dinc_version_list=none # When built on Solaris 10, enable DTrace support -CONFIGURE_ARGS-5.10 = -Dusedtrace -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) +#CONFIGURE_ARGS-5.10 = -Dusedtrace +#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) # Largefiles is on by default for 64 bit #CONFIGURE_ARGS-32 += -Duselargefiles -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) - +#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) #CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw -CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw -CONFIGURE_ARGS += -Dvendorprefix=$(prefix) -CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" -CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" -CONFIGURE_ARGS += -Dsed=$(bindir)/gsed +#CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw +#CONFIGURE_ARGS += -Dvendorprefix=$(prefix) +#CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" +#CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" +#CONFIGURE_ARGS += -Dlibsdirs=/usr/lib/64 +CONFIGURE_ARGS += -Dsed=/opt/csw/bin/gsed -EXTRA_LIB += $(prefix)/bdb48/lib -EXTRA_INC += $(prefix)/bdb48/include +#EXTRA_LIB += $(prefix)/bdb48/lib +#EXTRA_INC += $(prefix)/bdb48/include +#LD_LIBRARY_PATH for testing +#LD_LIBRARY_PATH += $(prefix)/bdb48/lib/$(MEMORYMODEL) # Somehow the CPPFLAGS do not make it into the compile environment. # Add them explicitly here, otherwise specifically the bdb48/include will # not make it resulting in db.h not to be found and DB_File.pm not to be built # as reported here: # https://www.opencsw.org/mantis/view.php?id=4544 -EXTRA_CFLAGS = $(CPPFLAGS) +#EXTRA_CFLAGS = $(CPPFLAGS) # Adding -lperl requires that libperl.so is available during compilation, which is not # the case on bootstrapping. However, we require explicit libperl linkage or programs @@ -130,32 +136,32 @@ #EXTRA_LDFLAGS-32 = -L$(libdir) -lperl #EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib #EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib -EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib/64 -R/opt/csw/bdb48/lib/64 -R/opt/csw/lib/64 +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) +EXTRA_LDFLAGS = -lperl # We want 64 bit binaries #MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) -EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod -PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* +#EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod +#PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* # The diagnostics.pm module needs the podfile to output its messages. # That means it must be included in the main package, not the docs. -EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod -EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod +#EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod +#EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod # Tests take a long time, run once for every release -TEST_SCRIPTS = - BUILD_SCRIPTS = perl TEST_SCRIPTS = perl # Make sure we don't include the path to the newly built perl as the # library is not in place yet. -IGNORE_DESTDIR = 1 +#IGNORE_DESTDIR = 1 # Do not exclude static libs as at least DynaLoader.a is needed for XS compilation -MERGE_EXCLUDE_STATICLIBS = +#MERGE_EXCLUDE_STATICLIBS = # This is for the communication with checkpkg. These pathes are searched for modules # when resolving dependencies. @@ -171,19 +177,19 @@ # This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and # the one in $WORKSRC has not been built yet # TBD: Investigate -post-extract-modulated: - mkdir -p $(WORKSRC) - #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so - @$(MAKECOOKIE) +#post-extract-modulated: +# mkdir -p $(WORKSRC) +# #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so +# @$(MAKECOOKIE) -ifneq ($(CORE_UPDATES),) -POST_TARGETS = install-core-updates -include files/updatecore.mk -endif +#ifneq ($(CORE_UPDATES),) +#POST_TARGETS = install-core-updates +#include files/updatecore.mk +#endif # How to configure Perl #configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS -configure-perl: ARGS-64 = -dusedtrace +#configure-perl: ARGS-64 = -dusedtrace -Duse64bitall configure-perl: (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) #cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be @@ -194,13 +200,14 @@ build-perl: @echo " ==> Running make in $*" @#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) - cd $(WORKSRC) && $(BUILD_ENV) gmake + cd $(WORKSRC) && $(BUILD_ENV) dmake @$(MAKECOOKIE) test-perl: @echo " ==> Running make $(TEST_TARGET) in $*" @#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) - cd $(WORKSRC) && gmake check + #cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && LD_LIBRARY_PATH_64=`pwd`:$(prefix)/bdb48/lib/$(MEMORYMODEL) gmake test && mv .mgar-git .git + cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && gmake test && mv .mgar-git .git @$(MAKECOOKIE) # Make links to libperl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Dec 14 16:59:10 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 14 Dec 2012 15:59:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[19889] csw/mgar/pkg/perl/trunk Message-ID: Revision: 19889 http://gar.svn.sourceforge.net/gar/?rev=19889&view=rev Author: claudio_sf Date: 2012-12-14 15:59:10 +0000 (Fri, 14 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: bump to latest release (5.16.2) Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile csw/mgar/pkg/perl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b Removed Paths: ------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2 Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2012-12-14 13:18:46 UTC (rev 19888) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-12-14 15:59:10 UTC (rev 19889) @@ -1 +1 @@ -link Makefile_5.16.1_64b \ No newline at end of file +link Makefile_5.16.2_64b \ No newline at end of file Deleted: csw/mgar/pkg/perl/trunk/Makefile_5.16.2 =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2 2012-12-14 13:18:46 UTC (rev 19888) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2 2012-12-14 15:59:10 UTC (rev 19889) @@ -1,249 +0,0 @@ -NAME = perl -VERSION = 5.16.2 -#CATEGORIES = lang -GARTYPE = v2 - -DESCRIPTION = A high-level, general-purpose programming language -define BLURB - Perl is a high-level, general-purpose programming language that makes easy - things easy and hard things possible. It is optimized for scanning arbitrary - text files and system administration. It has built-in extended regular - expression matching and replacement, a dataflow mechanism to improve security - with setuid scripts and is extendable via modules that can interface to C - libraries. -endef - -#MASTER_SITES = http://www.cpan.org/src/ -#SPKG_SOURCEURL = http://www.cpan.org/src -MASTER_SITES = manual:// -DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz - -# Make extra Solaris 10 package with DTrace support -#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PACKAGING_PLATFORMS += solaris10-sparc - -PACKAGES += CSWperl -SPKG_DESC_CSWperl = $(DESCRIPTION) -#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 -RUNTIME_DEP_PKGS_CSWperl = -INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags - -PACKAGES += CSWperldoc -SPKG_DESC_CSWperldoc = Perl documentation -RUNTIME_DEP_PKGS_CSWperldoc = CSWperl -ARCHALL_CSWperldoc = 1 - -LICENSE = Copying - -CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl - -# Core module updates -# Not used at the moment, leave one as example -#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ -#CORE_UPDATES += PathTools-3.30 -#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd - -DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) - -# GCC build (Sunstudio is problematic) # claudio -GARCOMPILER = GCC4 - - -# Custom configure -CONFIGURE_SCRIPTS = perl - -# Compatable with all prior patch revs -INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 - -# Force use of db-4.8 -# TBD: Reinsert libperl.so, see below. -#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt -PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt -PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) - -#BUILD64 = 1 - -# Configuration flags -CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) -CONFIGURE_ARGS += -Dcc=$(CC) -CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" -CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" -CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) -CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" -CONFIGURE_ARGS += -Dld=$(CC) -CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" -CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) -CONFIGURE_ARGS += -Dlocincpth=$(includedir) -CONFIGURE_ARGS += -Dloclibpth=$(libdir) -CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dman1ext=1 -CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dman3ext=3perl -CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" -CONFIGURE_ARGS += -Dperladmin="root at localhost" -CONFIGURE_ARGS += -Dprefix=$(prefix) -CONFIGURE_ARGS += -Dbin=$(bindir) -CONFIGURE_ARGS += -Dscriptdir=$(bindir) -CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) -CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl -CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl -CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dsiteprefix=/usr -CONFIGURE_ARGS += -Duseshrplib -CONFIGURE_ARGS += -Dusesitecustomize -CONFIGURE_ARGS += -Dusethreads - -# When built on Solaris 10, enable DTrace support -CONFIGURE_ARGS-5.10 = -Dusedtrace -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) - -# Largefiles is on by default for 64 bit -CONFIGURE_ARGS-32 += -Duselargefiles -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) - -#CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw -CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw -CONFIGURE_ARGS += -Dvendorprefix=$(prefix) -CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" -CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" -CONFIGURE_ARGS += -Dsed=$(bindir)/gsed - -EXTRA_LIB += $(prefix)/bdb48/lib -EXTRA_INC += $(prefix)/bdb48/include - -# Somehow the CPPFLAGS do not make it into the compile environment. -# Add them explicitly here, otherwise specifically the bdb48/include will -# not make it resulting in db.h not to be found and DB_File.pm not to be built -# as reported here: -# https://www.opencsw.org/mantis/view.php?id=4544 -EXTRA_CFLAGS = $(CPPFLAGS) - -# Adding -lperl requires that libperl.so is available during compilation, which is not -# the case on bootstrapping. However, we require explicit libperl linkage or programs -# embedding perl will have problems with duplicated static variables. -# XXX Investigate further after 64 bit has built -#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl -EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib -EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib - -# We want 64 bit binaries -#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) - -EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod -PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* - -# The diagnostics.pm module needs the podfile to output its messages. -# That means it must be included in the main package, not the docs. -EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod -EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod - -# Tests take a long time, run once for every release -TEST_SCRIPTS = - -BUILD_SCRIPTS = perl - -TEST_SCRIPTS = perl - -# Make sure we don't include the path to the newly built perl as the -# library is not in place yet. -IGNORE_DESTDIR = 1 - -# Do not exclude static libs as at least DynaLoader.a is needed for XS compilation -MERGE_EXCLUDE_STATICLIBS = - -# This is for the communication with checkpkg. These pathes are searched for modules -# when resolving dependencies. -PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") - -# Splitting of a separate libperl.so requires more work and careful planning. -# Override for now. -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 - -include gar/category.mk - -# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and -# the one in $WORKSRC has not been built yet -# TBD: Investigate -post-extract-modulated: - mkdir -p $(WORKSRC) - #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so - @$(MAKECOOKIE) - -ifneq ($(CORE_UPDATES),) -POST_TARGETS = install-core-updates -include files/updatecore.mk -endif - -# How to configure Perl -#configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS -configure-perl: ARGS-64 = -dusedtrace -configure-perl: - (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) - #cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be - @# 64 bit: -Duse64bitall - @$(MAKECOOKIE) - -build-perl: BUILD_EXPORTS = LD_OPTIONS -build-perl: - @echo " ==> Running make in $*" - @#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) - cd $(WORKSRC) && $(BUILD_ENV) gmake - @$(MAKECOOKIE) - -test-perl: - @echo " ==> Running make $(TEST_TARGET) in $*" - @#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) - cd $(WORKSRC) && gmake check - @$(MAKECOOKIE) - -# Make links to libperl -#POST_TARGETS += libperl -#LIB_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) -#LIB_PATH = $(libdir)/perl/$(VERSION)/CORE -#libperl: -# @( cd $(DESTDIR)$(libdir) ; \ -# mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ -# $(DESTDIR)$(libdir) ; \ -# chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ -# ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) -# #; \ -# #ln -s libperl.so.$(VERSION) libperl.so ) -# @$(MAKECOOKIE) - -# Remove build paths from Config -#POST_TARGETS += perlconf -#perlconf: -# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ -# /bin/perl -i -lne "\ -# next if /config_arg[1-9]/; \ -# s/^config_args=.+$$/config_args=''/; \ -# s/^config_argc=.+$$/config_argc='0'/; \ -# s,-I$(DESTDIR)$(includedir),,g; \ -# s,-[LR]$(DESTDIR)$(libdir),,g; \ -# s,( -I$(includedir))+,\$$1,g; \ -# s,( -[LR]$(libdir))+,\$$1,g; \ -# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ -# s, (-L)?$(CC_HOME)\S+,,g; \ -# if (/^\w+=/) { \ -# s/\s{2,}(\-)/ \-/g; \ -# s/(^\w+=.) /\$$1/; \ -# s/ (.)$$/\$$1/g; \ -# } \ -# print \ -# " Config.pm Config_heavy.pl ) -# @$(MAKECOOKIE) - -#POST_TARGETS += CSWperl.cswperlincpath -#CSWperl.cswperlincpath: -# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath - -# Invoke post-install targets -#post-install-modulated: $(POST_TARGETS) -# @$(MAKECOOKIE) Added: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b (rev 0) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b 2012-12-14 15:59:10 UTC (rev 19889) @@ -0,0 +1,256 @@ +NAME = perl +VERSION = 5.16.2 +#CATEGORIES = lang +GARTYPE = v2 + +DESCRIPTION = A high-level, general-purpose programming language +define BLURB + Perl is a high-level, general-purpose programming language that makes easy + things easy and hard things possible. It is optimized for scanning arbitrary + text files and system administration. It has built-in extended regular + expression matching and replacement, a dataflow mechanism to improve security + with setuid scripts and is extendable via modules that can interface to C + libraries. +endef + +#MASTER_SITES = http://www.cpan.org/src/ +#SPKG_SOURCEURL = http://www.cpan.org/src +MASTER_SITES = manual:// +DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz + +# Make extra Solaris 10 package with DTrace support +#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS += solaris10-sparc +BUILD64_ONLY = 1 +PACKAGES += CSWperl +SPKG_DESC_CSWperl = $(DESCRIPTION) +#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 +INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags + +#PACKAGES += CSWperldoc +#SPKG_DESC_CSWperldoc = Perl documentation +#RUNTIME_DEP_PKGS_CSWperldoc = CSWperl +#ARCHALL_CSWperldoc = 1 + +LICENSE = Copying + +#CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content +#CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content +#CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl + +# Core module updates +# Not used at the moment, leave one as example +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ +#CORE_UPDATES += PathTools-3.30 +#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd + +#DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) + +# GCC build (Sunstudio is problematic) # claudio +GARCOMPILER = GCC4 + + +# Custom configure +CONFIGURE_SCRIPTS = perl + +# Compatable with all prior patch revs +INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 + +# Force use of db-4.8 +# TBD: Reinsert libperl.so, see below. +#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc +#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt +#PERL_LIBS-64 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt +#PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) +#PERL_LIBS = -lsocket -lgdbm -ldl -lm -lpthread -lc -lcrypt + +#BUILD64 = 1 + +# Configuration flags +#CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) +CONFIGURE_ARGS += -Dcc=$(CC) +#CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" +#CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" +CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) +#CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" +#CONFIGURE_ARGS += -Dld=$(CC) +#CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" +#CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) +#CONFIGURE_ARGS += -Dlocincpth=$(includedir) +#CONFIGURE_ARGS += -Dloclibpth=$(libdir) +CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 +CONFIGURE_ARGS += -Dman1ext=1 +CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 +CONFIGURE_ARGS += -Dman3ext=3perl +#CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" +CONFIGURE_ARGS += -Dperladmin="root at localhost" +CONFIGURE_ARGS += -Dprefix=$(prefix) +CONFIGURE_ARGS += -Dbin=$(bindir) +CONFIGURE_ARGS += -Dscriptdir=$(bindir) +#CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) +#CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl +#CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl +#CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 +#CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 +#CONFIGURE_ARGS += -Dsiteprefix=/usr +CONFIGURE_ARGS += -Duseshrplib +#CONFIGURE_ARGS += -Dusesitecustomize +CONFIGURE_ARGS += -Dusethreads +CONFIGURE_ARGS += -Dusedtrace +CONFIGURE_ARGS += -Duse64bitall +CONFIGURE_ARGS += -Duse64bitint +CONFIGURE_ARGS += -Dinc_version_list=none + +# When built on Solaris 10, enable DTrace support +#CONFIGURE_ARGS-5.10 = -Dusedtrace +#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) + +# Largefiles is on by default for 64 bit +#CONFIGURE_ARGS-32 += -Duselargefiles +#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) +#CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw +#CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw +#CONFIGURE_ARGS += -Dvendorprefix=$(prefix) +#CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" +#CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" +#CONFIGURE_ARGS += -Dlibsdirs=/usr/lib/64 +CONFIGURE_ARGS += -Dsed=/opt/csw/bin/gsed + +#EXTRA_LIB += $(prefix)/bdb48/lib +#EXTRA_INC += $(prefix)/bdb48/include +#LD_LIBRARY_PATH for testing +#LD_LIBRARY_PATH += $(prefix)/bdb48/lib/$(MEMORYMODEL) + +# Somehow the CPPFLAGS do not make it into the compile environment. +# Add them explicitly here, otherwise specifically the bdb48/include will +# not make it resulting in db.h not to be found and DB_File.pm not to be built +# as reported here: +# https://www.opencsw.org/mantis/view.php?id=4544 +#EXTRA_CFLAGS = $(CPPFLAGS) + +# Adding -lperl requires that libperl.so is available during compilation, which is not +# the case on bootstrapping. However, we require explicit libperl linkage or programs +# embedding perl will have problems with duplicated static variables. +# XXX Investigate further after 64 bit has built +#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl +#EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib/64 -R/opt/csw/bdb48/lib/64 -R/opt/csw/lib/64 +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) +EXTRA_LDFLAGS = -lperl + +# We want 64 bit binaries +#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) + +#EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod +#PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* + +# The diagnostics.pm module needs the podfile to output its messages. +# That means it must be included in the main package, not the docs. +#EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod +#EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod + +# Tests take a long time, run once for every release +BUILD_SCRIPTS = perl + +TEST_SCRIPTS = perl + +# Make sure we don't include the path to the newly built perl as the +# library is not in place yet. +#IGNORE_DESTDIR = 1 + +# Do not exclude static libs as at least DynaLoader.a is needed for XS compilation +#MERGE_EXCLUDE_STATICLIBS = + +# This is for the communication with checkpkg. These pathes are searched for modules +# when resolving dependencies. +PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") + +# Splitting of a separate libperl.so requires more work and careful planning. +# Override for now. +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 + +include gar/category.mk + +# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and +# the one in $WORKSRC has not been built yet +# TBD: Investigate +#post-extract-modulated: +# mkdir -p $(WORKSRC) +# #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so +# @$(MAKECOOKIE) + +#ifneq ($(CORE_UPDATES),) +#POST_TARGETS = install-core-updates +#include files/updatecore.mk +#endif + +# How to configure Perl +#configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS +#configure-perl: ARGS-64 = -dusedtrace -Duse64bitall +configure-perl: + (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) + #cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be + @# 64 bit: -Duse64bitall + @$(MAKECOOKIE) + +build-perl: BUILD_EXPORTS = LD_OPTIONS +build-perl: + @echo " ==> Running make in $*" + @#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) + cd $(WORKSRC) && $(BUILD_ENV) dmake + @$(MAKECOOKIE) + +test-perl: + @echo " ==> Running make $(TEST_TARGET) in $*" + @#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) + #cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && LD_LIBRARY_PATH_64=`pwd`:$(prefix)/bdb48/lib/$(MEMORYMODEL) gmake test && mv .mgar-git .git + cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && gmake test && mv .mgar-git .git + @$(MAKECOOKIE) + +# Make links to libperl +#POST_TARGETS += libperl +#LIB_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) +#LIB_PATH = $(libdir)/perl/$(VERSION)/CORE +#libperl: +# @( cd $(DESTDIR)$(libdir) ; \ +# mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ +# $(DESTDIR)$(libdir) ; \ +# chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ +# ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) +# #; \ +# #ln -s libperl.so.$(VERSION) libperl.so ) +# @$(MAKECOOKIE) + +# Remove build paths from Config +#POST_TARGETS += perlconf +#perlconf: +# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ +# /bin/perl -i -lne "\ +# next if /config_arg[1-9]/; \ +# s/^config_args=.+$$/config_args=''/; \ +# s/^config_argc=.+$$/config_argc='0'/; \ +# s,-I$(DESTDIR)$(includedir),,g; \ +# s,-[LR]$(DESTDIR)$(libdir),,g; \ +# s,( -I$(includedir))+,\$$1,g; \ +# s,( -[LR]$(libdir))+,\$$1,g; \ +# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ +# s, (-L)?$(CC_HOME)\S+,,g; \ +# if (/^\w+=/) { \ +# s/\s{2,}(\-)/ \-/g; \ +# s/(^\w+=.) /\$$1/; \ +# s/ (.)$$/\$$1/g; \ +# } \ +# print \ +# " Config.pm Config_heavy.pl ) +# @$(MAKECOOKIE) + +#POST_TARGETS += CSWperl.cswperlincpath +#CSWperl.cswperlincpath: +# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath + +# Invoke post-install targets +#post-install-modulated: $(POST_TARGETS) +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/perl/trunk/checksums =================================================================== --- csw/mgar/pkg/perl/trunk/checksums 2012-12-14 13:18:46 UTC (rev 19888) +++ csw/mgar/pkg/perl/trunk/checksums 2012-12-14 15:59:10 UTC (rev 19889) @@ -1 +1 @@ -6846e50c800ce047a56f5b90205b0b64 perl-5.16.1-patched.tar.gz +b7c7e0b40cb6ac3a73111aa0949b9a51 perl-5.16.2-patched.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Dec 14 17:20:05 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 14 Dec 2012 16:20:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[19890] csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b Message-ID: Revision: 19890 http://gar.svn.sourceforge.net/gar/?rev=19890&view=rev Author: claudio_sf Date: 2012-12-14 16:20:04 +0000 (Fri, 14 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: Workaround to add versioning to libperl.so Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b 2012-12-14 15:59:10 UTC (rev 19889) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b 2012-12-14 16:20:04 UTC (rev 19890) @@ -26,7 +26,7 @@ PACKAGES += CSWperl SPKG_DESC_CSWperl = $(DESCRIPTION) #RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 -INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags +#INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags #PACKAGES += CSWperldoc #SPKG_DESC_CSWperldoc = Perl documentation @@ -211,18 +211,21 @@ @$(MAKECOOKIE) # Make links to libperl -#POST_TARGETS += libperl -#LIB_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) +POST_TARGETS += libperl +VERSION_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) #LIB_PATH = $(libdir)/perl/$(VERSION)/CORE -#libperl: -# @( cd $(DESTDIR)$(libdir) ; \ +libperl: + @( cd $(DESTDIR)$(libdir) ; +#\ # mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ # $(DESTDIR)$(libdir) ; \ # chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ # ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) # #; \ # #ln -s libperl.so.$(VERSION) libperl.so ) -# @$(MAKECOOKIE) + ln -s libperl.so libperl.so.$(VERSION)) \; + ln -s libperl.so libperl.so.$(VERSION_MINOR)) + @$(MAKECOOKIE) # Remove build paths from Config #POST_TARGETS += perlconf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Dec 14 22:40:23 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 14 Dec 2012 21:40:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19891] csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b Message-ID: Revision: 19891 http://gar.svn.sourceforge.net/gar/?rev=19891&view=rev Author: claudio_sf Date: 2012-12-14 21:40:23 +0000 (Fri, 14 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: + most csw customizing Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b 2012-12-14 16:20:04 UTC (rev 19890) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b 2012-12-14 21:40:23 UTC (rev 19891) @@ -73,9 +73,11 @@ #CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" #CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) -#CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" +CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" #CONFIGURE_ARGS += -Dld=$(CC) #CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" +# Workaround below. Do not version libperl.so here otherwise the other 5.10 +# lib will be picked up by mgar #CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) #CONFIGURE_ARGS += -Dlocincpth=$(includedir) #CONFIGURE_ARGS += -Dloclibpth=$(libdir) @@ -89,13 +91,13 @@ CONFIGURE_ARGS += -Dbin=$(bindir) CONFIGURE_ARGS += -Dscriptdir=$(bindir) #CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) -#CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl -#CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl -#CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 -#CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 -#CONFIGURE_ARGS += -Dsiteprefix=/usr +CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl +CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl +CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 +CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 +CONFIGURE_ARGS += -Dsiteprefix=/usr CONFIGURE_ARGS += -Duseshrplib -#CONFIGURE_ARGS += -Dusesitecustomize +CONFIGURE_ARGS += -Dusesitecustomize CONFIGURE_ARGS += -Dusethreads CONFIGURE_ARGS += -Dusedtrace CONFIGURE_ARGS += -Duse64bitall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Dec 14 23:08:24 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 14 Dec 2012 22:08:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[19892] csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b Message-ID: Revision: 19892 http://gar.svn.sourceforge.net/gar/?rev=19892&view=rev Author: claudio_sf Date: 2012-12-14 22:08:24 +0000 (Fri, 14 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: temporary removal of cswincpath file Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b 2012-12-14 21:40:23 UTC (rev 19891) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b 2012-12-14 22:08:24 UTC (rev 19892) @@ -167,7 +167,7 @@ # This is for the communication with checkpkg. These pathes are searched for modules # when resolving dependencies. -PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") +#PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") # Splitting of a separate libperl.so requires more work and careful planning. # Override for now. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Sat Dec 15 13:29:39 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sat, 15 Dec 2012 12:29:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[19893] csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b Message-ID: Revision: 19893 http://gar.svn.sourceforge.net/gar/?rev=19893&view=rev Author: claudio_sf Date: 2012-12-15 12:29:38 +0000 (Sat, 15 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: Add dependency Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b 2012-12-14 22:08:24 UTC (rev 19892) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b 2012-12-15 12:29:38 UTC (rev 19893) @@ -14,17 +14,19 @@ endef #MASTER_SITES = http://www.cpan.org/src/ -#SPKG_SOURCEURL = http://www.cpan.org/src +#SPKG_SOURCEURL = http://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.16.2.tar.bz2 MASTER_SITES = manual:// +#DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz # Make extra Solaris 10 package with DTrace support #PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PACKAGING_PLATFORMS += solaris10-sparc +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +#PACKAGING_PLATFORMS += solaris10-sparc BUILD64_ONLY = 1 PACKAGES += CSWperl -SPKG_DESC_CSWperl = $(DESCRIPTION) +PKG_DESC_CSWperl = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWperl += CSWlibssp0 #RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 #INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags @@ -35,7 +37,7 @@ LICENSE = Copying -#CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content #CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content #CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl @@ -65,7 +67,7 @@ #PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) #PERL_LIBS = -lsocket -lgdbm -ldl -lm -lpthread -lc -lcrypt -#BUILD64 = 1 +BUILD64 = 1 # Configuration flags #CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Dec 16 01:33:57 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 16 Dec 2012 00:33:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[19894] csw/mgar/pkg/irrtoolset/trunk Message-ID: Revision: 19894 http://gar.svn.sourceforge.net/gar/?rev=19894&view=rev Author: wahwah Date: 2012-12-16 00:33:56 +0000 (Sun, 16 Dec 2012) Log Message: ----------- irrtoolset/trunk: Added some gnulib, it still doesn't build. Modified Paths: -------------- csw/mgar/pkg/irrtoolset/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/irrtoolset/trunk/files/0001-Add-missing-this-in-src-normalform-Stack.hh.patch csw/mgar/pkg/irrtoolset/trunk/files/0002-Added-gnulib-strcasestr-module.patch csw/mgar/pkg/irrtoolset/trunk/files/0003-Added-references-to-Makefile.am-and-configure.ac.patch Modified: csw/mgar/pkg/irrtoolset/trunk/Makefile =================================================================== --- csw/mgar/pkg/irrtoolset/trunk/Makefile 2012-12-15 12:29:38 UTC (rev 19893) +++ csw/mgar/pkg/irrtoolset/trunk/Makefile 2012-12-16 00:33:56 UTC (rev 19894) @@ -17,5 +17,12 @@ CONFIGURE_ARGS = $(DIRPATHS) +PATCHFILES += 0001-Add-missing-this-in-src-normalform-Stack.hh.patch +PATCHFILES += 0002-Added-gnulib-strcasestr-module.patch +PATCHFILES += 0003-Added-references-to-Makefile.am-and-configure.ac.patch + include gar/category.mk +pre-configure-modulated: + cd $(WORKSRC); autoreconf -fi + @$(MAKECOOKIE) Added: csw/mgar/pkg/irrtoolset/trunk/files/0001-Add-missing-this-in-src-normalform-Stack.hh.patch =================================================================== --- csw/mgar/pkg/irrtoolset/trunk/files/0001-Add-missing-this-in-src-normalform-Stack.hh.patch (rev 0) +++ csw/mgar/pkg/irrtoolset/trunk/files/0001-Add-missing-this-in-src-normalform-Stack.hh.patch 2012-12-16 00:33:56 UTC (rev 19894) @@ -0,0 +1,25 @@ +From 9de5a6294e19078f06cd02b477905aa9184b2ba8 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 16 Dec 2012 01:18:39 +0100 +Subject: [PATCH 1/3] Add missing "this" in src/normalform/Stack.hh + +--- + src/normalform/Stack.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/normalform/Stack.hh b/src/normalform/Stack.hh +index 90c6a98..832101b 100644 +--- a/src/normalform/Stack.hh ++++ b/src/normalform/Stack.hh +@@ -93,7 +93,7 @@ template + class BoundedStack : BoundedQueue { + public: + BoundedStack(int size) : BoundedQueue(size) {} +- void push(TYPE elt) { enq(elt); } ++ void push(TYPE elt) { this->enq(elt); } + TYPE pop() { return this->q[--(this->last)]; } + int getPosition() { return this->last; } + void setPosition(int pos) { this->last = pos; } +-- +1.8.0 + Added: csw/mgar/pkg/irrtoolset/trunk/files/0002-Added-gnulib-strcasestr-module.patch =================================================================== --- csw/mgar/pkg/irrtoolset/trunk/files/0002-Added-gnulib-strcasestr-module.patch (rev 0) +++ csw/mgar/pkg/irrtoolset/trunk/files/0002-Added-gnulib-strcasestr-module.patch 2012-12-16 00:33:56 UTC (rev 19894) @@ -0,0 +1,4916 @@ +From d48d96410334de64c58b7b85bb00a0923491ce71 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 16 Dec 2012 01:19:02 +0100 +Subject: [PATCH 2/3] Added gnulib 'strcasestr' module + +--- + lib/Makefile.am | 369 ++++++++++++++++++ + lib/dummy.c | 42 +++ + lib/memchr.c | 172 +++++++++ + lib/memchr.valgrind | 14 + + lib/stdbool.in.h | 132 +++++++ + lib/stddef.in.h | 86 +++++ + lib/str-two-way.h | 452 ++++++++++++++++++++++ + lib/strcasecmp.c | 62 ++++ + lib/strcasestr.c | 82 ++++ + lib/string.in.h | 1029 +++++++++++++++++++++++++++++++++++++++++++++++++++ + lib/strings.in.h | 122 ++++++ + lib/strncasecmp.c | 62 ++++ + lib/sys_types.in.h | 51 +++ + m4/00gnulib.m4 | 30 ++ + m4/extensions.m4 | 123 ++++++ + m4/gnulib-cache.m4 | 48 +++ + m4/gnulib-common.m4 | 373 +++++++++++++++++++ + m4/gnulib-comp.m4 | 280 ++++++++++++++ + m4/gnulib-tool.m4 | 57 +++ + m4/include_next.m4 | 270 ++++++++++++++ + m4/memchr.m4 | 88 +++++ + m4/mmap-anon.m4 | 55 +++ + m4/off_t.m4 | 18 + + m4/ssize_t.m4 | 23 ++ + m4/stdbool.m4 | 100 +++++ + m4/stddef_h.m4 | 47 +++ + m4/strcase.m4 | 45 +++ + m4/strcasestr.m4 | 142 +++++++ + m4/string_h.m4 | 120 ++++++ + m4/strings_h.m4 | 52 +++ + m4/sys_types_h.m4 | 24 ++ + m4/warn-on-use.m4 | 47 +++ + m4/wchar_t.m4 | 24 ++ + 33 files changed, 4641 insertions(+) + create mode 100644 lib/Makefile.am + create mode 100644 lib/dummy.c + create mode 100644 lib/memchr.c + create mode 100644 lib/memchr.valgrind + create mode 100644 lib/stdbool.in.h + create mode 100644 lib/stddef.in.h + create mode 100644 lib/str-two-way.h + create mode 100644 lib/strcasecmp.c + create mode 100644 lib/strcasestr.c + create mode 100644 lib/string.in.h + create mode 100644 lib/strings.in.h + create mode 100644 lib/strncasecmp.c + create mode 100644 lib/sys_types.in.h + create mode 100644 m4/00gnulib.m4 + create mode 100644 m4/extensions.m4 + create mode 100644 m4/gnulib-cache.m4 + create mode 100644 m4/gnulib-common.m4 + create mode 100644 m4/gnulib-comp.m4 + create mode 100644 m4/gnulib-tool.m4 + create mode 100644 m4/include_next.m4 + create mode 100644 m4/memchr.m4 + create mode 100644 m4/mmap-anon.m4 + create mode 100644 m4/off_t.m4 + create mode 100644 m4/ssize_t.m4 + create mode 100644 m4/stdbool.m4 + create mode 100644 m4/stddef_h.m4 + create mode 100644 m4/strcase.m4 + create mode 100644 m4/strcasestr.m4 + create mode 100644 m4/string_h.m4 + create mode 100644 m4/strings_h.m4 + create mode 100644 m4/sys_types_h.m4 + create mode 100644 m4/warn-on-use.m4 + create mode 100644 m4/wchar_t.m4 + +diff --git a/lib/Makefile.am b/lib/Makefile.am +new file mode 100644 +index 0000000..a49c32d +--- /dev/null ++++ b/lib/Makefile.am +@@ -0,0 +1,369 @@ ++## DO NOT EDIT! GENERATED AUTOMATICALLY! ++## Process this file with automake to produce Makefile.in. ++# Copyright (C) 2002-2012 Free Software Foundation, Inc. ++# ++# This file is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This file is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this file. If not, see . ++# ++# As a special exception to the GNU General Public License, ++# this file may be distributed as part of a program that ++# contains a configuration script generated by Autoconf, under ++# the same distribution terms as the rest of that program. ++# ++# Generated by gnulib-tool. ++# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files strcasestr ++ ++AUTOMAKE_OPTIONS = 1.5 gnits ++ ++SUBDIRS = ++noinst_HEADERS = ++noinst_LIBRARIES = ++noinst_LTLIBRARIES = ++EXTRA_DIST = ++BUILT_SOURCES = ++SUFFIXES = ++MOSTLYCLEANFILES = core *.stackdump ++MOSTLYCLEANDIRS = ++CLEANFILES = ++DISTCLEANFILES = ++MAINTAINERCLEANFILES = ++ ++AM_CPPFLAGS = ++AM_CFLAGS = ++ ++noinst_LIBRARIES += libgnu.a ++ ++libgnu_a_SOURCES = ++libgnu_a_LIBADD = $(gl_LIBOBJS) ++libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) ++EXTRA_libgnu_a_SOURCES = ++ ++## begin gnulib module memchr ++ ++ ++EXTRA_DIST += memchr.c memchr.valgrind ++ ++EXTRA_libgnu_a_SOURCES += memchr.c ++ ++## end gnulib module memchr ++ ++## begin gnulib module snippet/arg-nonnull ++ ++# The BUILT_SOURCES created by this Makefile snippet are not used via #include ++# statements but through direct file reference. Therefore this snippet must be ++# present in all Makefile.am that need it. This is ensured by the applicability ++# 'all' defined above. ++ ++BUILT_SOURCES += arg-nonnull.h ++# The arg-nonnull.h that gets inserted into generated .h files is the same as ++# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut ++# off. ++arg-nonnull.h: $(top_srcdir)/./snippet/arg-nonnull.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ sed -n -e '/GL_ARG_NONNULL/,$$p' \ ++ < $(top_srcdir)/./snippet/arg-nonnull.h \ ++ > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t ++ ++ARG_NONNULL_H=arg-nonnull.h ++ ++EXTRA_DIST += $(top_srcdir)/./snippet/arg-nonnull.h ++ ++## end gnulib module snippet/arg-nonnull ++ ++## begin gnulib module snippet/c++defs ++ ++# The BUILT_SOURCES created by this Makefile snippet are not used via #include ++# statements but through direct file reference. Therefore this snippet must be ++# present in all Makefile.am that need it. This is ensured by the applicability ++# 'all' defined above. ++ ++BUILT_SOURCES += c++defs.h ++# The c++defs.h that gets inserted into generated .h files is the same as ++# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. ++c++defs.h: $(top_srcdir)/./snippet/c++defs.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ sed -n -e '/_GL_CXXDEFS/,$$p' \ ++ < $(top_srcdir)/./snippet/c++defs.h \ ++ > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += c++defs.h c++defs.h-t ++ ++CXXDEFS_H=c++defs.h ++ ++EXTRA_DIST += $(top_srcdir)/./snippet/c++defs.h ++ ++## end gnulib module snippet/c++defs ++ ++## begin gnulib module snippet/warn-on-use ++ ++BUILT_SOURCES += warn-on-use.h ++# The warn-on-use.h that gets inserted into generated .h files is the same as ++# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut ++# off. ++warn-on-use.h: $(top_srcdir)/./snippet/warn-on-use.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ sed -n -e '/^.ifndef/,$$p' \ ++ < $(top_srcdir)/./snippet/warn-on-use.h \ ++ > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t ++ ++WARN_ON_USE_H=warn-on-use.h ++ ++EXTRA_DIST += $(top_srcdir)/./snippet/warn-on-use.h ++ ++## end gnulib module snippet/warn-on-use ++ ++## begin gnulib module stdbool ++ ++BUILT_SOURCES += $(STDBOOL_H) ++ ++# We need the following in order to create when the system ++# doesn't have one that works. ++if GL_GENERATE_STDBOOL_H ++stdbool.h: stdbool.in.h $(top_builddir)/config.status ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++else ++stdbool.h: $(top_builddir)/config.status ++ rm -f $@ ++endif ++MOSTLYCLEANFILES += stdbool.h stdbool.h-t ++ ++EXTRA_DIST += stdbool.in.h ++ ++## end gnulib module stdbool ++ ++## begin gnulib module stddef ++ ++BUILT_SOURCES += $(STDDEF_H) ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++if GL_GENERATE_STDDEF_H ++stddef.h: stddef.in.h $(top_builddir)/config.status ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ ++ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ ++ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ ++ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ ++ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ ++ < $(srcdir)/stddef.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++else ++stddef.h: $(top_builddir)/config.status ++ rm -f $@ ++endif ++MOSTLYCLEANFILES += stddef.h stddef.h-t ++ ++EXTRA_DIST += stddef.in.h ++ ++## end gnulib module stddef ++ ++## begin gnulib module strcase ++ ++ ++EXTRA_DIST += strcasecmp.c strncasecmp.c ++ ++EXTRA_libgnu_a_SOURCES += strcasecmp.c strncasecmp.c ++ ++## end gnulib module strcase ++ ++## begin gnulib module strcasestr-simple ++ ++ ++EXTRA_DIST += str-two-way.h strcasestr.c ++ ++EXTRA_libgnu_a_SOURCES += strcasestr.c ++ ++## end gnulib module strcasestr-simple ++ ++## begin gnulib module string ++ ++BUILT_SOURCES += string.h ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ ++ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ ++ -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ ++ -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ ++ -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ ++ -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ ++ -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ ++ -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ ++ -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ ++ -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ ++ -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ ++ -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ ++ -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ ++ -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ ++ -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ ++ -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ ++ -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ ++ -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ ++ -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ ++ -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ ++ -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ ++ -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ ++ -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ ++ -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ ++ -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ ++ -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ ++ -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ ++ -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ ++ -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ ++ -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ ++ -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ ++ -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ ++ -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ ++ -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ ++ -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ ++ -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ ++ -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ ++ -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ ++ -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ ++ -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ ++ < $(srcdir)/string.in.h | \ ++ sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ ++ -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ ++ -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ ++ -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \ ++ -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ ++ -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ ++ -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \ ++ -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \ ++ -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \ ++ -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \ ++ -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \ ++ -e 's|@''HAVE_DECL_STRDUP''@|$(HAVE_DECL_STRDUP)|g' \ ++ -e 's|@''HAVE_DECL_STRNDUP''@|$(HAVE_DECL_STRNDUP)|g' \ ++ -e 's|@''HAVE_DECL_STRNLEN''@|$(HAVE_DECL_STRNLEN)|g' \ ++ -e 's|@''HAVE_STRPBRK''@|$(HAVE_STRPBRK)|g' \ ++ -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \ ++ -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ ++ -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ ++ -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \ ++ -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ ++ -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ ++ -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ ++ -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ ++ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ ++ -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \ ++ -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \ ++ -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ ++ -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ ++ -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ ++ -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ ++ -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \ ++ -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \ ++ -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \ ++ -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ ++ -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \ ++ -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \ ++ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ ++ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ ++ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ ++ < $(srcdir)/string.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += string.h string.h-t ++ ++EXTRA_DIST += string.in.h ++ ++## end gnulib module string ++ ++## begin gnulib module strings ++ ++BUILT_SOURCES += strings.h ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++strings.h: strings.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ ++ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ ++ -e 's|@''HAVE_STRINGS_H''@|$(HAVE_STRINGS_H)|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ ++ -e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \ ++ -e 's|@''GNULIB_FFS''@|$(GNULIB_FFS)|g' \ ++ -e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \ ++ -e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \ ++ -e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \ ++ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ ++ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ ++ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ ++ < $(srcdir)/strings.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += strings.h strings.h-t ++ ++EXTRA_DIST += strings.in.h ++ ++## end gnulib module strings ++ ++## begin gnulib module sys_types ++ ++BUILT_SOURCES += sys/types.h ++ ++# We need the following in order to create when the system ++# doesn't have one that works with the given compiler. ++sys/types.h: sys_types.in.h $(top_builddir)/config.status ++ $(AM_V_at)$(MKDIR_P) sys ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ ++ -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \ ++ -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ ++ < $(srcdir)/sys_types.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += sys/types.h sys/types.h-t ++ ++EXTRA_DIST += sys_types.in.h ++ ++## end gnulib module sys_types ++ ++## begin gnulib module dummy ++ ++libgnu_a_SOURCES += dummy.c ++ ++## end gnulib module dummy ++ ++ ++mostlyclean-local: mostlyclean-generic ++ @for dir in '' $(MOSTLYCLEANDIRS); do \ ++ if test -n "$$dir" && test -d $$dir; then \ ++ echo "rmdir $$dir"; rmdir $$dir; \ ++ fi; \ ++ done; \ ++ : +diff --git a/lib/dummy.c b/lib/dummy.c +new file mode 100644 +index 0000000..6e4b76e +--- /dev/null ++++ b/lib/dummy.c +@@ -0,0 +1,42 @@ ++/* A dummy file, to prevent empty libraries from breaking builds. ++ Copyright (C) 2004, 2007, 2009-2012 Free Software Foundation, Inc. ++ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create ++ libraries without any object files. You might get an error like: ++ ++ > ar cru .libs/libgl.a ++ > ar: no archive members specified ++ ++ Compiling this file, and adding its object file to the library, will ++ prevent the library from being empty. */ ++ ++/* Some systems, such as Solaris with cc 5.0, refuse to work with libraries ++ that don't export any symbol. You might get an error like: ++ ++ > cc ... libgnu.a ++ > ild: (bad file) garbled symbol table in archive ../gllib/libgnu.a ++ ++ Compiling this file, and adding its object file to the library, will ++ prevent the library from exporting no symbols. */ ++ ++#ifdef __sun ++/* This declaration ensures that the library will export at least 1 symbol. */ ++int gl_dummy_symbol; ++#else ++/* This declaration is solely to ensure that after preprocessing ++ this file is never empty. */ ++typedef int dummy; ++#endif +diff --git a/lib/memchr.c b/lib/memchr.c +new file mode 100644 +index 0000000..b8fb0ef +--- /dev/null ++++ b/lib/memchr.c +@@ -0,0 +1,172 @@ ++/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2012 ++ Free Software Foundation, Inc. ++ ++ Based on strlen implementation by Torbjorn Granlund (tege at sics.se), ++ with help from Dan Sahlin (dan at sics.se) and ++ commentary by Jim Blandy (jimb at ai.mit.edu); ++ adaptation to memchr suggested by Dick Karpinski (dick at cca.ucsf.edu), ++ and implemented by Roland McGrath (roland at ai.mit.edu). ++ ++NOTE: The canonical source of this file is maintained with the GNU C Library. ++Bugs can be reported to bug-glibc at prep.ai.mit.edu. ++ ++This program is free software: you can redistribute it and/or modify it ++under the terms of the GNU General Public License as published by the ++Free Software Foundation; either version 3 of the License, or any ++later version. ++ ++This program is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++GNU General Public License for more details. ++ ++You should have received a copy of the GNU General Public License ++along with this program. If not, see . */ ++ ++#ifndef _LIBC ++# include ++#endif ++ ++#include ++ ++#include ++ ++#if defined _LIBC ++# include ++#else ++# define reg_char char ++#endif ++ ++#include ++ ++#if HAVE_BP_SYM_H || defined _LIBC ++# include ++#else ++# define BP_SYM(sym) sym ++#endif ++ ++#undef __memchr ++#ifdef _LIBC ++# undef memchr ++#endif ++ ++#ifndef weak_alias ++# define __memchr memchr ++#endif ++ ++/* Search no more than N bytes of S for C. */ ++void * ++__memchr (void const *s, int c_in, size_t n) ++{ ++ /* On 32-bit hardware, choosing longword to be a 32-bit unsigned ++ long instead of a 64-bit uintmax_t tends to give better ++ performance. On 64-bit hardware, unsigned long is generally 64 ++ bits already. Change this typedef to experiment with ++ performance. */ ++ typedef unsigned long int longword; ++ ++ const unsigned char *char_ptr; ++ const longword *longword_ptr; ++ longword repeated_one; ++ longword repeated_c; ++ unsigned reg_char c; ++ ++ c = (unsigned char) c_in; ++ ++ /* Handle the first few bytes by reading one byte at a time. ++ Do this until CHAR_PTR is aligned on a longword boundary. */ ++ for (char_ptr = (const unsigned char *) s; ++ n > 0 && (size_t) char_ptr % sizeof (longword) != 0; ++ --n, ++char_ptr) ++ if (*char_ptr == c) ++ return (void *) char_ptr; ++ ++ longword_ptr = (const longword *) char_ptr; ++ ++ /* All these elucidatory comments refer to 4-byte longwords, ++ but the theory applies equally well to any size longwords. */ ++ ++ /* Compute auxiliary longword values: ++ repeated_one is a value which has a 1 in every byte. ++ repeated_c has c in every byte. */ ++ repeated_one = 0x01010101; ++ repeated_c = c | (c << 8); ++ repeated_c |= repeated_c << 16; ++ if (0xffffffffU < (longword) -1) ++ { ++ repeated_one |= repeated_one << 31 << 1; ++ repeated_c |= repeated_c << 31 << 1; ++ if (8 < sizeof (longword)) ++ { ++ size_t i; ++ ++ for (i = 64; i < sizeof (longword) * 8; i *= 2) ++ { ++ repeated_one |= repeated_one << i; ++ repeated_c |= repeated_c << i; ++ } ++ } ++ } ++ ++ /* Instead of the traditional loop which tests each byte, we will test a ++ longword at a time. The tricky part is testing if *any of the four* ++ bytes in the longword in question are equal to c. We first use an xor ++ with repeated_c. This reduces the task to testing whether *any of the ++ four* bytes in longword1 is zero. ++ ++ We compute tmp = ++ ((longword1 - repeated_one) & ~longword1) & (repeated_one << 7). ++ That is, we perform the following operations: ++ 1. Subtract repeated_one. ++ 2. & ~longword1. ++ 3. & a mask consisting of 0x80 in every byte. ++ Consider what happens in each byte: ++ - If a byte of longword1 is zero, step 1 and 2 transform it into 0xff, ++ and step 3 transforms it into 0x80. A carry can also be propagated ++ to more significant bytes. ++ - If a byte of longword1 is nonzero, let its lowest 1 bit be at ++ position k (0 <= k <= 7); so the lowest k bits are 0. After step 1, ++ the byte ends in a single bit of value 0 and k bits of value 1. ++ After step 2, the result is just k bits of value 1: 2^k - 1. After ++ step 3, the result is 0. And no carry is produced. ++ So, if longword1 has only non-zero bytes, tmp is zero. ++ Whereas if longword1 has a zero byte, call j the position of the least ++ significant zero byte. Then the result has a zero at positions 0, ..., ++ j-1 and a 0x80 at position j. We cannot predict the result at the more ++ significant bytes (positions j+1..3), but it does not matter since we ++ already have a non-zero bit at position 8*j+7. ++ ++ So, the test whether any byte in longword1 is zero is equivalent to ++ testing whether tmp is nonzero. */ ++ ++ while (n >= sizeof (longword)) ++ { ++ longword longword1 = *longword_ptr ^ repeated_c; ++ ++ if ((((longword1 - repeated_one) & ~longword1) ++ & (repeated_one << 7)) != 0) ++ break; ++ longword_ptr++; ++ n -= sizeof (longword); ++ } ++ ++ char_ptr = (const unsigned char *) longword_ptr; ++ ++ /* At this point, we know that either n < sizeof (longword), or one of the ++ sizeof (longword) bytes starting at char_ptr is == c. On little-endian ++ machines, we could determine the first such byte without any further ++ memory accesses, just by looking at the tmp result from the last loop ++ iteration. But this does not work on big-endian machines. Choose code ++ that works in both cases. */ ++ ++ for (; n > 0; --n, ++char_ptr) ++ { ++ if (*char_ptr == c) ++ return (void *) char_ptr; ++ } ++ ++ return NULL; ++} ++#ifdef weak_alias ++weak_alias (__memchr, BP_SYM (memchr)) ++#endif +diff --git a/lib/memchr.valgrind b/lib/memchr.valgrind +new file mode 100644 +index 0000000..60f247e +--- /dev/null ++++ b/lib/memchr.valgrind +@@ -0,0 +1,14 @@ ++# Suppress a valgrind message about use of uninitialized memory in memchr(). ++# POSIX states that when the character is found, memchr must not read extra ++# bytes in an overestimated length (for example, where memchr is used to ++# implement strnlen). However, we use a safe word read to provide a speedup. ++{ ++ memchr-value4 ++ Memcheck:Value4 ++ fun:rpl_memchr ++} ++{ ++ memchr-value8 ++ Memcheck:Value8 ++ fun:rpl_memchr ++} +diff --git a/lib/stdbool.in.h b/lib/stdbool.in.h +new file mode 100644 +index 0000000..1261936 +--- /dev/null ++++ b/lib/stdbool.in.h +@@ -0,0 +1,132 @@ ++/* Copyright (C) 2001-2003, 2006-2012 Free Software Foundation, Inc. ++ Written by Bruno Haible , 2001. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2, or (at your option) ++ any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, see . */ ++ ++#ifndef _GL_STDBOOL_H ++#define _GL_STDBOOL_H ++ ++/* ISO C 99 for platforms that lack it. */ ++ ++/* Usage suggestions: ++ ++ Programs that use should be aware of some limitations ++ and standards compliance issues. ++ ++ Standards compliance: ++ ++ - must be #included before 'bool', 'false', 'true' ++ can be used. ++ ++ - You cannot assume that sizeof (bool) == 1. ++ ++ - Programs should not undefine the macros bool, true, and false, ++ as C99 lists that as an "obsolescent feature". ++ ++ Limitations of this substitute, when used in a C89 environment: ++ ++ - must be #included before the '_Bool' type can be used. ++ ++ - You cannot assume that _Bool is a typedef; it might be a macro. ++ ++ - Bit-fields of type 'bool' are not supported. Portable code ++ should use 'unsigned int foo : 1;' rather than 'bool foo : 1;'. ++ ++ - In C99, casts and automatic conversions to '_Bool' or 'bool' are ++ performed in such a way that every nonzero value gets converted ++ to 'true', and zero gets converted to 'false'. This doesn't work ++ with this substitute. With this substitute, only the values 0 and 1 ++ give the expected result when converted to _Bool' or 'bool'. ++ ++ - C99 allows the use of (_Bool)0.0 in constant expressions, but ++ this substitute cannot always provide this property. ++ ++ Also, it is suggested that programs use 'bool' rather than '_Bool'; ++ this isn't required, but 'bool' is more common. */ ++ ++ ++/* 7.16. Boolean type and values */ ++ ++/* BeOS already #defines false 0, true 1. We use the same ++ definitions below, but temporarily we have to #undef them. */ ++#if defined __BEOS__ && !defined __HAIKU__ ++# include /* defines bool but not _Bool */ ++# undef false ++# undef true ++#endif ++ ++#ifdef __cplusplus ++# define _Bool bool ++# define bool bool ++#else ++# if defined __BEOS__ && !defined __HAIKU__ ++ /* A compiler known to have 'bool'. */ ++ /* If the compiler already has both 'bool' and '_Bool', we can assume they ++ are the same types. */ ++# if !@HAVE__BOOL@ ++typedef bool _Bool; ++# endif ++# else ++# if !defined __GNUC__ ++ /* If @HAVE__BOOL@: ++ Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when ++ the built-in _Bool type is used. See ++ http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html ++ http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html ++ http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html ++ Similar bugs are likely with other compilers as well; this file ++ wouldn't be used if was working. ++ So we override the _Bool type. ++ If !@HAVE__BOOL@: ++ Need to define _Bool ourselves. As 'signed char' or as an enum type? ++ Use of a typedef, with SunPRO C, leads to a stupid ++ "warning: _Bool is a keyword in ISO C99". ++ Use of an enum type, with IRIX cc, leads to a stupid ++ "warning(1185): enumerated type mixed with another type". ++ Even the existence of an enum type, without a typedef, ++ "Invalid enumerator. (badenum)" with HP-UX cc on Tru64. ++ The only benefit of the enum, debuggability, is not important ++ with these compilers. So use 'signed char' and no enum. */ ++# define _Bool signed char ++# else ++ /* With this compiler, trust the _Bool type if the compiler has it. */ ++# if !@HAVE__BOOL@ ++ /* For the sake of symbolic names in gdb, define true and false as ++ enum constants, not only as macros. ++ It is tempting to write ++ typedef enum { false = 0, true = 1 } _Bool; ++ so that gdb prints values of type 'bool' symbolically. But then ++ values of type '_Bool' might promote to 'int' or 'unsigned int' ++ (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int' ++ (see ISO C 99 6.3.1.1.(2)). So add a negative value to the ++ enum; this ensures that '_Bool' promotes to 'int'. */ ++typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool; ++# endif ++# endif ++# endif ++# define bool _Bool ++#endif ++ ++/* The other macros must be usable in preprocessor directives. */ ++#ifdef __cplusplus ++# define false false ++# define true true ++#else ++# define false 0 ++# define true 1 ++#endif ++ ++#define __bool_true_false_are_defined 1 ++ ++#endif /* _GL_STDBOOL_H */ +diff --git a/lib/stddef.in.h b/lib/stddef.in.h +new file mode 100644 +index 0000000..56c1b3b +--- /dev/null ++++ b/lib/stddef.in.h +@@ -0,0 +1,86 @@ ++/* A substitute for POSIX 2008 , for platforms that have issues. ++ ++ Copyright (C) 2009-2012 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2, or (at your option) ++ any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, see . */ ++ ++/* Written by Eric Blake. */ ++ ++/* ++ * POSIX 2008 for platforms that have issues. ++ * ++ */ ++ ++#if __GNUC__ >= 3 ++ at PRAGMA_SYSTEM_HEADER@ ++#endif ++ at PRAGMA_COLUMNS@ ++ ++#if defined __need_wchar_t || defined __need_size_t \ ++ || defined __need_ptrdiff_t || defined __need_NULL \ ++ || defined __need_wint_t ++/* Special invocation convention inside gcc header files. In ++ particular, gcc provides a version of that blindly ++ redefines NULL even when __need_wint_t was defined, even though ++ wint_t is not normally provided by . Hence, we must ++ remember if special invocation has ever been used to obtain wint_t, ++ in which case we need to clean up NULL yet again. */ ++ ++# if !(defined _ at GUARD_PREFIX@_STDDEF_H && defined _GL_STDDEF_WINT_T) ++# ifdef __need_wint_t ++# undef _ at GUARD_PREFIX@_STDDEF_H ++# define _GL_STDDEF_WINT_T ++# endif ++# @INCLUDE_NEXT@ @NEXT_STDDEF_H@ ++# endif ++ ++#else ++/* Normal invocation convention. */ ++ ++# ifndef _ at GUARD_PREFIX@_STDDEF_H ++ ++/* The include_next requires a split double-inclusion guard. */ ++ ++# @INCLUDE_NEXT@ @NEXT_STDDEF_H@ ++ ++# ifndef _ at GUARD_PREFIX@_STDDEF_H ++# define _ at GUARD_PREFIX@_STDDEF_H ++ ++/* On NetBSD 5.0, the definition of NULL lacks proper parentheses. */ ++#if @REPLACE_NULL@ ++# undef NULL ++# ifdef __cplusplus ++ /* ISO C++ says that the macro NULL must expand to an integer constant ++ expression, hence '((void *) 0)' is not allowed in C++. */ ++# if __GNUG__ >= 3 ++ /* GNU C++ has a __null macro that behaves like an integer ('int' or ++ 'long') but has the same size as a pointer. Use that, to avoid ++ warnings. */ ++# define NULL __null ++# else ++# define NULL 0L ++# endif ++# else ++# define NULL ((void *) 0) ++# endif ++#endif ++ ++/* Some platforms lack wchar_t. */ ++#if !@HAVE_WCHAR_T@ ++# define wchar_t int ++#endif ++ ++# endif /* _ at GUARD_PREFIX@_STDDEF_H */ ++# endif /* _ at GUARD_PREFIX@_STDDEF_H */ ++#endif /* __need_XXX */ +diff --git a/lib/str-two-way.h b/lib/str-two-way.h +new file mode 100644 +index 0000000..da6cfba +--- /dev/null ++++ b/lib/str-two-way.h +@@ -0,0 +1,452 @@ ++/* Byte-wise substring search, using the Two-Way algorithm. ++ Copyright (C) 2008-2012 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ Written by Eric Blake , 2008. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2, or (at your option) ++ any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License along ++ with this program; if not, see . */ ++ ++/* Before including this file, you need to include and ++ , and define: ++ RESULT_TYPE A macro that expands to the return type. ++ AVAILABLE(h, h_l, j, n_l) ++ A macro that returns nonzero if there are ++ at least N_L bytes left starting at H[J]. ++ H is 'unsigned char *', H_L, J, and N_L ++ are 'size_t'; H_L is an lvalue. For ++ NUL-terminated searches, H_L can be ++ modified each iteration to avoid having ++ to compute the end of H up front. ++ ++ For case-insensitivity, you may optionally define: ++ CMP_FUNC(p1, p2, l) A macro that returns 0 iff the first L ++ characters of P1 and P2 are equal. ++ CANON_ELEMENT(c) A macro that canonicalizes an element right after ++ it has been fetched from one of the two strings. ++ The argument is an 'unsigned char'; the result ++ must be an 'unsigned char' as well. ++ ++ This file undefines the macros documented above, and defines ++ LONG_NEEDLE_THRESHOLD. ++*/ ++ ++#include ++#include ++ ++/* We use the Two-Way string matching algorithm (also known as ++ Chrochemore-Perrin), which guarantees linear complexity with ++ constant space. Additionally, for long needles, we also use a bad ++ character shift table similar to the Boyer-Moore algorithm to ++ achieve improved (potentially sub-linear) performance. ++ ++ See http://www-igm.univ-mlv.fr/~lecroq/string/node26.html#SECTION00260, ++ http://en.wikipedia.org/wiki/Boyer-Moore_string_search_algorithm, ++ http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.34.6641&rep=rep1&type=pdf ++*/ ++ ++/* Point at which computing a bad-byte shift table is likely to be ++ worthwhile. Small needles should not compute a table, since it ++ adds (1 << CHAR_BIT) + NEEDLE_LEN computations of preparation for a ++ speedup no greater than a factor of NEEDLE_LEN. The larger the ++ needle, the better the potential performance gain. On the other ++ hand, on non-POSIX systems with CHAR_BIT larger than eight, the ++ memory required for the table is prohibitive. */ ++#if CHAR_BIT < 10 ++# define LONG_NEEDLE_THRESHOLD 32U ++#else ++# define LONG_NEEDLE_THRESHOLD SIZE_MAX ++#endif ++ ++#ifndef MAX ++# define MAX(a, b) ((a < b) ? (b) : (a)) ++#endif ++ ++#ifndef CANON_ELEMENT ++# define CANON_ELEMENT(c) c ++#endif ++#ifndef CMP_FUNC ++# define CMP_FUNC memcmp ++#endif ++ ++/* Perform a critical factorization of NEEDLE, of length NEEDLE_LEN. ++ Return the index of the first byte in the right half, and set ++ *PERIOD to the global period of the right half. ++ ++ The global period of a string is the smallest index (possibly its ++ length) at which all remaining bytes in the string are repetitions ++ of the prefix (the last repetition may be a subset of the prefix). ++ ++ When NEEDLE is factored into two halves, a local period is the ++ length of the smallest word that shares a suffix with the left half ++ and shares a prefix with the right half. All factorizations of a ++ non-empty NEEDLE have a local period of at least 1 and no greater ++ than NEEDLE_LEN. ++ ++ A critical factorization has the property that the local period ++ equals the global period. All strings have at least one critical ++ factorization with the left half smaller than the global period. ++ And while some strings have more than one critical factorization, ++ it is provable that with an ordered alphabet, at least one of the ++ critical factorizations corresponds to a maximal suffix. ++ ++ Given an ordered alphabet, a critical factorization can be computed ++ in linear time, with 2 * NEEDLE_LEN comparisons, by computing the ++ shorter of two ordered maximal suffixes. The ordered maximal ++ suffixes are determined by lexicographic comparison while tracking ++ periodicity. */ ++static size_t ++critical_factorization (const unsigned char *needle, size_t needle_len, ++ size_t *period) ++{ ++ /* Index of last byte of left half, or SIZE_MAX. */ ++ size_t max_suffix, max_suffix_rev; ++ size_t j; /* Index into NEEDLE for current candidate suffix. */ ++ size_t k; /* Offset into current period. */ ++ size_t p; /* Intermediate period. */ ++ unsigned char a, b; /* Current comparison bytes. */ ++ ++ /* Special case NEEDLE_LEN of 1 or 2 (all callers already filtered ++ out 0-length needles. */ ++ if (needle_len < 3) ++ { ++ *period = 1; ++ return needle_len - 1; ++ } ++ ++ /* Invariants: ++ 0 <= j < NEEDLE_LEN - 1 ++ -1 <= max_suffix{,_rev} < j (treating SIZE_MAX as if it were signed) ++ min(max_suffix, max_suffix_rev) < global period of NEEDLE ++ 1 <= p <= global period of NEEDLE ++ p == global period of the substring NEEDLE[max_suffix{,_rev}+1...j] ++ 1 <= k <= p ++ */ ++ ++ /* Perform lexicographic search. */ ++ max_suffix = SIZE_MAX; ++ j = 0; ++ k = p = 1; ++ while (j + k < needle_len) ++ { ++ a = CANON_ELEMENT (needle[j + k]); ++ b = CANON_ELEMENT (needle[max_suffix + k]); ++ if (a < b) ++ { ++ /* Suffix is smaller, period is entire prefix so far. */ ++ j += k; ++ k = 1; ++ p = j - max_suffix; ++ } ++ else if (a == b) ++ { ++ /* Advance through repetition of the current period. */ ++ if (k != p) ++ ++k; ++ else ++ { ++ j += p; ++ k = 1; ++ } ++ } ++ else /* b < a */ ++ { ++ /* Suffix is larger, start over from current location. */ ++ max_suffix = j++; ++ k = p = 1; ++ } ++ } ++ *period = p; ++ ++ /* Perform reverse lexicographic search. */ ++ max_suffix_rev = SIZE_MAX; ++ j = 0; ++ k = p = 1; ++ while (j + k < needle_len) ++ { ++ a = CANON_ELEMENT (needle[j + k]); ++ b = CANON_ELEMENT (needle[max_suffix_rev + k]); ++ if (b < a) ++ { ++ /* Suffix is smaller, period is entire prefix so far. */ ++ j += k; ++ k = 1; ++ p = j - max_suffix_rev; ++ } ++ else if (a == b) ++ { ++ /* Advance through repetition of the current period. */ ++ if (k != p) ++ ++k; ++ else ++ { ++ j += p; ++ k = 1; ++ } ++ } ++ else /* a < b */ ++ { ++ /* Suffix is larger, start over from current location. */ ++ max_suffix_rev = j++; ++ k = p = 1; ++ } ++ } ++ ++ /* Choose the shorter suffix. Return the index of the first byte of ++ the right half, rather than the last byte of the left half. ++ ++ For some examples, 'banana' has two critical factorizations, both ++ exposed by the two lexicographic extreme suffixes of 'anana' and ++ 'nana', where both suffixes have a period of 2. On the other ++ hand, with 'aab' and 'bba', both strings have a single critical ++ factorization of the last byte, with the suffix having a period ++ of 1. While the maximal lexicographic suffix of 'aab' is 'b', ++ the maximal lexicographic suffix of 'bba' is 'ba', which is not a ++ critical factorization. Conversely, the maximal reverse ++ lexicographic suffix of 'a' works for 'bba', but not 'ab' for ++ 'aab'. The shorter suffix of the two will always be a critical ++ factorization. */ ++ if (max_suffix_rev + 1 < max_suffix + 1) ++ return max_suffix + 1; ++ *period = p; ++ return max_suffix_rev + 1; ++} ++ ++/* Return the first location of non-empty NEEDLE within HAYSTACK, or ++ NULL. HAYSTACK_LEN is the minimum known length of HAYSTACK. This ++ method is optimized for NEEDLE_LEN < LONG_NEEDLE_THRESHOLD. ++ Performance is guaranteed to be linear, with an initialization cost ++ of 2 * NEEDLE_LEN comparisons. ++ ++ If AVAILABLE does not modify HAYSTACK_LEN (as in memmem), then at ++ most 2 * HAYSTACK_LEN - NEEDLE_LEN comparisons occur in searching. ++ If AVAILABLE modifies HAYSTACK_LEN (as in strstr), then at most 3 * ++ HAYSTACK_LEN - NEEDLE_LEN comparisons occur in searching. */ ++static RETURN_TYPE ++two_way_short_needle (const unsigned char *haystack, size_t haystack_len, ++ const unsigned char *needle, size_t needle_len) ++{ ++ size_t i; /* Index into current byte of NEEDLE. */ ++ size_t j; /* Index into current window of HAYSTACK. */ ++ size_t period; /* The period of the right half of needle. */ ++ size_t suffix; /* The index of the right half of needle. */ ++ ++ /* Factor the needle into two halves, such that the left half is ++ smaller than the global period, and the right half is ++ periodic (with a period as large as NEEDLE_LEN - suffix). */ ++ suffix = critical_factorization (needle, needle_len, &period); ++ ++ /* Perform the search. Each iteration compares the right half ++ first. */ ++ if (CMP_FUNC (needle, needle + period, suffix) == 0) ++ { ++ /* Entire needle is periodic; a mismatch in the left half can ++ only advance by the period, so use memory to avoid rescanning ++ known occurrences of the period in the right half. */ ++ size_t memory = 0; ++ j = 0; ++ while (AVAILABLE (haystack, haystack_len, j, needle_len)) ++ { ++ /* Scan for matches in right half. */ ++ i = MAX (suffix, memory); ++ while (i < needle_len && (CANON_ELEMENT (needle[i]) ++ == CANON_ELEMENT (haystack[i + j]))) ++ ++i; ++ if (needle_len <= i) ++ { ++ /* Scan for matches in left half. */ ++ i = suffix - 1; ++ while (memory < i + 1 && (CANON_ELEMENT (needle[i]) ++ == CANON_ELEMENT (haystack[i + j]))) ++ --i; ++ if (i + 1 < memory + 1) ++ return (RETURN_TYPE) (haystack + j); ++ /* No match, so remember how many repetitions of period ++ on the right half were scanned. */ ++ j += period; ++ memory = needle_len - period; ++ } ++ else ++ { ++ j += i - suffix + 1; ++ memory = 0; ++ } ++ } ++ } ++ else ++ { ++ /* The two halves of needle are distinct; no extra memory is ++ required, and any mismatch results in a maximal shift. */ ++ period = MAX (suffix, needle_len - suffix) + 1; ++ j = 0; ++ while (AVAILABLE (haystack, haystack_len, j, needle_len)) ++ { ++ /* Scan for matches in right half. */ ++ i = suffix; ++ while (i < needle_len && (CANON_ELEMENT (needle[i]) ++ == CANON_ELEMENT (haystack[i + j]))) ++ ++i; ++ if (needle_len <= i) ++ { ++ /* Scan for matches in left half. */ ++ i = suffix - 1; ++ while (i != SIZE_MAX && (CANON_ELEMENT (needle[i]) ++ == CANON_ELEMENT (haystack[i + j]))) ++ --i; ++ if (i == SIZE_MAX) ++ return (RETURN_TYPE) (haystack + j); ++ j += period; ++ } ++ else ++ j += i - suffix + 1; ++ } ++ } ++ return NULL; ++} ++ ++/* Return the first location of non-empty NEEDLE within HAYSTACK, or ++ NULL. HAYSTACK_LEN is the minimum known length of HAYSTACK. This ++ method is optimized for LONG_NEEDLE_THRESHOLD <= NEEDLE_LEN. ++ Performance is guaranteed to be linear, with an initialization cost ++ of 3 * NEEDLE_LEN + (1 << CHAR_BIT) operations. ++ ++ If AVAILABLE does not modify HAYSTACK_LEN (as in memmem), then at ++ most 2 * HAYSTACK_LEN - NEEDLE_LEN comparisons occur in searching, ++ and sublinear performance O(HAYSTACK_LEN / NEEDLE_LEN) is possible. ++ If AVAILABLE modifies HAYSTACK_LEN (as in strstr), then at most 3 * ++ HAYSTACK_LEN - NEEDLE_LEN comparisons occur in searching, and ++ sublinear performance is not possible. */ ++static RETURN_TYPE ++two_way_long_needle (const unsigned char *haystack, size_t haystack_len, ++ const unsigned char *needle, size_t needle_len) ++{ ++ size_t i; /* Index into current byte of NEEDLE. */ ++ size_t j; /* Index into current window of HAYSTACK. */ ++ size_t period; /* The period of the right half of needle. */ ++ size_t suffix; /* The index of the right half of needle. */ ++ size_t shift_table[1U << CHAR_BIT]; /* See below. */ ++ ++ /* Factor the needle into two halves, such that the left half is ++ smaller than the global period, and the right half is ++ periodic (with a period as large as NEEDLE_LEN - suffix). */ ++ suffix = critical_factorization (needle, needle_len, &period); ++ ++ /* Populate shift_table. For each possible byte value c, ++ shift_table[c] is the distance from the last occurrence of c to ++ the end of NEEDLE, or NEEDLE_LEN if c is absent from the NEEDLE. ++ shift_table[NEEDLE[NEEDLE_LEN - 1]] contains the only 0. */ ++ for (i = 0; i < 1U << CHAR_BIT; i++) ++ shift_table[i] = needle_len; ++ for (i = 0; i < needle_len; i++) ++ shift_table[CANON_ELEMENT (needle[i])] = needle_len - i - 1; ++ ++ /* Perform the search. Each iteration compares the right half ++ first. */ ++ if (CMP_FUNC (needle, needle + period, suffix) == 0) ++ { ++ /* Entire needle is periodic; a mismatch in the left half can ++ only advance by the period, so use memory to avoid rescanning ++ known occurrences of the period in the right half. */ ++ size_t memory = 0; ++ size_t shift; ++ j = 0; ++ while (AVAILABLE (haystack, haystack_len, j, needle_len)) ++ { ++ /* Check the last byte first; if it does not match, then ++ shift to the next possible match location. */ ++ shift = shift_table[CANON_ELEMENT (haystack[j + needle_len - 1])]; ++ if (0 < shift) ++ { ++ if (memory && shift < period) ++ { ++ /* Since needle is periodic, but the last period has ++ a byte out of place, there can be no match until ++ after the mismatch. */ ++ shift = needle_len - period; ++ } ++ memory = 0; ++ j += shift; ++ continue; ++ } ++ /* Scan for matches in right half. The last byte has ++ already been matched, by virtue of the shift table. */ ++ i = MAX (suffix, memory); ++ while (i < needle_len - 1 && (CANON_ELEMENT (needle[i]) ++ == CANON_ELEMENT (haystack[i + j]))) ++ ++i; ++ if (needle_len - 1 <= i) ++ { ++ /* Scan for matches in left half. */ ++ i = suffix - 1; ++ while (memory < i + 1 && (CANON_ELEMENT (needle[i]) ++ == CANON_ELEMENT (haystack[i + j]))) ++ --i; ++ if (i + 1 < memory + 1) ++ return (RETURN_TYPE) (haystack + j); ++ /* No match, so remember how many repetitions of period ++ on the right half were scanned. */ ++ j += period; ++ memory = needle_len - period; ++ } ++ else ++ { ++ j += i - suffix + 1; ++ memory = 0; ++ } ++ } ++ } ++ else ++ { ++ /* The two halves of needle are distinct; no extra memory is ++ required, and any mismatch results in a maximal shift. */ ++ size_t shift; ++ period = MAX (suffix, needle_len - suffix) + 1; ++ j = 0; ++ while (AVAILABLE (haystack, haystack_len, j, needle_len)) ++ { ++ /* Check the last byte first; if it does not match, then ++ shift to the next possible match location. */ ++ shift = shift_table[CANON_ELEMENT (haystack[j + needle_len - 1])]; ++ if (0 < shift) ++ { ++ j += shift; ++ continue; ++ } ++ /* Scan for matches in right half. The last byte has ++ already been matched, by virtue of the shift table. */ ++ i = suffix; ++ while (i < needle_len - 1 && (CANON_ELEMENT (needle[i]) ++ == CANON_ELEMENT (haystack[i + j]))) ++ ++i; ++ if (needle_len - 1 <= i) ++ { ++ /* Scan for matches in left half. */ ++ i = suffix - 1; ++ while (i != SIZE_MAX && (CANON_ELEMENT (needle[i]) ++ == CANON_ELEMENT (haystack[i + j]))) ++ --i; ++ if (i == SIZE_MAX) ++ return (RETURN_TYPE) (haystack + j); ++ j += period; ++ } ++ else ++ j += i - suffix + 1; ++ } ++ } ++ return NULL; ++} ++ ++#undef AVAILABLE ++#undef CANON_ELEMENT ++#undef CMP_FUNC ++#undef MAX ++#undef RETURN_TYPE +diff --git a/lib/strcasecmp.c b/lib/strcasecmp.c +new file mode 100644 +index 0000000..cb1a875 +--- /dev/null ++++ b/lib/strcasecmp.c +@@ -0,0 +1,62 @@ ++/* Case-insensitive string comparison function. ++ Copyright (C) 1998-1999, 2005-2007, 2009-2012 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2, or (at your option) ++ any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, see . */ ++ ++#include ++ ++/* Specification. */ ++#include ++ ++#include ++#include ++ ++#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) ++ ++/* Compare strings S1 and S2, ignoring case, returning less than, equal to or ++ greater than zero if S1 is lexicographically less than, equal to or greater ++ than S2. ++ Note: This function does not work with multibyte strings! */ ++ ++int ++strcasecmp (const char *s1, const char *s2) ++{ ++ const unsigned char *p1 = (const unsigned char *) s1; ++ const unsigned char *p2 = (const unsigned char *) s2; ++ unsigned char c1, c2; ++ ++ if (p1 == p2) ++ return 0; ++ ++ do ++ { ++ c1 = TOLOWER (*p1); ++ c2 = TOLOWER (*p2); ++ ++ if (c1 == '\0') ++ break; ++ ++ ++p1; ++ ++p2; ++ } ++ while (c1 == c2); ++ ++ if (UCHAR_MAX <= INT_MAX) ++ return c1 - c2; ++ else ++ /* On machines where 'char' and 'int' are types of the same size, the ++ difference of two 'unsigned char' values - including the sign bit - ++ doesn't fit in an 'int'. */ ++ return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0); ++} +diff --git a/lib/strcasestr.c b/lib/strcasestr.c +new file mode 100644 +index 0000000..e8ce38c +--- /dev/null ++++ b/lib/strcasestr.c +@@ -0,0 +1,82 @@ ++/* Case-insensitive searching in a string. ++ Copyright (C) 2005-2012 Free Software Foundation, Inc. ++ Written by Bruno Haible , 2005. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2, or (at your option) ++ any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, see . */ ++ ++#include ++ ++/* Specification. */ ++#include ++ ++#include ++#include ++#include ++ ++#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) ++ ++/* Two-Way algorithm. */ ++#define RETURN_TYPE char * ++#define AVAILABLE(h, h_l, j, n_l) \ ++ (!memchr ((h) + (h_l), '\0', (j) + (n_l) - (h_l)) \ ++ && ((h_l) = (j) + (n_l))) ++#define CANON_ELEMENT(c) TOLOWER (c) ++#define CMP_FUNC(p1, p2, l) \ ++ strncasecmp ((const char *) (p1), (const char *) (p2), l) ++#include "str-two-way.h" ++ ++/* Find the first occurrence of NEEDLE in HAYSTACK, using ++ case-insensitive comparison. This function gives unspecified ++ results in multibyte locales. */ ++char * ++strcasestr (const char *haystack_start, const char *needle_start) ++{ ++ const char *haystack = haystack_start; ++ const char *needle = needle_start; ++ size_t needle_len; /* Length of NEEDLE. */ ++ size_t haystack_len; /* Known minimum length of HAYSTACK. */ ++ bool ok = true; /* True if NEEDLE is prefix of HAYSTACK. */ ++ ++ /* Determine length of NEEDLE, and in the process, make sure ++ HAYSTACK is at least as long (no point processing all of a long ++ NEEDLE if HAYSTACK is too short). */ ++ while (*haystack && *needle) ++ { ++ ok &= (TOLOWER ((unsigned char) *haystack) ++ == TOLOWER ((unsigned char) *needle)); ++ haystack++; ++ needle++; ++ } ++ if (*needle) ++ return NULL; ++ if (ok) ++ return (char *) haystack_start; ++ needle_len = needle - needle_start; ++ haystack = haystack_start + 1; ++ haystack_len = needle_len - 1; ++ ++ /* Perform the search. Abstract memory is considered to be an array ++ of 'unsigned char' values, not an array of 'char' values. See ++ ISO C 99 section 6.2.6.1. */ ++ if (needle_len < LONG_NEEDLE_THRESHOLD) ++ return two_way_short_needle ((const unsigned char *) haystack, ++ haystack_len, ++ (const unsigned char *) needle_start, ++ needle_len); ++ return two_way_long_needle ((const unsigned char *) haystack, haystack_len, ++ (const unsigned char *) needle_start, ++ needle_len); ++} ++ ++#undef LONG_NEEDLE_THRESHOLD +diff --git a/lib/string.in.h b/lib/string.in.h +new file mode 100644 +index 0000000..8cbe8cd +--- /dev/null ++++ b/lib/string.in.h +@@ -0,0 +1,1029 @@ ++/* A GNU-like . ++ ++ Copyright (C) 1995-1996, 2001-2012 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2, or (at your option) ++ any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, see . */ ++ ++#ifndef _ at GUARD_PREFIX@_STRING_H ++ ++#if __GNUC__ >= 3 ++ at PRAGMA_SYSTEM_HEADER@ ++#endif ++ at PRAGMA_COLUMNS@ ++ ++/* The include_next requires a split double-inclusion guard. */ ++#@INCLUDE_NEXT@ @NEXT_STRING_H@ ++ ++#ifndef _ at GUARD_PREFIX@_STRING_H ++#define _ at GUARD_PREFIX@_STRING_H ++ ++/* NetBSD 5.0 mis-defines NULL. */ ++#include ++ ++/* MirBSD defines mbslen as a macro. */ ++#if @GNULIB_MBSLEN@ && defined __MirBSD__ ++# include ++#endif ++ ++/* The __attribute__ feature is available in gcc versions 2.5 and later. ++ The attribute __pure__ was added in gcc 2.96. */ ++#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) ++# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) ++#else ++# define _GL_ATTRIBUTE_PURE /* empty */ ++#endif ++ ++/* NetBSD 5.0 declares strsignal in , not in . */ ++/* But in any case avoid namespace pollution on glibc systems. */ ++#if (@GNULIB_STRSIGNAL@ || defined GNULIB_POSIXCHECK) && defined __NetBSD__ \ ++ && ! defined __GLIBC__ ++# include ++#endif ++ ++/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ ++ ++/* The definition of _GL_ARG_NONNULL is copied here. */ ++ ++/* The definition of _GL_WARN_ON_USE is copied here. */ ++ ++ ++/* Find the index of the least-significant set bit. */ ++#if @GNULIB_FFSL@ ++# if !@HAVE_FFSL@ ++_GL_FUNCDECL_SYS (ffsl, int, (long int i)); ++# endif ++_GL_CXXALIAS_SYS (ffsl, int, (long int i)); ++_GL_CXXALIASWARN (ffsl); ++#elif defined GNULIB_POSIXCHECK ++# undef ffsl ++# if HAVE_RAW_DECL_FFSL ++_GL_WARN_ON_USE (ffsl, "ffsl is not portable - use the ffsl module"); ++# endif ++#endif ++ ++ ++/* Find the index of the least-significant set bit. */ ++#if @GNULIB_FFSLL@ ++# if !@HAVE_FFSLL@ ++_GL_FUNCDECL_SYS (ffsll, int, (long long int i)); ++# endif ++_GL_CXXALIAS_SYS (ffsll, int, (long long int i)); ++_GL_CXXALIASWARN (ffsll); ++#elif defined GNULIB_POSIXCHECK ++# undef ffsll ++# if HAVE_RAW_DECL_FFSLL ++_GL_WARN_ON_USE (ffsll, "ffsll is not portable - use the ffsll module"); ++# endif ++#endif ++ ++ ++/* Return the first instance of C within N bytes of S, or NULL. */ ++#if @GNULIB_MEMCHR@ ++# if @REPLACE_MEMCHR@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# define memchr rpl_memchr ++# endif ++_GL_FUNCDECL_RPL (memchr, void *, (void const *__s, int __c, size_t __n) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_RPL (memchr, void *, (void const *__s, int __c, size_t __n)); ++# else ++# if ! @HAVE_MEMCHR@ ++_GL_FUNCDECL_SYS (memchr, void *, (void const *__s, int __c, size_t __n) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1))); ++# endif ++ /* On some systems, this function is defined as an overloaded function: ++ extern "C" { const void * std::memchr (const void *, int, size_t); } ++ extern "C++" { void * std::memchr (void *, int, size_t); } */ ++_GL_CXXALIAS_SYS_CAST2 (memchr, ++ void *, (void const *__s, int __c, size_t __n), ++ void const *, (void const *__s, int __c, size_t __n)); ++# endif ++# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ ++ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) ++_GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n)); ++_GL_CXXALIASWARN1 (memchr, void const *, ++ (void const *__s, int __c, size_t __n)); ++# else ++_GL_CXXALIASWARN (memchr); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef memchr ++/* Assume memchr is always declared. */ ++_GL_WARN_ON_USE (memchr, "memchr has platform-specific bugs - " ++ "use gnulib module memchr for portability" ); ++#endif ++ ++/* Return the first occurrence of NEEDLE in HAYSTACK. */ ++#if @GNULIB_MEMMEM@ ++# if @REPLACE_MEMMEM@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# define memmem rpl_memmem ++# endif ++_GL_FUNCDECL_RPL (memmem, void *, ++ (void const *__haystack, size_t __haystack_len, ++ void const *__needle, size_t __needle_len) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1, 3))); ++_GL_CXXALIAS_RPL (memmem, void *, ++ (void const *__haystack, size_t __haystack_len, ++ void const *__needle, size_t __needle_len)); ++# else ++# if ! @HAVE_DECL_MEMMEM@ ++_GL_FUNCDECL_SYS (memmem, void *, ++ (void const *__haystack, size_t __haystack_len, ++ void const *__needle, size_t __needle_len) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1, 3))); ++# endif ++_GL_CXXALIAS_SYS (memmem, void *, ++ (void const *__haystack, size_t __haystack_len, ++ void const *__needle, size_t __needle_len)); ++# endif ++_GL_CXXALIASWARN (memmem); ++#elif defined GNULIB_POSIXCHECK ++# undef memmem ++# if HAVE_RAW_DECL_MEMMEM ++_GL_WARN_ON_USE (memmem, "memmem is unportable and often quadratic - " ++ "use gnulib module memmem-simple for portability, " ++ "and module memmem for speed" ); ++# endif ++#endif ++ ++/* Copy N bytes of SRC to DEST, return pointer to bytes after the ++ last written byte. */ ++#if @GNULIB_MEMPCPY@ ++# if ! @HAVE_MEMPCPY@ ++_GL_FUNCDECL_SYS (mempcpy, void *, ++ (void *restrict __dest, void const *restrict __src, ++ size_t __n) ++ _GL_ARG_NONNULL ((1, 2))); ++# endif ++_GL_CXXALIAS_SYS (mempcpy, void *, ++ (void *restrict __dest, void const *restrict __src, ++ size_t __n)); ++_GL_CXXALIASWARN (mempcpy); ++#elif defined GNULIB_POSIXCHECK ++# undef mempcpy ++# if HAVE_RAW_DECL_MEMPCPY ++_GL_WARN_ON_USE (mempcpy, "mempcpy is unportable - " ++ "use gnulib module mempcpy for portability"); ++# endif ++#endif ++ ++/* Search backwards through a block for a byte (specified as an int). */ ++#if @GNULIB_MEMRCHR@ ++# if ! @HAVE_DECL_MEMRCHR@ ++_GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1))); ++# endif ++ /* On some systems, this function is defined as an overloaded function: ++ extern "C++" { const void * std::memrchr (const void *, int, size_t); } ++ extern "C++" { void * std::memrchr (void *, int, size_t); } */ ++_GL_CXXALIAS_SYS_CAST2 (memrchr, ++ void *, (void const *, int, size_t), ++ void const *, (void const *, int, size_t)); ++# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ ++ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) ++_GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t)); ++_GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t)); ++# else ++_GL_CXXALIASWARN (memrchr); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef memrchr ++# if HAVE_RAW_DECL_MEMRCHR ++_GL_WARN_ON_USE (memrchr, "memrchr is unportable - " ++ "use gnulib module memrchr for portability"); ++# endif ++#endif ++ ++/* Find the first occurrence of C in S. More efficient than ++ memchr(S,C,N), at the expense of undefined behavior if C does not ++ occur within N bytes. */ ++#if @GNULIB_RAWMEMCHR@ ++# if ! @HAVE_RAWMEMCHR@ ++_GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int __c_in) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1))); ++# endif ++ /* On some systems, this function is defined as an overloaded function: ++ extern "C++" { const void * std::rawmemchr (const void *, int); } ++ extern "C++" { void * std::rawmemchr (void *, int); } */ ++_GL_CXXALIAS_SYS_CAST2 (rawmemchr, ++ void *, (void const *__s, int __c_in), ++ void const *, (void const *__s, int __c_in)); ++# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ ++ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) ++_GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in)); ++_GL_CXXALIASWARN1 (rawmemchr, void const *, (void const *__s, int __c_in)); ++# else ++_GL_CXXALIASWARN (rawmemchr); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef rawmemchr ++# if HAVE_RAW_DECL_RAWMEMCHR ++_GL_WARN_ON_USE (rawmemchr, "rawmemchr is unportable - " ++ "use gnulib module rawmemchr for portability"); ++# endif ++#endif ++ ++/* Copy SRC to DST, returning the address of the terminating '\0' in DST. */ ++#if @GNULIB_STPCPY@ ++# if ! @HAVE_STPCPY@ ++_GL_FUNCDECL_SYS (stpcpy, char *, ++ (char *restrict __dst, char const *restrict __src) ++ _GL_ARG_NONNULL ((1, 2))); ++# endif ++_GL_CXXALIAS_SYS (stpcpy, char *, ++ (char *restrict __dst, char const *restrict __src)); ++_GL_CXXALIASWARN (stpcpy); ++#elif defined GNULIB_POSIXCHECK ++# undef stpcpy ++# if HAVE_RAW_DECL_STPCPY ++_GL_WARN_ON_USE (stpcpy, "stpcpy is unportable - " ++ "use gnulib module stpcpy for portability"); ++# endif ++#endif ++ ++/* Copy no more than N bytes of SRC to DST, returning a pointer past the ++ last non-NUL byte written into DST. */ ++#if @GNULIB_STPNCPY@ ++# if @REPLACE_STPNCPY@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef stpncpy ++# define stpncpy rpl_stpncpy ++# endif ++_GL_FUNCDECL_RPL (stpncpy, char *, ++ (char *restrict __dst, char const *restrict __src, ++ size_t __n) ++ _GL_ARG_NONNULL ((1, 2))); ++_GL_CXXALIAS_RPL (stpncpy, char *, ++ (char *restrict __dst, char const *restrict __src, ++ size_t __n)); ++# else ++# if ! @HAVE_STPNCPY@ ++_GL_FUNCDECL_SYS (stpncpy, char *, ++ (char *restrict __dst, char const *restrict __src, ++ size_t __n) ++ _GL_ARG_NONNULL ((1, 2))); ++# endif ++_GL_CXXALIAS_SYS (stpncpy, char *, ++ (char *restrict __dst, char const *restrict __src, ++ size_t __n)); ++# endif ++_GL_CXXALIASWARN (stpncpy); ++#elif defined GNULIB_POSIXCHECK ++# undef stpncpy ++# if HAVE_RAW_DECL_STPNCPY ++_GL_WARN_ON_USE (stpncpy, "stpncpy is unportable - " ++ "use gnulib module stpncpy for portability"); ++# endif ++#endif ++ ++#if defined GNULIB_POSIXCHECK ++/* strchr() does not work with multibyte strings if the locale encoding is ++ GB18030 and the character to be searched is a digit. */ ++# undef strchr ++/* Assume strchr is always declared. */ ++_GL_WARN_ON_USE (strchr, "strchr cannot work correctly on character strings " ++ "in some multibyte locales - " ++ "use mbschr if you care about internationalization"); ++#endif ++ ++/* Find the first occurrence of C in S or the final NUL byte. */ ++#if @GNULIB_STRCHRNUL@ ++# if @REPLACE_STRCHRNUL@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# define strchrnul rpl_strchrnul ++# endif ++_GL_FUNCDECL_RPL (strchrnul, char *, (const char *__s, int __c_in) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_RPL (strchrnul, char *, ++ (const char *str, int ch)); ++# else ++# if ! @HAVE_STRCHRNUL@ ++_GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int __c_in) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1))); ++# endif ++ /* On some systems, this function is defined as an overloaded function: ++ extern "C++" { const char * std::strchrnul (const char *, int); } ++ extern "C++" { char * std::strchrnul (char *, int); } */ ++_GL_CXXALIAS_SYS_CAST2 (strchrnul, ++ char *, (char const *__s, int __c_in), ++ char const *, (char const *__s, int __c_in)); ++# endif ++# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ ++ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) ++_GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in)); ++_GL_CXXALIASWARN1 (strchrnul, char const *, (char const *__s, int __c_in)); ++# else ++_GL_CXXALIASWARN (strchrnul); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef strchrnul ++# if HAVE_RAW_DECL_STRCHRNUL ++_GL_WARN_ON_USE (strchrnul, "strchrnul is unportable - " ++ "use gnulib module strchrnul for portability"); ++# endif ++#endif ++ ++/* Duplicate S, returning an identical malloc'd string. */ ++#if @GNULIB_STRDUP@ ++# if @REPLACE_STRDUP@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef strdup ++# define strdup rpl_strdup ++# endif ++_GL_FUNCDECL_RPL (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_RPL (strdup, char *, (char const *__s)); ++# else ++# if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup ++ /* strdup exists as a function and as a macro. Get rid of the macro. */ ++# undef strdup ++# endif ++# if !(@HAVE_DECL_STRDUP@ || defined strdup) ++_GL_FUNCDECL_SYS (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); ++# endif ++_GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); ++# endif ++_GL_CXXALIASWARN (strdup); ++#elif defined GNULIB_POSIXCHECK ++# undef strdup ++# if HAVE_RAW_DECL_STRDUP ++_GL_WARN_ON_USE (strdup, "strdup is unportable - " ++ "use gnulib module strdup for portability"); ++# endif ++#endif ++ ++/* Append no more than N characters from SRC onto DEST. */ ++#if @GNULIB_STRNCAT@ ++# if @REPLACE_STRNCAT@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef strncat ++# define strncat rpl_strncat ++# endif ++_GL_FUNCDECL_RPL (strncat, char *, (char *dest, const char *src, size_t n) ++ _GL_ARG_NONNULL ((1, 2))); ++_GL_CXXALIAS_RPL (strncat, char *, (char *dest, const char *src, size_t n)); ++# else ++_GL_CXXALIAS_SYS (strncat, char *, (char *dest, const char *src, size_t n)); ++# endif ++_GL_CXXALIASWARN (strncat); ++#elif defined GNULIB_POSIXCHECK ++# undef strncat ++# if HAVE_RAW_DECL_STRNCAT ++_GL_WARN_ON_USE (strncat, "strncat is unportable - " ++ "use gnulib module strncat for portability"); ++# endif ++#endif ++ ++/* Return a newly allocated copy of at most N bytes of STRING. */ ++#if @GNULIB_STRNDUP@ ++# if @REPLACE_STRNDUP@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef strndup ++# define strndup rpl_strndup ++# endif ++_GL_FUNCDECL_RPL (strndup, char *, (char const *__string, size_t __n) ++ _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_RPL (strndup, char *, (char const *__string, size_t __n)); ++# else ++# if ! @HAVE_DECL_STRNDUP@ ++_GL_FUNCDECL_SYS (strndup, char *, (char const *__string, size_t __n) ++ _GL_ARG_NONNULL ((1))); ++# endif ++_GL_CXXALIAS_SYS (strndup, char *, (char const *__string, size_t __n)); ++# endif ++_GL_CXXALIASWARN (strndup); ++#elif defined GNULIB_POSIXCHECK ++# undef strndup ++# if HAVE_RAW_DECL_STRNDUP ++_GL_WARN_ON_USE (strndup, "strndup is unportable - " ++ "use gnulib module strndup for portability"); ++# endif ++#endif ++ ++/* Find the length (number of bytes) of STRING, but scan at most ++ MAXLEN bytes. If no '\0' terminator is found in that many bytes, ++ return MAXLEN. */ ++#if @GNULIB_STRNLEN@ ++# if @REPLACE_STRNLEN@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef strnlen ++# define strnlen rpl_strnlen ++# endif ++_GL_FUNCDECL_RPL (strnlen, size_t, (char const *__string, size_t __maxlen) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_RPL (strnlen, size_t, (char const *__string, size_t __maxlen)); ++# else ++# if ! @HAVE_DECL_STRNLEN@ ++_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__string, size_t __maxlen) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1))); ++# endif ++_GL_CXXALIAS_SYS (strnlen, size_t, (char const *__string, size_t __maxlen)); ++# endif ++_GL_CXXALIASWARN (strnlen); ++#elif defined GNULIB_POSIXCHECK ++# undef strnlen ++# if HAVE_RAW_DECL_STRNLEN ++_GL_WARN_ON_USE (strnlen, "strnlen is unportable - " ++ "use gnulib module strnlen for portability"); ++# endif ++#endif ++ ++#if defined GNULIB_POSIXCHECK ++/* strcspn() assumes the second argument is a list of single-byte characters. ++ Even in this simple case, it does not work with multibyte strings if the ++ locale encoding is GB18030 and one of the characters to be searched is a ++ digit. */ ++# undef strcspn ++/* Assume strcspn is always declared. */ ++_GL_WARN_ON_USE (strcspn, "strcspn cannot work correctly on character strings " ++ "in multibyte locales - " ++ "use mbscspn if you care about internationalization"); ++#endif ++ ++/* Find the first occurrence in S of any character in ACCEPT. */ ++#if @GNULIB_STRPBRK@ ++# if ! @HAVE_STRPBRK@ ++_GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char const *__accept) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1, 2))); ++# endif ++ /* On some systems, this function is defined as an overloaded function: ++ extern "C" { const char * strpbrk (const char *, const char *); } ++ extern "C++" { char * strpbrk (char *, const char *); } */ ++_GL_CXXALIAS_SYS_CAST2 (strpbrk, ++ char *, (char const *__s, char const *__accept), ++ const char *, (char const *__s, char const *__accept)); ++# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ ++ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) ++_GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept)); ++_GL_CXXALIASWARN1 (strpbrk, char const *, ++ (char const *__s, char const *__accept)); ++# else ++_GL_CXXALIASWARN (strpbrk); ++# endif ++# if defined GNULIB_POSIXCHECK ++/* strpbrk() assumes the second argument is a list of single-byte characters. ++ Even in this simple case, it does not work with multibyte strings if the ++ locale encoding is GB18030 and one of the characters to be searched is a ++ digit. */ ++# undef strpbrk ++_GL_WARN_ON_USE (strpbrk, "strpbrk cannot work correctly on character strings " ++ "in multibyte locales - " ++ "use mbspbrk if you care about internationalization"); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef strpbrk ++# if HAVE_RAW_DECL_STRPBRK ++_GL_WARN_ON_USE (strpbrk, "strpbrk is unportable - " ++ "use gnulib module strpbrk for portability"); ++# endif ++#endif ++ ++#if defined GNULIB_POSIXCHECK ++/* strspn() assumes the second argument is a list of single-byte characters. ++ Even in this simple case, it cannot work with multibyte strings. */ ++# undef strspn ++/* Assume strspn is always declared. */ ++_GL_WARN_ON_USE (strspn, "strspn cannot work correctly on character strings " ++ "in multibyte locales - " ++ "use mbsspn if you care about internationalization"); ++#endif ++ ++#if defined GNULIB_POSIXCHECK ++/* strrchr() does not work with multibyte strings if the locale encoding is ++ GB18030 and the character to be searched is a digit. */ ++# undef strrchr ++/* Assume strrchr is always declared. */ ++_GL_WARN_ON_USE (strrchr, "strrchr cannot work correctly on character strings " ++ "in some multibyte locales - " ++ "use mbsrchr if you care about internationalization"); ++#endif ++ ++/* Search the next delimiter (char listed in DELIM) starting at *STRINGP. ++ If one is found, overwrite it with a NUL, and advance *STRINGP ++ to point to the next char after it. Otherwise, set *STRINGP to NULL. ++ If *STRINGP was already NULL, nothing happens. ++ Return the old value of *STRINGP. ++ ++ This is a variant of strtok() that is multithread-safe and supports ++ empty fields. ++ ++ Caveat: It modifies the original string. ++ Caveat: These functions cannot be used on constant strings. ++ Caveat: The identity of the delimiting character is lost. ++ Caveat: It doesn't work with multibyte strings unless all of the delimiter ++ characters are ASCII characters < 0x30. ++ ++ See also strtok_r(). */ ++#if @GNULIB_STRSEP@ ++# if ! @HAVE_STRSEP@ ++_GL_FUNCDECL_SYS (strsep, char *, ++ (char **restrict __stringp, char const *restrict __delim) ++ _GL_ARG_NONNULL ((1, 2))); ++# endif ++_GL_CXXALIAS_SYS (strsep, char *, ++ (char **restrict __stringp, char const *restrict __delim)); ++_GL_CXXALIASWARN (strsep); ++# if defined GNULIB_POSIXCHECK ++# undef strsep ++_GL_WARN_ON_USE (strsep, "strsep cannot work correctly on character strings " ++ "in multibyte locales - " ++ "use mbssep if you care about internationalization"); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef strsep ++# if HAVE_RAW_DECL_STRSEP ++_GL_WARN_ON_USE (strsep, "strsep is unportable - " ++ "use gnulib module strsep for portability"); ++# endif ++#endif ++ ++#if @GNULIB_STRSTR@ ++# if @REPLACE_STRSTR@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# define strstr rpl_strstr ++# endif ++_GL_FUNCDECL_RPL (strstr, char *, (const char *haystack, const char *needle) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1, 2))); ++_GL_CXXALIAS_RPL (strstr, char *, (const char *haystack, const char *needle)); ++# else ++ /* On some systems, this function is defined as an overloaded function: ++ extern "C++" { const char * strstr (const char *, const char *); } ++ extern "C++" { char * strstr (char *, const char *); } */ ++_GL_CXXALIAS_SYS_CAST2 (strstr, ++ char *, (const char *haystack, const char *needle), ++ const char *, (const char *haystack, const char *needle)); ++# endif ++# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ ++ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) ++_GL_CXXALIASWARN1 (strstr, char *, (char *haystack, const char *needle)); ++_GL_CXXALIASWARN1 (strstr, const char *, ++ (const char *haystack, const char *needle)); ++# else ++_GL_CXXALIASWARN (strstr); ++# endif ++#elif defined GNULIB_POSIXCHECK ++/* strstr() does not work with multibyte strings if the locale encoding is ++ different from UTF-8: ++ POSIX says that it operates on "strings", and "string" in POSIX is defined ++ as a sequence of bytes, not of characters. */ ++# undef strstr ++/* Assume strstr is always declared. */ ++_GL_WARN_ON_USE (strstr, "strstr is quadratic on many systems, and cannot " ++ "work correctly on character strings in most " ++ "multibyte locales - " ++ "use mbsstr if you care about internationalization, " ++ "or use strstr if you care about speed"); ++#endif ++ ++/* Find the first occurrence of NEEDLE in HAYSTACK, using case-insensitive ++ comparison. */ ++#if @GNULIB_STRCASESTR@ ++# if @REPLACE_STRCASESTR@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# define strcasestr rpl_strcasestr ++# endif ++_GL_FUNCDECL_RPL (strcasestr, char *, ++ (const char *haystack, const char *needle) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1, 2))); ++_GL_CXXALIAS_RPL (strcasestr, char *, ++ (const char *haystack, const char *needle)); ++# else ++# if ! @HAVE_STRCASESTR@ ++_GL_FUNCDECL_SYS (strcasestr, char *, ++ (const char *haystack, const char *needle) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1, 2))); ++# endif ++ /* On some systems, this function is defined as an overloaded function: ++ extern "C++" { const char * strcasestr (const char *, const char *); } ++ extern "C++" { char * strcasestr (char *, const char *); } */ ++_GL_CXXALIAS_SYS_CAST2 (strcasestr, ++ char *, (const char *haystack, const char *needle), ++ const char *, (const char *haystack, const char *needle)); ++# endif ++# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ ++ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) ++_GL_CXXALIASWARN1 (strcasestr, char *, (char *haystack, const char *needle)); ++_GL_CXXALIASWARN1 (strcasestr, const char *, ++ (const char *haystack, const char *needle)); ++# else ++_GL_CXXALIASWARN (strcasestr); ++# endif ++#elif defined GNULIB_POSIXCHECK ++/* strcasestr() does not work with multibyte strings: ++ It is a glibc extension, and glibc implements it only for unibyte ++ locales. */ ++# undef strcasestr ++# if HAVE_RAW_DECL_STRCASESTR ++_GL_WARN_ON_USE (strcasestr, "strcasestr does work correctly on character " ++ "strings in multibyte locales - " ++ "use mbscasestr if you care about " ++ "internationalization, or use c-strcasestr if you want " ++ "a locale independent function"); ++# endif ++#endif ++ ++/* Parse S into tokens separated by characters in DELIM. ++ If S is NULL, the saved pointer in SAVE_PTR is used as ++ the next starting point. For example: ++ char s[] = "-abc-=-def"; ++ char *sp; ++ x = strtok_r(s, "-", &sp); // x = "abc", sp = "=-def" ++ x = strtok_r(NULL, "-=", &sp); // x = "def", sp = NULL ++ x = strtok_r(NULL, "=", &sp); // x = NULL ++ // s = "abc\0-def\0" ++ ++ This is a variant of strtok() that is multithread-safe. ++ ++ For the POSIX documentation for this function, see: ++ http://www.opengroup.org/susv3xsh/strtok.html ++ ++ Caveat: It modifies the original string. ++ Caveat: These functions cannot be used on constant strings. ++ Caveat: The identity of the delimiting character is lost. ++ Caveat: It doesn't work with multibyte strings unless all of the delimiter ++ characters are ASCII characters < 0x30. ++ ++ See also strsep(). */ ++#if @GNULIB_STRTOK_R@ ++# if @REPLACE_STRTOK_R@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef strtok_r ++# define strtok_r rpl_strtok_r ++# endif ++_GL_FUNCDECL_RPL (strtok_r, char *, ++ (char *restrict s, char const *restrict delim, ++ char **restrict save_ptr) ++ _GL_ARG_NONNULL ((2, 3))); ++_GL_CXXALIAS_RPL (strtok_r, char *, ++ (char *restrict s, char const *restrict delim, ++ char **restrict save_ptr)); ++# else ++# if @UNDEFINE_STRTOK_R@ || defined GNULIB_POSIXCHECK ++# undef strtok_r ++# endif ++# if ! @HAVE_DECL_STRTOK_R@ ++_GL_FUNCDECL_SYS (strtok_r, char *, ++ (char *restrict s, char const *restrict delim, ++ char **restrict save_ptr) ++ _GL_ARG_NONNULL ((2, 3))); ++# endif ++_GL_CXXALIAS_SYS (strtok_r, char *, ++ (char *restrict s, char const *restrict delim, ++ char **restrict save_ptr)); ++# endif ++_GL_CXXALIASWARN (strtok_r); ++# if defined GNULIB_POSIXCHECK ++_GL_WARN_ON_USE (strtok_r, "strtok_r cannot work correctly on character " ++ "strings in multibyte locales - " ++ "use mbstok_r if you care about internationalization"); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef strtok_r ++# if HAVE_RAW_DECL_STRTOK_R ++_GL_WARN_ON_USE (strtok_r, "strtok_r is unportable - " ++ "use gnulib module strtok_r for portability"); ++# endif ++#endif ++ ++ ++/* The following functions are not specified by POSIX. They are gnulib ++ extensions. */ ++ ++#if @GNULIB_MBSLEN@ ++/* Return the number of multibyte characters in the character string STRING. ++ This considers multibyte characters, unlike strlen, which counts bytes. */ ++# ifdef __MirBSD__ /* MirBSD defines mbslen as a macro. Override it. */ ++# undef mbslen ++# endif ++# if @HAVE_MBSLEN@ /* AIX, OSF/1, MirBSD define mbslen already in libc. */ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# define mbslen rpl_mbslen ++# endif ++_GL_FUNCDECL_RPL (mbslen, size_t, (const char *string) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_RPL (mbslen, size_t, (const char *string)); ++# else ++_GL_FUNCDECL_SYS (mbslen, size_t, (const char *string) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_SYS (mbslen, size_t, (const char *string)); ++# endif ++_GL_CXXALIASWARN (mbslen); ++#endif ++ ++#if @GNULIB_MBSNLEN@ ++/* Return the number of multibyte characters in the character string starting ++ at STRING and ending at STRING + LEN. */ ++_GL_EXTERN_C size_t mbsnlen (const char *string, size_t len) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1)); ++#endif ++ ++#if @GNULIB_MBSCHR@ ++/* Locate the first single-byte character C in the character string STRING, ++ and return a pointer to it. Return NULL if C is not found in STRING. ++ Unlike strchr(), this function works correctly in multibyte locales with ++ encodings such as GB18030. */ ++# if defined __hpux ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# define mbschr rpl_mbschr /* avoid collision with HP-UX function */ ++# endif ++_GL_FUNCDECL_RPL (mbschr, char *, (const char *string, int c) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_RPL (mbschr, char *, (const char *string, int c)); ++# else ++_GL_FUNCDECL_SYS (mbschr, char *, (const char *string, int c) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_SYS (mbschr, char *, (const char *string, int c)); ++# endif ++_GL_CXXALIASWARN (mbschr); ++#endif ++ ++#if @GNULIB_MBSRCHR@ ++/* Locate the last single-byte character C in the character string STRING, ++ and return a pointer to it. Return NULL if C is not found in STRING. ++ Unlike strrchr(), this function works correctly in multibyte locales with ++ encodings such as GB18030. */ ++# if defined __hpux || defined __INTERIX ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# define mbsrchr rpl_mbsrchr /* avoid collision with system function */ ++# endif ++_GL_FUNCDECL_RPL (mbsrchr, char *, (const char *string, int c) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_RPL (mbsrchr, char *, (const char *string, int c)); ++# else ++_GL_FUNCDECL_SYS (mbsrchr, char *, (const char *string, int c) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_SYS (mbsrchr, char *, (const char *string, int c)); ++# endif ++_GL_CXXALIASWARN (mbsrchr); ++#endif ++ ++#if @GNULIB_MBSSTR@ ++/* Find the first occurrence of the character string NEEDLE in the character ++ string HAYSTACK. Return NULL if NEEDLE is not found in HAYSTACK. ++ Unlike strstr(), this function works correctly in multibyte locales with ++ encodings different from UTF-8. */ ++_GL_EXTERN_C char * mbsstr (const char *haystack, const char *needle) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1, 2)); ++#endif ++ ++#if @GNULIB_MBSCASECMP@ ++/* Compare the character strings S1 and S2, ignoring case, returning less than, ++ equal to or greater than zero if S1 is lexicographically less than, equal to ++ or greater than S2. ++ Note: This function may, in multibyte locales, return 0 for strings of ++ different lengths! ++ Unlike strcasecmp(), this function works correctly in multibyte locales. */ ++_GL_EXTERN_C int mbscasecmp (const char *s1, const char *s2) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1, 2)); ++#endif ++ ++#if @GNULIB_MBSNCASECMP@ ++/* Compare the initial segment of the character string S1 consisting of at most ++ N characters with the initial segment of the character string S2 consisting ++ of at most N characters, ignoring case, returning less than, equal to or ++ greater than zero if the initial segment of S1 is lexicographically less ++ than, equal to or greater than the initial segment of S2. ++ Note: This function may, in multibyte locales, return 0 for initial segments ++ of different lengths! ++ Unlike strncasecmp(), this function works correctly in multibyte locales. ++ But beware that N is not a byte count but a character count! */ ++_GL_EXTERN_C int mbsncasecmp (const char *s1, const char *s2, size_t n) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1, 2)); ++#endif ++ ++#if @GNULIB_MBSPCASECMP@ ++/* Compare the initial segment of the character string STRING consisting of ++ at most mbslen (PREFIX) characters with the character string PREFIX, ++ ignoring case. If the two match, return a pointer to the first byte ++ after this prefix in STRING. Otherwise, return NULL. ++ Note: This function may, in multibyte locales, return non-NULL if STRING ++ is of smaller length than PREFIX! ++ Unlike strncasecmp(), this function works correctly in multibyte ++ locales. */ ++_GL_EXTERN_C char * mbspcasecmp (const char *string, const char *prefix) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1, 2)); ++#endif ++ ++#if @GNULIB_MBSCASESTR@ ++/* Find the first occurrence of the character string NEEDLE in the character ++ string HAYSTACK, using case-insensitive comparison. ++ Note: This function may, in multibyte locales, return success even if ++ strlen (haystack) < strlen (needle) ! ++ Unlike strcasestr(), this function works correctly in multibyte locales. */ ++_GL_EXTERN_C char * mbscasestr (const char *haystack, const char *needle) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1, 2)); ++#endif ++ ++#if @GNULIB_MBSCSPN@ ++/* Find the first occurrence in the character string STRING of any character ++ in the character string ACCEPT. Return the number of bytes from the ++ beginning of the string to this occurrence, or to the end of the string ++ if none exists. ++ Unlike strcspn(), this function works correctly in multibyte locales. */ ++_GL_EXTERN_C size_t mbscspn (const char *string, const char *accept) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1, 2)); ++#endif ++ ++#if @GNULIB_MBSPBRK@ ++/* Find the first occurrence in the character string STRING of any character ++ in the character string ACCEPT. Return the pointer to it, or NULL if none ++ exists. ++ Unlike strpbrk(), this function works correctly in multibyte locales. */ ++# if defined __hpux ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# define mbspbrk rpl_mbspbrk /* avoid collision with HP-UX function */ ++# endif ++_GL_FUNCDECL_RPL (mbspbrk, char *, (const char *string, const char *accept) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1, 2))); ++_GL_CXXALIAS_RPL (mbspbrk, char *, (const char *string, const char *accept)); ++# else ++_GL_FUNCDECL_SYS (mbspbrk, char *, (const char *string, const char *accept) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1, 2))); ++_GL_CXXALIAS_SYS (mbspbrk, char *, (const char *string, const char *accept)); ++# endif ++_GL_CXXALIASWARN (mbspbrk); ++#endif ++ ++#if @GNULIB_MBSSPN@ ++/* Find the first occurrence in the character string STRING of any character ++ not in the character string REJECT. Return the number of bytes from the ++ beginning of the string to this occurrence, or to the end of the string ++ if none exists. ++ Unlike strspn(), this function works correctly in multibyte locales. */ ++_GL_EXTERN_C size_t mbsspn (const char *string, const char *reject) ++ _GL_ATTRIBUTE_PURE ++ _GL_ARG_NONNULL ((1, 2)); ++#endif ++ ++#if @GNULIB_MBSSEP@ ++/* Search the next delimiter (multibyte character listed in the character ++ string DELIM) starting at the character string *STRINGP. ++ If one is found, overwrite it with a NUL, and advance *STRINGP to point ++ to the next multibyte character after it. Otherwise, set *STRINGP to NULL. ++ If *STRINGP was already NULL, nothing happens. ++ Return the old value of *STRINGP. ++ ++ This is a variant of mbstok_r() that supports empty fields. ++ ++ Caveat: It modifies the original string. ++ Caveat: These functions cannot be used on constant strings. ++ Caveat: The identity of the delimiting character is lost. ++ ++ See also mbstok_r(). */ ++_GL_EXTERN_C char * mbssep (char **stringp, const char *delim) ++ _GL_ARG_NONNULL ((1, 2)); ++#endif ++ ++#if @GNULIB_MBSTOK_R@ ++/* Parse the character string STRING into tokens separated by characters in ++ the character string DELIM. ++ If STRING is NULL, the saved pointer in SAVE_PTR is used as ++ the next starting point. For example: ++ char s[] = "-abc-=-def"; ++ char *sp; ++ x = mbstok_r(s, "-", &sp); // x = "abc", sp = "=-def" ++ x = mbstok_r(NULL, "-=", &sp); // x = "def", sp = NULL ++ x = mbstok_r(NULL, "=", &sp); // x = NULL ++ // s = "abc\0-def\0" ++ ++ Caveat: It modifies the original string. ++ Caveat: These functions cannot be used on constant strings. ++ Caveat: The identity of the delimiting character is lost. ++ ++ See also mbssep(). */ ++_GL_EXTERN_C char * mbstok_r (char *string, const char *delim, char **save_ptr) ++ _GL_ARG_NONNULL ((2, 3)); ++#endif ++ ++/* Map any int, typically from errno, into an error message. */ ++#if @GNULIB_STRERROR@ ++# if @REPLACE_STRERROR@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef strerror ++# define strerror rpl_strerror ++# endif ++_GL_FUNCDECL_RPL (strerror, char *, (int)); ++_GL_CXXALIAS_RPL (strerror, char *, (int)); ++# else ++_GL_CXXALIAS_SYS (strerror, char *, (int)); ++# endif ++_GL_CXXALIASWARN (strerror); ++#elif defined GNULIB_POSIXCHECK ++# undef strerror ++/* Assume strerror is always declared. */ ++_GL_WARN_ON_USE (strerror, "strerror is unportable - " ++ "use gnulib module strerror to guarantee non-NULL result"); ++#endif ++ ++/* Map any int, typically from errno, into an error message. Multithread-safe. ++ Uses the POSIX declaration, not the glibc declaration. */ ++#if @GNULIB_STRERROR_R@ ++# if @REPLACE_STRERROR_R@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef strerror_r ++# define strerror_r rpl_strerror_r ++# endif ++_GL_FUNCDECL_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen) ++ _GL_ARG_NONNULL ((2))); ++_GL_CXXALIAS_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen)); ++# else ++# if !@HAVE_DECL_STRERROR_R@ ++_GL_FUNCDECL_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen) ++ _GL_ARG_NONNULL ((2))); ++# endif ++_GL_CXXALIAS_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen)); ++# endif ++# if @HAVE_DECL_STRERROR_R@ ++_GL_CXXALIASWARN (strerror_r); ++# endif ++#elif defined GNULIB_POSIXCHECK ++# undef strerror_r ++# if HAVE_RAW_DECL_STRERROR_R ++_GL_WARN_ON_USE (strerror_r, "strerror_r is unportable - " ++ "use gnulib module strerror_r-posix for portability"); ++# endif ++#endif ++ ++#if @GNULIB_STRSIGNAL@ ++# if @REPLACE_STRSIGNAL@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# define strsignal rpl_strsignal ++# endif ++_GL_FUNCDECL_RPL (strsignal, char *, (int __sig)); ++_GL_CXXALIAS_RPL (strsignal, char *, (int __sig)); ++# else ++# if ! @HAVE_DECL_STRSIGNAL@ ++_GL_FUNCDECL_SYS (strsignal, char *, (int __sig)); ++# endif @@ 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 bonivart at users.sourceforge.net Mon Dec 17 00:27:38 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 16 Dec 2012 23:27:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[19895] csw/mgar/pkg/lzop/trunk/Makefile Message-ID: Revision: 19895 http://gar.svn.sourceforge.net/gar/?rev=19895&view=rev Author: bonivart Date: 2012-12-16 23:27:38 +0000 (Sun, 16 Dec 2012) Log Message: ----------- lzop/trunk: respin with new deps Modified Paths: -------------- csw/mgar/pkg/lzop/trunk/Makefile Modified: csw/mgar/pkg/lzop/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzop/trunk/Makefile 2012-12-16 00:33:56 UTC (rev 19894) +++ csw/mgar/pkg/lzop/trunk/Makefile 2012-12-16 23:27:38 UTC (rev 19895) @@ -21,15 +21,14 @@ SPKG_DESC = $(DESCRIPTION) SPKG_SOURCEURL = http://www.lzop.org -RUNTIME_DEP_PKGS = CSWlzo +RUNTIME_DEP_PKGS = CSWliblzo2-2 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - CONFIGURE_ARGS = $(DIRPATHS) NOISALIST = 1 +CHECKPKG_OVERRIDES_CSWlzop += file-with-bad-content|/usr/share|root/opt/csw/share/doc/lzop/magic + include gar/category.mk #SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Dec 17 11:29:07 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 17 Dec 2012 10:29:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[19896] csw/mgar/pkg/cpan/Net-DNS/trunk Message-ID: Revision: 19896 http://gar.svn.sourceforge.net/gar/?rev=19896&view=rev Author: bonivart Date: 2012-12-17 10:29:06 +0000 (Mon, 17 Dec 2012) Log Message: ----------- cpan/Net-DNS/trunk: update to 0.71, fix one dep name Modified Paths: -------------- csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile csw/mgar/pkg/cpan/Net-DNS/trunk/checksums Modified: csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile 2012-12-16 23:27:38 UTC (rev 19895) +++ csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile 2012-12-17 10:29:06 UTC (rev 19896) @@ -1,8 +1,8 @@ NAME = Net-DNS -VERSION = 0.68 +VERSION = 0.71 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = OLAF +AUTHOR = NLNETLABS DESCRIPTION = Interface to the DNS resolver define BLURB @@ -18,7 +18,8 @@ DISTFILES += COPYING -RUNTIME_DEP_PKGS = CSWpmdigesthmac CSWpmnetip +RUNTIME_DEP_PKGS = CSWpmdigesthmac +RUNTIME_DEP_PKGS += CSWpm-net-ip CONFIGURE_ARGS = --no-online-tests CONFIGURE_ARGS += --no-IPv6-tests Modified: csw/mgar/pkg/cpan/Net-DNS/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-DNS/trunk/checksums 2012-12-16 23:27:38 UTC (rev 19895) +++ csw/mgar/pkg/cpan/Net-DNS/trunk/checksums 2012-12-17 10:29:06 UTC (rev 19896) @@ -1 +1 @@ -05c0f6955747758bb5c9578d9bc6c3a5 Net-DNS-0.68.tar.gz +dde4db75467a155beba741de822387f9 Net-DNS-0.71.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 Dec 17 13:41:58 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 17 Dec 2012 12:41:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[19897] csw/mgar/pkg/cpan/Digest-HMAC/trunk Message-ID: Revision: 19897 http://gar.svn.sourceforge.net/gar/?rev=19897&view=rev Author: dmichelsen Date: 2012-12-17 12:41:58 +0000 (Mon, 17 Dec 2012) Log Message: ----------- cpan/Digest-HMAC/trunk: Update to 1.03 and makemake Modified Paths: -------------- csw/mgar/pkg/cpan/Digest-HMAC/trunk/Makefile csw/mgar/pkg/cpan/Digest-HMAC/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Digest-HMAC/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/Digest-HMAC/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Digest-HMAC/trunk/Makefile 2012-12-17 10:29:06 UTC (rev 19896) +++ csw/mgar/pkg/cpan/Digest-HMAC/trunk/Makefile 2012-12-17 12:41:58 UTC (rev 19897) @@ -1,23 +1,22 @@ NAME = Digest-HMAC -VERSION = 1.02 +VERSION = 1.03 CATEGORIES = cpan GARTYPE = v2 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 -DEP_PKGS = CSWpmdigestsha1 +CATALOG_RELEASE = unstable -DISTFILES = COPYING +LICENSE_TEXT = This module is licensed under the perl license -PACKAGES = CSWpmdigesthmac -CATALOGNAME = pm_digesthmac +PACKAGES += CSWpm-digest-hmac +CATALOGNAME_CSWpm-digest-hmac = pm_digest_hmac +SPKG_DESC_CSWpm-digest-hmac = Keyed-Hashing for Message Authentication +ARCHALL_CSWpm-digest-hmac = 1 +OBSOLETED_BY_CSWpm-digest-hmac += CSWpmdigesthmac +CATALOGNAME_CSWpmdigesthmac = pm_digesthmac_stub -ARCHALL = 1 - include gar/category.mk Modified: csw/mgar/pkg/cpan/Digest-HMAC/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Digest-HMAC/trunk/checksums 2012-12-17 10:29:06 UTC (rev 19896) +++ csw/mgar/pkg/cpan/Digest-HMAC/trunk/checksums 2012-12-17 12:41:58 UTC (rev 19897) @@ -1,2 +1 @@ -da980cdc026faa065e5d5004115334e6 COPYING -64c4b247d83cd64ec32aa22bf58a709b Digest-HMAC-1.02.tar.gz +e6a5d6f552da16eacb5157ea4369ff9d Digest-HMAC-1.03.tar.gz Deleted: csw/mgar/pkg/cpan/Digest-HMAC/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Digest-HMAC/trunk/files/COPYING 2012-12-17 10:29:06 UTC (rev 19896) +++ csw/mgar/pkg/cpan/Digest-HMAC/trunk/files/COPYING 2012-12-17 12:41:58 UTC (rev 19897) @@ -1,5 +0,0 @@ -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. 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 Dec 17 14:13:24 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 17 Dec 2012 13:13:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[19898] csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile Message-ID: Revision: 19898 http://gar.svn.sourceforge.net/gar/?rev=19898&view=rev Author: bonivart Date: 2012-12-17 13:13:24 +0000 (Mon, 17 Dec 2012) Log Message: ----------- cpan/Net-DNS/trunk: fix 2nd dep Modified Paths: -------------- csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile Modified: csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile 2012-12-17 12:41:58 UTC (rev 19897) +++ csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile 2012-12-17 13:13:24 UTC (rev 19898) @@ -18,7 +18,7 @@ DISTFILES += COPYING -RUNTIME_DEP_PKGS = CSWpmdigesthmac +RUNTIME_DEP_PKGS = CSWpm-digest-hmac RUNTIME_DEP_PKGS += CSWpm-net-ip CONFIGURE_ARGS = --no-online-tests 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 Dec 17 14:21:12 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 17 Dec 2012 13:21:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[19899] csw/mgar/pkg/parallel/trunk Message-ID: Revision: 19899 http://gar.svn.sourceforge.net/gar/?rev=19899&view=rev Author: dmichelsen Date: 2012-12-17 13:21:11 +0000 (Mon, 17 Dec 2012) Log Message: ----------- parallel/trunk: Update to 20121122 Modified Paths: -------------- csw/mgar/pkg/parallel/trunk/Makefile csw/mgar/pkg/parallel/trunk/checksums Modified: csw/mgar/pkg/parallel/trunk/Makefile =================================================================== --- csw/mgar/pkg/parallel/trunk/Makefile 2012-12-17 13:13:24 UTC (rev 19898) +++ csw/mgar/pkg/parallel/trunk/Makefile 2012-12-17 13:21:11 UTC (rev 19899) @@ -1,6 +1,6 @@ # $Id$ NAME = parallel -VERSION = 20111222 +VERSION = 20121122 GARTYPE = v2 DESCRIPTION = Shell tool for executing jobs in parallel @@ -39,5 +39,6 @@ # This references a special ssh like /usr/local/bin/myssh CHECKPKG_OVERRIDES_CSWparallel += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/parallel.1 CHECKPKG_OVERRIDES_CSWparallel += file-with-bad-content|/usr/local|root/opt/csw/share/doc/parallel/parallel.html +CHECKPKG_OVERRIDES_CSWparallel += file-with-bad-content|/usr/local|root/opt/csw/share/doc/parallel/parallel.texi include gar/category.mk Modified: csw/mgar/pkg/parallel/trunk/checksums =================================================================== --- csw/mgar/pkg/parallel/trunk/checksums 2012-12-17 13:13:24 UTC (rev 19898) +++ csw/mgar/pkg/parallel/trunk/checksums 2012-12-17 13:21:11 UTC (rev 19899) @@ -1 +1 @@ -cddba502666d4c6658a59060fed854f3 parallel-20111222.tar.bz2 +c1e93b02057bc93b6da9a60072dc011a parallel-20121122.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Mon Dec 17 14:46:56 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Mon, 17 Dec 2012 13:46:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[19900] csw/mgar/pkg/php5/trunk Message-ID: Revision: 19900 http://gar.svn.sourceforge.net/gar/?rev=19900&view=rev Author: wilbury Date: 2012-12-17 13:46:56 +0000 (Mon, 17 Dec 2012) Log Message: ----------- php5/trunk: Version bump, minor recipe tweak. Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/checksums Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-12-17 13:21:11 UTC (rev 19899) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-12-17 13:46:56 UTC (rev 19900) @@ -1,5 +1,5 @@ NAME = php5 -VERSION = 5.3.18 +VERSION = 5.3.19 GARTYPE = v2 SF_PROJECT = $(shell echo $(NAME) | sed -e 's/[0-9]//g') DISTNAME = $(SF_PROJECT)-$(VERSION) @@ -334,14 +334,14 @@ # they're using git now and ship a .gitignore that excludes aclocal.m4 # that broke one of our patches so we'll nuke .gitignore before we patch pre-patch-modulated: - @(cd $(WORKSRC); rm .gitignore; git add -A; git ci -m 'adding files that were previously ignored' ) + @(cd $(WORKSRC); rm .gitignore; git add -A; git commit -m 'adding files that were previously ignored' ) @$(MAKECOOKIE) pre-configure-modulated: @echo Munging c-client routine in configure. @(cd $(WORKSRC); \ perl -pi -e "s|c-client4 c-client|c-client.2007f|g" configure; \ - git add configure; git ci -m 'modify c-client finding routine') + git add configure; git commit -m 'modify c-client finding routine') @$(MAKECOOKIE) # this allows apxs to install the module. stupid, but i couldn't make Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2012-12-17 13:21:11 UTC (rev 19899) +++ csw/mgar/pkg/php5/trunk/checksums 2012-12-17 13:46:56 UTC (rev 19900) @@ -1 +1 @@ -52539c19d0f261560af3c030143dfa8f php-5.3.18.tar.bz2 +e1d2a3ec7849d4b3032bd1abf1916aa4 php-5.3.19.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Mon Dec 17 20:14:50 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Mon, 17 Dec 2012 19:14:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[19901] csw/mgar/pkg/perl/trunk Message-ID: Revision: 19901 http://gar.svn.sourceforge.net/gar/?rev=19901&view=rev Author: claudio_sf Date: 2012-12-17 19:14:50 +0000 (Mon, 17 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: Initial support for dual-life modules Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b Added Paths: ----------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Removed Paths: ------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.1_32b csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2012-12-17 13:46:56 UTC (rev 19900) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-12-17 19:14:50 UTC (rev 19901) @@ -1 +1 @@ -link Makefile_5.16.2_64b \ No newline at end of file +link Makefile_5.16.2_32+64b_privlib \ No newline at end of file Deleted: csw/mgar/pkg/perl/trunk/Makefile_5.16.1_32b =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.1_32b 2012-12-17 13:46:56 UTC (rev 19900) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.1_32b 2012-12-17 19:14:50 UTC (rev 19901) @@ -1,249 +0,0 @@ -NAME = perl -VERSION = 5.16.1 -#CATEGORIES = lang -GARTYPE = v2 - -DESCRIPTION = A high-level, general-purpose programming language -define BLURB - Perl is a high-level, general-purpose programming language that makes easy - things easy and hard things possible. It is optimized for scanning arbitrary - text files and system administration. It has built-in extended regular - expression matching and replacement, a dataflow mechanism to improve security - with setuid scripts and is extendable via modules that can interface to C - libraries. -endef - -#MASTER_SITES = http://www.cpan.org/src/ -#SPKG_SOURCEURL = http://www.cpan.org/src -MASTER_SITES = manual:// -DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz - -# Make extra Solaris 10 package with DTrace support -#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PACKAGING_PLATFORMS += solaris10-sparc - -PACKAGES += CSWperl -SPKG_DESC_CSWperl = $(DESCRIPTION) -#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 -RUNTIME_DEP_PKGS_CSWperl = -INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags - -PACKAGES += CSWperldoc -SPKG_DESC_CSWperldoc = Perl documentation -RUNTIME_DEP_PKGS_CSWperldoc = CSWperl -ARCHALL_CSWperldoc = 1 - -LICENSE = Copying - -CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl - -# Core module updates -# Not used at the moment, leave one as example -#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ -#CORE_UPDATES += PathTools-3.30 -#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd - -DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) - -# GCC build (Sunstudio is problematic) # claudio -GARCOMPILER = GCC4 - - -# Custom configure -CONFIGURE_SCRIPTS = perl - -# Compatable with all prior patch revs -INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 - -# Force use of db-4.8 -# TBD: Reinsert libperl.so, see below. -#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt -PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt -PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) - -#BUILD64 = 1 - -# Configuration flags -CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) -CONFIGURE_ARGS += -Dcc=$(CC) -CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" -CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" -CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) -CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" -CONFIGURE_ARGS += -Dld=$(CC) -CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" -CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) -CONFIGURE_ARGS += -Dlocincpth=$(includedir) -CONFIGURE_ARGS += -Dloclibpth=$(libdir) -CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dman1ext=1 -CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dman3ext=3perl -CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" -CONFIGURE_ARGS += -Dperladmin="root at localhost" -CONFIGURE_ARGS += -Dprefix=$(prefix) -CONFIGURE_ARGS += -Dbin=$(bindir) -CONFIGURE_ARGS += -Dscriptdir=$(bindir) -CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) -CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl -CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl -CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dsiteprefix=/usr -CONFIGURE_ARGS += -Duseshrplib -CONFIGURE_ARGS += -Dusesitecustomize -CONFIGURE_ARGS += -Dusethreads - -# When built on Solaris 10, enable DTrace support -CONFIGURE_ARGS-5.10 = -Dusedtrace -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) - -# Largefiles is on by default for 64 bit -CONFIGURE_ARGS-32 += -Duselargefiles -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) - -#CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw -CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw -CONFIGURE_ARGS += -Dvendorprefix=$(prefix) -CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" -CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" -CONFIGURE_ARGS += -Dsed=$(bindir)/gsed - -EXTRA_LIB += $(prefix)/bdb48/lib -EXTRA_INC += $(prefix)/bdb48/include - -# Somehow the CPPFLAGS do not make it into the compile environment. -# Add them explicitly here, otherwise specifically the bdb48/include will -# not make it resulting in db.h not to be found and DB_File.pm not to be built -# as reported here: -# https://www.opencsw.org/mantis/view.php?id=4544 -EXTRA_CFLAGS = $(CPPFLAGS) - -# Adding -lperl requires that libperl.so is available during compilation, which is not -# the case on bootstrapping. However, we require explicit libperl linkage or programs -# embedding perl will have problems with duplicated static variables. -# XXX Investigate further after 64 bit has built -#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl -EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib -EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib - -# We want 64 bit binaries -#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) - -EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod -PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* - -# The diagnostics.pm module needs the podfile to output its messages. -# That means it must be included in the main package, not the docs. -EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod -EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod - -# Tests take a long time, run once for every release -TEST_SCRIPTS = - -BUILD_SCRIPTS = perl - -TEST_SCRIPTS = perl - -# Make sure we don't include the path to the newly built perl as the -# library is not in place yet. -IGNORE_DESTDIR = 1 - -# Do not exclude static libs as at least DynaLoader.a is needed for XS compilation -MERGE_EXCLUDE_STATICLIBS = - -# This is for the communication with checkpkg. These pathes are searched for modules -# when resolving dependencies. -PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") - -# Splitting of a separate libperl.so requires more work and careful planning. -# Override for now. -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 - -include gar/category.mk - -# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and -# the one in $WORKSRC has not been built yet -# TBD: Investigate -post-extract-modulated: - mkdir -p $(WORKSRC) - #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so - @$(MAKECOOKIE) - -ifneq ($(CORE_UPDATES),) -POST_TARGETS = install-core-updates -include files/updatecore.mk -endif - -# How to configure Perl -#configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS -configure-perl: ARGS-64 = -dusedtrace -configure-perl: - (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) - #cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be - @# 64 bit: -Duse64bitall - @$(MAKECOOKIE) - -build-perl: BUILD_EXPORTS = LD_OPTIONS -build-perl: - @echo " ==> Running make in $*" - @#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) - cd $(WORKSRC) && $(BUILD_ENV) gmake - @$(MAKECOOKIE) - -test-perl: - @echo " ==> Running make $(TEST_TARGET) in $*" - @#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) - cd $(WORKSRC) && gmake check - @$(MAKECOOKIE) - -# Make links to libperl -#POST_TARGETS += libperl -#LIB_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) -#LIB_PATH = $(libdir)/perl/$(VERSION)/CORE -#libperl: -# @( cd $(DESTDIR)$(libdir) ; \ -# mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ -# $(DESTDIR)$(libdir) ; \ -# chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ -# ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) -# #; \ -# #ln -s libperl.so.$(VERSION) libperl.so ) -# @$(MAKECOOKIE) - -# Remove build paths from Config -#POST_TARGETS += perlconf -#perlconf: -# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ -# /bin/perl -i -lne "\ -# next if /config_arg[1-9]/; \ -# s/^config_args=.+$$/config_args=''/; \ -# s/^config_argc=.+$$/config_argc='0'/; \ -# s,-I$(DESTDIR)$(includedir),,g; \ -# s,-[LR]$(DESTDIR)$(libdir),,g; \ -# s,( -I$(includedir))+,\$$1,g; \ -# s,( -[LR]$(libdir))+,\$$1,g; \ -# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ -# s, (-L)?$(CC_HOME)\S+,,g; \ -# if (/^\w+=/) { \ -# s/\s{2,}(\-)/ \-/g; \ -# s/(^\w+=.) /\$$1/; \ -# s/ (.)$$/\$$1/g; \ -# } \ -# print \ -# " Config.pm Config_heavy.pl ) -# @$(MAKECOOKIE) - -#POST_TARGETS += CSWperl.cswperlincpath -#CSWperl.cswperlincpath: -# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath - -# Invoke post-install targets -#post-install-modulated: $(POST_TARGETS) -# @$(MAKECOOKIE) Deleted: csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b 2012-12-17 13:46:56 UTC (rev 19900) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b 2012-12-17 19:14:50 UTC (rev 19901) @@ -1,256 +0,0 @@ -NAME = perl -VERSION = 5.16.1 -#CATEGORIES = lang -GARTYPE = v2 - -DESCRIPTION = A high-level, general-purpose programming language -define BLURB - Perl is a high-level, general-purpose programming language that makes easy - things easy and hard things possible. It is optimized for scanning arbitrary - text files and system administration. It has built-in extended regular - expression matching and replacement, a dataflow mechanism to improve security - with setuid scripts and is extendable via modules that can interface to C - libraries. -endef - -#MASTER_SITES = http://www.cpan.org/src/ -#SPKG_SOURCEURL = http://www.cpan.org/src -MASTER_SITES = manual:// -DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz - -# Make extra Solaris 10 package with DTrace support -#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PACKAGING_PLATFORMS += solaris10-sparc -BUILD64_ONLY = 1 -PACKAGES += CSWperl -SPKG_DESC_CSWperl = $(DESCRIPTION) -#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 -INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags - -#PACKAGES += CSWperldoc -#SPKG_DESC_CSWperldoc = Perl documentation -#RUNTIME_DEP_PKGS_CSWperldoc = CSWperl -#ARCHALL_CSWperldoc = 1 - -LICENSE = Copying - -#CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content -#CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content -#CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl - -# Core module updates -# Not used at the moment, leave one as example -#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ -#CORE_UPDATES += PathTools-3.30 -#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd - -#DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) - -# GCC build (Sunstudio is problematic) # claudio -GARCOMPILER = GCC4 - - -# Custom configure -CONFIGURE_SCRIPTS = perl - -# Compatable with all prior patch revs -INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 - -# Force use of db-4.8 -# TBD: Reinsert libperl.so, see below. -#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt -#PERL_LIBS-64 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt -#PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) -#PERL_LIBS = -lsocket -lgdbm -ldl -lm -lpthread -lc -lcrypt - -#BUILD64 = 1 - -# Configuration flags -#CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) -CONFIGURE_ARGS += -Dcc=$(CC) -#CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" -#CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" -CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) -#CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" -#CONFIGURE_ARGS += -Dld=$(CC) -#CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" -#CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) -#CONFIGURE_ARGS += -Dlocincpth=$(includedir) -#CONFIGURE_ARGS += -Dloclibpth=$(libdir) -CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dman1ext=1 -CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dman3ext=3perl -#CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" -CONFIGURE_ARGS += -Dperladmin="root at localhost" -CONFIGURE_ARGS += -Dprefix=$(prefix) -CONFIGURE_ARGS += -Dbin=$(bindir) -CONFIGURE_ARGS += -Dscriptdir=$(bindir) -#CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) -#CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl -#CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl -#CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 -#CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 -#CONFIGURE_ARGS += -Dsiteprefix=/usr -CONFIGURE_ARGS += -Duseshrplib -#CONFIGURE_ARGS += -Dusesitecustomize -CONFIGURE_ARGS += -Dusethreads -CONFIGURE_ARGS += -Dusedtrace -CONFIGURE_ARGS += -Duse64bitall -CONFIGURE_ARGS += -Duse64bitint -CONFIGURE_ARGS += -Dinc_version_list=none - -# When built on Solaris 10, enable DTrace support -#CONFIGURE_ARGS-5.10 = -Dusedtrace -#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) - -# Largefiles is on by default for 64 bit -#CONFIGURE_ARGS-32 += -Duselargefiles -#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) -#CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw -#CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw -#CONFIGURE_ARGS += -Dvendorprefix=$(prefix) -#CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" -#CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" -#CONFIGURE_ARGS += -Dlibsdirs=/usr/lib/64 -CONFIGURE_ARGS += -Dsed=/opt/csw/bin/gsed - -#EXTRA_LIB += $(prefix)/bdb48/lib -#EXTRA_INC += $(prefix)/bdb48/include -#LD_LIBRARY_PATH for testing -#LD_LIBRARY_PATH += $(prefix)/bdb48/lib/$(MEMORYMODEL) - -# Somehow the CPPFLAGS do not make it into the compile environment. -# Add them explicitly here, otherwise specifically the bdb48/include will -# not make it resulting in db.h not to be found and DB_File.pm not to be built -# as reported here: -# https://www.opencsw.org/mantis/view.php?id=4544 -#EXTRA_CFLAGS = $(CPPFLAGS) - -# Adding -lperl requires that libperl.so is available during compilation, which is not -# the case on bootstrapping. However, we require explicit libperl linkage or programs -# embedding perl will have problems with duplicated static variables. -# XXX Investigate further after 64 bit has built -#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl -#EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib/64 -R/opt/csw/bdb48/lib/64 -R/opt/csw/lib/64 -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -EXTRA_LDFLAGS = -lperl - -# We want 64 bit binaries -#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) - -#EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod -#PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* - -# The diagnostics.pm module needs the podfile to output its messages. -# That means it must be included in the main package, not the docs. -#EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod -#EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod - -# Tests take a long time, run once for every release -BUILD_SCRIPTS = perl - -TEST_SCRIPTS = perl - -# Make sure we don't include the path to the newly built perl as the -# library is not in place yet. -#IGNORE_DESTDIR = 1 - -# Do not exclude static libs as at least DynaLoader.a is needed for XS compilation -#MERGE_EXCLUDE_STATICLIBS = - -# This is for the communication with checkpkg. These pathes are searched for modules -# when resolving dependencies. -PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") - -# Splitting of a separate libperl.so requires more work and careful planning. -# Override for now. -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 - -include gar/category.mk - -# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and -# the one in $WORKSRC has not been built yet -# TBD: Investigate -#post-extract-modulated: -# mkdir -p $(WORKSRC) -# #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so -# @$(MAKECOOKIE) - -#ifneq ($(CORE_UPDATES),) -#POST_TARGETS = install-core-updates -#include files/updatecore.mk -#endif - -# How to configure Perl -#configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS -#configure-perl: ARGS-64 = -dusedtrace -Duse64bitall -configure-perl: - (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) - #cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be - @# 64 bit: -Duse64bitall - @$(MAKECOOKIE) - -build-perl: BUILD_EXPORTS = LD_OPTIONS -build-perl: - @echo " ==> Running make in $*" - @#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) - cd $(WORKSRC) && $(BUILD_ENV) dmake - @$(MAKECOOKIE) - -test-perl: - @echo " ==> Running make $(TEST_TARGET) in $*" - @#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) - #cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && LD_LIBRARY_PATH_64=`pwd`:$(prefix)/bdb48/lib/$(MEMORYMODEL) gmake test && mv .mgar-git .git - cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && gmake test && mv .mgar-git .git - @$(MAKECOOKIE) - -# Make links to libperl -#POST_TARGETS += libperl -#LIB_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) -#LIB_PATH = $(libdir)/perl/$(VERSION)/CORE -#libperl: -# @( cd $(DESTDIR)$(libdir) ; \ -# mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ -# $(DESTDIR)$(libdir) ; \ -# chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ -# ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) -# #; \ -# #ln -s libperl.so.$(VERSION) libperl.so ) -# @$(MAKECOOKIE) - -# Remove build paths from Config -#POST_TARGETS += perlconf -#perlconf: -# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ -# /bin/perl -i -lne "\ -# next if /config_arg[1-9]/; \ -# s/^config_args=.+$$/config_args=''/; \ -# s/^config_argc=.+$$/config_argc='0'/; \ -# s,-I$(DESTDIR)$(includedir),,g; \ -# s,-[LR]$(DESTDIR)$(libdir),,g; \ -# s,( -I$(includedir))+,\$$1,g; \ -# s,( -[LR]$(libdir))+,\$$1,g; \ -# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ -# s, (-L)?$(CC_HOME)\S+,,g; \ -# if (/^\w+=/) { \ -# s/\s{2,}(\-)/ \-/g; \ -# s/(^\w+=.) /\$$1/; \ -# s/ (.)$$/\$$1/g; \ -# } \ -# print \ -# " Config.pm Config_heavy.pl ) -# @$(MAKECOOKIE) - -#POST_TARGETS += CSWperl.cswperlincpath -#CSWperl.cswperlincpath: -# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath - -# Invoke post-install targets -#post-install-modulated: $(POST_TARGETS) -# @$(MAKECOOKIE) Added: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b (rev 0) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b 2012-12-17 19:14:50 UTC (rev 19901) @@ -0,0 +1,266 @@ +NAME = perl +VERSION = 5.16.2 +#CATEGORIES = lang +GARTYPE = v2 + +DESCRIPTION = A high-level, general-purpose programming language +define BLURB + Perl is a high-level, general-purpose programming language that makes easy + things easy and hard things possible. It is optimized for scanning arbitrary + text files and system administration. It has built-in extended regular + expression matching and replacement, a dataflow mechanism to improve security + with setuid scripts and is extendable via modules that can interface to C + libraries. +endef + +#MASTER_SITES = http://www.cpan.org/src/ +#SPKG_SOURCEURL = http://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.16.2.tar.bz2 +MASTER_SITES = manual:// +VENDOR_URL = http://www.perl.org +#DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz + +# Make extra Solaris 10 package with DTrace support +#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +#PACKAGING_PLATFORMS += solaris10-sparc +#BUILD64_ONLY = 1 +PACKAGES += CSWperl +PKG_DESC_CSWperl = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWperl += CSWlibssp0 +#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 +INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags + +PACKAGES += CSWperldoc +SPKG_DESC_CSWperldoc = Perl documentation +SPKG_DESC_CSWperl = Core Perl distribution +RUNTIME_DEP_PKGS_CSWperldoc = CSWperl +ARCHALL_CSWperldoc = 1 + +LICENSE = Copying + +CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWperl += binary-architecture-does-not-match-placement + +# Core module updates +# Not used at the moment, leave one as example +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ +#CORE_UPDATES += PathTools-3.30 +#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd + +#DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) + +# GCC build (Sunstudio is problematic) # claudio +GARCOMPILER = GCC4 + + +# Custom configure +CONFIGURE_SCRIPTS = perl + +# Compatable with all prior patch revs +INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 + +# Force use of db-4.8 +# TBD: Reinsert libperl.so, see below. +#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc +#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt +#PERL_LIBS-64 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt +#PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) +#PERL_LIBS = -lsocket -lgdbm -ldl -lm -lpthread -lc -lcrypt + +BUILD64 = 1 + +# Configuration flags +#CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) +CONFIGURE_ARGS += -Dcc=$(CC) +#CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" +#CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" +CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) +CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" +#CONFIGURE_ARGS += -Dld=$(CC) +#CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" +# Workaround below. Do not version libperl.so here otherwise the other 5.10 +# lib will be picked up by mgar +#CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) +#CONFIGURE_ARGS += -Dlocincpth=$(includedir) +#CONFIGURE_ARGS += -Dloclibpth=$(libdir) +CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 +CONFIGURE_ARGS += -Dman1ext=1 +CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 +CONFIGURE_ARGS += -Dman3ext=3perl +#CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" +CONFIGURE_ARGS += -Dperladmin="root at localhost" +CONFIGURE_ARGS += -Dprefix=$(prefix) +CONFIGURE_ARGS += -Dbin=$(bindir) +CONFIGURE_ARGS += -Dscriptdir=$(bindir) +#CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) +CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl +CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl +CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 +CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 +CONFIGURE_ARGS += -Dsiteprefix=/usr +CONFIGURE_ARGS += -Duseshrplib +CONFIGURE_ARGS += -Dusesitecustomize +CONFIGURE_ARGS += -Dusethreads +CONFIGURE_ARGS += -Dusedtrace +CONFIGURE_ARGS += -Duse64bitall +CONFIGURE_ARGS += -Duse64bitint +CONFIGURE_ARGS += -Dinc_version_list=none + +# When built on Solaris 10, enable DTrace support +#CONFIGURE_ARGS-5.10 = -Dusedtrace +#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) + +# Largefiles is on by default for 64 bit +#CONFIGURE_ARGS-32 += -Duselargefiles +#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) +#CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw +#CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw +#CONFIGURE_ARGS += -Dvendorprefix=$(prefix) +#CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" +CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" +#CONFIGURE_ARGS += -Dlibsdirs=/usr/lib/64 +CONFIGURE_ARGS += -Dsed=/opt/csw/bin/gsed + +#EXTRA_LIB += $(prefix)/bdb48/lib +#EXTRA_INC += $(prefix)/bdb48/include +#LD_LIBRARY_PATH for testing +#LD_LIBRARY_PATH += $(prefix)/bdb48/lib/$(MEMORYMODEL) + +# Somehow the CPPFLAGS do not make it into the compile environment. +# Add them explicitly here, otherwise specifically the bdb48/include will +# not make it resulting in db.h not to be found and DB_File.pm not to be built +# as reported here: +# https://www.opencsw.org/mantis/view.php?id=4544 +#EXTRA_CFLAGS = $(CPPFLAGS) + +# Adding -lperl requires that libperl.so is available during compilation, which is not +# the case on bootstrapping. However, we require explicit libperl linkage or programs +# embedding perl will have problems with duplicated static variables. +# XXX Investigate further after 64 bit has built +#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl +#EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib/64 -R/opt/csw/bdb48/lib/64 -R/opt/csw/lib/64 +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) +EXTRA_LDFLAGS = -lperl + +# We want 64 bit binaries +#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) + +EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod +PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* + +# The diagnostics.pm module needs the podfile to output its messages. +# That means it must be included in the main package, not the docs. +EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod +EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod + +# Tests take a long time, run once for every release +BUILD_SCRIPTS = perl + +TEST_SCRIPTS = perl + +# Make sure we don't include the path to the newly built perl as the +# library is not in place yet. +#IGNORE_DESTDIR = 1 + +# Do not exclude static libs as at least DynaLoader.a is needed for XS compilation +#MERGE_EXCLUDE_STATICLIBS = + +# This is for the communication with checkpkg. These pathes are searched for modules +# when resolving dependencies. +#PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") + +# Splitting of a separate libperl.so requires more work and careful planning. +# Override for now. +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 + +include gar/category.mk + +# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and +# the one in $WORKSRC has not been built yet +# TBD: Investigate +#post-extract-modulated: +# mkdir -p $(WORKSRC) +# #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so +# @$(MAKECOOKIE) + +#ifneq ($(CORE_UPDATES),) +#POST_TARGETS = install-core-updates +#include files/updatecore.mk +#endif + +# How to configure Perl +#configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS +#configure-perl: ARGS-64 = -dusedtrace -Duse64bitall +configure-perl: + (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) + #cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be + @# 64 bit: -Duse64bitall + @$(MAKECOOKIE) + +build-perl: BUILD_EXPORTS = LD_OPTIONS +build-perl: + @echo " ==> Running make in $*" + @#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) + cd $(WORKSRC) && $(BUILD_ENV) dmake + @$(MAKECOOKIE) + +test-perl: + @echo " ==> Running make $(TEST_TARGET) in $*" + @#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) + #cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && LD_LIBRARY_PATH_64=`pwd`:$(prefix)/bdb48/lib/$(MEMORYMODEL) gmake test && mv .mgar-git .git + cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && gmake test && mv .mgar-git .git + @$(MAKECOOKIE) + +# Make links to libperl +POST_TARGETS += libperl +VERSION_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) +#LIB_PATH = $(libdir)/perl/$(VERSION)/CORE +libperl: + @( cd $(DESTDIR)$(libdir) ; +#\ +# mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ +# $(DESTDIR)$(libdir) ; \ +# chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ +# ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) +# #; \ +# #ln -s libperl.so.$(VERSION) libperl.so ) + ln -s libperl.so libperl.so.$(VERSION)) \; + ln -s libperl.so libperl.so.$(VERSION_MINOR)) + @$(MAKECOOKIE) + +# Remove build paths from Config +#POST_TARGETS += perlconf +#perlconf: +# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ +# /bin/perl -i -lne "\ +# next if /config_arg[1-9]/; \ +# s/^config_args=.+$$/config_args=''/; \ +# s/^config_argc=.+$$/config_argc='0'/; \ +# s,-I$(DESTDIR)$(includedir),,g; \ +# s,-[LR]$(DESTDIR)$(libdir),,g; \ +# s,( -I$(includedir))+,\$$1,g; \ +# s,( -[LR]$(libdir))+,\$$1,g; \ +# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ +# s, (-L)?$(CC_HOME)\S+,,g; \ +# if (/^\w+=/) { \ +# s/\s{2,}(\-)/ \-/g; \ +# s/(^\w+=.) /\$$1/; \ +# s/ (.)$$/\$$1/g; \ +# } \ +# print \ +# " Config.pm Config_heavy.pl ) +# @$(MAKECOOKIE) + +#POST_TARGETS += CSWperl.cswperlincpath +#CSWperl.cswperlincpath: +# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath + +# Invoke post-install targets +#post-install-modulated: $(POST_TARGETS) +# @$(MAKECOOKIE) Added: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib (rev 0) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-17 19:14:50 UTC (rev 19901) @@ -0,0 +1,266 @@ +NAME = perl +VERSION = 5.16.2 +#CATEGORIES = lang +GARTYPE = v2 + +DESCRIPTION = A high-level, general-purpose programming language +define BLURB + Perl is a high-level, general-purpose programming language that makes easy + things easy and hard things possible. It is optimized for scanning arbitrary + text files and system administration. It has built-in extended regular + expression matching and replacement, a dataflow mechanism to improve security + with setuid scripts and is extendable via modules that can interface to C + libraries. +endef + +#MASTER_SITES = http://www.cpan.org/src/ +#SPKG_SOURCEURL = http://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.16.2.tar.bz2 +MASTER_SITES = manual:// +VENDOR_URL = http://www.perl.org +#DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz + +# Make extra Solaris 10 package with DTrace support +#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +#PACKAGING_PLATFORMS += solaris10-sparc +#BUILD64_ONLY = 1 +PACKAGES += CSWperl +PKG_DESC_CSWperl = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWperl += CSWlibssp0 +#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 +INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags + +PACKAGES += CSWperldoc +SPKG_DESC_CSWperldoc = Perl documentation +SPKG_DESC_CSWperl = Core Perl distribution +RUNTIME_DEP_PKGS_CSWperldoc = CSWperl +ARCHALL_CSWperldoc = 1 + +LICENSE = Copying + +CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWperl += binary-architecture-does-not-match-placement + +# Core module updates +# Not used at the moment, leave one as example +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ +#CORE_UPDATES += PathTools-3.30 +#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd + +#DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) + +# GCC build (Sunstudio is problematic) # claudio +GARCOMPILER = GCC4 + + +# Custom configure +CONFIGURE_SCRIPTS = perl + +# Compatable with all prior patch revs +INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 + +# Force use of db-4.8 +# TBD: Reinsert libperl.so, see below. +#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc +#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt +#PERL_LIBS-64 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt +#PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) +#PERL_LIBS = -lsocket -lgdbm -ldl -lm -lpthread -lc -lcrypt + +BUILD64 = 1 + +# Configuration flags +#CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) +CONFIGURE_ARGS += -Dcc=$(CC) +#CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" +#CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" +CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) +CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" +#CONFIGURE_ARGS += -Dld=$(CC) +#CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" +# Workaround below. Do not version libperl.so here otherwise the other 5.10 +# lib will be picked up by mgar +#CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) +#CONFIGURE_ARGS += -Dlocincpth=$(includedir) +#CONFIGURE_ARGS += -Dloclibpth=$(libdir) +CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 +CONFIGURE_ARGS += -Dman1ext=1 +CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 +CONFIGURE_ARGS += -Dman3ext=3perl +#CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" +CONFIGURE_ARGS += -Dperladmin="root at localhost" +CONFIGURE_ARGS += -Dprefix=$(prefix) +CONFIGURE_ARGS += -Dbin=$(bindir) +CONFIGURE_ARGS += -Dscriptdir=$(bindir) +#CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) +CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl +CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl +CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 +CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 +CONFIGURE_ARGS += -Dsiteprefix=/usr +CONFIGURE_ARGS += -Duseshrplib +CONFIGURE_ARGS += -Dusesitecustomize +CONFIGURE_ARGS += -Dusethreads +CONFIGURE_ARGS += -Dusedtrace +CONFIGURE_ARGS += -Duse64bitall +CONFIGURE_ARGS += -Duse64bitint +CONFIGURE_ARGS += -Dinc_version_list=none + +# When built on Solaris 10, enable DTrace support +#CONFIGURE_ARGS-5.10 = -Dusedtrace +#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) + +# Largefiles is on by default for 64 bit +#CONFIGURE_ARGS-32 += -Duselargefiles +#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) +#CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw +#CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw +#CONFIGURE_ARGS += -Dvendorprefix=$(prefix) +#CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" +CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" +#CONFIGURE_ARGS += -Dlibsdirs=/usr/lib/64 +CONFIGURE_ARGS += -Dsed=/opt/csw/bin/gsed + +#EXTRA_LIB += $(prefix)/bdb48/lib +#EXTRA_INC += $(prefix)/bdb48/include +#LD_LIBRARY_PATH for testing +#LD_LIBRARY_PATH += $(prefix)/bdb48/lib/$(MEMORYMODEL) + +# Somehow the CPPFLAGS do not make it into the compile environment. +# Add them explicitly here, otherwise specifically the bdb48/include will +# not make it resulting in db.h not to be found and DB_File.pm not to be built +# as reported here: +# https://www.opencsw.org/mantis/view.php?id=4544 +#EXTRA_CFLAGS = $(CPPFLAGS) + +# Adding -lperl requires that libperl.so is available during compilation, which is not +# the case on bootstrapping. However, we require explicit libperl linkage or programs +# embedding perl will have problems with duplicated static variables. +# XXX Investigate further after 64 bit has built +#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl +#EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib/64 -R/opt/csw/bdb48/lib/64 -R/opt/csw/lib/64 +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) +EXTRA_LDFLAGS = -lperl + +# We want 64 bit binaries +#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) + +EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod +PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* + +# The diagnostics.pm module needs the podfile to output its messages. +# That means it must be included in the main package, not the docs. +EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod +EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod + +# Tests take a long time, run once for every release +BUILD_SCRIPTS = perl + +TEST_SCRIPTS = perl + +# Make sure we don't include the path to the newly built perl as the +# library is not in place yet. +#IGNORE_DESTDIR = 1 + +# Do not exclude static libs as at least DynaLoader.a is needed for XS compilation +#MERGE_EXCLUDE_STATICLIBS = + +# This is for the communication with checkpkg. These pathes are searched for modules +# when resolving dependencies. +#PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") + +# Splitting of a separate libperl.so requires more work and careful planning. +# Override for now. +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 + +include gar/category.mk + +# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and +# the one in $WORKSRC has not been built yet +# TBD: Investigate +#post-extract-modulated: +# mkdir -p $(WORKSRC) +# #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so +# @$(MAKECOOKIE) + +#ifneq ($(CORE_UPDATES),) +#POST_TARGETS = install-core-updates +#include files/updatecore.mk +#endif + +# How to configure Perl +#configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS +#configure-perl: ARGS-64 = -dusedtrace -Duse64bitall +configure-perl: + (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) + #cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be + @# 64 bit: -Duse64bitall + @$(MAKECOOKIE) + +build-perl: BUILD_EXPORTS = LD_OPTIONS +build-perl: + @echo " ==> Running make in $*" + @#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) + cd $(WORKSRC) && $(BUILD_ENV) dmake + @$(MAKECOOKIE) + +test-perl: + @echo " ==> Running make $(TEST_TARGET) in $*" + @#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) + #cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && LD_LIBRARY_PATH_64=`pwd`:$(prefix)/bdb48/lib/$(MEMORYMODEL) gmake test && mv .mgar-git .git + cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && gmake test && mv .mgar-git .git + @$(MAKECOOKIE) + +# Make links to libperl +POST_TARGETS += libperl +VERSION_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) +#LIB_PATH = $(libdir)/perl/$(VERSION)/CORE +libperl: + @( cd $(DESTDIR)$(libdir) ; +#\ +# mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ +# $(DESTDIR)$(libdir) ; \ +# chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ +# ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) +# #; \ +# #ln -s libperl.so.$(VERSION) libperl.so ) + ln -s libperl.so libperl.so.$(VERSION)) \; + ln -s libperl.so libperl.so.$(VERSION_MINOR)) + @$(MAKECOOKIE) + +# Remove build paths from Config +#POST_TARGETS += perlconf +#perlconf: +# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ +# /bin/perl -i -lne "\ +# next if /config_arg[1-9]/; \ +# s/^config_args=.+$$/config_args=''/; \ +# s/^config_argc=.+$$/config_argc='0'/; \ +# s,-I$(DESTDIR)$(includedir),,g; \ +# s,-[LR]$(DESTDIR)$(libdir),,g; \ +# s,( -I$(includedir))+,\$$1,g; \ +# s,( -[LR]$(libdir))+,\$$1,g; \ +# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ +# s, (-L)?$(CC_HOME)\S+,,g; \ +# if (/^\w+=/) { \ +# s/\s{2,}(\-)/ \-/g; \ +# s/(^\w+=.) /\$$1/; \ +# s/ (.)$$/\$$1/g; \ +# } \ +# print \ +# " Config.pm Config_heavy.pl ) +# @$(MAKECOOKIE) + +#POST_TARGETS += CSWperl.cswperlincpath +#CSWperl.cswperlincpath: +# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath + +# Invoke post-install targets +#post-install-modulated: $(POST_TARGETS) +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b 2012-12-17 13:46:56 UTC (rev 19900) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b 2012-12-17 19:14:50 UTC (rev 19901) @@ -16,6 +16,7 @@ #MASTER_SITES = http://www.cpan.org/src/ #SPKG_SOURCEURL = http://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.16.2.tar.bz2 MASTER_SITES = manual:// +VENDOR_URL = http://www.perl.org #DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz @@ -23,23 +24,25 @@ #PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 #PACKAGING_PLATFORMS += solaris10-sparc -BUILD64_ONLY = 1 +#BUILD64_ONLY = 1 PACKAGES += CSWperl PKG_DESC_CSWperl = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWperl += CSWlibssp0 #RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 -#INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags +INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags -#PACKAGES += CSWperldoc -#SPKG_DESC_CSWperldoc = Perl documentation -#RUNTIME_DEP_PKGS_CSWperldoc = CSWperl -#ARCHALL_CSWperldoc = 1 +PACKAGES += CSWperldoc +SPKG_DESC_CSWperldoc = Perl documentation +SPKG_DESC_CSWperl = Core Perl distribution +RUNTIME_DEP_PKGS_CSWperldoc = CSWperl +ARCHALL_CSWperldoc = 1 LICENSE = Copying CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content -#CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content -#CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWperl += binary-architecture-does-not-match-placement # Core module updates # Not used at the moment, leave one as example @@ -117,7 +120,7 @@ #CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw #CONFIGURE_ARGS += -Dvendorprefix=$(prefix) #CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" -#CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" +CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" #CONFIGURE_ARGS += -Dlibsdirs=/usr/lib/64 CONFIGURE_ARGS += -Dsed=/opt/csw/bin/gsed @@ -147,13 +150,13 @@ # We want 64 bit binaries #MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) -#EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod -#PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* +EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod +PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* # The diagnostics.pm module needs the podfile to output its messages. # That means it must be included in the main package, not the docs. -#EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod -#EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod +EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod +EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod # Tests take a long time, run once for every release BUILD_SCRIPTS = perl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Mon Dec 17 20:39:50 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Mon, 17 Dec 2012 19:39:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[19902] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19902 http://gar.svn.sourceforge.net/gar/?rev=19902&view=rev Author: claudio_sf Date: 2012-12-17 19:39:50 +0000 (Mon, 17 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: privlib and archlib Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-17 19:14:50 UTC (rev 19901) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-17 19:39:50 UTC (rev 19902) @@ -1,5 +1,6 @@ NAME = perl VERSION = 5.16.2 +VERSION_MAJOR = $(shell echo $(VERSION) | cut -f1-2 -d.) #CATEGORIES = lang GARTYPE = v2 @@ -55,6 +56,8 @@ # GCC build (Sunstudio is problematic) # claudio GARCOMPILER = GCC4 +# a .git directory will cause failing upstream author tests (the source will be considered blead) +NOGITPATCH = 1 # Custom configure CONFIGURE_SCRIPTS = perl @@ -73,7 +76,7 @@ BUILD64 = 1 # Configuration flags -#CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) +CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION_MAJOR) CONFIGURE_ARGS += -Dcc=$(CC) #CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" #CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" @@ -95,7 +98,7 @@ CONFIGURE_ARGS += -Dprefix=$(prefix) CONFIGURE_ARGS += -Dbin=$(bindir) CONFIGURE_ARGS += -Dscriptdir=$(bindir) -#CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) +CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION_MAJOR) CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 @@ -214,24 +217,21 @@ @echo " ==> Running make $(TEST_TARGET) in $*" @#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) #cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && LD_LIBRARY_PATH_64=`pwd`:$(prefix)/bdb48/lib/$(MEMORYMODEL) gmake test && mv .mgar-git .git - cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && gmake test && mv .mgar-git .git + #cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && gmake test && mv .mgar-git .git + gmake test @$(MAKECOOKIE) # Make links to libperl -POST_TARGETS += libperl -VERSION_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) +POST_TARGETS += syslinks #LIB_PATH = $(libdir)/perl/$(VERSION)/CORE -libperl: - @( cd $(DESTDIR)$(libdir) ; -#\ -# mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ -# $(DESTDIR)$(libdir) ; \ -# chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ -# ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) -# #; \ -# #ln -s libperl.so.$(VERSION) libperl.so ) - ln -s libperl.so libperl.so.$(VERSION)) \; - ln -s libperl.so libperl.so.$(VERSION_MINOR)) +syslinks: + @( cd $(DESTDIR)$(libdir) ; \ + ln -s libperl.so libperl.so.$(VERSION) ; \ + ln -s libperl.so libperl.so.$(VERSION_MAJOR)) + @( cd $(DESTDIR)$(libdir)/perl ; \ + ln -s $(VERSION_MAJOR) $(VERSION)) + @( cd $(DESTDIR)$(datadir)/perl ; \ + ln -s $(VERSION_MAJOR) $(VERSION)) @$(MAKECOOKIE) # Remove build paths from Config This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Mon Dec 17 22:22:59 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Mon, 17 Dec 2012 21:22:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[19903] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19903 http://gar.svn.sourceforge.net/gar/?rev=19903&view=rev Author: claudio_sf Date: 2012-12-17 21:22:58 +0000 (Mon, 17 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: pkg obsoletes Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-17 19:39:50 UTC (rev 19902) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-17 21:22:58 UTC (rev 19903) @@ -44,6 +44,8 @@ CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl CHECKPKG_OVERRIDES_CSWperl += binary-architecture-does-not-match-placement +OBSOLETED_BY_CSWperl += CSWpm-module-build +OBSOLETED_BY_CSWperl += CSWpm-json-pp # Core module updates # Not used at the moment, leave one as example @@ -199,39 +201,32 @@ # How to configure Perl #configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS -#configure-perl: ARGS-64 = -dusedtrace -Duse64bitall configure-perl: (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) - #cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be - @# 64 bit: -Duse64bitall @$(MAKECOOKIE) build-perl: BUILD_EXPORTS = LD_OPTIONS build-perl: @echo " ==> Running make in $*" - @#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) cd $(WORKSRC) && $(BUILD_ENV) dmake @$(MAKECOOKIE) test-perl: @echo " ==> Running make $(TEST_TARGET) in $*" - @#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) - #cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && LD_LIBRARY_PATH_64=`pwd`:$(prefix)/bdb48/lib/$(MEMORYMODEL) gmake test && mv .mgar-git .git - #cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && gmake test && mv .mgar-git .git - gmake test + cd $(WORKSRC) && gmake test @$(MAKECOOKIE) -# Make links to libperl +# Make links to libperl and minor-major lib dirs POST_TARGETS += syslinks -#LIB_PATH = $(libdir)/perl/$(VERSION)/CORE syslinks: - @( cd $(DESTDIR)$(libdir) ; \ - ln -s libperl.so libperl.so.$(VERSION) ; \ - ln -s libperl.so libperl.so.$(VERSION_MAJOR)) - @( cd $(DESTDIR)$(libdir)/perl ; \ - ln -s $(VERSION_MAJOR) $(VERSION)) - @( cd $(DESTDIR)$(datadir)/perl ; \ - ln -s $(VERSION_MAJOR) $(VERSION)) + @echo "Creating links to libperl and minor-major lib dirs" + cd $(DESTDIR)$(libdir) && \ + ln -s libperl.so libperl.so.$(VERSION) && \ + ln -s libperl.so libperl.so.$(VERSION_MAJOR) && \ + cd $(DESTDIR)$(libdir)/perl && \ + ln -s $(VERSION_MAJOR) $(VERSION)) && \ + cd $(DESTDIR)$(datadir)/perl && \ + ln -s $(VERSION_MAJOR) $(VERSION) @$(MAKECOOKIE) # Remove build paths from Config @@ -262,5 +257,5 @@ # LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath # Invoke post-install targets -#post-install-modulated: $(POST_TARGETS) -# @$(MAKECOOKIE) +post-install-modulated: $(POST_TARGETS) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Dec 18 00:57:55 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Mon, 17 Dec 2012 23:57:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[19904] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 19904 http://gar.svn.sourceforge.net/gar/?rev=19904&view=rev Author: wilbury Date: 2012-12-17 23:57:55 +0000 (Mon, 17 Dec 2012) Log Message: ----------- php5/trunk: A bit of tweaking Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-12-17 21:22:58 UTC (rev 19903) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-12-17 23:57:55 UTC (rev 19904) @@ -92,11 +92,12 @@ # verify these... CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/etc/opt/csw/php5/php.ini.CSW +CHECKPKG_OVERRIDES_CSWphp5 += file-collision|/opt/csw/php5/include/php/ext/sqlite3/libsqlite/sqlite3.h|CSWphp5|CSWphp5-sqlite + PACKAGES += CSWphp5-dev CATALOGNAME_CSWphp5-dev = php5_dev SPKG_DESC_CSWphp5-dev = Development files for php5 RUNTIME_DEP_PKGS_CSWphp5-dev = CSWphp5 -RUNTIME_DEP_PKGS_CSWphp5-dev += CSWgsed OBSOLETED_BY_CSWphp5-dev = CSWphp5devel PKGFILES_CSWphp5-dev = $(prefix)/php5/bin/php-config PKGFILES_CSWphp5-dev = $(prefix)/bin/php-config 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 Dec 18 02:19:37 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 18 Dec 2012 01:19:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[19905] csw/mgar/pkg/google-gflags/trunk Message-ID: Revision: 19905 http://gar.svn.sourceforge.net/gar/?rev=19905&view=rev Author: wahwah Date: 2012-12-18 01:19:37 +0000 (Tue, 18 Dec 2012) Log Message: ----------- google-gflags/trunk: update to 2.0 - it doesn't build, I'm suspecting gcc vs assembler issues Modified Paths: -------------- csw/mgar/pkg/google-gflags/trunk/Makefile csw/mgar/pkg/google-gflags/trunk/checksums Added Paths: ----------- csw/mgar/pkg/google-gflags/trunk/files/0000-Disable-a-test-that-doesn-t-work-on-Solaris.patch csw/mgar/pkg/google-gflags/trunk/files/0001-Disable-the-same-test-again-inf-this-time.patch csw/mgar/pkg/google-gflags/trunk/files/0002-One-more-test.patch Modified: csw/mgar/pkg/google-gflags/trunk/Makefile =================================================================== --- csw/mgar/pkg/google-gflags/trunk/Makefile 2012-12-17 23:57:55 UTC (rev 19904) +++ csw/mgar/pkg/google-gflags/trunk/Makefile 2012-12-18 01:19:37 UTC (rev 19905) @@ -3,7 +3,7 @@ # $Id$ NAME = gflags -VERSION = 1.3 +VERSION = 2.0 GARTYPE = v2 DESCRIPTION = a library that implements commandline flags processing define BLURB @@ -14,11 +14,17 @@ endef SPKG_SOURCEURL = http://code.google.com/p/google-gflags/ MASTER_SITES = $(GOOGLE_MIRROR) -GOOGLE_PROJECT = google-gflags DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) + BUILD64 = 1 + +GARCOMPILER = GNU +PATCHFILES += 0000-Disable-a-test-that-doesn-t-work-on-Solaris.patch +PATCHFILES += 0001-Disable-the-same-test-again-inf-this-time.patch +PATCHFILES += 0002-One-more-test.patch + MERGE_DIRS_isa-sparcv9 = $(libdir) MERGE_DIRS_isa-amd64 = $(libdir) + include gar/category.mk Modified: csw/mgar/pkg/google-gflags/trunk/checksums =================================================================== --- csw/mgar/pkg/google-gflags/trunk/checksums 2012-12-17 23:57:55 UTC (rev 19904) +++ csw/mgar/pkg/google-gflags/trunk/checksums 2012-12-18 01:19:37 UTC (rev 19905) @@ -1 +1 @@ -6da3d3b9cd82c222b521ae686b6cfa8b gflags-1.3.tar.gz +e02268c1e90876c809ec0ffa095da864 gflags-2.0.tar.gz Added: csw/mgar/pkg/google-gflags/trunk/files/0000-Disable-a-test-that-doesn-t-work-on-Solaris.patch =================================================================== --- csw/mgar/pkg/google-gflags/trunk/files/0000-Disable-a-test-that-doesn-t-work-on-Solaris.patch (rev 0) +++ csw/mgar/pkg/google-gflags/trunk/files/0000-Disable-a-test-that-doesn-t-work-on-Solaris.patch 2012-12-18 01:19:37 UTC (rev 19905) @@ -0,0 +1,24 @@ +From e786aa2d94cda7f9a544af52a5ac3e7afe10eda1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Mon, 17 Dec 2012 23:36:09 +0000 +Subject: [PATCH] Disable a test that doesn't work on Solaris + +--- + src/gflags_unittest.cc | 2 +- + +diff --git a/src/gflags_unittest.cc b/src/gflags_unittest.cc +index 08abc1b..7487f51 100644 +--- a/src/gflags_unittest.cc ++++ b/src/gflags_unittest.cc +@@ -549,7 +549,7 @@ TEST(SetFlagValueTest, OrdinaryValues) { + // http://www.mail-archive.com/bug-gnulib at gnu.org/msg09573.html + // This url says FreeBSD also has a problem, but I didn't see that. + TEST(SetFlagValueTest, ExceptionalValues) { +-#if defined(isinf) && !defined(__MINGW32__) ++#if defined(isinf) && !defined(__MINGW32__) && !defined(__sun__) + EXPECT_EQ("test_double set to inf\n", + SetCommandLineOption("test_double", "inf")); + EXPECT_INF(FLAGS_test_double); +-- +1.8.0 + Added: csw/mgar/pkg/google-gflags/trunk/files/0001-Disable-the-same-test-again-inf-this-time.patch =================================================================== --- csw/mgar/pkg/google-gflags/trunk/files/0001-Disable-the-same-test-again-inf-this-time.patch (rev 0) +++ csw/mgar/pkg/google-gflags/trunk/files/0001-Disable-the-same-test-again-inf-this-time.patch 2012-12-18 01:19:37 UTC (rev 19905) @@ -0,0 +1,55 @@ +From 16d6c142a23f40580f2f6c467190db2d24276879 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Mon, 17 Dec 2012 23:49:21 +0000 +Subject: [PATCH] Disable the same test again (-inf this time) + +--- + libtool | 122 ++++++++++++++++++++++---------------------- + src/gflags/gflags_declare.h | 2 +- + src/gflags_unittest-main.cc | 2 +- + src/gflags_unittest.cc | 2 +- + src/gflags_unittest_main.cc | 2 +- + 5 files changed, 65 insertions(+), 65 deletions(-) + +diff --git a/src/gflags_unittest-main.cc b/src/gflags_unittest-main.cc +index 08abc1b..7487f51 100644 +--- a/src/gflags_unittest-main.cc ++++ b/src/gflags_unittest-main.cc +@@ -549,7 +549,7 @@ TEST(SetFlagValueTest, OrdinaryValues) { + // http://www.mail-archive.com/bug-gnulib at gnu.org/msg09573.html + // This url says FreeBSD also has a problem, but I didn't see that. + TEST(SetFlagValueTest, ExceptionalValues) { +-#if defined(isinf) && !defined(__MINGW32__) ++#if defined(isinf) && !defined(__MINGW32__) && !defined(__sun__) + EXPECT_EQ("test_double set to inf\n", + SetCommandLineOption("test_double", "inf")); + EXPECT_INF(FLAGS_test_double); +diff --git a/src/gflags_unittest.cc b/src/gflags_unittest.cc +index 7487f51..d58b6e9 100644 +--- a/src/gflags_unittest.cc ++++ b/src/gflags_unittest.cc +@@ -566,7 +566,7 @@ TEST(SetFlagValueTest, ExceptionalValues) { + SetCommandLineOption("test_double", " ")); + EXPECT_EQ("", + SetCommandLineOption("test_double", "")); +-#if defined(isinf) && !defined(__MINGW32__) ++#if defined(isinf) && !defined(__MINGW32__) && !defined(__sun__) + EXPECT_EQ("test_double set to -inf\n", + SetCommandLineOption("test_double", "-inf")); + EXPECT_INF(FLAGS_test_double); +diff --git a/src/gflags_unittest_main.cc b/src/gflags_unittest_main.cc +index 08abc1b..7487f51 100644 +--- a/src/gflags_unittest_main.cc ++++ b/src/gflags_unittest_main.cc +@@ -549,7 +549,7 @@ TEST(SetFlagValueTest, OrdinaryValues) { + // http://www.mail-archive.com/bug-gnulib at gnu.org/msg09573.html + // This url says FreeBSD also has a problem, but I didn't see that. + TEST(SetFlagValueTest, ExceptionalValues) { +-#if defined(isinf) && !defined(__MINGW32__) ++#if defined(isinf) && !defined(__MINGW32__) && !defined(__sun__) + EXPECT_EQ("test_double set to inf\n", + SetCommandLineOption("test_double", "inf")); + EXPECT_INF(FLAGS_test_double); +-- +1.8.0 + Added: csw/mgar/pkg/google-gflags/trunk/files/0002-One-more-test.patch =================================================================== --- csw/mgar/pkg/google-gflags/trunk/files/0002-One-more-test.patch (rev 0) +++ csw/mgar/pkg/google-gflags/trunk/files/0002-One-more-test.patch 2012-12-18 01:19:37 UTC (rev 19905) @@ -0,0 +1,39 @@ +From 89f07763dba7152645632b5d0b7c9036d96b81ea Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Mon, 17 Dec 2012 23:58:03 +0000 +Subject: [PATCH] One more test. + +--- + src/gflags_unittest-main.cc | 2 +- + src/gflags_unittest.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gflags_unittest-main.cc b/src/gflags_unittest-main.cc +index 7487f51..d58b6e9 100644 +--- a/src/gflags_unittest-main.cc ++++ b/src/gflags_unittest-main.cc +@@ -566,7 +566,7 @@ TEST(SetFlagValueTest, ExceptionalValues) { + SetCommandLineOption("test_double", " ")); + EXPECT_EQ("", + SetCommandLineOption("test_double", "")); +-#if defined(isinf) && !defined(__MINGW32__) ++#if defined(isinf) && !defined(__MINGW32__) && !defined(__sun__) + EXPECT_EQ("test_double set to -inf\n", + SetCommandLineOption("test_double", "-inf")); + EXPECT_INF(FLAGS_test_double); +diff --git a/src/gflags_unittest.cc b/src/gflags_unittest.cc +index d58b6e9..daf435b 100644 +--- a/src/gflags_unittest.cc ++++ b/src/gflags_unittest.cc +@@ -573,7 +573,7 @@ TEST(SetFlagValueTest, ExceptionalValues) { + EXPECT_GT(0, FLAGS_test_double); + #endif + +-#if defined(isnan) && !defined(__MINGW32__) ++#if defined(isinf) && !defined(__MINGW32__) && !defined(__sun__) + EXPECT_EQ("test_double set to nan\n", + SetCommandLineOption("test_double", "NaN")); + EXPECT_NAN(FLAGS_test_double); +-- +1.8.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 Dec 18 09:56:20 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 18 Dec 2012 08:56:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[19906] csw/mgar/pkg/lua/trunk/Makefile Message-ID: Revision: 19906 http://gar.svn.sourceforge.net/gar/?rev=19906&view=rev Author: dmichelsen Date: 2012-12-18 08:56:19 +0000 (Tue, 18 Dec 2012) Log Message: ----------- lua/trunk: Fix LUA_ROOT as reported in #4651 Modified Paths: -------------- csw/mgar/pkg/lua/trunk/Makefile Modified: csw/mgar/pkg/lua/trunk/Makefile =================================================================== --- csw/mgar/pkg/lua/trunk/Makefile 2012-12-18 01:19:37 UTC (rev 19905) +++ csw/mgar/pkg/lua/trunk/Makefile 2012-12-18 08:56:19 UTC (rev 19906) @@ -21,8 +21,6 @@ PATCHFILES += 0001-Make-shared-lib.patch -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - VENDOR_URL = http://www.lua.org LICENSE = doc/readme.html @@ -42,7 +40,7 @@ REINPLACEMENTS += luaroot REINPLACE_MATCH_luaroot = (\#define\s+LUA_ROOT\s+).* -REINPLACE_WITH_luaroot = $$1"$(prefix)" +REINPLACE_WITH_luaroot = $$1"$(prefix)/" REINPLACE_FILES_luaroot += src/luaconf.h BUILD64 = 1 @@ -52,6 +50,8 @@ CONFIGURE_SCRIPTS = EXTRA_CFLAGS += -KPIC +# This is in the original Makefile, add here as we overwrite CFLAGS +EXTRA_CFLAGS += -DLUA_COMPAT_ALL BUILD_ARGS += solaris BUILD_ARGS += CC=$(CC) 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 Dec 18 10:14:56 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 18 Dec 2012 09:14:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[19907] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 19907 http://gar.svn.sourceforge.net/gar/?rev=19907&view=rev Author: wahwah Date: 2012-12-18 09:14:55 +0000 (Tue, 18 Dec 2012) Log Message: ----------- gcc4/trunk: use the GNU assembler on Intel platforms, and Sun assembler on SPARC Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-18 08:56:19 UTC (rev 19906) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-18 09:14:55 UTC (rev 19907) @@ -60,12 +60,8 @@ CONFIGURE_ARGS += --enable-objc-gc CONFIGURE_ARGS += --enable-threads=posix CONFIGURE_ARGS += --program-suffix=$(PROGRAM_SUFFIX) -#CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas -CONFIGURE_ARGS += --with-as=/usr/ccs/bin/as CONFIGURE_ARGS += --with-cloog=$(BUILD_PREFIX) CONFIGURE_ARGS += --with-gmp=$(BUILD_PREFIX) -#CONFIGURE_ARGS += --with-gnu-as -CONFIGURE_ARGS += --without-gnu-as CONFIGURE_ARGS += --with-included-gettext CONFIGURE_ARGS += --with-ld=/usr/ccs/bin/ld CONFIGURE_ARGS += --without-gnu-ld @@ -74,6 +70,16 @@ CONFIGURE_ARGS += --with-ppl=$(BUILD_PREFIX) CONFIGURE_ARGS += --with-system-zlib=$(BUILD_PREFIX) +# Using ccs/bin/bas on x86 results in this problem: +# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35531 +ifeq ($(GARCH),sparc) +CONFIGURE_ARGS += --with-as=/usr/ccs/bin/as +CONFIGURE_ARGS += --without-gnu-as +else +CONFIGURE_ARGS += --with-gnu-as +CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas +endif + # GCC can't be built in the same directory with the sources. # It also can't be built in a subdirectory of the sources. OBJDIR = $(abspath $(WORKDIR)/objdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Tue Dec 18 10:25:44 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Tue, 18 Dec 2012 09:25:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[19908] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19908 http://gar.svn.sourceforge.net/gar/?rev=19908&view=rev Author: claudio_sf Date: 2012-12-18 09:25:43 +0000 (Tue, 18 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: Fix for dual-life modules (core/cpan) Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-18 09:14:55 UTC (rev 19907) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-18 09:25:43 UTC (rev 19908) @@ -100,6 +100,7 @@ CONFIGURE_ARGS += -Dprefix=$(prefix) CONFIGURE_ARGS += -Dbin=$(bindir) CONFIGURE_ARGS += -Dscriptdir=$(bindir) +# CSW provided modules should install in the privlib directory (/opt/csw/share/perl/5.14) CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION_MAJOR) CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl @@ -220,13 +221,9 @@ POST_TARGETS += syslinks syslinks: @echo "Creating links to libperl and minor-major lib dirs" - cd $(DESTDIR)$(libdir) && \ - ln -s libperl.so libperl.so.$(VERSION) && \ - ln -s libperl.so libperl.so.$(VERSION_MAJOR) && \ - cd $(DESTDIR)$(libdir)/perl && \ - ln -s $(VERSION_MAJOR) $(VERSION)) && \ - cd $(DESTDIR)$(datadir)/perl && \ - ln -s $(VERSION_MAJOR) $(VERSION) + cd $(DESTDIR)$(libdir)/perl && ln -s $(VERSION_MAJOR) $(VERSION) &&\ + cd $(VERSION_MAJOR) && ln -s libperl.so libperl.so.$(VERSION) && ln -s libperl.so libperl.so.$(VERSION_MAJOR) &&\ + cd $(DESTDIR)$(datadir)/perl && ln -s $(VERSION_MAJOR) $(VERSION) @$(MAKECOOKIE) # Remove build paths from Config This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Tue Dec 18 10:55:29 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Tue, 18 Dec 2012 09:55:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[19909] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19909 http://gar.svn.sourceforge.net/gar/?rev=19909&view=rev Author: claudio_sf Date: 2012-12-18 09:55:29 +0000 (Tue, 18 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: Separate 32 and 64b libs Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-18 09:25:43 UTC (rev 19908) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-18 09:55:29 UTC (rev 19909) @@ -78,7 +78,7 @@ BUILD64 = 1 # Configuration flags -CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION_MAJOR) +CONFIGURE_ARGS += -Darchlib=$(libdir)/$(MEMORYMODEL)/perl/$(VERSION_MAJOR) CONFIGURE_ARGS += -Dcc=$(CC) #CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" #CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" @@ -101,9 +101,9 @@ CONFIGURE_ARGS += -Dbin=$(bindir) CONFIGURE_ARGS += -Dscriptdir=$(bindir) # CSW provided modules should install in the privlib directory (/opt/csw/share/perl/5.14) -CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION_MAJOR) -CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl -CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl +CONFIGURE_ARGS += -Dprivlib=$(datadir)/$(MEMORYMODEL)/perl/$(VERSION_MAJOR) +CONFIGURE_ARGS += -Dsitearch=$(libdir)/$(MEMORYMODEL)/perl/site_perl +CONFIGURE_ARGS += -Dsitelib=$(datadir)/$(MEMORYMODEL)/perl/site_perl CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 CONFIGURE_ARGS += -Dsiteprefix=/usr This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Tue Dec 18 11:01:04 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Tue, 18 Dec 2012 10:01:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[19910] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19910 http://gar.svn.sourceforge.net/gar/?rev=19910&view=rev Author: claudio_sf Date: 2012-12-18 10:01:04 +0000 (Tue, 18 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: Comments Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-18 09:55:29 UTC (rev 19909) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-18 10:01:04 UTC (rev 19910) @@ -100,7 +100,7 @@ CONFIGURE_ARGS += -Dprefix=$(prefix) CONFIGURE_ARGS += -Dbin=$(bindir) CONFIGURE_ARGS += -Dscriptdir=$(bindir) -# CSW provided modules should install in the privlib directory (/opt/csw/share/perl/5.14) +# CSW provided modules should install in the privlib directory (/opt/csw/share/$MEMORYMODEL/perl/5.14) CONFIGURE_ARGS += -Dprivlib=$(datadir)/$(MEMORYMODEL)/perl/$(VERSION_MAJOR) CONFIGURE_ARGS += -Dsitearch=$(libdir)/$(MEMORYMODEL)/perl/site_perl CONFIGURE_ARGS += -Dsitelib=$(datadir)/$(MEMORYMODEL)/perl/site_perl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Dec 18 11:10:27 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 18 Dec 2012 10:10:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[19911] csw/mgar/pkg Message-ID: Revision: 19911 http://gar.svn.sourceforge.net/gar/?rev=19911&view=rev Author: cgrzemba Date: 2012-12-18 10:10:27 +0000 (Tue, 18 Dec 2012) Log Message: ----------- ctags/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/ctags/ csw/mgar/pkg/ctags/Makefile csw/mgar/pkg/ctags/branches/ csw/mgar/pkg/ctags/tags/ csw/mgar/pkg/ctags/trunk/ csw/mgar/pkg/ctags/trunk/Makefile csw/mgar/pkg/ctags/trunk/checksums csw/mgar/pkg/ctags/trunk/files/ Added: csw/mgar/pkg/ctags/Makefile =================================================================== --- csw/mgar/pkg/ctags/Makefile (rev 0) +++ csw/mgar/pkg/ctags/Makefile 2012-12-18 10:10:27 UTC (rev 19911) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/ctags/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/ctags/trunk/Makefile =================================================================== --- csw/mgar/pkg/ctags/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ctags/trunk/Makefile 2012-12-18 10:10:27 UTC (rev 19911) @@ -0,0 +1,42 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = ctags +VERSION = 5.8 +GARTYPE = v2 + +DESCRIPTION = Exuberant Ctags +define BLURB + Exuberant Ctags is a multilanguage reimplementation of the Unix ctags utility. Ctags generates an index of source code definitions which is used by numerous editors and utilities to instantly locate the definitions. +endef + +MASTER_SITES = $(SFMIRROS) +DISTFILES = $(DISTNAME).tar.gz +VENDOR_URL = http://ctags.sourceforge.net/ + +INCOMPATIBLE_PKGS = CSWemacs-bin-common +INCOMPATIBLE_PKGS = CSWemacs-common + +REINPLACE_MATCH = /usr/local/etc +REINPLACE_WITH = /etc/opt/csw +REINPLACE_FILES += options.c +REINPLACE_FILES += ctags.1 + +CHECKPKG_OVERRIDES_CSWctags += file-collision|/opt/csw/bin/ctags|CSWctags|CSWemacs-bin-common +CHECKPKG_OVERRIDES_CSWctags += file-collision|/opt/csw/share/man/man1/ctags.1|CSWctags|CSWemacs-common + +# no traget check +SKIPTEST = 1 +# no DESTDIR support +INSTALL_SCRIPTS = custom + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(bindir) + @ginstall -d $(DESTDIR)$(mandir)/man1 + @gcp -fp $(WORKSRC)/ctags $(DESTDIR)$(bindir) + @gcp -fp $(WORKSRC)/ctags.1 $(DESTDIR)$(mandir)/man1 + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/ctags/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/ctags/trunk/checksums =================================================================== --- csw/mgar/pkg/ctags/trunk/checksums (rev 0) +++ csw/mgar/pkg/ctags/trunk/checksums 2012-12-18 10:10:27 UTC (rev 19911) @@ -0,0 +1 @@ +c00f82ecdcc357434731913e5b48630d ctags-5.8.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 Dec 18 11:37:41 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 18 Dec 2012 10:37:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[19912] csw/mgar/pkg/lua/trunk Message-ID: Revision: 19912 http://gar.svn.sourceforge.net/gar/?rev=19912&view=rev Author: dmichelsen Date: 2012-12-18 10:37:41 +0000 (Tue, 18 Dec 2012) Log Message: ----------- lua/trunk: Add pkgconfig files Modified Paths: -------------- csw/mgar/pkg/lua/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lua/trunk/files/lua.pc Modified: csw/mgar/pkg/lua/trunk/Makefile =================================================================== --- csw/mgar/pkg/lua/trunk/Makefile 2012-12-18 10:10:27 UTC (rev 19911) +++ csw/mgar/pkg/lua/trunk/Makefile 2012-12-18 10:37:41 UTC (rev 19912) @@ -7,7 +7,7 @@ NAME = lua VERSION = 5.2.1 -GARTYPE = v2 +MAJOR = $(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}') DESCRIPTION = Light-weight language designed for extending applications define BLURB @@ -18,6 +18,8 @@ MASTER_SITES = http://www.lua.org/ftp/ DISTFILES += $(DISTNAME).tar.gz +DISTFILES += lua.pc +EXPANDVARS += lua.pc PATCHFILES += 0001-Make-shared-lib.patch @@ -68,3 +70,10 @@ INSTALL_ARGS += INSTALL_LIB=$(DESTDIR)$(libdir) include gar/category.mk + +post-install-modulated: + ginstall -d $(DESTDIR)$(libdir)/pkgconfig + ginstall $(WORKDIR)/lua.pc $(DESTDIR)$(libdir)/pkgconfig/lua-$(MAJOR).pc + gln -s lua-$(MAJOR).pc $(DESTDIR)$(libdir)/pkgconfig/lua$(MAJOR).pc + gln -s lua-$(MAJOR).pc $(DESTDIR)$(libdir)/pkgconfig/lua.pc + @$(MAKECOOKIE) Added: csw/mgar/pkg/lua/trunk/files/lua.pc =================================================================== --- csw/mgar/pkg/lua/trunk/files/lua.pc (rev 0) +++ csw/mgar/pkg/lua/trunk/files/lua.pc 2012-12-18 10:37:41 UTC (rev 19912) @@ -0,0 +1,32 @@ +# lua.pc -- pkg-config data for Lua + +# We construct the .pc here because upstream is reducing the number of files in the tarball +# and .pc is "so useless" :-( +# http://lua-users.org/lists/lua-l/2010-03/msg00718.html + +prefix=@prefix@ +V=@MAJOR@ +R=@VERSION@ + +prefix=@prefix@ +INSTALL_BIN=@bindir@ +INSTALL_INC=@includedir@ +INSTALL_LIB=@libdir@ +INSTALL_MAN=@mandir@/man1 +INSTALL_LMOD=@sharedstatedir@/lua/${V} +INSTALL_CMOD=@libdir@/lua/${V} + +# canonical vars +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Lua +Description: An Extensible Extension Language +Version: ${R} +Requires: +Libs: -L${libdir} -llua -lm +Cflags: -I${includedir} + +# (end of lua.pc) + 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 Dec 18 12:46:58 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 18 Dec 2012 11:46:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[19913] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 19913 http://gar.svn.sourceforge.net/gar/?rev=19913&view=rev Author: wahwah Date: 2012-12-18 11:46:58 +0000 (Tue, 18 Dec 2012) Log Message: ----------- gcc4/trunk: The previous way of doing it did not work. Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-18 10:37:41 UTC (rev 19912) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-12-18 11:46:58 UTC (rev 19913) @@ -72,13 +72,11 @@ # Using ccs/bin/bas on x86 results in this problem: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35531 -ifeq ($(GARCH),sparc) -CONFIGURE_ARGS += --with-as=/usr/ccs/bin/as -CONFIGURE_ARGS += --without-gnu-as -else -CONFIGURE_ARGS += --with-gnu-as -CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas -endif +CONFIGURE_ARGS_sparc += --with-as=/usr/ccs/bin/as +CONFIGURE_ARGS_sparc += --without-gnu-as +CONFIGURE_ARGS_i386 += --with-gnu-as +CONFIGURE_ARGS_i386 += --with-as=/opt/csw/bin/gas +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) # GCC can't be built in the same directory with the sources. # It also can't be built in a subdirectory of the sources. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Tue Dec 18 15:54:39 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Tue, 18 Dec 2012 14:54:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[19914] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19914 http://gar.svn.sourceforge.net/gar/?rev=19914&view=rev Author: claudio_sf Date: 2012-12-18 14:54:38 +0000 (Tue, 18 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: Memorymodel syslinks Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-18 11:46:58 UTC (rev 19913) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-18 14:54:38 UTC (rev 19914) @@ -221,9 +221,9 @@ POST_TARGETS += syslinks syslinks: @echo "Creating links to libperl and minor-major lib dirs" - cd $(DESTDIR)$(libdir)/perl && ln -s $(VERSION_MAJOR) $(VERSION) &&\ + cd $(DESTDIR)$(libdir)/$(MEMORYMODEL)/perl && ln -s $(VERSION_MAJOR) $(VERSION) &&\ cd $(VERSION_MAJOR) && ln -s libperl.so libperl.so.$(VERSION) && ln -s libperl.so libperl.so.$(VERSION_MAJOR) &&\ - cd $(DESTDIR)$(datadir)/perl && ln -s $(VERSION_MAJOR) $(VERSION) + cd $(DESTDIR)$(datadir)/$(MEMORYMODEL)/perl && ln -s $(VERSION_MAJOR) $(VERSION) @$(MAKECOOKIE) # Remove build paths from Config 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 Dec 18 16:25:01 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 18 Dec 2012 15:25:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[19915] csw/mgar/pkg/gnuplot/trunk Message-ID: Revision: 19915 http://gar.svn.sourceforge.net/gar/?rev=19915&view=rev Author: dmichelsen Date: 2012-12-18 15:25:01 +0000 (Tue, 18 Dec 2012) Log Message: ----------- gnuplot/trunk: Update to 4.6.1, fix testsuite and disable -z ignore until Wx is fixed Modified Paths: -------------- csw/mgar/pkg/gnuplot/trunk/Makefile csw/mgar/pkg/gnuplot/trunk/checksums Modified: csw/mgar/pkg/gnuplot/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnuplot/trunk/Makefile 2012-12-18 14:54:38 UTC (rev 19914) +++ csw/mgar/pkg/gnuplot/trunk/Makefile 2012-12-18 15:25:01 UTC (rev 19915) @@ -1,19 +1,13 @@ NAME = gnuplot -VERSION = 4.6.0 -GARTYPE = v2 +VERSION = 4.6.1 DESCRIPTION = The Gnuplot Plotting Utility -define BLURB - The Gnuplot Plotting Utility. -endef MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz PATCHFILES = 0001-Remove-definition-unclear-why-leaving-it-in-causes-e.patch -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - VENDOR_URL = http://www.gnuplot.info/ LICENSE = Copyright @@ -22,7 +16,6 @@ CATALOGNAME_CSWgnuplot = gnuplot SPKG_DESC_CSWgnuplot = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWgnuplot += CSWemacscommon RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibreadline6 @@ -70,8 +63,15 @@ REINPLACE_USRLOCAL += share/gnuplotrc -EXTRA_LINKER_FLAGS = -norunpath +EXTRA_LINKER_FLAGS += -norunpath +# Gnuplot automatically pulls in libCstd which is needed by libwx_gtk2u_core-2.8.so.0.6.0 because +# the library is wrong self-contained (ldd -r on that throws unresolved symbol errors). +# Gnuplot itself does not need libCstd leading to stripped NEEDED and then linking in libwx +# fails. Long-term should be a fix to libwx to be self-contained, but add libs unconditionally +# for now. +LINKER_IGNORE = + EXTRA_MODULATORS = WXWIDGETS MODULATIONS_WXWIDGETS = yes no @@ -91,6 +91,10 @@ EXTRA_TEST_EXPORTS = DISPLAY DISPLAY = +# The testsuite does not work without DISPLAY any more, I tested it manually for 4.6.1 with DISPLAY +# without errors. Please retest on major new versions. +SKIPTEST ?= 1 + MERGE_SCRIPTS_isa-default-wxwidgets-yes = copy-all MERGE_SCRIPTS_isa-default-wxwidgets-no = copy-all Modified: csw/mgar/pkg/gnuplot/trunk/checksums =================================================================== --- csw/mgar/pkg/gnuplot/trunk/checksums 2012-12-18 14:54:38 UTC (rev 19914) +++ csw/mgar/pkg/gnuplot/trunk/checksums 2012-12-18 15:25:01 UTC (rev 19915) @@ -1 +1 @@ -8e6e92b4596ea0eb75e16a57fc79efec gnuplot-4.6.0.tar.gz +4c9a06461f402482c30cf94e267eb877 gnuplot-4.6.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Dec 18 16:40:05 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 18 Dec 2012 15:40:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[19916] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 19916 http://gar.svn.sourceforge.net/gar/?rev=19916&view=rev Author: pfelecan Date: 2012-12-18 15:40:04 +0000 (Tue, 18 Dec 2012) Log Message: ----------- texlive/trunk: refinement for checkpkg diagnostics Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-12-18 15:25:01 UTC (rev 19915) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-12-18 15:40:04 UTC (rev 19916) @@ -131,6 +131,11 @@ EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/bin/httexi EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/bin/htxelatex EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/bin/htxetex +# foreign binaries +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/source/latex/splitindex/splitindex-Linux-i386 +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/source/latex/splitindex/splitindex-OpenBSD-i386 +# compiled Python +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/doc/fonts/gnu-freefont/tools/generate/buildutils.pyc DEBUG_PACKAGING = 1 SPKG_TMPDIR = $(HOME)/ocswtmp @@ -514,6 +519,7 @@ PKGFILES_CSWtexlive-binaries += /opt/csw/bin/synctex PKGFILES_CSWtexlive-binaries += /opt/csw/bin/t1ascii PKGFILES_CSWtexlive-binaries += /opt/csw/bin/t1asm +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/t1binary PKGFILES_CSWtexlive-binaries += /opt/csw/bin/t1disasm PKGFILES_CSWtexlive-binaries += /opt/csw/bin/t1dotlessj PKGFILES_CSWtexlive-binaries += /opt/csw/bin/t1lint @@ -583,6 +589,17 @@ PKGFILES_CSWtexlive-doc-base += /opt/csw/share/texmf/doc/texlive/texlive-en/.* ARCHALL_CSWtexlive-doc-base = 1 RUNTIME_DEP_PKGS_CSWtexlive-doc-base += CSWperl +CHECKPKG_OVERRIDES_CSWtexlive-doc-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-en/archive/live-2010.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-en/archive/live-2008.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-en/archive/live-tl7.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-en/archive/live-2011.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-en/archive/live-2007.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-en/archive/live-2009.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-en/archive/live-2003.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-en/archive/live-2004.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-en/archive/live-2005.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-en/texlive-en.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-en/texlive-en.html PACKAGES += CSWtexlive-doc-bg CATALOGNAME_CSWtexlive-doc-bg = texlive_doc_bg @@ -694,6 +711,8 @@ PKGFILES_CSWtexlive-doc-fr += /opt/csw/share/texmf-dist/doc/plain/impatient-fr/.* PKGFILES_CSWtexlive-doc-fr += /opt/csw/share/texmf/doc/texlive/texlive-fr/.* ARCHALL_CSWtexlive-doc-fr = 1 +CHECKPKG_OVERRIDES_CSWtexlive-doc-fr += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-fr/texlive-fr.html +CHECKPKG_OVERRIDES_CSWtexlive-doc-fr += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-fr/texlive-fr.tex PACKAGES += CSWtexlive-doc-it CATALOGNAME_CSWtexlive-doc-it = texlive_doc_it @@ -1541,6 +1560,8 @@ PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/yfonts/.* PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/omega/ocherokee/.* ARCHALL_CSWtexlive-fonts-extra-doc = 1 +RUNTIME_DEP_PKGS_CSWtexlive-fonts-extra-doc += CSWpython +RUNTIME_DEP_PKGS_CSWtexlive-fonts-extra-doc += CSWperl PACKAGES += CSWtexlive-fonts-recommended CATALOGNAME_CSWtexlive-fonts-recommended = texlive_fonts_recommended @@ -2487,7 +2508,6 @@ PKGFILES_CSWtexlive-latex-base += /opt/csw/bin/arlatex PKGFILES_CSWtexlive-latex-base += /opt/csw/bin/bundledoc PKGFILES_CSWtexlive-latex-base += /opt/csw/bin/dvilualatex -PKGFILES_CSWtexlive-latex-base += /opt/csw/bin/extconv PKGFILES_CSWtexlive-latex-base += /opt/csw/bin/latex PKGFILES_CSWtexlive-latex-base += /opt/csw/bin/lualatex PKGFILES_CSWtexlive-latex-base += /opt/csw/bin/pdfatfi @@ -2536,7 +2556,17 @@ RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWtexlive-binaries RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWperl RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWtexlive-luatex +CHECKPKG_OVERRIDES_CSWtexlive-latex-base += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/tex/context/base/colo-x11.mkii +CHECKPKG_OVERRIDES_CSWtexlive-latex-base += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/tex/context/base/colo-imp-x11.mkiv +PACKAGES += CSWtexlive-latex-base-binaries-binaries +CATALOGNAME_CSWtexlive-latex-base-binaries = texlive_latex_base_binaries +SPKG_DESC_CSWtexlive-latex-base-binaries += $(DESCRIPTION), latex base, architecture dependent +OBSOLETED_BY_CSWtexlive-latex-base-binaries = CSWtetex +PKGFILES_CSWtexlive-latex-base-binaries += $(docdir)/$(CATALOGNAME_CSWtexlive-latex-base-binaries)/.* +PKGFILES_CSWtexlive-latex-base-binaries += /opt/csw/bin/extconv +RUNTIME_DEP_PKGS_CSWtexlive-latex-base-binaries += CSWtexlive-common + PACKAGES += CSWtexlive-latex-base-doc CATALOGNAME_CSWtexlive-latex-base-doc = texlive_latex_base_doc SPKG_DESC_CSWtexlive-latex-base-doc += $(DESCRIPTION), latex base doc @@ -2566,6 +2596,25 @@ SPKG_DESC_CSWtexlive-latex-extra += $(DESCRIPTION), latex extra OBSOLETED_BY_CSWtexlive-latex-extra = CSWtetex PKGFILES_CSWtexlive-latex-extra += $(docdir)/$(CATALOGNAME_CSWtexlive-latex-extra)/.* +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/authorindex +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/bg5+latex +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/bg5+pdflatex +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/bg5latex +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/bg5pdflatex +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/cef5latex +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/cef5pdflatex +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/ceflatex +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/cefpdflatex +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/cefslatex +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/cefspdflatex +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/chkweb +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/deweb +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/exceltex +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/latexdiff +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/latexdiff-vc +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/latexfileversion +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/latexmk +PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/latexrevise PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/makeglossaries PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/pdfannotextractor PKGFILES_CSWtexlive-latex-extra += /opt/csw/bin/perltex @@ -3224,34 +3273,22 @@ PKGFILES_CSWtexlive-latex-extra += /opt/csw/share/texmf-dist/tex/latex/zwpagelayout/.* PKGFILES_CSWtexlive-latex-extra += /opt/csw/share/texmf-dist/tex/plain/esint-type1/.* PKGFILES_CSWtexlive-latex-extra += /opt/csw/share/texmf-dist/tex/xmltex/xmlplay/.* -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/authorindex -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/bg5+latex -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/bg5+pdflatex -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/bg5conv -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/bg5latex -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/bg5pdflatex -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/cef5conv -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/cef5latex -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/cef5pdflatex -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/cefconv -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/ceflatex -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/cefpdflatex -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/cefsconv -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/cefslatex -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/cefspdflatex -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/chktex -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/chkweb -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/deweb -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/exceltex -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/latexdiff -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/latexdiff-vc -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/latexfileversion -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/latexmk -PKGFILES_CSWtexlive-latex-extra += latex-extra /opt/csw/bin/latexrevise RUNTIME_DEP_PKGS_CSWtexlive-latex-extra += CSWtexlive-common RUNTIME_DEP_PKGS_CSWtexlive-latex-extra += CSWperl +RUNTIME_DEP_PKGS_CSWtexlive-latex-extra += CSWtexlive-latex-extra-binaries ARCHALL_CSWtexlive-latex-extra = 1 +PACKAGES += CSWtexlive-latex-extra-binaries +CATALOGNAME_CSWtexlive-latex-extra-binaries = texlive_latex_extra_binaries +SPKG_DESC_CSWtexlive-latex-extra-binaries += $(DESCRIPTION), latex extra +OBSOLETED_BY_CSWtexlive-latex-extra-binaries = CSWtetex +PKGFILES_CSWtexlive-latex-extra-binaries += $(docdir)/$(CATALOGNAME_CSWtexlive-latex-extra-binaries)/.* +PKGFILES_CSWtexlive-latex-extra-binaries += /opt/csw/bin/bg5conv +PKGFILES_CSWtexlive-latex-extra-binaries += /opt/csw/bin/cef5conv +PKGFILES_CSWtexlive-latex-extra-binaries += /opt/csw/bin/cefconv +PKGFILES_CSWtexlive-latex-extra-binaries += /opt/csw/bin/cefsconv +PKGFILES_CSWtexlive-latex-extra-binaries += /opt/csw/bin/chktex + PACKAGES += CSWtexlive-latex-extra-doc CATALOGNAME_CSWtexlive-latex-extra-doc = texlive_latex_extra_doc SPKG_DESC_CSWtexlive-latex-extra-doc += $(DESCRIPTION), latex extra doc @@ -4085,7 +4122,17 @@ PKGFILES_CSWtexlive-music += /opt/csw/share/texmf-dist/tex/latex/songbook/.* ARCHALL_CSWtexlive-music = 1 RUNTIME_DEP_PKGS_CSWtexlive-music += CSWtexlive-common +RUNTIME_DEP_PKGS_CSWtexlive-music += CSWtexlive-music-binaries +PACKAGES += CSWtexlive-music-binaries +CATALOGNAME_CSWtexlive-music-binaries = texlive_music_binaries +SPKG_DESC_CSWtexlive-music-binaries += $(DESCRIPTION), music +OBSOLETED_BY_CSWtexlive-music-binaries = CSWtetex +PKGFILES_CSWtexlive-music-binaries += $(docdir)/$(CATALOGNAME_CSWtexlive-music-binaries)/.* +PKGFILES_CSWtexlive-music-binaries += /opt/csw/bin/prepmx +ARCHALL_CSWtexlive-music-binaries = 1 +RUNTIME_DEP_PKGS_CSWtexlive-music-binaries += CSWtexlive-common + PACKAGES += CSWtexlive-omega CATALOGNAME_CSWtexlive-omega = texlive_omega SPKG_DESC_CSWtexlive-omega += $(DESCRIPTION), omega @@ -4814,11 +4861,23 @@ PKGFILES_CSWtexlive-xindy += /opt/csw/share/share/texmf/scripts/xindy/xindy.pl PKGFILES_CSWtexlive-xindy += /opt/csw/share/texmf/doc/xindy/.* PKGFILES_CSWtexlive-xindy += /opt/csw/share/texmf/xindy/.* -RUNTIME_DEP_PKGS_CSWtexlive-xindy += CSWperl RUNTIME_DEP_PKGS_CSWtexlive-xindy += CSWclisp RUNTIME_DEP_PKGS_CSWtexlive-xindy += CSWtexlive-common +RUNTIME_DEP_PKGS_CSWtexlive-xindy += CSWtexlive-xindy-binaries +RUNTIME_DEP_PKGS_CSWtexlive-xindy += CSWperl ARCHALL_CSWtexlive-xindy = 1 +CHECKPKG_OVERRIDES_CSWtexlive-xindy += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/xindy/README.distrib-source +CHECKPKG_OVERRIDES_CSWtexlive-xindy += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/xindy/manual-3.html +PACKAGES += CSWtexlive-xindy-binaries +CATALOGNAME_CSWtexlive-xindy-binaries = texlive_xindy_binaries +SPKG_DESC_CSWtexlive-xindy-binaries += $(DESCRIPTION), index generator for structured documents like LaTeX or SGML +PKGFILES_CSWtexlive-xindy-binaries += $(docdir)/$(CATALOGNAME_CSWtexlive-xindy-binaries)/.* +PKGFILES_CSWtexlive-xindy-binaries += /opt/csw//bin/tex2xindy +RUNTIME_DEP_PKGS_CSWtexlive-xindy-binaries += CSWclisp +RUNTIME_DEP_PKGS_CSWtexlive-xindy-binaries += CSWtexlive-common +RUNTIME_DEP_PKGS_CSWtexlive-xindy-binaries += CSWtexlive-xindy-binaries-binary + include gar/category.mk PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 18 16:43:55 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 18 Dec 2012 15:43:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[19917] csw/mgar/pkg/gnuplot/trunk/Makefile Message-ID: Revision: 19917 http://gar.svn.sourceforge.net/gar/?rev=19917&view=rev Author: dmichelsen Date: 2012-12-18 15:43:54 +0000 (Tue, 18 Dec 2012) Log Message: ----------- gnuplot/trunk: Add override and additional deps Modified Paths: -------------- csw/mgar/pkg/gnuplot/trunk/Makefile Modified: csw/mgar/pkg/gnuplot/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnuplot/trunk/Makefile 2012-12-18 15:40:04 UTC (rev 19916) +++ csw/mgar/pkg/gnuplot/trunk/Makefile 2012-12-18 15:43:54 UTC (rev 19917) @@ -26,7 +26,12 @@ RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibz1 RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibpdf6 +RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibpng15-15 +# There is just an emacs style in it, do not depend on it +CHECKPKG_OVERRIDES_CSWgnuplot += missing-dependency|CSWemacscommon + PACKAGES += CSWgnuplot-wx CATALOGNAME_CSWgnuplot-wx = gnuplot_wx SPKG_DESC_CSWgnuplot-wx = $(DESCRIPTION) (with WX-Widgets and Pango) @@ -50,7 +55,6 @@ RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibz1 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgdk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgtk-x11-2-0-0 @@ -58,7 +62,13 @@ RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibpdf6 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibpng15-15 +# This is pulled in from Wx, take out if that has been redone +CHECKPKG_OVERRIDES_CSWgnuplot-wx += bad-rpath-entry|/opt/csw/lib/|opt/csw/libexec/gnuplot/4.6/gnuplot_x11-wx + +# TBD: Add all build deps BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWgnuplot-wx) REINPLACE_USRLOCAL += share/gnuplotrc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Tue Dec 18 22:32:37 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Tue, 18 Dec 2012 21:32:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[19918] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19918 http://gar.svn.sourceforge.net/gar/?rev=19918&view=rev Author: claudio_sf Date: 2012-12-18 21:32:37 +0000 (Tue, 18 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: debian like libs (split later) Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-18 15:43:54 UTC (rev 19917) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-18 21:32:37 UTC (rev 19918) @@ -78,7 +78,7 @@ BUILD64 = 1 # Configuration flags -CONFIGURE_ARGS += -Darchlib=$(libdir)/$(MEMORYMODEL)/perl/$(VERSION_MAJOR) +CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION_MAJOR) CONFIGURE_ARGS += -Dcc=$(CC) #CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" #CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" @@ -100,13 +100,13 @@ CONFIGURE_ARGS += -Dprefix=$(prefix) CONFIGURE_ARGS += -Dbin=$(bindir) CONFIGURE_ARGS += -Dscriptdir=$(bindir) -# CSW provided modules should install in the privlib directory (/opt/csw/share/$MEMORYMODEL/perl/5.14) -CONFIGURE_ARGS += -Dprivlib=$(datadir)/$(MEMORYMODEL)/perl/$(VERSION_MAJOR) -CONFIGURE_ARGS += -Dsitearch=$(libdir)/$(MEMORYMODEL)/perl/site_perl -CONFIGURE_ARGS += -Dsitelib=$(datadir)/$(MEMORYMODEL)/perl/site_perl -CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dsiteprefix=/usr +# CSW provided modules should install in the privlib directory (/opt/csw/share/perl/5.14) +CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION_MAJOR) +CONFIGURE_ARGS += -Dsitearch=/usr/local/lib/perl/$(VERSION_MAJOR) +CONFIGURE_ARGS += -Dsitelib=/usr/local/share/perl/$(VERSION) +CONFIGURE_ARGS += -Dsiteman1dir=/usr/local/share/man/man1 +CONFIGURE_ARGS += -Dsiteman3dir==/usr/local/share/man/man3 +CONFIGURE_ARGS += -Dsiteprefix=/usr/local CONFIGURE_ARGS += -Duseshrplib CONFIGURE_ARGS += -Dusesitecustomize CONFIGURE_ARGS += -Dusethreads @@ -120,15 +120,16 @@ #CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) # Largefiles is on by default for 64 bit -#CONFIGURE_ARGS-32 += -Duselargefiles -#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) -#CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw -#CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw -#CONFIGURE_ARGS += -Dvendorprefix=$(prefix) +CONFIGURE_ARGS += -Duselargefiles +CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl5 +CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl5 +CONFIGURE_ARGS += -Dvendorprefix=$(prefix) #CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" #CONFIGURE_ARGS += -Dlibsdirs=/usr/lib/64 CONFIGURE_ARGS += -Dsed=/opt/csw/bin/gsed +CONFIGURE_ARGS-64 += -Duse64bitint +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) #EXTRA_LIB += $(prefix)/bdb48/lib #EXTRA_INC += $(prefix)/bdb48/include @@ -221,9 +222,9 @@ POST_TARGETS += syslinks syslinks: @echo "Creating links to libperl and minor-major lib dirs" - cd $(DESTDIR)$(libdir)/$(MEMORYMODEL)/perl && ln -s $(VERSION_MAJOR) $(VERSION) &&\ + cd $(DESTDIR)$(libdir)/perl && ln -s $(VERSION_MAJOR) $(VERSION) &&\ cd $(VERSION_MAJOR) && ln -s libperl.so libperl.so.$(VERSION) && ln -s libperl.so libperl.so.$(VERSION_MAJOR) &&\ - cd $(DESTDIR)$(datadir)/$(MEMORYMODEL)/perl && ln -s $(VERSION_MAJOR) $(VERSION) + cd $(DESTDIR)$(datadir)/perl && ln -s $(VERSION_MAJOR) $(VERSION) @$(MAKECOOKIE) # Remove build paths from Config This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Wed Dec 19 10:47:10 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 19 Dec 2012 09:47:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[19919] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19919 http://gar.svn.sourceforge.net/gar/?rev=19919&view=rev Author: claudio_sf Date: 2012-12-19 09:47:09 +0000 (Wed, 19 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: configure arg changes Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-18 21:32:37 UTC (rev 19918) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-19 09:47:09 UTC (rev 19919) @@ -111,8 +111,8 @@ CONFIGURE_ARGS += -Dusesitecustomize CONFIGURE_ARGS += -Dusethreads CONFIGURE_ARGS += -Dusedtrace -CONFIGURE_ARGS += -Duse64bitall CONFIGURE_ARGS += -Duse64bitint +CONFIGURE_ARGS-64 += -Duse64bitall CONFIGURE_ARGS += -Dinc_version_list=none # When built on Solaris 10, enable DTrace support @@ -128,7 +128,6 @@ CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" #CONFIGURE_ARGS += -Dlibsdirs=/usr/lib/64 CONFIGURE_ARGS += -Dsed=/opt/csw/bin/gsed -CONFIGURE_ARGS-64 += -Duse64bitint CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) #EXTRA_LIB += $(prefix)/bdb48/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Wed Dec 19 15:26:18 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 19 Dec 2012 14:26:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[19920] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19920 http://gar.svn.sourceforge.net/gar/?rev=19920&view=rev Author: claudio_sf Date: 2012-12-19 14:26:18 +0000 (Wed, 19 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: ISAEXEC addition Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-19 09:47:09 UTC (rev 19919) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-19 14:26:18 UTC (rev 19920) @@ -76,7 +76,9 @@ #PERL_LIBS = -lsocket -lgdbm -ldl -lm -lpthread -lc -lcrypt BUILD64 = 1 +ISAEXEC = 1 + # Configuration flags CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION_MAJOR) CONFIGURE_ARGS += -Dcc=$(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 Wed Dec 19 15:29:36 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 19 Dec 2012 14:29:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[19921] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 19921 http://gar.svn.sourceforge.net/gar/?rev=19921&view=rev Author: dmichelsen Date: 2012-12-19 14:29:36 +0000 (Wed, 19 Dec 2012) Log Message: ----------- mGAR v2: Inherit SKIPTEST to other platforms, sanitize package name further Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2012-12-19 14:26:18 UTC (rev 19920) +++ csw/mgar/gar/v2/gar.pkg.mk 2012-12-19 14:29:36 UTC (rev 19921) @@ -31,7 +31,7 @@ # SRCPACKAGE is the name of the package containing the sources ifeq ($(origin PACKAGES), undefined) -PACKAGES = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(NAME)) +PACKAGES = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(subst _,-,$(NAME))) CATALOGNAME ?= $(if $(filter %.gspec,$(DISTFILES)),,$(subst -,_,$(NAME))) SRCPACKAGE_BASE = $(firstword $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES)) SRCPACKAGE ?= $(SRCPACKAGE_BASE)-src @@ -1052,6 +1052,7 @@ _PROPAGATE_ENV += PARALLELMFLAGS _PROPAGATE_ENV += PARALLELMODULATIONS _PROPAGATE_ENV += PATH +_PROPAGATE_ENV += SKIPTEST platforms: _PACKAGING_PLATFORMS=$(if $(ARCHALL),$(firstword $(PACKAGING_PLATFORMS)),$(PACKAGING_PLATFORMS)) platforms: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Wed Dec 19 19:41:42 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 19 Dec 2012 18:41:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[19922] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19922 http://gar.svn.sourceforge.net/gar/?rev=19922&view=rev Author: claudio_sf Date: 2012-12-19 18:41:42 +0000 (Wed, 19 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: Remove binary-architecture-does-not-match-placement Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-19 14:29:36 UTC (rev 19921) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-19 18:41:42 UTC (rev 19922) @@ -43,7 +43,7 @@ CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWperl += binary-architecture-does-not-match-placement +#CHECKPKG_OVERRIDES_CSWperl += binary-architecture-does-not-match-placement OBSOLETED_BY_CSWperl += CSWpm-module-build OBSOLETED_BY_CSWperl += CSWpm-json-pp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Wed Dec 19 20:05:34 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 19 Dec 2012 19:05:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[19923] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19923 http://gar.svn.sourceforge.net/gar/?rev=19923&view=rev Author: claudio_sf Date: 2012-12-19 19:05:34 +0000 (Wed, 19 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: /opt/csw/local + obsoletes Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-19 18:41:42 UTC (rev 19922) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-19 19:05:34 UTC (rev 19923) @@ -24,7 +24,6 @@ # Make extra Solaris 10 package with DTrace support #PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -#PACKAGING_PLATFORMS += solaris10-sparc #BUILD64_ONLY = 1 PACKAGES += CSWperl PKG_DESC_CSWperl = $(DESCRIPTION) @@ -46,7 +45,14 @@ #CHECKPKG_OVERRIDES_CSWperl += binary-architecture-does-not-match-placement OBSOLETED_BY_CSWperl += CSWpm-module-build OBSOLETED_BY_CSWperl += CSWpm-json-pp +OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta +OBSOLETED_BY_CSWperldoc += CSWpm-parse-cpan-meta +OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-yaml +OBSOLETED_BY_CSWperldoc += CSWpm-module-metadata +OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-requirements +OBSOLETED_BY_CSWperldoc += CSWpm-perl-ostype + # Core module updates # Not used at the moment, leave one as example #MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ @@ -104,11 +110,11 @@ CONFIGURE_ARGS += -Dscriptdir=$(bindir) # CSW provided modules should install in the privlib directory (/opt/csw/share/perl/5.14) CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION_MAJOR) -CONFIGURE_ARGS += -Dsitearch=/usr/local/lib/perl/$(VERSION_MAJOR) -CONFIGURE_ARGS += -Dsitelib=/usr/local/share/perl/$(VERSION) -CONFIGURE_ARGS += -Dsiteman1dir=/usr/local/share/man/man1 -CONFIGURE_ARGS += -Dsiteman3dir==/usr/local/share/man/man3 -CONFIGURE_ARGS += -Dsiteprefix=/usr/local +CONFIGURE_ARGS += -Dsitearch=/opt/csw/local/lib/perl/$(VERSION_MAJOR) +CONFIGURE_ARGS += -Dsitelib=/opt/csw/local/share/perl/$(VERSION) +CONFIGURE_ARGS += -Dsiteman1dir=/opt/csw//local/share/man/man1 +CONFIGURE_ARGS += -Dsiteman3dir==/opt/csw/local/share/man/man3 +CONFIGURE_ARGS += -Dsiteprefix=/opt/csw/local CONFIGURE_ARGS += -Duseshrplib CONFIGURE_ARGS += -Dusesitecustomize CONFIGURE_ARGS += -Dusethreads This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Thu Dec 20 09:19:38 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Thu, 20 Dec 2012 08:19:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[19924] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19924 http://gar.svn.sourceforge.net/gar/?rev=19924&view=rev Author: claudio_sf Date: 2012-12-20 08:19:37 +0000 (Thu, 20 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: remove obsoletes Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-19 19:05:34 UTC (rev 19923) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-20 08:19:37 UTC (rev 19924) @@ -41,16 +41,16 @@ CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl +#CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl #CHECKPKG_OVERRIDES_CSWperl += binary-architecture-does-not-match-placement -OBSOLETED_BY_CSWperl += CSWpm-module-build -OBSOLETED_BY_CSWperl += CSWpm-json-pp -OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta -OBSOLETED_BY_CSWperldoc += CSWpm-parse-cpan-meta -OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-yaml -OBSOLETED_BY_CSWperldoc += CSWpm-module-metadata -OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-requirements -OBSOLETED_BY_CSWperldoc += CSWpm-perl-ostype +#OBSOLETED_BY_CSWperl += CSWpm-module-build +#OBSOLETED_BY_CSWperl += CSWpm-json-pp +#OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta +#OBSOLETED_BY_CSWperldoc += CSWpm-parse-cpan-meta +#OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-yaml +#OBSOLETED_BY_CSWperldoc += CSWpm-module-metadata +#OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-requirements +#OBSOLETED_BY_CSWperldoc += CSWpm-perl-ostype # Core module updates This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Thu Dec 20 14:01:42 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Thu, 20 Dec 2012 13:01:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[19925] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19925 http://gar.svn.sourceforge.net/gar/?rev=19925&view=rev Author: claudio_sf Date: 2012-12-20 13:01:41 +0000 (Thu, 20 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: overrides Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-20 08:19:37 UTC (rev 19924) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-20 13:01:41 UTC (rev 19925) @@ -51,8 +51,57 @@ #OBSOLETED_BY_CSWperldoc += CSWpm-module-metadata #OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-requirements #OBSOLETED_BY_CSWperldoc += CSWpm-perl-ostype +CHECKPKG_OVERRIDES_CSWperl += file-collision|/opt/csw/bin/config_data|CSWperl|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperl += file-collision|/opt/csw/bin/json_pp|CSWperl|CSWpm-json-pp +CHECKPKG_OVERRIDES_CSWperl += filename-version-does-not-match-pkginfo-version|filename=5.16.2,REV=2012.12.19|pkginfo=5.16.2,REV=2012.12.20 +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Spec.3perl|CSWperldoc|CSWpm-cpan-meta +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Validator.3perl|CSWperldoc|CSWpm-cpan-meta +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Notes.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man1/config_data.1|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::darwin.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::cygwin.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta.3perl|CSWperldoc|CSWpm-cpan-meta +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/JSON::PP.3perl|CSWperldoc|CSWpm-json-pp +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Prereqs.3perl|CSWperldoc|CSWpm-cpan-meta +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::VOS.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::YAML.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Base.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::MPEiX.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::os2.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::RiscOS.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man1/json_pp.1|CSWperldoc|CSWpm-json-pp +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::EBCDIC.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Authoring.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Parse::CPAN::Meta.3perl|CSWperldoc|CSWpm-parse-cpan-meta +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Version.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::YAML.3perl|CSWperldoc|CSWpm-cpan-meta-yaml +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::VMS.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::aix.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::PPMMaker.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::API.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Metadata.3perl|CSWperldoc|CSWpm-module-metadata +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Requirements.3perl|CSWperldoc|CSWpm-cpan-meta-requirements +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::MacOS.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::History.3perl|CSWperldoc|CSWpm-cpan-meta +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/JSON::PP::Boolean.3perl|CSWperldoc|CSWpm-json-pp +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Compat.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::Amiga.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::ModuleInfo.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::Default.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Converter.3perl|CSWperldoc|CSWpm-cpan-meta +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Perl::OSType.3perl|CSWperldoc|CSWpm-perl-ostype +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::Windows.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::Unix.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Cookbook.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/inc::latest.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Bundling.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::ConfigData.3perl|CSWperldoc|CSWpm-module-build +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Feature.3perl|CSWperldoc|CSWpm-cpan-meta +CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl + # Core module updates # Not used at the moment, leave one as example #MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Thu Dec 20 14:50:07 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Thu, 20 Dec 2012 13:50:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[19925] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib In-Reply-To: References: Message-ID: Hi Claudio, Why are you overriding file collisions? You're also overriding filename-version-does-not-match-pkginfo-version - this means that you have an inconsistency between the pkginfo file and the file name. This is not good. Maciej 2012/12/20 : > Revision: 19925 > http://gar.svn.sourceforge.net/gar/?rev=19925&view=rev > Author: claudio_sf > Date: 2012-12-20 13:01:41 +0000 (Thu, 20 Dec 2012) > Log Message: > ----------- > /home/claudio/opencsw/perl/trunk: overrides > > Modified Paths: > -------------- > csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib > > Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib > =================================================================== > --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-20 08:19:37 UTC (rev 19924) > +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-20 13:01:41 UTC (rev 19925) > @@ -51,8 +51,57 @@ > #OBSOLETED_BY_CSWperldoc += CSWpm-module-metadata > #OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-requirements > #OBSOLETED_BY_CSWperldoc += CSWpm-perl-ostype > +CHECKPKG_OVERRIDES_CSWperl += file-collision|/opt/csw/bin/config_data|CSWperl|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperl += file-collision|/opt/csw/bin/json_pp|CSWperl|CSWpm-json-pp > +CHECKPKG_OVERRIDES_CSWperl += filename-version-does-not-match-pkginfo-version|filename=5.16.2,REV=2012.12.19|pkginfo=5.16.2,REV=2012.12.20 > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Spec.3perl|CSWperldoc|CSWpm-cpan-meta > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Validator.3perl|CSWperldoc|CSWpm-cpan-meta > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Notes.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man1/config_data.1|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::darwin.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::cygwin.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta.3perl|CSWperldoc|CSWpm-cpan-meta > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/JSON::PP.3perl|CSWperldoc|CSWpm-json-pp > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Prereqs.3perl|CSWperldoc|CSWpm-cpan-meta > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::VOS.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::YAML.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Base.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::MPEiX.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::os2.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::RiscOS.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man1/json_pp.1|CSWperldoc|CSWpm-json-pp > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::EBCDIC.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Authoring.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Parse::CPAN::Meta.3perl|CSWperldoc|CSWpm-parse-cpan-meta > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Version.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::YAML.3perl|CSWperldoc|CSWpm-cpan-meta-yaml > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::VMS.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::aix.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::PPMMaker.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::API.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Metadata.3perl|CSWperldoc|CSWpm-module-metadata > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Requirements.3perl|CSWperldoc|CSWpm-cpan-meta-requirements > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::MacOS.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::History.3perl|CSWperldoc|CSWpm-cpan-meta > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/JSON::PP::Boolean.3perl|CSWperldoc|CSWpm-json-pp > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Compat.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::Amiga.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::ModuleInfo.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::Default.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Converter.3perl|CSWperldoc|CSWpm-cpan-meta > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Perl::OSType.3perl|CSWperldoc|CSWpm-perl-ostype > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::Windows.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::Unix.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Cookbook.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/inc::latest.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Bundling.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::ConfigData.3perl|CSWperldoc|CSWpm-module-build > +CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Feature.3perl|CSWperldoc|CSWpm-cpan-meta > +CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl > > > + > # Core module updates > # Not used at the moment, leave one as example > #MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel From claudio_sf at users.sourceforge.net Thu Dec 20 21:12:27 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Thu, 20 Dec 2012 20:12:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[19926] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19926 http://gar.svn.sourceforge.net/gar/?rev=19926&view=rev Author: claudio_sf Date: 2012-12-20 20:12:26 +0000 (Thu, 20 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: fix uncommited msg Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-20 13:01:41 UTC (rev 19925) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-20 20:12:26 UTC (rev 19926) @@ -43,61 +43,15 @@ CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content #CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl #CHECKPKG_OVERRIDES_CSWperl += binary-architecture-does-not-match-placement -#OBSOLETED_BY_CSWperl += CSWpm-module-build -#OBSOLETED_BY_CSWperl += CSWpm-json-pp -#OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta -#OBSOLETED_BY_CSWperldoc += CSWpm-parse-cpan-meta -#OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-yaml -#OBSOLETED_BY_CSWperldoc += CSWpm-module-metadata -#OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-requirements -#OBSOLETED_BY_CSWperldoc += CSWpm-perl-ostype -CHECKPKG_OVERRIDES_CSWperl += file-collision|/opt/csw/bin/config_data|CSWperl|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperl += file-collision|/opt/csw/bin/json_pp|CSWperl|CSWpm-json-pp -CHECKPKG_OVERRIDES_CSWperl += filename-version-does-not-match-pkginfo-version|filename=5.16.2,REV=2012.12.19|pkginfo=5.16.2,REV=2012.12.20 -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Spec.3perl|CSWperldoc|CSWpm-cpan-meta -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Validator.3perl|CSWperldoc|CSWpm-cpan-meta -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Notes.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man1/config_data.1|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::darwin.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::cygwin.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta.3perl|CSWperldoc|CSWpm-cpan-meta -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/JSON::PP.3perl|CSWperldoc|CSWpm-json-pp -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Prereqs.3perl|CSWperldoc|CSWpm-cpan-meta -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::VOS.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::YAML.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Base.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::MPEiX.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::os2.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::RiscOS.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man1/json_pp.1|CSWperldoc|CSWpm-json-pp -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::EBCDIC.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Authoring.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Parse::CPAN::Meta.3perl|CSWperldoc|CSWpm-parse-cpan-meta -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Version.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::YAML.3perl|CSWperldoc|CSWpm-cpan-meta-yaml -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::VMS.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::aix.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::PPMMaker.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::API.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Metadata.3perl|CSWperldoc|CSWpm-module-metadata -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Requirements.3perl|CSWperldoc|CSWpm-cpan-meta-requirements -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::MacOS.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::History.3perl|CSWperldoc|CSWpm-cpan-meta -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/JSON::PP::Boolean.3perl|CSWperldoc|CSWpm-json-pp -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Compat.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::Amiga.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::ModuleInfo.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::Default.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Converter.3perl|CSWperldoc|CSWpm-cpan-meta -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Perl::OSType.3perl|CSWperldoc|CSWpm-perl-ostype -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::Windows.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Platform::Unix.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Cookbook.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/inc::latest.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::Bundling.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/Module::Build::ConfigData.3perl|CSWperldoc|CSWpm-module-build -CHECKPKG_OVERRIDES_CSWperldoc += file-collision|/opt/csw/share/man/man3/CPAN::Meta::Feature.3perl|CSWperldoc|CSWpm-cpan-meta +OBSOLETED_BY_CSWperl += CSWpm-module-build +OBSOLETED_BY_CSWperl += CSWpm-json-pp +OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta +OBSOLETED_BY_CSWperldoc += CSWpm-parse-cpan-meta +OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-yaml +OBSOLETED_BY_CSWperldoc += CSWpm-module-metadata +CATALOGNAME_CSWpm-cpan-meta-requirements = pm_cpan_meta_reqs_stub +OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-requirements +OBSOLETED_BY_CSWperldoc += CSWpm-perl-ostype CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl @@ -168,7 +122,7 @@ CONFIGURE_ARGS += -Dusesitecustomize CONFIGURE_ARGS += -Dusethreads CONFIGURE_ARGS += -Dusedtrace -CONFIGURE_ARGS += -Duse64bitint +CONFIGURE_ARGS-64 += -Duse64bitint CONFIGURE_ARGS-64 += -Duse64bitall CONFIGURE_ARGS += -Dinc_version_list=none This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Thu Dec 20 22:44:23 2012 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Thu, 20 Dec 2012 21:44:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19927] csw/mgar/pkg/zsh/trunk Message-ID: Revision: 19927 http://gar.svn.sourceforge.net/gar/?rev=19927&view=rev Author: opk Date: 2012-12-20 21:44:23 +0000 (Thu, 20 Dec 2012) Log Message: ----------- zsh/trunk: update zsh to 5.0.1 Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile csw/mgar/pkg/zsh/trunk/checksums Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2012-12-20 20:12:26 UTC (rev 19926) +++ csw/mgar/pkg/zsh/trunk/Makefile 2012-12-20 21:44:23 UTC (rev 19927) @@ -1,5 +1,5 @@ NAME = zsh -VERSION = 5.0.0 +VERSION = 5.0.1 GARTYPE = v2 DESCRIPTION = Powerful UNIX shell Modified: csw/mgar/pkg/zsh/trunk/checksums =================================================================== --- csw/mgar/pkg/zsh/trunk/checksums 2012-12-20 20:12:26 UTC (rev 19926) +++ csw/mgar/pkg/zsh/trunk/checksums 2012-12-20 21:44:23 UTC (rev 19927) @@ -1 +1 @@ -e8484468925cec8d9a84b8b04797e764 zsh-5.0.0.tar.bz2 +fa5f0f2b64df667d17993d06bb11a7bc zsh-5.0.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Thu Dec 20 23:22:07 2012 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Thu, 20 Dec 2012 22:22:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[19928] csw/mgar/pkg/zsh/trunk/Makefile Message-ID: Revision: 19928 http://gar.svn.sourceforge.net/gar/?rev=19928&view=rev Author: opk Date: 2012-12-20 22:22:06 +0000 (Thu, 20 Dec 2012) Log Message: ----------- zsh/trunk: add additional override needed for zsh completion function Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2012-12-20 21:44:23 UTC (rev 19927) +++ csw/mgar/pkg/zsh/trunk/Makefile 2012-12-20 22:22:06 UTC (rev 19928) @@ -29,6 +29,7 @@ CONFIGURE_ARGS += --enable-fndir=$(sharedstatedir)/$(NAME)/functions CONFIGURE_ARGS += --enable-pcre +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_urxvt CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_units CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_hg CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_loadkeys This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Fri Dec 21 00:18:31 2012 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Thu, 20 Dec 2012 23:18:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[19929] csw/mgar/pkg/zsh/trunk/Makefile Message-ID: Revision: 19929 http://gar.svn.sourceforge.net/gar/?rev=19929&view=rev Author: opk Date: 2012-12-20 23:18:31 +0000 (Thu, 20 Dec 2012) Log Message: ----------- pass sysconfdir to configure for zsh Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2012-12-20 22:22:06 UTC (rev 19928) +++ csw/mgar/pkg/zsh/trunk/Makefile 2012-12-20 23:18:31 UTC (rev 19929) @@ -28,6 +28,7 @@ CONFIGURE_ARGS += --enable-maildir-support CONFIGURE_ARGS += --enable-fndir=$(sharedstatedir)/$(NAME)/functions CONFIGURE_ARGS += --enable-pcre +CONFIGURE_ARGS += --enable-etcdir=$(sysconfdir) CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_urxvt CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_units This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Fri Dec 21 01:17:34 2012 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Fri, 21 Dec 2012 00:17:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[19930] csw/mgar/pkg/lang-python/pytz/trunk Message-ID: Revision: 19930 http://gar.svn.sourceforge.net/gar/?rev=19930&view=rev Author: opk Date: 2012-12-21 00:17:33 +0000 (Fri, 21 Dec 2012) Log Message: ----------- upgrade pytz to 2012h Modified Paths: -------------- csw/mgar/pkg/lang-python/pytz/trunk/Makefile csw/mgar/pkg/lang-python/pytz/trunk/checksums Modified: csw/mgar/pkg/lang-python/pytz/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pytz/trunk/Makefile 2012-12-20 23:18:31 UTC (rev 19929) +++ csw/mgar/pkg/lang-python/pytz/trunk/Makefile 2012-12-21 00:17:33 UTC (rev 19930) @@ -1,6 +1,6 @@ # $Id$ NAME = pytz -VERSION = 2012f +VERSION = 2012h CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/lang-python/pytz/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pytz/trunk/checksums 2012-12-20 23:18:31 UTC (rev 19929) +++ csw/mgar/pkg/lang-python/pytz/trunk/checksums 2012-12-21 00:17:33 UTC (rev 19930) @@ -1 +1 @@ -176a00c875b5a8356f12cd96276bdcd5 pytz-2012f.tar.bz2 +90d5dcb521671a9f1f405aa139845f79 pytz-2012h.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Dec 21 10:00:03 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 21 Dec 2012 09:00:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[19931] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19931 http://gar.svn.sourceforge.net/gar/?rev=19931&view=rev Author: claudio_sf Date: 2012-12-21 09:00:03 +0000 (Fri, 21 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: fpic addition Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-21 00:17:33 UTC (rev 19930) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-21 09:00:03 UTC (rev 19931) @@ -21,7 +21,6 @@ #DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz -# Make extra Solaris 10 package with DTrace support #PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 #BUILD64_ONLY = 1 @@ -140,6 +139,7 @@ #CONFIGURE_ARGS += -Dlibsdirs=/usr/lib/64 CONFIGURE_ARGS += -Dsed=/opt/csw/bin/gsed CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) +CONFIGURE_ARGS_amd64 #EXTRA_LIB += $(prefix)/bdb48/lib #EXTRA_INC += $(prefix)/bdb48/include @@ -162,7 +162,7 @@ #EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib #EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib/64 -R/opt/csw/bdb48/lib/64 -R/opt/csw/lib/64 #EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -EXTRA_LDFLAGS = -lperl +EXTRA_LDFLAGS = -fPIC -lperl # We want 64 bit binaries #MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Dec 21 10:03:08 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 21 Dec 2012 09:03:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[19932] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19932 http://gar.svn.sourceforge.net/gar/?rev=19932&view=rev Author: claudio_sf Date: 2012-12-21 09:03:07 +0000 (Fri, 21 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: fpic addition typo Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-21 09:00:03 UTC (rev 19931) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-21 09:03:07 UTC (rev 19932) @@ -139,7 +139,7 @@ #CONFIGURE_ARGS += -Dlibsdirs=/usr/lib/64 CONFIGURE_ARGS += -Dsed=/opt/csw/bin/gsed CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) -CONFIGURE_ARGS_amd64 +#CONFIGURE_ARGS_amd64 #EXTRA_LIB += $(prefix)/bdb48/lib #EXTRA_INC += $(prefix)/bdb48/include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Dec 21 10:58:47 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 21 Dec 2012 09:58:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[19933] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19933 http://gar.svn.sourceforge.net/gar/?rev=19933&view=rev Author: claudio_sf Date: 2012-12-21 09:58:46 +0000 (Fri, 21 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: i386 tests Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-21 09:03:07 UTC (rev 19932) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-21 09:58:46 UTC (rev 19933) @@ -21,8 +21,8 @@ #DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz -#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS = solaris10101010101010101010-i386 +#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 #BUILD64_ONLY = 1 PACKAGES += CSWperl PKG_DESC_CSWperl = $(DESCRIPTION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Dec 21 22:14:01 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 21 Dec 2012 21:14:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[19934] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19934 http://gar.svn.sourceforge.net/gar/?rev=19934&view=rev Author: claudio_sf Date: 2012-12-21 21:14:01 +0000 (Fri, 21 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: support for amd64 Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-21 09:58:46 UTC (rev 19933) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-21 21:14:01 UTC (rev 19934) @@ -21,8 +21,7 @@ #DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz -PACKAGING_PLATFORMS = solaris10101010101010101010-i386 -#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc #BUILD64_ONLY = 1 PACKAGES += CSWperl PKG_DESC_CSWperl = $(DESCRIPTION) @@ -121,14 +120,8 @@ CONFIGURE_ARGS += -Dusesitecustomize CONFIGURE_ARGS += -Dusethreads CONFIGURE_ARGS += -Dusedtrace -CONFIGURE_ARGS-64 += -Duse64bitint -CONFIGURE_ARGS-64 += -Duse64bitall CONFIGURE_ARGS += -Dinc_version_list=none - -# When built on Solaris 10, enable DTrace support -#CONFIGURE_ARGS-5.10 = -Dusedtrace #CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) - # Largefiles is on by default for 64 bit CONFIGURE_ARGS += -Duselargefiles CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl5 @@ -138,8 +131,12 @@ CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" #CONFIGURE_ARGS += -Dlibsdirs=/usr/lib/64 CONFIGURE_ARGS += -Dsed=/opt/csw/bin/gsed +CONFIGURE_ARGS-64 += -Duse64bitint +CONFIGURE_ARGS-64 += -Duse64bitall CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) -#CONFIGURE_ARGS_amd64 +CONFIGURE_ARGS_isa-amd64 += -Dlddlflags=-shared +CONFIGURE_ARGS_isa-amd64 += -Dcccdlflags=-fPIC +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MODULATION)) #EXTRA_LIB += $(prefix)/bdb48/lib #EXTRA_INC += $(prefix)/bdb48/include @@ -162,7 +159,7 @@ #EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib #EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib/64 -R/opt/csw/bdb48/lib/64 -R/opt/csw/lib/64 #EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -EXTRA_LDFLAGS = -fPIC -lperl +EXTRA_LDFLAGS = -lperl # We want 64 bit binaries #MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Dec 21 23:13:41 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 21 Dec 2012 22:13:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[19935] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19935 http://gar.svn.sourceforge.net/gar/?rev=19935&view=rev Author: claudio_sf Date: 2012-12-21 22:13:41 +0000 (Fri, 21 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: Extra include Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-21 21:14:01 UTC (rev 19934) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-21 22:13:41 UTC (rev 19935) @@ -140,6 +140,7 @@ #EXTRA_LIB += $(prefix)/bdb48/lib #EXTRA_INC += $(prefix)/bdb48/include +EXTRA_INC += /usr/include #LD_LIBRARY_PATH for testing #LD_LIBRARY_PATH += $(prefix)/bdb48/lib/$(MEMORYMODEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Dec 21 23:17:00 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 21 Dec 2012 22:17:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[19936] csw/mgar/pkg/perl/trunk Message-ID: Revision: 19936 http://gar.svn.sourceforge.net/gar/?rev=19936&view=rev Author: claudio_sf Date: 2012-12-21 22:16:58 +0000 (Fri, 21 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: removal of tmp makefiles Added Paths: ----------- csw/mgar/pkg/perl/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/perl/trunk/Makefile csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b Deleted: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2012-12-21 22:13:41 UTC (rev 19935) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-12-21 22:16:58 UTC (rev 19936) @@ -1 +0,0 @@ -link Makefile_5.16.2_32+64b_privlib \ No newline at end of file Added: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-12-21 22:16:58 UTC (rev 19936) @@ -0,0 +1,267 @@ +NAME = perl +VERSION = 5.16.2 +VERSION_MAJOR = $(shell echo $(VERSION) | cut -f1-2 -d.) +#CATEGORIES = lang +GARTYPE = v2 + +DESCRIPTION = A high-level, general-purpose programming language +define BLURB + Perl is a high-level, general-purpose programming language that makes easy + things easy and hard things possible. It is optimized for scanning arbitrary + text files and system administration. It has built-in extended regular + expression matching and replacement, a dataflow mechanism to improve security + with setuid scripts and is extendable via modules that can interface to C + libraries. +endef + +#MASTER_SITES = http://www.cpan.org/src/ +#SPKG_SOURCEURL = http://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.16.2.tar.bz2 +MASTER_SITES = manual:// +VENDOR_URL = http://www.perl.org +#DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz + +PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc +#BUILD64_ONLY = 1 +PACKAGES += CSWperl +PKG_DESC_CSWperl = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWperl += CSWlibssp0 +#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 +INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags + +PACKAGES += CSWperldoc +SPKG_DESC_CSWperldoc = Perl documentation +SPKG_DESC_CSWperl = Core Perl distribution +RUNTIME_DEP_PKGS_CSWperldoc = CSWperl +ARCHALL_CSWperldoc = 1 + +LICENSE = Copying + +CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content +CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content +#CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl +#CHECKPKG_OVERRIDES_CSWperl += binary-architecture-does-not-match-placement +OBSOLETED_BY_CSWperl += CSWpm-module-build +OBSOLETED_BY_CSWperl += CSWpm-json-pp +OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta +OBSOLETED_BY_CSWperldoc += CSWpm-parse-cpan-meta +OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-yaml +OBSOLETED_BY_CSWperldoc += CSWpm-module-metadata +CATALOGNAME_CSWpm-cpan-meta-requirements = pm_cpan_meta_reqs_stub +OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-requirements +OBSOLETED_BY_CSWperldoc += CSWpm-perl-ostype +CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl + + + +# Core module updates +# Not used at the moment, leave one as example +#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ +#CORE_UPDATES += PathTools-3.30 +#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd + +#DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) + +# GCC build (Sunstudio is problematic) # claudio +GARCOMPILER = GCC4 + +# a .git directory will cause failing upstream author tests (the source will be considered blead) +NOGITPATCH = 1 + +# Custom configure +CONFIGURE_SCRIPTS = perl + +# Compatable with all prior patch revs +INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 + +# Force use of db-4.8 +# TBD: Reinsert libperl.so, see below. +#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc +#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt +#PERL_LIBS-64 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt +#PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) +#PERL_LIBS = -lsocket -lgdbm -ldl -lm -lpthread -lc -lcrypt + +BUILD64 = 1 +ISAEXEC = 1 + + +# Configuration flags +CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION_MAJOR) +CONFIGURE_ARGS += -Dcc=$(CC) +#CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" +#CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" +CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) +CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" +#CONFIGURE_ARGS += -Dld=$(CC) +#CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" +# Workaround below. Do not version libperl.so here otherwise the other 5.10 +# lib will be picked up by mgar +#CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) +#CONFIGURE_ARGS += -Dlocincpth=$(includedir) +#CONFIGURE_ARGS += -Dloclibpth=$(libdir) +CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 +CONFIGURE_ARGS += -Dman1ext=1 +CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 +CONFIGURE_ARGS += -Dman3ext=3perl +#CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" +CONFIGURE_ARGS += -Dperladmin="root at localhost" +CONFIGURE_ARGS += -Dprefix=$(prefix) +CONFIGURE_ARGS += -Dbin=$(bindir) +CONFIGURE_ARGS += -Dscriptdir=$(bindir) +# CSW provided modules should install in the privlib directory (/opt/csw/share/perl/5.14) +CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION_MAJOR) +CONFIGURE_ARGS += -Dsitearch=/opt/csw/local/lib/perl/$(VERSION_MAJOR) +CONFIGURE_ARGS += -Dsitelib=/opt/csw/local/share/perl/$(VERSION) +CONFIGURE_ARGS += -Dsiteman1dir=/opt/csw//local/share/man/man1 +CONFIGURE_ARGS += -Dsiteman3dir==/opt/csw/local/share/man/man3 +CONFIGURE_ARGS += -Dsiteprefix=/opt/csw/local +CONFIGURE_ARGS += -Duseshrplib +CONFIGURE_ARGS += -Dusesitecustomize +CONFIGURE_ARGS += -Dusethreads +CONFIGURE_ARGS += -Dusedtrace +CONFIGURE_ARGS += -Dinc_version_list=none +#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) +# Largefiles is on by default for 64 bit +CONFIGURE_ARGS += -Duselargefiles +CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl5 +CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl5 +CONFIGURE_ARGS += -Dvendorprefix=$(prefix) +#CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" +CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" +#CONFIGURE_ARGS += -Dlibsdirs=/usr/lib/64 +CONFIGURE_ARGS += -Dsed=/opt/csw/bin/gsed +CONFIGURE_ARGS-64 += -Duse64bitint +CONFIGURE_ARGS-64 += -Duse64bitall +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) +CONFIGURE_ARGS_isa-amd64 += -Dlddlflags=-shared +CONFIGURE_ARGS_isa-amd64 += -Dcccdlflags=-fPIC +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MODULATION)) + +#EXTRA_LIB += $(prefix)/bdb48/lib +#EXTRA_INC += $(prefix)/bdb48/include +EXTRA_INC += /usr/include +#LD_LIBRARY_PATH for testing +#LD_LIBRARY_PATH += $(prefix)/bdb48/lib/$(MEMORYMODEL) + +# Somehow the CPPFLAGS do not make it into the compile environment. +# Add them explicitly here, otherwise specifically the bdb48/include will +# not make it resulting in db.h not to be found and DB_File.pm not to be built +# as reported here: +# https://www.opencsw.org/mantis/view.php?id=4544 +#EXTRA_CFLAGS = $(CPPFLAGS) + +# Adding -lperl requires that libperl.so is available during compilation, which is not +# the case on bootstrapping. However, we require explicit libperl linkage or programs +# embedding perl will have problems with duplicated static variables. +# XXX Investigate further after 64 bit has built +#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl +#EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib/64 -R/opt/csw/bdb48/lib/64 -R/opt/csw/lib/64 +#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) +EXTRA_LDFLAGS = -lperl + +# We want 64 bit binaries +#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) + +EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod +PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* + +# The diagnostics.pm module needs the podfile to output its messages. +# That means it must be included in the main package, not the docs. +EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod +EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod + +# Tests take a long time, run once for every release +BUILD_SCRIPTS = perl + +TEST_SCRIPTS = perl + +# Make sure we don't include the path to the newly built perl as the +# library is not in place yet. +#IGNORE_DESTDIR = 1 + +# Do not exclude static libs as at least DynaLoader.a is needed for XS compilation +#MERGE_EXCLUDE_STATICLIBS = + +# This is for the communication with checkpkg. These pathes are searched for modules +# when resolving dependencies. +#PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") + +# Splitting of a separate libperl.so requires more work and careful planning. +# Override for now. +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so +#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 + +include gar/category.mk + +# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and +# the one in $WORKSRC has not been built yet +# TBD: Investigate +#post-extract-modulated: +# mkdir -p $(WORKSRC) +# #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so +# @$(MAKECOOKIE) + +#ifneq ($(CORE_UPDATES),) +#POST_TARGETS = install-core-updates +#include files/updatecore.mk +#endif + +# How to configure Perl +#configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS +configure-perl: + (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) + @$(MAKECOOKIE) + +build-perl: BUILD_EXPORTS = LD_OPTIONS +build-perl: + @echo " ==> Running make in $*" + cd $(WORKSRC) && $(BUILD_ENV) dmake + @$(MAKECOOKIE) + +test-perl: + @echo " ==> Running make $(TEST_TARGET) in $*" + cd $(WORKSRC) && gmake test + @$(MAKECOOKIE) + +# Make links to libperl and minor-major lib dirs +POST_TARGETS += syslinks +syslinks: + @echo "Creating links to libperl and minor-major lib dirs" + cd $(DESTDIR)$(libdir)/perl && ln -s $(VERSION_MAJOR) $(VERSION) &&\ + cd $(VERSION_MAJOR) && ln -s libperl.so libperl.so.$(VERSION) && ln -s libperl.so libperl.so.$(VERSION_MAJOR) &&\ + cd $(DESTDIR)$(datadir)/perl && ln -s $(VERSION_MAJOR) $(VERSION) + @$(MAKECOOKIE) + +# Remove build paths from Config +#POST_TARGETS += perlconf +#perlconf: +# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ +# /bin/perl -i -lne "\ +# next if /config_arg[1-9]/; \ +# s/^config_args=.+$$/config_args=''/; \ +# s/^config_argc=.+$$/config_argc='0'/; \ +# s,-I$(DESTDIR)$(includedir),,g; \ +# s,-[LR]$(DESTDIR)$(libdir),,g; \ +# s,( -I$(includedir))+,\$$1,g; \ +# s,( -[LR]$(libdir))+,\$$1,g; \ +# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ +# s, (-L)?$(CC_HOME)\S+,,g; \ +# if (/^\w+=/) { \ +# s/\s{2,}(\-)/ \-/g; \ +# s/(^\w+=.) /\$$1/; \ +# s/ (.)$$/\$$1/g; \ +# } \ +# print \ +# " Config.pm Config_heavy.pl ) +# @$(MAKECOOKIE) + +#POST_TARGETS += CSWperl.cswperlincpath +#CSWperl.cswperlincpath: +# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath + +# Invoke post-install targets +post-install-modulated: $(POST_TARGETS) + @$(MAKECOOKIE) Deleted: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b 2012-12-21 22:13:41 UTC (rev 19935) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b 2012-12-21 22:16:58 UTC (rev 19936) @@ -1,266 +0,0 @@ -NAME = perl -VERSION = 5.16.2 -#CATEGORIES = lang -GARTYPE = v2 - -DESCRIPTION = A high-level, general-purpose programming language -define BLURB - Perl is a high-level, general-purpose programming language that makes easy - things easy and hard things possible. It is optimized for scanning arbitrary - text files and system administration. It has built-in extended regular - expression matching and replacement, a dataflow mechanism to improve security - with setuid scripts and is extendable via modules that can interface to C - libraries. -endef - -#MASTER_SITES = http://www.cpan.org/src/ -#SPKG_SOURCEURL = http://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.16.2.tar.bz2 -MASTER_SITES = manual:// -VENDOR_URL = http://www.perl.org -#DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz - -# Make extra Solaris 10 package with DTrace support -#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -#PACKAGING_PLATFORMS += solaris10-sparc -#BUILD64_ONLY = 1 -PACKAGES += CSWperl -PKG_DESC_CSWperl = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWperl += CSWlibssp0 -#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 -INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags - -PACKAGES += CSWperldoc -SPKG_DESC_CSWperldoc = Perl documentation -SPKG_DESC_CSWperl = Core Perl distribution -RUNTIME_DEP_PKGS_CSWperldoc = CSWperl -ARCHALL_CSWperldoc = 1 - -LICENSE = Copying - -CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWperl += binary-architecture-does-not-match-placement - -# Core module updates -# Not used at the moment, leave one as example -#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ -#CORE_UPDATES += PathTools-3.30 -#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd - -#DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) - -# GCC build (Sunstudio is problematic) # claudio -GARCOMPILER = GCC4 - - -# Custom configure -CONFIGURE_SCRIPTS = perl - -# Compatable with all prior patch revs -INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 - -# Force use of db-4.8 -# TBD: Reinsert libperl.so, see below. -#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt -#PERL_LIBS-64 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt -#PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) -#PERL_LIBS = -lsocket -lgdbm -ldl -lm -lpthread -lc -lcrypt - -BUILD64 = 1 - -# Configuration flags -#CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) -CONFIGURE_ARGS += -Dcc=$(CC) -#CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" -#CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" -CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) -CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" -#CONFIGURE_ARGS += -Dld=$(CC) -#CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" -# Workaround below. Do not version libperl.so here otherwise the other 5.10 -# lib will be picked up by mgar -#CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) -#CONFIGURE_ARGS += -Dlocincpth=$(includedir) -#CONFIGURE_ARGS += -Dloclibpth=$(libdir) -CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dman1ext=1 -CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dman3ext=3perl -#CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" -CONFIGURE_ARGS += -Dperladmin="root at localhost" -CONFIGURE_ARGS += -Dprefix=$(prefix) -CONFIGURE_ARGS += -Dbin=$(bindir) -CONFIGURE_ARGS += -Dscriptdir=$(bindir) -#CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) -CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl -CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl -CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dsiteprefix=/usr -CONFIGURE_ARGS += -Duseshrplib -CONFIGURE_ARGS += -Dusesitecustomize -CONFIGURE_ARGS += -Dusethreads -CONFIGURE_ARGS += -Dusedtrace -CONFIGURE_ARGS += -Duse64bitall -CONFIGURE_ARGS += -Duse64bitint -CONFIGURE_ARGS += -Dinc_version_list=none - -# When built on Solaris 10, enable DTrace support -#CONFIGURE_ARGS-5.10 = -Dusedtrace -#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) - -# Largefiles is on by default for 64 bit -#CONFIGURE_ARGS-32 += -Duselargefiles -#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) -#CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw -#CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw -#CONFIGURE_ARGS += -Dvendorprefix=$(prefix) -#CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" -CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" -#CONFIGURE_ARGS += -Dlibsdirs=/usr/lib/64 -CONFIGURE_ARGS += -Dsed=/opt/csw/bin/gsed - -#EXTRA_LIB += $(prefix)/bdb48/lib -#EXTRA_INC += $(prefix)/bdb48/include -#LD_LIBRARY_PATH for testing -#LD_LIBRARY_PATH += $(prefix)/bdb48/lib/$(MEMORYMODEL) - -# Somehow the CPPFLAGS do not make it into the compile environment. -# Add them explicitly here, otherwise specifically the bdb48/include will -# not make it resulting in db.h not to be found and DB_File.pm not to be built -# as reported here: -# https://www.opencsw.org/mantis/view.php?id=4544 -#EXTRA_CFLAGS = $(CPPFLAGS) - -# Adding -lperl requires that libperl.so is available during compilation, which is not -# the case on bootstrapping. However, we require explicit libperl linkage or programs -# embedding perl will have problems with duplicated static variables. -# XXX Investigate further after 64 bit has built -#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl -#EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib/64 -R/opt/csw/bdb48/lib/64 -R/opt/csw/lib/64 -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -EXTRA_LDFLAGS = -lperl - -# We want 64 bit binaries -#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) - -EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod -PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* - -# The diagnostics.pm module needs the podfile to output its messages. -# That means it must be included in the main package, not the docs. -EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod -EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod - -# Tests take a long time, run once for every release -BUILD_SCRIPTS = perl - -TEST_SCRIPTS = perl - -# Make sure we don't include the path to the newly built perl as the -# library is not in place yet. -#IGNORE_DESTDIR = 1 - -# Do not exclude static libs as at least DynaLoader.a is needed for XS compilation -#MERGE_EXCLUDE_STATICLIBS = - -# This is for the communication with checkpkg. These pathes are searched for modules -# when resolving dependencies. -#PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") - -# Splitting of a separate libperl.so requires more work and careful planning. -# Override for now. -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 - -include gar/category.mk - -# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and -# the one in $WORKSRC has not been built yet -# TBD: Investigate -#post-extract-modulated: -# mkdir -p $(WORKSRC) -# #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so -# @$(MAKECOOKIE) - -#ifneq ($(CORE_UPDATES),) -#POST_TARGETS = install-core-updates -#include files/updatecore.mk -#endif - -# How to configure Perl -#configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS -#configure-perl: ARGS-64 = -dusedtrace -Duse64bitall -configure-perl: - (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) - #cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be - @# 64 bit: -Duse64bitall - @$(MAKECOOKIE) - -build-perl: BUILD_EXPORTS = LD_OPTIONS -build-perl: - @echo " ==> Running make in $*" - @#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) - cd $(WORKSRC) && $(BUILD_ENV) dmake - @$(MAKECOOKIE) - -test-perl: - @echo " ==> Running make $(TEST_TARGET) in $*" - @#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) - #cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && LD_LIBRARY_PATH_64=`pwd`:$(prefix)/bdb48/lib/$(MEMORYMODEL) gmake test && mv .mgar-git .git - cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && gmake test && mv .mgar-git .git - @$(MAKECOOKIE) - -# Make links to libperl -POST_TARGETS += libperl -VERSION_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) -#LIB_PATH = $(libdir)/perl/$(VERSION)/CORE -libperl: - @( cd $(DESTDIR)$(libdir) ; -#\ -# mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ -# $(DESTDIR)$(libdir) ; \ -# chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ -# ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) -# #; \ -# #ln -s libperl.so.$(VERSION) libperl.so ) - ln -s libperl.so libperl.so.$(VERSION)) \; - ln -s libperl.so libperl.so.$(VERSION_MINOR)) - @$(MAKECOOKIE) - -# Remove build paths from Config -#POST_TARGETS += perlconf -#perlconf: -# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ -# /bin/perl -i -lne "\ -# next if /config_arg[1-9]/; \ -# s/^config_args=.+$$/config_args=''/; \ -# s/^config_argc=.+$$/config_argc='0'/; \ -# s,-I$(DESTDIR)$(includedir),,g; \ -# s,-[LR]$(DESTDIR)$(libdir),,g; \ -# s,( -I$(includedir))+,\$$1,g; \ -# s,( -[LR]$(libdir))+,\$$1,g; \ -# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ -# s, (-L)?$(CC_HOME)\S+,,g; \ -# if (/^\w+=/) { \ -# s/\s{2,}(\-)/ \-/g; \ -# s/(^\w+=.) /\$$1/; \ -# s/ (.)$$/\$$1/g; \ -# } \ -# print \ -# " Config.pm Config_heavy.pl ) -# @$(MAKECOOKIE) - -#POST_TARGETS += CSWperl.cswperlincpath -#CSWperl.cswperlincpath: -# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath - -# Invoke post-install targets -#post-install-modulated: $(POST_TARGETS) -# @$(MAKECOOKIE) Deleted: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b 2012-12-21 22:13:41 UTC (rev 19935) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_64b 2012-12-21 22:16:58 UTC (rev 19936) @@ -1,266 +0,0 @@ -NAME = perl -VERSION = 5.16.2 -#CATEGORIES = lang -GARTYPE = v2 - -DESCRIPTION = A high-level, general-purpose programming language -define BLURB - Perl is a high-level, general-purpose programming language that makes easy - things easy and hard things possible. It is optimized for scanning arbitrary - text files and system administration. It has built-in extended regular - expression matching and replacement, a dataflow mechanism to improve security - with setuid scripts and is extendable via modules that can interface to C - libraries. -endef - -#MASTER_SITES = http://www.cpan.org/src/ -#SPKG_SOURCEURL = http://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.16.2.tar.bz2 -MASTER_SITES = manual:// -VENDOR_URL = http://www.perl.org -#DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz - -# Make extra Solaris 10 package with DTrace support -#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -#PACKAGING_PLATFORMS += solaris10-sparc -#BUILD64_ONLY = 1 -PACKAGES += CSWperl -PKG_DESC_CSWperl = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWperl += CSWlibssp0 -#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 -INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags - -PACKAGES += CSWperldoc -SPKG_DESC_CSWperldoc = Perl documentation -SPKG_DESC_CSWperl = Core Perl distribution -RUNTIME_DEP_PKGS_CSWperldoc = CSWperl -ARCHALL_CSWperldoc = 1 - -LICENSE = Copying - -CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWperl += binary-architecture-does-not-match-placement - -# Core module updates -# Not used at the moment, leave one as example -#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ -#CORE_UPDATES += PathTools-3.30 -#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd - -#DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) - -# GCC build (Sunstudio is problematic) # claudio -GARCOMPILER = GCC4 - - -# Custom configure -CONFIGURE_SCRIPTS = perl - -# Compatable with all prior patch revs -INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 - -# Force use of db-4.8 -# TBD: Reinsert libperl.so, see below. -#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt -#PERL_LIBS-64 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt -#PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) -#PERL_LIBS = -lsocket -lgdbm -ldl -lm -lpthread -lc -lcrypt - -BUILD64 = 1 - -# Configuration flags -#CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) -CONFIGURE_ARGS += -Dcc=$(CC) -#CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" -#CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" -CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) -CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" -#CONFIGURE_ARGS += -Dld=$(CC) -#CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" -# Workaround below. Do not version libperl.so here otherwise the other 5.10 -# lib will be picked up by mgar -#CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) -#CONFIGURE_ARGS += -Dlocincpth=$(includedir) -#CONFIGURE_ARGS += -Dloclibpth=$(libdir) -CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dman1ext=1 -CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dman3ext=3perl -#CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" -CONFIGURE_ARGS += -Dperladmin="root at localhost" -CONFIGURE_ARGS += -Dprefix=$(prefix) -CONFIGURE_ARGS += -Dbin=$(bindir) -CONFIGURE_ARGS += -Dscriptdir=$(bindir) -#CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) -CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl -CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl -CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dsiteprefix=/usr -CONFIGURE_ARGS += -Duseshrplib -CONFIGURE_ARGS += -Dusesitecustomize -CONFIGURE_ARGS += -Dusethreads -CONFIGURE_ARGS += -Dusedtrace -CONFIGURE_ARGS += -Duse64bitall -CONFIGURE_ARGS += -Duse64bitint -CONFIGURE_ARGS += -Dinc_version_list=none - -# When built on Solaris 10, enable DTrace support -#CONFIGURE_ARGS-5.10 = -Dusedtrace -#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) - -# Largefiles is on by default for 64 bit -#CONFIGURE_ARGS-32 += -Duselargefiles -#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) -#CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw -#CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw -#CONFIGURE_ARGS += -Dvendorprefix=$(prefix) -#CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" -CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" -#CONFIGURE_ARGS += -Dlibsdirs=/usr/lib/64 -CONFIGURE_ARGS += -Dsed=/opt/csw/bin/gsed - -#EXTRA_LIB += $(prefix)/bdb48/lib -#EXTRA_INC += $(prefix)/bdb48/include -#LD_LIBRARY_PATH for testing -#LD_LIBRARY_PATH += $(prefix)/bdb48/lib/$(MEMORYMODEL) - -# Somehow the CPPFLAGS do not make it into the compile environment. -# Add them explicitly here, otherwise specifically the bdb48/include will -# not make it resulting in db.h not to be found and DB_File.pm not to be built -# as reported here: -# https://www.opencsw.org/mantis/view.php?id=4544 -#EXTRA_CFLAGS = $(CPPFLAGS) - -# Adding -lperl requires that libperl.so is available during compilation, which is not -# the case on bootstrapping. However, we require explicit libperl linkage or programs -# embedding perl will have problems with duplicated static variables. -# XXX Investigate further after 64 bit has built -#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl -#EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib/64 -R/opt/csw/bdb48/lib/64 -R/opt/csw/lib/64 -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -EXTRA_LDFLAGS = -lperl - -# We want 64 bit binaries -#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) - -EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod -PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* - -# The diagnostics.pm module needs the podfile to output its messages. -# That means it must be included in the main package, not the docs. -EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod -EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod - -# Tests take a long time, run once for every release -BUILD_SCRIPTS = perl - -TEST_SCRIPTS = perl - -# Make sure we don't include the path to the newly built perl as the -# library is not in place yet. -#IGNORE_DESTDIR = 1 - -# Do not exclude static libs as at least DynaLoader.a is needed for XS compilation -#MERGE_EXCLUDE_STATICLIBS = - -# This is for the communication with checkpkg. These pathes are searched for modules -# when resolving dependencies. -#PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") - -# Splitting of a separate libperl.so requires more work and careful planning. -# Override for now. -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 - -include gar/category.mk - -# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and -# the one in $WORKSRC has not been built yet -# TBD: Investigate -#post-extract-modulated: -# mkdir -p $(WORKSRC) -# #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so -# @$(MAKECOOKIE) - -#ifneq ($(CORE_UPDATES),) -#POST_TARGETS = install-core-updates -#include files/updatecore.mk -#endif - -# How to configure Perl -#configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS -#configure-perl: ARGS-64 = -dusedtrace -Duse64bitall -configure-perl: - (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) - #cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be - @# 64 bit: -Duse64bitall - @$(MAKECOOKIE) - -build-perl: BUILD_EXPORTS = LD_OPTIONS -build-perl: - @echo " ==> Running make in $*" - @#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) - cd $(WORKSRC) && $(BUILD_ENV) dmake - @$(MAKECOOKIE) - -test-perl: - @echo " ==> Running make $(TEST_TARGET) in $*" - @#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) - #cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && LD_LIBRARY_PATH_64=`pwd`:$(prefix)/bdb48/lib/$(MEMORYMODEL) gmake test && mv .mgar-git .git - cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && gmake test && mv .mgar-git .git - @$(MAKECOOKIE) - -# Make links to libperl -POST_TARGETS += libperl -VERSION_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.) -#LIB_PATH = $(libdir)/perl/$(VERSION)/CORE -libperl: - @( cd $(DESTDIR)$(libdir) ; -#\ -# mv $(DESTDIR)$(LIB_PATH)/libperl.so.$(VERSION) \ -# $(DESTDIR)$(libdir) ; \ -# chmod 755 $(DESTDIR)$(libdir)/libperl.so.$(VERSION) ; \ -# ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) -# #; \ -# #ln -s libperl.so.$(VERSION) libperl.so ) - ln -s libperl.so libperl.so.$(VERSION)) \; - ln -s libperl.so libperl.so.$(VERSION_MINOR)) - @$(MAKECOOKIE) - -# Remove build paths from Config -#POST_TARGETS += perlconf -#perlconf: -# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ -# /bin/perl -i -lne "\ -# next if /config_arg[1-9]/; \ -# s/^config_args=.+$$/config_args=''/; \ -# s/^config_argc=.+$$/config_argc='0'/; \ -# s,-I$(DESTDIR)$(includedir),,g; \ -# s,-[LR]$(DESTDIR)$(libdir),,g; \ -# s,( -I$(includedir))+,\$$1,g; \ -# s,( -[LR]$(libdir))+,\$$1,g; \ -# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ -# s, (-L)?$(CC_HOME)\S+,,g; \ -# if (/^\w+=/) { \ -# s/\s{2,}(\-)/ \-/g; \ -# s/(^\w+=.) /\$$1/; \ -# s/ (.)$$/\$$1/g; \ -# } \ -# print \ -# " Config.pm Config_heavy.pl ) -# @$(MAKECOOKIE) - -#POST_TARGETS += CSWperl.cswperlincpath -#CSWperl.cswperlincpath: -# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath - -# Invoke post-install targets -#post-install-modulated: $(POST_TARGETS) -# @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Dec 21 23:28:25 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 21 Dec 2012 22:28:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[19937] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 19937 http://gar.svn.sourceforge.net/gar/?rev=19937&view=rev Author: claudio_sf Date: 2012-12-21 22:28:24 +0000 (Fri, 21 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: dmake -> gmake Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2012-12-21 22:16:58 UTC (rev 19936) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-12-21 22:28:24 UTC (rev 19937) @@ -218,7 +218,7 @@ build-perl: BUILD_EXPORTS = LD_OPTIONS build-perl: @echo " ==> Running make in $*" - cd $(WORKSRC) && $(BUILD_ENV) dmake + cd $(WORKSRC) && $(BUILD_ENV) gmake $(PARALLELMFLAGS) @$(MAKECOOKIE) test-perl: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Dec 21 23:30:52 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 21 Dec 2012 22:30:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[19938] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 19938 http://gar.svn.sourceforge.net/gar/?rev=19938&view=rev Author: claudio_sf Date: 2012-12-21 22:30:51 +0000 (Fri, 21 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: dmake -> gmake Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2012-12-21 22:28:24 UTC (rev 19937) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-12-21 22:30:51 UTC (rev 19938) @@ -64,6 +64,9 @@ # GCC build (Sunstudio is problematic) # claudio GARCOMPILER = GCC4 +PARALLELMFLAGS_unstable10s = "-l -j $(SPARC_PARALLEL)" +PARALLELMFLAGS_unstable10x = "-l -j $(INTEL_PARALLEL)" +PARALLELMFLAGS = $(PARALLELMFLAGS_$(shell hostname)) # a .git directory will cause failing upstream author tests (the source will be considered blead) NOGITPATCH = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri Dec 21 23:34:17 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 21 Dec 2012 22:34:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[19939] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 19939 http://gar.svn.sourceforge.net/gar/?rev=19939&view=rev Author: claudio_sf Date: 2012-12-21 22:34:17 +0000 (Fri, 21 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: dmake -> gmake Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2012-12-21 22:30:51 UTC (rev 19938) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-12-21 22:34:17 UTC (rev 19939) @@ -64,9 +64,9 @@ # GCC build (Sunstudio is problematic) # claudio GARCOMPILER = GCC4 -PARALLELMFLAGS_unstable10s = "-l -j $(SPARC_PARALLEL)" -PARALLELMFLAGS_unstable10x = "-l -j $(INTEL_PARALLEL)" -PARALLELMFLAGS = $(PARALLELMFLAGS_$(shell hostname)) +MAKE_OPT_unstable10s = "-l -j $(SPARC_PARALLEL)" +MAKE_OPT_unstable10x = "-l -j $(INTEL_PARALLEL)" +MAKE_OPT = $(MAKE_OPT_$(shell hostname)) # a .git directory will cause failing upstream author tests (the source will be considered blead) NOGITPATCH = 1 @@ -221,7 +221,7 @@ build-perl: BUILD_EXPORTS = LD_OPTIONS build-perl: @echo " ==> Running make in $*" - cd $(WORKSRC) && $(BUILD_ENV) gmake $(PARALLELMFLAGS) + cd $(WORKSRC) && $(BUILD_ENV) gmake $(MAKE_OPT) @$(MAKECOOKIE) test-perl: 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 Dec 22 04:17:50 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 22 Dec 2012 03:17:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[19940] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 19940 http://gar.svn.sourceforge.net/gar/?rev=19940&view=rev Author: wahwah Date: 2012-12-22 03:17:50 +0000 (Sat, 22 Dec 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: version bump Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-12-21 22:34:17 UTC (rev 19939) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-12-22 03:17:50 UTC (rev 19940) @@ -13,10 +13,9 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)5 BASE_VERSION = 5.5 -PATCHLEVEL = 28 +PATCHLEVEL = 29 ALTS_PRIO = 55 VERSION = $(BASE_VERSION).$(PATCHLEVEL) -CATEGORIES = server # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2012-12-21 22:34:17 UTC (rev 19939) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2012-12-22 03:17:50 UTC (rev 19940) @@ -1 +1 @@ -da8ddb3d00e6e159153d2444360f52a8 mysql-5.5.28.tar.gz +e6b9f9cb82e990bd8f0474df7462904e mysql-5.5.29.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Sat Dec 22 08:09:06 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sat, 22 Dec 2012 07:09:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[19941] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 19941 http://gar.svn.sourceforge.net/gar/?rev=19941&view=rev Author: claudio_sf Date: 2012-12-22 07:09:05 +0000 (Sat, 22 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: Make ppt Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2012-12-22 03:17:50 UTC (rev 19940) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-12-22 07:09:05 UTC (rev 19941) @@ -64,8 +64,8 @@ # GCC build (Sunstudio is problematic) # claudio GARCOMPILER = GCC4 -MAKE_OPT_unstable10s = "-l -j $(SPARC_PARALLEL)" -MAKE_OPT_unstable10x = "-l -j $(INTEL_PARALLEL)" +MAKE_OPT_unstable10s = "-j $(SPARC_PARALLEL)" +MAKE_OPT_unstable10x = "-j $(INTEL_PARALLEL)" MAKE_OPT = $(MAKE_OPT_$(shell hostname)) # a .git directory will cause failing upstream author tests (the source will be considered blead) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Sat Dec 22 08:18:49 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sat, 22 Dec 2012 07:18:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[19942] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 19942 http://gar.svn.sourceforge.net/gar/?rev=19942&view=rev Author: claudio_sf Date: 2012-12-22 07:18:49 +0000 (Sat, 22 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: Make ppt Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2012-12-22 07:09:05 UTC (rev 19941) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-12-22 07:18:49 UTC (rev 19942) @@ -64,8 +64,8 @@ # GCC build (Sunstudio is problematic) # claudio GARCOMPILER = GCC4 -MAKE_OPT_unstable10s = "-j $(SPARC_PARALLEL)" -MAKE_OPT_unstable10x = "-j $(INTEL_PARALLEL)" +MAKE_OPT_unstable10s = "-j 24" +MAKE_OPT_unstable10x = "-j 4" MAKE_OPT = $(MAKE_OPT_$(shell hostname)) # a .git directory will cause failing upstream author tests (the source will be considered blead) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Sat Dec 22 08:26:09 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sat, 22 Dec 2012 07:26:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[19943] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 19943 http://gar.svn.sourceforge.net/gar/?rev=19943&view=rev Author: claudio_sf Date: 2012-12-22 07:26:09 +0000 (Sat, 22 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: Make ppt Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2012-12-22 07:18:49 UTC (rev 19942) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-12-22 07:26:09 UTC (rev 19943) @@ -64,8 +64,8 @@ # GCC build (Sunstudio is problematic) # claudio GARCOMPILER = GCC4 -MAKE_OPT_unstable10s = "-j 24" -MAKE_OPT_unstable10x = "-j 4" +MAKE_OPT_unstable10s = -j 24 +MAKE_OPT_unstable10x = -j 4 MAKE_OPT = $(MAKE_OPT_$(shell hostname)) # a .git directory will cause failing upstream author tests (the source will be considered blead) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Sat Dec 22 19:43:06 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sat, 22 Dec 2012 18:43:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[19944] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 19944 http://gar.svn.sourceforge.net/gar/?rev=19944&view=rev Author: claudio_sf Date: 2012-12-22 18:43:05 +0000 (Sat, 22 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: i386 fix Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2012-12-22 07:26:09 UTC (rev 19943) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-12-22 18:43:05 UTC (rev 19944) @@ -137,9 +137,11 @@ CONFIGURE_ARGS-64 += -Duse64bitint CONFIGURE_ARGS-64 += -Duse64bitall CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) -CONFIGURE_ARGS_isa-amd64 += -Dlddlflags=-shared -CONFIGURE_ARGS_isa-amd64 += -Dcccdlflags=-fPIC -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MODULATION)) +#CONFIGURE_ARGS_isa-amd64 += -Dlddlflags=-shared +#CONFIGURE_ARGS_isa-amd64 += -Dcccdlflags=-fPIC +CONFIGURE_ARGS += -Dlddlflags=-shared +CONFIGURE_ARGS += -Dcccdlflags=-fPIC +#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MODULATION)) #EXTRA_LIB += $(prefix)/bdb48/lib #EXTRA_INC += $(prefix)/bdb48/include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Sat Dec 22 22:20:23 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sat, 22 Dec 2012 21:20:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19945] csw/mgar/pkg/perl/trunk/Makefile_5.16. 2_32+64b_privlib Message-ID: Revision: 19945 http://gar.svn.sourceforge.net/gar/?rev=19945&view=rev Author: claudio_sf Date: 2012-12-22 21:20:23 +0000 (Sat, 22 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: Get rid of uncommitted error Removed Paths: ------------- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib Deleted: csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-22 18:43:05 UTC (rev 19944) +++ csw/mgar/pkg/perl/trunk/Makefile_5.16.2_32+64b_privlib 2012-12-22 21:20:23 UTC (rev 19945) @@ -1,267 +0,0 @@ -NAME = perl -VERSION = 5.16.2 -VERSION_MAJOR = $(shell echo $(VERSION) | cut -f1-2 -d.) -#CATEGORIES = lang -GARTYPE = v2 - -DESCRIPTION = A high-level, general-purpose programming language -define BLURB - Perl is a high-level, general-purpose programming language that makes easy - things easy and hard things possible. It is optimized for scanning arbitrary - text files and system administration. It has built-in extended regular - expression matching and replacement, a dataflow mechanism to improve security - with setuid scripts and is extendable via modules that can interface to C - libraries. -endef - -#MASTER_SITES = http://www.cpan.org/src/ -#SPKG_SOURCEURL = http://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.16.2.tar.bz2 -MASTER_SITES = manual:// -VENDOR_URL = http://www.perl.org -#DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz - -PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc -#BUILD64_ONLY = 1 -PACKAGES += CSWperl -PKG_DESC_CSWperl = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWperl += CSWlibssp0 -#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 -INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags - -PACKAGES += CSWperldoc -SPKG_DESC_CSWperldoc = Perl documentation -SPKG_DESC_CSWperl = Core Perl distribution -RUNTIME_DEP_PKGS_CSWperldoc = CSWperl -ARCHALL_CSWperldoc = 1 - -LICENSE = Copying - -CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content -#CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl -#CHECKPKG_OVERRIDES_CSWperl += binary-architecture-does-not-match-placement -OBSOLETED_BY_CSWperl += CSWpm-module-build -OBSOLETED_BY_CSWperl += CSWpm-json-pp -OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta -OBSOLETED_BY_CSWperldoc += CSWpm-parse-cpan-meta -OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-yaml -OBSOLETED_BY_CSWperldoc += CSWpm-module-metadata -CATALOGNAME_CSWpm-cpan-meta-requirements = pm_cpan_meta_reqs_stub -OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-requirements -OBSOLETED_BY_CSWperldoc += CSWpm-perl-ostype -CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl - - - -# Core module updates -# Not used at the moment, leave one as example -#MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ -#CORE_UPDATES += PathTools-3.30 -#CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd - -#DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) - -# GCC build (Sunstudio is problematic) # claudio -GARCOMPILER = GCC4 - -# a .git directory will cause failing upstream author tests (the source will be considered blead) -NOGITPATCH = 1 - -# Custom configure -CONFIGURE_SCRIPTS = perl - -# Compatable with all prior patch revs -INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 - -# Force use of db-4.8 -# TBD: Reinsert libperl.so, see below. -#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -#PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt -#PERL_LIBS-64 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt -#PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) -#PERL_LIBS = -lsocket -lgdbm -ldl -lm -lpthread -lc -lcrypt - -BUILD64 = 1 -ISAEXEC = 1 - - -# Configuration flags -CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION_MAJOR) -CONFIGURE_ARGS += -Dcc=$(CC) -#CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" -#CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" -CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) -CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" -#CONFIGURE_ARGS += -Dld=$(CC) -#CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" -# Workaround below. Do not version libperl.so here otherwise the other 5.10 -# lib will be picked up by mgar -#CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION) -#CONFIGURE_ARGS += -Dlocincpth=$(includedir) -#CONFIGURE_ARGS += -Dloclibpth=$(libdir) -CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dman1ext=1 -CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dman3ext=3perl -#CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" -CONFIGURE_ARGS += -Dperladmin="root at localhost" -CONFIGURE_ARGS += -Dprefix=$(prefix) -CONFIGURE_ARGS += -Dbin=$(bindir) -CONFIGURE_ARGS += -Dscriptdir=$(bindir) -# CSW provided modules should install in the privlib directory (/opt/csw/share/perl/5.14) -CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION_MAJOR) -CONFIGURE_ARGS += -Dsitearch=/opt/csw/local/lib/perl/$(VERSION_MAJOR) -CONFIGURE_ARGS += -Dsitelib=/opt/csw/local/share/perl/$(VERSION) -CONFIGURE_ARGS += -Dsiteman1dir=/opt/csw//local/share/man/man1 -CONFIGURE_ARGS += -Dsiteman3dir==/opt/csw/local/share/man/man3 -CONFIGURE_ARGS += -Dsiteprefix=/opt/csw/local -CONFIGURE_ARGS += -Duseshrplib -CONFIGURE_ARGS += -Dusesitecustomize -CONFIGURE_ARGS += -Dusethreads -CONFIGURE_ARGS += -Dusedtrace -CONFIGURE_ARGS += -Dinc_version_list=none -#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) -# Largefiles is on by default for 64 bit -CONFIGURE_ARGS += -Duselargefiles -CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl5 -CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl5 -CONFIGURE_ARGS += -Dvendorprefix=$(prefix) -#CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" -CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" -#CONFIGURE_ARGS += -Dlibsdirs=/usr/lib/64 -CONFIGURE_ARGS += -Dsed=/opt/csw/bin/gsed -CONFIGURE_ARGS-64 += -Duse64bitint -CONFIGURE_ARGS-64 += -Duse64bitall -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) -CONFIGURE_ARGS_isa-amd64 += -Dlddlflags=-shared -CONFIGURE_ARGS_isa-amd64 += -Dcccdlflags=-fPIC -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MODULATION)) - -#EXTRA_LIB += $(prefix)/bdb48/lib -#EXTRA_INC += $(prefix)/bdb48/include -EXTRA_INC += /usr/include -#LD_LIBRARY_PATH for testing -#LD_LIBRARY_PATH += $(prefix)/bdb48/lib/$(MEMORYMODEL) - -# Somehow the CPPFLAGS do not make it into the compile environment. -# Add them explicitly here, otherwise specifically the bdb48/include will -# not make it resulting in db.h not to be found and DB_File.pm not to be built -# as reported here: -# https://www.opencsw.org/mantis/view.php?id=4544 -#EXTRA_CFLAGS = $(CPPFLAGS) - -# Adding -lperl requires that libperl.so is available during compilation, which is not -# the case on bootstrapping. However, we require explicit libperl linkage or programs -# embedding perl will have problems with duplicated static variables. -# XXX Investigate further after 64 bit has built -#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl -#EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib/64 -R/opt/csw/bdb48/lib/64 -R/opt/csw/lib/64 -#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -EXTRA_LDFLAGS = -lperl - -# We want 64 bit binaries -#MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) - -EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod -PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* - -# The diagnostics.pm module needs the podfile to output its messages. -# That means it must be included in the main package, not the docs. -EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod -EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod - -# Tests take a long time, run once for every release -BUILD_SCRIPTS = perl - -TEST_SCRIPTS = perl - -# Make sure we don't include the path to the newly built perl as the -# library is not in place yet. -#IGNORE_DESTDIR = 1 - -# Do not exclude static libs as at least DynaLoader.a is needed for XS compilation -#MERGE_EXCLUDE_STATICLIBS = - -# This is for the communication with checkpkg. These pathes are searched for modules -# when resolving dependencies. -#PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") - -# Splitting of a separate libperl.so requires more work and careful planning. -# Override for now. -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 - -include gar/category.mk - -# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and -# the one in $WORKSRC has not been built yet -# TBD: Investigate -#post-extract-modulated: -# mkdir -p $(WORKSRC) -# #gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so -# @$(MAKECOOKIE) - -#ifneq ($(CORE_UPDATES),) -#POST_TARGETS = install-core-updates -#include files/updatecore.mk -#endif - -# How to configure Perl -#configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS -configure-perl: - (cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders) - @$(MAKECOOKIE) - -build-perl: BUILD_EXPORTS = LD_OPTIONS -build-perl: - @echo " ==> Running make in $*" - cd $(WORKSRC) && $(BUILD_ENV) dmake - @$(MAKECOOKIE) - -test-perl: - @echo " ==> Running make $(TEST_TARGET) in $*" - cd $(WORKSRC) && gmake test - @$(MAKECOOKIE) - -# Make links to libperl and minor-major lib dirs -POST_TARGETS += syslinks -syslinks: - @echo "Creating links to libperl and minor-major lib dirs" - cd $(DESTDIR)$(libdir)/perl && ln -s $(VERSION_MAJOR) $(VERSION) &&\ - cd $(VERSION_MAJOR) && ln -s libperl.so libperl.so.$(VERSION) && ln -s libperl.so libperl.so.$(VERSION_MAJOR) &&\ - cd $(DESTDIR)$(datadir)/perl && ln -s $(VERSION_MAJOR) $(VERSION) - @$(MAKECOOKIE) - -# Remove build paths from Config -#POST_TARGETS += perlconf -#perlconf: -# @( cd $(DESTDIR)$(libdir)/perl/$(VERSION) ; \ -# /bin/perl -i -lne "\ -# next if /config_arg[1-9]/; \ -# s/^config_args=.+$$/config_args=''/; \ -# s/^config_argc=.+$$/config_argc='0'/; \ -# s,-I$(DESTDIR)$(includedir),,g; \ -# s,-[LR]$(DESTDIR)$(libdir),,g; \ -# s,( -I$(includedir))+,\$$1,g; \ -# s,( -[LR]$(libdir))+,\$$1,g; \ -# s,-R $(libdir)/perl/$(VERSION)/CORE,-R $(libdir),; \ -# s, (-L)?$(CC_HOME)\S+,,g; \ -# if (/^\w+=/) { \ -# s/\s{2,}(\-)/ \-/g; \ -# s/(^\w+=.) /\$$1/; \ -# s/ (.)$$/\$$1/g; \ -# } \ -# print \ -# " Config.pm Config_heavy.pl ) -# @$(MAKECOOKIE) - -#POST_TARGETS += CSWperl.cswperlincpath -#CSWperl.cswperlincpath: -# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath - -# Invoke post-install targets -post-install-modulated: $(POST_TARGETS) - @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Sun Dec 23 01:04:42 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sun, 23 Dec 2012 00:04:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[19946] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 19946 http://gar.svn.sourceforge.net/gar/?rev=19946&view=rev Author: claudio_sf Date: 2012-12-23 00:04:39 +0000 (Sun, 23 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: fix incorrect inc_version_list Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2012-12-22 21:20:23 UTC (rev 19945) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-12-23 00:04:39 UTC (rev 19946) @@ -26,6 +26,7 @@ PACKAGES += CSWperl PKG_DESC_CSWperl = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWperl += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWperl += CSWlibgcc-s1 #RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags @@ -95,7 +96,7 @@ #CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" #CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)" CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) -CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" +#CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)" #CONFIGURE_ARGS += -Dld=$(CC) #CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)" # Workaround below. Do not version libperl.so here otherwise the other 5.10 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 Dec 23 11:24:48 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 23 Dec 2012 10:24:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[19947] csw/mgar/gar/v2/lib/python/sharedlib_utils.py Message-ID: Revision: 19947 http://gar.svn.sourceforge.net/gar/?rev=19947&view=rev Author: wahwah Date: 2012-12-23 10:24:48 +0000 (Sun, 23 Dec 2012) Log Message: ----------- checkpkg: When hachoir fails, display a msg It used to be a cryptic stack trace. Let's display an informative error message instead. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2012-12-23 00:04:39 UTC (rev 19946) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2012-12-23 10:24:48 UTC (rev 19947) @@ -47,6 +47,10 @@ pass +class DataInconsistencyError(Error): + """Inconsistency in the data.""" + + def ParseLibPath(directory): arch_subdirs = (SPARCV8_PATHS + SPARCV8PLUS_PATHS + SPARCV9_PATHS + INTEL_386_PATHS + AMD64_PATHS) @@ -227,6 +231,14 @@ if mimetype in file_info["mime_type"]: is_a_binary = True break + if is_a_binary and not "machine_id" in file_info: + raise DataInconsistencyError( + "'machine_id' not found in file_info: %r. checkpkg can't continue, " + "but it's not a problem with checkpkg; it's a problem with the underlying " + "libraries. In this case it's the hachoir library, which failed to " + "detect the processor type for this binary. A workaround for it " + "could be building the binary again, e.g. 'mgar clean package'." + % file_info) return is_a_binary This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Sun Dec 23 11:48:25 2012 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sun, 23 Dec 2012 10:48:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[19948] csw/mgar/pkg/perl/trunk Message-ID: Revision: 19948 http://gar.svn.sourceforge.net/gar/?rev=19948&view=rev Author: claudio_sf Date: 2012-12-23 10:48:24 +0000 (Sun, 23 Dec 2012) Log Message: ----------- /home/claudio/opencsw/perl/trunk: comments for maintainer Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/perl/trunk/files/sigsystem.t csw/mgar/pkg/perl/trunk/files/sigsystem.t.patch Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2012-12-23 10:24:48 UTC (rev 19947) +++ csw/mgar/pkg/perl/trunk/Makefile 2012-12-23 10:48:24 UTC (rev 19948) @@ -19,6 +19,7 @@ MASTER_SITES = manual:// VENDOR_URL = http://www.perl.org #DISTFILES = $(NAME)-$(VERSION).tar.gz +# The source has been patched to fix a failing patch (Solaris only). The patch was discussed with upstream (p5p) and committed to BLEAD. The patch is in the files directory. DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc @@ -41,7 +42,6 @@ CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content #CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl -#CHECKPKG_OVERRIDES_CSWperl += binary-architecture-does-not-match-placement OBSOLETED_BY_CSWperl += CSWpm-module-build OBSOLETED_BY_CSWperl += CSWpm-json-pp OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta @@ -60,7 +60,6 @@ #MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ #CORE_UPDATES += PathTools-3.30 #CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd - #DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) # GCC build (Sunstudio is problematic) # claudio @@ -68,6 +67,8 @@ MAKE_OPT_unstable10s = -j 24 MAKE_OPT_unstable10x = -j 4 MAKE_OPT = $(MAKE_OPT_$(shell hostname)) +BUILD64 = 1 +ISAEXEC = 1 # a .git directory will cause failing upstream author tests (the source will be considered blead) NOGITPATCH = 1 @@ -75,9 +76,12 @@ # Custom configure CONFIGURE_SCRIPTS = perl +# Disabled, this is the first 5.16 release +# If I read the doc correctly, the arguments should be directories and not releases. I the the debian build does not have this option set. # Compatable with all prior patch revs -INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 +# INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 5.12.2 5.12.3 5.12.4 5.14.0 5.14.1 5.14.2 +# We added some libs and options through CONFIGURE_ARGS values. The libs were picked up thorugh the hints mechanism. The db-4.8 must be investigated (needed/wished?) # Force use of db-4.8 # TBD: Reinsert libperl.so, see below. #PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc @@ -86,11 +90,8 @@ #PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) #PERL_LIBS = -lsocket -lgdbm -ldl -lm -lpthread -lc -lcrypt -BUILD64 = 1 -ISAEXEC = 1 - - # Configuration flags +# Commented options were not needed, or broke the build. Alternatives were supplied. CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION_MAJOR) CONFIGURE_ARGS += -Dcc=$(CC) #CONFIGURE_ARGS += -Dccflags="$(CFLAGS)" @@ -117,16 +118,15 @@ CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION_MAJOR) CONFIGURE_ARGS += -Dsitearch=/opt/csw/local/lib/perl/$(VERSION_MAJOR) CONFIGURE_ARGS += -Dsitelib=/opt/csw/local/share/perl/$(VERSION) -CONFIGURE_ARGS += -Dsiteman1dir=/opt/csw//local/share/man/man1 +CONFIGURE_ARGS += -Dsiteman1dir=/opt/csw/local/share/man/man1 CONFIGURE_ARGS += -Dsiteman3dir==/opt/csw/local/share/man/man3 CONFIGURE_ARGS += -Dsiteprefix=/opt/csw/local CONFIGURE_ARGS += -Duseshrplib CONFIGURE_ARGS += -Dusesitecustomize CONFIGURE_ARGS += -Dusethreads CONFIGURE_ARGS += -Dusedtrace -CONFIGURE_ARGS += -Dinc_version_list=none +#CONFIGURE_ARGS += -Dinc_version_list=none #CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) -# Largefiles is on by default for 64 bit CONFIGURE_ARGS += -Duselargefiles CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl5 CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl5 @@ -138,11 +138,8 @@ CONFIGURE_ARGS-64 += -Duse64bitint CONFIGURE_ARGS-64 += -Duse64bitall CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) -#CONFIGURE_ARGS_isa-amd64 += -Dlddlflags=-shared -#CONFIGURE_ARGS_isa-amd64 += -Dcccdlflags=-fPIC CONFIGURE_ARGS += -Dlddlflags=-shared CONFIGURE_ARGS += -Dcccdlflags=-fPIC -#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MODULATION)) #EXTRA_LIB += $(prefix)/bdb48/lib #EXTRA_INC += $(prefix)/bdb48/include @@ -156,7 +153,6 @@ # as reported here: # https://www.opencsw.org/mantis/view.php?id=4544 #EXTRA_CFLAGS = $(CPPFLAGS) - # Adding -lperl requires that libperl.so is available during compilation, which is not # the case on bootstrapping. However, we require explicit libperl linkage or programs # embedding perl will have problems with duplicated static variables. Added: csw/mgar/pkg/perl/trunk/files/sigsystem.t =================================================================== --- csw/mgar/pkg/perl/trunk/files/sigsystem.t (rev 0) +++ csw/mgar/pkg/perl/trunk/files/sigsystem.t 2012-12-23 10:48:24 UTC (rev 19948) @@ -0,0 +1,69 @@ +#!perl -w + +BEGIN { + require './test.pl'; + skip_all_if_miniperl(); + skip_all_without_config(qw(d_fork)); +} + +use strict; +use constant TRUE => ($^X, '-e', 'exit 0'); +use Data::Dumper; + +plan tests => 4; + +SKIP: { + skip 'Platform doesn\'t support SIGCHLD', 4 if not exists $SIG{CHLD}; + require POSIX; + require Time::HiRes; + + my @pids; + $SIG{CHLD} = sub { + while ((my $child = waitpid(-1, POSIX::WNOHANG())) > 0) { + note "Reaped: $child"; + push @pids, $child; + } + }; + my $pid = fork // die "Can't fork: $!"; + unless ($pid) { + note("Child PID: $$"); + Time::HiRes::sleep(0.250); + POSIX::_exit(0); + } + + test_system('without reaper'); + + my $current = POSIX::SigSet->new; + POSIX::sigprocmask(POSIX::SIG_BLOCK(), undef, $current); + diag("SIGCHLD is blocked? " . $current->ismember(POSIX::SIGCHLD())); + test_system('with reaper'); + POSIX::sigprocmask(POSIX::SIG_BLOCK(), undef, $current); + diag("SIGCHLD is blocked? " . $current->ismember(POSIX::SIGCHLD())); + + note("Waiting briefly for SIGCHLD..."); + Time::HiRes::sleep(0.500); + + ok(@pids == 1, 'Reaped only one process'); + ok($pids[0] == $pid, "Reaped the right process.") or diag(Dumper(\@pids)); +} + +sub test_system { + my $subtest = shift; + + my $expected_zeroes = 10; + my $got_zeroes = 0; + + # This test is looking for a race between system()'s waitpid() and a + # signal handler. Looping a few times increases the chances of + # catching the error. + + for (1..$expected_zeroes) { + $got_zeroes++ unless system(TRUE); + } + + is( + $got_zeroes, $expected_zeroes, + "system() $subtest succeeded $got_zeroes times out of $expected_zeroes" + ); +} + Added: csw/mgar/pkg/perl/trunk/files/sigsystem.t.patch =================================================================== --- csw/mgar/pkg/perl/trunk/files/sigsystem.t.patch (rev 0) +++ csw/mgar/pkg/perl/trunk/files/sigsystem.t.patch 2012-12-23 10:48:24 UTC (rev 19948) @@ -0,0 +1,39 @@ +diff --git a/t/op/sigsystem.t b/t/op/sigsystem.t +index 197ecb2..dcbbab1 100644 +--- a/t/op/sigsystem.t ++++ b/t/op/sigsystem.t +@@ -17,6 +17,13 @@ SKIP: { + require POSIX; + require Time::HiRes; + ++ my @pids; ++ $SIG{CHLD} = sub { ++ while ((my $child = waitpid(-1, POSIX::WNOHANG())) > 0) { ++ note "Reaped: $child"; ++ push @pids, $child; ++ } ++ }; + my $pid = fork // die "Can't fork: $!"; + unless ($pid) { + note("Child PID: $$"); +@@ -26,15 +33,12 @@ SKIP: { + + test_system('without reaper'); + +- my @pids; +- $SIG{CHLD} = sub { +- while ((my $child = waitpid(-1, POSIX::WNOHANG())) > 0) { +- note "Reaped: $child"; +- push @pids, $child; +- } +- }; +- ++ my $current = POSIX::SigSet->new; ++ POSIX::sigprocmask(POSIX::SIG_BLOCK(), undef, $current); ++ diag("SIGCHLD is blocked? " . $current->ismember(POSIX::SIGCHLD())); + test_system('with reaper'); ++ POSIX::sigprocmask(POSIX::SIG_BLOCK(), undef, $current); ++ diag("SIGCHLD is blocked? " . $current->ismember(POSIX::SIGCHLD())); + + note("Waiting briefly for SIGCHLD..."); + Time::HiRes::sleep(0.500); 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 Dec 23 13:16:15 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 23 Dec 2012 12:16:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[19949] csw/mgar/gar/v2/lib/web/releases_web.py Message-ID: Revision: 19949 http://gar.svn.sourceforge.net/gar/?rev=19949&view=rev Author: wahwah Date: 2012-12-23 12:16:13 +0000 (Sun, 23 Dec 2012) Log Message: ----------- pkgdb-web: Disallow old osrel only in unstable This safety check is there to make it harder for people to remove packages from the old, unsupported OS releases. It's better to allow updating old OS releases in other catalogs, so that catalog integration works. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/releases_web.py Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2012-12-23 10:48:24 UTC (rev 19948) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2012-12-23 12:16:13 UTC (rev 19949) @@ -218,7 +218,7 @@ self.ReturnError( "%s is not one of %s (OS releases)" % (osrel_name, common_constants.OS_RELS)) - if osrel_name in common_constants.OBSOLETE_OS_RELS: + if osrel_name in common_constants.OBSOLETE_OS_RELS and catrel_name == 'unstable': self.ReturnError( "package deletions from an obsolete OS release such as %s " "are not allowed" % osrel_name) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Dec 23 13:17:04 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 23 Dec 2012 12:17:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[19950] csw/mgar/gar/v2/lib/web/templates/CatalogDetail. html Message-ID: Revision: 19950 http://gar.svn.sourceforge.net/gar/?rev=19950&view=rev Author: wahwah Date: 2012-12-23 12:17:03 +0000 (Sun, 23 Dec 2012) Log Message: ----------- pkgdb-web: Display catalogs as a table, not list Modified Paths: -------------- csw/mgar/gar/v2/lib/web/templates/CatalogDetail.html Modified: csw/mgar/gar/v2/lib/web/templates/CatalogDetail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/CatalogDetail.html 2012-12-23 12:16:13 UTC (rev 19949) +++ csw/mgar/gar/v2/lib/web/templates/CatalogDetail.html 2012-12-23 12:17:03 UTC (rev 19950) @@ -9,13 +9,18 @@

$cat_name

$pkgs.count() packages

-
    + + + + + + $for pkg in pkgs: -
  • - - $pkg - -
    • - + + + + +
    filenamecatalognameversion
    $pkg.basename + $pkg.catalogname$pkg.version_string
    This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Sun Dec 23 13:46:57 2012 From: pfelecan at opencsw.org (Peter FELECAN) Date: Sun, 23 Dec 2012 13:46:57 +0100 Subject: [csw-devel] SF.net SVN: gar:[19947] csw/mgar/gar/v2/lib/python/sharedlib_utils.py In-Reply-To: (wahwah@users.sourceforge.net's message of "Sun, 23 Dec 2012 10:24:48 +0000") References: Message-ID: wahwah at users.sourceforge.net writes: > It used to be a cryptic stack trace. Let's display an informative error > message instead. Yeah, human understandable messages... What I dislike most in Python eco-system is the tendency to let the interpreter dump the trace and let the poor user, usually me, to understand what happened. A small step for you but a great one for me. Thanks. -- Peter From pfelecan at users.sourceforge.net Sun Dec 23 18:19:42 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sun, 23 Dec 2012 17:19:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[19951] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 19951 http://gar.svn.sourceforge.net/gar/?rev=19951&view=rev Author: pfelecan Date: 2012-12-23 17:19:42 +0000 (Sun, 23 Dec 2012) Log Message: ----------- fix stutter in LaTeX base binaries package name Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-12-23 12:17:03 UTC (rev 19950) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-12-23 17:19:42 UTC (rev 19951) @@ -2559,7 +2559,7 @@ CHECKPKG_OVERRIDES_CSWtexlive-latex-base += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/tex/context/base/colo-x11.mkii CHECKPKG_OVERRIDES_CSWtexlive-latex-base += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/tex/context/base/colo-imp-x11.mkiv -PACKAGES += CSWtexlive-latex-base-binaries-binaries +PACKAGES += CSWtexlive-latex-base-binaries CATALOGNAME_CSWtexlive-latex-base-binaries = texlive_latex_base_binaries SPKG_DESC_CSWtexlive-latex-base-binaries += $(DESCRIPTION), latex base, architecture dependent OBSOLETED_BY_CSWtexlive-latex-base-binaries = CSWtetex This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sun Dec 23 18:22:35 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sun, 23 Dec 2012 17:22:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[19952] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 19952 http://gar.svn.sourceforge.net/gar/?rev=19952&view=rev Author: pfelecan Date: 2012-12-23 17:22:35 +0000 (Sun, 23 Dec 2012) Log Message: ----------- fix description for LaTeX extra package Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-12-23 17:19:42 UTC (rev 19951) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-12-23 17:22:35 UTC (rev 19952) @@ -3280,7 +3280,7 @@ PACKAGES += CSWtexlive-latex-extra-binaries CATALOGNAME_CSWtexlive-latex-extra-binaries = texlive_latex_extra_binaries -SPKG_DESC_CSWtexlive-latex-extra-binaries += $(DESCRIPTION), latex extra +SPKG_DESC_CSWtexlive-latex-extra-binaries += $(DESCRIPTION), latex extra, binaries OBSOLETED_BY_CSWtexlive-latex-extra-binaries = CSWtetex PKGFILES_CSWtexlive-latex-extra-binaries += $(docdir)/$(CATALOGNAME_CSWtexlive-latex-extra-binaries)/.* PKGFILES_CSWtexlive-latex-extra-binaries += /opt/csw/bin/bg5conv This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sun Dec 23 18:23:54 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sun, 23 Dec 2012 17:23:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[19953] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 19953 http://gar.svn.sourceforge.net/gar/?rev=19953&view=rev Author: pfelecan Date: 2012-12-23 17:23:54 +0000 (Sun, 23 Dec 2012) Log Message: ----------- fix description for music binaries package Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-12-23 17:22:35 UTC (rev 19952) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-12-23 17:23:54 UTC (rev 19953) @@ -4126,7 +4126,7 @@ PACKAGES += CSWtexlive-music-binaries CATALOGNAME_CSWtexlive-music-binaries = texlive_music_binaries -SPKG_DESC_CSWtexlive-music-binaries += $(DESCRIPTION), music +SPKG_DESC_CSWtexlive-music-binaries += $(DESCRIPTION), music, binaries OBSOLETED_BY_CSWtexlive-music-binaries = CSWtetex PKGFILES_CSWtexlive-music-binaries += $(docdir)/$(CATALOGNAME_CSWtexlive-music-binaries)/.* PKGFILES_CSWtexlive-music-binaries += /opt/csw/bin/prepmx This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sun Dec 23 18:25:00 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sun, 23 Dec 2012 17:25:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[19954] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 19954 http://gar.svn.sourceforge.net/gar/?rev=19954&view=rev Author: pfelecan Date: 2012-12-23 17:25:00 +0000 (Sun, 23 Dec 2012) Log Message: ----------- fix description for xindy binaries package Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-12-23 17:23:54 UTC (rev 19953) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-12-23 17:25:00 UTC (rev 19954) @@ -4871,7 +4871,7 @@ PACKAGES += CSWtexlive-xindy-binaries CATALOGNAME_CSWtexlive-xindy-binaries = texlive_xindy_binaries -SPKG_DESC_CSWtexlive-xindy-binaries += $(DESCRIPTION), index generator for structured documents like LaTeX or SGML +SPKG_DESC_CSWtexlive-xindy-binaries += $(DESCRIPTION), index generator for structured documents like LaTeX or SGML, binaries PKGFILES_CSWtexlive-xindy-binaries += $(docdir)/$(CATALOGNAME_CSWtexlive-xindy-binaries)/.* PKGFILES_CSWtexlive-xindy-binaries += /opt/csw//bin/tex2xindy RUNTIME_DEP_PKGS_CSWtexlive-xindy-binaries += CSWclisp 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 Dec 24 05:49:21 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 24 Dec 2012 04:49:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[19955] csw/mgar/pkg/lang-python/sqlobject/trunk Message-ID: Revision: 19955 http://gar.svn.sourceforge.net/gar/?rev=19955&view=rev Author: wahwah Date: 2012-12-24 04:49:21 +0000 (Mon, 24 Dec 2012) Log Message: ----------- lang-python/sqlobject/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile csw/mgar/pkg/lang-python/sqlobject/trunk/checksums Modified: csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile 2012-12-23 17:25:00 UTC (rev 19954) +++ csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile 2012-12-24 04:49:21 UTC (rev 19955) @@ -3,7 +3,7 @@ # $Id$ NAME = SQLObject -VERSION = 1.2.2 +VERSION = 1.3.2 CATEGORIES = python GARTYPE = v2 DESCRIPTION = Object Relational Manager for Python Modified: csw/mgar/pkg/lang-python/sqlobject/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/sqlobject/trunk/checksums 2012-12-23 17:25:00 UTC (rev 19954) +++ csw/mgar/pkg/lang-python/sqlobject/trunk/checksums 2012-12-24 04:49:21 UTC (rev 19955) @@ -1 +1 @@ -b2f4e52112e54233a85c075e8af3c62d SQLObject-1.2.2.tar.gz +225f5ecb912804415ffbd24db9473367 SQLObject-1.3.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Dec 24 05:53:13 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 24 Dec 2012 04:53:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[19956] csw/mgar/gar/v2/lib/python/database.py Message-ID: Revision: 19956 http://gar.svn.sourceforge.net/gar/?rev=19956&view=rev Author: wahwah Date: 2012-12-24 04:53:12 +0000 (Mon, 24 Dec 2012) Log Message: ----------- pkgdb: Fix the table creation order Since the Stats table refers to the Blob table, Blob has to be created first. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/database.py Modified: csw/mgar/gar/v2/lib/python/database.py =================================================================== --- csw/mgar/gar/v2/lib/python/database.py 2012-12-24 04:49:21 UTC (rev 19955) +++ csw/mgar/gar/v2/lib/python/database.py 2012-12-24 04:53:12 UTC (rev 19956) @@ -25,8 +25,8 @@ m.Pkginst, m.Srv4DependsOn, m.Srv4FileInCatalog, - m.Srv4FileStats, - m.Srv4FileStatsBlob) + m.Srv4FileStatsBlob, + m.Srv4FileStats) # Shouldn't this be in common_constants? SYSTEM_PKGMAP = "/var/sadm/install/contents" CONFIG_MTIME = "mtime" @@ -153,7 +153,13 @@ def CreateTables(self): for table in TABLES: - table.createTable(ifNotExists=True) + try: + logging.debug("Creating table %r", table) + table.createTable(ifNotExists=True) + except sqlobject.dberrors.OperationalError, e: + logging.error("Could not create table %r: %s", table, e) + raise + def InitialDataImport(self): """Imports initial data into the db. @@ -183,10 +189,6 @@ pass self.SetDatabaseSchemaVersion() - def CreateTables(self): - for table in TABLES: - table.createTable(ifNotExists=True) - def ClearTablesForUpdates(self): for table in TABLES_THAT_NEED_UPDATES: table.clearTable() 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 Dec 24 06:45:48 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 24 Dec 2012 05:45:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[19957] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators/mirror-setup.rst Message-ID: Revision: 19957 http://gar.svn.sourceforge.net/gar/?rev=19957&view=rev Author: wahwah Date: 2012-12-24 05:45:47 +0000 (Mon, 24 Dec 2012) Log Message: ----------- opencsw-manual/trunk: mirror setup update Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst 2012-12-24 04:53:12 UTC (rev 19956) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst 2012-12-24 05:45:47 UTC (rev 19957) @@ -10,13 +10,14 @@ To set up the mirror you should use ``rsync`` as it can update your local copy quickly and with low bandwidth use and also preserves hardlinks. Not all -mirrors provide access via the ``rsync`` protocol, a list can be found at -http://www.opencsw.org/get-it/mirrors/ . To make a full copy of the OpenCSW -repository use this:: +mirrors provide access via the ``rsync`` protocol, please consult +[our list of mirrors](http://www.opencsw.org/get-it/mirrors/). +To make a full copy of the OpenCSW repository:: pkgutil -y -i rsync - rsync -aH --delete rsync://rsync.opencsw.org/opencsw /my/server/repo + mkdir /export/opencsw-mirror + rsync -aH --delete rsync://rsync.opencsw.org/opencsw/ /export/opencsw-mirror -The directory ``repo`` can either be shared via HTTP or via NFS to the -``pkgutil`` clients. Use http://myserver/url-to-repo/ for HTTP and -file:///myserver/dir-to-repo for NFS as mirror option in ``pkgutil``. +The directory ``opencsw-mirror`` can either be shared via HTTP or via NFS to the +``pkgutil`` clients. Use ``http://myserver/opencsw-mirror/`` for HTTP and +``file:///myserver/opencsw-mirror`` for NFS as mirror option in ``pkgutil``. 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 Dec 24 11:09:23 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 24 Dec 2012 10:09:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19958] csw/mgar/pkg/opencsw-manual/trunk Message-ID: Revision: 19958 http://gar.svn.sourceforge.net/gar/?rev=19958&view=rev Author: wahwah Date: 2012-12-24 10:09:22 +0000 (Mon, 24 Dec 2012) Log Message: ----------- opencsw-manual/trunk: a stub for buildfarm setup instructions Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/Makefile csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst Added Paths: ----------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/Makefile =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/Makefile 2012-12-24 05:45:47 UTC (rev 19957) +++ csw/mgar/pkg/opencsw-manual/trunk/Makefile 2012-12-24 10:09:22 UTC (rev 19958) @@ -32,6 +32,9 @@ BUILD_DEP_PKGS += CSWrsync BUILD_DEP_PKGS += CSWpysetuptools +# This is a documentation package, so references to /usr are fine. +CHECKPKG_OVERRIDES_CSWopencsw-manual += file-with-bad-content + include gar/category.mk post-extract-modulated: @@ -43,17 +46,19 @@ @$(MAKECOOKIE) install-manual: - ginstall -m 755 -d $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-manual) - rsync -rv $(WORKSRC)/_build/html/ $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-manual) + ginstall -m 755 -d $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWopencsw-manual) + rsync -rv $(WORKSRC)/_build/html/ $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWopencsw-manual) @$(MAKECOOKIE) post-install-modulated: copy-to-web @$(MAKECOOKIE) copy-to-web: - if [ -d $(HOME)/public_html/opencsw-manual ]; then \ - rsync -r $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-manual)/ \ - $(HOME)/public_html/opencsw-manual; \ + if echo $(DESTDIR) | grep global; then :; else \ + if [ -d $(HOME)/public_html/opencsw-manual ]; then \ + rsync -r $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWopencsw-manual)/ \ + $(HOME)/public_html/opencsw-manual; \ + fi \ fi .PHONY: copy-to-web Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2012-12-24 10:09:22 UTC (rev 19958) @@ -0,0 +1,35 @@ +--------------- +Buildfarm setup +--------------- + +.. highlight:: text + +Introduction +------------ + +Packages released by OpenCSW must be built on the OpenCSW buildfarm, but if +you want to experiment, or build in-house packages, you might want to set up +your own build farm, or at least a build host. + +Buildfarm setup consists of: + +* OpenCSW installation +* `GAR setup`_ and subversion checkout +* `Local catalog mirror`_ +* `checkpkg database`_ +* pkgdb-web (with Apache) +* system garrc +* `wiki instructions`_ (Java setup, Solaris Studio setup, ssh agent setup) +* signing daemon + +.. _GAR setup: + http://sourceforge.net/apps/trac/gar/wiki/GarSetup + +.. _checkpkg database: + http://wiki.opencsw.org/checkpkg#toc2 + +.. _wiki instructions: + http://wiki.opencsw.org/buildfarm + +.. _Local catalog mirror: + ../for-administrators/mirror-setup.html Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst 2012-12-24 05:45:47 UTC (rev 19957) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst 2012-12-24 10:09:22 UTC (rev 19958) @@ -12,3 +12,4 @@ building-a-catalog shared-libraries package-naming + buildfarm-setup 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 Dec 25 12:44:09 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 25 Dec 2012 11:44:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[19959] csw/mgar/pkg/sed/trunk Message-ID: Revision: 19959 http://gar.svn.sourceforge.net/gar/?rev=19959&view=rev Author: wahwah Date: 2012-12-25 11:44:08 +0000 (Tue, 25 Dec 2012) Log Message: ----------- sed/trunk: version bump. I can tell somebody was using emacs. Modified Paths: -------------- csw/mgar/pkg/sed/trunk/Makefile csw/mgar/pkg/sed/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/sed/trunk/Makefile Modified: csw/mgar/pkg/sed/trunk/Makefile =================================================================== --- csw/mgar/pkg/sed/trunk/Makefile 2012-12-24 10:09:22 UTC (rev 19958) +++ csw/mgar/pkg/sed/trunk/Makefile 2012-12-25 11:44:08 UTC (rev 19959) @@ -1,5 +1,7 @@ +# $Id$ + NAME = sed -VERSION = 4.2.1 +VERSION = 4.2.2 GARTYPE = v2 PACKAGES = CSWgsed @@ -23,17 +25,17 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -# Use GNU because of issue with syntax containing ellipsis in lib/regcomp.c. +# Use GNU because of issue with syntax containing ellipsis in lib/regcomp.c. # See http://markmail.org/message/7ki46iiok3ddu3sa GARCOMPILER = GNU RUNTIME_DEP_PKGS += CSWlibintl8 -# No special platform optimization +# No special platform optimization NOISALIST = 1 -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --program-prefix=g +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --program-prefix=g CONFIGURE_ARGS += --with-included-gettext SHELL = /bin/bash Property changes on: csw/mgar/pkg/sed/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/sed/trunk/checksums =================================================================== --- csw/mgar/pkg/sed/trunk/checksums 2012-12-24 10:09:22 UTC (rev 19958) +++ csw/mgar/pkg/sed/trunk/checksums 2012-12-25 11:44:08 UTC (rev 19959) @@ -1 +1 @@ -f0fd4d7da574d4707e442285fd2d3b86 download/sed-4.2.1.tar.gz +4111de4faa3b9848a0686b2f260c5056 sed-4.2.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 26 10:18:23 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 26 Dec 2012 09:18:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19960] csw/mgar/pkg/sed/trunk/files/ 0001-Enhance-Solaris-ACL-error-handling.patch Message-ID: Revision: 19960 http://gar.svn.sourceforge.net/gar/?rev=19960&view=rev Author: wahwah Date: 2012-12-26 09:18:20 +0000 (Wed, 26 Dec 2012) Log Message: ----------- sed/trunk: updating the patch Modified Paths: -------------- csw/mgar/pkg/sed/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch Modified: csw/mgar/pkg/sed/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch =================================================================== --- csw/mgar/pkg/sed/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch 2012-12-25 11:44:08 UTC (rev 19959) +++ csw/mgar/pkg/sed/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch 2012-12-26 09:18:20 UTC (rev 19960) @@ -14,45 +14,22 @@ Signed-off-by: Ben Walton --- - lib/copy-acl.c | 4 ++-- - lib/set-mode-acl.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) + lib/copy-acl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/copy-acl.c b/lib/copy-acl.c -index af85a08..55999ec 100644 +index 5cc75e1..cebc8e8 100644 --- a/lib/copy-acl.c +++ b/lib/copy-acl.c -@@ -253,7 +253,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, +@@ -212,7 +212,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, if (ace_count < 0) - { -- if (errno == ENOSYS || errno == EINVAL) -+ if (errno == ENOSYS || errno == EINVAL || errno == EOPNOTSUPP) - { - ace_count = 0; - ace_entries = NULL; -@@ -358,7 +358,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, - if (ret < 0 && saved_errno == 0) - { - saved_errno = errno; -- if (errno == ENOSYS && !acl_nontrivial (count, entries)) -+ if ((errno == ENOSYS || errno == EOPNOTSUPP) && !acl_nontrivial (count, entries)) - saved_errno = 0; - } - else -diff --git a/lib/set-mode-acl.c b/lib/set-mode-acl.c -index a24b9f3..28c6d4e 100644 ---- a/lib/set-mode-acl.c -+++ b/lib/set-mode-acl.c -@@ -387,7 +387,7 @@ qset_acl (char const *name, int desc, mode_t mode) - ret = acl (name, SETACL, sizeof (entries) / sizeof (aclent_t), entries); - if (ret < 0) - { -- if (errno == ENOSYS) -+ if (errno == ENOSYS || errno == EOPNOTSUPP) - return chmod_or_fchmod (name, desc, mode); - return -1; - } + { +- if (errno == ENOSYS || errno == EINVAL) ++ if (errno == ENOSYS || errno == EINVAL || errno == EOPNOTSUPP) + { + ace_count = 0; + ace_entries = NULL; -- -1.7.3.2 +1.8.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 26 12:32:30 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 26 Dec 2012 11:32:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[19961] csw/mgar/gar/v2/lib/python/catalog_gc.py Message-ID: Revision: 19961 http://gar.svn.sourceforge.net/gar/?rev=19961&view=rev Author: wahwah Date: 2012-12-26 11:32:30 +0000 (Wed, 26 Dec 2012) Log Message: ----------- catalog-gc: Keep files from the 'legacy' catalog Additional catalogs must be listed, otherwise their files will be nuked. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/catalog_gc.py Modified: csw/mgar/gar/v2/lib/python/catalog_gc.py =================================================================== --- csw/mgar/gar/v2/lib/python/catalog_gc.py 2012-12-26 09:18:20 UTC (rev 19960) +++ csw/mgar/gar/v2/lib/python/catalog_gc.py 2012-12-26 11:32:30 UTC (rev 19961) @@ -20,7 +20,7 @@ class CatalogGarbageCollector(object): - ADDITIONAL_CATALOGS = ("current", "stable") + ADDITIONAL_CATALOGS = ("legacy") def __init__(self, d): logging.debug("CatalogGarbageCollector(%s)", repr(d)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 26 12:33:55 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 26 Dec 2012 11:33:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[19962] csw/mgar/gar/v2/lib/python Message-ID: Revision: 19962 http://gar.svn.sourceforge.net/gar/?rev=19962&view=rev Author: wahwah Date: 2012-12-26 11:33:54 +0000 (Wed, 26 Dec 2012) Log Message: ----------- checkpkg: chicken-and-egg mimetype problem fix The IsBinary() function is used to: 1. Figure out whether a file is a binary file 2. Check if hachoir parser info is already there 3. Whether we should collect hachoir parser info The first time we're calling it to figure out whether we should collect hachoir parser info, so obviously hachoir parser info is not present yet, and we need to tell it to not check for that. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py csw/mgar/gar/v2/lib/python/sharedlib_utils.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2012-12-26 11:32:30 UTC (rev 19961) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2012-12-26 11:33:54 UTC (rev 19962) @@ -54,7 +54,7 @@ "will probably finish successfully when do you that." % full_path) raise package.PackageError(msg) - if sharedlib_utils.IsBinary(file_info): + if sharedlib_utils.IsBinary(file_info, check_consistency=False): parser = hachoir_parser.createParser(full_path) if not parser: logging.warning("Can't parse file %s", file_path) Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2012-12-26 11:32:30 UTC (rev 19961) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2012-12-26 11:33:54 UTC (rev 19962) @@ -217,8 +217,16 @@ return LCS -def IsBinary(file_info): - """Returns True or False depending on file metadata.""" +def IsBinary(file_info, check_consistency=True): + """Returns True or False depending on file metadata. + + Args: + file_info: A dictionary containing file information + check_consistency: Whether to check for consistency between the mimetype + information and other information, such as machine_id. During the + initial data gathering, the check must be disabled, because IsBinary() + is used to determine whether we should collect machine_id or not. + """ is_a_binary = False if "mime_type" not in file_info: # This would be a problem in the data. @@ -231,13 +239,12 @@ if mimetype in file_info["mime_type"]: is_a_binary = True break - if is_a_binary and not "machine_id" in file_info: + if check_consistency and is_a_binary and not "machine_id" in file_info: raise DataInconsistencyError( "'machine_id' not found in file_info: %r. checkpkg can't continue, " "but it's not a problem with checkpkg; it's a problem with the underlying " "libraries. In this case it's the hachoir library, which failed to " - "detect the processor type for this binary. A workaround for it " - "could be building the binary again, e.g. 'mgar clean package'." + "detect the processor type for this binary." % file_info) return is_a_binary 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 Dec 26 12:34:20 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 26 Dec 2012 11:34:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[19963] csw/mgar/gar/v2/lib/python/inspective_package.py Message-ID: Revision: 19963 http://gar.svn.sourceforge.net/gar/?rev=19963&view=rev Author: wahwah Date: 2012-12-26 11:34:20 +0000 (Wed, 26 Dec 2012) Log Message: ----------- checkpkg: If hachoir fails, exit early If hachoir_parser fails to get the machine_id, do not even complete the data collection, as the collected metadata are useless anyway. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2012-12-26 11:33:54 UTC (rev 19962) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2012-12-26 11:34:20 UTC (rev 19963) @@ -60,8 +60,15 @@ logging.warning("Can't parse file %s", file_path) else: try: + machine_id = parser["/header/machine"].value + except hachoir_core.field.field.MissingField, e: + logging.fatal( + "hachoir_parser failed to retrieve machine_id for %r. " + "checkpkg cannot continue.", + file_info) + raise + try: file_info["mime_type_by_hachoir"] = parser.mime_type - machine_id = parser["/header/machine"].value file_info["machine_id"] = machine_id file_info["endian"] = parser["/header/endian"].display except hachoir_core.field.field.MissingField, e: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Dec 26 17:08:51 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 26 Dec 2012 16:08:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[19964] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 19964 http://gar.svn.sourceforge.net/gar/?rev=19964&view=rev Author: pfelecan Date: 2012-12-26 16:08:51 +0000 (Wed, 26 Dec 2012) Log Message: ----------- texlive/trunk: acted on checkpkg diagnostic: verification and validation Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-12-26 11:34:20 UTC (rev 19963) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-12-26 16:08:51 UTC (rev 19964) @@ -136,6 +136,9 @@ EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/source/latex/splitindex/splitindex-OpenBSD-i386 # compiled Python EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/doc/fonts/gnu-freefont/tools/generate/buildutils.pyc +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/doc/latex/cweb-latex/examples/compare/wcltx.log +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/doc/latex/pstool/example.log +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/doc/latex/nicetext/readprov.log DEBUG_PACKAGING = 1 SPKG_TMPDIR = $(HOME)/ocswtmp @@ -151,6 +154,180 @@ RUNTIME_DEP_PKGS_CSWtexlive-common += CSWruby RUNTIME_DEP_PKGS_CSWtexlive-common += CSWtexlive-binaries RUNTIME_DEP_PKGS_CSWtexlive-common += CSWperl +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/context/data/scite/scite-context-readme.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/fonts/prodint/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/fonts/Type1fonts/fontinstallationguide.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/fonts/gnu-freefont/notes/troubleshooting.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/fonts/gnu-freefont/TROUBLESHOOTING +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/fonts/oldstandard/oldstand-manual.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/fonts/cm-unicode/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/biblatex-chicago/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/translation-ecv-de/ecvde.dtx.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/jmlr/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/biblatex/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/latex4wp-it/latex4wp-it.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/beamer/doc/beamerug-installation.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/mathspic/README.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/mathspic/mathspic.1 +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/latex4wp/latex4wp.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/tkz-orm/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/chinese/teTeXb5.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/pdfhowto/HOWTO.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/context/third/context-notes-zh-cn/src/basis.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-installation.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/generic/tex4ht/mn38.html +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/otherformats/jadetex/base/releasenotes.xml +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/otherformats/jadetex/base/index.html +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/otherformats/jadetex/base/index.xml +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/support/pdfjam/PDFjam-README.html +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/support/fragmaster/README.de +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/support/fragmaster/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/support/bundledoc/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/ecv/ecv.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/ecv/ecv.ins +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/listings-ext/listings-ext.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/mftinc/mftinc.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/documentation/documentation.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/struktex/struktex.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/tex4ht/mn-unix.html +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/tex4ht/mn31.html +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/dosepsbin/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/latexmk/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/latexmk/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/latexmk/latexmk.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/pdfjam/PDFjam-README.html +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/fragmaster/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/texdef/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/bundledoc/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/plain/js-misc/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/bibtex/urlbst/urlbst.html +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/bibtex/urlbst/urlbst.html.in +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/cweb-latex/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/pdfpages/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/base/ltdirchk.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/base/docstrip.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/marginnote/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/listings-ext/listings-ext.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/splitindex/install.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/splitindex/install.sh +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/amscls/install.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/gridset/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/struktex/struktex.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/foilhtml/foilhtml.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/fontspec/fontspec.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/amsfonts/amsfndoc.ins +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/amsrefs/install.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/aiaa/aiaa.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/thailatex/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/thailatex/configure +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/sffms/sffms.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/ltxindex/ltxindex.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/geschichtsfrkl/geschichtsfrkl.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/decimal/decimal.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/amsmath/install.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/basque-date/basque-date.ins +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/confproc/confproc.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/platex/base/plnews05.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/platex/base/plnews03.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/platex/base/plnews04.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/platex/base/README.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/platex/base/plnews07.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/platex/base/plnews06.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/platex/base/plnews08.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/bibtex/urlbst/configure +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/fonts/fonts-tlwg/configure +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/thumbpdf/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/otherformats/jadetex/base/index.html +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/textopo/textopo.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/prosper/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/inputtrc/inputtrc.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/cmll/cmll.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/texshade/texshade.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/fonts/fonts-tlwg/configure +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/fonts/fonts-tlwg/configure.in +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/fonts/fonts-tlwg/ChangeLog.thai-ttf +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/generic/pst-pdgr/pst-pdgr.ins +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/export/home|root/opt/csw/share/texmf-dist/tex/latex/prosper/red-bullet-on-blue.ps +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/export/home|root/opt/csw/share/texmf-dist/tex/latex/prosper/green-bullet-on-blue.ps +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/otherformats/jadetex/base/index.xml +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-sr/texlive-sr.html +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-sr/texlive-sr.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-common/examples/ex6a.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-common/examples/ex6b.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-common/examples/ex6.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-common/examples/ex6c.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/bibtexu/00readme.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/Type1fonts/fontinstallationguide.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/prodint/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/tex/texinfo/texinfo.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/fonts/fonts-tlwg/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.10.patch +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/fonts/berenisadf/cfr.make.public +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/fonts/berenisadf/ff-ybd.pe +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/info/eplain.info +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/info/kpathsea.info +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/fonts/universa/uni.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/startex/base/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/hbf2gf/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/pedigree-perl/doc/pedigree.ps +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/pedigree-perl/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/support/dosepsbin/configure +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/support/texdef/texdef.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/generic/mkjobtexmf/configure +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/metapost/expressg/expressg.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/pedigree-perl/doc/pedigree.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/starfont/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/esstix/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/boondox/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/gnu-freefont/ChangeLog +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/newtx/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/gnu-freefont/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/pedigree-perl/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/chess/makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/chess/installation +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/hfoldsty/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/cm-unicode/FAQ +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/ptex/base/INSTALL.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/biblatex-chicago/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/bgteubner/Makefile.hhsubfigure +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/bgteubner/installation.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/vpe/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/jamtimes/jamtimes.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/macros2e/macros2e.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/nameauth/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/tipa-de/tipaman1-de.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/foilhtml/readme.v12 +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/biblatex-swiss-legal/doc_source/biblatex-swiss-legal.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/biblatex/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/presentations/02-04-1.ltxpd +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/beamer/doc/beamerug-installation.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/mathspic/README.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/hobete/poster-test.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/japanese/japanese.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/japanese/japanese.jis +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/cjk/READMEb5.cjk +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/chinese/teTeXb5.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/chinese/READMEb5.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/dvipdfmx.cfg +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/hbf2gf.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/thaifont.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/history.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/CJK.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/cjk-enc.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/TDS.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/fonts.txt +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/filemod/README +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-base-external.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-installation.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-electricfield/pst-electricfield-docFR.pdf +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-electricfield/pst-electricfield-docDE.pdf +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-electricfield/pst-electricfield-docEN.pdf +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docDE.pdf +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docFR.pdf +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.pdf PACKAGES += CSWtexlive-dev CATALOGNAME_CSWtexlive-dev += texlive_dev @@ -198,8 +375,6 @@ PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/generic/enctex/.* PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/generic/hyph-utf8/.* PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/generic/ifxetex/.* -PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/latex/etex-pkg/.* -PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/latex/oberdiek/.* PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/pdftex/.* PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/support/makeindex/.* PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/dvips/base/.* @@ -225,14 +400,11 @@ PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/metafont/base/.* PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/metafont/config/.* PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/metafont/misc/.* -PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/omega/ocp/misc/.* -PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/omega/otp/misc/.* PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/generic/dvips/.* PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/generic/enctex/.* PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/generic/hyph-utf8/.* PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/generic/ifxetex/.* PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/generic/misc/.* -PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/generic/oberdiek/ifluatex.sty PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/latex/amsfonts/.* PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/latex/dvipdfmx-def/.* PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/latex/etex-pkg/.* @@ -278,6 +450,14 @@ RUNTIME_DEP_PKGS_CSWtexlive-base += CSWtexlive-common RUNTIME_DEP_PKGS_CSWtexlive-base += CSWperl RUNTIME_DEP_PKGS_CSWtexlive-base += CSWtexlive-luatex +CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/dvips/dvips.html +CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/web2c/web2c.html +CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/kpathsea/kpathsea.html +CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/tetex/teTeX-FAQ +CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/pdftex/manual/pdftex-t.tex +CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/hyph-utf8/hyphenation-distribution.tex +CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/enctex/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/enctex/INSTALL.eng PACKAGES += CSWtexlive-bibtex-extra CATALOGNAME_CSWtexlive-bibtex-extra = texlive_bibtex_extra @@ -380,6 +560,7 @@ PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/plain/harvmac/.* ARCHALL_CSWtexlive-bibtex-extra = 1 RUNTIME_DEP_PKGS_CSWtexlive-bibtex-extra += CSWtexlive-common +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/bibtex/bibhtml/bibhtml.html PACKAGES += CSWtexlive-binaries CATALOGNAME_CSWtexlive-binaries = texlive_binaries @@ -617,6 +798,8 @@ PKGFILES_CSWtexlive-doc-cs+sk += /opt/csw/share/texmf-dist/doc/latex/lshort-slovak/.* PKGFILES_CSWtexlive-doc-cs+sk += /opt/csw/share/texmf/doc/texlive/texlive-cz/.* ARCHALL_CSWtexlive-doc-cs+sk = 1 +CHECKPKG_OVERRIDES_CSWtexlive-doc-cs+sk += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-cz/texlive-cz.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-cs+sk += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-cz/texlive-cz.html PACKAGES += CSWtexlive-doc-de CATALOGNAME_CSWtexlive-doc-de = texlive_doc_de @@ -632,6 +815,8 @@ PKGFILES_CSWtexlive-doc-de += /opt/csw/share/texmf-dist/doc/latex/templates-sommer/.* PKGFILES_CSWtexlive-doc-de += /opt/csw/share/texmf/doc/texlive/texlive-de/.* ARCHALL_CSWtexlive-doc-de = 1 +CHECKPKG_OVERRIDES_CSWtexlive-doc-de += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-de/texlive-de.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-de += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-de/texlive-de.html PACKAGES += CSWtexlive-doc-en CATALOGNAME_CSWtexlive-doc-en = texlive_doc_en @@ -671,15 +856,27 @@ PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/tlc2/.* PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/visualfaq/.* PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/webguide/.* -PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/metapost/metapost-examples/.* PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/plain/gentle/.* PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/plain/impatient/.* PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/plain/plain-doc/.* PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/plain/texbytopic/.* -PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/xetex/xetexref/.* ARCHALL_CSWtexlive-doc-en = 1 RUNTIME_DEP_PKGS_CSWtexlive-doc-en += CSWemacscommon RUNTIME_DEP_PKGS_CSWtexlive-doc-en += CSWperl +CHECKPKG_OVERRIDES_CSWtexlive-doc-en += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/tds/tds.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-en += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/FAQ-en/ChangeLog +CHECKPKG_OVERRIDES_CSWtexlive-doc-en += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/FAQ-en/faq-install.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-en += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/mathmode/Mathmode.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-en += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/dtxtut/dtxtut.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-en += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/comprehensive/symbols-a4.pdf +CHECKPKG_OVERRIDES_CSWtexlive-doc-en += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/metafont-beginners/metafont-for-beginners.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-en += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/generic/FAQ-en/faq-install.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-en += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/generic/FAQ-en/faq-bits+pieces.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-en += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/comprehensive/source/symbols.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-en += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/comprehensive/symbols-letter.pdf +CHECKPKG_OVERRIDES_CSWtexlive-doc-en += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/tex-refs/tex-refs.html +CHECKPKG_OVERRIDES_CSWtexlive-doc-en += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/tds/tds.dvi +CHECKPKG_OVERRIDES_CSWtexlive-doc-en += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/tds/tds.html PACKAGES += CSWtexlive-doc-es CATALOGNAME_CSWtexlive-doc-es = texlive_doc_es @@ -691,6 +888,9 @@ PKGFILES_CSWtexlive-doc-es += /opt/csw/share/texmf-dist/doc/latex/lshort-spanish/.* ARCHALL_CSWtexlive-doc-es = 1 RUNTIME_DEP_PKGS_CSWtexlive-doc-es += CSWperl +CHECKPKG_OVERRIDES_CSWtexlive-doc-es += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/generic/es-tex-faq/FAQ-CervanTeX.sgml +CHECKPKG_OVERRIDES_CSWtexlive-doc-es += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/generic/es-tex-faq/FAQ-CervanTeX.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-es += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/generic/es-tex-faq/FAQ-CervanTeX.latin1 PACKAGES += CSWtexlive-doc-fi CATALOGNAME_CSWtexlive-doc-fi = texlive_doc_fi @@ -728,6 +928,8 @@ PKGFILES_CSWtexlive-doc-it += /opt/csw/share/texmf/doc/texlive/texlive-it/.* ARCHALL_CSWtexlive-doc-it = 1 RUNTIME_DEP_PKGS_CSWtexlive-doc-it += CSWperl +CHECKPKG_OVERRIDES_CSWtexlive-doc-it += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-it/texlive-it.html +CHECKPKG_OVERRIDES_CSWtexlive-doc-it += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-it/texlive-it.tex PACKAGES += CSWtexlive-doc-ja CATALOGNAME_CSWtexlive-doc-ja = texlive_doc_ja @@ -771,6 +973,8 @@ PKGFILES_CSWtexlive-doc-pl += /opt/csw/share/texmf-dist/doc/latex/lshort-polish/.* PKGFILES_CSWtexlive-doc-pl += /opt/csw/share/texmf/doc/texlive/texlive-pl/.* ARCHALL_CSWtexlive-doc-pl = 1 +CHECKPKG_OVERRIDES_CSWtexlive-doc-pl += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-pl/texlive-pl.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-pl += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-pl/texlive-pl.html PACKAGES += CSWtexlive-doc-pt CATALOGNAME_CSWtexlive-doc-pt = texlive_doc_pt @@ -783,6 +987,8 @@ PKGFILES_CSWtexlive-doc-pt += /opt/csw/share/texmf-dist/doc/latex/cursolatex/cursolatex.pdf PKGFILES_CSWtexlive-doc-pt += /opt/csw/share/texmf-dist/doc/latex/latexcheat-ptbr/.* ARCHALL_CSWtexlive-doc-pt = 1 +CHECKPKG_OVERRIDES_CSWtexlive-doc-pt += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/beamer-tut-pt/tutorialbeamer.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-pt += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/cursolatex/cursolatex.pdf PACKAGES += CSWtexlive-doc-ru CATALOGNAME_CSWtexlive-doc-ru = texlive_doc_ru @@ -790,9 +996,10 @@ OBSOLETED_BY_CSWtexlive-doc-ru = CSWtetex PKGFILES_CSWtexlive-doc-ru += $(docdir)/$(CATALOGNAME_CSWtexlive-doc-ru)/.* PKGFILES_CSWtexlive-doc-ru += /opt/csw/share/texmf-dist/doc/latex/lshort-russian/.* -PKGFILES_CSWtexlive-doc-ru += /opt/csw/share/texmf-dist/doc/metapost/mpman-ru/.* PKGFILES_CSWtexlive-doc-ru += /opt/csw/share/texmf/doc/texlive/texlive-ru/.* ARCHALL_CSWtexlive-doc-ru = 1 +CHECKPKG_OVERRIDES_CSWtexlive-doc-ru += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-ru/texlive-ru.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-ru += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-ru/texlive-ru.html PACKAGES += CSWtexlive-doc-si CATALOGNAME_CSWtexlive-doc-si = texlive_doc_si @@ -849,11 +1056,14 @@ PKGFILES_CSWtexlive-doc-zh += /opt/csw/share/texmf-dist/doc/support/asymptote-manual-zh-cn/.* PKGFILES_CSWtexlive-doc-zh += /opt/csw/share/texmf/doc/texlive/texlive-zh-cn/.* ARCHALL_CSWtexlive-doc-zh = 1 +CHECKPKG_OVERRIDES_CSWtexlive-doc-zh += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex +CHECKPKG_OVERRIDES_CSWtexlive-doc-zh += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/asymptote-manual-zh-cn/src/main.tex PACKAGES += CSWtexlive-extra-utils CATALOGNAME_CSWtexlive-extra-utils = texlive_extra_utils SPKG_DESC_CSWtexlive-extra-utils += $(DESCRIPTION), extra utils OBSOLETED_BY_CSWtexlive-extra-utils = CSWtetex +OBSOLETED_BY_CSWtexlive-extra-utils += CSWpdfjam PKGFILES_CSWtexlive-extra-utils += $(docdir)/$(CATALOGNAME_CSWtexlive-extra-utils)/.* PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/a2ping PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/cfftot1 @@ -930,6 +1140,12 @@ RUNTIME_DEP_PKGS_CSWtexlive-extra-utils += CSWtexlive-common RUNTIME_DEP_PKGS_CSWtexlive-extra-utils += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWtexlive-extra-utils += CSWlibstdc++6 +CHECKPKG_OVERRIDES_CSWtexlive-extra-utils += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/bibtex8/00readme.txt +CHECKPKG_OVERRIDES_CSWtexlive-extra-utils += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/mkjobtexmf/README +CHECKPKG_OVERRIDES_CSWtexlive-extra-utils += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/latex2man/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-extra-utils += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/pkfix-helper/README +CHECKPKG_OVERRIDES_CSWtexlive-extra-utils += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/pkfix/README +CHECKPKG_OVERRIDES_CSWtexlive-extra-utils += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/pdfcrop/README PACKAGES += CSWtexlive-font-utils CATALOGNAME_CSWtexlive-font-utils = texlive_font_utils @@ -1362,10 +1578,6 @@ PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/tengwarscript/.* PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/urw/antiqua/.* PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/urw/grotesq/.* -PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/metapost/nkarta/nkarta.mp -PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/omega/ocp/ocherokee/.* -PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/omega/ocp/oinuit/.* -PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/omega/otp/ocherokee/.* PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/context/third/semaphor/.* PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/generic/ean/.* PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/generic/mathabx/.* @@ -1562,6 +1774,14 @@ ARCHALL_CSWtexlive-fonts-extra-doc = 1 RUNTIME_DEP_PKGS_CSWtexlive-fonts-extra-doc += CSWpython RUNTIME_DEP_PKGS_CSWtexlive-fonts-extra-doc += CSWperl +CHECKPKG_OVERRIDES_CSWtexlive-fonts-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/blacklettert1/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-fonts-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/allrunes/README +CHECKPKG_OVERRIDES_CSWtexlive-fonts-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/universa/README.uni +CHECKPKG_OVERRIDES_CSWtexlive-fonts-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/fonts/boisik/README +CHECKPKG_OVERRIDES_CSWtexlive-fonts-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/fonts/frcursive/README +CHECKPKG_OVERRIDES_CSWtexlive-fonts-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/fonts/cmll/README +CHECKPKG_OVERRIDES_CSWtexlive-fonts-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/cryst/cryst1.tex +CHECKPKG_OVERRIDES_CSWtexlive-fonts-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/cryst/README PACKAGES += CSWtexlive-fonts-recommended CATALOGNAME_CSWtexlive-fonts-recommended = texlive_fonts_recommended @@ -1788,6 +2008,14 @@ ARCHALL_CSWtexlive-formats-extra = 1 RUNTIME_DEP_PKGS_CSWtexlive-formats-extra += CSWemacscommon RUNTIME_DEP_PKGS_CSWtexlive-formats-extra += CSWtexlive-binaries +CHECKPKG_OVERRIDES_CSWtexlive-formats-extra += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/eplain/doc/eplain.html +CHECKPKG_OVERRIDES_CSWtexlive-formats-extra += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/otherformats/texsis/base/texsis.1 +CHECKPKG_OVERRIDES_CSWtexlive-formats-extra += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/eplain/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-formats-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/eplain/doc/eplain.html +CHECKPKG_OVERRIDES_CSWtexlive-formats-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/eplain/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-formats-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/otherformats/texsis/base/TXSinstl.doc +CHECKPKG_OVERRIDES_CSWtexlive-formats-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/otherformats/texsis/base/texsis.1 +CHECKPKG_OVERRIDES_CSWtexlive-formats-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/otherformats/texsis/base/TXSrevs.doc PACKAGES += CSWtexlive-games CATALOGNAME_CSWtexlive-games = texlive_games @@ -1894,6 +2122,8 @@ PKGFILES_CSWtexlive-generic-extra += /opt/csw/share/texmf-dist/tex/plain/metatex/.* ARCHALL_CSWtexlive-generic-extra = 1 RUNTIME_DEP_PKGS_CSWtexlive-generic-extra += CSWpython +CHECKPKG_OVERRIDES_CSWtexlive-generic-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/ofs/eurotex2003-ofs.tex +CHECKPKG_OVERRIDES_CSWtexlive-generic-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/tex/generic/ofs/ofs-slt.tex PACKAGES += CSWtexlive-generic-recommended CATALOGNAME_CSWtexlive-generic-recommended = texlive_generic_recommended @@ -1913,6 +2143,7 @@ PKGFILES_CSWtexlive-generic-recommended += /opt/csw/share/texmf-dist/tex/generic/tex-ps/.* PKGFILES_CSWtexlive-generic-recommended += /opt/csw/share/texmf-dist/tex/latex/multido/.* ARCHALL_CSWtexlive-generic-recommended = 1 +CHECKPKG_OVERRIDES_CSWtexlive-generic-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/epsf/README PACKAGES += CSWtexlive-humanities CATALOGNAME_CSWtexlive-humanities = texlive_humanities @@ -2011,8 +2242,6 @@ PKGFILES_CSWtexlive-lang-african += /opt/csw/share/texmf-dist/fonts/tfm/jknappen/fc/.* PKGFILES_CSWtexlive-lang-african += /opt/csw/share/texmf-dist/fonts/tfm/public/ethiop/.* PKGFILES_CSWtexlive-lang-african += /opt/csw/share/texmf-dist/fonts/type1/public/ethiop-t1/.* -PKGFILES_CSWtexlive-lang-african += /opt/csw/share/texmf-dist/omega/ocp/ethiop/.* -PKGFILES_CSWtexlive-lang-african += /opt/csw/share/texmf-dist/omega/otp/ethiop/.* PKGFILES_CSWtexlive-lang-african += /opt/csw/share/texmf-dist/tex/latex/ethiop/.* PKGFILES_CSWtexlive-lang-african += /opt/csw/share/texmf-dist/tex/latex/fc/.* ARCHALL_CSWtexlive-lang-african = 1 @@ -2038,6 +2267,8 @@ PKGFILES_CSWtexlive-lang-arabic += /opt/csw/share/texmf-dist/tex/latex/arabi/.* PKGFILES_CSWtexlive-lang-arabic += /opt/csw/share/texmf-dist/tex/latex/arabtex/.* ARCHALL_CSWtexlive-lang-arabic = 1 +CHECKPKG_OVERRIDES_CSWtexlive-lang-arabic += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/arabtex/tetex.txt +CHECKPKG_OVERRIDES_CSWtexlive-lang-arabic += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/arabi/README PACKAGES += CSWtexlive-lang-croatian CATALOGNAME_CSWtexlive-lang-croatian = texlive_lang_croatian @@ -2100,6 +2331,8 @@ ARCHALL_CSWtexlive-lang-cyrillic = 1 RUNTIME_DEP_PKGS_CSWtexlive-lang-cyrillic += CSWtexlive-binaries RUNTIME_DEP_PKGS_CSWtexlive-lang-cyrillic += CSWperl +CHECKPKG_OVERRIDES_CSWtexlive-lang-cyrillic += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/t2/etc/rubibtex/README +CHECKPKG_OVERRIDES_CSWtexlive-lang-cyrillic += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/t2/etc/rumkidx/README PACKAGES += CSWtexlive-lang-czechslovak CATALOGNAME_CSWtexlive-lang-czechslovak = texlive_lang_czechslovak @@ -2125,6 +2358,8 @@ PKGFILES_CSWtexlive-lang-czechslovak += /opt/csw/share/texmf/doc/vlna/.* ARCHALL_CSWtexlive-lang-czechslovak = 1 RUNTIME_DEP_PKGS_CSWtexlive-lang-czechslovak += CSWtexlive-binaries +CHECKPKG_OVERRIDES_CSWtexlive-lang-czechslovak += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/fonts/type1/public/cs/README +CHECKPKG_OVERRIDES_CSWtexlive-lang-czechslovak += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/cslatex/base/README-cspsfont PACKAGES += CSWtexlive-lang-finnish CATALOGNAME_CSWtexlive-lang-finnish = texlive_lang_finnish @@ -2152,7 +2387,6 @@ PKGFILES_CSWtexlive-lang-french += /opt/csw/share/texmf-dist/fonts/map/dvips/tabvar/.* PKGFILES_CSWtexlive-lang-french += /opt/csw/share/texmf-dist/fonts/tfm/public/tabvar/.* PKGFILES_CSWtexlive-lang-french += /opt/csw/share/texmf-dist/fonts/type1/public/tabvar/.* -PKGFILES_CSWtexlive-lang-french += /opt/csw/share/texmf-dist/metapost/tabvar/.* PKGFILES_CSWtexlive-lang-french += /opt/csw/share/texmf-dist/tex/generic/variations/.* PKGFILES_CSWtexlive-lang-french += /opt/csw/share/texmf-dist/tex/latex/aeguill/.* PKGFILES_CSWtexlive-lang-french += /opt/csw/share/texmf-dist/tex/latex/frenchle/.* @@ -2161,6 +2395,10 @@ PKGFILES_CSWtexlive-lang-french += /opt/csw/share/texmf-dist/tex/latex/tabvar/.* PKGFILES_CSWtexlive-lang-french += /opt/csw/share/texmf-dist/tex/latex/tdsfrmath/.* ARCHALL_CSWtexlive-lang-french = 1 +CHECKPKG_OVERRIDES_CSWtexlive-lang-french += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/mafr/ALIRE +CHECKPKG_OVERRIDES_CSWtexlive-lang-french += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/mafr/README +CHECKPKG_OVERRIDES_CSWtexlive-lang-french += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/generic/variations/README +CHECKPKG_OVERRIDES_CSWtexlive-lang-french += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/generic/variations/ALIRE PACKAGES += CSWtexlive-lang-german CATALOGNAME_CSWtexlive-lang-german = texlive_lang_german @@ -2207,7 +2445,6 @@ PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf-dist/doc/latex/lgreek/.* PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf-dist/doc/latex/teubner/.* PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf-dist/doc/support/mkgrkindex/.* -PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf-dist/doc/xelatex/xgreek/xgreek.pdf PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf-dist/fonts/afm/public/gfsbaskerville/.* PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf-dist/fonts/afm/public/gfsporson/.* PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf-dist/fonts/afm/public/grverb/.* @@ -2263,7 +2500,6 @@ PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf-dist/tex/latex/kerkis/.* PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf-dist/tex/latex/lgreek/.* PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf-dist/tex/latex/teubner/.* -PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf-dist/tex/xelatex/xgreek/.* PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf/doc/generic/elhyphen/.* PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf/tex/generic/hyphen/grahyph5.tex PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf/tex/generic/hyphen/grmhyph5.tex @@ -2271,6 +2507,8 @@ PKGFILES_CSWtexlive-lang-greek += /opt/csw/share/texmf/tex/generic/hyphen/ibyhyph.tex RUNTIME_DEP_PKGS_CSWtexlive-lang-greek += CSWperl ARCHALL_CSWtexlive-lang-greek = 1 +CHECKPKG_OVERRIDES_CSWtexlive-lang-greek += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/bgreek/bgman.tex +CHECKPKG_OVERRIDES_CSWtexlive-lang-greek += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/greektex/greektexdoc.tex PACKAGES += CSWtexlive-lang-hebrew CATALOGNAME_CSWtexlive-lang-hebrew = texlive_lang_hebrew @@ -2458,7 +2696,6 @@ PKGFILES_CSWtexlive-lang-tibetan += /opt/csw/share/texmf-dist/fonts/source/public/otibet/.* PKGFILES_CSWtexlive-lang-tibetan += /opt/csw/share/texmf-dist/fonts/tfm/public/ctib/.* PKGFILES_CSWtexlive-lang-tibetan += /opt/csw/share/texmf-dist/fonts/tfm/public/otibet/.* -PKGFILES_CSWtexlive-lang-tibetan += /opt/csw/share/texmf-dist/omega/ocp/otibet/.* PKGFILES_CSWtexlive-lang-tibetan += /opt/csw/share/texmf-dist/omega/otp/otibet/.* PKGFILES_CSWtexlive-lang-tibetan += /opt/csw/share/texmf-dist/tex/latex/ctib/.* PKGFILES_CSWtexlive-lang-tibetan += /opt/csw/share/texmf-dist/tex/latex/otibet/.* @@ -2552,10 +2789,12 @@ PKGFILES_CSWtexlive-latex-base += /opt/csw/share/texmf-dist/tex/latex/pspicture/.* PKGFILES_CSWtexlive-latex-base += /opt/csw/share/texmf-dist/tex/latex/tools/.* ARCHALL_CSWtexlive-latex-base = 1 -RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWtexlive-common -RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWtexlive-binaries -RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWperl -RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWtexlive-luatex +RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWtexlive-common +RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWtexlive-binaries +RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWperl +RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWtexlive-luatex +RUNTIME_DEP_PKGS_CSWtexlive-latex-base += CSWtexlive-latex-base-binaries +CHECKPKG_OVERRIDES_CSWtexlive-latex-base += surplus-dependency|CSWtexlive-latex-base-binaries CHECKPKG_OVERRIDES_CSWtexlive-latex-base += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/tex/context/base/colo-x11.mkii CHECKPKG_OVERRIDES_CSWtexlive-latex-base += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/tex/context/base/colo-imp-x11.mkiv @@ -2565,7 +2804,6 @@ OBSOLETED_BY_CSWtexlive-latex-base-binaries = CSWtetex PKGFILES_CSWtexlive-latex-base-binaries += $(docdir)/$(CATALOGNAME_CSWtexlive-latex-base-binaries)/.* PKGFILES_CSWtexlive-latex-base-binaries += /opt/csw/bin/extconv -RUNTIME_DEP_PKGS_CSWtexlive-latex-base-binaries += CSWtexlive-common PACKAGES += CSWtexlive-latex-base-doc CATALOGNAME_CSWtexlive-latex-base-doc = texlive_latex_base_doc @@ -2579,6 +2817,7 @@ PKGFILES_CSWtexlive-latex-base-doc += /opt/csw/share/texmf-dist/doc/latex/base/.* PKGFILES_CSWtexlive-latex-base-doc += /opt/csw/share/texmf-dist/doc/latex/carlisle/.* PKGFILES_CSWtexlive-latex-base-doc += /opt/csw/share/texmf-dist/doc/latex/colortbl/.* +PKGFILES_CSWtexlive-latex-base-doc += /opt/csw/share/texmf-dist/doc/latex/etex-pkg/.* PKGFILES_CSWtexlive-latex-base-doc += /opt/csw/share/texmf-dist/doc/latex/fancyhdr/.* PKGFILES_CSWtexlive-latex-base-doc += /opt/csw/share/texmf-dist/doc/latex/geometry/.* PKGFILES_CSWtexlive-latex-base-doc += /opt/csw/share/texmf-dist/doc/latex/graphics/.* @@ -2590,6 +2829,7 @@ PKGFILES_CSWtexlive-latex-base-doc += /opt/csw/share/texmf-dist/doc/latex/pspicture/.* PKGFILES_CSWtexlive-latex-base-doc += /opt/csw/share/texmf-dist/doc/latex/tools/.* ARCHALL_CSWtexlive-latex-base-doc = 1 +CHECKPKG_OVERRIDES_CSWtexlive-latex-base-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/babel/install.txt PACKAGES += CSWtexlive-latex-extra CATALOGNAME_CSWtexlive-latex-extra = texlive_latex_extra @@ -2679,7 +2919,6 @@ PKGFILES_CSWtexlive-latex-extra += /opt/csw/share/texmf-dist/makeindex/nomentbl/.* PKGFILES_CSWtexlive-latex-extra += /opt/csw/share/texmf-dist/makeindex/repeatindex/.* PKGFILES_CSWtexlive-latex-extra += /opt/csw/share/texmf-dist/makeindex/xdoc/.* -PKGFILES_CSWtexlive-latex-extra += /opt/csw/share/texmf-dist/metapost/makecirc/.* PKGFILES_CSWtexlive-latex-extra += /opt/csw/share/texmf-dist/scripts/glossaries/.* PKGFILES_CSWtexlive-latex-extra += /opt/csw/share/texmf-dist/scripts/pax/.* PKGFILES_CSWtexlive-latex-extra += /opt/csw/share/texmf-dist/scripts/pst-pdf/.* @@ -3276,6 +3515,7 @@ RUNTIME_DEP_PKGS_CSWtexlive-latex-extra += CSWtexlive-common RUNTIME_DEP_PKGS_CSWtexlive-latex-extra += CSWperl RUNTIME_DEP_PKGS_CSWtexlive-latex-extra += CSWtexlive-latex-extra-binaries +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra += surplus-dependency|CSWtexlive-latex-extra-binaries ARCHALL_CSWtexlive-latex-extra = 1 PACKAGES += CSWtexlive-latex-extra-binaries @@ -3842,13 +4082,36 @@ PKGFILES_CSWtexlive-latex-extra-doc += /opt/csw/share/texmf-dist/doc/latex/ziffer/.* PKGFILES_CSWtexlive-latex-extra-doc += /opt/csw/share/texmf-dist/doc/latex/zwgetfdate/.* PKGFILES_CSWtexlive-latex-extra-doc += /opt/csw/share/texmf-dist/doc/latex/zwpagelayout/.* -PKGFILES_CSWtexlive-latex-extra-doc += /opt/csw/share/texmf-dist/doc/metapost/makecirc/.* PKGFILES_CSWtexlive-latex-extra-doc += /opt/csw/share/texmf-dist/doc/otherformats/xmltex/xmlplay/.* RUNTIME_DEP_PKGS_CSWtexlive-latex-extra-doc += CSWemacscommon RUNTIME_DEP_PKGS_CSWtexlive-latex-extra-doc += CSWpython RUNTIME_DEP_PKGS_CSWtexlive-latex-extra-doc += CSWperl RUNTIME_DEP_PKGS_CSWtexlive-latex-extra-doc += CSWruby ARCHALL_CSWtexlive-latex-extra-doc = 1 +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/svn-multi/README +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/etoolbox/README +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/csquotes/README +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/glossaries/glossaries-user.tex +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/glossaries/glossaries-user.html +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/splitindex/install.txt +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/exceltex/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/pst-pdf/README +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/pax/README +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/pdfcprot/INSTALL.txt +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/fonttable/README +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/perltex/README +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/pstool/example.synctex +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/probsoln/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/etoolbox/README +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/ecv/docstrip.cfg +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/csquotes/README +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/glossaries/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/ticket/manual.pdf +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/upmethodology/README +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/pax/README +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/pdfcprot/INSTALL.txt +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/texshade/tsfaq.tex PACKAGES += CSWtexlive-latex-recommended CATALOGNAME_CSWtexlive-latex-recommended = texlive_latex_recommended @@ -4014,7 +4277,6 @@ PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/doc/latex/thmbox/.* PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/doc/latex/turnstile/.* PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/doc/latex/yhmath/.* -PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/doc/metapost/venn/.* PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/stmaryrd/.* PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/yhmath/.* PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/fonts/source/public/concrete/.* @@ -4027,7 +4289,6 @@ PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/yhmath/.* PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/fonts/type1/public/yhmath/.* PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/fonts/vf/public/yhmath/.* -PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/metapost/venn/.* PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/tex/amstex/base/.* PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/tex/amstex/config/.* PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/tex/generic/tex-ewd/.* @@ -4062,6 +4323,7 @@ PKGFILES_CSWtexlive-math-extra += /opt/csw/share/texmf-dist/tex/latex/yhmath/.* ARCHALL_CSWtexlive-math-extra = 1 RUNTIME_DEP_PKGS_CSWtexlive-math-extra += CSWtexlive-binaries +CHECKPKG_OVERRIDES_CSWtexlive-math-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/amstex/base/amstinst.tex PACKAGES += CSWtexlive-metapost CATALOGNAME_CSWtexlive-metapost = texlive_metapost @@ -4094,6 +4356,12 @@ PKGFILES_CSWtexlive-metapost-doc += /opt/csw/share/texmf-dist/doc/metapost/.* ARCHALL_CSWtexlive-metapost-doc = 1 RUNTIME_DEP_PKGS_CSWtexlive-metapost-doc += CSWperl +CHECKPKG_OVERRIDES_CSWtexlive-metapost-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/metapost/expressg/n2mpsprl.prl +CHECKPKG_OVERRIDES_CSWtexlive-metapost-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/metapost/piechartmp/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-metapost-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/metapost/featpost/example/bananadimmer.log +CHECKPKG_OVERRIDES_CSWtexlive-metapost-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/metapost/featpost/example/directfonts.mp +CHECKPKG_OVERRIDES_CSWtexlive-metapost-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/metapost/piechartmp/INSTALL +CHECKPKG_OVERRIDES_CSWtexlive-metapost-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/metapost/exteps/exteps.tex PACKAGES += CSWtexlive-music CATALOGNAME_CSWtexlive-music = texlive_music @@ -4123,6 +4391,7 @@ ARCHALL_CSWtexlive-music = 1 RUNTIME_DEP_PKGS_CSWtexlive-music += CSWtexlive-common RUNTIME_DEP_PKGS_CSWtexlive-music += CSWtexlive-music-binaries +CHECKPKG_OVERRIDES_CSWtexlive-music += surplus-dependency|CSWtexlive-music-binaries PACKAGES += CSWtexlive-music-binaries CATALOGNAME_CSWtexlive-music-binaries = texlive_music_binaries @@ -4130,8 +4399,6 @@ OBSOLETED_BY_CSWtexlive-music-binaries = CSWtetex PKGFILES_CSWtexlive-music-binaries += $(docdir)/$(CATALOGNAME_CSWtexlive-music-binaries)/.* PKGFILES_CSWtexlive-music-binaries += /opt/csw/bin/prepmx -ARCHALL_CSWtexlive-music-binaries = 1 -RUNTIME_DEP_PKGS_CSWtexlive-music-binaries += CSWtexlive-common PACKAGES += CSWtexlive-omega CATALOGNAME_CSWtexlive-omega = texlive_omega @@ -4163,6 +4430,7 @@ PKGFILES_CSWtexlive-omega += /opt/csw/share/texmf-dist/tex/plain/omega/.* ARCHALL_CSWtexlive-omega = 1 RUNTIME_DEP_PKGS_CSWtexlive-omega += CSWtexlive-binaries +CHECKPKG_OVERRIDES_CSWtexlive-omega += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/omega/base/doc-1.8.tex PACKAGES += CSWtexlive-pictures CATALOGNAME_CSWtexlive-pictures = texlive_pictures @@ -4276,6 +4544,9 @@ ARCHALL_CSWtexlive-pictures-doc = 1 RUNTIME_DEP_PKGS_CSWtexlive-pictures-doc += CSWemacscommon RUNTIME_DEP_PKGS_CSWtexlive-pictures-doc += CSWperl +CHECKPKG_OVERRIDES_CSWtexlive-pictures-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/pb-diagram/pb-manual.tex +CHECKPKG_OVERRIDES_CSWtexlive-pictures-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/pgfplots/pgfplotstodo.tex +CHECKPKG_OVERRIDES_CSWtexlive-pictures-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/pgfplots/pgfplots.resources.tex PACKAGES += CSWtexlive-plain-extra CATALOGNAME_CSWtexlive-plain-extra = texlive_plain_extra @@ -4525,6 +4796,13 @@ PKGFILES_CSWtexlive-pstricks-doc += /opt/csw/share/texmf-dist/doc/latex/uml/.* ARCHALL_CSWtexlive-pstricks-doc = 1 RUNTIME_DEP_PKGS_CSWtexlive-pstricks-doc += CSWperl +CHECKPKG_OVERRIDES_CSWtexlive-pstricks-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/generic/pst-pdgr/README +CHECKPKG_OVERRIDES_CSWtexlive-pstricks-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/pst2pdf/test2-pdf.pdf +CHECKPKG_OVERRIDES_CSWtexlive-pstricks-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-fractal/pst-fractal-doc.pdf +CHECKPKG_OVERRIDES_CSWtexlive-pstricks-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-eucl/README +CHECKPKG_OVERRIDES_CSWtexlive-pstricks-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.tex +CHECKPKG_OVERRIDES_CSWtexlive-pstricks-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.tex +CHECKPKG_OVERRIDES_CSWtexlive-pstricks-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.tex PACKAGES += CSWtexlive-publishers CATALOGNAME_CSWtexlive-publishers = texlive_publishers @@ -4706,6 +4984,13 @@ ARCHALL_CSWtexlive-publishers-doc = 1 RUNTIME_DEP_PKGS_CSWtexlive-publishers-doc += CSWemacscommon RUNTIME_DEP_PKGS_CSWtexlive-publishers-doc += CSWperl +CHECKPKG_OVERRIDES_CSWtexlive-publishers-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/aastex/README +CHECKPKG_OVERRIDES_CSWtexlive-publishers-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/nddiss/example-v1.3/example.tex +CHECKPKG_OVERRIDES_CSWtexlive-publishers-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/imtekda/README +CHECKPKG_OVERRIDES_CSWtexlive-publishers-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/aastex/f1.eps +CHECKPKG_OVERRIDES_CSWtexlive-publishers-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/IEEEconf/README +CHECKPKG_OVERRIDES_CSWtexlive-publishers-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/revtex/README +CHECKPKG_OVERRIDES_CSWtexlive-publishers-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/bibtex/economic/aer-cje-ex.tex PACKAGES += CSWtexlive-science CATALOGNAME_CSWtexlive-science = texlive_science @@ -4823,6 +5108,10 @@ ARCHALL_CSWtexlive-science-doc = 1 RUNTIME_DEP_PKGS_CSWtexlive-science += CSWperl RUNTIME_DEP_PKGS_CSWtexlive-science-doc += CSWemacscommon +CHECKPKG_OVERRIDES_CSWtexlive-science-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/struktex/struktex.mk +CHECKPKG_OVERRIDES_CSWtexlive-science-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/objectz/ozguide.tex +CHECKPKG_OVERRIDES_CSWtexlive-science-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/complexity/complexity.tex +CHECKPKG_OVERRIDES_CSWtexlive-science-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/struktex/struktex.mk PACKAGES += CSWtexlive-xetex CATALOGNAME_CSWtexlive-xetex = texlive_xetex @@ -4848,7 +5137,6 @@ CATALOGNAME_CSWtexlive-xindy = texlive_xindy SPKG_DESC_CSWtexlive-xindy += $(DESCRIPTION), index generator for structured documents like LaTeX or SGML PKGFILES_CSWtexlive-xindy += $(docdir)/$(CATALOGNAME_CSWtexlive-xindy)/.* -PKGFILES_CSWtexlive-xindy += /opt/csw//bin/tex2xindy PKGFILES_CSWtexlive-xindy += /opt/csw//bin/texindy PKGFILES_CSWtexlive-xindy += /opt/csw//bin/xindy PKGFILES_CSWtexlive-xindy += /opt/csw/bin/tex2xindy @@ -4864,7 +5152,7 @@ RUNTIME_DEP_PKGS_CSWtexlive-xindy += CSWclisp RUNTIME_DEP_PKGS_CSWtexlive-xindy += CSWtexlive-common RUNTIME_DEP_PKGS_CSWtexlive-xindy += CSWtexlive-xindy-binaries -RUNTIME_DEP_PKGS_CSWtexlive-xindy += CSWperl +CHECKPKG_OVERRIDES_CSWtexlive-xindy += surplus-dependency|CSWtexlive-xindy-binaries ARCHALL_CSWtexlive-xindy = 1 CHECKPKG_OVERRIDES_CSWtexlive-xindy += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/xindy/README.distrib-source CHECKPKG_OVERRIDES_CSWtexlive-xindy += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/xindy/manual-3.html @@ -4873,10 +5161,7 @@ CATALOGNAME_CSWtexlive-xindy-binaries = texlive_xindy_binaries SPKG_DESC_CSWtexlive-xindy-binaries += $(DESCRIPTION), index generator for structured documents like LaTeX or SGML, binaries PKGFILES_CSWtexlive-xindy-binaries += $(docdir)/$(CATALOGNAME_CSWtexlive-xindy-binaries)/.* -PKGFILES_CSWtexlive-xindy-binaries += /opt/csw//bin/tex2xindy -RUNTIME_DEP_PKGS_CSWtexlive-xindy-binaries += CSWclisp -RUNTIME_DEP_PKGS_CSWtexlive-xindy-binaries += CSWtexlive-common -RUNTIME_DEP_PKGS_CSWtexlive-xindy-binaries += CSWtexlive-xindy-binaries-binary +PKGFILES_CSWtexlive-xindy-binaries += /opt/csw/bin/tex2xindy include gar/category.mk @@ -4948,6 +5233,162 @@ cd $(DESTDIR)/$(prefix) && gfind . -type f | xargs ggrep -n '^#![[:space:]]*.*/sh[[:space:]]*' /dev/null | ggrep -v '/env ' | ggrep ':1:' | cut -d : -f 1 | xargs -l -i gsed --in-place --regexp-extended --expression 's;^#![[:space:]]*.*/sh[[:space:]]*;#!/usr/bin/env bash ;' {} $(MAKECOOKIE) +REINPLACE_WHEN_USRLOCAL = postinstall +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/generic/tds/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/fonts/concrete/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/bin/dvips +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/bin/luatex +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/bin/mktexlsr +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/bin/pdftex +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/bin/pdftosrc +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/bin/xdvi-xaw +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/bin/xetex +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/include/kpathsea/types.h +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/info/kpathsea.info +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/info/web2c.info +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/man/man1/texmfstart.1 +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/man/man1/xdvi.1 +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phaip.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phcpc.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phiaea.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phjcp.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phnf.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phnflet.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phpf.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phppcf.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phreport.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phrmp.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/plainyr.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/abbrvhtml.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/alphahtml.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/alphahtmldate.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/alphahtmldater.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/plainhtml.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/plainhtmldate.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/plainhtmldater.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/unsrthtml.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/urlbst/abbrvurl.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/urlbst/alphaurl.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/urlbst/plainurl.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/urlbst/unsrturl.bst +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/bibtex/urlbst/Makefile.in +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/fonts/concmath-fonts/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/fonts/fontname/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/MES-Conformance/mes-list-expand.pl +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/fonts/tipa/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/fonts/tipa/mktipapk.sh +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/fonts/tipa/mkxipapk.sh +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/fonts/tipa/tipaman1.tex +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/fonts/wsuipa/compilefonts +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/aiaa/pre2004/aiaa.dtx +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/confproc/buildpapers.sh +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/confproc/example/buildpapers.sh +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/cweb-latex/examples/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/emp/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/latexdiff/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/latexdiff/contrib/latexdiff.spec +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/listings-ext/listings-ext.mk +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/mathspic/mathspic.sh +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/montex/mfinput/bithe/testfont.sh +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/montex/testfont.sh +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/pdfcprot/Makefile.unx +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/plain/js-misc/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/support/lua-alt-getopt/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/support/pedigree-perl/Pedigree/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/avantgar/pagdc8z.vf +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/avantgar/pagkc8z.vf +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/bookman/pbkdc8z.vf +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/bookman/pbklc8z.vf +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/courier/pcrbc8u.vf +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/courier/pcrrc8u.vf +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/helvetic/phvbc8z.vf +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/helvetic/phvrc8z.vf +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/ncntrsbk/pncbc8z.vf +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/ncntrsbk/pncrv8z.vf +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/palatino/pplbc8z.vf +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/palatino/pplrc8z.vf +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/times/ptmbc8z.vf +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/times/ptmrc8z.vf +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/metafont/misc/modes.mf +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/scripts/context/ruby/texmfstart.rb +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/scripts/fragmaster/fragmaster.pl +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/scripts/latexmk/latexmk.pl +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/scripts/pax/pdfannotextractor.pl +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/scripts/pdfjam/pdfjam +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/scripts/purifyeps/purifyeps +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/scripts/xetex/perl/xdv2pdf_mergemarks +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/fonts/berenisadf/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/fonts/blacklettert1/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/captcont/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/circ/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/concmath/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/crossword/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/esk/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/feynmf/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/footnpag/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/frankenstein/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/koma-script/Makefile.baseinit +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/mcite/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/mflogo/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/plari/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/plweb/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/qsymbols/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/rcs/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/rcs/src/test/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/subfigure/Makefile +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/tex/latex/base/ltxcheck.tex +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/tex/latex/base/texsys.cfg +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/doc/info/tds.info +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/doc/info/web2c.info +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/doc/man/man1/install-tl.1 +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/doc/man/man1/latexmk.1 +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/doc/man/man1/pdfjam.1 +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/doc/man/man1/texmfstart.1 +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/doc/man/man1/xdvi.1 +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/dvipdfm/config/config-win32 +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/dvipdfmx/dvipdfmx.cfg +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/scripts/simpdftex/simpdftex +REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/web2c/texmf.cnf + +REINPLACE_WHEN_USRshare = postinstall +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/tex/latex/susy/susy.sty +REINPLACE_USRSHARE += /usr/share|root/opt/csw/bin/luatex +REINPLACE_USRSHARE += /usr/share|root/opt/csw/bin/pdftex +REINPLACE_USRSHARE += /usr/share|root/opt/csw/bin/pdftosrc +REINPLACE_USRSHARE += /usr/share|root/opt/csw/bin/xetex +REINPLACE_USRSHARE += /usr/share|root/opt/csw/include/kpathsea/paths.h +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/info/dvips.info +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/man/man1/chktex.1 +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/man/man1/chkweb.1 +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/bibtex/bst/minitoc/en-mtc.bst +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/latex/bigints/Makefile +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/latex/dashundergaps/doc/tex/Makefile +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/latex/disser/Makefile +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/latex/disser/templates/Makefile +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/latex/listings-ext/listings-ext.mk +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/latex/pdfcprot/Makefile.unx +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/latex/plantslabels/doc/tex/Makefile +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/latex/turnthepage/Makefile +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/otherformats/jadetex/base/Makefile +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/scripts/bundledoc/arlatex +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/scripts/fragmaster/fragmaster.pl +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/scripts/pax/pdfannotextractor.pl +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/scripts/pdfjam/pdfjam +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/scripts/purifyeps/purifyeps +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/source/latex/koma-script/Makefile.baseinit +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/source/latex/sf298/Makefile +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/source/latex/subfig/Makefile +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/doc/info/dvips.info +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/doc/info/eplain.info +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/doc/man/man1/arlatex.1 +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/doc/man/man1/chktex.1 +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/doc/man/man1/chkweb.1 +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/doc/man/man1/pdfjam.1 +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/doc/man/man1/purifyeps.1 +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/texconfig/v/vt100 +REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/web2c/texmf.cnf +REINPLACE_USRSHARE += /usr/local|root/opt/csw/share/texmf-dist/doc/generic/epsf/Makefile + # the texlive-common package is bigger than a trivially sized /tmp pre-package: mkdir -p $(SPKG_TMPDIR) 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 Dec 26 18:40:42 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 Dec 2012 17:40:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[19965] csw/mgar/pkg/doxygen/trunk Message-ID: Revision: 19965 http://gar.svn.sourceforge.net/gar/?rev=19965&view=rev Author: dmichelsen Date: 2012-12-26 17:40:38 +0000 (Wed, 26 Dec 2012) Log Message: ----------- doxygen/trunk: Update to 1.8.3 Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile csw/mgar/pkg/doxygen/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/doxygen/trunk/files/0001-Cannot-cast-0-to-QCString.patch Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2012-12-26 16:08:51 UTC (rev 19964) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2012-12-26 17:40:38 UTC (rev 19965) @@ -1,5 +1,5 @@ NAME = doxygen -VERSION = 1.8.2 +VERSION = 1.8.3 GARTYPE = v2 DESCRIPTION = A documentation system for programming languages @@ -11,10 +11,6 @@ MASTER_SITES = http://ftp.stack.nl/pub/users/dimitri/ DISTFILES = $(DISTNAME).src.tar.gz -# Use patch until this is fixed: -# https://bugzilla.gnome.org/show_bug.cgi?id=670853 -PATCHFILES += 0001-Cannot-cast-0-to-QCString.patch - VENDOR_URL = http://www.stack.nl/~dimitri/doxygen/ LICENSE = LICENSE Modified: csw/mgar/pkg/doxygen/trunk/checksums =================================================================== --- csw/mgar/pkg/doxygen/trunk/checksums 2012-12-26 16:08:51 UTC (rev 19964) +++ csw/mgar/pkg/doxygen/trunk/checksums 2012-12-26 17:40:38 UTC (rev 19965) @@ -1 +1 @@ -ac77157d7051e5f2b82c749c498a17ae doxygen-1.8.2.src.tar.gz +7004085a39217b4848e26ee726b3c9a7 doxygen-1.8.3.src.tar.gz Deleted: csw/mgar/pkg/doxygen/trunk/files/0001-Cannot-cast-0-to-QCString.patch =================================================================== --- csw/mgar/pkg/doxygen/trunk/files/0001-Cannot-cast-0-to-QCString.patch 2012-12-26 16:08:51 UTC (rev 19964) +++ csw/mgar/pkg/doxygen/trunk/files/0001-Cannot-cast-0-to-QCString.patch 2012-12-26 17:40:38 UTC (rev 19965) @@ -1,34 +0,0 @@ -From 628dfba31d353378e2a5ff90aaf10187dfe212a2 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Sat, 11 Aug 2012 16:32:40 +0200 -Subject: [PATCH] Cannot cast 0 to QCString - ---- - src/filedef.cpp | 4 ++-- - 1 Datei ge?ndert, 2 Zeilen hinzugef?gt(+), 2 Zeilen entfernt(-) - -diff --git a/src/filedef.cpp b/src/filedef.cpp -index dd9f125..36efc27 100644 ---- a/src/filedef.cpp -+++ b/src/filedef.cpp -@@ -807,7 +807,7 @@ void FileDef::writeSource(OutputList &ol) - { - startFile(ol,getSourceFileBase(),0,pageTitle,HLI_FileVisible, - !generateTreeView, -- !isDocFile && genSourceFile ? 0 : getOutputFileBase()); -+ !isDocFile && genSourceFile ? QCString() : getOutputFileBase()); - if (!generateTreeView) - { - getDirDef()->writeNavigationPath(ol); -@@ -820,7 +820,7 @@ void FileDef::writeSource(OutputList &ol) - else - { - startFile(ol,getSourceFileBase(),0,pageTitle,HLI_FileVisible,FALSE, -- !isDocFile && genSourceFile ? 0 : getOutputFileBase()); -+ !isDocFile && genSourceFile ? QCString() : getOutputFileBase()); - startTitle(ol,getSourceFileBase()); - ol.parseText(title); - endTitle(ol,getSourceFileBase(),0); --- -1.7.10.3 - 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 Dec 27 12:23:31 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 27 Dec 2012 11:23:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[19966] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 19966 http://gar.svn.sourceforge.net/gar/?rev=19966&view=rev Author: bonivart Date: 2012-12-27 11:23:30 +0000 (Thu, 27 Dec 2012) Log Message: ----------- sendmail/trunk: update to 8.14.6 Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile csw/mgar/pkg/sendmail/trunk/checksums Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2012-12-26 17:40:38 UTC (rev 19965) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2012-12-27 11:23:30 UTC (rev 19966) @@ -1,9 +1,9 @@ # $Id$ # TODO -# - Build separate 9/10 packages? # - One big "mta" switch in alternatives between sendmail/postfix +# + Build separate 9/10 packages? -> build only 5.10 # + add symlink from /etc/opt/csw/mail/cf to /opt/csw/share/sendmail/cf/cf # + add ostype solaris9csw.m4 # + add sendmail.mc in cf dir @@ -31,7 +31,7 @@ # + #4150 Sendmail 8.14.4 released -> this is 8.14.5 NAME = sendmail -VERSION = 8.14.5 +VERSION = 8.14.6 GARTYPE = v2 DESCRIPTION = Sendmail MTA @@ -52,6 +52,8 @@ LICENSE = LICENSE +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + PACKAGES = CSWsendmail CATALOGNAME_CSWsendmail = sendmail SPKG_DESC_CSWsendmail = $(DESCRIPTION) Modified: csw/mgar/pkg/sendmail/trunk/checksums =================================================================== --- csw/mgar/pkg/sendmail/trunk/checksums 2012-12-26 17:40:38 UTC (rev 19965) +++ csw/mgar/pkg/sendmail/trunk/checksums 2012-12-27 11:23:30 UTC (rev 19966) @@ -1 +1 @@ -02ccfc331cc81ed00ec8bb5ecfc69018 sendmail.8.14.5.tar.gz +9eeed3d1baecbf4e17d829d2ec005553 sendmail.8.14.6.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 Thu Dec 27 17:12:38 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 27 Dec 2012 16:12:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[19967] csw/mgar/pkg/bind/trunk Message-ID: Revision: 19967 http://gar.svn.sourceforge.net/gar/?rev=19967&view=rev Author: bonivart Date: 2012-12-27 16:12:37 +0000 (Thu, 27 Dec 2012) Log Message: ----------- bind/trunk: update to 9.9.2-P1 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2012-12-27 11:23:30 UTC (rev 19966) +++ csw/mgar/pkg/bind/trunk/Makefile 2012-12-27 16:12:37 UTC (rev 19967) @@ -2,8 +2,8 @@ # owner/group for device files? (root:sys) NAME = bind -VERSION = 9.8.4 -#VERSION = 9.9.0 +#VERSION = 9.8.4 +VERSION = 9.9.2 GARTYPE = v2 # Enable these for Px-releases @@ -63,12 +63,15 @@ RUNTIME_DEP_PKGS_CSWlibbind += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWlibbind += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWlibbind += CSWlibgcc-s1 PACKAGES += CSWbindutils CATALOGNAME_CSWbindutils = bind_utils SPKG_DESC_CSWbindutils = ISC BIND DNS utilities package RUNTIME_DEP_PKGS_CSWbindutils = CSWlibbind RUNTIME_DEP_PKGS_CSWbindutils += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWbindutils += CSWlibreadline6 PACKAGES += CSWbindchroot CATALOGNAME_CSWbindchroot = bind_chroot @@ -76,6 +79,8 @@ RUNTIME_DEP_PKGS_CSWbindchroot = CSWbind ARCHALL_CSWbindchroot = 1 +GARCOMPILER = GNU + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libtool CONFIGURE_ARGS += --with-openssl=/opt/csw @@ -115,12 +120,12 @@ CHECKPKG_OVERRIDES_CSWbindutils += catalogname-does-not-match-pkgname|pkgname=CSWbindutils|catalogname=bind_utils|expected-catalogname=bindutils CHECKPKG_OVERRIDES_CSWbindchroot += catalogname-does-not-match-pkgname|pkgname=CSWbindchroot|catalogname=bind_chroot|expected-catalogname=bindchroot # Will not split out all these libs -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.80.0.7|soname=libbind9.so.80|pkgname=CSWlibbind|expected=CSWlibbind9-80 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.88.1.1|soname=libdns.so.88|pkgname=CSWlibbind|expected=CSWlibdns88 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.84.1.0|soname=libisc.so.84|pkgname=CSWlibbind|expected=CSWlibisc84 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.80.0.2|soname=libisccc.so.80|pkgname=CSWlibbind|expected=CSWlibisccc80 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.82.0.3|soname=libisccfg.so.82|pkgname=CSWlibbind|expected=CSWlibisccfg82 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.80.0.3|soname=liblwres.so.80|pkgname=CSWlibbind|expected=CSWliblwres80 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.90.0.1|soname=liblwres.so.90|pkgname=CSWlibbind|expected=CSWliblwres90 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.90.0.2|soname=libisccfg.so.90|pkgname=CSWlibbind|expected=CSWlibisccfg90 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.90.0.2|soname=libisccc.so.90|pkgname=CSWlibbind|expected=CSWlibisccc90 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.92.1.0|soname=libisc.so.92|pkgname=CSWlibbind|expected=CSWlibisc92 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.95.1.1|soname=libdns.so.95|pkgname=CSWlibbind|expected=CSWlibdns95 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.90.0.5|soname=libbind9.so.90|pkgname=CSWlibbind|expected=CSWlibbind9-90 include gar/category.mk Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2012-12-27 11:23:30 UTC (rev 19966) +++ csw/mgar/pkg/bind/trunk/checksums 2012-12-27 16:12:37 UTC (rev 19967) @@ -1 +1 @@ -08b5fc744c58cadbecf06c38db7cae36 bind-9.8.4-P1.tar.gz +44b9d1feb11de09811160775f94c2554 bind-9.9.2-P1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Dec 27 17:41:20 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 27 Dec 2012 16:41:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[19968] csw/mgar/pkg/texlive/trunk/doIt Message-ID: Revision: 19968 http://gar.svn.sourceforge.net/gar/?rev=19968&view=rev Author: pfelecan Date: 2012-12-27 16:41:20 +0000 (Thu, 27 Dec 2012) Log Message: ----------- for reference Added Paths: ----------- csw/mgar/pkg/texlive/trunk/doIt Added: csw/mgar/pkg/texlive/trunk/doIt =================================================================== --- csw/mgar/pkg/texlive/trunk/doIt (rev 0) +++ csw/mgar/pkg/texlive/trunk/doIt 2012-12-27 16:41:20 UTC (rev 19968) @@ -0,0 +1,3 @@ +#! /usr/bin/env bash +mgar platforms < /dev/null > ~/logs/texlive 2>&1 +exit $? Property changes on: csw/mgar/pkg/texlive/trunk/doIt ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Dec 27 18:30:04 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 27 Dec 2012 17:30:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[19969] csw/mgar/pkg/texlive/trunk Message-ID: Revision: 19969 http://gar.svn.sourceforge.net/gar/?rev=19969&view=rev Author: pfelecan Date: 2012-12-27 17:30:03 +0000 (Thu, 27 Dec 2012) Log Message: ----------- texlive/trunk: ignore nohup.out file Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/texlive/trunk/ Property changes on: csw/mgar/pkg/texlive/trunk ___________________________________________________________________ Modified: svn:ignore - work + work nohup.out Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-12-27 16:41:20 UTC (rev 19968) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-12-27 17:30:03 UTC (rev 19969) @@ -139,6 +139,8 @@ EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/doc/latex/cweb-latex/examples/compare/wcltx.log EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/doc/latex/pstool/example.log EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/doc/latex/nicetext/readprov.log +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf/dvipdfm/config/config-win32 +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/doc/latex/latexdiff/contrib/latexdiff.spec DEBUG_PACKAGING = 1 SPKG_TMPDIR = $(HOME)/ocswtmp @@ -328,6 +330,115 @@ CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docDE.pdf CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docFR.pdf CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.pdf +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/setouterhbox.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdfescape.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/stringenc.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/telprint.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/scrindex.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hypdoc.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/resizegather.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/grfext.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/auxhook.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/transparent.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/ifdraft.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/aliascnt.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/enparen.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/thepdfnumber.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/alphalph.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/zref.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/intcalc.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hypcap.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/ltxcmds.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hycolor.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/stampinclude.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/makerobust.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/stackrel.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/bigintcalc.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pagegrid.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hopatch.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/gettitlestring.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/dvipscol.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/grffile.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/mleftright.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/uniquecounter.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/centernot.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/rotchiffre.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/inputenx.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/colonequals.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/bmpsize.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/atenddvi.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/flags.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdfcol.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/twoopt.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/ifpdf.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/atveryend.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/rerunfilecheck.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/classlist.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/catchfile.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdflscape.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/kvdefinekeys.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/attachfile2.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/epstopdf.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/ifluatex.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/listingsutf8.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdfrender.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/picture.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hyphsubst.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/bookmark.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hypbmsec.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/tabularht.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hypgotoe.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/tabularkv.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hypdestopt.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/eolgrab.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/fibnum.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/kvoptions.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/iflang.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hobsub.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/holtxdoc.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/atbegshi.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/refcount.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/askinclude.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/selinput.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/magicnum.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/letltxmacro.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/settobox.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hologo.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/soulutf8.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/chemarr.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/luatex.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/bitset.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pagesel.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/accsupp.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/engord.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/ifvtex.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/infwarerr.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/protecteddef.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/luacolor.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/embedfile.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/etexcmds.dtx +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/tipa/tipaman1.tex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/wsuipa/compilefonts +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/concmath-fonts/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/lua-alt-getopt/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/scripts/fragmaster/fragmaster.pl +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/mflogo/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/concmath/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/qsymbols/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/bigints/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/plantslabels/doc/tex/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/dashundergaps/doc/tex/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/turnthepage/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/scripts/bundledoc/arlatex +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/scripts/fragmaster/fragmaster.pl PACKAGES += CSWtexlive-dev CATALOGNAME_CSWtexlive-dev += texlive_dev @@ -340,6 +451,7 @@ CHECKPKG_OVERRIDES_CSWtexlive-dev += archall-devel-package RUNTIME_DEP_PKGS_CSWtexlive-dev += CSWlibkpathsea6 RUNTIME_DEP_PKGS_CSWtexlive-dev += CSWlibptexenc1 +CHECKPKG_OVERRIDES_CSWtexlive-dev += file-with-bad-content|/usr/local|root/opt/csw/include/kpathsea/types.h PACKAGES += CSWlibkpathsea6 CATALOGNAME_CSWlibkpathsea6 = libkpathsea6 @@ -458,6 +570,10 @@ CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/hyph-utf8/hyphenation-distribution.tex CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/enctex/INSTALL CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/enctex/INSTALL.eng +CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/texconfig/v/vt100 +CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/metafont/misc/modes.mf +CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/web2c/texmf.cnf +CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/web2c/texmf.cnf PACKAGES += CSWtexlive-bibtex-extra CATALOGNAME_CSWtexlive-bibtex-extra = texlive_bibtex_extra @@ -561,6 +677,29 @@ ARCHALL_CSWtexlive-bibtex-extra = 1 RUNTIME_DEP_PKGS_CSWtexlive-bibtex-extra += CSWtexlive-common CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/bibtex/bibhtml/bibhtml.html +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phnflet.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/plainyr.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phpf.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phppcf.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phcpc.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phaip.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phjcp.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phrmp.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phreport.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phiaea.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phnf.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/urlbst/alphaurl.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/urlbst/unsrturl.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/urlbst/plainurl.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/urlbst/abbrvurl.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/unsrthtml.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/plainhtml.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/alphahtmldater.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/plainhtmldate.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/alphahtmldate.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/alphahtml.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/plainhtmldater.bst +CHECKPKG_OVERRIDES_CSWtexlive-bibtex-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/abbrvhtml.bst PACKAGES += CSWtexlive-binaries CATALOGNAME_CSWtexlive-binaries = texlive_binaries @@ -761,6 +900,7 @@ RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibpng15-15 RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibxpm4 +CHECKPKG_OVERRIDES_CSWtexlive-binaries += file-with-bad-content|/usr/local|root/opt/csw/bin/dvips PACKAGES += CSWtexlive-doc-base CATALOGNAME_CSWtexlive-doc-base = texlive_doc_base @@ -1146,6 +1286,8 @@ CHECKPKG_OVERRIDES_CSWtexlive-extra-utils += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/pkfix-helper/README CHECKPKG_OVERRIDES_CSWtexlive-extra-utils += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/pkfix/README CHECKPKG_OVERRIDES_CSWtexlive-extra-utils += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/pdfcrop/README +CHECKPKG_OVERRIDES_CSWtexlive-extra-utils += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/listings-ext/listings-ext.mk +CHECKPKG_OVERRIDES_CSWtexlive-extra-utils += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/listings-ext/listings-ext.mk PACKAGES += CSWtexlive-font-utils CATALOGNAME_CSWtexlive-font-utils = texlive_font_utils @@ -1958,6 +2100,20 @@ PKGFILES_CSWtexlive-fonts-recommended += /opt/csw/share/texmf-dist/tex/plain/rsfs/.* PKGFILES_CSWtexlive-fonts-recommended += /opt/csw/share/texmf-dist/tex/plain/wasy/.* ARCHALL_CSWtexlive-fonts-recommended = 1 +CHECKPKG_OVERRIDES_CSWtexlive-fonts-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/palatino/pplrc8z.vf +CHECKPKG_OVERRIDES_CSWtexlive-fonts-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/bookman/pbklc8z.vf +CHECKPKG_OVERRIDES_CSWtexlive-fonts-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/palatino/pplbc8z.vf +CHECKPKG_OVERRIDES_CSWtexlive-fonts-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/helvetic/phvrc8z.vf +CHECKPKG_OVERRIDES_CSWtexlive-fonts-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/helvetic/phvbc8z.vf +CHECKPKG_OVERRIDES_CSWtexlive-fonts-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/avantgar/pagdc8z.vf +CHECKPKG_OVERRIDES_CSWtexlive-fonts-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/avantgar/pagkc8z.vf +CHECKPKG_OVERRIDES_CSWtexlive-fonts-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/times/ptmbc8z.vf +CHECKPKG_OVERRIDES_CSWtexlive-fonts-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/times/ptmrc8z.vf +CHECKPKG_OVERRIDES_CSWtexlive-fonts-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/courier/pcrbc8u.vf +CHECKPKG_OVERRIDES_CSWtexlive-fonts-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/courier/pcrrc8u.vf +CHECKPKG_OVERRIDES_CSWtexlive-fonts-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/ncntrsbk/pncbc8z.vf +CHECKPKG_OVERRIDES_CSWtexlive-fonts-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/ncntrsbk/pncrv8z.vf +CHECKPKG_OVERRIDES_CSWtexlive-fonts-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/bookman/pbkdc8z.vf PACKAGES += CSWtexlive-fonts-recommended-doc CATALOGNAME_CSWtexlive-fonts-recommended-doc = texlive_fonts_recommended_doc @@ -2696,7 +2852,6 @@ PKGFILES_CSWtexlive-lang-tibetan += /opt/csw/share/texmf-dist/fonts/source/public/otibet/.* PKGFILES_CSWtexlive-lang-tibetan += /opt/csw/share/texmf-dist/fonts/tfm/public/ctib/.* PKGFILES_CSWtexlive-lang-tibetan += /opt/csw/share/texmf-dist/fonts/tfm/public/otibet/.* -PKGFILES_CSWtexlive-lang-tibetan += /opt/csw/share/texmf-dist/omega/otp/otibet/.* PKGFILES_CSWtexlive-lang-tibetan += /opt/csw/share/texmf-dist/tex/latex/ctib/.* PKGFILES_CSWtexlive-lang-tibetan += /opt/csw/share/texmf-dist/tex/latex/otibet/.* ARCHALL_CSWtexlive-lang-tibetan = 1 @@ -2797,6 +2952,7 @@ CHECKPKG_OVERRIDES_CSWtexlive-latex-base += surplus-dependency|CSWtexlive-latex-base-binaries CHECKPKG_OVERRIDES_CSWtexlive-latex-base += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/tex/context/base/colo-x11.mkii CHECKPKG_OVERRIDES_CSWtexlive-latex-base += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/tex/context/base/colo-imp-x11.mkiv +CHECKPKG_OVERRIDES_CSWtexlive-latex-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/tex/latex/base/ltxcheck.tex PACKAGES += CSWtexlive-latex-base-binaries CATALOGNAME_CSWtexlive-latex-base-binaries = texlive_latex_base_binaries @@ -3517,6 +3673,8 @@ RUNTIME_DEP_PKGS_CSWtexlive-latex-extra += CSWtexlive-latex-extra-binaries CHECKPKG_OVERRIDES_CSWtexlive-latex-extra += surplus-dependency|CSWtexlive-latex-extra-binaries ARCHALL_CSWtexlive-latex-extra = 1 +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/bibtex/bst/minitoc/en-mtc.bst +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/scripts/pax/pdfannotextractor.pl PACKAGES += CSWtexlive-latex-extra-binaries CATALOGNAME_CSWtexlive-latex-extra-binaries = texlive_latex_extra_binaries @@ -4112,6 +4270,8 @@ CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/pax/README CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/pdfcprot/INSTALL.txt CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/texshade/tsfaq.tex +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/pdfcprot/Makefile.unx +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/pdfcprot/Makefile.unx PACKAGES += CSWtexlive-latex-recommended CATALOGNAME_CSWtexlive-latex-recommended = texlive_latex_recommended @@ -4167,6 +4327,8 @@ PKGFILES_CSWtexlive-latex-recommended += /opt/csw/share/texmf-dist/tex/plain/fp/.* ARCHALL_CSWtexlive-latex-recommended = 1 RUNTIME_DEP_PKGS_CSWtexlive-latex-recommended += CSWperl +CHECKPKG_OVERRIDES_CSWtexlive-latex-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/koma-script/Makefile.baseinit +CHECKPKG_OVERRIDES_CSWtexlive-latex-recommended += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/koma-script/Makefile.baseinit PACKAGES += CSWtexlive-latex-recommended-doc CATALOGNAME_CSWtexlive-latex-recommended-doc = texlive_latex_recommended_doc @@ -4324,6 +4486,7 @@ ARCHALL_CSWtexlive-math-extra = 1 RUNTIME_DEP_PKGS_CSWtexlive-math-extra += CSWtexlive-binaries CHECKPKG_OVERRIDES_CSWtexlive-math-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/amstex/base/amstinst.tex +CHECKPKG_OVERRIDES_CSWtexlive-math-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/concrete/Makefile PACKAGES += CSWtexlive-metapost CATALOGNAME_CSWtexlive-metapost = texlive_metapost @@ -4371,7 +4534,6 @@ PKGFILES_CSWtexlive-music += /opt/csw/bin/m-tx PKGFILES_CSWtexlive-music += /opt/csw/bin/musixflx PKGFILES_CSWtexlive-music += /opt/csw/bin/musixtex -PKGFILES_CSWtexlive-music += /opt/csw/bin/prepmx PKGFILES_CSWtexlive-music += /opt/csw/share/texmf-dist/doc/latex/abc/.* PKGFILES_CSWtexlive-music += /opt/csw/share/texmf-dist/doc/latex/gchords/.* PKGFILES_CSWtexlive-music += /opt/csw/share/texmf-dist/doc/latex/guitar/guitar.tex @@ -4582,6 +4744,7 @@ CATALOGNAME_CSWtexlive-pstricks = texlive_pstricks SPKG_DESC_CSWtexlive-pstricks += $(DESCRIPTION), pstricks OBSOLETED_BY_CSWtexlive-pstricks = CSWtetex +OBSOLETED_BY_CSWtexlive-pstricks += CSWtex-pdftricks PKGFILES_CSWtexlive-pstricks += $(docdir)/$(CATALOGNAME_CSWtexlive-pstricks)/.* PKGFILES_CSWtexlive-pstricks += /opt/csw/bin/pedigree PKGFILES_CSWtexlive-pstricks += /opt/csw/bin/pst2pdf @@ -4991,6 +5154,7 @@ CHECKPKG_OVERRIDES_CSWtexlive-publishers-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/IEEEconf/README CHECKPKG_OVERRIDES_CSWtexlive-publishers-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/revtex/README CHECKPKG_OVERRIDES_CSWtexlive-publishers-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/bibtex/economic/aer-cje-ex.tex +CHECKPKG_OVERRIDES_CSWtexlive-publishers-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/aiaa/pre2004/aiaa.dtx PACKAGES += CSWtexlive-science CATALOGNAME_CSWtexlive-science = texlive_science @@ -5139,10 +5303,8 @@ PKGFILES_CSWtexlive-xindy += $(docdir)/$(CATALOGNAME_CSWtexlive-xindy)/.* PKGFILES_CSWtexlive-xindy += /opt/csw//bin/texindy PKGFILES_CSWtexlive-xindy += /opt/csw//bin/xindy -PKGFILES_CSWtexlive-xindy += /opt/csw/bin/tex2xindy PKGFILES_CSWtexlive-xindy += /opt/csw/bin/xindy PKGFILES_CSWtexlive-xindy += /opt/csw/bin/xindy.mem -PKGFILES_CSWtexlive-xindy += /opt/csw/share/man/man1/tex2xindy.1 PKGFILES_CSWtexlive-xindy += /opt/csw/share/man/man1/texindy.1 PKGFILES_CSWtexlive-xindy += /opt/csw/share/man/man1/xindy.1 PKGFILES_CSWtexlive-xindy += /opt/csw/share/share/texmf/scripts/xindy/texindy.pl @@ -5162,6 +5324,7 @@ SPKG_DESC_CSWtexlive-xindy-binaries += $(DESCRIPTION), index generator for structured documents like LaTeX or SGML, binaries PKGFILES_CSWtexlive-xindy-binaries += $(docdir)/$(CATALOGNAME_CSWtexlive-xindy-binaries)/.* PKGFILES_CSWtexlive-xindy-binaries += /opt/csw/bin/tex2xindy +PKGFILES_CSWtexlive-xindy-binaries += /opt/csw/share/man/man1/tex2xindy.1 include gar/category.mk @@ -5349,6 +5512,21 @@ REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/dvipdfmx/dvipdfmx.cfg REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/scripts/simpdftex/simpdftex REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/web2c/texmf.cnf +REINPLACE_USRLOCAL += /opt/csw/share/man/man1/xdvi.1 +REINPLACE_USRLOCAL += /opt/csw/share/man/man1/texmfstart.1 +REINPLACE_USRLOCAL += /opt/csw/share/info/web2c.info +REINPLACE_USRLOCAL += /opt/csw/share/info/kpathsea.info +REINPLACE_USRLOCAL += /opt/csw/share/texmf/doc/info/tds.info +REINPLACE_USRLOCAL += /opt/csw/share/texmf/doc/info/web2c.info +REINPLACE_USRLOCAL += /opt/csw/share/texmf/doc/man/man1/latexmk.1 +REINPLACE_USRLOCAL += /opt/csw/share/texmf/doc/man/man1/pdfjam.1 +REINPLACE_USRLOCAL += /opt/csw/share/texmf/doc/man/man1/xdvi.1 +REINPLACE_USRLOCAL += /opt/csw/share/texmf/doc/man/man1/install-tl.1 +REINPLACE_USRLOCAL += /opt/csw/share/texmf/doc/man/man1/texmfstart.1 +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/scripts/pax/pdfannotextractor.pl +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/scripts/purifyeps/purifyeps +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/scripts/context/ruby/texmfstart.rb +REINPLACE_USRLOCAL += /opt/csw/share/texmf/dvipdfmx/dvipdfmx.cfg REINPLACE_WHEN_USRshare = postinstall REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/tex/latex/susy/susy.sty @@ -5388,6 +5566,17 @@ REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/texconfig/v/vt100 REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/web2c/texmf.cnf REINPLACE_USRSHARE += /usr/local|root/opt/csw/share/texmf-dist/doc/generic/epsf/Makefile +REINPLACE_USRSHARE += /opt/csw/share/man/man1/chkweb.1 +REINPLACE_USRSHARE += /opt/csw/share/man/man1/chktex.1 +REINPLACE_USRSHARE += /opt/csw/share/info/dvips.info +REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/info/eplain.info +REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/info/dvips.info +REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/man/man1/pdfjam.1 +REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/man/man1/chktex.1 +REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/man/man1/purifyeps.1 +REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/man/man1/chkweb.1 +REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/man/man1/arlatex.1 +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/scripts/purifyeps/purifyeps # the texlive-common package is bigger than a trivially sized /tmp pre-package: 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 Dec 27 18:47:31 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 27 Dec 2012 17:47:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[19970] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 19970 http://gar.svn.sourceforge.net/gar/?rev=19970&view=rev Author: wahwah Date: 2012-12-27 17:47:30 +0000 (Thu, 27 Dec 2012) Log Message: ----------- pkgdb-web: Don't crash on missing release The process was getting restarted on the server anyway, but it's cleaner to serve a 404 instead. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-12-27 17:30:03 UTC (rev 19969) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-12-27 17:47:30 UTC (rev 19970) @@ -378,8 +378,11 @@ def GET(self, catrel_name, arch_name, osrel_name, catalogname): """Get a srv4 reference by catalog ane catalogname.""" configuration.SetUpSqlobjectConnection() - sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad( - osrel_name, arch_name, catrel_name) + try: + sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad( + osrel_name, arch_name, catrel_name) + except sqlobject.main.SQLObjectNotFound: + raise web.notfound() join = [ sqlbuilder.INNERJOINOn(None, models.Srv4FileInCatalog, @@ -401,7 +404,7 @@ web.header('Access-Control-Allow-Origin', '*') return cjson.encode(data) except sqlobject.main.SQLObjectNotFound: - return cjson.encode(None) + raise web.notfound() except sqlobject.dberrors.OperationalError, e: raise web.internalerror(e) 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 Dec 27 18:48:16 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 27 Dec 2012 17:48:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[19971] csw/mgar/gar/v2/lib/python/catalog_gc.py Message-ID: Revision: 19971 http://gar.svn.sourceforge.net/gar/?rev=19971&view=rev Author: wahwah Date: 2012-12-27 17:48:16 +0000 (Thu, 27 Dec 2012) Log Message: ----------- catalog-gc: Bugfix and update usage info Modified Paths: -------------- csw/mgar/gar/v2/lib/python/catalog_gc.py Modified: csw/mgar/gar/v2/lib/python/catalog_gc.py =================================================================== --- csw/mgar/gar/v2/lib/python/catalog_gc.py 2012-12-27 17:47:30 UTC (rev 19970) +++ csw/mgar/gar/v2/lib/python/catalog_gc.py 2012-12-27 17:48:16 UTC (rev 19971) @@ -1,16 +1,25 @@ #!/opt/csw/bin/python2.6 -"""Garbage-collecting for a catalog. +"""Garbage-collecting for the catalog tree. The allpkgs directory may contain unused files. They should be deleted. """ +import logging import optparse -import logging import os.path +import pipes import re import common_constants +USAGE = """%prog --catalog-tree /home/mirror/opencsw-official > gc_01.sh +less gc_01.sh + +# Looks good? + +bash gc_01.sh +""" + class Error(Exception): """Base error.""" @@ -20,7 +29,7 @@ class CatalogGarbageCollector(object): - ADDITIONAL_CATALOGS = ("legacy") + ADDITIONAL_CATALOGS = ("legacy",) def __init__(self, d): logging.debug("CatalogGarbageCollector(%s)", repr(d)) @@ -53,21 +62,21 @@ l = catalogs_by_files.setdefault(p, []) l.append((catrel, arch, osrel_short)) for p in allpkgs.difference(files_in_catalogs): - logging.debug("File %s is not used by any catalogs.", p) - print "rm %s/%s" % (allpkgs_path, p) + print "rm", pipes.quote(os.path.join(allpkgs_path, p)) def main(): parser = optparse.OptionParser() - parser.add_option("-c", "--catalog", - dest="catalog", - help="Catalog path") + parser.add_option("--catalog-tree", + dest="catalog_tree", + help=("Path to the catalog tree, that is the directory " + "containing subdirectories unstable, testing, etc.")) options, args = parser.parse_args() logging.basicConfig(level=logging.DEBUG) - if not options.catalog: + if not options.catalog_tree: parser.print_usage() - raise UsageError("Missing catalog option, see --help.") - gcg = CatalogGarbageCollector(options.catalog) + raise UsageError("Missing the catalog tree option, see --help.") + gcg = CatalogGarbageCollector(options.catalog_tree) gcg.GarbageCollect() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Dec 28 19:49:14 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 28 Dec 2012 18:49:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[19972] csw/mgar/pkg/texlive/trunk Message-ID: Revision: 19972 http://gar.svn.sourceforge.net/gar/?rev=19972&view=rev Author: pfelecan Date: 2012-12-28 18:49:14 +0000 (Fri, 28 Dec 2012) Log Message: ----------- texlive/trunk: patched the internal poppler mess --- 2 instances, no less! Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/texlive/trunk/files/0006-Fix-internal-poppler-library-paths.patch csw/mgar/pkg/texlive/trunk/files/0007-Fix-internal-poppler-library-paths-second-instance.patch Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-12-27 17:48:16 UTC (rev 19971) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-12-28 18:49:14 UTC (rev 19972) @@ -30,6 +30,8 @@ PATCHFILES += 0003-Adapt-texmf-configuration.patch PATCHFILES += 0004-Activate-formats.patch PATCHFILES += 0005-Fix-dvi2tty-buffer-overflow.patch +PATCHFILES += 0006-Fix-internal-poppler-library-paths.patch +PATCHFILES += 0007-Fix-internal-poppler-library-paths-second-instance.patch PACKAGING_PLATFORMS = solaris10-sparc PACKAGING_PLATFORMS += solaris10-i386 @@ -887,6 +889,8 @@ PKGFILES_CSWtexlive-binaries += /opt/csw/bin/xmltex RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWgs +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWgsfonts +CHECKPKG_OVERRIDES_CSWtexlive-binaries += surplus-dependency|CSWgsfonts RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWtexlive-common RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibgd2 RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibptexenc1 Added: csw/mgar/pkg/texlive/trunk/files/0006-Fix-internal-poppler-library-paths.patch =================================================================== --- csw/mgar/pkg/texlive/trunk/files/0006-Fix-internal-poppler-library-paths.patch (rev 0) +++ csw/mgar/pkg/texlive/trunk/files/0006-Fix-internal-poppler-library-paths.patch 2012-12-28 18:49:14 UTC (rev 19972) @@ -0,0 +1,31 @@ +From d0ee28d1e61f2177f0eaacb65e898eee7524dacd Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Fri, 28 Dec 2012 16:06:46 +0100 +Subject: [PATCH] Fix internal poppler library paths + +to use Open CSW provide GhostScript fonts; remove all the other +alternatives (maybe not the best option...) +--- + libs/xpdf/xpdf-3.03/xpdf/GlobalParams.cc | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/libs/xpdf/xpdf-3.03/xpdf/GlobalParams.cc b/libs/xpdf/xpdf-3.03/xpdf/GlobalParams.cc +index 0189784..9117ec1 100644 +--- a/libs/xpdf/xpdf-3.03/xpdf/GlobalParams.cc ++++ b/libs/xpdf/xpdf-3.03/xpdf/GlobalParams.cc +@@ -119,11 +119,7 @@ static const char *displayFontDirs[] = { + }; + #else + static const char *displayFontDirs[] = { +- "/usr/share/ghostscript/fonts", +- "/usr/local/share/ghostscript/fonts", +- "/usr/share/fonts/default/Type1", +- "/usr/share/fonts/default/ghostscript", +- "/usr/share/fonts/type1/gsfonts", ++ "/opt/csw/share/ghostscript/fonts", + NULL + }; + #endif +-- +1.7.12 + Added: csw/mgar/pkg/texlive/trunk/files/0007-Fix-internal-poppler-library-paths-second-instance.patch =================================================================== --- csw/mgar/pkg/texlive/trunk/files/0007-Fix-internal-poppler-library-paths-second-instance.patch (rev 0) +++ csw/mgar/pkg/texlive/trunk/files/0007-Fix-internal-poppler-library-paths-second-instance.patch 2012-12-28 18:49:14 UTC (rev 19972) @@ -0,0 +1,31 @@ +From f2b820ad643577177bac7a89f093cc57d8f21ded Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Fri, 28 Dec 2012 18:56:13 +0100 +Subject: [PATCH] Fix internal poppler library paths - second instance + +to use Open CSW provide GhostScript fonts; remove all the other +alternatives (maybe not the best option...) +--- + libs/poppler/poppler-0.20.0/poppler/GlobalParams.cc | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/libs/poppler/poppler-0.20.0/poppler/GlobalParams.cc b/libs/poppler/poppler-0.20.0/poppler/GlobalParams.cc +index 64d6133..5054c96 100644 +--- a/libs/poppler/poppler-0.20.0/poppler/GlobalParams.cc ++++ b/libs/poppler/poppler-0.20.0/poppler/GlobalParams.cc +@@ -1370,11 +1370,7 @@ static struct { + }; + + static const char *displayFontDirs[] = { +- "/usr/share/ghostscript/fonts", +- "/usr/local/share/ghostscript/fonts", +- "/usr/share/fonts/default/Type1", +- "/usr/share/fonts/default/ghostscript", +- "/usr/share/fonts/type1/gsfonts", ++ "/opt/csw/share/ghostscript/fonts", + NULL + }; + +-- +1.7.12 + 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 Dec 29 11:43:31 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 29 Dec 2012 10:43:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[19973] csw/mgar/gar/v2/lib/python/rest.py Message-ID: Revision: 19973 http://gar.svn.sourceforge.net/gar/?rev=19973&view=rev Author: wahwah Date: 2012-12-29 10:43:30 +0000 (Sat, 29 Dec 2012) Log Message: ----------- pkgdb: A new function get the list of catalogs Modified Paths: -------------- csw/mgar/gar/v2/lib/python/rest.py Modified: csw/mgar/gar/v2/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2/lib/python/rest.py 2012-12-28 18:49:14 UTC (rev 19972) +++ csw/mgar/gar/v2/lib/python/rest.py 2012-12-29 10:43:30 UTC (rev 19973) @@ -74,10 +74,18 @@ "maintainer_email": pkg["maintainer_email"], } + def GetCatalogList(self): + url = self.rest_url + self.PKGDB_APP + "/catalogs/" + data = urllib2.urlopen(url).read() + return cjson.decode(data) + def GetCatalog(self, catrel, arch, osrel): if not catrel: raise ArgumentError("Missing catalog release.") - url = self.rest_url + self.PKGDB_APP + "/catalogs/%s/%s/%s/?quick=true" % (catrel, arch, osrel) + url = ( + self.rest_url + + self.PKGDB_APP + + "/catalogs/%s/%s/%s/?quick=true" % (catrel, arch, osrel)) logging.debug("GetCatalog(): GET %s", url) try: data = urllib2.urlopen(url).read() 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 Dec 29 11:44:10 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 29 Dec 2012 10:44:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[19974] csw/mgar/gar/v2/lib/python/common_constants.py Message-ID: Revision: 19974 http://gar.svn.sourceforge.net/gar/?rev=19974&view=rev Author: wahwah Date: 2012-12-29 10:44:09 +0000 (Sat, 29 Dec 2012) Log Message: ----------- pkgdb: Adding kiel to DEFAULT_CATALOG_RELEASES Ideally, this variable should not be used, and the RESTful interface should be used instead. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/common_constants.py Modified: csw/mgar/gar/v2/lib/python/common_constants.py =================================================================== --- csw/mgar/gar/v2/lib/python/common_constants.py 2012-12-29 10:43:30 UTC (rev 19973) +++ csw/mgar/gar/v2/lib/python/common_constants.py 2012-12-29 10:44:09 UTC (rev 19974) @@ -73,6 +73,7 @@ 'dublin', 'unstable', 'legacy', + 'kiel', ]) # At some point, it was used to prevent people from linking against 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 Dec 29 11:44:25 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 29 Dec 2012 10:44:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[19975] csw/mgar/gar/v2/lib/python/catalog_gc.py Message-ID: Revision: 19975 http://gar.svn.sourceforge.net/gar/?rev=19975&view=rev Author: wahwah Date: 2012-12-29 10:44:25 +0000 (Sat, 29 Dec 2012) Log Message: ----------- catalog-gc: Multiple fixes - More logging - Getting the catalog list from via REST - Moving files to another directory instead of unlinking Modified Paths: -------------- csw/mgar/gar/v2/lib/python/catalog_gc.py Modified: csw/mgar/gar/v2/lib/python/catalog_gc.py =================================================================== --- csw/mgar/gar/v2/lib/python/catalog_gc.py 2012-12-29 10:44:09 UTC (rev 19974) +++ csw/mgar/gar/v2/lib/python/catalog_gc.py 2012-12-29 10:44:25 UTC (rev 19975) @@ -7,17 +7,21 @@ import logging import optparse -import os.path +import os import pipes import re import common_constants +import rest -USAGE = """%prog --catalog-tree /home/mirror/opencsw-official > gc_01.sh +USAGE = """%prog --catalog-tree /home/mirror/opencsw-official --dest_dir /home/mirror/gc > gc_01.sh less gc_01.sh # Looks good? bash gc_01.sh + +If everything is fine (catalog still generates, no files are missing that are +necessary), you can remove files from /home/mirror/gc. """ class Error(Exception): @@ -31,9 +35,10 @@ ADDITIONAL_CATALOGS = ("legacy",) - def __init__(self, d): + def __init__(self, d, dest_dir): logging.debug("CatalogGarbageCollector(%s)", repr(d)) self.catalog_dir = d + self.dest_dir = dest_dir def GarbageCollect(self): allpkgs_path = os.path.join(self.catalog_dir, "allpkgs") @@ -42,9 +47,15 @@ catalogs_by_files = {} for p in os.listdir(allpkgs_path): allpkgs.add(p) - catalogs_to_check = ( - tuple(common_constants.DEFAULT_CATALOG_RELEASES) - + self.ADDITIONAL_CATALOGS) + catalogs_to_check = tuple(common_constants.DEFAULT_CATALOG_RELEASES) + catalogs_to_check += self.ADDITIONAL_CATALOGS + rest_client = rest.RestClient() + catalog_triplet_list = rest_client.GetCatalogList() + catalogs_to_check += tuple(set([x[2] for x in catalog_triplet_list])) + catalogs_to_check = tuple(set(catalogs_to_check)) + logging.info("Collecting packages from catalogs: %s", + catalogs_to_check) + file_sizes = {} for catrel in catalogs_to_check: for arch in common_constants.PHYSICAL_ARCHITECTURES: for osrel_long in common_constants.OS_RELS: @@ -58,11 +69,25 @@ for p in os.listdir(catalog_path): if pkg_re.search(p): # It's a package + full_path = os.path.join(catalog_path, p) files_in_catalogs.add(p) l = catalogs_by_files.setdefault(p, []) l.append((catrel, arch, osrel_short)) - for p in allpkgs.difference(files_in_catalogs): - print "rm", pipes.quote(os.path.join(allpkgs_path, p)) + if full_path not in file_sizes: + s = os.stat(full_path) + file_sizes[full_path] = s.st_size + logging.info( + "Collected from %r, found references to %d files (out of %d in allpkgs)", + catrel, len(files_in_catalogs), len(allpkgs)) + to_remove = allpkgs.difference(files_in_catalogs) + logging.debug("Collecting file sizes.") + total_size = sum(os.stat(os.path.join(allpkgs_path, x)).st_size + for x in to_remove) + logging.info("Found %d packages to remove, total size: %.1fMB.", + len(to_remove), float(total_size) / 1024 ** 2) + for p in to_remove: + full_path = os.path.join(allpkgs_path, p) + print "mv", pipes.quote(full_path), pipes.quote(self.dest_dir) def main(): @@ -71,12 +96,15 @@ dest="catalog_tree", help=("Path to the catalog tree, that is the directory " "containing subdirectories unstable, testing, etc.")) + parser.add_option("--dest-dir", + dest="dest_dir", + help=("Move files out to this catalog.")) options, args = parser.parse_args() logging.basicConfig(level=logging.DEBUG) - if not options.catalog_tree: + if not options.catalog_tree or not options.dest_dir: parser.print_usage() raise UsageError("Missing the catalog tree option, see --help.") - gcg = CatalogGarbageCollector(options.catalog_tree) + gcg = CatalogGarbageCollector(options.catalog_tree, options.dest_dir) gcg.GarbageCollect() 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 Dec 29 11:44:41 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 29 Dec 2012 10:44:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[19976] csw/mgar/gar/v2/lib/python/rest.py Message-ID: Revision: 19976 http://gar.svn.sourceforge.net/gar/?rev=19976&view=rev Author: wahwah Date: 2012-12-29 10:44:40 +0000 (Sat, 29 Dec 2012) Log Message: ----------- pkgdb: Removed old comments Modified Paths: -------------- csw/mgar/gar/v2/lib/python/rest.py Modified: csw/mgar/gar/v2/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2/lib/python/rest.py 2012-12-29 10:44:25 UTC (rev 19975) +++ csw/mgar/gar/v2/lib/python/rest.py 2012-12-29 10:44:40 UTC (rev 19976) @@ -192,10 +192,6 @@ http_code, c.getinfo(pycurl.EFFECTIVE_URL)) c.close() - # if self.debug: - # logging.debug("*** Headers") - # logging.debug(h.getvalue()) - # logging.debug("*** Data") if http_code >= 400 and http_code <= 599: if not self.debug: # In debug mode, all headers are printed to screen, and we aren't This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Dec 29 13:06:39 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 29 Dec 2012 12:06:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[19977] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 19977 http://gar.svn.sourceforge.net/gar/?rev=19977&view=rev Author: rthurner Date: 2012-12-29 12:06:37 +0000 (Sat, 29 Dec 2012) Log Message: ----------- subversion: add category again as mgar complains otherwise. upgrade to svn-1.7.8 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2012-12-29 10:44:40 UTC (rev 19976) +++ csw/mgar/pkg/subversion/trunk/Makefile 2012-12-29 12:06:37 UTC (rev 19977) @@ -20,8 +20,9 @@ # http://subversion.apache.org/mailing-lists.html NAME = subversion -VERSION = 1.7.7 +VERSION = 1.7.8 GARTYPE = v2 +CATEGORIES = apps DESCRIPTION = Version control rethought define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Sat Dec 29 13:21:55 2012 From: dam at opencsw.org (Dagobert Michelsen) Date: Sat, 29 Dec 2012 13:21:55 +0100 Subject: [csw-devel] SF.net SVN: gar:[19977] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: References: Message-ID: Hi Rupert, Am 29.12.2012 um 13:06 schrieb rthurner at users.sourceforge.net: > Revision: 19977 > http://gar.svn.sourceforge.net/gar/?rev=19977&view=rev > Author: rthurner > Date: 2012-12-29 12:06:37 +0000 (Sat, 29 Dec 2012) > Log Message: > ----------- > subversion: add category again as mgar complains otherwise. upgrade to svn-1.7.8 What is the mgar complaint? It should not be necessary to add a category. Best regards -- Dago > > Modified Paths: > -------------- > csw/mgar/pkg/subversion/trunk/Makefile > > Modified: csw/mgar/pkg/subversion/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/subversion/trunk/Makefile 2012-12-29 10:44:40 UTC (rev 19976) > +++ csw/mgar/pkg/subversion/trunk/Makefile 2012-12-29 12:06:37 UTC (rev 19977) > @@ -20,8 +20,9 @@ > # http://subversion.apache.org/mailing-lists.html > > NAME = subversion > -VERSION = 1.7.7 > +VERSION = 1.7.8 > GARTYPE = v2 > +CATEGORIES = apps > > DESCRIPTION = Version control rethought > define BLURB > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 From bonivart at opencsw.org Sat Dec 29 13:36:36 2012 From: bonivart at opencsw.org (Peter Bonivart) Date: Sat, 29 Dec 2012 13:36:36 +0100 Subject: [csw-devel] SF.net SVN: gar:[19977] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: References: Message-ID: On Sat, Dec 29, 2012 at 1:21 PM, Dagobert Michelsen wrote: > Hi Rupert, > > Am 29.12.2012 um 13:06 schrieb rthurner at users.sourceforge.net: > >> Revision: 19977 >> http://gar.svn.sourceforge.net/gar/?rev=19977&view=rev >> Author: rthurner >> Date: 2012-12-29 12:06:37 +0000 (Sat, 29 Dec 2012) >> Log Message: >> ----------- >> subversion: add category again as mgar complains otherwise. upgrade to svn-1.7.8 > > What is the mgar complaint? It should not be necessary to add a category. Maybe he hasn't updated gar in a long time? Rupert, try "mgar up". /peter From wahwah at users.sourceforge.net Sat Dec 29 14:04:43 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 29 Dec 2012 13:04:43 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[645] buildfarm/bin/opencsw-future-update Message-ID: Revision: 645 http://opencsw.svn.sourceforge.net/opencsw/?rev=645&view=rev Author: wahwah Date: 2012-12-29 13:04:40 +0000 (Sat, 29 Dec 2012) Log Message: ----------- opencsw-future-update: Remove comments Modified Paths: -------------- buildfarm/bin/opencsw-future-update Modified: buildfarm/bin/opencsw-future-update =================================================================== --- buildfarm/bin/opencsw-future-update 2012-11-26 09:31:21 UTC (rev 644) +++ buildfarm/bin/opencsw-future-update 2012-12-29 13:04:40 UTC (rev 645) @@ -10,13 +10,7 @@ ${BASE_DIR}/sync-mirror ${BASE_DIR}/sync-checkpkg -# Current is no longer synced from the official mirror. -# ${BASE_DIR}/sync-current-in-opencsw-future -# I'm suspending the snapshots, because they take up space and make -# pushes slow. Snapshots should be made elsewhere. -# ${BASE_DIR}/make-snapshot-README - # Generating unstable. ${BASE_DIR}/generate-unstable ${BASE_DIR}/link-toplevel-pkgutil 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 Dec 29 14:05:04 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 29 Dec 2012 13:05:04 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[646] buildfarm/bin/opencsw-future-update Message-ID: Revision: 646 http://opencsw.svn.sourceforge.net/opencsw/?rev=646&view=rev Author: wahwah Date: 2012-12-29 13:05:03 +0000 (Sat, 29 Dec 2012) Log Message: ----------- opencsw-future-update: Allow only one instance Modified Paths: -------------- buildfarm/bin/opencsw-future-update Modified: buildfarm/bin/opencsw-future-update =================================================================== --- buildfarm/bin/opencsw-future-update 2012-12-29 13:04:40 UTC (rev 645) +++ buildfarm/bin/opencsw-future-update 2012-12-29 13:05:03 UTC (rev 646) @@ -8,6 +8,16 @@ declare -r BASE_DIR=$(dirname $0) +readonly lockpath=/var/tmp/catalog-generation.lock + +if ! mkdir "${lockpath}"; then + echo "'${lockpath}' is locked, '$0' is exiting." + exit 1 +fi + +trap "rm -f \"${lockpath}\"/pid; rmdir \"${lockpath}\"; exit 0" 1 2 3 5 6 15 ERR +echo $$ > "${lockpath}/pid" + ${BASE_DIR}/sync-mirror ${BASE_DIR}/sync-checkpkg @@ -18,3 +28,6 @@ ${BASE_DIR}/send-catalog-update-notifications echo "$0 completed successfully" + +rm -f "${lockpath}/pid" +rmdir "${lockpath}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Dec 29 15:15:47 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 29 Dec 2012 14:15:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[19978] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 19978 http://gar.svn.sourceforge.net/gar/?rev=19978&view=rev Author: rthurner Date: 2012-12-29 14:15:44 +0000 (Sat, 29 Dec 2012) Log Message: ----------- subversion: remove category after mgar upgrade. checksums for svn-1.7.8 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2012-12-29 12:06:37 UTC (rev 19977) +++ csw/mgar/pkg/subversion/trunk/Makefile 2012-12-29 14:15:44 UTC (rev 19978) @@ -22,7 +22,6 @@ NAME = subversion VERSION = 1.7.8 GARTYPE = v2 -CATEGORIES = apps DESCRIPTION = Version control rethought define BLURB Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2012-12-29 12:06:37 UTC (rev 19977) +++ csw/mgar/pkg/subversion/trunk/checksums 2012-12-29 14:15:44 UTC (rev 19978) @@ -1 +1 @@ -5a42b7d0f1366a8d60f9ad7d5890295d subversion-1.7.7.tar.bz2 +454b9f398415c3504435bf8c3f6ed127 subversion-1.7.8.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 30 12:49:29 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 30 Dec 2012 11:49:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[19979] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 19979 http://gar.svn.sourceforge.net/gar/?rev=19979&view=rev Author: rthurner Date: 2012-12-30 11:49:28 +0000 (Sun, 30 Dec 2012) Log Message: ----------- subversion: correct checkpkg errors Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2012-12-29 14:15:44 UTC (rev 19978) +++ csw/mgar/pkg/subversion/trunk/Makefile 2012-12-30 11:49:28 UTC (rev 19979) @@ -54,11 +54,9 @@ RUNTIME_DEP_PKGS_CSWsvn += CSWlibexpat1 RUNTIME_DEP_PKGS_CSWsvn += CSWlibz1 RUNTIME_DEP_PKGS_CSWsvn += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWsvn += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWsvn += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWsvn += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWsvn += CSWlibneon27 -RUNTIME_DEP_PKGS_CSWsvn += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWsvn += CSWlibgnome-keyring0 RUNTIME_DEP_PKGS_CSWsvn += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWsvn += CSWlibglib2-0-0 @@ -76,13 +74,7 @@ PKGFILES_CSWap2svn += $(docdir)/$(CATALOGNAME_CSWap2svn)/changelog.CSW RUNTIME_DEP_PKGS_CSWap2svn = CSWsvn RUNTIME_DEP_PKGS_CSWap2svn += CSWapache2 -RUNTIME_DEP_PKGS_CSWap2svn += CSWlibmagic1 -RUNTIME_DEP_PKGS_CSWap2svn += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWap2svn += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWap2svn += CSWlibz1 -RUNTIME_DEP_PKGS_CSWap2svn += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWap2svn += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWap2svn += CSWbdb48 RUNTIME_DEP_PKGS_CSWap2svn += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWap2svn += CSWlibaprutil1-0 CHECKPKG_OVERRIDES_CSWap2svn += catalogname-does-not-match-pkgname|pkgname=CSWap2svn|catalogname=ap2_subversion|expected-catalogname=ap2svn @@ -93,18 +85,8 @@ CATALOGNAME_CSWjavasvn = javasvn PKGFILES_CSWjavasvn = $(SVNLIB)/.*java.* PKGFILES_CSWjavasvn += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW -RUNTIME_DEP_PKGS_CSWjavasvn += CSWbdb48 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibapr1-0 -RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibaprutil1-0 -RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibmagic1 -RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibneon27 -RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibz1 -RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSWjavasvn += CSWsvn CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 @@ -120,23 +102,8 @@ PKGFILES_CSWpmsvn += $(docdir)/$(CATALOGNAME_CSWpmsvn)/changelog.CSW RUNTIME_DEP_PKGS_CSWpmsvn += CSWperl RUNTIME_DEP_PKGS_CSWpmsvn += CSWsvn -RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibmagic1 -RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibz1 -RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibintl8 RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibapr1-0 -RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibaprutil1-0 -RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibsqlite3-0 CHECKPKG_OVERRIDES_CSWpmsvn += catalogname-does-not-match-pkgname|pkgname=CSWpmsvn|catalogname=pm_subversion|expected-catalogname=pmsvn -CHECKPKG_OVERRIDES_CSWpmsvn += binary-architecture-does-not-match-placement|file=opt/csw/lib/svn/libsvn_swig_perl-1.so.0.0.0|arch_id=18|arch_name=sparcv8+ -CHECKPKG_OVERRIDES_CSWpmsvn += binary-architecture-does-not-match-placement|file=opt/csw/lib/perl/site_perl/auto/SVN/_Repos/_Repos.so|arch_id=18|arch_name=sparcv8+ -CHECKPKG_OVERRIDES_CSWpmsvn += binary-architecture-does-not-match-placement|file=opt/csw/lib/perl/site_perl/auto/SVN/_Ra/_Ra.so|arch_id=18|arch_name=sparcv8+ -CHECKPKG_OVERRIDES_CSWpmsvn += binary-architecture-does-not-match-placement|file=opt/csw/lib/perl/site_perl/auto/SVN/_Fs/_Fs.so|arch_id=18|arch_name=sparcv8+ -CHECKPKG_OVERRIDES_CSWpmsvn += binary-architecture-does-not-match-placement|file=opt/csw/lib/perl/site_perl/auto/SVN/_Wc/_Wc.so|arch_id=18|arch_name=sparcv8+ -CHECKPKG_OVERRIDES_CSWpmsvn += binary-architecture-does-not-match-placement|file=opt/csw/lib/perl/site_perl/auto/SVN/_Core/_Core.so|arch_id=18|arch_name=sparcv8+ -CHECKPKG_OVERRIDES_CSWpmsvn += binary-architecture-does-not-match-placement|file=opt/csw/lib/perl/site_perl/auto/SVN/_Client/_Client.so|arch_id=18|arch_name=sparcv8+ -CHECKPKG_OVERRIDES_CSWpmsvn += binary-architecture-does-not-match-placement|file=opt/csw/lib/perl/site_perl/auto/SVN/_Delta/_Delta.so|arch_id=18|arch_name=sparcv8+ PACKAGES += CSWrbsvn @@ -147,19 +114,9 @@ PKGFILES_CSWrbsvn += $(docdir)/$(CATALOGNAME_CSWrbsvn)/changelog.CSW RUNTIME_DEP_PKGS_CSWrbsvn += CSWsvn RUNTIME_DEP_PKGS_CSWrbsvn += CSWruby -RUNTIME_DEP_PKGS_CSWrbsvn += CSWbdb48 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibapr1-0 -RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibaprutil1-0 -RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibmagic1 -RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibneon27 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibruby18-1 -RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibz1 -RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibsasl2-2 PACKAGES += CSWpythonsvn @@ -169,19 +126,8 @@ PKGFILES_CSWpythonsvn += $(SVNLIB)/python.* PKGFILES_CSWpythonsvn += $(SVNLIB)/.*swig_py.* PKGFILES_CSWpythonsvn += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibmagic1 -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibz1 -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibintl8 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsvn -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWbdb48 -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibaprutil1-0 -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibneon27 -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWpython This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sun Dec 30 20:46:18 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sun, 30 Dec 2012 19:46:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[19980] csw/mgar/pkg/texlive/trunk Message-ID: Revision: 19980 http://gar.svn.sourceforge.net/gar/?rev=19980&view=rev Author: pfelecan Date: 2012-12-30 19:46:17 +0000 (Sun, 30 Dec 2012) Log Message: ----------- texlive/trunk: solved the salient "file-with-bad-content" stanzas Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/texlive/trunk/files/0008-Add-CSW-prefix-to-groff-fonts-configuration.patch csw/mgar/pkg/texlive/trunk/files/0009-Fix-pdfjam-configuration-path.patch Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-12-30 11:49:28 UTC (rev 19979) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-12-30 19:46:17 UTC (rev 19980) @@ -32,6 +32,8 @@ PATCHFILES += 0005-Fix-dvi2tty-buffer-overflow.patch PATCHFILES += 0006-Fix-internal-poppler-library-paths.patch PATCHFILES += 0007-Fix-internal-poppler-library-paths-second-instance.patch +PATCHFILES += 0008-Add-CSW-prefix-to-groff-fonts-configuration.patch +PATCHFILES += 0009-Fix-pdfjam-configuration-path.patch PACKAGING_PLATFORMS = solaris10-sparc PACKAGING_PLATFORMS += solaris10-i386 @@ -441,6 +443,8 @@ CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/turnthepage/Makefile CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/scripts/bundledoc/arlatex CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/scripts/fragmaster/fragmaster.pl +# I don't know what to do with this: +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/scripts/latexmk/latexmk.pl PACKAGES += CSWtexlive-dev CATALOGNAME_CSWtexlive-dev += texlive_dev @@ -454,6 +458,7 @@ RUNTIME_DEP_PKGS_CSWtexlive-dev += CSWlibkpathsea6 RUNTIME_DEP_PKGS_CSWtexlive-dev += CSWlibptexenc1 CHECKPKG_OVERRIDES_CSWtexlive-dev += file-with-bad-content|/usr/local|root/opt/csw/include/kpathsea/types.h +CHECKPKG_OVERRIDES_CSWtexlive-dev += file-with-bad-content|/usr/share|root/opt/csw/include/kpathsea/paths.h PACKAGES += CSWlibkpathsea6 CATALOGNAME_CSWlibkpathsea6 = libkpathsea6 @@ -2762,6 +2767,8 @@ PKGFILES_CSWtexlive-lang-mongolian += /opt/csw/share/texmf-dist/tex/latex/montex/.* RUNTIME_DEP_PKGS_CSWtexlive-lang-mongolian += CSWperl ARCHALL_CSWtexlive-lang-mongolian = 1 +CHECKPKG_OVERRIDES_CSWtexlive-lang-mongolian += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/montex/mfinput/bithe/testfont.sh +CHECKPKG_OVERRIDES_CSWtexlive-lang-mongolian += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/montex/testfont.sh PACKAGES += CSWtexlive-lang-polish CATALOGNAME_CSWtexlive-lang-polish = texlive_lang_polish @@ -4491,6 +4498,7 @@ RUNTIME_DEP_PKGS_CSWtexlive-math-extra += CSWtexlive-binaries CHECKPKG_OVERRIDES_CSWtexlive-math-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/amstex/base/amstinst.tex CHECKPKG_OVERRIDES_CSWtexlive-math-extra += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/concrete/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-math-extra += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/tex/latex/susy/susy.sty PACKAGES += CSWtexlive-metapost CATALOGNAME_CSWtexlive-metapost = texlive_metapost @@ -5330,6 +5338,39 @@ PKGFILES_CSWtexlive-xindy-binaries += /opt/csw/bin/tex2xindy PKGFILES_CSWtexlive-xindy-binaries += /opt/csw/share/man/man1/tex2xindy.1 +# TODO verify and validate if needed; this is a merged, package wise, +# list of overrides: +CHECKPKG_OVERRIDES_CSWtexlive-lang-cyrillic += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/disser/templates/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-lang-cyrillic += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/disser/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-metapost-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/emp/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-doc-en += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/tds/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-latex-extra-doc += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cweb-latex/examples/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/subfig/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/sf298/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/otherformats/jadetex/base/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/footnpag/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/feynmf/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/esk/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/frankenstein/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/plweb/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/crossword/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/plari/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/rcs/src/test/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/rcs/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/subfigure/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/captcont/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/circ/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/mcite/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/fonts/berenisadf/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/fonts/blacklettert1/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/pedigree-perl/Pedigree/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/plain/js-misc/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/bibtex/urlbst/Makefile.in +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/latexdiff/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/tipa/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-generic-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/fontname/Makefile +CHECKPKG_OVERRIDES_CSWtexlive-generic-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/epsf/Makefile + include gar/category.mk PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH) @@ -5398,6 +5439,10 @@ cd $(DESTDIR)/$(prefix) && gfind . -type f | xargs ggrep -n '^#![[:space:]]*.*/perl[[:space:]]*' /dev/null | ggrep -v '/env ' | ggrep ':1:' | cut -d : -f 1 | xargs -l -i gsed --in-place --regexp-extended --expression 's;^#![[:space:]]*.*/perl[[:space:]]*;#!/usr/bin/env perl ;' {} : Bourne Shell cd $(DESTDIR)/$(prefix) && gfind . -type f | xargs ggrep -n '^#![[:space:]]*.*/sh[[:space:]]*' /dev/null | ggrep -v '/env ' | ggrep ':1:' | cut -d : -f 1 | xargs -l -i gsed --in-place --regexp-extended --expression 's;^#![[:space:]]*.*/sh[[:space:]]*;#!/usr/bin/env bash ;' {} + : patch postinstallation files being too expansive to patch in the classic way + gsed --in-place 's;^cmbase=cmbase.mf$;/opt/csw/share/texmf-dist/fonts/source/public/cm/cmbase.mf;' $(DESTDIR)/opt/csw/share/texmf-dist/doc/fonts/tipa/mktipapk.sh $(DESTDIR)/opt/csw/share/texmf-dist/doc/fonts/tipa/mkxipapk.sh + gsed --in-place 's;^LATEXPATH="/usr/texbin/" # TeXLive$;LATEXPATH="/opt/csw/bin/" # TeXLive;' $(DESTDIR)/opt/csw/share/texmf-dist/doc/latex/confproc/example/buildpapers.sh + gsed --in-place 's;/usr/local/teTeX/share/texmf.local/scripts/xetex/perl/lib/PDF/Reuse.pm;/opt/csw/share/texmf-dist/scripts/xetex/perl/lib/PDF/Reuse.pm;' $(DESTDIR)/opt/csw/share/texmf-dist/scripts/xetex/perl/xdv2pdf_mergemarks $(MAKECOOKIE) REINPLACE_WHEN_USRLOCAL = postinstall @@ -5531,6 +5576,11 @@ REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/scripts/purifyeps/purifyeps REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/scripts/context/ruby/texmfstart.rb REINPLACE_USRLOCAL += /opt/csw/share/texmf/dvipdfmx/dvipdfmx.cfg +REINPLACE_USRLOCAL += /opt/csw/share/texmf/scripts/simpdftex/simpdftex +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/latex/mathspic/mathspic.sh +# until finding a better way: +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/MES-Conformance/mes-list-expand.pl +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/latex/confproc/example/buildpapers.sh REINPLACE_WHEN_USRshare = postinstall REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/tex/latex/susy/susy.sty Added: csw/mgar/pkg/texlive/trunk/files/0008-Add-CSW-prefix-to-groff-fonts-configuration.patch =================================================================== --- csw/mgar/pkg/texlive/trunk/files/0008-Add-CSW-prefix-to-groff-fonts-configuration.patch (rev 0) +++ csw/mgar/pkg/texlive/trunk/files/0008-Add-CSW-prefix-to-groff-fonts-configuration.patch 2012-12-30 19:46:17 UTC (rev 19980) @@ -0,0 +1,26 @@ +From dbeab55e6e2605f9307e624fa9781855b98fa2e2 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Sun, 30 Dec 2012 15:56:21 +0100 +Subject: [PATCH] Add CSW prefix to groff fonts configuration + +affect also kpathsea/paths.h +--- + texk/kpathsea/texmf.cnf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/texk/kpathsea/texmf.cnf b/texk/kpathsea/texmf.cnf +index 903f681..052c964 100644 +--- a/texk/kpathsea/texmf.cnf ++++ b/texk/kpathsea/texmf.cnf +@@ -371,7 +371,7 @@ FONTCIDMAPS=.;$TEXMF/fonts/cid// + PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}// + + % Used by DMP (ditroff-to-mpx), called by makempx -troff. +-TRFONTS = /usr{/local,}/share/groff/{current/font,site-font}/devps ++TRFONTS = /{opt/csw,}usr{/local,}/share/groff/{current/font,site-font}/devps + MPSUPPORT = .;$TEXMF/metapost/support + + % For xdvi to find mime.types and .mailcap, if they do not exist in +-- +1.7.12 + Added: csw/mgar/pkg/texlive/trunk/files/0009-Fix-pdfjam-configuration-path.patch =================================================================== --- csw/mgar/pkg/texlive/trunk/files/0009-Fix-pdfjam-configuration-path.patch (rev 0) +++ csw/mgar/pkg/texlive/trunk/files/0009-Fix-pdfjam-configuration-path.patch 2012-12-30 19:46:17 UTC (rev 19980) @@ -0,0 +1,38 @@ +From f3e6cf72b9ad545952a9a7977cb9c72d3b06e034 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Sun, 30 Dec 2012 16:14:53 +0100 +Subject: [PATCH] Fix pdfjam configuration path + +--- + texk/texlive/linked_scripts/pdfjam/pdfjam | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/texk/texlive/linked_scripts/pdfjam/pdfjam b/texk/texlive/linked_scripts/pdfjam/pdfjam +index e12b466..a351e78 100755 +--- a/texk/texlive/linked_scripts/pdfjam/pdfjam ++++ b/texk/texlive/linked_scripts/pdfjam/pdfjam +@@ -20,7 +20,7 @@ version=2.08 + ## The path searched for site-wide configuration files can be set ## + ## by editing the following variable: ## + ## ## +- configpath='/etc:/usr/share/etc:/usr/local/share:/usr/local/etc' ## ++ configpath='/etc/opt/csw:/opt/csw/etc' ## + ## ## + ## Nothing else in this file should need to be changed. ## + ## ## +@@ -140,10 +140,8 @@ prattle "This is pdfjam version ${version}." + ## + ## THESE SETTINGS WILL BE OVER-RIDDEN by any found in configuration + ## files. By default such files are found at any or all of +-## /etc/pdfjam.conf +-## /usr/share/etc/pdfjam.conf +-## /usr/local/share/pdfjam.conf +-## /usr/local/etc/pdfjam.conf ++## /etc/opt/csw/pdfjam.conf ++## /opt/csw/etc/pdfjam.conf + ## $HOME/.pdfjam.conf + ## (And they are read in that order; if a setting is made more than + ## once, the last instance prevails.) +-- +1.7.12 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Dec 31 01:54:48 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 31 Dec 2012 00:54:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[19981] csw/mgar/gar/v2-yann/lib/python/inspective_package. py Message-ID: Revision: 19981 http://gar.svn.sourceforge.net/gar/?rev=19981&view=rev Author: chninkel Date: 2012-12-31 00:54:47 +0000 (Mon, 31 Dec 2012) Log Message: ----------- gar/v2-yann: handles the case where there is no indexes in version section + more elfdump error handling Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/inspective_package.py Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-12-30 19:46:17 UTC (rev 19980) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-12-31 00:54:47 UTC (rev 19981) @@ -266,7 +266,7 @@ # we ignore for now these elfdump errors which can be catched # later by check functions, ignored_error_re = re.compile( - r"""[^:]+:\s\.((SUNW_l)?dynsym|symtab):\s + r"""[^:]+:(\s\.((SUNW_l)?dynsym|symtab):\s (index\[\d+\]:\s (suspicious\s(local|global)\ssymbol\sentry:\s[^:]+:\slies \swithin\s(local|global)\ssymbol\srange\s\(index\s[<>=]+\s\d+\) @@ -277,7 +277,12 @@ |bad\ssymbol\sentry:\s:\sinvalid\sshndx:\s\d+) - |invalid\ssh_link:\s0)\n""", + |invalid\ssh_link:\s0) + + |\smemory\soverlap\sbetween\ssection\[\d+\]:\s[^:]+:\s + [0-9a-f]+:[0-9a-f]+\sand\ssection\[\d+\]:\s[^:]+: + \s[0-9a-f]+:[0-9a-f]+) + \n""", re.VERBOSE) stderr = re.sub(ignored_error_re, "", stderr) @@ -317,9 +322,10 @@ # soname version needed are usually displayed sorted by index ... # but that's not always the case :( so we have to reorder - # the list by index - binary_info['version needed'].sort(key=lambda m: int(m['index'])) - for version in binary_info['version needed']: + # the list by index if they are present + if any ( v['index'] for v in binary_info['version needed'] ): + binary_info['version needed'].sort(key=lambda m: int(m['index'])) + for version in binary_info['version needed']: del version['index'] # if it exists, the first "version definition" entry is the base soname This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Dec 31 02:04:31 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 31 Dec 2012 01:04:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[19982] csw/mgar/gar/v2-yann Message-ID: Revision: 19982 http://gar.svn.sourceforge.net/gar/?rev=19982&view=rev Author: chninkel Date: 2012-12-31 01:04:31 +0000 (Mon, 31 Dec 2012) Log Message: ----------- gar/v2-yann: updated from HEAD Modified Paths: -------------- csw/mgar/gar/v2-yann/bin/cswproto csw/mgar/gar/v2-yann/bin/pathfilter csw/mgar/gar/v2-yann/gar.pkg.mk csw/mgar/gar/v2-yann/lib/python/catalog_gc.py csw/mgar/gar/v2-yann/lib/python/common_constants.py csw/mgar/gar/v2-yann/lib/python/csw_upload_pkg.py csw/mgar/gar/v2-yann/lib/python/csw_upload_pkg_test.py csw/mgar/gar/v2-yann/lib/python/database.py csw/mgar/gar/v2-yann/lib/python/inspective_package.py csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py csw/mgar/gar/v2-yann/lib/python/models.py csw/mgar/gar/v2-yann/lib/python/package.py csw/mgar/gar/v2-yann/lib/python/package_checks.py csw/mgar/gar/v2-yann/lib/python/package_stats.py csw/mgar/gar/v2-yann/lib/python/rest.py csw/mgar/gar/v2-yann/lib/python/sharedlib_utils.py csw/mgar/gar/v2-yann/lib/python/system_pkgmap_test.py csw/mgar/gar/v2-yann/lib/web/pkgdb_web.py csw/mgar/gar/v2-yann/lib/web/releases_web.py csw/mgar/gar/v2-yann/lib/web/templates/CatalogDetail.html Added Paths: ----------- csw/mgar/gar/v2-yann/lib/python/garbage_collection.py Property Changed: ---------------- csw/mgar/gar/v2-yann/ Property changes on: csw/mgar/gar/v2-yann ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678,19287-19753 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-solaris11:18134-18236 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 + /csw/mgar/gar/v2:4936-6678,19234-19981 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-solaris11:18134-18236 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 Modified: csw/mgar/gar/v2-yann/bin/cswproto =================================================================== --- csw/mgar/gar/v2-yann/bin/cswproto 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/bin/cswproto 2012-12-31 01:04:31 UTC (rev 19982) @@ -20,7 +20,7 @@ use POSIX; use vars qw/ - @XFORMS @Common $StdOwn $StdGrp $StdDirPerm $common $stamp $root + @XFORMS $Common $StdOwn $StdGrp $StdDirPerm $common $stamp $root /; # atime=8,mtime=9,ctime=10 @@ -66,15 +66,6 @@ exit 1; } -# Check whether a path is a 'common' file, defined in __DATA__ -sub is_common { - my $path = shift; - foreach my $pat (@Common) { - return 1 if $path =~ m!^$pat$!; - } - return 0; -} - # Returns true if the file should be excluded, false otherwise. sub exclude { my $path = shift; @@ -108,7 +99,7 @@ if( $common ) { # Load common path contents - my %alldirs; + my %alldirs = ('/' => 1); open F, $common || die "Couldn't open $common"; while () { chomp; next if /^\s*$/ or /^#/; @@ -119,7 +110,8 @@ $alldirs{$_} = 1 foreach (@pc); } close F; - @Common = map { qr#$_$# } ('/', keys %alldirs); + my $re = '^(' . join( '|', keys %alldirs ) . ')$'; + $Common = qr /$re/; } my @prototype; @@ -160,7 +152,7 @@ next unless $F[2]; # Then process any excludes - next SPECLINE if( is_common( $F[2] ) ); + next SPECLINE if( $Common && $F[2] =~ /$Common/ ); next if exclude($realpath); # Fix up dir permissions/file ownership. Modified: csw/mgar/gar/v2-yann/bin/pathfilter =================================================================== --- csw/mgar/gar/v2-yann/bin/pathfilter 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/bin/pathfilter 2012-12-31 01:04:31 UTC (rev 19982) @@ -14,6 +14,7 @@ # excluded also. use strict; +use Carp; use Getopt::Long qw(:config no_ignore_case); use Pod::Usage; @@ -53,8 +54,11 @@ push @seltemp, $re; } -my $mre = '^(' . join( '|', @seltemp ) . ')$'; -push @selection, [ $mode, qr/$mre/ ]; +# If @selection_args is empty the @selection must also be empty +if( defined $mode ) { + my $mre = '^(' . join( '|', @seltemp ) . ')$'; + push @selection, [ $mode, qr/$mre/ ]; +} pod2usage(-verbose => 2) if $help; Modified: csw/mgar/gar/v2-yann/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-yann/gar.pkg.mk 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/gar.pkg.mk 2012-12-31 01:04:31 UTC (rev 19982) @@ -31,7 +31,7 @@ # SRCPACKAGE is the name of the package containing the sources ifeq ($(origin PACKAGES), undefined) -PACKAGES = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(NAME)) +PACKAGES = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(subst _,-,$(NAME))) CATALOGNAME ?= $(if $(filter %.gspec,$(DISTFILES)),,$(subst -,_,$(NAME))) SRCPACKAGE_BASE = $(firstword $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES)) SRCPACKAGE ?= $(SRCPACKAGE_BASE)-src @@ -208,7 +208,14 @@ SPKG_SPOOLROOT ?= $(DESTROOT) SPKG_SPOOLDIR ?= $(SPKG_SPOOLROOT)/spool.$(GAROSREL)-$(GARCH) -SPKG_EXPORT ?= $(HOME)/staging/build-$(shell date '+%d.%b.%Y') +ifdef SPKG_EXPORT +# The definition may include variable parts like a call to "date". This would lead to different directory names +# for multiple invocation in longs builds and a failing checkpkg due to lookup in wrong directories, so fixate +# once what we have. +SPKG_EXPORT := $(SPKG_EXPORT) +else +SPKG_EXPORT := $(HOME)/staging/build-$(shell date '+%d.%b.%Y') +endif SPKG_PKGROOT ?= $(PKGROOT) SPKG_PKGBASE ?= $(PKGROOT) SPKG_WORKDIR ?= $(CURDIR)/$(WORKDIR) @@ -216,8 +223,20 @@ SPKG_DEPEND_DB = $(GARDIR)/csw/depend.db -SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg +# These variables could change value transiently and need to be passed to subinvocations of GAR +_PASS_GAR_SUBINVOCATION_EXPORTS += SPKG_EXPORT +_PASS_GAR_ENV = $(foreach V,$(_PASS_GAR_SUBINVOCATION_EXPORTS),$V=$($V)) +# This is the old specification being evaluated during mkpackage. The expansion of the SPKG_REVSTAMP leads to +# problems later on when need the filename for checkpkg again and too much time has passed. In the new approach +# the packagename is directly put in the gspec. +# SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg + +# The filename for a package +define _pkgfile +$(call catalogname,$(1))-$(call pkgvar,SPKG_VERSION,$(1)),$(call pkgvar,SPKG_REVSTAMP,$(1))-$(call pkgvar,SPKG_OSNAME,$(1))-$(if $(or $(ARCHALL),$(ARCHALL_$(1))),all,$(GARCH))-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg +endef + MIGRATECONF ?= $(strip $(foreach S,$(filter-out $(OBSOLETED_PKGS),$(SPKG_SPECS)),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf))) # It is NOT sufficient to change the pathes here, they must be adjusted in merge-* also @@ -314,6 +333,7 @@ # Where we find our mkpackage global templates PKGLIB = $(GARDIR)/pkglib +# These variables are for mkpackage and the gspec expansion PKG_EXPORTS = NAME VERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN PKG_EXPORTS += CURDIR WORKDIR WORKDIR_FIRSTMOD WORKSRC WORKSRC_FIRSTMOD PKGROOT PKG_EXPORTS += SPKG_REVSTAMP SPKG_PKGNAME SPKG_DESC SPKG_VERSION SPKG_CATEGORY @@ -596,6 +616,7 @@ $(_DBG)$(if $(filter $*.gspec,$(DISTFILES)),,\ (echo "%var bitname $(call catalogname,$*)"; \ echo "%var pkgname $*"; \ + echo "%var pkgfile $(call _pkgfile,$*)"; \ $(if $(or $(ARCHALL),$(ARCHALL_$*)),echo "%var arch all";) \ $(if $(_CATEGORY_GSPEC_INCLUDE),echo "%include url file://%{PKGLIB}/$(_CATEGORY_GSPEC_INCLUDE)")) >$@\ ) @@ -949,7 +970,7 @@ @echo @echo "The following packages have been built:" @echo - @$(MAKE) -s GAR_PLATFORM=$(GAR_PLATFORM) _pkgshow + @$(MAKE) -s $(_PASS_GAR_ENV) GAR_PLATFORM=$(GAR_PLATFORM) _pkgshow @echo @$(DONADA) @@ -958,7 +979,7 @@ dirpackage: _package @echo "The following packages have been built:" @echo - @$(MAKE) -s GAR_PLATFORM=$(GAR_PLATFORM) _dirpkgshow + @$(MAKE) -s $(_PASS_GAR_ENV) GAR_PLATFORM=$(GAR_PLATFORM) _dirpkgshow @echo @$(DONADA) @@ -1031,14 +1052,15 @@ _PROPAGATE_ENV += PARALLELMFLAGS _PROPAGATE_ENV += PARALLELMODULATIONS _PROPAGATE_ENV += PATH +_PROPAGATE_ENV += SKIPTEST platforms: _PACKAGING_PLATFORMS=$(if $(ARCHALL),$(firstword $(PACKAGING_PLATFORMS)),$(PACKAGING_PLATFORMS)) platforms: $(foreach P,$(_PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) GAR_PLATFORM=$P _package && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "$(foreach V,$(_PROPAGATE_ENV),$(if $($V),$V=$($V))) $(MAKE) -I $(GARDIR) -C $(CURDIR) GAR_PLATFORM=$P _package" && \ + $(MAKE) $(_PASS_GAR_ENV) GAR_PLATFORM=$P _package && ,\ + $(SSH) -t $(PACKAGING_HOST_$P) "$(foreach V,$(_PROPAGATE_ENV),$(if $($V),$V=$($V))) $(MAKE) -I $(GARDIR) -C $(CURDIR) $(_PASS_GAR_ENV) GAR_PLATFORM=$P _package" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ @@ -1051,9 +1073,9 @@ $(if $(ARCHALL),echo " (suitable for all architectures)\c";) \ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ echo " (built on this host)";\ - $(MAKE) -s GAR_PLATFORM=$P _pkgshow;echo;,\ + $(MAKE) -s $(_PASS_GAR_ENV) GAR_PLATFORM=$P _pkgshow;echo;,\ echo " (built on host '$(PACKAGING_HOST_$P)')";\ - $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -I $(GARDIR) -C $(CURDIR) -s GAR_PLATFORM=$P _pkgshow";echo;\ + $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -I $(GARDIR) -C $(CURDIR) -s $(_PASS_GAR_ENV) GAR_PLATFORM=$P _pkgshow";echo;\ )\ ) @$(MAKECOOKIE) @@ -1063,8 +1085,8 @@ $(foreach P,$(_PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) -s GAR_PLATFORM=$P $* && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -I $(GARDIR) -C $(CURDIR) GAR_PLATFORM=$P $*" && \ + $(MAKE) -s $(_PASS_GAR_ENV) GAR_PLATFORM=$P $* && ,\ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -I $(GARDIR) -C $(CURDIR) $(_PASS_GAR_ENV) GAR_PLATFORM=$P $*" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ Modified: csw/mgar/gar/v2-yann/lib/python/catalog_gc.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/catalog_gc.py 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/lib/python/catalog_gc.py 2012-12-31 01:04:31 UTC (rev 19982) @@ -1,16 +1,29 @@ #!/opt/csw/bin/python2.6 -"""Garbage-collecting for a catalog. +"""Garbage-collecting for the catalog tree. The allpkgs directory may contain unused files. They should be deleted. """ +import logging import optparse -import logging -import os.path +import os +import pipes import re import common_constants +import rest +USAGE = """%prog --catalog-tree /home/mirror/opencsw-official --dest_dir /home/mirror/gc > gc_01.sh +less gc_01.sh + +# Looks good? + +bash gc_01.sh + +If everything is fine (catalog still generates, no files are missing that are +necessary), you can remove files from /home/mirror/gc. +""" + class Error(Exception): """Base error.""" @@ -20,11 +33,12 @@ class CatalogGarbageCollector(object): - ADDITIONAL_CATALOGS = ("current", "stable") + ADDITIONAL_CATALOGS = ("legacy",) - def __init__(self, d): + def __init__(self, d, dest_dir): logging.debug("CatalogGarbageCollector(%s)", repr(d)) self.catalog_dir = d + self.dest_dir = dest_dir def GarbageCollect(self): allpkgs_path = os.path.join(self.catalog_dir, "allpkgs") @@ -33,9 +47,15 @@ catalogs_by_files = {} for p in os.listdir(allpkgs_path): allpkgs.add(p) - catalogs_to_check = ( - tuple(common_constants.DEFAULT_CATALOG_RELEASES) - + self.ADDITIONAL_CATALOGS) + catalogs_to_check = tuple(common_constants.DEFAULT_CATALOG_RELEASES) + catalogs_to_check += self.ADDITIONAL_CATALOGS + rest_client = rest.RestClient() + catalog_triplet_list = rest_client.GetCatalogList() + catalogs_to_check += tuple(set([x[2] for x in catalog_triplet_list])) + catalogs_to_check = tuple(set(catalogs_to_check)) + logging.info("Collecting packages from catalogs: %s", + catalogs_to_check) + file_sizes = {} for catrel in catalogs_to_check: for arch in common_constants.PHYSICAL_ARCHITECTURES: for osrel_long in common_constants.OS_RELS: @@ -49,25 +69,42 @@ for p in os.listdir(catalog_path): if pkg_re.search(p): # It's a package + full_path = os.path.join(catalog_path, p) files_in_catalogs.add(p) l = catalogs_by_files.setdefault(p, []) l.append((catrel, arch, osrel_short)) - for p in allpkgs.difference(files_in_catalogs): - logging.debug("File %s is not used by any catalogs.", p) - print "rm %s/%s" % (allpkgs_path, p) + if full_path not in file_sizes: + s = os.stat(full_path) + file_sizes[full_path] = s.st_size + logging.info( + "Collected from %r, found references to %d files (out of %d in allpkgs)", + catrel, len(files_in_catalogs), len(allpkgs)) + to_remove = allpkgs.difference(files_in_catalogs) + logging.debug("Collecting file sizes.") + total_size = sum(os.stat(os.path.join(allpkgs_path, x)).st_size + for x in to_remove) + logging.info("Found %d packages to remove, total size: %.1fMB.", + len(to_remove), float(total_size) / 1024 ** 2) + for p in to_remove: + full_path = os.path.join(allpkgs_path, p) + print "mv", pipes.quote(full_path), pipes.quote(self.dest_dir) def main(): parser = optparse.OptionParser() - parser.add_option("-c", "--catalog", - dest="catalog", - help="Catalog path") + parser.add_option("--catalog-tree", + dest="catalog_tree", + help=("Path to the catalog tree, that is the directory " + "containing subdirectories unstable, testing, etc.")) + parser.add_option("--dest-dir", + dest="dest_dir", + help=("Move files out to this catalog.")) options, args = parser.parse_args() logging.basicConfig(level=logging.DEBUG) - if not options.catalog: + if not options.catalog_tree or not options.dest_dir: parser.print_usage() - raise UsageError("Missing catalog option, see --help.") - gcg = CatalogGarbageCollector(options.catalog) + raise UsageError("Missing the catalog tree option, see --help.") + gcg = CatalogGarbageCollector(options.catalog_tree, options.dest_dir) gcg.GarbageCollect() Modified: csw/mgar/gar/v2-yann/lib/python/common_constants.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/common_constants.py 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/lib/python/common_constants.py 2012-12-31 01:04:31 UTC (rev 19982) @@ -74,6 +74,7 @@ 'dublin', 'unstable', 'legacy', + 'kiel', ]) # At some point, it was used to prevent people from linking against Modified: csw/mgar/gar/v2-yann/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/csw_upload_pkg.py 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/lib/python/csw_upload_pkg.py 2012-12-31 01:04:31 UTC (rev 19982) @@ -32,28 +32,29 @@ Uploads a set of packages to the unstable catalog in opencsw-future. - When an architecture-independent package is uploaded, it gets added to both - sparc and i386 catalogs + sparc and i386 catalogs - When a SunOS5.x package is sent, it's added to catalogs SunOS5.x, SunOS5.(x+1), up to SunOS5.11, but only if there are no packages specific to 5.10 (and/or 5.11). - If a package update is sent, the tool uses both the catalogname and the - pkgname to identify the package it's updating. For example, you might upload - foo_stub/CSWfoo and mean to replace foo/CSWfoo with it. + pkgname to identify the package it's updating. For example, you might upload + foo_stub/CSWfoo and mean to replace foo/CSWfoo with it. The --os-release flag makes %prog only insert the package to catalog with the given OS release. +The --catalog-release flag allows to insert a package into a specific catalog, +instead of the default 'unstable'. + = General considerations = This tool operates on a database of packages and a package file store. It -modifies a number of package catalogs, a cartesian product of: +modifies a number of package catalogs, e.g.: - {legacy,dublin,unstable}x{sparc,i386}x{5.8,5.9.5.10,5.11} + {{dublin,unstable,kiel,bratislava}}x{{sparc,i386}}x{{5.8,5.9.5.10,5.11}} -This amounts to 3x2x4 = 24 package catalogs total. - = Removing packages from the catalog = The --remove option works the same way as the regular use, except that it @@ -524,7 +525,8 @@ help="Remove packages from catalogs instead of adding them") parser.add_option("--os-release", dest="os_release", - help="If specified, only uploads to the specified OS release.") + help="If specified, only uploads to the specified OS release. " + "Valid values: {0}".format(" ".join(common_constants.OS_RELS))) parser.add_option("--rest-url", dest="rest_url", default=BASE_URL, @@ -568,6 +570,11 @@ else: print "Continuing anyway." + if os_release and os_release not in common_constants.OS_RELS: + raise DataError( + "OS release %r is not valid. Valid values: %r" + % (os_release, common_constants.OS_RELS)) + username, password = rest.GetUsernameAndPassword() uploader = Srv4Uploader(args, options.rest_url, Modified: csw/mgar/gar/v2-yann/lib/python/csw_upload_pkg_test.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/csw_upload_pkg_test.py 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/lib/python/csw_upload_pkg_test.py 2012-12-31 01:04:31 UTC (rev 19982) @@ -98,7 +98,7 @@ def test_MatchSrv4ToCatalogsSame(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -121,7 +121,7 @@ def test_MatchSrv4ToCatalogsDifferent(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -144,7 +144,7 @@ # uploading a 5.10 package. rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.10', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -164,7 +164,7 @@ def test_MatchSrv4ToCatalogsSameSpecificOsrel(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -185,7 +185,7 @@ def test_MatchSrv4ToCatalogsAbsentFromAll(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(None) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -208,7 +208,7 @@ def test_MatchSrv4ToCatalogsSameSpecificOsrelAlreadyPresent(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -229,7 +229,7 @@ def test_MatchSrv4ToCatalogsNotPresent(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -250,7 +250,7 @@ def test_MatchSrv4ToCatalogsFirstNotPresent(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(None) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -271,7 +271,7 @@ def test_MatchSrv4ToCatalogsSolaris8(self): rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) rest_client_mock.Srv4ByCatalogAndCatalogname( 'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_8) rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -340,7 +340,7 @@ } rest_client_mock = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(rest, "RestClient") - rest.RestClient(None).AndReturn(rest_client_mock) + rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock) for i, os_n in enumerate(in_catalog, 3 - len(in_catalog)): pkg_struct = pkg_struct_map[os_n] rest_client_mock.Srv4ByCatalogAndCatalogname( @@ -416,7 +416,6 @@ import_metadata_mock = self.mox.StubOutWithMock(su, '_GetFileMd5sum') import_metadata_mock = self.mox.StubOutWithMock(su, '_ImportMetadata') import_metadata_mock = self.mox.StubOutWithMock(su, '_InsertIntoCatalog') - import_metadata_mock = self.mox.StubOutWithMock(su, '_RemoveFromCatalog') import_metadata_mock = self.mox.StubOutWithMock(su, '_PostFile') import_metadata_mock = self.mox.StubOutWithMock(su, '_GetSrv4FileMetadata') import_metadata_mock = self.mox.StubOutWithMock(su, '_MatchSrv4ToCatalogs') Modified: csw/mgar/gar/v2-yann/lib/python/database.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/database.py 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/lib/python/database.py 2012-12-31 01:04:31 UTC (rev 19982) @@ -25,8 +25,8 @@ m.Pkginst, m.Srv4DependsOn, m.Srv4FileInCatalog, - m.Srv4FileStats, - m.Srv4FileStatsBlob) + m.Srv4FileStatsBlob, + m.Srv4FileStats) # Shouldn't this be in common_constants? SYSTEM_PKGMAP = "/var/sadm/install/contents" CONFIG_MTIME = "mtime" @@ -153,7 +153,13 @@ def CreateTables(self): for table in TABLES: - table.createTable(ifNotExists=True) + try: + logging.debug("Creating table %r", table) + table.createTable(ifNotExists=True) + except sqlobject.dberrors.OperationalError, e: + logging.error("Could not create table %r: %s", table, e) + raise + def InitialDataImport(self): """Imports initial data into the db. @@ -183,10 +189,6 @@ pass self.SetDatabaseSchemaVersion() - def CreateTables(self): - for table in TABLES: - table.createTable(ifNotExists=True) - def ClearTablesForUpdates(self): for table in TABLES_THAT_NEED_UPDATES: table.clearTable() Copied: csw/mgar/gar/v2-yann/lib/python/garbage_collection.py (from rev 19981, csw/mgar/gar/v2/lib/python/garbage_collection.py) =================================================================== --- csw/mgar/gar/v2-yann/lib/python/garbage_collection.py (rev 0) +++ csw/mgar/gar/v2-yann/lib/python/garbage_collection.py 2012-12-31 01:04:31 UTC (rev 19982) @@ -0,0 +1,43 @@ +#!/opt/csw/bin/python2.6 +# coding=utf-8 +# +# $Id$ +# +# The idea is to remove the package stats entries (and their blobs, and files) +# for packages that aren't part of any catalogs. +# +# The main query can take a couple minutes. Please be careful with editing +# this script, because if you screw up the main query, it can obliterate the +# whole database. Make backups! + +import logging +import sys + +import configuration +import models as m +from sqlobject import sqlbuilder + +def main(): + configuration.SetUpSqlobjectConnection() + total_pkgs = m.Srv4FileStats.select().count() + logging.info("There are {0} packages to inspect.".format(total_pkgs)) + res = m.Srv4FileStats.select( + sqlbuilder.NOTEXISTS( + sqlbuilder.Select(m.Srv4FileInCatalog.q.id, + where=( + sqlbuilder.Outer(m.Srv4FileStats).q.id == m.Srv4FileInCatalog.q.srv4file)) + ) + ).orderBy('id') + deleted_pkgs = 0 + for stats in res: + # logging.info("Package {0} ({1}) is not in any catalogs. Removing.".format(stats.basename, stats.md5_sum)) + stats.DeleteAllDependentObjects() + stats.destroySelf() + deleted_pkgs += 1 + sys.stdout.write(".") + sys.stdout.flush() + logging.info("Deleted {0} unused packages.".format(deleted_pkgs)) + +if __name__ == '__main__': + logging.basicConfig(level=logging.INFO) + main() Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-12-31 01:04:31 UTC (rev 19982) @@ -54,14 +54,21 @@ "will probably finish successfully when do you that." % full_path) raise package.PackageError(msg) - if sharedlib_utils.IsBinary(file_info): + if sharedlib_utils.IsBinary(file_info, check_consistency=False): parser = hachoir_parser.createParser(full_path) if not parser: logging.warning("Can't parse file %s", file_path) else: try: + machine_id = parser["/header/machine"].value + except hachoir_core.field.field.MissingField, e: + logging.fatal( + "hachoir_parser failed to retrieve machine_id for %r. " + "checkpkg cannot continue.", + file_info) + raise + try: file_info["mime_type_by_hachoir"] = parser.mime_type - machine_id = parser["/header/machine"].value file_info["machine_id"] = machine_id file_info["endian"] = parser["/header/endian"].display except hachoir_core.field.field.MissingField, e: Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py 2012-12-31 01:04:31 UTC (rev 19982) @@ -1,6 +1,6 @@ #!/usr/bin/env python2.6 -import unittest +import unittest2 as unittest import inspective_package import mox import hachoir_parser Modified: csw/mgar/gar/v2-yann/lib/python/models.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/models.py 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/lib/python/models.py 2012-12-31 01:04:31 UTC (rev 19982) @@ -52,11 +52,11 @@ if self.email: email = self.email.split("@") else: - email = ["unknown"] + email = ["unknown"] if len(email) == 2: username, domain = email else: - username, domain = email[0], "no domain" + username, domain = email[0], "no domain" username = username[:-3] + "..." return "@".join((username, domain)) Modified: csw/mgar/gar/v2-yann/lib/python/package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/package.py 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/lib/python/package.py 2012-12-31 01:04:31 UTC (rev 19982) @@ -192,10 +192,9 @@ def GetMd5sum(self): if not self.md5sum: logging.debug("GetMd5sum() reading file %s", repr(self.pkg_path)) - fp = open(self.pkg_path) hash = hashlib.md5() - hash.update(fp.read()) - fp.close() + with open(self.pkg_path) as fp: + hash.update(fp.read()) self.md5sum = hash.hexdigest() return self.md5sum Modified: csw/mgar/gar/v2-yann/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/package_checks.py 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/lib/python/package_checks.py 2012-12-31 01:04:31 UTC (rev 19982) @@ -503,7 +503,10 @@ pkgmap_paths = [x["path"] for x in pkgmap] for pkgmap_path in pkgmap_paths: try: - path_str = str(pkgmap_path) + if type(pkgmap_path) is unicode: + path_str = pkgmap_path.encode("utf-8") + else: + path_str = str(pkgmap_path) if re.search(ARCH_RE, path_str): reasons_to_be_arch_specific.append(( "archall-with-arch-paths", Modified: csw/mgar/gar/v2-yann/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/package_stats.py 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/lib/python/package_stats.py 2012-12-31 01:04:31 UTC (rev 19982) @@ -365,7 +365,7 @@ if stats.registered and not replace: logging.debug( "@classmethod ImportPkg(): " - "Package %s is already registered. Exiting.", stats) + "Package %r is already registered. Exiting.", stats) return stats stats.RemoveAllCswFiles() for pkgmap_entry in pkg_stats["pkgmap"]: Modified: csw/mgar/gar/v2-yann/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/rest.py 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/lib/python/rest.py 2012-12-31 01:04:31 UTC (rev 19982) @@ -74,10 +74,18 @@ "maintainer_email": pkg["maintainer_email"], } + def GetCatalogList(self): + url = self.rest_url + self.PKGDB_APP + "/catalogs/" + data = urllib2.urlopen(url).read() + return cjson.decode(data) + def GetCatalog(self, catrel, arch, osrel): if not catrel: raise ArgumentError("Missing catalog release.") - url = self.rest_url + self.PKGDB_APP + "/catalogs/%s/%s/%s/?quick=true" % (catrel, arch, osrel) + url = ( + self.rest_url + + self.PKGDB_APP + + "/catalogs/%s/%s/%s/?quick=true" % (catrel, arch, osrel)) logging.debug("GetCatalog(): GET %s", url) try: data = urllib2.urlopen(url).read() @@ -184,10 +192,6 @@ http_code, c.getinfo(pycurl.EFFECTIVE_URL)) c.close() - # if self.debug: - # logging.debug("*** Headers") - # logging.debug(h.getvalue()) - # logging.debug("*** Data") if http_code >= 400 and http_code <= 599: if not self.debug: # In debug mode, all headers are printed to screen, and we aren't Modified: csw/mgar/gar/v2-yann/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/sharedlib_utils.py 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/lib/python/sharedlib_utils.py 2012-12-31 01:04:31 UTC (rev 19982) @@ -47,6 +47,10 @@ pass +class DataInconsistencyError(Error): + """Inconsistency in the data.""" + + def ParseLibPath(directory): arch_subdirs = (SPARCV8_PATHS + SPARCV8PLUS_PATHS + SPARCV9_PATHS + INTEL_386_PATHS + AMD64_PATHS) @@ -213,8 +217,16 @@ return LCS -def IsBinary(file_info): - """Returns True or False depending on file metadata.""" +def IsBinary(file_info, check_consistency=True): + """Returns True or False depending on file metadata. + + Args: + file_info: A dictionary containing file information + check_consistency: Whether to check for consistency between the mimetype + information and other information, such as machine_id. During the + initial data gathering, the check must be disabled, because IsBinary() + is used to determine whether we should collect machine_id or not. + """ is_a_binary = False if "mime_type" not in file_info: # This would be a problem in the data. @@ -227,6 +239,13 @@ if mimetype in file_info["mime_type"]: is_a_binary = True break + if check_consistency and is_a_binary and not "machine_id" in file_info: + raise DataInconsistencyError( + "'machine_id' not found in file_info: %r. checkpkg can't continue, " + "but it's not a problem with checkpkg; it's a problem with the underlying " + "libraries. In this case it's the hachoir library, which failed to " + "detect the processor type for this binary." + % file_info) return is_a_binary Modified: csw/mgar/gar/v2-yann/lib/python/system_pkgmap_test.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/system_pkgmap_test.py 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/lib/python/system_pkgmap_test.py 2012-12-31 01:04:31 UTC (rev 19982) @@ -1,6 +1,6 @@ #!/usr/bin/env python2.6 -import unittest +import unittest2 as unittest import system_pkgmap import test_base import models @@ -45,6 +45,10 @@ class IndexerUnitTest(unittest.TestCase): + def setUp(self): + super(IndexerUnitTest, self).setUp() + self.maxDiff = None + def test_ParseSrv4PkginfoLine(self): spi = system_pkgmap.Indexer() expected = ('SUNWwpau', 'Wireless WPA Supplicant, (Usr)') @@ -274,8 +278,8 @@ 'path': '/bin', 'pkgnames': ['SUNWsystem-core-os'], 'target': './usr/bin', 'type': 's'}, {'group': 'sys', 'line': 'dev\tdir\tsystem/core-os\t\t0755\troot\tsys', 'mode': '0755', 'owner': 'root', 'path': '/dev', 'pkgnames': ['SUNWsystem-core-os'], 'target': None, 'type': 'd'}], - 'pkginfo': {'SUNWbin': u'link system/core-os ./usr/bin', - 'SUNWdev': u'dir system/core-os 0755 root sys', + 'pkginfo': {'SUNWdeveloper-solarisstudio-122-c': u'C++ Compilers', + 'SUNWdeveloper-versioning-sccs': u'Source Code Control System', 'SUNWpcan': u'Cisco-Aironet 802.11b driver', 'SUNWwpau': u'Wireless WPA Supplicant, (Usr)'} } Modified: csw/mgar/gar/v2-yann/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2-yann/lib/web/pkgdb_web.py 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/lib/web/pkgdb_web.py 2012-12-31 01:04:31 UTC (rev 19982) @@ -378,8 +378,11 @@ def GET(self, catrel_name, arch_name, osrel_name, catalogname): """Get a srv4 reference by catalog ane catalogname.""" configuration.SetUpSqlobjectConnection() - sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad( - osrel_name, arch_name, catrel_name) + try: + sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad( + osrel_name, arch_name, catrel_name) + except sqlobject.main.SQLObjectNotFound: + raise web.notfound() join = [ sqlbuilder.INNERJOINOn(None, models.Srv4FileInCatalog, @@ -401,7 +404,7 @@ web.header('Access-Control-Allow-Origin', '*') return cjson.encode(data) except sqlobject.main.SQLObjectNotFound: - return cjson.encode(None) + raise web.notfound() except sqlobject.dberrors.OperationalError, e: raise web.internalerror(e) @@ -434,6 +437,7 @@ srv4 = res.getOne() mimetype, data = srv4.GetRestRepr() web.header('Content-type', mimetype) + web.header('Access-Control-Allow-Origin', '*') return cjson.encode(data) except sqlobject.main.SQLObjectNotFound: return cjson.encode(None) Modified: csw/mgar/gar/v2-yann/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2-yann/lib/web/releases_web.py 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/lib/web/releases_web.py 2012-12-31 01:04:31 UTC (rev 19982) @@ -218,7 +218,7 @@ self.ReturnError( "%s is not one of %s (OS releases)" % (osrel_name, common_constants.OS_RELS)) - if osrel_name in common_constants.OBSOLETE_OS_RELS: + if osrel_name in common_constants.OBSOLETE_OS_RELS and catrel_name == 'unstable': self.ReturnError( "package deletions from an obsolete OS release such as %s " "are not allowed" % osrel_name) Modified: csw/mgar/gar/v2-yann/lib/web/templates/CatalogDetail.html =================================================================== --- csw/mgar/gar/v2-yann/lib/web/templates/CatalogDetail.html 2012-12-31 00:54:47 UTC (rev 19981) +++ csw/mgar/gar/v2-yann/lib/web/templates/CatalogDetail.html 2012-12-31 01:04:31 UTC (rev 19982) @@ -9,13 +9,18 @@

    $cat_name

    $pkgs.count() packages

    -
      + + + + + + $for pkg in pkgs: -
    • - - $pkg - -
      • - + + + + +
      filenamecatalognameversion
      $pkg.basename + $pkg.catalogname$pkg.version_string
      This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Dec 31 13:48:57 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 31 Dec 2012 12:48:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[19983] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 19983 http://gar.svn.sourceforge.net/gar/?rev=19983&view=rev Author: pfelecan Date: 2012-12-31 12:48:57 +0000 (Mon, 31 Dec 2012) Log Message: ----------- texlive/trunk: fix regex and makefile conflict Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-12-31 01:04:31 UTC (rev 19982) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-12-31 12:48:57 UTC (rev 19983) @@ -5439,10 +5439,10 @@ cd $(DESTDIR)/$(prefix) && gfind . -type f | xargs ggrep -n '^#![[:space:]]*.*/perl[[:space:]]*' /dev/null | ggrep -v '/env ' | ggrep ':1:' | cut -d : -f 1 | xargs -l -i gsed --in-place --regexp-extended --expression 's;^#![[:space:]]*.*/perl[[:space:]]*;#!/usr/bin/env perl ;' {} : Bourne Shell cd $(DESTDIR)/$(prefix) && gfind . -type f | xargs ggrep -n '^#![[:space:]]*.*/sh[[:space:]]*' /dev/null | ggrep -v '/env ' | ggrep ':1:' | cut -d : -f 1 | xargs -l -i gsed --in-place --regexp-extended --expression 's;^#![[:space:]]*.*/sh[[:space:]]*;#!/usr/bin/env bash ;' {} - : patch postinstallation files being too expansive to patch in the classic way - gsed --in-place 's;^cmbase=cmbase.mf$;/opt/csw/share/texmf-dist/fonts/source/public/cm/cmbase.mf;' $(DESTDIR)/opt/csw/share/texmf-dist/doc/fonts/tipa/mktipapk.sh $(DESTDIR)/opt/csw/share/texmf-dist/doc/fonts/tipa/mkxipapk.sh - gsed --in-place 's;^LATEXPATH="/usr/texbin/" # TeXLive$;LATEXPATH="/opt/csw/bin/" # TeXLive;' $(DESTDIR)/opt/csw/share/texmf-dist/doc/latex/confproc/example/buildpapers.sh - gsed --in-place 's;/usr/local/teTeX/share/texmf.local/scripts/xetex/perl/lib/PDF/Reuse.pm;/opt/csw/share/texmf-dist/scripts/xetex/perl/lib/PDF/Reuse.pm;' $(DESTDIR)/opt/csw/share/texmf-dist/scripts/xetex/perl/xdv2pdf_mergemarks + : patch postinstallation for those files being too expansive to patch in the classic way + gsed --in-place --expression 's;^cmbase=.*cmbase.mf$$;cmbase=/opt/csw/share/texmf-dist/fonts/source/public/cm/cmbase.mf;' $(DESTDIR)/opt/csw/share/texmf-dist/doc/fonts/tipa/mktipapk.sh $(DESTDIR)/opt/csw/share/texmf-dist/doc/fonts/tipa/mkxipapk.sh + gsed --in-place --expression 's;^LATEXPATH="/usr/texbin/" # TeXLive$$;LATEXPATH="/opt/csw/bin/" # TeXLive;' $(DESTDIR)/opt/csw/share/texmf-dist/doc/latex/confproc/example/buildpapers.sh + gsed --in-place --expression 's;/usr/local/teTeX/share/texmf.local/scripts/xetex/perl/lib/PDF/Reuse.pm;/opt/csw/share/texmf-dist/scripts/xetex/perl/lib/PDF/Reuse.pm;' $(DESTDIR)/opt/csw/share/texmf-dist/scripts/xetex/perl/xdv2pdf_mergemarks $(MAKECOOKIE) REINPLACE_WHEN_USRLOCAL = postinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Dec 31 18:20:02 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 31 Dec 2012 17:20:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[19985] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 19985 http://gar.svn.sourceforge.net/gar/?rev=19985&view=rev Author: chninkel Date: 2012-12-31 17:20:02 +0000 (Mon, 31 Dec 2012) Log Message: ----------- openssl1/trunk: added 64-bit openssl binary Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2012-12-31 17:19:22 UTC (rev 19984) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2012-12-31 17:20:02 UTC (rev 19985) @@ -147,6 +147,8 @@ ##### Build and installation information ##### +BUILD64 =1 + # The list of instructions set for which we will # provide optimized libraries and binaries EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2012-12-31 17:19:22 UTC (rev 19984) +++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2012-12-31 17:20:02 UTC (rev 19985) @@ -1,6 +1,7 @@ openssl (1.0.1c,rev=2012.12.31) unstable * Start a new changelog for openssl 1.0 + * Added 64-bit binaries (Closes: #5028) * Enabled direct-linking -- Yann Rouillard Mon, 31 Dec 2012 18:14:47 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Dec 31 18:19:22 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 31 Dec 2012 17:19:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[19984] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 19984 http://gar.svn.sourceforge.net/gar/?rev=19984&view=rev Author: chninkel Date: 2012-12-31 17:19:22 +0000 (Mon, 31 Dec 2012) Log Message: ----------- openssl1/trunk: enabled direct binding with map file Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/files/changelog.CSW csw/mgar/pkg/openssl1/trunk/files/map.openssl.engines csw/mgar/pkg/openssl1/trunk/files/map.openssl.libcrypto csw/mgar/pkg/openssl1/trunk/files/map.openssl.libssl Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2012-12-31 12:48:57 UTC (rev 19983) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2012-12-31 17:19:22 UTC (rev 19984) @@ -64,7 +64,6 @@ # We use SUN perl, not the opencsw one CHECKPKG_OVERRIDES_CSWopenssl-utils += missing-dependency|CSWperl - # References to default path in documentation files, can be safely ignored CHECKPKG_OVERRIDES_CSWlibssl-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl_dev/INSTALL CHECKPKG_OVERRIDES_CSWlibssl-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl_dev/CHANGES Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2012-12-31 12:48:57 UTC (rev 19983) +++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2012-12-31 17:19:22 UTC (rev 19984) @@ -1,99 +1,7 @@ -openssl (0.9.8,rev=2009.03.27_rev=k) unstable +openssl (1.0.1c,rev=2012.12.31) unstable - * New upstream version. + * Start a new changelog for openssl 1.0 + * Enabled direct-linking - -- Yann Rouillard Wed, 25 Mar 2009 22:57:40 +0100 + -- Yann Rouillard Mon, 31 Dec 2012 18:14:47 +0100 -openssl (0.9.8,rev=2009.01.28_rev=j) unstable - - * Fixed checkinstall bug, -h should be used instead of -L to - test symlink because old sh doesn't know -L. - - -- Yann Rouillard Wed, 28 Jan 2009 10:37:43 +0100 - -openssl (0.9.8,rev=2009.01.07_rev=j) unstable - - * New upstream version. - * Made the private directory local by symlinking it to - /etc/opt/csw/ssl/private - - -- Yann Rouillard Wed, 07 Jan 2009 19:07:01 +0100 - -openssl (0.9.8,rev=2009.01.01_rev=i) unstable - - * Removed CA and added dependancy on ca_certificates. - * Added openssl documentation files. - * checkinstall script now accepts that /dev/random and - /dev/random are pipes (Closes: #2687) - - -- Yann Rouillard Sat, 13 Dec 2008 14:28:14 +0100 - -openssl (0.9.8,rev=2008.10.05_rev=i) unstable - - * New upstream version. - * Added ca certs that were removed in 0.9.8h. - * Fixed arch in openssl meta-package. - - -- Yann Rouillard Fri, 05 oct 2008 21:25:09 +0200 - -openssl (0.9.8,REV=2007.12.26_rev=g) unstable - - * Fixed inconsistency between headers and libraries. - - -- Yann Rouillard Wed, 26 Dec 2007 12:30:22 +0100 - -openssl (0.9.8,REV=2007.11.02_rev=g) unstable - - * New upstream version. - - -- Yann Rouillard Fri, 02 Nov 2007 17:28:41 +0100 - -openssl (0.9.8,REV=2007.10.27_rev=f) unstable - - * New upstream version. - - -- Yann Rouillard Sat, 27 Oct 2007 21:02:17 +0200 - -openssl (0.9.8,REV=2007.10.27_rev=e) unstable - - * Fixed CVE-2007-4995: DTLS Heap Buffer Overflow Vulnerability. - - -- Yann Rouillard Sat, 27 Oct 2007 14:38:55 +0200 - -openssl (0.9.8,REV=2007.10.11_rev=e) unstable - - * Fixed CVE-2007-5135: Fix off by one error in SSL_get_shared_ciphers(). - * Fixed CVE-2007-3108: RSA side-channel attack. - - -- Yann Rouillard Tue, 02 Oct 2007 23:57:35 +0200 - -openssl (0.9.8,REV=2007.08.21_rev=e) unstable - - * Replaced "? ? ?" with "0755 root bin" in the prototype. - - -- Yann Rouillard Tue, 17 Jul 2007 23:26:37 +0200 - -openssl (0.9.8,REV=2007.07.22_rev=e) unstable - - * Added amd64 libraries symlinks (libssl.so -> libssl.so.0.9.8, ...). - - -- Yann Rouillard Tue, 17 Jul 2007 23:26:37 +0200 - -openssl (0.9.8,REV=2007.06.02_rev=e) UNRELEASED - - * manpages are now under /opt/csw/share/man instead of /opt/csw/ssl/man. - * package split in openssl_rt (runtime libraries), openssl_devel. - (development files) and openssl_utils (binaries and related files). - - -- Yann Rouillard Sat, 2 Jun 2007 17:29:01 +0200 - -openssl (0.9.8,REV=2007.05.10_rev=e) unstable - - * New upstream version. - * Static libraries removed. - * Old 0.9.6 libraries removed. - * amd64 optimized libraries added. - - -- Yann Rouillard Thu, 10 May 2007 14:54:17 +0200 - - Modified: csw/mgar/pkg/openssl1/trunk/files/map.openssl.engines =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/map.openssl.engines 2012-12-31 12:48:57 UTC (rev 19983) +++ csw/mgar/pkg/openssl1/trunk/files/map.openssl.engines 2012-12-31 17:19:22 UTC (rev 19984) @@ -1,7 +1,7 @@ OPENSSL_1.0.0 { global: - bind_engine; - v_check; + bind_engine = DIRECT; + v_check = DIRECT; local: *; }; Modified: csw/mgar/pkg/openssl1/trunk/files/map.openssl.libcrypto =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/map.openssl.libcrypto 2012-12-31 12:48:57 UTC (rev 19983) +++ csw/mgar/pkg/openssl1/trunk/files/map.openssl.libcrypto 2012-12-31 17:19:22 UTC (rev 19984) @@ -1,3634 +1,3634 @@ OPENSSL_1.0.0 { global: - SSLeay; - SSLeay_version; - ASN1_INTEGER_get; - ASN1_INTEGER_set; - ASN1_INTEGER_to_BN; - ASN1_OBJECT_create; - ASN1_OBJECT_free; - ASN1_OBJECT_new; - ASN1_PRINTABLE_type; - ASN1_STRING_cmp; - ASN1_STRING_dup; - ASN1_STRING_free; - ASN1_STRING_new; - ASN1_STRING_print; - ASN1_STRING_set; - ASN1_STRING_type_new; - ASN1_TYPE_free; - ASN1_TYPE_new; - ASN1_UNIVERSALSTRING_to_string; - ASN1_UTCTIME_check; - ASN1_UTCTIME_print; - ASN1_UTCTIME_set; - ASN1_check_infinite_end; - ASN1_d2i_bio; - ASN1_d2i_fp; - ASN1_digest; - ASN1_dup; - ASN1_get_object; - ASN1_i2d_bio; - ASN1_i2d_fp; - ASN1_object_size; - ASN1_parse; - ASN1_put_object; - ASN1_sign; - ASN1_verify; - BF_cbc_encrypt; - BF_cfb64_encrypt; - BF_ecb_encrypt; - BF_encrypt; - BF_ofb64_encrypt; - BF_options; - BF_set_key; - BIO_CONNECT_free; - BIO_CONNECT_new; - BIO_accept; - BIO_ctrl; - BIO_int_ctrl; - BIO_debug_callback; - BIO_dump; - BIO_dup_chain; - BIO_f_base64; - BIO_f_buffer; - BIO_f_cipher; - BIO_f_md; - BIO_f_null; - BIO_fd_non_fatal_error; - BIO_fd_should_retry; - BIO_find_type; - BIO_free; - BIO_free_all; - BIO_get_accept_socket; - BIO_get_host_ip; - BIO_get_port; - BIO_get_retry_BIO; - BIO_get_retry_reason; - BIO_gethostbyname; - BIO_gets; - BIO_new; - BIO_new_accept; - BIO_new_connect; - BIO_new_fd; - BIO_new_file; - BIO_new_fp; - BIO_new_socket; - BIO_pop; - BIO_printf; - BIO_push; - BIO_puts; - BIO_read; - BIO_s_accept; - BIO_s_connect; - BIO_s_fd; - BIO_s_file; - BIO_s_mem; - BIO_s_null; - BIO_s_socket; - BIO_set; - BIO_set_cipher; - BIO_set_tcp_ndelay; - BIO_sock_cleanup; - BIO_sock_error; - BIO_sock_init; - BIO_sock_non_fatal_error; - BIO_sock_should_retry; - BIO_socket_ioctl; - BIO_write; - BN_CTX_free; - BN_CTX_new; - BN_MONT_CTX_free; - BN_MONT_CTX_new; - BN_MONT_CTX_set; - BN_add; - BN_add_word; - BN_hex2bn; - BN_bin2bn; - BN_bn2hex; - BN_bn2bin; - BN_clear; - BN_clear_bit; - BN_clear_free; - BN_cmp; - BN_copy; - BN_div; - BN_div_word; - BN_dup; - BN_free; - BN_from_montgomery; - BN_gcd; - BN_generate_prime; - BN_get_word; - BN_is_bit_set; - BN_is_prime; - BN_lshift; - BN_lshift1; - BN_mask_bits; - BN_mod_exp; - BN_mod_exp_mont; - BN_mod_exp_simple; - BN_mod_inverse; - BN_mod_mul; - BN_mod_mul_montgomery; - BN_mod_word; - BN_mul; - BN_new; - BN_num_bits; - BN_num_bits_word; - BN_options; - BN_print; - BN_print_fp; - BN_rand; - BN_reciprocal; - BN_rshift; - BN_rshift1; - BN_set_bit; - BN_set_word; - BN_sqr; - BN_sub; - BN_to_ASN1_INTEGER; - BN_ucmp; - BN_value_one; - BUF_MEM_free; - BUF_MEM_grow; - BUF_MEM_new; - BUF_strdup; - CONF_free; - CONF_get_number; - CONF_get_section; - CONF_get_string; - CONF_load; - CRYPTO_add_lock; - CRYPTO_dbg_free; - CRYPTO_dbg_malloc; - CRYPTO_dbg_realloc; - CRYPTO_free; - CRYPTO_get_add_lock_callback; - CRYPTO_get_id_callback; - CRYPTO_get_lock_name; - CRYPTO_get_locking_callback; - CRYPTO_get_mem_functions; - CRYPTO_lock; - CRYPTO_malloc; - CRYPTO_mem_ctrl; - CRYPTO_mem_leaks; - CRYPTO_mem_leaks_cb; - CRYPTO_mem_leaks_fp; - CRYPTO_realloc; - CRYPTO_remalloc; - CRYPTO_set_add_lock_callback; - CRYPTO_set_id_callback; - CRYPTO_set_locking_callback; - CRYPTO_set_mem_functions; - CRYPTO_thread_id; - DH_check; - DH_compute_key; - DH_free; - DH_generate_key; - DH_generate_parameters; - DH_new; - DH_size; - DHparams_print; - DHparams_print_fp; - DSA_free; - DSA_generate_key; - DSA_generate_parameters; - DSA_new; - DSA_print; - DSA_print_fp; - DSA_sign; - DSA_sign_setup; - DSA_size; - DSA_verify; - DSAparams_print; - DSAparams_print_fp; - ERR_clear_error; - ERR_error_string; - ERR_free_strings; - ERR_func_error_string; - ERR_get_err_state_table; - ERR_get_error; - ERR_get_error_line; - ERR_get_state; - ERR_get_string_table; - ERR_lib_error_string; - ERR_load_ASN1_strings; - ERR_load_BIO_strings; - ERR_load_BN_strings; - ERR_load_BUF_strings; - ERR_load_CONF_strings; - ERR_load_DH_strings; - ERR_load_DSA_strings; - ERR_load_ERR_strings; - ERR_load_EVP_strings; - ERR_load_OBJ_strings; - ERR_load_PEM_strings; - ERR_load_RSA_strings; - ERR_load_X509_strings; - ERR_load_crypto_strings; - ERR_load_strings; - ERR_peek_error; - ERR_peek_error_line; - ERR_print_errors; - ERR_print_errors_fp; - ERR_put_error; - ERR_reason_error_string; - ERR_remove_state; - EVP_BytesToKey; - EVP_CIPHER_CTX_cleanup; - EVP_CipherFinal; - EVP_CipherInit; - EVP_CipherUpdate; - EVP_DecodeBlock; - EVP_DecodeFinal; - EVP_DecodeInit; - EVP_DecodeUpdate; - EVP_DecryptFinal; - EVP_DecryptInit; - EVP_DecryptUpdate; - EVP_DigestFinal; - EVP_DigestInit; - EVP_DigestUpdate; - EVP_EncodeBlock; - EVP_EncodeFinal; - EVP_EncodeInit; - EVP_EncodeUpdate; - EVP_EncryptFinal; - EVP_EncryptInit; - EVP_EncryptUpdate; - EVP_OpenFinal; - EVP_OpenInit; - EVP_PKEY_assign; - EVP_PKEY_copy_parameters; - EVP_PKEY_free; - EVP_PKEY_missing_parameters; - EVP_PKEY_new; - EVP_PKEY_save_parameters; - EVP_PKEY_size; - EVP_PKEY_type; - EVP_SealFinal; - EVP_SealInit; - EVP_SignFinal; - EVP_VerifyFinal; - EVP_add_cipher; - EVP_add_digest; - EVP_bf_cbc; - EVP_bf_cfb64; - EVP_bf_ecb; - EVP_bf_ofb; - EVP_cleanup; - EVP_des_cbc; - EVP_des_cfb64; - EVP_des_ecb; - EVP_des_ede; - EVP_des_ede3; - EVP_des_ede3_cbc; - EVP_des_ede3_cfb64; - EVP_des_ede3_ofb; - EVP_des_ede_cbc; - EVP_des_ede_cfb64; - EVP_des_ede_ofb; - EVP_des_ofb; - EVP_desx_cbc; - EVP_dss; - EVP_dss1; - EVP_enc_null; - EVP_get_cipherbyname; - EVP_get_digestbyname; - EVP_get_pw_prompt; - EVP_idea_cbc; - EVP_idea_cfb64; - EVP_idea_ecb; - EVP_idea_ofb; - EVP_md5; - EVP_md_null; - EVP_rc2_cbc; - EVP_rc2_cfb64; - EVP_rc2_ecb; - EVP_rc2_ofb; - EVP_rc4; - EVP_read_pw_string; - EVP_set_pw_prompt; - EVP_sha; - EVP_sha1; - MD5; - MD5_Final; - MD5_Init; - MD5_Update; - MDC2; - MDC2_Final; - MDC2_Init; - MDC2_Update; - NETSCAPE_SPKAC_free; - NETSCAPE_SPKAC_new; - NETSCAPE_SPKI_free; - NETSCAPE_SPKI_new; - NETSCAPE_SPKI_sign; - NETSCAPE_SPKI_verify; - OBJ_add_object; - OBJ_cleanup; - OBJ_cmp; - OBJ_create; - OBJ_dup; - OBJ_ln2nid; - OBJ_new_nid; - OBJ_nid2ln; - OBJ_nid2obj; - OBJ_nid2sn; - OBJ_obj2nid; - OBJ_sn2nid; - OBJ_txt2nid; - PEM_ASN1_read; - PEM_ASN1_read_bio; - PEM_ASN1_write; - PEM_ASN1_write_bio; - PEM_SealFinal; - PEM_SealInit; - PEM_SealUpdate; - PEM_SignFinal; - PEM_SignInit; - PEM_SignUpdate; - PEM_X509_INFO_read; - PEM_X509_INFO_read_bio; - PEM_X509_INFO_write_bio; - PEM_dek_info; - PEM_do_header; - PEM_get_EVP_CIPHER_INFO; - PEM_proc_type; - PEM_read; - PEM_read_DHparams; - PEM_read_DSAPrivateKey; - PEM_read_DSAparams; - PEM_read_PKCS7; - PEM_read_PrivateKey; - PEM_read_RSAPrivateKey; - PEM_read_X509; - PEM_read_X509_CRL; - PEM_read_X509_REQ; - PEM_read_bio; - PEM_read_bio_DHparams; - PEM_read_bio_DSAPrivateKey; - PEM_read_bio_DSAparams; - PEM_read_bio_PKCS7; - PEM_read_bio_PrivateKey; - PEM_read_bio_RSAPrivateKey; - PEM_read_bio_X509; - PEM_read_bio_X509_CRL; - PEM_read_bio_X509_REQ; - PEM_write; - PEM_write_DHparams; - PEM_write_DSAPrivateKey; - PEM_write_DSAparams; - PEM_write_PKCS7; - PEM_write_PrivateKey; - PEM_write_RSAPrivateKey; - PEM_write_X509; - PEM_write_X509_CRL; - PEM_write_X509_REQ; - PEM_write_bio; - PEM_write_bio_DHparams; - PEM_write_bio_DSAPrivateKey; - PEM_write_bio_DSAparams; - PEM_write_bio_PKCS7; - PEM_write_bio_PrivateKey; - PEM_write_bio_RSAPrivateKey; - PEM_write_bio_X509; - PEM_write_bio_X509_CRL; - PEM_write_bio_X509_REQ; - PKCS7_DIGEST_free; - PKCS7_DIGEST_new; - PKCS7_ENCRYPT_free; - PKCS7_ENCRYPT_new; - PKCS7_ENC_CONTENT_free; - PKCS7_ENC_CONTENT_new; - PKCS7_ENVELOPE_free; - PKCS7_ENVELOPE_new; - PKCS7_ISSUER_AND_SERIAL_digest; - PKCS7_ISSUER_AND_SERIAL_free; - PKCS7_ISSUER_AND_SERIAL_new; - PKCS7_RECIP_INFO_free; - PKCS7_RECIP_INFO_new; - PKCS7_SIGNED_free; - PKCS7_SIGNED_new; - PKCS7_SIGNER_INFO_free; - PKCS7_SIGNER_INFO_new; - PKCS7_SIGN_ENVELOPE_free; - PKCS7_SIGN_ENVELOPE_new; - PKCS7_dup; - PKCS7_free; - PKCS7_new; - RAND_bytes; - RAND_cleanup; - RAND_file_name; - RAND_load_file; - RAND_seed; - RAND_write_file; - RC2_cbc_encrypt; - RC2_cfb64_encrypt; - RC2_ecb_encrypt; - RC2_encrypt; - RC2_ofb64_encrypt; - RC2_set_key; - RC4; - RC4_options; - RC4_set_key; - RSAPrivateKey_dup; - RSAPublicKey_dup; - RSA_PKCS1_SSLeay; - RSA_free; - RSA_generate_key; - RSA_new; - RSA_new_method; - RSA_print; - RSA_print_fp; - RSA_private_decrypt; - RSA_private_encrypt; - RSA_public_decrypt; - RSA_public_encrypt; - RSA_set_default_method; - RSA_sign; - RSA_sign_ASN1_OCTET_STRING; - RSA_size; - RSA_verify; - RSA_verify_ASN1_OCTET_STRING; - SHA; - SHA1; - SHA1_Final; - SHA1_Init; - SHA1_Update; - SHA_Final; - SHA_Init; - SHA_Update; - OpenSSL_add_all_ciphers; - OpenSSL_add_all_digests; - TXT_DB_create_index; - TXT_DB_free; - TXT_DB_get_by_index; - TXT_DB_insert; - TXT_DB_read; - TXT_DB_write; - X509_ALGOR_free; - X509_ALGOR_new; - X509_ATTRIBUTE_free; - X509_ATTRIBUTE_new; - X509_CINF_free; - X509_CINF_new; - X509_CRL_INFO_free; - X509_CRL_INFO_new; - X509_CRL_add_ext; - X509_CRL_cmp; - X509_CRL_delete_ext; - X509_CRL_dup; - X509_CRL_free; - X509_CRL_get_ext; - X509_CRL_get_ext_by_NID; - X509_CRL_get_ext_by_OBJ; - X509_CRL_get_ext_by_critical; - X509_CRL_get_ext_count; - X509_CRL_new; - X509_CRL_sign; - X509_CRL_verify; - X509_EXTENSION_create_by_NID; - X509_EXTENSION_create_by_OBJ; - X509_EXTENSION_dup; - X509_EXTENSION_free; - X509_EXTENSION_get_critical; - X509_EXTENSION_get_data; - X509_EXTENSION_get_object; - X509_EXTENSION_new; - X509_EXTENSION_set_critical; - X509_EXTENSION_set_data; - X509_EXTENSION_set_object; - X509_INFO_free; - X509_INFO_new; - X509_LOOKUP_by_alias; - X509_LOOKUP_by_fingerprint; - X509_LOOKUP_by_issuer_serial; - X509_LOOKUP_by_subject; - X509_LOOKUP_ctrl; - X509_LOOKUP_file; - X509_LOOKUP_free; - X509_LOOKUP_hash_dir; - X509_LOOKUP_init; - X509_LOOKUP_new; - X509_LOOKUP_shutdown; - X509_NAME_ENTRY_create_by_NID; - X509_NAME_ENTRY_create_by_OBJ; - X509_NAME_ENTRY_dup; - X509_NAME_ENTRY_free; - X509_NAME_ENTRY_get_data; - X509_NAME_ENTRY_get_object; - X509_NAME_ENTRY_new; - X509_NAME_ENTRY_set_data; - X509_NAME_ENTRY_set_object; - X509_NAME_add_entry; - X509_NAME_cmp; - X509_NAME_delete_entry; - X509_NAME_digest; - X509_NAME_dup; - X509_NAME_entry_count; - X509_NAME_free; - X509_NAME_get_entry; - X509_NAME_get_index_by_NID; - X509_NAME_get_index_by_OBJ; - X509_NAME_get_text_by_NID; - X509_NAME_get_text_by_OBJ; - X509_NAME_hash; - X509_NAME_new; - X509_NAME_oneline; - X509_NAME_print; - X509_NAME_set; - X509_OBJECT_free_contents; - X509_OBJECT_retrieve_by_subject; - X509_OBJECT_up_ref_count; - X509_PKEY_free; - X509_PKEY_new; - X509_PUBKEY_free; - X509_PUBKEY_get; - X509_PUBKEY_new; - X509_PUBKEY_set; - X509_REQ_INFO_free; - X509_REQ_INFO_new; - X509_REQ_dup; - X509_REQ_free; - X509_REQ_get_pubkey; - X509_REQ_new; - X509_REQ_print; - X509_REQ_print_fp; - X509_REQ_set_pubkey; - X509_REQ_set_subject_name; - X509_REQ_set_version; - X509_REQ_sign; - X509_REQ_to_X509; - X509_REQ_verify; - X509_REVOKED_add_ext; - X509_REVOKED_delete_ext; - X509_REVOKED_free; - X509_REVOKED_get_ext; - X509_REVOKED_get_ext_by_NID; - X509_REVOKED_get_ext_by_OBJ; - X509_REVOKED_get_ext_by_critical; - X509_REVOKED_get_ext_count; - X509_REVOKED_new; - X509_SIG_free; - X509_SIG_new; - X509_STORE_CTX_cleanup; - X509_STORE_CTX_init; - X509_STORE_add_cert; - X509_STORE_add_lookup; - X509_STORE_get_by_subject; - X509_STORE_load_locations; - X509_STORE_new; - X509_STORE_free; - X509_STORE_set_default_paths; - X509_VAL_free; - X509_VAL_new; - X509_add_ext; - X509_certificate_type; - X509_check_private_key; - X509_cmp_current_time; - X509_delete_ext; - X509_digest; - X509_dup; - X509_free; - X509_get_default_cert_area; - X509_get_default_cert_dir; - X509_get_default_cert_dir_env; - X509_get_default_cert_file; - X509_get_default_cert_file_env; - X509_get_default_private_dir; - X509_get_ext; - X509_get_ext_by_NID; - X509_get_ext_by_OBJ; - X509_get_ext_by_critical; - X509_get_ext_count; - X509_get_issuer_name; - X509_get_pubkey; - X509_get_pubkey_parameters; - X509_get_serialNumber; - X509_get_subject_name; - X509_gmtime_adj; - X509_issuer_and_serial_cmp; - X509_issuer_and_serial_hash; - X509_issuer_name_cmp; - X509_issuer_name_hash; - X509_load_cert_file; - X509_new; - X509_print; - X509_print_fp; - X509_set_issuer_name; - X509_set_notAfter; - X509_set_notBefore; - X509_set_pubkey; - X509_set_serialNumber; - X509_set_subject_name; - X509_set_version; - X509_sign; - X509_subject_name_cmp; - X509_subject_name_hash; - X509_to_X509_REQ; - X509_verify; - X509_verify_cert; - X509_verify_cert_error_string; - X509v3_add_ext; - X509v3_delete_ext; - X509v3_get_ext; - X509v3_get_ext_by_NID; - X509v3_get_ext_by_OBJ; - X509v3_get_ext_by_critical; - X509v3_get_ext_count; - _des_crypt; - a2d_ASN1_OBJECT; - a2i_ASN1_INTEGER; - a2i_ASN1_STRING; - asn1_Finish; - asn1_GetSequence; - bn_div_words; - bn_expand2; - bn_mul_add_words; - bn_mul_words; - BN_uadd; - BN_usub; - bn_sqr_words; - _ossl_old_crypt; - d2i_ASN1_BIT_STRING; - d2i_ASN1_BOOLEAN; - d2i_ASN1_IA5STRING; - d2i_ASN1_INTEGER; - d2i_ASN1_OBJECT; - d2i_ASN1_OCTET_STRING; - d2i_ASN1_PRINTABLE; - d2i_ASN1_PRINTABLESTRING; - d2i_ASN1_SET; - d2i_ASN1_T61STRING; - d2i_ASN1_TYPE; - d2i_ASN1_UTCTIME; - d2i_ASN1_bytes; - d2i_ASN1_type_bytes; - d2i_DHparams; - d2i_DSAPrivateKey; - d2i_DSAPrivateKey_bio; - d2i_DSAPrivateKey_fp; - d2i_DSAPublicKey; - d2i_DSAparams; - d2i_NETSCAPE_SPKAC; - d2i_NETSCAPE_SPKI; - d2i_Netscape_RSA; - d2i_PKCS7; - d2i_PKCS7_DIGEST; - d2i_PKCS7_ENCRYPT; - d2i_PKCS7_ENC_CONTENT; - d2i_PKCS7_ENVELOPE; - d2i_PKCS7_ISSUER_AND_SERIAL; - d2i_PKCS7_RECIP_INFO; - d2i_PKCS7_SIGNED; - d2i_PKCS7_SIGNER_INFO; - d2i_PKCS7_SIGN_ENVELOPE; - d2i_PKCS7_bio; - d2i_PKCS7_fp; - d2i_PrivateKey; - d2i_PublicKey; - d2i_RSAPrivateKey; - d2i_RSAPrivateKey_bio; - d2i_RSAPrivateKey_fp; - d2i_RSAPublicKey; - d2i_X509; - d2i_X509_ALGOR; - d2i_X509_ATTRIBUTE; - d2i_X509_CINF; - d2i_X509_CRL; - d2i_X509_CRL_INFO; - d2i_X509_CRL_bio; - d2i_X509_CRL_fp; - d2i_X509_EXTENSION; - d2i_X509_NAME; - d2i_X509_NAME_ENTRY; - d2i_X509_PKEY; - d2i_X509_PUBKEY; - d2i_X509_REQ; - d2i_X509_REQ_INFO; - d2i_X509_REQ_bio; - d2i_X509_REQ_fp; - d2i_X509_REVOKED; - d2i_X509_SIG; - d2i_X509_VAL; - d2i_X509_bio; - d2i_X509_fp; - DES_cbc_cksum; - DES_cbc_encrypt; - DES_cfb64_encrypt; - DES_cfb_encrypt; - DES_decrypt3; - DES_ecb3_encrypt; - DES_ecb_encrypt; - DES_ede3_cbc_encrypt; - DES_ede3_cfb64_encrypt; - DES_ede3_ofb64_encrypt; - DES_enc_read; - DES_enc_write; - DES_encrypt1; - DES_encrypt2; - DES_encrypt3; - DES_fcrypt; - DES_is_weak_key; - DES_key_sched; - DES_ncbc_encrypt; - DES_ofb64_encrypt; - DES_ofb_encrypt; - DES_options; - DES_pcbc_encrypt; - DES_quad_cksum; - DES_random_key; - _ossl_old_des_random_seed; - _ossl_old_des_read_2passwords; - _ossl_old_des_read_password; - _ossl_old_des_read_pw; - _ossl_old_des_read_pw_string; - DES_set_key; - DES_set_odd_parity; - DES_string_to_2keys; - DES_string_to_key; - DES_xcbc_encrypt; - fcrypt_body; - i2a_ASN1_INTEGER; - i2a_ASN1_OBJECT; - i2a_ASN1_STRING; - i2d_ASN1_BIT_STRING; - i2d_ASN1_BOOLEAN; - i2d_ASN1_IA5STRING; - i2d_ASN1_INTEGER; - i2d_ASN1_OBJECT; - i2d_ASN1_OCTET_STRING; - i2d_ASN1_PRINTABLE; - i2d_ASN1_SET; - i2d_ASN1_TYPE; - i2d_ASN1_UTCTIME; - i2d_ASN1_bytes; - i2d_DHparams; - i2d_DSAPrivateKey; - i2d_DSAPrivateKey_bio; - i2d_DSAPrivateKey_fp; - i2d_DSAPublicKey; - i2d_DSAparams; - i2d_NETSCAPE_SPKAC; - i2d_NETSCAPE_SPKI; - i2d_Netscape_RSA; - i2d_PKCS7; - i2d_PKCS7_DIGEST; - i2d_PKCS7_ENCRYPT; - i2d_PKCS7_ENC_CONTENT; - i2d_PKCS7_ENVELOPE; - i2d_PKCS7_ISSUER_AND_SERIAL; - i2d_PKCS7_RECIP_INFO; - i2d_PKCS7_SIGNED; - i2d_PKCS7_SIGNER_INFO; - i2d_PKCS7_SIGN_ENVELOPE; - i2d_PKCS7_bio; - i2d_PKCS7_fp; - i2d_PrivateKey; - i2d_PublicKey; - i2d_RSAPrivateKey; - i2d_RSAPrivateKey_bio; - i2d_RSAPrivateKey_fp; - i2d_RSAPublicKey; - i2d_X509; - i2d_X509_ALGOR; - i2d_X509_ATTRIBUTE; - i2d_X509_CINF; - i2d_X509_CRL; - i2d_X509_CRL_INFO; - i2d_X509_CRL_bio; - i2d_X509_CRL_fp; - i2d_X509_EXTENSION; - i2d_X509_NAME; - i2d_X509_NAME_ENTRY; - i2d_X509_PKEY; - i2d_X509_PUBKEY; - i2d_X509_REQ; - i2d_X509_REQ_INFO; - i2d_X509_REQ_bio; - i2d_X509_REQ_fp; - i2d_X509_REVOKED; - i2d_X509_SIG; - i2d_X509_VAL; - i2d_X509_bio; - i2d_X509_fp; - idea_cbc_encrypt; - idea_cfb64_encrypt; - idea_ecb_encrypt; - idea_encrypt; - idea_ofb64_encrypt; - idea_options; - idea_set_decrypt_key; - idea_set_encrypt_key; - lh_delete; - lh_doall; - lh_doall_arg; - lh_free; - lh_insert; - lh_new; - lh_node_stats; - lh_node_stats_bio; - lh_node_usage_stats; - lh_node_usage_stats_bio; - lh_retrieve; - lh_stats; - lh_stats_bio; - lh_strhash; - sk_delete; - sk_delete_ptr; - sk_dup; - sk_find; - sk_free; - sk_insert; - sk_new; - sk_pop; - sk_pop_free; - sk_push; - sk_set_cmp_func; - sk_shift; - sk_unshift; - sk_zero; - BIO_f_nbio_test; - ASN1_TYPE_get; - ASN1_TYPE_set; - ERR_load_PKCS7_strings; - X509_find_by_issuer_and_serial; - X509_find_by_subject; - PKCS7_ctrl; - PKCS7_set_type; - PKCS7_set_content; - PKCS7_SIGNER_INFO_set; - PKCS7_add_signer; - PKCS7_add_certificate; - PKCS7_add_crl; - PKCS7_content_new; - PKCS7_dataVerify; - PKCS7_dataInit; - PKCS7_add_signature; - PKCS7_cert_from_signer_info; - PKCS7_get_signer_info; - EVP_mdc2; - PEM_read_bio_RSAPublicKey; - PEM_write_bio_RSAPublicKey; - d2i_RSAPublicKey_bio; - i2d_RSAPublicKey_bio; - PEM_read_RSAPublicKey; - PEM_write_RSAPublicKey; - d2i_RSAPublicKey_fp; - i2d_RSAPublicKey_fp; - BIO_copy_next_retry; - RSA_flags; - X509_STORE_add_crl; - X509_load_crl_file; - EVP_rc2_40_cbc; - EVP_rc4_40; - EVP_CIPHER_CTX_init; - HMAC; - HMAC_Init; - HMAC_Update; - HMAC_Final; - ERR_get_next_error_library; - EVP_PKEY_cmp_parameters; - BIO_ptr_ctrl; - BN_BLINDING_convert; - BN_BLINDING_invert; - BN_BLINDING_update; - RSA_blinding_on; - RSA_blinding_off; - i2t_ASN1_OBJECT; - BN_BLINDING_new; - BN_BLINDING_free; - EVP_cast5_cbc; - EVP_cast5_cfb64; - EVP_cast5_ecb; - EVP_cast5_ofb; - BF_decrypt; - CAST_set_key; - CAST_encrypt; - CAST_decrypt; - CAST_ecb_encrypt; - CAST_cbc_encrypt; - CAST_cfb64_encrypt; - CAST_ofb64_encrypt; - RC2_decrypt; - OBJ_create_objects; - BN_exp; - BN_mul_word; - BN_sub_word; - BN_dec2bn; - BN_bn2dec; - CRYPTO_free_ex_data; - CRYPTO_get_ex_data; - CRYPTO_set_ex_data; - ERR_load_CRYPTO_strings; - EVP_PKEY_bits; - MD5_Transform; - SHA1_Transform; - SHA_Transform; - X509_STORE_CTX_get_chain; - X509_STORE_CTX_get_current_cert; - X509_STORE_CTX_get_error; - X509_STORE_CTX_get_error_depth; - X509_STORE_CTX_get_ex_data; - X509_STORE_CTX_set_cert; - X509_STORE_CTX_set_chain; - X509_STORE_CTX_set_error; - X509_STORE_CTX_set_ex_data; - CRYPTO_dup_ex_data; - CRYPTO_get_new_lockid; - CRYPTO_new_ex_data; - RSA_set_ex_data; - RSA_get_ex_data; - RSA_get_ex_new_index; - RSA_padding_add_PKCS1_type_1; - RSA_padding_add_PKCS1_type_2; - RSA_padding_add_SSLv23; - RSA_padding_add_none; - RSA_padding_check_PKCS1_type_1; - RSA_padding_check_PKCS1_type_2; - RSA_padding_check_SSLv23; - RSA_padding_check_none; - bn_add_words; - CRYPTO_get_ex_new_index; - RIPEMD160_Init; - RIPEMD160_Update; - RIPEMD160_Final; - RIPEMD160; - RIPEMD160_Transform; - BN_bn2mpi; - BN_mpi2bn; - ASN1_BIT_STRING_get_bit; - ASN1_BIT_STRING_set_bit; - BIO_get_ex_data; - BIO_get_ex_new_index; - BIO_set_ex_data; - EVP_PKEY_decrypt; - EVP_PKEY_encrypt; - PKCS7_RECIP_INFO_set; - PKCS7_add_recipient; - PKCS7_add_recipient_info; - PKCS7_set_cipher; - ASN1_TYPE_get_int_octetstring; - ASN1_TYPE_get_octetstring; - ASN1_TYPE_set_int_octetstring; - ASN1_TYPE_set_octetstring; - ASN1_UTCTIME_set_string; - ERR_add_error_data; - ERR_set_error_data; - EVP_CIPHER_asn1_to_param; - EVP_CIPHER_param_to_asn1; - EVP_CIPHER_get_asn1_iv; - EVP_CIPHER_set_asn1_iv; - asn1_add_error; - d2i_ASN1_BMPSTRING; - i2d_ASN1_BMPSTRING; - BN_init; - COMP_CTX_new; - COMP_CTX_free; - X509_STORE_CTX_get_ex_new_index; - OBJ_NAME_add; - BIO_socket_nbio; - EVP_rc2_64_cbc; - OBJ_NAME_cleanup; - OBJ_NAME_get; - OBJ_NAME_init; - OBJ_NAME_new_index; - OBJ_NAME_remove; - BN_MONT_CTX_copy; - RAND_SSLeay; - RAND_set_rand_method; - RSA_memory_lock; - bn_sub_words; - bn_mul_normal; - bn_mul_comba8; - bn_mul_comba4; - bn_sqr_normal; - bn_sqr_comba8; - bn_sqr_comba4; - bn_cmp_words; - bn_mul_recursive; - bn_mul_part_recursive; - bn_sqr_recursive; - bn_mul_low_normal; - BN_RECP_CTX_init; - BN_RECP_CTX_new; - BN_RECP_CTX_free; - BN_RECP_CTX_set; - BN_mod_mul_reciprocal; - BN_mod_exp_recp; - BN_div_recp; - BN_CTX_init; - BN_MONT_CTX_init; - RAND_get_rand_method; - PKCS7_add_attribute; - PKCS7_add_signed_attribute; - PKCS7_digest_from_attributes; - PKCS7_get_attribute; - PKCS7_get_issuer_and_serial; - PKCS7_get_signed_attribute; - COMP_compress_block; - COMP_expand_block; - COMP_rle; - COMP_zlib; - PKCS7_set_attributes; - PKCS7_set_signed_attributes; - X509_ATTRIBUTE_create; - X509_ATTRIBUTE_dup; - ASN1_GENERALIZEDTIME_check; - ASN1_GENERALIZEDTIME_print; - ASN1_GENERALIZEDTIME_set; - ASN1_GENERALIZEDTIME_set_string; - ASN1_TIME_print; - BASIC_CONSTRAINTS_free; - BASIC_CONSTRAINTS_new; - ERR_load_X509V3_strings; - NETSCAPE_CERT_SEQUENCE_free; - NETSCAPE_CERT_SEQUENCE_new; - OBJ_txt2obj; - PEM_read_NETSCAPE_CERT_SEQUENCE; - PEM_read_bio_NETSCAPE_CERT_SEQUENCE; - PEM_write_NETSCAPE_CERT_SEQUENCE; - PEM_write_bio_NETSCAPE_CERT_SEQUENCE; - X509V3_EXT_add; - X509V3_EXT_add_alias; - X509V3_EXT_add_conf; - X509V3_EXT_cleanup; - X509V3_EXT_conf; - X509V3_EXT_conf_nid; - X509V3_EXT_get; - X509V3_EXT_get_nid; - X509V3_EXT_print; - X509V3_EXT_print_fp; - X509V3_add_standard_extensions; - X509V3_add_value; - X509V3_add_value_bool; - X509V3_add_value_int; - X509V3_conf_free; - X509V3_get_value_bool; - X509V3_get_value_int; - X509V3_parse_list; - d2i_ASN1_GENERALIZEDTIME; - d2i_ASN1_TIME; - d2i_BASIC_CONSTRAINTS; - d2i_NETSCAPE_CERT_SEQUENCE; - i2d_ASN1_GENERALIZEDTIME; - i2d_ASN1_TIME; - i2d_BASIC_CONSTRAINTS; - i2d_NETSCAPE_CERT_SEQUENCE; - EVP_MD_CTX_copy; - i2d_ASN1_ENUMERATED; - d2i_ASN1_ENUMERATED; - ASN1_ENUMERATED_set; - ASN1_ENUMERATED_get; - BN_to_ASN1_ENUMERATED; - ASN1_ENUMERATED_to_BN; - i2a_ASN1_ENUMERATED; - a2i_ASN1_ENUMERATED; - i2d_GENERAL_NAME; - d2i_GENERAL_NAME; - GENERAL_NAME_new; - GENERAL_NAME_free; - GENERAL_NAMES_new; - GENERAL_NAMES_free; - d2i_GENERAL_NAMES; - i2d_GENERAL_NAMES; - i2v_GENERAL_NAMES; - i2s_ASN1_OCTET_STRING; - s2i_ASN1_OCTET_STRING; - hex_to_string; - string_to_hex; - DES_ede3_cbcm_encrypt; - RSA_padding_add_PKCS1_OAEP; - RSA_padding_check_PKCS1_OAEP; - X509_CRL_print_fp; - X509_CRL_print; - i2v_GENERAL_NAME; - v2i_GENERAL_NAME; - i2d_PKEY_USAGE_PERIOD; - d2i_PKEY_USAGE_PERIOD; - PKEY_USAGE_PERIOD_new; - PKEY_USAGE_PERIOD_free; - v2i_GENERAL_NAMES; - i2s_ASN1_INTEGER; - X509V3_EXT_d2i; - name_cmp; - i2s_ASN1_ENUMERATED; - i2s_ASN1_ENUMERATED_TABLE; - BIO_s_log; - BIO_f_reliable; - PKCS7_dataFinal; - PKCS7_dataDecode; - X509V3_EXT_CRL_add_conf; - BN_set_params; - BN_get_params; - EVP_ripemd160; - ASN1_TIME_set; - i2d_AUTHORITY_KEYID; - d2i_AUTHORITY_KEYID; - AUTHORITY_KEYID_new; - AUTHORITY_KEYID_free; - ASN1_seq_unpack; - ASN1_seq_pack; - ASN1_unpack_string; - ASN1_pack_string; - PKCS12_MAKE_KEYBAG; - PKCS8_encrypt; - PKCS12_MAKE_SHKEYBAG; - PKCS12_pack_p7data; - PKCS12_pack_p7encdata; - PKCS12_add_localkeyid; - PKCS12_add_friendlyname_asc; - PKCS12_add_friendlyname_uni; - PKCS12_get_friendlyname; - PKCS12_pbe_crypt; - PKCS12_init; - PKCS12_key_gen_asc; - PKCS12_key_gen_uni; - PKCS12_gen_mac; - PKCS12_verify_mac; - PKCS12_set_mac; - PKCS12_setup_mac; - OPENSSL_asc2uni; - OPENSSL_uni2asc; - i2d_PKCS12_BAGS; - PKCS12_BAGS_new; - d2i_PKCS12_BAGS; - PKCS12_BAGS_free; - i2d_PKCS12; - d2i_PKCS12; - PKCS12_new; - PKCS12_free; - i2d_PKCS12_MAC_DATA; - PKCS12_MAC_DATA_new; - d2i_PKCS12_MAC_DATA; - PKCS12_MAC_DATA_free; - i2d_PKCS12_SAFEBAG; - PKCS12_SAFEBAG_new; - d2i_PKCS12_SAFEBAG; - PKCS12_SAFEBAG_free; - ERR_load_PKCS12_strings; - PKCS12_PBE_add; - PKCS8_add_keyusage; - PKCS12_get_attr_gen; - PKCS12_parse; - PKCS12_create; - i2d_PKCS12_bio; - i2d_PKCS12_fp; - d2i_PKCS12_bio; - d2i_PKCS12_fp; - i2d_PBEPARAM; - PBEPARAM_new; - d2i_PBEPARAM; - PBEPARAM_free; - i2d_PKCS8_PRIV_KEY_INFO; - PKCS8_PRIV_KEY_INFO_new; - d2i_PKCS8_PRIV_KEY_INFO; - PKCS8_PRIV_KEY_INFO_free; - EVP_PKCS82PKEY; - EVP_PKEY2PKCS8; - PKCS8_set_broken; - EVP_PBE_alg_add; - PKCS5_pbe_set; - EVP_PBE_cleanup; - i2d_SXNET; - d2i_SXNET; - SXNET_new; - SXNET_free; - i2d_SXNETID; - d2i_SXNETID; - SXNETID_new; - SXNETID_free; - DSA_SIG_new; - DSA_SIG_free; - DSA_do_sign; - DSA_do_verify; - d2i_DSA_SIG; - i2d_DSA_SIG; - i2d_ASN1_VISIBLESTRING; - d2i_ASN1_VISIBLESTRING; - i2d_ASN1_UTF8STRING; - d2i_ASN1_UTF8STRING; - i2d_DIRECTORYSTRING; - d2i_DIRECTORYSTRING; - i2d_DISPLAYTEXT; - d2i_DISPLAYTEXT; - i2d_PBKDF2PARAM; - PBKDF2PARAM_new; - d2i_PBKDF2PARAM; - PBKDF2PARAM_free; - i2d_PBE2PARAM; - PBE2PARAM_new; - d2i_PBE2PARAM; - PBE2PARAM_free; - SXNET_add_id_asc; - SXNET_add_id_ulong; - SXNET_add_id_INTEGER; - SXNET_get_id_asc; - SXNET_get_id_ulong; - SXNET_get_id_INTEGER; - X509V3_set_conf_lhash; - i2d_CERTIFICATEPOLICIES; - CERTIFICATEPOLICIES_new; - CERTIFICATEPOLICIES_free; - d2i_CERTIFICATEPOLICIES; - i2d_POLICYINFO; - POLICYINFO_new; - d2i_POLICYINFO; - POLICYINFO_free; - i2d_POLICYQUALINFO; - POLICYQUALINFO_new; - d2i_POLICYQUALINFO; - POLICYQUALINFO_free; - i2d_USERNOTICE; - USERNOTICE_new; - d2i_USERNOTICE; - USERNOTICE_free; - i2d_NOTICEREF; - NOTICEREF_new; - d2i_NOTICEREF; - NOTICEREF_free; - X509V3_get_string; - X509V3_get_section; - X509V3_string_free; - X509V3_section_free; - X509V3_set_ctx; - s2i_ASN1_INTEGER; - CRYPTO_set_locked_mem_functions; - CRYPTO_get_locked_mem_functions; - CRYPTO_malloc_locked; - CRYPTO_free_locked; - BN_mod_exp2_mont; - ERR_get_error_line_data; - ERR_peek_error_line_data; - PKCS12_PBE_keyivgen; - X509_ALGOR_dup; - i2d_CRL_DIST_POINTS; - CRL_DIST_POINTS_new; - CRL_DIST_POINTS_free; - d2i_CRL_DIST_POINTS; - i2d_DIST_POINT; - DIST_POINT_new; - d2i_DIST_POINT; - DIST_POINT_free; - i2d_DIST_POINT_NAME; - DIST_POINT_NAME_new; - DIST_POINT_NAME_free; - d2i_DIST_POINT_NAME; - X509V3_add_value_uchar; - X509V3_EXT_i2d; - X509V3_EXT_val_prn; - X509V3_EXT_add_list; - EVP_CIPHER_type; - EVP_PBE_CipherInit; - X509V3_add_value_bool_nf; - d2i_ASN1_UINTEGER; - sk_value; - sk_num; - sk_set; - sk_sort; - PKCS5_PBE_add; - PEM_write_bio_PKCS8; - i2d_PKCS8_fp; - PEM_read_bio_PKCS8_PRIV_KEY_INFO; - d2i_PKCS8_bio; - d2i_PKCS8_PRIV_KEY_INFO_fp; - PEM_write_bio_PKCS8_PRIV_KEY_INFO; - PEM_read_PKCS8; - d2i_PKCS8_PRIV_KEY_INFO_bio; - d2i_PKCS8_fp; - PEM_write_PKCS8; - PEM_read_PKCS8_PRIV_KEY_INFO; - PEM_read_bio_PKCS8; - PEM_write_PKCS8_PRIV_KEY_INFO; - PKCS5_PBE_keyivgen; - i2d_PKCS8_bio; - i2d_PKCS8_PRIV_KEY_INFO_fp; - i2d_PKCS8_PRIV_KEY_INFO_bio; - BIO_s_bio; - PKCS5_pbe2_set; - PKCS5_PBKDF2_HMAC_SHA1; - PKCS5_v2_PBE_keyivgen; - PEM_write_bio_PKCS8PrivateKey; - PEM_write_PKCS8PrivateKey; - BIO_ctrl_get_read_request; - BIO_ctrl_pending; - BIO_ctrl_wpending; - BIO_new_bio_pair; - BIO_ctrl_get_write_guarantee; - CRYPTO_num_locks; - CONF_load_bio; - CONF_load_fp; - PKCS7_signatureVerify; - RSA_set_method; - RSA_get_method; - RSA_get_default_method; - RSA_check_key; - OBJ_obj2txt; - DSA_dup_DH; - X509_REQ_get_extensions; - X509_REQ_set_extension_nids; - BIO_nwrite; - X509_REQ_extension_nid; - BIO_nread; - X509_REQ_get_extension_nids; - BIO_nwrite0; - X509_REQ_add_extensions_nid; - BIO_nread0; - X509_REQ_add_extensions; - BIO_new_mem_buf; - DH_set_ex_data; - DH_set_method; - DSA_OpenSSL; - DH_get_ex_data; - DH_get_ex_new_index; - DSA_new_method; - DH_new_method; - DH_OpenSSL; - DSA_get_ex_new_index; - DH_get_default_method; - DSA_set_ex_data; - DH_set_default_method; - DSA_get_ex_data; - X509V3_EXT_REQ_add_conf; - NETSCAPE_SPKI_print; - NETSCAPE_SPKI_set_pubkey; - NETSCAPE_SPKI_b64_encode; - NETSCAPE_SPKI_get_pubkey; - NETSCAPE_SPKI_b64_decode; - UTF8_putc; - UTF8_getc; - RSA_null_method; - ASN1_tag2str; - BIO_ctrl_reset_read_request; - DISPLAYTEXT_new; - ASN1_GENERALIZEDTIME_free; - X509_REVOKED_get_ext_d2i; - X509_set_ex_data; - X509_NAME_add_entry_by_txt; - X509_NAME_add_entry_by_NID; - X509_PURPOSE_get0; - PEM_read_X509_AUX; - d2i_AUTHORITY_INFO_ACCESS; - PEM_write_PUBKEY; - ACCESS_DESCRIPTION_new; - X509_CERT_AUX_free; - d2i_ACCESS_DESCRIPTION; - X509_trust_clear; - X509_TRUST_add; - ASN1_VISIBLESTRING_new; - X509_alias_set1; - ASN1_PRINTABLESTRING_free; - EVP_PKEY_get1_DSA; - ASN1_BMPSTRING_new; - ASN1_mbstring_copy; - ASN1_UTF8STRING_new; - DSA_get_default_method; - ASN1_T61STRING_free; - DSA_set_method; - X509_get_ex_data; - ASN1_STRING_type; - X509_PURPOSE_get_by_sname; - ASN1_TIME_free; - ASN1_OCTET_STRING_cmp; - ASN1_BIT_STRING_new; - X509_get_ext_d2i; - PEM_read_bio_X509_AUX; - ASN1_STRING_set_default_mask_asc; - PEM_write_bio_RSA_PUBKEY; - ASN1_INTEGER_cmp; - d2i_RSA_PUBKEY_fp; - PEM_write_bio_DSA_PUBKEY; - X509_STORE_CTX_free; - EVP_PKEY_set1_DSA; - i2d_DSA_PUBKEY_fp; - X509_load_cert_crl_file; - ASN1_TIME_new; - i2d_RSA_PUBKEY; - X509_STORE_CTX_purpose_inherit; - PEM_read_RSA_PUBKEY; - d2i_X509_AUX; - i2d_DSA_PUBKEY; - X509_CERT_AUX_print; - PEM_read_DSA_PUBKEY; - i2d_RSA_PUBKEY_bio; - ASN1_BIT_STRING_num_asc; - i2d_PUBKEY; - ASN1_UTCTIME_free; - DSA_set_default_method; - X509_PURPOSE_get_by_id; - ACCESS_DESCRIPTION_free; - PEM_read_bio_PUBKEY; - ASN1_STRING_set_by_NID; - X509_PURPOSE_get_id; - DISPLAYTEXT_free; - OTHERNAME_new; - X509_CERT_AUX_new; - X509_TRUST_cleanup; - X509_NAME_add_entry_by_OBJ; - X509_CRL_get_ext_d2i; - X509_PURPOSE_get0_name; - PEM_read_PUBKEY; - i2d_DSA_PUBKEY_bio; - i2d_OTHERNAME; - ASN1_OCTET_STRING_free; - ASN1_BIT_STRING_set_asc; - X509_get_ex_new_index; - ASN1_STRING_TABLE_cleanup; - X509_TRUST_get_by_id; - X509_PURPOSE_get_trust; - ASN1_STRING_length; - ASN1_PRINTABLESTRING_new; - X509V3_get_d2i; - ASN1_ENUMERATED_free; - i2d_X509_CERT_AUX; - X509_STORE_CTX_set_trust; - ASN1_STRING_set_default_mask; - X509_STORE_CTX_new; - EVP_PKEY_get1_RSA; - DIRECTORYSTRING_free; - PEM_write_X509_AUX; - ASN1_OCTET_STRING_set; - d2i_DSA_PUBKEY_fp; - d2i_RSA_PUBKEY; - X509_TRUST_get0_name; - X509_TRUST_get0; - AUTHORITY_INFO_ACCESS_free; - ASN1_IA5STRING_new; - d2i_DSA_PUBKEY; - X509_check_purpose; - ASN1_ENUMERATED_new; - d2i_RSA_PUBKEY_bio; - d2i_PUBKEY; - X509_TRUST_get_trust; - X509_TRUST_get_flags; - ASN1_BMPSTRING_free; - ASN1_T61STRING_new; - ASN1_UTCTIME_new; - i2d_AUTHORITY_INFO_ACCESS; - EVP_PKEY_set1_RSA; - X509_STORE_CTX_set_purpose; - ASN1_IA5STRING_free; - PEM_write_bio_X509_AUX; - X509_PURPOSE_get_count; - X509_NAME_ENTRY_create_by_txt; - ASN1_STRING_get_default_mask; - X509_alias_get0; - ASN1_STRING_data; - i2d_ACCESS_DESCRIPTION; - ASN1_BIT_STRING_free; - PEM_read_bio_RSA_PUBKEY; - X509_add1_reject_object; - X509_check_trust; - PEM_read_bio_DSA_PUBKEY; - X509_PURPOSE_add; - ASN1_STRING_TABLE_get; - ASN1_UTF8STRING_free; - d2i_DSA_PUBKEY_bio; - PEM_write_RSA_PUBKEY; - d2i_OTHERNAME; - PEM_write_DSA_PUBKEY; - X509_PURPOSE_get0_sname; - EVP_PKEY_set1_DH; - ASN1_OCTET_STRING_dup; - ASN1_BIT_STRING_set; - X509_TRUST_get_count; - ASN1_INTEGER_free; - OTHERNAME_free; - i2d_RSA_PUBKEY_fp; - ASN1_INTEGER_dup; - d2i_X509_CERT_AUX; - PEM_write_bio_PUBKEY; - ASN1_VISIBLESTRING_free; - X509_PURPOSE_cleanup; - ASN1_mbstring_ncopy; - ASN1_GENERALIZEDTIME_new; - EVP_PKEY_get1_DH; - ASN1_OCTET_STRING_new; - ASN1_INTEGER_new; - i2d_X509_AUX; - ASN1_BIT_STRING_name_print; - X509_cmp; - ASN1_STRING_length_set; - DIRECTORYSTRING_new; - X509_add1_trust_object; - PKCS12_newpass; - SMIME_write_PKCS7; - SMIME_read_PKCS7; - DES_set_key_checked; - PKCS7_verify; - PKCS7_encrypt; - DES_set_key_unchecked; - SMIME_crlf_copy; - i2d_ASN1_PRINTABLESTRING; - PKCS7_get0_signers; - PKCS7_decrypt; - SMIME_text; - PKCS7_simple_smimecap; - PKCS7_get_smimecap; - PKCS7_sign; - PKCS7_add_attrib_smimecap; - CRYPTO_dbg_set_options; - CRYPTO_remove_all_info; - CRYPTO_get_mem_debug_functions; - CRYPTO_is_mem_check_on; - CRYPTO_set_mem_debug_functions; - CRYPTO_pop_info; - CRYPTO_push_info_; - CRYPTO_set_mem_debug_options; - PEM_write_PKCS8PrivateKey_nid; - PEM_write_bio_PKCS8PrivateKey_nid; - d2i_PKCS8PrivateKey_bio; - ASN1_NULL_free; - d2i_ASN1_NULL; - ASN1_NULL_new; - i2d_PKCS8PrivateKey_bio; - i2d_PKCS8PrivateKey_fp; - i2d_ASN1_NULL; - i2d_PKCS8PrivateKey_nid_fp; - d2i_PKCS8PrivateKey_fp; - i2d_PKCS8PrivateKey_nid_bio; - i2d_PKCS8PrivateKeyInfo_fp; - i2d_PKCS8PrivateKeyInfo_bio; - i2d_PrivateKey_fp; - d2i_PrivateKey_bio; - d2i_PrivateKey_fp; - i2d_PrivateKey_bio; - X509_reject_clear; - X509_TRUST_set_default; - d2i_AutoPrivateKey; - X509_ATTRIBUTE_get0_type; - X509_ATTRIBUTE_set1_data; - X509at_get_attr; - X509at_get_attr_count; - X509_ATTRIBUTE_create_by_NID; - X509_ATTRIBUTE_set1_object; - X509_ATTRIBUTE_count; - X509_ATTRIBUTE_create_by_OBJ; - X509_ATTRIBUTE_get0_object; - X509at_get_attr_by_NID; - X509at_add1_attr; - X509_ATTRIBUTE_get0_data; - X509at_delete_attr; - X509at_get_attr_by_OBJ; - RAND_add; - BIO_number_written; - BIO_number_read; - X509_STORE_CTX_get1_chain; - ERR_load_RAND_strings; - RAND_pseudo_bytes; - X509_REQ_get_attr_by_NID; - X509_REQ_get_attr; - X509_REQ_add1_attr_by_NID; - X509_REQ_get_attr_by_OBJ; - X509at_add1_attr_by_NID; - X509_REQ_add1_attr_by_OBJ; - X509_REQ_get_attr_count; - X509_REQ_add1_attr; - X509_REQ_delete_attr; - X509at_add1_attr_by_OBJ; - X509_REQ_add1_attr_by_txt; - X509_ATTRIBUTE_create_by_txt; - X509at_add1_attr_by_txt; - BN_pseudo_rand; - BN_is_prime_fasttest; - BN_CTX_end; - BN_CTX_start; - BN_CTX_get; - EVP_PKEY2PKCS8_broken; - ASN1_STRING_TABLE_add; - CRYPTO_dbg_get_options; - AUTHORITY_INFO_ACCESS_new; - CRYPTO_get_mem_debug_options; - DES_crypt; - PEM_write_bio_X509_REQ_NEW; - PEM_write_X509_REQ_NEW; - BIO_callback_ctrl; - RAND_egd; - RAND_status; - DES_check_key_parity; - lh_num_items; - DSO_new; - DSO_new_method; - DSO_free; - DSO_flags; - DSO_set_default_method; - DSO_get_default_method; - DSO_get_method; - DSO_set_method; - DSO_load; - DSO_bind_var; - DSO_METHOD_null; - DSO_METHOD_openssl; - DSO_METHOD_dlfcn; - DSO_METHOD_win32; - ERR_load_DSO_strings; - DSO_METHOD_dl; - NCONF_load; - NCONF_load_fp; - NCONF_new; - NCONF_get_string; - NCONF_free; - CONF_dump_fp; - NCONF_load_bio; - NCONF_dump_fp; - NCONF_get_section; - NCONF_dump_bio; - CONF_dump_bio; - NCONF_free_data; - CONF_set_default_method; - ERR_error_string_n; - BIO_snprintf; - DSO_ctrl; - BIO_vfree; - X509_REQ_digest; - X509_CRL_digest; - EVP_CIPHER_CTX_set_key_length; - EVP_CIPHER_CTX_ctrl; - BN_mod_exp_mont_word; - RAND_egd_bytes; - X509_REQ_get1_email; - X509_get1_email; - X509_email_free; - i2d_RSA_NET; - d2i_RSA_NET; - DSO_bind_func; - CRYPTO_get_new_dynlockid; - sk_new_null; - CRYPTO_set_dynlock_destroy_callback; - CRYPTO_destroy_dynlockid; - CRYPTO_set_dynlock_create_callback; - CRYPTO_set_dynlock_lock_callback; - CRYPTO_get_dynlock_lock_callback; - CRYPTO_get_dynlock_destroy_callback; - CRYPTO_get_dynlock_value; - CRYPTO_get_dynlock_create_callback; - c2i_ASN1_BIT_STRING; - i2c_ASN1_BIT_STRING; - RAND_poll; - c2i_ASN1_INTEGER; - i2c_ASN1_INTEGER; - BIO_dump_indent; - ASN1_parse_dump; - c2i_ASN1_OBJECT; - X509_NAME_print_ex_fp; - ASN1_STRING_print_ex_fp; - X509_NAME_print_ex; - ASN1_STRING_print_ex; - MD4; - MD4_Transform; - MD4_Final; - MD4_Update; - MD4_Init; - EVP_md4; - i2d_PUBKEY_bio; - i2d_PUBKEY_fp; - d2i_PUBKEY_bio; - ASN1_STRING_to_UTF8; - BIO_vprintf; - BIO_vsnprintf; - d2i_PUBKEY_fp; - X509_cmp_time; - X509_STORE_CTX_set_time; - X509_STORE_CTX_get1_issuer; - X509_OBJECT_retrieve_match; - X509_OBJECT_idx_by_subject; - X509_STORE_CTX_set_flags; - X509_STORE_CTX_trusted_stack; - X509_time_adj; - X509_check_issued; - ASN1_UTCTIME_cmp_time_t; - X509_keyid_set1; - BIO_next; - DSO_METHOD_vms; - BN_bntest_rand; - OPENSSL_issetugid; - BN_rand_range; - ERR_load_ENGINE_strings; - ENGINE_set_DSA; - ENGINE_get_finish_function; - ENGINE_get_default_RSA; - ENGINE_set_DH; - ENGINE_init; - ENGINE_finish; - ENGINE_load_public_key; - ENGINE_get_DH; - ENGINE_ctrl; - ENGINE_get_init_function; - ENGINE_set_init_function; - ENGINE_set_default_DSA; - ENGINE_get_name; - ENGINE_get_last; - ENGINE_get_prev; - ENGINE_get_default_DH; - ENGINE_get_RSA; - ENGINE_set_default; - ENGINE_get_RAND; - ENGINE_get_first; - ENGINE_by_id; - ENGINE_set_finish_function; - ENGINE_set_RSA; - ENGINE_load_private_key; - ENGINE_set_default_RAND; - ENGINE_remove; - ENGINE_free; - ENGINE_get_next; - ENGINE_set_name; - ENGINE_get_default_DSA; - ENGINE_set_default_RSA; - ENGINE_get_default_RAND; - ENGINE_set_RAND; - ENGINE_set_id; - ENGINE_set_default_DH; - ENGINE_new; - ENGINE_get_id; - ENGINE_add; - ENGINE_get_DSA; - ENGINE_get_ctrl_function; - ENGINE_set_ctrl_function; - BN_pseudo_rand_range; - X509_STORE_CTX_set_verify_cb; - ERR_load_COMP_strings; - PKCS12_item_decrypt_d2i; - ASN1_UTF8STRING_it; - ASN1_UTF8STRING_it; - ENGINE_unregister_ciphers; - ENGINE_get_ciphers; - d2i_OCSP_BASICRESP; - KRB5_CHECKSUM_it; - KRB5_CHECKSUM_it; - EC_POINT_add; - ASN1_item_ex_i2d; - OCSP_CERTID_it; - OCSP_CERTID_it; - d2i_OCSP_RESPBYTES; - X509V3_add1_i2d; - PKCS7_ENVELOPE_it; - PKCS7_ENVELOPE_it; - UI_add_input_boolean; - ENGINE_unregister_RSA; - X509V3_EXT_nconf; - ASN1_GENERALSTRING_free; - d2i_OCSP_CERTSTATUS; - X509_REVOKED_set_serialNumber; - X509_print_ex; - OCSP_ONEREQ_get1_ext_d2i; - ENGINE_register_all_RAND; - ENGINE_load_dynamic; - PBKDF2PARAM_it; - PBKDF2PARAM_it; - EXTENDED_KEY_USAGE_new; - EC_GROUP_clear_free; - OCSP_sendreq_bio; - ASN1_item_digest; - OCSP_BASICRESP_delete_ext; - OCSP_SIGNATURE_it; - OCSP_SIGNATURE_it; - X509_CRL_it; - X509_CRL_it; - OCSP_BASICRESP_add_ext; - KRB5_ENCKEY_it; - KRB5_ENCKEY_it; - UI_method_set_closer; - X509_STORE_set_purpose; - i2d_ASN1_GENERALSTRING; - OCSP_response_status; - i2d_OCSP_SERVICELOC; - ENGINE_get_digest_engine; - EC_GROUP_set_curve_GFp; - OCSP_REQUEST_get_ext_by_OBJ; - _ossl_old_des_random_key; - ASN1_T61STRING_it; - ASN1_T61STRING_it; - EC_GROUP_method_of; - i2d_KRB5_APREQ; - _ossl_old_des_encrypt; - ASN1_PRINTABLE_new; - HMAC_Init_ex; - d2i_KRB5_AUTHENT; - OCSP_archive_cutoff_new; - EC_POINT_set_Jprojective_coordinates_GFp; - _ossl_old_des_is_weak_key; - OCSP_BASICRESP_get_ext_by_OBJ; - EC_POINT_oct2point; - OCSP_SINGLERESP_get_ext_count; - UI_ctrl; - asn1_do_adb; - ASN1_template_i2d; - ENGINE_register_DH; - UI_construct_prompt; - X509_STORE_set_trust; - UI_dup_input_string; - d2i_KRB5_APREQ; - EVP_MD_CTX_copy_ex; - OCSP_request_is_signed; - i2d_OCSP_REQINFO; - KRB5_ENCKEY_free; - OCSP_resp_get0; - GENERAL_NAME_it; - GENERAL_NAME_it; - ASN1_GENERALIZEDTIME_it; - ASN1_GENERALIZEDTIME_it; - X509_STORE_set_flags; - EC_POINT_set_compressed_coordinates_GFp; - OCSP_response_status_str; - d2i_OCSP_REVOKEDINFO; - OCSP_basic_add1_cert; - ERR_get_implementation; - EVP_CipherFinal_ex; - OCSP_CERTSTATUS_new; - CRYPTO_cleanup_all_ex_data; - OCSP_resp_find; - BN_nnmod; - X509_CRL_sort; - X509_REVOKED_set_revocationDate; - ENGINE_register_RAND; - OCSP_SERVICELOC_new; - EC_POINT_set_affine_coordinates_GFp; - _ossl_old_des_options; - SXNET_it; - SXNET_it; - UI_dup_input_boolean; - PKCS12_add_CSPName_asc; - EC_POINT_is_at_infinity; - ENGINE_load_cryptodev; - DSO_convert_filename; - POLICYQUALINFO_it; - POLICYQUALINFO_it; - ENGINE_register_ciphers; - BN_mod_lshift_quick; - DSO_set_filename; - ASN1_item_free; - KRB5_TKTBODY_free; - AUTHORITY_KEYID_it; - AUTHORITY_KEYID_it; - KRB5_APREQBODY_new; - X509V3_EXT_REQ_add_nconf; - ENGINE_ctrl_cmd_string; - i2d_OCSP_RESPDATA; - EVP_MD_CTX_init; - EXTENDED_KEY_USAGE_free; - PKCS7_ATTR_SIGN_it; - PKCS7_ATTR_SIGN_it; - UI_add_error_string; - KRB5_CHECKSUM_free; - OCSP_REQUEST_get_ext; - ENGINE_register_all_digests; - PKEY_USAGE_PERIOD_it; - PKEY_USAGE_PERIOD_it; - PKCS12_unpack_authsafes; - ASN1_item_unpack; - NETSCAPE_SPKAC_it; - NETSCAPE_SPKAC_it; - X509_REVOKED_it; - X509_REVOKED_it; - EVP_aes_128_ecb; - KRB5_AUTHENT_free; - OCSP_BASICRESP_get_ext_by_critical; - OCSP_cert_status_str; - d2i_OCSP_REQUEST; - UI_dup_info_string; - PKCS12_it; - PKCS12_it; - OCSP_SINGLERESP_get_ext_by_critical; - OCSP_CERTSTATUS_free; - _ossl_old_des_crypt; - ASN1_item_i2d; - EVP_DecryptFinal_ex; - ENGINE_load_openssl; - ENGINE_get_cmd_defns; - ENGINE_set_load_privkey_function; - EVP_EncryptFinal_ex; - ENGINE_set_default_digests; - X509_get0_pubkey_bitstr; - asn1_ex_i2c; - ENGINE_register_RSA; - ENGINE_unregister_DSA; - _ossl_old_des_key_sched; - X509_EXTENSION_it; - X509_EXTENSION_it; - i2d_KRB5_AUTHENT; - SXNETID_it; - SXNETID_it; - d2i_OCSP_SINGLERESP; - EDIPARTYNAME_new; - PKCS12_certbag2x509; - _ossl_old_des_ofb64_encrypt; - d2i_EXTENDED_KEY_USAGE; - ERR_print_errors_cb; - ENGINE_set_ciphers; - d2i_KRB5_APREQBODY; - UI_method_get_flusher; - X509_PUBKEY_it; - X509_PUBKEY_it; - _ossl_old_des_enc_read; - PKCS7_ENCRYPT_it; - PKCS7_ENCRYPT_it; - i2d_OCSP_RESPONSE; - EC_GROUP_get_cofactor; - PKCS12_unpack_p7data; - d2i_KRB5_AUTHDATA; - OCSP_copy_nonce; - KRB5_AUTHDATA_new; - OCSP_RESPDATA_new; - EC_GFp_mont_method; - OCSP_REVOKEDINFO_free; - UI_get_ex_data; - KRB5_APREQBODY_free; - EC_GROUP_get0_generator; - UI_get_default_method; - X509V3_set_nconf; - PKCS12_item_i2d_encrypt; - X509_add1_ext_i2d; - PKCS7_SIGNER_INFO_it; - PKCS7_SIGNER_INFO_it; - KRB5_PRINCNAME_new; - PKCS12_SAFEBAG_it; - PKCS12_SAFEBAG_it; - EC_GROUP_get_order; - d2i_OCSP_RESPID; - OCSP_request_verify; - NCONF_get_number_e; - _ossl_old_des_decrypt3; - X509_signature_print; - OCSP_SINGLERESP_free; - ENGINE_load_builtin_engines; - i2d_OCSP_ONEREQ; - OCSP_REQUEST_add_ext; - OCSP_RESPBYTES_new; - EVP_MD_CTX_create; - OCSP_resp_find_status; - X509_ALGOR_it; - X509_ALGOR_it; - ASN1_TIME_it; - ASN1_TIME_it; - OCSP_request_set1_name; - OCSP_ONEREQ_get_ext_count; - UI_get0_result; - PKCS12_AUTHSAFES_it; - PKCS12_AUTHSAFES_it; - EVP_aes_256_ecb; - PKCS12_pack_authsafes; - ASN1_IA5STRING_it; - ASN1_IA5STRING_it; - UI_get_input_flags; - EC_GROUP_set_generator; - _ossl_old_des_string_to_2keys; - OCSP_CERTID_free; - X509_CERT_AUX_it; - X509_CERT_AUX_it; - CERTIFICATEPOLICIES_it; - CERTIFICATEPOLICIES_it; - _ossl_old_des_ede3_cbc_encrypt; - RAND_set_rand_engine; - DSO_get_loaded_filename; - X509_ATTRIBUTE_it; - X509_ATTRIBUTE_it; - OCSP_ONEREQ_get_ext_by_NID; - PKCS12_decrypt_skey; - KRB5_AUTHENT_it; - KRB5_AUTHENT_it; - UI_dup_error_string; - RSAPublicKey_it; - RSAPublicKey_it; - i2d_OCSP_REQUEST; - PKCS12_x509crl2certbag; - OCSP_SERVICELOC_it; - OCSP_SERVICELOC_it; - ASN1_item_sign; - X509_CRL_set_issuer_name; - OBJ_NAME_do_all_sorted; - i2d_OCSP_BASICRESP; - i2d_OCSP_RESPBYTES; - PKCS12_unpack_p7encdata; - HMAC_CTX_init; - ENGINE_get_digest; - OCSP_RESPONSE_print; - KRB5_TKTBODY_it; - KRB5_TKTBODY_it; - ACCESS_DESCRIPTION_it; - ACCESS_DESCRIPTION_it; - PKCS7_ISSUER_AND_SERIAL_it; - PKCS7_ISSUER_AND_SERIAL_it; - PBE2PARAM_it; - PBE2PARAM_it; - PKCS12_certbag2x509crl; - PKCS7_SIGNED_it; - PKCS7_SIGNED_it; - ENGINE_get_cipher; - i2d_OCSP_CRLID; - OCSP_SINGLERESP_new; - ENGINE_cmd_is_executable; - RSA_up_ref; - ASN1_GENERALSTRING_it; - ASN1_GENERALSTRING_it; - ENGINE_register_DSA; - X509V3_EXT_add_nconf_sk; - ENGINE_set_load_pubkey_function; - PKCS8_decrypt; - PEM_bytes_read_bio; - DIRECTORYSTRING_it; - DIRECTORYSTRING_it; - d2i_OCSP_CRLID; - EC_POINT_is_on_curve; - CRYPTO_set_locked_mem_ex_functions; - d2i_KRB5_CHECKSUM; - ASN1_item_dup; - X509_it; - X509_it; - BN_mod_add; - KRB5_AUTHDATA_free; - _ossl_old_des_cbc_cksum; - ASN1_item_verify; - CRYPTO_set_mem_ex_functions; - EC_POINT_get_Jprojective_coordinates_GFp; - ZLONG_it; - ZLONG_it; - CRYPTO_get_locked_mem_ex_functions; - ASN1_TIME_check; - UI_get0_user_data; - HMAC_CTX_cleanup; - DSA_up_ref; - _ossl_old_des_ede3_cfb64_encrypt; - ASN1_BMPSTRING_it; - ASN1_BMPSTRING_it; - ASN1_tag2bit; - UI_method_set_flusher; - X509_ocspid_print; - KRB5_ENCDATA_it; - KRB5_ENCDATA_it; - ENGINE_get_load_pubkey_function; - UI_add_user_data; - OCSP_REQUEST_delete_ext; - UI_get_method; - OCSP_ONEREQ_free; - ASN1_PRINTABLESTRING_it; - ASN1_PRINTABLESTRING_it; - X509_CRL_set_nextUpdate; - OCSP_REQUEST_it; - OCSP_REQUEST_it; - OCSP_BASICRESP_it; - OCSP_BASICRESP_it; - AES_ecb_encrypt; - BN_mod_sqr; - NETSCAPE_CERT_SEQUENCE_it; - NETSCAPE_CERT_SEQUENCE_it; - GENERAL_NAMES_it; - GENERAL_NAMES_it; - AUTHORITY_INFO_ACCESS_it; - AUTHORITY_INFO_ACCESS_it; - ASN1_FBOOLEAN_it; - ASN1_FBOOLEAN_it; - UI_set_ex_data; - _ossl_old_des_string_to_key; - ENGINE_register_all_RSA; - d2i_KRB5_PRINCNAME; - OCSP_RESPBYTES_it; - OCSP_RESPBYTES_it; - X509_CINF_it; - X509_CINF_it; - ENGINE_unregister_digests; - d2i_EDIPARTYNAME; - d2i_OCSP_SERVICELOC; - ENGINE_get_digests; - _ossl_old_des_set_odd_parity; - OCSP_RESPDATA_free; - d2i_KRB5_TICKET; - OTHERNAME_it; - OTHERNAME_it; - EVP_MD_CTX_cleanup; - d2i_ASN1_GENERALSTRING; - X509_CRL_set_version; - BN_mod_sub; - OCSP_SINGLERESP_get_ext_by_NID; - ENGINE_get_ex_new_index; - OCSP_REQUEST_free; - OCSP_REQUEST_add1_ext_i2d; - X509_VAL_it; - X509_VAL_it; - EC_POINTs_make_affine; - EC_POINT_mul; - X509V3_EXT_add_nconf; - X509_TRUST_set; - X509_CRL_add1_ext_i2d; - _ossl_old_des_fcrypt; - DISPLAYTEXT_it; - DISPLAYTEXT_it; - X509_CRL_set_lastUpdate; - OCSP_BASICRESP_free; - OCSP_BASICRESP_add1_ext_i2d; - d2i_KRB5_AUTHENTBODY; - CRYPTO_set_ex_data_implementation; - KRB5_ENCDATA_new; - DSO_up_ref; - OCSP_crl_reason_str; - UI_get0_result_string; - ASN1_GENERALSTRING_new; - X509_SIG_it; - X509_SIG_it; - ERR_set_implementation; - ERR_load_EC_strings; - UI_get0_action_string; - OCSP_ONEREQ_get_ext; - EC_POINT_method_of; - i2d_KRB5_APREQBODY; - _ossl_old_des_ecb3_encrypt; - CRYPTO_get_mem_ex_functions; - ENGINE_get_ex_data; - UI_destroy_method; - ASN1_item_i2d_bio; - OCSP_ONEREQ_get_ext_by_OBJ; - ASN1_primitive_new; - ASN1_PRINTABLE_it; - ASN1_PRINTABLE_it; - EVP_aes_192_ecb; - OCSP_SIGNATURE_new; - LONG_it; - LONG_it; - ASN1_VISIBLESTRING_it; - ASN1_VISIBLESTRING_it; - OCSP_SINGLERESP_add1_ext_i2d; - d2i_OCSP_CERTID; - ASN1_item_d2i_fp; - CRL_DIST_POINTS_it; - CRL_DIST_POINTS_it; - GENERAL_NAME_print; - OCSP_SINGLERESP_delete_ext; - PKCS12_SAFEBAGS_it; - PKCS12_SAFEBAGS_it; - d2i_OCSP_SIGNATURE; - OCSP_request_add1_nonce; - ENGINE_set_cmd_defns; - OCSP_SERVICELOC_free; - EC_GROUP_free; - ASN1_BIT_STRING_it; - ASN1_BIT_STRING_it; - X509_REQ_it; - X509_REQ_it; - _ossl_old_des_cbc_encrypt; - ERR_unload_strings; - PKCS7_SIGN_ENVELOPE_it; - PKCS7_SIGN_ENVELOPE_it; - EDIPARTYNAME_free; - OCSP_REQINFO_free; - EC_GROUP_new_curve_GFp; - OCSP_REQUEST_get1_ext_d2i; - PKCS12_item_pack_safebag; - asn1_ex_c2i; - ENGINE_register_digests; - i2d_OCSP_REVOKEDINFO; - asn1_enc_restore; - UI_free; - UI_new_method; - EVP_EncryptInit_ex; - X509_pubkey_digest; - EC_POINT_invert; - OCSP_basic_sign; - i2d_OCSP_RESPID; - OCSP_check_nonce; - ENGINE_ctrl_cmd; - d2i_KRB5_ENCKEY; - OCSP_parse_url; - OCSP_SINGLERESP_get_ext; - OCSP_CRLID_free; - OCSP_BASICRESP_get1_ext_d2i; - RSAPrivateKey_it; - RSAPrivateKey_it; - ENGINE_register_all_DH; - i2d_EDIPARTYNAME; - EC_POINT_get_affine_coordinates_GFp; - OCSP_CRLID_new; - ENGINE_get_flags; - OCSP_ONEREQ_it; - OCSP_ONEREQ_it; - UI_process; - ASN1_INTEGER_it; - ASN1_INTEGER_it; - EVP_CipherInit_ex; - UI_get_string_type; - ENGINE_unregister_DH; - ENGINE_register_all_DSA; - OCSP_ONEREQ_get_ext_by_critical; - bn_dup_expand; - OCSP_cert_id_new; - BASIC_CONSTRAINTS_it; - BASIC_CONSTRAINTS_it; - BN_mod_add_quick; - EC_POINT_new; - EVP_MD_CTX_destroy; - OCSP_RESPBYTES_free; - EVP_aes_128_cbc; - OCSP_SINGLERESP_get1_ext_d2i; - EC_POINT_free; - DH_up_ref; - X509_NAME_ENTRY_it; - X509_NAME_ENTRY_it; - UI_get_ex_new_index; - BN_mod_sub_quick; - OCSP_ONEREQ_add_ext; - OCSP_request_sign; - EVP_DigestFinal_ex; - ENGINE_set_digests; - OCSP_id_issuer_cmp; - OBJ_NAME_do_all; - EC_POINTs_mul; - ENGINE_register_complete; - X509V3_EXT_nconf_nid; - ASN1_SEQUENCE_it; - ASN1_SEQUENCE_it; - UI_set_default_method; - RAND_query_egd_bytes; - UI_method_get_writer; - UI_OpenSSL; - PEM_def_callback; - ENGINE_cleanup; - DIST_POINT_it; - DIST_POINT_it; - OCSP_SINGLERESP_it; - OCSP_SINGLERESP_it; - d2i_KRB5_TKTBODY; - EC_POINT_cmp; - OCSP_REVOKEDINFO_new; - i2d_OCSP_CERTSTATUS; - OCSP_basic_add1_nonce; - ASN1_item_ex_d2i; - BN_mod_lshift1_quick; - UI_set_method; - OCSP_id_get0_info; - BN_mod_sqrt; - EC_GROUP_copy; - KRB5_ENCDATA_free; - _ossl_old_des_cfb_encrypt; - OCSP_SINGLERESP_get_ext_by_OBJ; - OCSP_cert_to_id; - OCSP_RESPID_new; - OCSP_RESPDATA_it; - OCSP_RESPDATA_it; - d2i_OCSP_RESPDATA; - ENGINE_register_all_complete; - OCSP_check_validity; - PKCS12_BAGS_it; - PKCS12_BAGS_it; - OCSP_url_svcloc_new; - ASN1_template_free; - OCSP_SINGLERESP_add_ext; - KRB5_AUTHENTBODY_it; - KRB5_AUTHENTBODY_it; - X509_supported_extension; - i2d_KRB5_AUTHDATA; - UI_method_get_opener; - ENGINE_set_ex_data; - OCSP_REQUEST_print; - CBIGNUM_it; - CBIGNUM_it; - KRB5_TICKET_new; - KRB5_APREQ_new; - EC_GROUP_get_curve_GFp; - KRB5_ENCKEY_new; - ASN1_template_d2i; - _ossl_old_des_quad_cksum; - OCSP_single_get0_status; - BN_swap; - POLICYINFO_it; - POLICYINFO_it; - ENGINE_set_destroy_function; - asn1_enc_free; - OCSP_RESPID_it; - OCSP_RESPID_it; - EC_GROUP_new; - EVP_aes_256_cbc; - i2d_KRB5_PRINCNAME; - _ossl_old_des_encrypt2; - _ossl_old_des_encrypt3; - PKCS8_PRIV_KEY_INFO_it; - PKCS8_PRIV_KEY_INFO_it; - OCSP_REQINFO_it; - OCSP_REQINFO_it; - PBEPARAM_it; - PBEPARAM_it; - KRB5_AUTHENTBODY_new; - X509_CRL_add0_revoked; - EDIPARTYNAME_it; - EDIPARTYNAME_it; - NETSCAPE_SPKI_it; - NETSCAPE_SPKI_it; - UI_get0_test_string; - ENGINE_get_cipher_engine; - ENGINE_register_all_ciphers; - EC_POINT_copy; - BN_kronecker; - _ossl_old_des_ede3_ofb64_encrypt; - UI_method_get_reader; - OCSP_BASICRESP_get_ext_count; - ASN1_ENUMERATED_it; - ASN1_ENUMERATED_it; - UI_set_result; - i2d_KRB5_TICKET; - X509_print_ex_fp; - EVP_CIPHER_CTX_set_padding; - d2i_OCSP_RESPONSE; - ASN1_UTCTIME_it; - ASN1_UTCTIME_it; - _ossl_old_des_enc_write; - OCSP_RESPONSE_new; - AES_set_encrypt_key; - OCSP_resp_count; - KRB5_CHECKSUM_new; - OCSP_onereq_get0_id; - ENGINE_set_default_ciphers; - NOTICEREF_it; - NOTICEREF_it; - X509V3_EXT_CRL_add_nconf; - OCSP_REVOKEDINFO_it; - OCSP_REVOKEDINFO_it; - AES_encrypt; - OCSP_REQUEST_new; - ASN1_ANY_it; - ASN1_ANY_it; - CRYPTO_ex_data_new_class; - _ossl_old_des_ncbc_encrypt; - i2d_KRB5_TKTBODY; - EC_POINT_clear_free; - AES_decrypt; - asn1_enc_init; - UI_get_result_maxsize; - OCSP_CERTID_new; - ENGINE_unregister_RAND; - UI_method_get_closer; - d2i_KRB5_ENCDATA; - OCSP_request_onereq_count; - OCSP_basic_verify; - KRB5_AUTHENTBODY_free; - ASN1_item_d2i; - ASN1_primitive_free; - i2d_EXTENDED_KEY_USAGE; - i2d_OCSP_SIGNATURE; - asn1_enc_save; - _ossl_old_des_pcbc_encrypt; - PKCS12_MAC_DATA_it; - PKCS12_MAC_DATA_it; - OCSP_accept_responses_new; - asn1_do_lock; - PKCS7_ATTR_VERIFY_it; - PKCS7_ATTR_VERIFY_it; - KRB5_APREQBODY_it; - KRB5_APREQBODY_it; - i2d_OCSP_SINGLERESP; - ASN1_item_ex_new; - UI_add_verify_string; - _ossl_old_des_set_key; - KRB5_PRINCNAME_it; - KRB5_PRINCNAME_it; - EVP_DecryptInit_ex; - i2d_OCSP_CERTID; - ASN1_item_d2i_bio; - EC_POINT_dbl; - asn1_get_choice_selector; - i2d_KRB5_CHECKSUM; - ENGINE_set_table_flags; - AES_options; - OCSP_id_cmp; - OCSP_BASICRESP_new; - OCSP_REQUEST_get_ext_by_NID; - KRB5_APREQ_it; - KRB5_APREQ_it; - ENGINE_get_destroy_function; - CONF_set_nconf; - ASN1_PRINTABLE_free; - OCSP_BASICRESP_get_ext_by_NID; - DIST_POINT_NAME_it; - DIST_POINT_NAME_it; - X509V3_extensions_print; - _ossl_old_des_cfb64_encrypt; - X509_REVOKED_add1_ext_i2d; - _ossl_old_des_ofb_encrypt; - KRB5_TKTBODY_new; - ASN1_OCTET_STRING_it; - ASN1_OCTET_STRING_it; - ERR_load_UI_strings; - i2d_KRB5_ENCKEY; - ASN1_template_new; - OCSP_SIGNATURE_free; - ASN1_item_i2d_fp; - KRB5_PRINCNAME_free; - PKCS7_RECIP_INFO_it; - PKCS7_RECIP_INFO_it; - EXTENDED_KEY_USAGE_it; - EXTENDED_KEY_USAGE_it; - EC_GFp_simple_method; - EC_GROUP_precompute_mult; - OCSP_request_onereq_get0; - UI_method_set_writer; - KRB5_AUTHENT_new; - X509_CRL_INFO_it; - X509_CRL_INFO_it; - DSO_set_name_converter; - AES_set_decrypt_key; - PKCS7_DIGEST_it; - PKCS7_DIGEST_it; - PKCS12_x5092certbag; - EVP_DigestInit_ex; - i2a_ACCESS_DESCRIPTION; - OCSP_RESPONSE_it; - OCSP_RESPONSE_it; - PKCS7_ENC_CONTENT_it; - PKCS7_ENC_CONTENT_it; - OCSP_request_add0_id; - EC_POINT_make_affine; - DSO_get_filename; - OCSP_CERTSTATUS_it; - OCSP_CERTSTATUS_it; - OCSP_request_add1_cert; - UI_get0_output_string; - UI_dup_verify_string; - BN_mod_lshift; - KRB5_AUTHDATA_it; - KRB5_AUTHDATA_it; - asn1_set_choice_selector; - OCSP_basic_add1_status; - OCSP_RESPID_free; - asn1_get_field_ptr; - UI_add_input_string; - OCSP_CRLID_it; - OCSP_CRLID_it; - i2d_KRB5_AUTHENTBODY; - OCSP_REQUEST_get_ext_count; - X509_NAME_it; - X509_NAME_it; - USERNOTICE_it; - USERNOTICE_it; - OCSP_REQINFO_new; - OCSP_BASICRESP_get_ext; - CRYPTO_get_ex_data_implementation; - ASN1_item_pack; - i2d_KRB5_ENCDATA; - X509_PURPOSE_set; - X509_REQ_INFO_it; - X509_REQ_INFO_it; - UI_method_set_opener; - ASN1_item_ex_free; - ASN1_BOOLEAN_it; - ASN1_BOOLEAN_it; - ENGINE_get_table_flags; - UI_create_method; - OCSP_ONEREQ_add1_ext_i2d; - d2i_OCSP_REQINFO; - UI_add_info_string; - UI_get_result_minsize; - ASN1_NULL_it; - ASN1_NULL_it; - BN_mod_lshift1; - d2i_OCSP_ONEREQ; - OCSP_ONEREQ_new; - KRB5_TICKET_it; - KRB5_TICKET_it; - EVP_aes_192_cbc; - KRB5_TICKET_free; - UI_new; - OCSP_response_create; - _ossl_old_des_xcbc_encrypt; - PKCS7_it; - PKCS7_it; - OCSP_REQUEST_get_ext_by_critical; - ENGINE_set_flags; - _ossl_old_des_ecb_encrypt; - OCSP_response_get1_basic; - EVP_Digest; - OCSP_ONEREQ_delete_ext; - ASN1_TBOOLEAN_it; - ASN1_TBOOLEAN_it; - ASN1_item_new; - ASN1_TIME_to_generalizedtime; - BIGNUM_it; - BIGNUM_it; - AES_cbc_encrypt; - ENGINE_get_load_privkey_function; - OCSP_RESPONSE_free; - UI_method_set_reader; - i2d_ASN1_T61STRING; - EC_POINT_set_to_infinity; - ERR_load_OCSP_strings; - EC_POINT_point2oct; - KRB5_APREQ_free; - ASN1_OBJECT_it; - ASN1_OBJECT_it; - OCSP_crlID_new; - CONF_modules_load_file; - CONF_imodule_set_usr_data; - ENGINE_set_default_string; - CONF_module_get_usr_data; - ASN1_add_oid_module; - CONF_modules_finish; - OPENSSL_config; - CONF_modules_unload; - CONF_imodule_get_value; - CONF_module_set_usr_data; - CONF_parse_list; - CONF_module_add; - CONF_get1_default_config_file; - CONF_imodule_get_flags; - CONF_imodule_get_module; - CONF_modules_load; - CONF_imodule_get_name; - CONF_imodule_get_usr_data; - CONF_imodule_set_flags; - ENGINE_add_conf_module; - ERR_peek_last_error_line; - ERR_peek_last_error_line_data; - ERR_peek_last_error; - DES_read_2passwords; - DES_read_password; - UI_UTIL_read_pw; - UI_UTIL_read_pw_string; - OPENSSL_add_all_algorithms_noconf; - OPENSSL_add_all_algorithms_conf; - OPENSSL_load_builtin_modules; - AES_ofb128_encrypt; - AES_ctr128_encrypt; - AES_cfb128_encrypt; - _ossl_096_des_random_seed; - EVP_aes_256_ofb; - EVP_aes_192_ofb; - EVP_aes_128_cfb128; - EVP_aes_256_cfb128; - EVP_aes_128_ofb; - EVP_aes_192_cfb128; - CONF_modules_free; - NCONF_default; - OPENSSL_no_config; - NCONF_WIN32; - ASN1_UNIVERSALSTRING_new; - EVP_des_ede_ecb; - i2d_ASN1_UNIVERSALSTRING; - ASN1_UNIVERSALSTRING_free; - ASN1_UNIVERSALSTRING_it; - ASN1_UNIVERSALSTRING_it; - d2i_ASN1_UNIVERSALSTRING; - EVP_des_ede3_ecb; - X509_REQ_print_ex; - ENGINE_up_ref; - BUF_MEM_grow_clean; - CRYPTO_realloc_clean; - BUF_strlcat; - BIO_indent; - BUF_strlcpy; - OpenSSLDie; - OPENSSL_cleanse; - ERR_release_err_state_table; - EVP_aes_128_cfb8; - EVP_aes_128_cfb1; - EVP_aes_192_cfb8; - FIPS_mode_set; - EVP_aes_256_cfb8; - DES_ede3_cfb_encrypt; - EVP_des_ede3_cfb8; - AES_cfb8_encrypt; - EVP_aes_192_cfb1; - EVP_des_cfb8; - EVP_aes_256_cfb1; - EVP_des_cfb1; - AES_cfb1_encrypt; - EVP_des_ede3_cfb1; - FIPS_mode; - sk_is_sorted; - X509_check_ca; - HMAC_CTX_set_flags; - d2i_PROXY_CERT_INFO_EXTENSION; - PROXY_POLICY_it; - PROXY_POLICY_it; - i2d_PROXY_POLICY; - i2d_PROXY_CERT_INFO_EXTENSION; - d2i_PROXY_POLICY; - PROXY_CERT_INFO_EXTENSION_new; - PROXY_CERT_INFO_EXTENSION_free; - PROXY_CERT_INFO_EXTENSION_it; - PROXY_CERT_INFO_EXTENSION_it; - PROXY_POLICY_free; - PROXY_POLICY_new; - BN_MONT_CTX_set_locked; - EVP_sha384; - EVP_sha512; - EVP_sha224; - EVP_sha256; - BN_mod_exp_mont_consttime; - RSA_X931_hash_id; - RSA_padding_check_X931; - RSA_verify_PKCS1_PSS; - RSA_padding_add_X931; - RSA_padding_add_PKCS1_PSS; - PKCS1_MGF1; - BN_X931_generate_Xpq; - BIO_new_dgram; - BN_get0_nist_prime_384; - ERR_set_mark; - X509_STORE_CTX_set0_crls; - ENGINE_set_STORE; - ENGINE_register_ECDSA; - BN_BLINDING_invert_ex; - NAME_CONSTRAINTS_free; - BN_BLINDING_get_thread_id; - X509_STORE_CTX_set0_param; - POLICY_MAPPING_it; - POLICY_MAPPING_it; - POLICY_CONSTRAINTS_free; - EVP_PKEY_add1_attr_by_NID; - BN_nist_mod_192; - EC_GROUP_get_trinomial_basis; - GENERAL_SUBTREE_free; - NAME_CONSTRAINTS_it; - NAME_CONSTRAINTS_it; - ECDH_get_default_method; - PKCS12_add_safe; - EC_KEY_new_by_curve_name; - ENGINE_register_ECDH; - SHA512_Update; - i2d_ECPrivateKey; - BN_get0_nist_prime_192; - EC_POINT_set_affine_coordinates_GF2m; - BN_GF2m_mod_exp_arr; - X509_keyid_get0; - pitem_new; - BN_GF2m_mod_mul_arr; - o2i_ECPublicKey; - EC_KEY_copy; - BIO_dump_fp; - X509_policy_node_get0_parent; - EC_GROUP_check_discriminant; - i2o_ECPublicKey; - EC_KEY_precompute_mult; - a2i_IPADDRESS; - X509_STORE_CTX_set_depth; - X509_VERIFY_PARAM_inherit; - EC_POINT_point2bn; - X509_policy_tree_get0_policies; - EC_GROUP_new_curve_GF2m; - ENGINE_unregister_STORE; - EVP_PKEY_get1_EC_KEY; - ENGINE_get_default_ECDH; - EC_KEY_get_conv_form; - ASN1_OCTET_STRING_NDEF_it; - ASN1_OCTET_STRING_NDEF_it; - ENGINE_get_static_state; - pqueue_iterator; - ECDSA_SIG_new; - OPENSSL_DIR_end; - BN_GF2m_mod_sqr; - EC_POINT_bn2point; - X509_VERIFY_PARAM_set_depth; - EC_KEY_set_asn1_flag; - EC_KEY_get_key_method_data; - ECDSA_sign_ex; - EC_GROUP_get_point_conversion_form; - PEM_read_bio_ECPKParameters; - EC_GROUP_get_pentanomial_basis; - EVP_PKEY_add1_attr_by_txt; - BN_BLINDING_set_flags; - X509_VERIFY_PARAM_set1_policies; - X509_VERIFY_PARAM_set1_name; - X509_VERIFY_PARAM_set_purpose; - ECDSA_sign_setup; - BN_GF2m_mod_solve_quad_arr; - EC_KEY_up_ref; - POLICY_MAPPING_free; - BN_GF2m_mod_div; - X509_VERIFY_PARAM_set_flags; - EC_KEY_free; - PEM_write_bio_ECPrivateKey; - d2i_EC_PUBKEY; - pqueue_print; - EC_GROUP_have_precompute_mult; - EC_KEY_print_fp; - BN_GF2m_mod_arr; - PEM_write_bio_X509_CERT_PAIR; - EVP_PKEY_cmp; - X509_policy_level_node_count; - X509_VERIFY_PARAM_new; - ECDH_get_ex_data; - EVP_PKEY_get_attr; - ECDSA_do_sign; - ENGINE_unregister_ECDH; - ECDH_OpenSSL; - EC_KEY_set_conv_form; - EC_POINT_dup; - GENERAL_SUBTREE_new; - EC_get_builtin_curves; - X509_policy_node_get0_qualifiers; - EVP_PKEY_set1_EC_KEY; - BN_GF2m_mod_sqrt_arr; - i2d_ECPrivateKey_bio; - ECPKParameters_print_fp; - pqueue_find; - ECDSA_SIG_free; - PEM_write_bio_ECPKParameters; - EC_KEY_set_private_key; - pqueue_peek; - X509_policy_node_get0_policy; - PKCS12_add_safes; - BN_BLINDING_convert_ex; - X509_policy_tree_free; - OPENSSL_ia32cap_loc; - BN_GF2m_poly2arr; - BN_get0_nist_prime_224; - i2d_ECParameters; - i2d_ECPKParameters; - BN_GENCB_call; - d2i_ECPKParameters; - ENGINE_set_ECDH; - NAME_CONSTRAINTS_new; - SHA256_Init; - EC_KEY_get0_public_key; - PEM_write_bio_EC_PUBKEY; - ECParameters_print; - ASN1_generate_nconf; - BUF_memdup; - BN_GF2m_mod_mul; - EC_GROUP_set_seed; - X509_VERIFY_PARAM_set_trust; - EVP_PKEY_get_attr_count; - EC_GROUP_get_curve_GF2m; - BN_is_prime_ex; - X509_STORE_CTX_get0_param; - PEM_read_X509_CERT_PAIR; - X509_STORE_set_depth; - ECDSA_get_ex_data; - SHA224; - BIO_dump_indent_fp; - EC_KEY_set_group; - BUF_strndup; - BN_GF2m_mod; - X509_REQ_check_private_key; - EC_GROUP_get_seed_len; - PEM_read_bio_EC_PUBKEY; - i2d_EC_PUBKEY; - ECDSA_get_default_method; - ASN1_put_eoc; - X509_STORE_CTX_get_explicit_policy; - X509_VERIFY_PARAM_table_cleanup; - X509_VERIFY_PARAM_free; - EC_METHOD_get_field_type; - EC_GFp_nist_method; - EC_GROUP_set_curve_name; - X509_CERT_PAIR_it; - X509_CERT_PAIR_it; - BN_GF2m_mod_sqr_arr; - RSA_setup_blinding; - BIO_s_datagram; - sk_find_ex; - EC_GROUP_set_curve_GF2m; - ENGINE_set_default_ECDSA; - POLICY_CONSTRAINTS_new; - BN_GF2m_mod_sqrt; - ECDH_set_default_method; - EC_KEY_generate_key; - SHA384_Update; - BN_GF2m_arr2poly; - EC_GROUP_check; - d2i_ECPrivateKey_bio; - EC_KEY_insert_key_method_data; - X509_VERIFY_PARAM_get_depth; - SHA224_Final; - SHA224_Update; - d2i_ECPrivateKey; - ASN1_item_ndef_i2d; - ERR_pop_to_mark; - ENGINE_register_all_STORE; - X509_policy_level_get0_node; - i2d_PKCS7_NDEF; - EC_GROUP_get_degree; - ASN1_generate_v3; - X509_policy_tree_level_count; - BN_GF2m_add; - EC_KEY_get0_group; - X509_CERT_PAIR_free; - BN_nist_mod_224; - SHA512_Final; - i2d_EC_PUBKEY_bio; - BIO_dgram_non_fatal_error; - EC_GROUP_get_asn1_flag; - ECDH_get_ex_new_index; - v2i_ASN1_BIT_STRING; - X509_STORE_CTX_set_default; - BN_GF2m_mod_inv; - BN_GF2m_mod_exp; - EC_GROUP_get0_seed; - BN_GF2m_mod_div_arr; - ENGINE_set_ECDSA; - ECPKParameters_print; - EC_KEY_get0_private_key; - PEM_write_EC_PUBKEY; - X509_VERIFY_PARAM_set1; - ECDH_set_method; - v2i_GENERAL_NAME_ex; - ECDH_set_ex_data; - BN_nist_mod_521; - X509_policy_tree_get0_level; - EC_GROUP_set_point_conversion_form; - PEM_read_EC_PUBKEY; - i2d_ECDSA_SIG; - ECDSA_OpenSSL; - EC_KEY_get_enc_flags; - ASN1_const_check_infinite_end; - EVP_PKEY_delete_attr; - ECDSA_set_default_method; - EC_POINT_set_compressed_coordinates_GF2m; - EC_GROUP_cmp; - BN_get0_nist_prime_256; - SHA224_Init; - PEM_read_ECPrivateKey; - SHA512_Init; - BN_set_negative; - ERR_load_ECDSA_strings; - EC_GROUP_get_basis_type; - i2v_ASN1_BIT_STRING; - BN_nist_mod_384; - i2d_X509_CERT_PAIR; - PEM_write_ECPKParameters; - ECDH_compute_key; - ENGINE_register_all_ECDH; - pqueue_pop; - POLICY_CONSTRAINTS_it; - POLICY_CONSTRAINTS_it; - EVP_PKEY_get_attr_by_OBJ; - X509_VERIFY_PARAM_add0_policy; - BN_GF2m_mod_solve_quad; - SHA256; - i2d_ECPrivateKey_fp; - X509_policy_tree_get0_user_policies; - OPENSSL_DIR_read; - ENGINE_register_all_ECDSA; - X509_VERIFY_PARAM_lookup; - EC_POINT_get_affine_coordinates_GF2m; - EC_GROUP_dup; - ENGINE_get_default_ECDSA; - EC_KEY_new; - SHA256_Transform; - EC_KEY_set_enc_flags; - ECDSA_verify; - EC_POINT_point2hex; - ENGINE_get_STORE; - SHA512; - ECDSA_do_sign_ex; - ECDSA_do_verify; - d2i_ECPrivateKey_fp; - SHA512_Transform; - X509_STORE_set1_param; - PEM_write_ECPrivateKey; - EC_KEY_set_public_key; - PEM_read_ECPKParameters; - X509_CERT_PAIR_new; - ENGINE_register_STORE; - RSA_generate_key_ex; - DSA_generate_parameters_ex; - ECParameters_print_fp; - X509V3_NAME_from_section; - EVP_PKEY_add1_attr; - POLICY_MAPPINGS_it; - POLICY_MAPPINGS_it; - GENERAL_SUBTREE_it; - GENERAL_SUBTREE_it; - EC_GROUP_get_curve_name; - PEM_write_X509_CERT_PAIR; - BIO_dump_indent_cb; - d2i_X509_CERT_PAIR; - asn1_const_Finish; - i2d_EC_PUBKEY_fp; - BN_nist_mod_256; - X509_VERIFY_PARAM_add0_table; - pqueue_free; - BN_BLINDING_create_param; - ECDSA_size; - d2i_EC_PUBKEY_bio; - BN_get0_nist_prime_521; - BN_generate_prime_ex; - EC_GROUP_new_by_curve_name; - SHA256_Final; - DH_generate_parameters_ex; - PEM_read_bio_ECPrivateKey; - ENGINE_get_ECDH; - d2i_ECDSA_SIG; - BN_is_prime_fasttest_ex; - ECDSA_sign; - X509_policy_check; - EVP_PKEY_get_attr_by_NID; - ENGINE_get_ECDSA; - EVP_ecdsa; - BN_BLINDING_get_flags; - PKCS12_add_cert; - ERR_load_ECDH_strings; - EC_KEY_dup; - EVP_CIPHER_CTX_rand_key; - ECDSA_set_method; - a2i_IPADDRESS_NC; - d2i_ECParameters; - X509_POLICY_NODE_print; - SHA384_Init; - EC_GF2m_simple_method; - ECDSA_set_ex_data; - SHA384_Final; - PKCS7_set_digest; - EC_KEY_print; - ECDSA_get_ex_new_index; - SHA384; - POLICY_MAPPING_new; - X509_STORE_CTX_get0_policy_tree; - EC_GROUP_set_asn1_flag; - EC_KEY_check_key; - d2i_EC_PUBKEY_fp; - PKCS7_set0_type_other; - PEM_read_bio_X509_CERT_PAIR; - pqueue_next; - EVP_PKEY_add1_attr_by_OBJ; - X509_VERIFY_PARAM_set_time; - pqueue_new; - ENGINE_set_default_ECDH; - PKCS12_add_key; - DSO_merge; - EC_POINT_hex2point; - BIO_dump_cb; - SHA256_Update; - pqueue_insert; - pitem_free; - BN_GF2m_mod_inv_arr; - ENGINE_unregister_ECDSA; - BN_BLINDING_set_thread_id; - get_rfc3526_prime_8192; - X509_VERIFY_PARAM_clear_flags; - get_rfc2409_prime_1024; - DH_check_pub_key; - get_rfc3526_prime_2048; - get_rfc3526_prime_6144; - get_rfc3526_prime_1536; - get_rfc3526_prime_3072; - get_rfc3526_prime_4096; - get_rfc2409_prime_768; - X509_VERIFY_PARAM_get_flags; - EVP_CIPHER_CTX_new; - EVP_CIPHER_CTX_free; - Camellia_cbc_encrypt; - Camellia_cfb128_encrypt; - Camellia_cfb1_encrypt; - Camellia_cfb8_encrypt; - Camellia_ctr128_encrypt; - Camellia_decrypt; - Camellia_ecb_encrypt; - Camellia_encrypt; - Camellia_ofb128_encrypt; - Camellia_set_key; - EVP_camellia_128_cbc; - EVP_camellia_128_cfb128; - EVP_camellia_128_cfb1; - EVP_camellia_128_cfb8; - EVP_camellia_128_ecb; - EVP_camellia_128_ofb; - EVP_camellia_192_cbc; - EVP_camellia_192_cfb128; - EVP_camellia_192_cfb1; - EVP_camellia_192_cfb8; - EVP_camellia_192_ecb; - EVP_camellia_192_ofb; - EVP_camellia_256_cbc; - EVP_camellia_256_cfb128; - EVP_camellia_256_cfb1; - EVP_camellia_256_cfb8; - EVP_camellia_256_ecb; - EVP_camellia_256_ofb; - a2i_ipadd; - EVP_CIPHER_block_size; - EVP_CIPHER_CTX_set_app_data; - BIO_set_callback_arg; - BIO_set_flags; - BIO_method_type; - AES_ige_encrypt; - EVP_CIPHER_CTX_nid; - EVP_CIPHER_iv_length; - EVP_MD_type; - EVP_CIPHER_CTX_key_length; - EVP_MD_size; - EVP_MD_CTX_test_flags; - BIO_clear_flags; - EVP_MD_pkey_type; - EVP_MD_CTX_clear_flags; - EVP_CIPHER_flags; - AES_bi_ige_encrypt; - BIO_get_callback; - BIO_test_flags; - EVP_CIPHER_key_length; - EVP_Cipher; - EVP_CIPHER_nid; - EVP_CIPHER_CTX_block_size; - EVP_MD_CTX_set_flags; - EVP_CIPHER_CTX_cipher; - EVP_CIPHER_CTX_get_app_data; - EVP_MD_block_size; - EVP_CIPHER_CTX_flags; - EVP_MD_CTX_md; - BIO_method_name; - EVP_CIPHER_CTX_iv_length; - BIO_get_callback_arg; - BIO_set_callback; - SEED_decrypt; - SEED_encrypt; - SEED_cbc_encrypt; - EVP_seed_ofb; - SEED_cfb128_encrypt; - SEED_ofb128_encrypt; - EVP_seed_cbc; - SEED_ecb_encrypt; - EVP_seed_ecb; - SEED_set_key; - EVP_seed_cfb128; - X509_EXTENSIONS_it; - X509_EXTENSIONS_it; - X509_get1_ocsp; - OCSP_REQ_CTX_free; - i2d_X509_EXTENSIONS; - OCSP_sendreq_nbio; - OCSP_sendreq_new; - d2i_X509_EXTENSIONS; - X509_ALGORS_it; - X509_ALGORS_it; - X509_ALGOR_get0; - X509_ALGOR_set0; - AES_unwrap_key; - AES_wrap_key; - X509at_get0_data_by_OBJ; - ASN1_TYPE_set1; - ASN1_STRING_set0; - i2d_X509_ALGORS; - COMP_zlib_cleanup; - d2i_X509_ALGORS; - CMS_ReceiptRequest_free; - PEM_write_CMS; - CMS_add0_CertificateChoices; - CMS_unsigned_add1_attr_by_OBJ; - ERR_load_CMS_strings; - CMS_sign_receipt; - i2d_CMS_ContentInfo; - CMS_signed_delete_attr; - d2i_CMS_bio; - CMS_unsigned_get_attr_by_NID; - CMS_verify; - SMIME_read_CMS; - CMS_decrypt_set1_key; - CMS_SignerInfo_get0_algs; - CMS_add1_cert; - CMS_set_detached; - CMS_encrypt; - CMS_EnvelopedData_create; - CMS_uncompress; - CMS_add0_crl; - CMS_SignerInfo_verify_content; - CMS_unsigned_get0_data_by_OBJ; - PEM_write_bio_CMS; - CMS_unsigned_get_attr; - CMS_RecipientInfo_ktri_cert_cmp; - CMS_RecipientInfo_ktri_get0_algs; - CMS_ContentInfo_free; - CMS_final; - CMS_add_simple_smimecap; - CMS_SignerInfo_verify; - CMS_data; - CMS_ContentInfo_it; - CMS_ContentInfo_it; - d2i_CMS_ReceiptRequest; - CMS_compress; - CMS_digest_create; - CMS_SignerInfo_cert_cmp; - CMS_SignerInfo_sign; - CMS_data_create; - i2d_CMS_bio; - CMS_EncryptedData_set1_key; - CMS_decrypt; - CMS_unsigned_delete_attr; - CMS_unsigned_get_attr_count; - CMS_add_smimecap; - PEM_read_CMS; - CMS_signed_get_attr_by_OBJ; - d2i_CMS_ContentInfo; - CMS_add_standard_smimecap; - CMS_ContentInfo_new; - CMS_RecipientInfo_type; - CMS_get0_type; - CMS_is_detached; - CMS_sign; - CMS_signed_add1_attr; - CMS_unsigned_get_attr_by_OBJ; - SMIME_write_CMS; - CMS_EncryptedData_decrypt; - CMS_get0_RecipientInfos; - CMS_add0_RevocationInfoChoice; - CMS_decrypt_set1_pkey; - CMS_SignerInfo_set1_signer_cert; - CMS_get0_signers; - CMS_ReceiptRequest_get0_values; - CMS_signed_get0_data_by_OBJ; - CMS_get0_SignerInfos; - CMS_add0_cert; - CMS_EncryptedData_encrypt; - CMS_digest_verify; - CMS_set1_signers_certs; - CMS_signed_get_attr; - CMS_RecipientInfo_set0_key; - CMS_SignedData_init; - CMS_RecipientInfo_kekri_get0_id; - CMS_verify_receipt; - CMS_ReceiptRequest_it; - CMS_ReceiptRequest_it; - PEM_read_bio_CMS; - CMS_get1_crls; - CMS_add0_recipient_key; - SMIME_read_ASN1; - CMS_ReceiptRequest_new; - CMS_get0_content; - CMS_get1_ReceiptRequest; - CMS_signed_add1_attr_by_OBJ; - CMS_RecipientInfo_kekri_id_cmp; - CMS_add1_ReceiptRequest; - CMS_SignerInfo_get0_signer_id; - CMS_unsigned_add1_attr_by_NID; - CMS_unsigned_add1_attr; - CMS_signed_get_attr_by_NID; - CMS_get1_certs; - CMS_signed_add1_attr_by_NID; - CMS_unsigned_add1_attr_by_txt; - CMS_dataFinal; - CMS_RecipientInfo_ktri_get0_signer_id; - i2d_CMS_ReceiptRequest; - CMS_add1_recipient_cert; - CMS_dataInit; - CMS_signed_add1_attr_by_txt; - CMS_RecipientInfo_decrypt; - CMS_signed_get_attr_count; - CMS_get0_eContentType; - CMS_set1_eContentType; - CMS_ReceiptRequest_create0; - CMS_add1_signer; - CMS_RecipientInfo_set0_pkey; - ENGINE_set_load_ssl_client_cert_function; - ENGINE_get_ssl_client_cert_function; - ENGINE_load_ssl_client_cert; - OPENSSL_isservice; - EVP_CIPHER_CTX_clear_flags; - EVP_CIPHER_CTX_set_flags; - BN_X931_generate_prime_ex; - EVP_CIPHER_CTX_test_flags; - BN_X931_derive_prime_ex; - OPENSSL_init; - CRYPTO_strdup; - pqueue_size; - i2d_TS_ACCURACY; - i2d_TS_MSG_IMPRINT_fp; - i2d_TS_MSG_IMPRINT; - EVP_PKEY_print_public; - EVP_PKEY_CTX_new; - i2d_TS_TST_INFO; - EVP_PKEY_asn1_find; - DSO_METHOD_beos; - TS_CONF_load_cert; - TS_REQ_get_ext; - EVP_PKEY_sign_init; - ASN1_item_print; - TS_TST_INFO_set_nonce; - TS_RESP_dup; - ENGINE_register_pkey_meths; - EVP_PKEY_asn1_add0; - PKCS7_add0_attrib_signing_time; - i2d_TS_TST_INFO_fp; - BIO_asn1_get_prefix; - TS_TST_INFO_set_time; - EVP_PKEY_meth_set_decrypt; - EVP_PKEY_set_type_str; - EVP_PKEY_CTX_get_keygen_info; - TS_REQ_set_policy_id; - d2i_TS_RESP_fp; - ENGINE_get_pkey_asn1_meth_engine; - WHIRLPOOL_Init; - TS_RESP_set_status_info; - EVP_PKEY_keygen; - EVP_DigestSignInit; - TS_ACCURACY_set_millis; - TS_REQ_dup; - GENERAL_NAME_dup; - ASN1_SEQUENCE_ANY_it; - ASN1_SEQUENCE_ANY_it; - WHIRLPOOL; - X509_STORE_get1_crls; - ENGINE_get_pkey_asn1_meth; - EVP_PKEY_asn1_new; - BIO_new_NDEF; - ENGINE_get_pkey_meth; - TS_MSG_IMPRINT_set_algo; - i2d_TS_TST_INFO_bio; - TS_TST_INFO_set_ordering; - TS_TST_INFO_get_ext_by_OBJ; - CRYPTO_THREADID_set_pointer; - TS_CONF_get_tsa_section; - SMIME_write_ASN1; - TS_RESP_CTX_set_signer_key; - EVP_PKEY_encrypt_old; - EVP_PKEY_encrypt_init; - CRYPTO_THREADID_cpy; - ASN1_PCTX_get_cert_flags; - i2d_ESS_SIGNING_CERT; - TS_CONF_load_key; - i2d_ASN1_SEQUENCE_ANY; - d2i_TS_MSG_IMPRINT_bio; - EVP_PKEY_asn1_set_public; - b2i_PublicKey_bio; - BIO_asn1_set_prefix; - EVP_PKEY_new_mac_key; - BIO_new_CMS; - CRYPTO_THREADID_cmp; - TS_REQ_ext_free; - EVP_PKEY_asn1_set_free; - EVP_PKEY_get0_asn1; - d2i_NETSCAPE_X509; - EVP_PKEY_verify_recover_init; - EVP_PKEY_CTX_set_data; - EVP_PKEY_keygen_init; - TS_RESP_CTX_set_status_info; - TS_MSG_IMPRINT_get_algo; - TS_REQ_print_bio; - EVP_PKEY_CTX_ctrl_str; - EVP_PKEY_get_default_digest_nid; - PEM_write_bio_PKCS7_stream; - TS_MSG_IMPRINT_print_bio; - BN_asc2bn; - TS_REQ_get_policy_id; - ENGINE_set_default_pkey_asn1_meths; - d2i_TS_ACCURACY; - DSO_global_lookup; - TS_CONF_set_tsa_name; - i2d_ASN1_SET_ANY; - WHIRLPOOL_BitUpdate; - ASN1_PCTX_get_flags; - TS_TST_INFO_get_ext_by_NID; - TS_RESP_new; - ESS_CERT_ID_dup; - TS_STATUS_INFO_dup; - TS_REQ_delete_ext; - EVP_DigestVerifyFinal; - EVP_PKEY_print_params; - i2d_CMS_bio_stream; - TS_REQ_get_msg_imprint; - OBJ_find_sigid_by_algs; - TS_TST_INFO_get_serial; - TS_REQ_get_nonce; - X509_PUBKEY_set0_param; - EVP_PKEY_CTX_set0_keygen_info; - DIST_POINT_set_dpname; - i2d_ISSUING_DIST_POINT; - ASN1_SET_ANY_it; - ASN1_SET_ANY_it; - EVP_PKEY_CTX_get_data; - TS_STATUS_INFO_print_bio; - EVP_PKEY_derive_init; - d2i_TS_TST_INFO; - EVP_PKEY_asn1_add_alias; - d2i_TS_RESP_bio; - OTHERNAME_cmp; - GENERAL_NAME_set0_value; - PKCS7_RECIP_INFO_get0_alg; - TS_RESP_CTX_new; - TS_RESP_set_tst_info; - PKCS7_final; - EVP_PKEY_base_id; - TS_RESP_CTX_set_signer_cert; - TS_REQ_set_msg_imprint; - EVP_PKEY_CTX_ctrl; - TS_CONF_set_digests; - d2i_TS_MSG_IMPRINT; - EVP_PKEY_meth_set_ctrl; - TS_REQ_get_ext_by_NID; - PKCS5_pbe_set0_algor; - BN_BLINDING_thread_id; - TS_ACCURACY_new; - X509_CRL_METHOD_free; - ASN1_PCTX_get_nm_flags; - EVP_PKEY_meth_set_sign; - CRYPTO_THREADID_current; - EVP_PKEY_decrypt_init; - NETSCAPE_X509_free; - i2b_PVK_bio; - EVP_PKEY_print_private; - GENERAL_NAME_get0_value; - b2i_PVK_bio; - ASN1_UTCTIME_adj; - TS_TST_INFO_new; - EVP_MD_do_all_sorted; - TS_CONF_set_default_engine; - TS_ACCURACY_set_seconds; - TS_TST_INFO_get_time; - PKCS8_pkey_get0; - EVP_PKEY_asn1_get0; - OBJ_add_sigid; - PKCS7_SIGNER_INFO_sign; - EVP_PKEY_paramgen_init; - EVP_PKEY_sign; - OBJ_sigid_free; - EVP_PKEY_meth_set_init; - d2i_ESS_ISSUER_SERIAL; - ISSUING_DIST_POINT_new; - ASN1_TIME_adj; - TS_OBJ_print_bio; - EVP_PKEY_meth_set_verify_recover; - TS_RESP_get_status_info; - CMS_stream; - EVP_PKEY_CTX_set_cb; - PKCS7_to_TS_TST_INFO; - ASN1_PCTX_get_oid_flags; - TS_TST_INFO_add_ext; - EVP_PKEY_meth_set_derive; - i2d_TS_RESP_fp; - i2d_TS_MSG_IMPRINT_bio; - TS_RESP_CTX_set_accuracy; - TS_REQ_set_nonce; - ESS_CERT_ID_new; - ENGINE_pkey_asn1_find_str; - TS_REQ_get_ext_count; - BUF_reverse; - TS_TST_INFO_print_bio; - d2i_ISSUING_DIST_POINT; - ENGINE_get_pkey_meths; - i2b_PrivateKey_bio; - i2d_TS_RESP; - b2i_PublicKey; - TS_VERIFY_CTX_cleanup; - TS_STATUS_INFO_free; - TS_RESP_verify_token; - OBJ_bsearch_ex_; - ASN1_bn_print; - EVP_PKEY_asn1_get_count; - ENGINE_register_pkey_asn1_meths; - ASN1_PCTX_set_nm_flags; - EVP_DigestVerifyInit; - ENGINE_set_default_pkey_meths; - TS_TST_INFO_get_policy_id; - TS_REQ_get_cert_req; - X509_CRL_set_meth_data; - PKCS8_pkey_set0; - ASN1_STRING_copy; - d2i_TS_TST_INFO_fp; - X509_CRL_match; - EVP_PKEY_asn1_set_private; - TS_TST_INFO_get_ext_d2i; - TS_RESP_CTX_add_policy; - d2i_TS_RESP; - TS_CONF_load_certs; - TS_TST_INFO_get_msg_imprint; - ERR_load_TS_strings; - TS_TST_INFO_get_version; - EVP_PKEY_CTX_dup; - EVP_PKEY_meth_set_verify; - i2b_PublicKey_bio; - TS_CONF_set_certs; - EVP_PKEY_asn1_get0_info; - TS_VERIFY_CTX_free; - TS_REQ_get_ext_by_critical; - TS_RESP_CTX_set_serial_cb; - X509_CRL_get_meth_data; - TS_RESP_CTX_set_time_cb; - TS_MSG_IMPRINT_get_msg; - TS_TST_INFO_ext_free; - TS_REQ_get_version; - TS_REQ_add_ext; - EVP_PKEY_CTX_set_app_data; - OBJ_bsearch_; - EVP_PKEY_meth_set_verifyctx; - i2d_PKCS7_bio_stream; - CRYPTO_THREADID_set_numeric; - PKCS7_sign_add_signer; - d2i_TS_TST_INFO_bio; - TS_TST_INFO_get_ordering; - TS_RESP_print_bio; - TS_TST_INFO_get_exts; - HMAC_CTX_copy; - PKCS5_pbe2_set_iv; - ENGINE_get_pkey_asn1_meths; - b2i_PrivateKey; - EVP_PKEY_CTX_get_app_data; - TS_REQ_set_cert_req; - CRYPTO_THREADID_set_callback; - TS_CONF_set_serial; - TS_TST_INFO_free; - d2i_TS_REQ_fp; - TS_RESP_verify_response; - i2d_ESS_ISSUER_SERIAL; - TS_ACCURACY_get_seconds; - EVP_CIPHER_do_all; - b2i_PrivateKey_bio; - OCSP_CERTID_dup; - X509_PUBKEY_get0_param; - TS_MSG_IMPRINT_dup; - PKCS7_print_ctx; - i2d_TS_REQ_bio; - EVP_whirlpool; - EVP_PKEY_asn1_set_param; - EVP_PKEY_meth_set_encrypt; - ASN1_PCTX_set_flags; - i2d_ESS_CERT_ID; - TS_VERIFY_CTX_new; - TS_RESP_CTX_set_extension_cb; - ENGINE_register_all_pkey_meths; - TS_RESP_CTX_set_status_info_cond; - EVP_PKEY_verify; - WHIRLPOOL_Final; - X509_CRL_METHOD_new; - EVP_DigestSignFinal; - TS_RESP_CTX_set_def_policy; - NETSCAPE_X509_it; - NETSCAPE_X509_it; - TS_RESP_create_response; - PKCS7_SIGNER_INFO_get0_algs; - TS_TST_INFO_get_nonce; - EVP_PKEY_decrypt_old; - TS_TST_INFO_set_policy_id; - TS_CONF_set_ess_cert_id_chain; - EVP_PKEY_CTX_get0_pkey; - d2i_TS_REQ; - EVP_PKEY_asn1_find_str; - BIO_f_asn1; - ESS_SIGNING_CERT_new; - EVP_PBE_find; - X509_CRL_get0_by_cert; - EVP_PKEY_derive; - i2d_TS_REQ; - TS_TST_INFO_delete_ext; - ESS_ISSUER_SERIAL_free; - ASN1_PCTX_set_str_flags; - ENGINE_get_pkey_asn1_meth_str; - TS_CONF_set_signer_key; - TS_ACCURACY_get_millis; - TS_RESP_get_token; - TS_ACCURACY_dup; - ENGINE_register_all_pkey_asn1_meths; - X509_CRL_set_default_method; - CRYPTO_THREADID_hash; - CMS_ContentInfo_print_ctx; - TS_RESP_free; - ISSUING_DIST_POINT_free; - ESS_ISSUER_SERIAL_new; - CMS_add1_crl; - PKCS7_add1_attrib_digest; - TS_RESP_CTX_add_md; - TS_TST_INFO_dup; - ENGINE_set_pkey_asn1_meths; - PEM_write_bio_Parameters; - TS_TST_INFO_get_accuracy; - X509_CRL_get0_by_serial; - TS_TST_INFO_set_version; - TS_RESP_CTX_get_tst_info; - TS_RESP_verify_signature; - CRYPTO_THREADID_get_callback; - TS_TST_INFO_get_tsa; - TS_STATUS_INFO_new; - EVP_PKEY_CTX_get_cb; - TS_REQ_get_ext_d2i; - GENERAL_NAME_set0_othername; - TS_TST_INFO_get_ext_count; - TS_RESP_CTX_get_request; - i2d_NETSCAPE_X509; - ENGINE_get_pkey_meth_engine; - EVP_PKEY_meth_set_signctx; - EVP_PKEY_asn1_copy; - ASN1_TYPE_cmp; - EVP_CIPHER_do_all_sorted; - EVP_PKEY_CTX_free; - ISSUING_DIST_POINT_it; - ISSUING_DIST_POINT_it; - d2i_TS_MSG_IMPRINT_fp; - X509_STORE_get1_certs; - EVP_PKEY_CTX_get_operation; - d2i_ESS_SIGNING_CERT; - TS_CONF_set_ordering; - EVP_PBE_alg_add_type; - TS_REQ_set_version; - EVP_PKEY_get0; - BIO_asn1_set_suffix; - i2d_TS_STATUS_INFO; - EVP_MD_do_all; - TS_TST_INFO_set_accuracy; - PKCS7_add_attrib_content_type; - ERR_remove_thread_state; - EVP_PKEY_meth_add0; - TS_TST_INFO_set_tsa; - EVP_PKEY_meth_new; - WHIRLPOOL_Update; - TS_CONF_set_accuracy; - ASN1_PCTX_set_oid_flags; - ESS_SIGNING_CERT_dup; - d2i_TS_REQ_bio; - X509_time_adj_ex; - TS_RESP_CTX_add_flags; - d2i_TS_STATUS_INFO; - TS_MSG_IMPRINT_set_msg; - BIO_asn1_get_suffix; - TS_REQ_free; - EVP_PKEY_meth_free; - TS_REQ_get_exts; - TS_RESP_CTX_set_clock_precision_digits; - TS_RESP_CTX_add_failure_info; - i2d_TS_RESP_bio; - EVP_PKEY_CTX_get0_peerkey; - PEM_write_bio_CMS_stream; - TS_REQ_new; - TS_MSG_IMPRINT_new; - EVP_PKEY_meth_find; - EVP_PKEY_id; - TS_TST_INFO_set_serial; - a2i_GENERAL_NAME; - TS_CONF_set_crypto_device; - EVP_PKEY_verify_init; - TS_CONF_set_policies; - ASN1_PCTX_new; - ESS_CERT_ID_free; - ENGINE_unregister_pkey_meths; - TS_MSG_IMPRINT_free; - TS_VERIFY_CTX_init; - PKCS7_stream; - TS_RESP_CTX_set_certs; - TS_CONF_set_def_policy; - ASN1_GENERALIZEDTIME_adj; - NETSCAPE_X509_new; - TS_ACCURACY_free; - TS_RESP_get_tst_info; - EVP_PKEY_derive_set_peer; - PEM_read_bio_Parameters; - TS_CONF_set_clock_precision_digits; - ESS_ISSUER_SERIAL_dup; - TS_ACCURACY_get_micros; - ASN1_PCTX_get_str_flags; - NAME_CONSTRAINTS_check; - ASN1_BIT_STRING_check; - X509_check_akid; - ENGINE_unregister_pkey_asn1_meths; - ASN1_PCTX_free; - PEM_write_bio_ASN1_stream; - i2d_ASN1_bio_stream; - TS_X509_ALGOR_print_bio; - EVP_PKEY_meth_set_cleanup; - EVP_PKEY_asn1_free; - ESS_SIGNING_CERT_free; - TS_TST_INFO_set_msg_imprint; - GENERAL_NAME_cmp; - d2i_ASN1_SET_ANY; - ENGINE_set_pkey_meths; - i2d_TS_REQ_fp; - d2i_ASN1_SEQUENCE_ANY; - GENERAL_NAME_get0_otherName; - d2i_ESS_CERT_ID; - OBJ_find_sigid_algs; - EVP_PKEY_meth_set_keygen; - PKCS5_PBKDF2_HMAC; - EVP_PKEY_paramgen; - EVP_PKEY_meth_set_paramgen; - BIO_new_PKCS7; - EVP_PKEY_verify_recover; - TS_ext_print_bio; - TS_ASN1_INTEGER_print_bio; - check_defer; - DSO_pathbyaddr; - EVP_PKEY_set_type; - TS_ACCURACY_set_micros; - TS_REQ_to_TS_VERIFY_CTX; - EVP_PKEY_meth_set_copy; - ASN1_PCTX_set_cert_flags; - TS_TST_INFO_get_ext; - EVP_PKEY_asn1_set_ctrl; - TS_TST_INFO_get_ext_by_critical; - EVP_PKEY_CTX_new_id; - TS_REQ_get_ext_by_OBJ; - TS_CONF_set_signer_cert; - X509_NAME_hash_old; - ASN1_TIME_set_string; - EVP_MD_flags; - TS_RESP_CTX_free; - DSAparams_dup; - DHparams_dup; - OCSP_REQ_CTX_add1_header; - OCSP_REQ_CTX_set1_req; - X509_STORE_set_verify_cb; - X509_STORE_CTX_get0_current_crl; - X509_STORE_CTX_get0_parent_ctx; - X509_STORE_CTX_get0_current_issuer; - X509_issuer_name_hash_old; - X509_subject_name_hash_old; - EVP_CIPHER_CTX_copy; - UI_method_get_prompt_constructor; - UI_method_set_prompt_constructor; - EVP_read_pw_string_min; - CRYPTO_cts128_encrypt; - CRYPTO_cts128_decrypt_block; - CRYPTO_cfb128_1_encrypt; - CRYPTO_cbc128_encrypt; - CRYPTO_ctr128_encrypt; - CRYPTO_ofb128_encrypt; - CRYPTO_cts128_decrypt; - CRYPTO_cts128_encrypt_block; - CRYPTO_cbc128_decrypt; - CRYPTO_cfb128_encrypt; - CRYPTO_cfb128_8_encrypt; + SSLeay = DIRECT; + SSLeay_version = DIRECT; + ASN1_INTEGER_get = DIRECT; + ASN1_INTEGER_set = DIRECT; + ASN1_INTEGER_to_BN = DIRECT; + ASN1_OBJECT_create = DIRECT; + ASN1_OBJECT_free = DIRECT; + ASN1_OBJECT_new = DIRECT; + ASN1_PRINTABLE_type = DIRECT; + ASN1_STRING_cmp = DIRECT; + ASN1_STRING_dup = DIRECT; + ASN1_STRING_free = DIRECT; + ASN1_STRING_new = DIRECT; + ASN1_STRING_print = DIRECT; + ASN1_STRING_set = DIRECT; + ASN1_STRING_type_new = DIRECT; + ASN1_TYPE_free = DIRECT; + ASN1_TYPE_new = DIRECT; + ASN1_UNIVERSALSTRING_to_string = DIRECT; + ASN1_UTCTIME_check = DIRECT; + ASN1_UTCTIME_print = DIRECT; + ASN1_UTCTIME_set = DIRECT; + ASN1_check_infinite_end = DIRECT; + ASN1_d2i_bio = DIRECT; + ASN1_d2i_fp = DIRECT; + ASN1_digest = DIRECT; + ASN1_dup = DIRECT; + ASN1_get_object = DIRECT; + ASN1_i2d_bio = DIRECT; + ASN1_i2d_fp = DIRECT; + ASN1_object_size = DIRECT; + ASN1_parse = DIRECT; + ASN1_put_object = DIRECT; + ASN1_sign = DIRECT; + ASN1_verify = DIRECT; + BF_cbc_encrypt = DIRECT; + BF_cfb64_encrypt = DIRECT; + BF_ecb_encrypt = DIRECT; + BF_encrypt = DIRECT; + BF_ofb64_encrypt = DIRECT; + BF_options = DIRECT; + BF_set_key = DIRECT; + BIO_CONNECT_free = DIRECT; + BIO_CONNECT_new = DIRECT; + BIO_accept = DIRECT; + BIO_ctrl = DIRECT; + BIO_int_ctrl = DIRECT; + BIO_debug_callback = DIRECT; + BIO_dump = DIRECT; + BIO_dup_chain = DIRECT; + BIO_f_base64 = DIRECT; + BIO_f_buffer = DIRECT; + BIO_f_cipher = DIRECT; + BIO_f_md = DIRECT; + BIO_f_null = DIRECT; + BIO_fd_non_fatal_error = DIRECT; + BIO_fd_should_retry = DIRECT; + BIO_find_type = DIRECT; + BIO_free = DIRECT; + BIO_free_all = DIRECT; + BIO_get_accept_socket = DIRECT; + BIO_get_host_ip = DIRECT; + BIO_get_port = DIRECT; + BIO_get_retry_BIO = DIRECT; + BIO_get_retry_reason = DIRECT; + BIO_gethostbyname = DIRECT; + BIO_gets = DIRECT; + BIO_new = DIRECT; + BIO_new_accept = DIRECT; + BIO_new_connect = DIRECT; + BIO_new_fd = DIRECT; + BIO_new_file = DIRECT; + BIO_new_fp = DIRECT; + BIO_new_socket = DIRECT; + BIO_pop = DIRECT; + BIO_printf = DIRECT; + BIO_push = DIRECT; + BIO_puts = DIRECT; + BIO_read = DIRECT; + BIO_s_accept = DIRECT; + BIO_s_connect = DIRECT; + BIO_s_fd = DIRECT; + BIO_s_file = DIRECT; + BIO_s_mem = DIRECT; + BIO_s_null = DIRECT; + BIO_s_socket = DIRECT; + BIO_set = DIRECT; + BIO_set_cipher = DIRECT; + BIO_set_tcp_ndelay = DIRECT; + BIO_sock_cleanup = DIRECT; + BIO_sock_error = DIRECT; + BIO_sock_init = DIRECT; + BIO_sock_non_fatal_error = DIRECT; + BIO_sock_should_retry = DIRECT; + BIO_socket_ioctl = DIRECT; + BIO_write = DIRECT; + BN_CTX_free = DIRECT; + BN_CTX_new = DIRECT; + BN_MONT_CTX_free = DIRECT; + BN_MONT_CTX_new = DIRECT; + BN_MONT_CTX_set = DIRECT; + BN_add = DIRECT; + BN_add_word = DIRECT; + BN_hex2bn = DIRECT; + BN_bin2bn = DIRECT; + BN_bn2hex = DIRECT; + BN_bn2bin = DIRECT; + BN_clear = DIRECT; + BN_clear_bit = DIRECT; + BN_clear_free = DIRECT; + BN_cmp = DIRECT; + BN_copy = DIRECT; + BN_div = DIRECT; + BN_div_word = DIRECT; + BN_dup = DIRECT; + BN_free = DIRECT; + BN_from_montgomery = DIRECT; + BN_gcd = DIRECT; + BN_generate_prime = DIRECT; + BN_get_word = DIRECT; + BN_is_bit_set = DIRECT; + BN_is_prime = DIRECT; + BN_lshift = DIRECT; + BN_lshift1 = DIRECT; + BN_mask_bits = DIRECT; + BN_mod_exp = DIRECT; + BN_mod_exp_mont = DIRECT; + BN_mod_exp_simple = DIRECT; + BN_mod_inverse = DIRECT; + BN_mod_mul = DIRECT; + BN_mod_mul_montgomery = DIRECT; + BN_mod_word = DIRECT; + BN_mul = DIRECT; + BN_new = DIRECT; + BN_num_bits = DIRECT; + BN_num_bits_word = DIRECT; + BN_options = DIRECT; + BN_print = DIRECT; + BN_print_fp = DIRECT; + BN_rand = DIRECT; + BN_reciprocal = DIRECT; + BN_rshift = DIRECT; + BN_rshift1 = DIRECT; + BN_set_bit = DIRECT; + BN_set_word = DIRECT; + BN_sqr = DIRECT; + BN_sub = DIRECT; + BN_to_ASN1_INTEGER = DIRECT; + BN_ucmp = DIRECT; + BN_value_one = DIRECT; + BUF_MEM_free = DIRECT; + BUF_MEM_grow = DIRECT; + BUF_MEM_new = DIRECT; + BUF_strdup = DIRECT; + CONF_free = DIRECT; + CONF_get_number = DIRECT; + CONF_get_section = DIRECT; + CONF_get_string = DIRECT; + CONF_load = DIRECT; + CRYPTO_add_lock = DIRECT; + CRYPTO_dbg_free = DIRECT; + CRYPTO_dbg_malloc = DIRECT; + CRYPTO_dbg_realloc = DIRECT; + CRYPTO_free = DIRECT; + CRYPTO_get_add_lock_callback = DIRECT; + CRYPTO_get_id_callback = DIRECT; + CRYPTO_get_lock_name = DIRECT; + CRYPTO_get_locking_callback = DIRECT; + CRYPTO_get_mem_functions = DIRECT; + CRYPTO_lock = DIRECT; + CRYPTO_malloc = DIRECT; + CRYPTO_mem_ctrl = DIRECT; + CRYPTO_mem_leaks = DIRECT; + CRYPTO_mem_leaks_cb = DIRECT; + CRYPTO_mem_leaks_fp = DIRECT; + CRYPTO_realloc = DIRECT; + CRYPTO_remalloc = DIRECT; + CRYPTO_set_add_lock_callback = DIRECT; + CRYPTO_set_id_callback = DIRECT; + CRYPTO_set_locking_callback = DIRECT; + CRYPTO_set_mem_functions = DIRECT; + CRYPTO_thread_id = DIRECT; + DH_check = DIRECT; + DH_compute_key = DIRECT; + DH_free = DIRECT; + DH_generate_key = DIRECT; + DH_generate_parameters = DIRECT; + DH_new = DIRECT; + DH_size = DIRECT; + DHparams_print = DIRECT; + DHparams_print_fp = DIRECT; + DSA_free = DIRECT; + DSA_generate_key = DIRECT; + DSA_generate_parameters = DIRECT; + DSA_new = DIRECT; + DSA_print = DIRECT; + DSA_print_fp = DIRECT; + DSA_sign = DIRECT; + DSA_sign_setup = DIRECT; + DSA_size = DIRECT; + DSA_verify = DIRECT; + DSAparams_print = DIRECT; + DSAparams_print_fp = DIRECT; + ERR_clear_error = DIRECT; + ERR_error_string = DIRECT; + ERR_free_strings = DIRECT; + ERR_func_error_string = DIRECT; + ERR_get_err_state_table = DIRECT; + ERR_get_error = DIRECT; + ERR_get_error_line = DIRECT; + ERR_get_state = DIRECT; + ERR_get_string_table = DIRECT; + ERR_lib_error_string = DIRECT; + ERR_load_ASN1_strings = DIRECT; + ERR_load_BIO_strings = DIRECT; + ERR_load_BN_strings = DIRECT; + ERR_load_BUF_strings = DIRECT; + ERR_load_CONF_strings = DIRECT; + ERR_load_DH_strings = DIRECT; + ERR_load_DSA_strings = DIRECT; + ERR_load_ERR_strings = DIRECT; + ERR_load_EVP_strings = DIRECT; + ERR_load_OBJ_strings = DIRECT; + ERR_load_PEM_strings = DIRECT; + ERR_load_RSA_strings = DIRECT; + ERR_load_X509_strings = DIRECT; + ERR_load_crypto_strings = DIRECT; + ERR_load_strings = DIRECT; + ERR_peek_error = DIRECT; + ERR_peek_error_line = DIRECT; + ERR_print_errors = DIRECT; + ERR_print_errors_fp = DIRECT; + ERR_put_error = DIRECT; + ERR_reason_error_string = DIRECT; + ERR_remove_state = DIRECT; + EVP_BytesToKey = DIRECT; + EVP_CIPHER_CTX_cleanup = DIRECT; + EVP_CipherFinal = DIRECT; + EVP_CipherInit = DIRECT; + EVP_CipherUpdate = DIRECT; + EVP_DecodeBlock = DIRECT; + EVP_DecodeFinal = DIRECT; + EVP_DecodeInit = DIRECT; + EVP_DecodeUpdate = DIRECT; + EVP_DecryptFinal = DIRECT; + EVP_DecryptInit = DIRECT; + EVP_DecryptUpdate = DIRECT; + EVP_DigestFinal = DIRECT; + EVP_DigestInit = DIRECT; + EVP_DigestUpdate = DIRECT; + EVP_EncodeBlock = DIRECT; + EVP_EncodeFinal = DIRECT; + EVP_EncodeInit = DIRECT; + EVP_EncodeUpdate = DIRECT; + EVP_EncryptFinal = DIRECT; + EVP_EncryptInit = DIRECT; + EVP_EncryptUpdate = DIRECT; + EVP_OpenFinal = DIRECT; + EVP_OpenInit = DIRECT; + EVP_PKEY_assign = DIRECT; + EVP_PKEY_copy_parameters = DIRECT; + EVP_PKEY_free = DIRECT; + EVP_PKEY_missing_parameters = DIRECT; + EVP_PKEY_new = DIRECT; + EVP_PKEY_save_parameters = DIRECT; + EVP_PKEY_size = DIRECT; + EVP_PKEY_type = DIRECT; + EVP_SealFinal = DIRECT; + EVP_SealInit = DIRECT; + EVP_SignFinal = DIRECT; + EVP_VerifyFinal = DIRECT; + EVP_add_cipher = DIRECT; + EVP_add_digest = DIRECT; + EVP_bf_cbc = DIRECT; + EVP_bf_cfb64 = DIRECT; + EVP_bf_ecb = DIRECT; + EVP_bf_ofb = DIRECT; + EVP_cleanup = DIRECT; + EVP_des_cbc = DIRECT; + EVP_des_cfb64 = DIRECT; + EVP_des_ecb = DIRECT; + EVP_des_ede = DIRECT; + EVP_des_ede3 = DIRECT; + EVP_des_ede3_cbc = DIRECT; + EVP_des_ede3_cfb64 = DIRECT; + EVP_des_ede3_ofb = DIRECT; + EVP_des_ede_cbc = DIRECT; + EVP_des_ede_cfb64 = DIRECT; + EVP_des_ede_ofb = DIRECT; + EVP_des_ofb = DIRECT; + EVP_desx_cbc = DIRECT; + EVP_dss = DIRECT; + EVP_dss1 = DIRECT; + EVP_enc_null = DIRECT; + EVP_get_cipherbyname = DIRECT; + EVP_get_digestbyname = DIRECT; + EVP_get_pw_prompt = DIRECT; + EVP_idea_cbc = DIRECT; + EVP_idea_cfb64 = DIRECT; + EVP_idea_ecb = DIRECT; + EVP_idea_ofb = DIRECT; + EVP_md5 = DIRECT; + EVP_md_null = DIRECT; + EVP_rc2_cbc = DIRECT; + EVP_rc2_cfb64 = DIRECT; + EVP_rc2_ecb = DIRECT; + EVP_rc2_ofb = DIRECT; + EVP_rc4 = DIRECT; + EVP_read_pw_string = DIRECT; + EVP_set_pw_prompt = DIRECT; + EVP_sha = DIRECT; + EVP_sha1 = DIRECT; + MD5 = DIRECT; + MD5_Final = DIRECT; + MD5_Init = DIRECT; + MD5_Update = DIRECT; + MDC2 = DIRECT; + MDC2_Final = DIRECT; + MDC2_Init = DIRECT; + MDC2_Update = DIRECT; + NETSCAPE_SPKAC_free = DIRECT; + NETSCAPE_SPKAC_new = DIRECT; + NETSCAPE_SPKI_free = DIRECT; + NETSCAPE_SPKI_new = DIRECT; + NETSCAPE_SPKI_sign = DIRECT; + NETSCAPE_SPKI_verify = DIRECT; + OBJ_add_object = DIRECT; + OBJ_cleanup = DIRECT; + OBJ_cmp = DIRECT; + OBJ_create = DIRECT; + OBJ_dup = DIRECT; + OBJ_ln2nid = DIRECT; + OBJ_new_nid = DIRECT; + OBJ_nid2ln = DIRECT; + OBJ_nid2obj = DIRECT; + OBJ_nid2sn = DIRECT; + OBJ_obj2nid = DIRECT; + OBJ_sn2nid = DIRECT; + OBJ_txt2nid = DIRECT; + PEM_ASN1_read = DIRECT; + PEM_ASN1_read_bio = DIRECT; + PEM_ASN1_write = DIRECT; + PEM_ASN1_write_bio = DIRECT; + PEM_SealFinal = DIRECT; + PEM_SealInit = DIRECT; + PEM_SealUpdate = DIRECT; + PEM_SignFinal = DIRECT; + PEM_SignInit = DIRECT; + PEM_SignUpdate = DIRECT; + PEM_X509_INFO_read = DIRECT; + PEM_X509_INFO_read_bio = DIRECT; + PEM_X509_INFO_write_bio = DIRECT; + PEM_dek_info = DIRECT; + PEM_do_header = DIRECT; + PEM_get_EVP_CIPHER_INFO = DIRECT; + PEM_proc_type = DIRECT; + PEM_read = DIRECT; + PEM_read_DHparams = DIRECT; + PEM_read_DSAPrivateKey = DIRECT; + PEM_read_DSAparams = DIRECT; + PEM_read_PKCS7 = DIRECT; + PEM_read_PrivateKey = DIRECT; + PEM_read_RSAPrivateKey = DIRECT; + PEM_read_X509 = DIRECT; + PEM_read_X509_CRL = DIRECT; + PEM_read_X509_REQ = DIRECT; + PEM_read_bio = DIRECT; + PEM_read_bio_DHparams = DIRECT; + PEM_read_bio_DSAPrivateKey = DIRECT; + PEM_read_bio_DSAparams = DIRECT; + PEM_read_bio_PKCS7 = DIRECT; + PEM_read_bio_PrivateKey = DIRECT; + PEM_read_bio_RSAPrivateKey = DIRECT; + PEM_read_bio_X509 = DIRECT; + PEM_read_bio_X509_CRL = DIRECT; + PEM_read_bio_X509_REQ = DIRECT; + PEM_write = DIRECT; + PEM_write_DHparams = DIRECT; + PEM_write_DSAPrivateKey = DIRECT; + PEM_write_DSAparams = DIRECT; + PEM_write_PKCS7 = DIRECT; + PEM_write_PrivateKey = DIRECT; + PEM_write_RSAPrivateKey = DIRECT; + PEM_write_X509 = DIRECT; + PEM_write_X509_CRL = DIRECT; + PEM_write_X509_REQ = DIRECT; + PEM_write_bio = DIRECT; + PEM_write_bio_DHparams = DIRECT; + PEM_write_bio_DSAPrivateKey = DIRECT; + PEM_write_bio_DSAparams = DIRECT; + PEM_write_bio_PKCS7 = DIRECT; + PEM_write_bio_PrivateKey = DIRECT; + PEM_write_bio_RSAPrivateKey = DIRECT; + PEM_write_bio_X509 = DIRECT; + PEM_write_bio_X509_CRL = DIRECT; + PEM_write_bio_X509_REQ = DIRECT; + PKCS7_DIGEST_free = DIRECT; + PKCS7_DIGEST_new = DIRECT; + PKCS7_ENCRYPT_free = DIRECT; + PKCS7_ENCRYPT_new = DIRECT; + PKCS7_ENC_CONTENT_free = DIRECT; + PKCS7_ENC_CONTENT_new = DIRECT; + PKCS7_ENVELOPE_free = DIRECT; + PKCS7_ENVELOPE_new = DIRECT; + PKCS7_ISSUER_AND_SERIAL_digest = DIRECT; + PKCS7_ISSUER_AND_SERIAL_free = DIRECT; + PKCS7_ISSUER_AND_SERIAL_new = DIRECT; + PKCS7_RECIP_INFO_free = DIRECT; + PKCS7_RECIP_INFO_new = DIRECT; + PKCS7_SIGNED_free = DIRECT; + PKCS7_SIGNED_new = DIRECT; + PKCS7_SIGNER_INFO_free = DIRECT; + PKCS7_SIGNER_INFO_new = DIRECT; + PKCS7_SIGN_ENVELOPE_free = DIRECT; + PKCS7_SIGN_ENVELOPE_new = DIRECT; + PKCS7_dup = DIRECT; + PKCS7_free = DIRECT; + PKCS7_new = DIRECT; + RAND_bytes = DIRECT; + RAND_cleanup = DIRECT; + RAND_file_name = DIRECT; + RAND_load_file = DIRECT; + RAND_seed = DIRECT; + RAND_write_file = DIRECT; + RC2_cbc_encrypt = DIRECT; + RC2_cfb64_encrypt = DIRECT; + RC2_ecb_encrypt = DIRECT; + RC2_encrypt = DIRECT; + RC2_ofb64_encrypt = DIRECT; + RC2_set_key = DIRECT; + RC4 = DIRECT; + RC4_options = DIRECT; + RC4_set_key = DIRECT; + RSAPrivateKey_dup = DIRECT; + RSAPublicKey_dup = DIRECT; + RSA_PKCS1_SSLeay = DIRECT; + RSA_free = DIRECT; + RSA_generate_key = DIRECT; + RSA_new = DIRECT; + RSA_new_method = DIRECT; + RSA_print = DIRECT; + RSA_print_fp = DIRECT; + RSA_private_decrypt = DIRECT; + RSA_private_encrypt = DIRECT; + RSA_public_decrypt = DIRECT; + RSA_public_encrypt = DIRECT; + RSA_set_default_method = DIRECT; + RSA_sign = DIRECT; + RSA_sign_ASN1_OCTET_STRING = DIRECT; + RSA_size = DIRECT; + RSA_verify = DIRECT; + RSA_verify_ASN1_OCTET_STRING = DIRECT; + SHA = DIRECT; + SHA1 = DIRECT; + SHA1_Final = DIRECT; + SHA1_Init = DIRECT; + SHA1_Update = DIRECT; + SHA_Final = DIRECT; + SHA_Init = DIRECT; + SHA_Update = DIRECT; + OpenSSL_add_all_ciphers = DIRECT; + OpenSSL_add_all_digests = DIRECT; + TXT_DB_create_index = DIRECT; + TXT_DB_free = DIRECT; + TXT_DB_get_by_index = DIRECT; + TXT_DB_insert = DIRECT; + TXT_DB_read = DIRECT; + TXT_DB_write = DIRECT; + X509_ALGOR_free = DIRECT; + X509_ALGOR_new = DIRECT; + X509_ATTRIBUTE_free = DIRECT; + X509_ATTRIBUTE_new = DIRECT; + X509_CINF_free = DIRECT; + X509_CINF_new = DIRECT; + X509_CRL_INFO_free = DIRECT; + X509_CRL_INFO_new = DIRECT; + X509_CRL_add_ext = DIRECT; + X509_CRL_cmp = DIRECT; + X509_CRL_delete_ext = DIRECT; + X509_CRL_dup = DIRECT; + X509_CRL_free = DIRECT; + X509_CRL_get_ext = DIRECT; + X509_CRL_get_ext_by_NID = DIRECT; + X509_CRL_get_ext_by_OBJ = DIRECT; + X509_CRL_get_ext_by_critical = DIRECT; + X509_CRL_get_ext_count = DIRECT; + X509_CRL_new = DIRECT; + X509_CRL_sign = DIRECT; + X509_CRL_verify = DIRECT; + X509_EXTENSION_create_by_NID = DIRECT; + X509_EXTENSION_create_by_OBJ = DIRECT; + X509_EXTENSION_dup = DIRECT; + X509_EXTENSION_free = DIRECT; + X509_EXTENSION_get_critical = DIRECT; + X509_EXTENSION_get_data = DIRECT; + X509_EXTENSION_get_object = DIRECT; + X509_EXTENSION_new = DIRECT; + X509_EXTENSION_set_critical = DIRECT; + X509_EXTENSION_set_data = DIRECT; + X509_EXTENSION_set_object = DIRECT; + X509_INFO_free = DIRECT; + X509_INFO_new = DIRECT; + X509_LOOKUP_by_alias = DIRECT; + X509_LOOKUP_by_fingerprint = DIRECT; + X509_LOOKUP_by_issuer_serial = DIRECT; + X509_LOOKUP_by_subject = DIRECT; + X509_LOOKUP_ctrl = DIRECT; + X509_LOOKUP_file = DIRECT; + X509_LOOKUP_free = DIRECT; + X509_LOOKUP_hash_dir = DIRECT; + X509_LOOKUP_init = DIRECT; + X509_LOOKUP_new = DIRECT; + X509_LOOKUP_shutdown = DIRECT; + X509_NAME_ENTRY_create_by_NID = DIRECT; + X509_NAME_ENTRY_create_by_OBJ = DIRECT; + X509_NAME_ENTRY_dup = DIRECT; + X509_NAME_ENTRY_free = DIRECT; + X509_NAME_ENTRY_get_data = DIRECT; + X509_NAME_ENTRY_get_object = DIRECT; + X509_NAME_ENTRY_new = DIRECT; + X509_NAME_ENTRY_set_data = DIRECT; + X509_NAME_ENTRY_set_object = DIRECT; + X509_NAME_add_entry = DIRECT; + X509_NAME_cmp = DIRECT; + X509_NAME_delete_entry = DIRECT; + X509_NAME_digest = DIRECT; + X509_NAME_dup = DIRECT; + X509_NAME_entry_count = DIRECT; + X509_NAME_free = DIRECT; + X509_NAME_get_entry = DIRECT; + X509_NAME_get_index_by_NID = DIRECT; + X509_NAME_get_index_by_OBJ = DIRECT; + X509_NAME_get_text_by_NID = DIRECT; @@ 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 chninkel at users.sourceforge.net Mon Dec 31 18:24:50 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 31 Dec 2012 17:24:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[19986] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 19986 http://gar.svn.sourceforge.net/gar/?rev=19986&view=rev Author: chninkel Date: 2012-12-31 17:24:50 +0000 (Mon, 31 Dec 2012) Log Message: ----------- openssl1/trunk: added automatic selection of binary with isaexec Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2012-12-31 17:20:02 UTC (rev 19985) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2012-12-31 17:24:50 UTC (rev 19986) @@ -147,7 +147,8 @@ ##### Build and installation information ##### -BUILD64 =1 +BUILD64 = 1 +ISAEXEC = 1 # The list of instructions set for which we will # provide optimized libraries and binaries This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.