From maciej at opencsw.org Thu Mar 1 00:55:47 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Thu, 1 Mar 2012 00:55:47 +0100 Subject: [csw-devel] [PATCH 0/2] 'gmake check' on Solaris 10 Message-ID: <1330559749-23883-1-git-send-email-maciej@opencsw.org> These two patches make 'gmake check' pass in Solaris 10. There are two cases where CONFIG_SHELL needs to be used, and one place where libcompat is necessary because of asprintf(). Maciej Blizinski (2): Use libcompat in tests Invoke check_headers with $(SHELL) lib/Makefile.am | 2 +- src/Makefile.am | 2 +- src/test/Makefile.am | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) -- 1.7.9 From maciej at opencsw.org Thu Mar 1 00:55:48 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Thu, 1 Mar 2012 00:55:48 +0100 Subject: [csw-devel] [PATCH 1/2] Use libcompat in tests In-Reply-To: <1330559749-23883-1-git-send-email-maciej@opencsw.org> References: <1330559749-23883-1-git-send-email-maciej@opencsw.org> Message-ID: <1330559749-23883-2-git-send-email-maciej@opencsw.org> Otherwise: Undefined first referenced symbol in file asprintf url.o ld: fatal: Symbol referencing errors. No output written to test_url --- src/test/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 71f6768..128aecd 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -15,7 +15,8 @@ TESTS = $(check_PROGRAMS) AM_CFLAGS = $(CFLAGS_libvlccore) AM_LDFLAGS = -no-install -LDADD = ../libvlccore.la +LDADD = ../libvlccore.la \ + ../../compat/libcompat.la test_block_SOURCES = block_test.c ../misc/block.c test_block_LDADD = $(LDADD) $(LIBS_libvlccore) -- 1.7.9 From maciej at opencsw.org Thu Mar 1 00:55:49 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Thu, 1 Mar 2012 00:55:49 +0100 Subject: [csw-devel] [PATCH 2/2] Invoke check_headers with $(SHELL) In-Reply-To: <1330559749-23883-1-git-send-email-maciej@opencsw.org> References: <1330559749-23883-1-git-send-email-maciej@opencsw.org> Message-ID: <1330559749-23883-3-git-send-email-maciej@opencsw.org> Otherwise, it gets executed with /bin/sh which on Solaris does not support the $(...) construct. This causes 'gmake check' to fail. For example: ../src/check_headers: $(dirname ../src/check_headers): does not exist Calling check_headers with $(SHELL) explicitly makes use of CONFIG_SHELL. --- lib/Makefile.am | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 339d3b4..4ad0e21 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -75,4 +75,4 @@ pkgconfig_DATA = libvlc.pc $(SHELL) ./config.status --file="lib/$@" check-local: - $(top_srcdir)/src/check_headers $(pkginclude_HEADERS) + $(SHELL) $(top_srcdir)/src/check_headers $(pkginclude_HEADERS) diff --git a/src/Makefile.am b/src/Makefile.am index 492dcde..059b90c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -530,7 +530,7 @@ check-local: exit 1; \ fi ; \ done - $(srcdir)/check_headers $(pluginsinclude_HEADERS) + $(SHELL) $(srcdir)/check_headers $(pluginsinclude_HEADERS) FORCE: @echo "Generated source cannot be phony. Go away." >&2 -- 1.7.9 From maciej at opencsw.org Thu Mar 1 09:37:48 2012 From: maciej at opencsw.org (Maciej Blizinski) Date: Thu, 1 Mar 2012 09:37:48 +0100 Subject: [csw-devel] [PATCH 1/2] Use libcompat in tests In-Reply-To: <1330559749-23883-2-git-send-email-maciej@opencsw.org> References: <1330559749-23883-2-git-send-email-maciej@opencsw.org> Message-ID: <1330591068-20300-1-git-send-email-maciej@opencsw.org> Otherwise: Undefined first referenced symbol in file asprintf url.o ld: fatal: Symbol referencing errors. No output written to test_url This patch uses a mix of tabs and spaces to match the existing convention. --- src/test/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 71f6768..25e5d50 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -15,7 +15,8 @@ TESTS = $(check_PROGRAMS) AM_CFLAGS = $(CFLAGS_libvlccore) AM_LDFLAGS = -no-install -LDADD = ../libvlccore.la +LDADD = ../libvlccore.la \ + ../../compat/libcompat.la test_block_SOURCES = block_test.c ../misc/block.c test_block_LDADD = $(LDADD) $(LIBS_libvlccore) -- 1.7.5.4 From dmichelsen at users.sourceforge.net Thu Mar 1 11:40:12 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Mar 2012 10:40:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17253] csw/mgar/pkg/cpan Message-ID: Revision: 17253 http://gar.svn.sourceforge.net/gar/?rev=17253&view=rev Author: dmichelsen Date: 2012-03-01 10:40:12 +0000 (Thu, 01 Mar 2012) Log Message: ----------- cpan/Mouse/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Mouse/ csw/mgar/pkg/cpan/Mouse/branches/ csw/mgar/pkg/cpan/Mouse/tags/ csw/mgar/pkg/cpan/Mouse/trunk/ csw/mgar/pkg/cpan/Mouse/trunk/Makefile csw/mgar/pkg/cpan/Mouse/trunk/checksums csw/mgar/pkg/cpan/Mouse/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Mouse/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Mouse/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mouse/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Mouse/trunk/Makefile 2012-03-01 10:40:12 UTC (rev 17253) @@ -0,0 +1,19 @@ +NAME = Mouse +VERSION = 0.97 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = GFUJI + +DESCRIPTION = Moose minus the antlers +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = README + +PACKAGES += CSWpm-mouse +CATALOGNAME_CSWpm-mouse = pm_mouse +SPKG_DESC_CSWpm-mouse = Moose minus the antlers + +include gar/category.mk Added: csw/mgar/pkg/cpan/Mouse/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Mouse/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Mouse/trunk/checksums 2012-03-01 10:40:12 UTC (rev 17253) @@ -0,0 +1 @@ +92a8b387f9619d32bce6685c1dd370e5 Mouse-0.97.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 1 14:40:51 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Mar 2012 13:40:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[17254] csw/mgar/pkg Message-ID: Revision: 17254 http://gar.svn.sourceforge.net/gar/?rev=17254&view=rev Author: dmichelsen Date: 2012-03-01 13:40:51 +0000 (Thu, 01 Mar 2012) Log Message: ----------- pupnp/trunk: Initial commit, does not compile yet Added Paths: ----------- csw/mgar/pkg/pupnp/ csw/mgar/pkg/pupnp/Makefile csw/mgar/pkg/pupnp/branches/ csw/mgar/pkg/pupnp/tags/ csw/mgar/pkg/pupnp/trunk/ csw/mgar/pkg/pupnp/trunk/Makefile csw/mgar/pkg/pupnp/trunk/checksums csw/mgar/pkg/pupnp/trunk/files/ csw/mgar/pkg/pupnp/trunk/files/0001-Add-includes-for-Solaris.patch csw/mgar/pkg/pupnp/trunk/files/0002-Use-inttypes.h-if-stdint.h-is-not-available.patch csw/mgar/pkg/pupnp/trunk/files/libupnp-01-solaris.spec Added: csw/mgar/pkg/pupnp/Makefile =================================================================== --- csw/mgar/pkg/pupnp/Makefile (rev 0) +++ csw/mgar/pkg/pupnp/Makefile 2012-03-01 13:40:51 UTC (rev 17254) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/pupnp/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/pupnp/trunk/Makefile =================================================================== --- csw/mgar/pkg/pupnp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pupnp/trunk/Makefile 2012-03-01 13:40:51 UTC (rev 17254) @@ -0,0 +1,45 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libupnp +VERSION = 1.6.15 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Portable UPnP SDK +define BLURB +endef + +SF_PROJ = pupnp +MASTER_SITES = $(SF_MIRROR) +DISTFILES += $(DISTNAME).tar.bz2 + +# Add patch from SFE originally to be found at +# http://pkgbuild.svn.sourceforge.net/svnroot/pkgbuild/spec-files-extra/trunk/patches/libupnp-01-solaris.spec +# PATCHFILES += libupnp-01-solaris.spec + +PATCHFILES += 0001-Add-includes-for-Solaris.patch +PATCHFILES += 0002-Use-inttypes.h-if-stdint.h-is-not-available.patch + +PACKAGES += CSWmypkg +SPKG_DESC_CSWmypkg = My package +PKGFILES_CSWmypkg += $(call pkgfiles_lib,libabc.so.1) +PKGFILES_CSWmypkg += $(call baseisadirs,$(bindir),myexec) +PKGFILES_CSWmypkg += $(sysconfdir)/myconf + +# "VERSION\" | sed " configure +REINPLACEMENTS += gsed +REINPLACE_MATCH_gsed = VERSION\"\ \|\ sed +REINPLACE_WITH_gsed = VERSION\" | gsed +REINPLACE_FILES_gsed += configure + + +BUILD64_LIBS_ONLY = 1 + +# From README +EXTRA_CFLAGS += -D__sun + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/pupnp/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/pupnp/trunk/checksums =================================================================== --- csw/mgar/pkg/pupnp/trunk/checksums (rev 0) +++ csw/mgar/pkg/pupnp/trunk/checksums 2012-03-01 13:40:51 UTC (rev 17254) @@ -0,0 +1 @@ +1b21e5b5fb6185101c467aefd19f0bf7 libupnp-1.6.15.tar.bz2 Added: csw/mgar/pkg/pupnp/trunk/files/0001-Add-includes-for-Solaris.patch =================================================================== --- csw/mgar/pkg/pupnp/trunk/files/0001-Add-includes-for-Solaris.patch (rev 0) +++ csw/mgar/pkg/pupnp/trunk/files/0001-Add-includes-for-Solaris.patch 2012-03-01 13:40:51 UTC (rev 17254) @@ -0,0 +1,25 @@ +From b2d7dc97a2498339e01cc2799e6e27640f83cca2 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 1 Mar 2012 13:43:07 +0100 +Subject: [PATCH] Add includes for Solaris + +--- + upnp/inc/UpnpInet.h | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/upnp/inc/UpnpInet.h b/upnp/inc/UpnpInet.h +index 6269c4a..a51cdc5 100644 +--- a/upnp/inc/UpnpInet.h ++++ b/upnp/inc/UpnpInet.h +@@ -30,6 +30,8 @@ + #if defined(__sun) + #include + #include ++ #include ++ #include + #elif (defined(BSD) && BSD >= 199306) || defined (__FreeBSD_kernel__) + #include + /* Do not move or remove the include below for "sys/socket"! +-- +1.7.9 + Added: csw/mgar/pkg/pupnp/trunk/files/0002-Use-inttypes.h-if-stdint.h-is-not-available.patch =================================================================== --- csw/mgar/pkg/pupnp/trunk/files/0002-Use-inttypes.h-if-stdint.h-is-not-available.patch (rev 0) +++ csw/mgar/pkg/pupnp/trunk/files/0002-Use-inttypes.h-if-stdint.h-is-not-available.patch 2012-03-01 13:40:51 UTC (rev 17254) @@ -0,0 +1,28 @@ +From b32cacc18632995c2ac265eb323b30e2c2ee1b56 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 1 Mar 2012 14:09:24 +0100 +Subject: [PATCH] Use inttypes.h if stdint.h is not available + +--- + upnp/inc/UpnpStdInt.h | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/upnp/inc/UpnpStdInt.h b/upnp/inc/UpnpStdInt.h +index 9256f57..f87c095 100644 +--- a/upnp/inc/UpnpStdInt.h ++++ b/upnp/inc/UpnpStdInt.h +@@ -4,7 +4,11 @@ + #if !defined(UPNP_USE_BCBPP) + + /* Sized integer types. */ ++#if defined( HAVE_STDINT_H ) + #include ++#elsif defined( HAVE_INTTYPES_H ) ++#include ++#endif + + #ifdef UPNP_USE_MSVCPP + /* no ssize_t defined for VC */ +-- +1.7.9 + Added: csw/mgar/pkg/pupnp/trunk/files/libupnp-01-solaris.spec =================================================================== --- csw/mgar/pkg/pupnp/trunk/files/libupnp-01-solaris.spec (rev 0) +++ csw/mgar/pkg/pupnp/trunk/files/libupnp-01-solaris.spec 2012-03-01 13:40:51 UTC (rev 17254) @@ -0,0 +1,42 @@ +--- libupnp-1.6.0/README.orig 2007-07-15 15:19:30.541726415 +0700 ++++ libupnp-1.6.0/README 2007-07-15 15:20:12.555440132 +0700 +@@ -111,7 +111,7 @@ + options enabled (see below for options available at configure time). + + % cd $(LIBUPNP) +-% ./configure CFLAGS="-DSPARC_SOLARIS -mtune= -mcpu=" ++% ./configure CFLAGS="-DSOLARIS -mtune= -mcpu=" + % make + + will build a Sparc Solaris version of the binaries without debug support +@@ -247,7 +247,7 @@ + described above. Only the call to ./configure has to be done using an + additional parameter: + +-./configure CFLAGS="-mcpu= -mtune= -DSPARC_SOLARIS" ++./configure CFLAGS="-mcpu= -mtune= -DSOLARIS" + + where has to be replaced by the appropriate CPU tuning flag (e.g. + "supersparc"). Afterwards +--- libupnp-1.6.6/upnp/src/genlib/net/uri/uri.c.orig 2008-11-13 13:58:53.675111848 +0800 ++++ libupnp-1.6.6/upnp/src/genlib/net/uri/uri.c 2008-11-13 14:36:42.044847654 +0800 +@@ -627,7 +627,7 @@ + // platform-specific stuff below + #if defined(WIN32) || defined(__CYGWIN__) + h = gethostbyname(temp_host_name); +-#elif defined(SPARC_SOLARIS) ++#elif defined(SOLARIS) + errCode = gethostbyname_r( + temp_host_name, + &h, +--- libupnp-1.6.6/upnp/src/api/upnpapi.c.orig 2008-11-13 14:51:07.131616887 +0800 ++++ libupnp-1.6.6/upnp/src/api/upnpapi.c 2008-11-13 14:51:52.992915327 +0800 +@@ -56,7 +56,7 @@ + #include + + +- #if defined(_sun) ++ #if defined(SOLARIS) + #include + #include + #elif defined(BSD) && BSD >= 199306 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 Mar 1 14:46:48 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Mar 2012 13:46:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[17255] csw/mgar/pkg/cpan/makemake Message-ID: Revision: 17255 http://gar.svn.sourceforge.net/gar/?rev=17255&view=rev Author: dmichelsen Date: 2012-03-01 13:46:48 +0000 (Thu, 01 Mar 2012) Log Message: ----------- makemake: General rewort Modified Paths: -------------- csw/mgar/pkg/cpan/makemake Modified: csw/mgar/pkg/cpan/makemake =================================================================== --- csw/mgar/pkg/cpan/makemake 2012-03-01 13:40:51 UTC (rev 17254) +++ csw/mgar/pkg/cpan/makemake 2012-03-01 13:46:48 UTC (rev 17255) @@ -1,5 +1,11 @@ #!/opt/csw/bin/perl +# This is a tool to make Makefiles for CPAN modules +# Usage: +# makemake My::Module +# It generate My-Module/trunk/Makefile and modified it accordingly. If the Makefile is already there it +# it overwritten and can be inspected with "svn diff". + use strict; use warnings; use feature ':5.10'; @@ -16,21 +22,11 @@ use Parallel::ForkManager; use JSON; -# TBD: -# [10:14] El_Che: no fix for require, but it gives you filenames of the source -# [10:16] Dagobert: Ahhhh.... sorry, I missed that -# [10:16] Dagobert: How does it work? Does it access a static copy of the CPAN database? -# [10:17] El_Che: I guess it looks locally looking at the deployed modules -# [10:17] El_Che: looks looking -# [10:17] El_Che: goodmorning -# [10:18] El_Che: there is also a path option - # These three routines are used to capture the output of sub processes and # perl routines (such as CPAN::Module::get) into a log file. If the command # completes successfuly, the log file is thrown away. If the command fails, # the log file is printed along with an error message by calling fail. - ### Variables ### my ( $verbose, $logfile, $pgm ); my $cpandir = getcwd; @@ -115,11 +111,12 @@ @runtime_dep_pkgs = dep_pkgs($req); } -$description //= $mod->description; # Changed to defined from false or +$description //= $mod->description; # Changed to defined from false or $description //= $mod->manpage_headline; $description //= $mod->distribution->as_glimpse; $description //= ""; $description = ucfirst($description); +$description =~ s/\.$//; # Strip trailing . chomp($description); # Come back from cpan module build directory to GAR cpan/ @@ -153,13 +150,6 @@ } say {$mf_fh} "" if ($upstreaminfo); -if (@build_dep_pkgs) { - foreach my $p (@build_dep_pkgs) { - say {$mf_fh} "BUILD_DEP_PKGS += $p"; - } - say {$mf_fh} ""; -} - say {$mf_fh} "CATALOG_RELEASE = unstable"; say {$mf_fh} ""; @@ -170,6 +160,13 @@ } } +if (@build_dep_pkgs) { + foreach my $p (@build_dep_pkgs) { + say {$mf_fh} "BUILD_DEP_PKGS += $p"; + } + say {$mf_fh} ""; +} + say {$mf_fh} "PACKAGES += $cswpkg"; say {$mf_fh} "CATALOGNAME_$cswpkg = $cswcatalog"; say {$mf_fh} "SPKG_DESC_$cswpkg = $description"; @@ -191,33 +188,19 @@ if ( @oldpkgs > 1 ) { say STDERR "ERROR: More than one package for module '$modname' found: @oldpkgs"; } -my $oldpkg = shift @oldpkgs; -if ( $oldpkg ne $cswpkg ) { +foreach my $oldpkg (@oldpkgs) { + if( $cswpkg eq $oldpkg ) { + say STDERR "A previous version of this package $cswpkg has been released"; + next; + } + say STDERR "A previous version of this package $cswpkg was released, but was named $oldpkg then"; + say {$mf_fh} "OBSOLETED_BY_$cswpkg += $oldpkg"; - my $ua = LWP::UserAgent->new; - $ua->timeout(300); - $ua->proxy( [ 'http', 'ftp' ], 'http://proxy:3128' ); - - my $catalog = "unstable"; - my $arch = "sparc"; - my $rel = "SunOS5.10"; - - my $url = "http://buildfarm.opencsw.org/pkgdb/rest/catalogs/$catalog/$arch/$rel/pkgnames/$oldpkg/"; - - my $response = $ua->get($url); - - if ( $response->is_success ) { - my $json_string = $response->decoded_content; # or whatever - if ( $json_string eq "null" ) { - say "Couldn't find package $oldpkg in $catalog:$arch:$rel"; - } else { - my $data = decode_json $json_string; - my $cname = $data->{catalogname}; - say {$mf_fh} "CATALOGNAME_$oldpkg = ${cname}_stub"; - } - } else { - print "Error getting $url\n" . $response->status_line; + my $data = getpkgdata( $oldpkg ); + if( $data ) { + my $cname = $data->{catalogname}; + say {$mf_fh} "CATALOGNAME_$oldpkg = ${cname}_stub"; } } @@ -236,7 +219,7 @@ sub dep_pkgs { my $req = shift @_; - my @result; + my %result; foreach my $modname ( keys %$req ) { my $version = version->parse( $req->{$modname} ); if ( $modname eq "perl" ) { @@ -245,19 +228,34 @@ } next; } - if ( $version > version->parse( get_version($modname) ) ) { - print STDERR "Version of $modname is too old. Required is $version, installed is ", - ( get_version($modname) or "nothing" ), "\n"; + + if( get_version( $modname ) ) { + if ( $version > version->parse( get_version($modname) ) ) { + say STDERR "Version of $modname is too old. Required is $version, installed is ", + get_version($modname); + # XXX: Is there something newer in the catalog? + # XXX: If not, recommend updating the recipe with makemake + } + } else { + # The module is not installed + # XXX: Compare against package version in the catalog } my @pkgs = mod2pkg($modname); if ( @pkgs > 1 ) { print STDERR "ERROR: More than one package for module '$modname' found: @pkgs\n"; } - my $pkg = shift @pkgs; + my $pkg = $pkgs[0]; if ($pkg) { - print STDERR "Packages for module '$modname': $pkg\n"; + say STDERR "Packages for module '$modname': ", join( ", ", @pkgs ); next if ( $pkg eq 'CSWperl' ); + + my ( $guessedpkg, $dirname ) = guess_name_from_module($modname); + + if( $pkg ne $guessedpkg ) { + print STDERR "ERROR: Found package name '$pkg' is not consistent to the " . + "canonical '$guessedpkg', please invoke makemake $modname\n"; + } } else { print STDERR "MISSING package for '$modname'\n"; @@ -272,10 +270,10 @@ } } } - push @result, $pkg if ($pkg); + $result{$pkg} = 1 if ($pkg); } - return @result; + return keys %result; } sub endlog { @@ -377,9 +375,10 @@ $pm->wait_all_children; - print "Matched packages: ", join( ", ", keys %pkgs ), "\n"; + # print "Matched packages: ", join( ", ", keys %pkgs ), "\n"; - return keys %pkgs; + # Perl may provide the functionality itself, although there is a more up-to-date module + return ( exists $pkgs{CSWperl} ? "CSWperl" : keys %pkgs ); } @@ -399,3 +398,35 @@ return %pkgs; } + +sub getpkgdata { + my ($pkg) = @_; + + my $ua = LWP::UserAgent->new; + $ua->timeout(300); + $ua->proxy( [ 'http', 'ftp' ], 'http://proxy:3128' ); + + my $catalog = "unstable"; + my $arch = "sparc"; + my $rel = "SunOS5.10"; + + my $url = "http://buildfarm.opencsw.org/pkgdb/rest/catalogs/$catalog/$arch/$rel/pkgnames/$pkg/"; + + my $response = $ua->get($url); + + # version is "version": "1.6.4,REV=2011.11.24" + + my $data; + if ( $response->is_success ) { + my $json_string = $response->decoded_content; # or whatever + if ( $json_string eq "null" ) { + say STDERR "Couldn't find package $pkg in $catalog:$arch:$rel"; + } else { + $data = decode_json $json_string; + } + } else { + print STDERR "Error getting $url\n" . $response->status_line; + } + + return $data; +} 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 Mar 1 17:02:11 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Mar 2012 16:02:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17256] csw/mgar/pkg/varnish/trunk Message-ID: Revision: 17256 http://gar.svn.sourceforge.net/gar/?rev=17256&view=rev Author: dmichelsen Date: 2012-03-01 16:02:10 +0000 (Thu, 01 Mar 2012) Log Message: ----------- varnish/trunk: Update to 3.0.2, testsuite still has problems Modified Paths: -------------- csw/mgar/pkg/varnish/trunk/Makefile csw/mgar/pkg/varnish/trunk/checksums Modified: csw/mgar/pkg/varnish/trunk/Makefile =================================================================== --- csw/mgar/pkg/varnish/trunk/Makefile 2012-03-01 13:46:48 UTC (rev 17255) +++ csw/mgar/pkg/varnish/trunk/Makefile 2012-03-01 16:02:10 UTC (rev 17256) @@ -1,36 +1,42 @@ # $Id$ NAME = varnish -VERSION = 2.1.3 +VERSION = 3.0.2 CATEGORIES = apps GARTYPE = v2 DESCRIPTION = Varnish Web Cache define BLURB - Long description endef -MASTER_SITES = http://www.varnish-software.com/sites/default/files/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = http://repo.varnish-cache.org/source/ +DISTFILES += $(DISTNAME).tar.gz # From http://www.varnish-cache.org/trac/ticket/663 -PATCHFILES = varnish_autoconf_pthread.patch +#PATCHFILES = varnish_autoconf_pthread.patch -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - VENDOR_URL = http://www.varnish-cache.org PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +LICENSE = LICENSE + +BUILD_DEP_PKGS += CSWlibpcre-dev + +# TBD: http://www.gossamer-threads.com/lists/varnish/bugs/2283 + # Otherwise testsuite is failing LD_OPTIONS = EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) -BUILD64_LIBS_ONLY = 1 -CONFIGURE_ARGS = $(DIRPATHS) +BUILD64 = 1 +EXTRA_CPPFLAGS = -D__inline= + +EXTRA_CONFIGURE_EXPORTS = VCC_CC +VCC_CC = $(CC) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) -o %o %s + include gar/category.mk -pre-configure-modulated: - -cd $(WORKSRC) && autoreconf -fi - @$(MAKECOOKIE) +#pre-configure-modulated: +# -cd $(WORKSRC) && autoreconf -fi +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/varnish/trunk/checksums =================================================================== --- csw/mgar/pkg/varnish/trunk/checksums 2012-03-01 13:46:48 UTC (rev 17255) +++ csw/mgar/pkg/varnish/trunk/checksums 2012-03-01 16:02:10 UTC (rev 17256) @@ -1 +1 @@ -357d99a760de173d841ac37bf2052be8 varnish-2.1.3.tar.gz +c8eae0aabbe66b6daabdf3a1f58cd47a varnish-3.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 Thu Mar 1 17:05:30 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Mar 2012 16:05:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[17257] csw/mgar/pkg Message-ID: Revision: 17257 http://gar.svn.sourceforge.net/gar/?rev=17257&view=rev Author: dmichelsen Date: 2012-03-01 16:05:30 +0000 (Thu, 01 Mar 2012) Log Message: ----------- libedit/trunk: Initial commit, not finished Added Paths: ----------- csw/mgar/pkg/libedit/ csw/mgar/pkg/libedit/Makefile csw/mgar/pkg/libedit/branches/ csw/mgar/pkg/libedit/tags/ csw/mgar/pkg/libedit/trunk/ csw/mgar/pkg/libedit/trunk/Makefile csw/mgar/pkg/libedit/trunk/checksums csw/mgar/pkg/libedit/trunk/files/ csw/mgar/pkg/libedit/trunk/files/0001-Add-definition-for-sig_t.patch Added: csw/mgar/pkg/libedit/Makefile =================================================================== --- csw/mgar/pkg/libedit/Makefile (rev 0) +++ csw/mgar/pkg/libedit/Makefile 2012-03-01 16:05:30 UTC (rev 17257) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/libedit/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libedit/trunk/Makefile =================================================================== --- csw/mgar/pkg/libedit/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libedit/trunk/Makefile 2012-03-01 16:05:30 UTC (rev 17257) @@ -0,0 +1,37 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# ! Installation needs to be relocated to DESTDIR by using INSTALL_OVERRIDE_VARS +# ! Linkage of libedit.so needs a SONAME, probably libedit.so.1 +# ! Package creation is missing + +NAME = libedit +VERSION = 0.3 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Non-GPL replacement for readline library +define BLURB +endef + +MASTER_SITES = $(SF_MIRROR) +DISTNAME = libedit +DISTFILES = $(NAME)-$(VERSION).tar.gz + +PATCHFILES += 0001-Add-definition-for-sig_t.patch + +BUILD64_LIBS_ONLY = 1 + +# The vis.h is completely different what libedit expects +EXTRA_CONFIGURE_ENV += ac_cv_header_vis_h=no + +EXTRA_CFLAGS += $(CPPFLAGS) +EXTRA_INC += $(includedir)/ncurses + +CONFIGURE_ARGS += $(DIRPATHS) + +TEST_TARGET = TEST +TEST_OVERRIDE_VARS = LDADD +TEST_OVERRIDE_VAR_LDADD = $(LDFLAGS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/libedit/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libedit/trunk/checksums =================================================================== --- csw/mgar/pkg/libedit/trunk/checksums (rev 0) +++ csw/mgar/pkg/libedit/trunk/checksums 2012-03-01 16:05:30 UTC (rev 17257) @@ -0,0 +1 @@ +252fbaa3812f0034715f7e78203897ec libedit-0.3.tar.gz Added: csw/mgar/pkg/libedit/trunk/files/0001-Add-definition-for-sig_t.patch =================================================================== --- csw/mgar/pkg/libedit/trunk/files/0001-Add-definition-for-sig_t.patch (rev 0) +++ csw/mgar/pkg/libedit/trunk/files/0001-Add-definition-for-sig_t.patch 2012-03-01 16:05:30 UTC (rev 17257) @@ -0,0 +1,24 @@ +From 0c52ba0a8b12b1eccbe87a7c03591b28d8c23a6f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 1 Mar 2012 16:53:53 +0100 +Subject: [PATCH] Add definition for sig_t + +--- + sig.h | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/sig.h b/sig.h +index e7231b6..5a68e8a 100644 +--- a/sig.h ++++ b/sig.h +@@ -62,6 +62,7 @@ + _DO(SIGCONT) \ + _DO(SIGWINCH) + ++typedef int sig_t; + typedef sig_t *el_signal_t; + + protected void sig_end(EditLine*); +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 2 01:56:55 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 02 Mar 2012 00:56:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[17258] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 17258 http://gar.svn.sourceforge.net/gar/?rev=17258&view=rev Author: bdwalton Date: 2012-03-02 00:56:55 +0000 (Fri, 02 Mar 2012) Log Message: ----------- php5/trunk: ensure that the default php.ini file has extension=session.so; mantis 4905,4911 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-03-01 16:05:30 UTC (rev 17257) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-03-02 00:56:55 UTC (rev 17258) @@ -365,5 +365,9 @@ @$(MAKECOOKIE) post-merge: + @echo " ==> Killing phar" @(rm $(PKGROOT)/opt/csw/php5/extensions/phar) + @echo " ==> Fixing php.ini: adding loadable session.so support" + @( cd $(PKGROOT)/$(sysconfdir)/$(NAME); \ + perl -pi.bak -e 's/extension=bz2.so/extension=session.so\n;extension=bz2.so/' php.ini; ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 2 02:10:33 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 02 Mar 2012 01:10:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[17259] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 17259 http://gar.svn.sourceforge.net/gar/?rev=17259&view=rev Author: bdwalton Date: 2012-03-02 01:10:33 +0000 (Fri, 02 Mar 2012) Log Message: ----------- php5/trunk: sysconfdir already includes NAME (fix post-merge) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-03-02 00:56:55 UTC (rev 17258) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-03-02 01:10:33 UTC (rev 17259) @@ -368,6 +368,6 @@ @echo " ==> Killing phar" @(rm $(PKGROOT)/opt/csw/php5/extensions/phar) @echo " ==> Fixing php.ini: adding loadable session.so support" - @( cd $(PKGROOT)/$(sysconfdir)/$(NAME); \ + @( cd $(PKGROOT)/$(sysconfdir)/; \ perl -pi.bak -e 's/extension=bz2.so/extension=session.so\n;extension=bz2.so/' php.ini; ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 2 02:20:08 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 02 Mar 2012 01:20:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17260] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 17260 http://gar.svn.sourceforge.net/gar/?rev=17260&view=rev Author: bdwalton Date: 2012-03-02 01:20:08 +0000 (Fri, 02 Mar 2012) Log Message: ----------- php5/trunk: the ini file is already moved into template position after merge; fix the post-merge fixup Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-03-02 01:10:33 UTC (rev 17259) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-03-02 01:20:08 UTC (rev 17260) @@ -369,5 +369,5 @@ @(rm $(PKGROOT)/opt/csw/php5/extensions/phar) @echo " ==> Fixing php.ini: adding loadable session.so support" @( cd $(PKGROOT)/$(sysconfdir)/; \ - perl -pi.bak -e 's/extension=bz2.so/extension=session.so\n;extension=bz2.so/' php.ini; ) + perl -pi.bak -e 's/extension=bz2.so/extension=session.so\n;extension=bz2.so/' php.ini.CSW; ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 2 16:04:39 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Mar 2012 15:04:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17261] csw/mgar/pkg/cpan/Test-use-ok/trunk/Makefile Message-ID: Revision: 17261 http://gar.svn.sourceforge.net/gar/?rev=17261&view=rev Author: dmichelsen Date: 2012-03-02 15:04:39 +0000 (Fri, 02 Mar 2012) Log Message: ----------- cpan/Test-use-ok/trunk: Update to sane naming Modified Paths: -------------- csw/mgar/pkg/cpan/Test-use-ok/trunk/Makefile Modified: csw/mgar/pkg/cpan/Test-use-ok/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-use-ok/trunk/Makefile 2012-03-02 01:20:08 UTC (rev 17260) +++ csw/mgar/pkg/cpan/Test-use-ok/trunk/Makefile 2012-03-02 15:04:39 UTC (rev 17261) @@ -8,11 +8,15 @@ define BLURB endef -DISTFILES = COPYING +DISTFILES += COPYING -PACKAGES = CSWpmtestuseok -CATALOGNAME = pm_testuseok +CATALOG_RELEASE = unstable -ARCHALL = 1 +PACKAGES += CSWpm-ok +CATALOGNAME_CSWpm-ok = pm_ok +SPKG_DESC_CSWpm-ok = Alternative to Test::More::use_ok +ARCHALL_CSWpm-ok = 1 +OBSOLETED_BY_CSWpm-ok += CSWpmtestuseok +CATALOGNAME_CSWpmtestuseok = pm_testuseok_stub include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 2 16:06:15 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Mar 2012 15:06:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[17262] csw/mgar/pkg/cpan/Params-Util/trunk Message-ID: Revision: 17262 http://gar.svn.sourceforge.net/gar/?rev=17262&view=rev Author: dmichelsen Date: 2012-03-02 15:06:15 +0000 (Fri, 02 Mar 2012) Log Message: ----------- cpan/Params-Util/trunk: Update to 1.06 and sane package naming Modified Paths: -------------- csw/mgar/pkg/cpan/Params-Util/trunk/Makefile csw/mgar/pkg/cpan/Params-Util/trunk/checksums Modified: csw/mgar/pkg/cpan/Params-Util/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Params-Util/trunk/Makefile 2012-03-02 15:04:39 UTC (rev 17261) +++ csw/mgar/pkg/cpan/Params-Util/trunk/Makefile 2012-03-02 15:06:15 UTC (rev 17262) @@ -1,16 +1,21 @@ NAME = Params-Util -VERSION = 1.00 +VERSION = 1.06 CATEGORIES = cpan GARTYPE = v2 AUTHOR = ADAMK DESCRIPTION = Simple, compact and correct param-checking functions define BLURB - "Params::Util" provides a basic set of importable functions that makes - checking parameters a hell of a lot easier endef -PACKAGES = CSWpmparamsutil -CATALOGNAME = pm_paramsutil +CATALOG_RELEASE = unstable +LICENSE = LICENSE + +PACKAGES += CSWpm-params-util +CATALOGNAME_CSWpm-params-util = pm_params_util +SPKG_DESC_CSWpm-params-util = Simple, compact and correct param-checking functions +OBSOLETED_BY_CSWpm-params-util += CSWpmparamsutil +CATALOGNAME_CSWpmparamsutil = pm_paramsutil_stub + include gar/category.mk Modified: csw/mgar/pkg/cpan/Params-Util/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Params-Util/trunk/checksums 2012-03-02 15:04:39 UTC (rev 17261) +++ csw/mgar/pkg/cpan/Params-Util/trunk/checksums 2012-03-02 15:06:15 UTC (rev 17262) @@ -1 +1 @@ -827ba4b8bed00e718cea60321129be41 download/Params-Util-1.00.tar.gz +e2d155ad4f1b4b32c22b215cfdf49b8c Params-Util-1.06.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 Mar 2 16:08:38 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Mar 2012 15:08:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[17263] csw/mgar/pkg/cpan/Sub-Install/trunk Message-ID: Revision: 17263 http://gar.svn.sourceforge.net/gar/?rev=17263&view=rev Author: dmichelsen Date: 2012-03-02 15:08:38 +0000 (Fri, 02 Mar 2012) Log Message: ----------- cpan/Sub-Install/trunk: Update to 0.926 and sanitize package naming Modified Paths: -------------- csw/mgar/pkg/cpan/Sub-Install/trunk/Makefile csw/mgar/pkg/cpan/Sub-Install/trunk/checksums Modified: csw/mgar/pkg/cpan/Sub-Install/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Sub-Install/trunk/Makefile 2012-03-02 15:06:15 UTC (rev 17262) +++ csw/mgar/pkg/cpan/Sub-Install/trunk/Makefile 2012-03-02 15:08:38 UTC (rev 17263) @@ -1,5 +1,5 @@ NAME = Sub-Install -VERSION = 0.925 +VERSION = 0.926 CATEGORIES = cpan GARTYPE = v2 AUTHOR = RJBS @@ -8,11 +8,16 @@ define BLURB endef -PACKAGES = CSWpmsubinstall -CATALOGNAME = pm_subinstall +CATALOG_RELEASE = unstable LICENSE = LICENSE -ARCHALL = 1 +PACKAGES += CSWpm-sub-install +CATALOGNAME_CSWpm-sub-install = pm_sub_install +SPKG_DESC_CSWpm-sub-install = Install subroutines into packages easily +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-sub-install = 1 +OBSOLETED_BY_CSWpm-sub-install += CSWpmsubinstall +CATALOGNAME_CSWpmsubinstall = pm_subinstall_stub include gar/category.mk Modified: csw/mgar/pkg/cpan/Sub-Install/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Sub-Install/trunk/checksums 2012-03-02 15:06:15 UTC (rev 17262) +++ csw/mgar/pkg/cpan/Sub-Install/trunk/checksums 2012-03-02 15:08:38 UTC (rev 17263) @@ -1 +1 @@ -694aaec771c42280746a9a6279683263 Sub-Install-0.925.tar.gz +89a7f82dd840bc2401f281b5f24732b9 Sub-Install-0.926.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 Mar 2 16:25:24 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Mar 2012 15:25:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17264] csw/mgar/pkg/cpan Message-ID: Revision: 17264 http://gar.svn.sourceforge.net/gar/?rev=17264&view=rev Author: dmichelsen Date: 2012-03-02 15:25:23 +0000 (Fri, 02 Mar 2012) Log Message: ----------- cpan/MouseX-Traits/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/MouseX-Traits/ csw/mgar/pkg/cpan/MouseX-Traits/branches/ csw/mgar/pkg/cpan/MouseX-Traits/tags/ csw/mgar/pkg/cpan/MouseX-Traits/trunk/ csw/mgar/pkg/cpan/MouseX-Traits/trunk/Makefile csw/mgar/pkg/cpan/MouseX-Traits/trunk/checksums csw/mgar/pkg/cpan/MouseX-Traits/trunk/files/ Property changes on: csw/mgar/pkg/cpan/MouseX-Traits/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/MouseX-Traits/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MouseX-Traits/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/MouseX-Traits/trunk/Makefile 2012-03-02 15:25:23 UTC (rev 17264) @@ -0,0 +1,26 @@ +NAME = MouseX-Traits +VERSION = 0.1102 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = GFUJI + +DESCRIPTION = Automatically apply roles at object creation time +define BLURB +endef + +CATALOG_RELEASE = unstable + +BUILD_DEP_PKGS += CSWpm-ok +BUILD_DEP_PKGS += CSWpm-test-exception + +# Really no license +CHECKPKG_OVERRIDES_CSWpm-mousex-traits += license-missing|/opt/csw/share/doc/pm_mousex_traits/license + +PACKAGES += CSWpm-mousex-traits +CATALOGNAME_CSWpm-mousex-traits = pm_mousex_traits +SPKG_DESC_CSWpm-mousex-traits = Automatically apply roles at object creation time +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-mousex-traits = 1 +RUNTIME_DEP_PKGS_CSWpm-mousex-traits += CSWpm-mouse + +include gar/category.mk Added: csw/mgar/pkg/cpan/MouseX-Traits/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/MouseX-Traits/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/MouseX-Traits/trunk/checksums 2012-03-02 15:25:23 UTC (rev 17264) @@ -0,0 +1 @@ +47763484e2298c20fc1d0e779abe5c2c MouseX-Traits-0.1102.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 Mar 2 17:52:17 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Mar 2012 16:52:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17265] csw/mgar/pkg/cpan/Data-OptList/trunk Message-ID: Revision: 17265 http://gar.svn.sourceforge.net/gar/?rev=17265&view=rev Author: dmichelsen Date: 2012-03-02 16:52:16 +0000 (Fri, 02 Mar 2012) Log Message: ----------- cpan/Data-OptList/trunk: Update to 0.107, sanitize package name and update dependencies Modified Paths: -------------- csw/mgar/pkg/cpan/Data-OptList/trunk/Makefile csw/mgar/pkg/cpan/Data-OptList/trunk/checksums Modified: csw/mgar/pkg/cpan/Data-OptList/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Data-OptList/trunk/Makefile 2012-03-02 15:25:23 UTC (rev 17264) +++ csw/mgar/pkg/cpan/Data-OptList/trunk/Makefile 2012-03-02 16:52:16 UTC (rev 17265) @@ -1,5 +1,5 @@ NAME = Data-OptList -VERSION = 0.106 +VERSION = 0.107 CATEGORIES = cpan GARTYPE = v2 AUTHOR = RJBS @@ -8,13 +8,17 @@ define BLURB endef -PACKAGES = CSWpmdataoptlist -CATALOGNAME = pm_dataoptlist +CATALOG_RELEASE = unstable -DEP_PKGS = CSWpmsubinstall - LICENSE = LICENSE -ARCHALL = 1 +PACKAGES += CSWpm-data-optlist +CATALOGNAME_CSWpm-data-optlist = pm_data_optlist +SPKG_DESC_CSWpm-data-optlist = Parse and validate simple name/value option pairs +ARCHALL_CSWpm-data-optlist = 1 +RUNTIME_DEP_PKGS_CSWpm-data-optlist += CSWpm-params-util +RUNTIME_DEP_PKGS_CSWpm-data-optlist += CSWpm-sub-install +OBSOLETED_BY_CSWpm-data-optlist += CSWpmdataoptlist +CATALOGNAME_CSWpmdataoptlist = pm_dataoptlist_stub include gar/category.mk Modified: csw/mgar/pkg/cpan/Data-OptList/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Data-OptList/trunk/checksums 2012-03-02 15:25:23 UTC (rev 17264) +++ csw/mgar/pkg/cpan/Data-OptList/trunk/checksums 2012-03-02 16:52:16 UTC (rev 17265) @@ -1 +1 @@ -d2e2e74540f9a388a7d180849d63d03a Data-OptList-0.106.tar.gz +17177b3cfb8941780a8736f9b9b30421 Data-OptList-0.107.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Mar 2 20:10:47 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 02 Mar 2012 19:10:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[17266] csw/mgar/pkg/cmake/trunk/Makefile Message-ID: Revision: 17266 http://gar.svn.sourceforge.net/gar/?rev=17266&view=rev Author: rthurner Date: 2012-03-02 19:10:46 +0000 (Fri, 02 Mar 2012) Log Message: ----------- cmake, checkpackage correction Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2012-03-02 16:52:16 UTC (rev 17265) +++ csw/mgar/pkg/cmake/trunk/Makefile 2012-03-02 19:10:46 UTC (rev 17266) @@ -25,10 +25,7 @@ CATALOGNAME_CSWcmake = cmake SPKG_DESC_CSWcmake = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWcmake += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWcmake += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWcmake += CSWlibz1 -RUNTIME_DEP_PKGS_CSWcmake += CSWosslrt +RUNTIME_DEP_PKGS_CSWcmake += CSWlibidn11 datadir = /share/$(NAME)-$(VERSION) sharedstatedir = /share This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Mar 2 20:11:45 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 02 Mar 2012 19:11:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17267] csw/mgar/pkg/libserf/trunk Message-ID: Revision: 17267 http://gar.svn.sourceforge.net/gar/?rev=17267&view=rev Author: rthurner Date: 2012-03-02 19:11:44 +0000 (Fri, 02 Mar 2012) Log Message: ----------- libserf, upgrade to serf-1.0.1 Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile csw/mgar/pkg/libserf/trunk/checksums Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2012-03-02 19:10:46 UTC (rev 17266) +++ csw/mgar/pkg/libserf/trunk/Makefile 2012-03-02 19:11:44 UTC (rev 17267) @@ -1,5 +1,5 @@ NAME = libserf -VERSION = 1.0.0 +VERSION = 1.0.1 DISTNAME = serf-$(VERSION) CATEGORIES = lib GARTYPE = v2 Modified: csw/mgar/pkg/libserf/trunk/checksums =================================================================== --- csw/mgar/pkg/libserf/trunk/checksums 2012-03-02 19:10:46 UTC (rev 17266) +++ csw/mgar/pkg/libserf/trunk/checksums 2012-03-02 19:11:44 UTC (rev 17267) @@ -1 +1 @@ -3b179ed18f65c43141528aa6d2440db4 serf-1.0.0.tar.bz2 +01ade77ba0502687aa42551db31316f1 serf-1.0.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Mar 2 20:19:45 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 02 Mar 2012 19:19:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17268] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 17268 http://gar.svn.sourceforge.net/gar/?rev=17268&view=rev Author: rthurner Date: 2012-03-02 19:19:45 +0000 (Fri, 02 Mar 2012) Log Message: ----------- mercurial, upgrade to hg-2.1.1 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2012-03-02 19:11:44 UTC (rev 17267) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2012-03-02 19:19:45 UTC (rev 17268) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 2.1 +VERSION = 2.1.1 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2012-03-02 19:11:44 UTC (rev 17267) +++ csw/mgar/pkg/mercurial/trunk/checksums 2012-03-02 19:19:45 UTC (rev 17268) @@ -1 +1 @@ -d2ca44f8d0129ab50639143af99d9363 mercurial-2.1.tar.gz +368fab4705ebd4d1296fdd6bd2fe6272 mercurial-2.1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Mar 2 20:25:45 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 02 Mar 2012 19:25:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17269] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 17269 http://gar.svn.sourceforge.net/gar/?rev=17269&view=rev Author: rthurner Date: 2012-03-02 19:25:45 +0000 (Fri, 02 Mar 2012) Log Message: ----------- libserf, upgrade checkpkg Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2012-03-02 19:19:45 UTC (rev 17268) +++ csw/mgar/pkg/libserf/trunk/Makefile 2012-03-02 19:25:45 UTC (rev 17269) @@ -21,14 +21,14 @@ PACKAGES += CSWlibserf1-0 CATALOGNAME_CSWlibserf1-0 = libserf1_0 SPKG_DESC_CSWlibserf1-0 += HTTP client library built on APR, multiplexes connections, libserf-1.so.0 -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWapr -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWapr-util +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWapr1-0 +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWaprutil1-0 RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWbdb48 RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWiconv -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWoldaprt -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibz1 PACKAGES += CSWlibserf-dev CATALOGNAME_CSWlibserf-dev = libserf_dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Mar 2 20:28:40 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 02 Mar 2012 19:28:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[17270] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 17270 http://gar.svn.sourceforge.net/gar/?rev=17270&view=rev Author: rthurner Date: 2012-03-02 19:28:40 +0000 (Fri, 02 Mar 2012) Log Message: ----------- libserf, upgrade checkpkg Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2012-03-02 19:25:45 UTC (rev 17269) +++ csw/mgar/pkg/libserf/trunk/Makefile 2012-03-02 19:28:40 UTC (rev 17270) @@ -21,11 +21,12 @@ PACKAGES += CSWlibserf1-0 CATALOGNAME_CSWlibserf1-0 = libserf1_0 SPKG_DESC_CSWlibserf1-0 += HTTP client library built on APR, multiplexes connections, libserf-1.so.0 -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWapr1-0 -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWaprutil1-0 RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWbdb48 +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibapr1-0 +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibexpat1 RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibz1 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 Mar 2 20:55:34 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Mar 2012 19:55:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[17271] csw/mgar/pkg/cpan/TimeDate/trunk Message-ID: Revision: 17271 http://gar.svn.sourceforge.net/gar/?rev=17271&view=rev Author: dmichelsen Date: 2012-03-02 19:55:34 +0000 (Fri, 02 Mar 2012) Log Message: ----------- cpan/TimeDate/trunk: Sanitize package naming Modified Paths: -------------- csw/mgar/pkg/cpan/TimeDate/trunk/Makefile csw/mgar/pkg/cpan/TimeDate/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/TimeDate/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/TimeDate/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/TimeDate/trunk/Makefile 2012-03-02 19:28:40 UTC (rev 17270) +++ csw/mgar/pkg/cpan/TimeDate/trunk/Makefile 2012-03-02 19:55:34 UTC (rev 17271) @@ -4,16 +4,24 @@ GARTYPE = v2 AUTHOR = GBARR -DESCRIPTION = parse date strings into time values +DESCRIPTION = ASCII Date parser using regexps define BLURB - Date::Parse provides two routines for parsing date strings into time values. endef -DISTFILES = COPYING +CATALOG_RELEASE = unstable -PACKAGES = CSWpmtimedate -CATALOGNAME = pm_timedate +LICENSE = README -ARCHALL = 1 +PACKAGES += CSWpm-date-parse +CATALOGNAME_CSWpm-date-parse = pm_date_parse +SPKG_DESC_CSWpm-date-parse = ASCII Date parser using regexps +ARCHALL_CSWpm-date-parse = 1 +OBSOLETED_BY_CSWpm-date-parse += CSWpmtimedate +CATALOGNAME_CSWpmtimedate = pm_timedate_stub +# This is for a config file location we don't have at all, maybe we need +# to provide one later: +# /usr/share/lib/locale/LC_TIME/default +CHECKPKG_OVERRIDES_CSWpm-date-parse += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/Date/Format.pm + include gar/category.mk Modified: csw/mgar/pkg/cpan/TimeDate/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/TimeDate/trunk/checksums 2012-03-02 19:28:40 UTC (rev 17270) +++ csw/mgar/pkg/cpan/TimeDate/trunk/checksums 2012-03-02 19:55:34 UTC (rev 17271) @@ -1,2 +1 @@ -548ae818969b549bf703fbea7d667c07 COPYING 7da7452bce4c684e4238e6d09b390200 TimeDate-1.20.tar.gz Deleted: csw/mgar/pkg/cpan/TimeDate/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/TimeDate/trunk/files/COPYING 2012-03-02 19:28:40 UTC (rev 17270) +++ csw/mgar/pkg/cpan/TimeDate/trunk/files/COPYING 2012-03-02 19:55:34 UTC (rev 17271) @@ -1,4 +0,0 @@ -Copyright 1996-2000 Graham Barr. All rights reserved. - -This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 2 20:59:49 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 02 Mar 2012 19:59:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[17272] csw/mgar/pkg/cpan/Math-Interpolate/trunk Message-ID: Revision: 17272 http://gar.svn.sourceforge.net/gar/?rev=17272&view=rev Author: dmichelsen Date: 2012-03-02 19:59:49 +0000 (Fri, 02 Mar 2012) Log Message: ----------- cpan/Math-Interpolate/trunk: Sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Math-Interpolate/trunk/Makefile csw/mgar/pkg/cpan/Math-Interpolate/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Math-Interpolate/trunk/files/CSWpmmathinterpolate.gspec csw/mgar/pkg/cpan/Math-Interpolate/trunk/files/CSWpmmathinterpolate.prototype Modified: csw/mgar/pkg/cpan/Math-Interpolate/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Math-Interpolate/trunk/Makefile 2012-03-02 19:55:34 UTC (rev 17271) +++ csw/mgar/pkg/cpan/Math-Interpolate/trunk/Makefile 2012-03-02 19:59:49 UTC (rev 17272) @@ -4,13 +4,24 @@ GARTYPE = v2 AUTHOR = BZAJAC -DESCRIPTION = Useful routines for interpolating data sets +DESCRIPTION = Interpolate the value Y from X using a list of pairs define BLURB - This is the Math::Interpolate package. This module contains several - useful routines for interpolating data sets and finding where a given - value lies in a sorted list. endef -DISTFILES += $(call admfiles,CSWpmmathinterpolate,prototype) +CATALOG_RELEASE = unstable +PACKAGES += CSWpm-math-interpolate +CATALOGNAME_CSWpm-math-interpolate = pm_math_interpolate +SPKG_DESC_CSWpm-math-interpolate = Interpolate the value Y from X using a list of pairs +ARCHALL_CSWpm-math-interpolate = 1 +OBSOLETED_BY_CSWpm-math-interpolate += CSWpmmathinterpolate +CATALOGNAME_CSWpmmathinterpolate = pm_mathinterpolate_stub + +# There is really no license +CHECKPKG_OVERRIDES_CSWpm-math-interpolate += license-missing +CHECKPKG_OVERRIDES_CSWpmmathinterpolate += license-missing + +# This is a problem in checkpkg, override for now +CHECKPKG_OVERRIDES_CSWpmmathinterpolate += action-class-only-in-pkginfo|none + include gar/category.mk Modified: csw/mgar/pkg/cpan/Math-Interpolate/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Math-Interpolate/trunk/checksums 2012-03-02 19:55:34 UTC (rev 17271) +++ csw/mgar/pkg/cpan/Math-Interpolate/trunk/checksums 2012-03-02 19:59:49 UTC (rev 17272) @@ -1,3 +1 @@ -dd2b50d8ad466ea56ea9217aea8b9558 download/CSWpmmathinterpolate.gspec -e26501ffae36e5a4afc882109de179b7 download/CSWpmmathinterpolate.prototype -1826c6c24b75a2a27964c3dac198adac download/Math-Interpolate-1.05.tar.gz +1826c6c24b75a2a27964c3dac198adac Math-Interpolate-1.05.tar.gz Deleted: csw/mgar/pkg/cpan/Math-Interpolate/trunk/files/CSWpmmathinterpolate.gspec =================================================================== --- csw/mgar/pkg/cpan/Math-Interpolate/trunk/files/CSWpmmathinterpolate.gspec 2012-03-02 19:55:34 UTC (rev 17271) +++ csw/mgar/pkg/cpan/Math-Interpolate/trunk/files/CSWpmmathinterpolate.gspec 2012-03-02 19:59:49 UTC (rev 17272) @@ -1,8 +0,0 @@ -%var bitname pm_mathinterpolate -%var pkgname CSWpmmathinterpolate -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 1999, Blair Zajac - -This code is distributed under the same copyright terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Math-Interpolate/trunk/files/CSWpmmathinterpolate.prototype =================================================================== --- csw/mgar/pkg/cpan/Math-Interpolate/trunk/files/CSWpmmathinterpolate.prototype 2012-03-02 19:55:34 UTC (rev 17271) +++ csw/mgar/pkg/cpan/Math-Interpolate/trunk/files/CSWpmmathinterpolate.prototype 2012-03-02 19:59:49 UTC (rev 17272) @@ -1,20 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Math 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Math/Interpolate 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Math/Interpolate/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Math::Interpolate.3perl 0444 root bin -f none /opt/csw/share/man/man3/Math::IntervalSearch.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Math 0755 root bin -f none /opt/csw/share/perl/csw/Math/Interpolate.pm 0444 root bin -f none /opt/csw/share/perl/csw/Math/IntervalSearch.pm 0444 root bin -i copyright=CSWpmmathinterpolate.copyright -i depend=CSWpmmathinterpolate.depend -i pkginfo=CSWpmmathinterpolate.pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Fri Mar 2 22:04:42 2012 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 02 Mar 2012 21:04:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[17273] csw/mgar/pkg Message-ID: Revision: 17273 http://gar.svn.sourceforge.net/gar/?rev=17273&view=rev Author: jake_goerzen Date: 2012-03-02 21:04:42 +0000 (Fri, 02 Mar 2012) Log Message: ----------- dnsmasq: Initial commit Added Paths: ----------- csw/mgar/pkg/dnsmasq/ csw/mgar/pkg/dnsmasq/Makefile csw/mgar/pkg/dnsmasq/branches/ csw/mgar/pkg/dnsmasq/tags/ csw/mgar/pkg/dnsmasq/trunk/ csw/mgar/pkg/dnsmasq/trunk/Makefile csw/mgar/pkg/dnsmasq/trunk/checksums csw/mgar/pkg/dnsmasq/trunk/files/ Added: csw/mgar/pkg/dnsmasq/Makefile =================================================================== --- csw/mgar/pkg/dnsmasq/Makefile (rev 0) +++ csw/mgar/pkg/dnsmasq/Makefile 2012-03-02 21:04:42 UTC (rev 17273) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/dnsmasq/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/dnsmasq/trunk/Makefile =================================================================== --- csw/mgar/pkg/dnsmasq/trunk/Makefile (rev 0) +++ csw/mgar/pkg/dnsmasq/trunk/Makefile 2012-03-02 21:04:42 UTC (rev 17273) @@ -0,0 +1,26 @@ +NAME = dnsmasq +VERSION = 2.59 +GARTYPE = v2 +CATEGORIES = net + +DESCRIPTION = Lightweight DNS forwarder and DHCP server +define BLURB + Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP server. It is designed to provide DNS and, optionally, DHCP, to a small network. It can serve the names of local machines which are not in the global DNS. The DHCP server integrates with the DNS server and allows machines with DHCP-allocated addresses to appear in the DNS with names configured either in each host or in a central configuration file. Dnsmasq supports static and dynamic DHCP leases and BOOTP/TFTP/PXE for network booting of diskless machines. +endef + +MASTER_SITES = http://www.thekelleys.org.uk/dnsmasq/ +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_SCRIPTS = +GARCOMPILER = GNU +SKIPTEST = 1 +INSTALL_ARGS = PREFIX=/opt/csw MAKE=gmake INSTALL=ginstall + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +include gar/category.mk + +post-install-modulated: + + perl -pi -e 's|/usr/local|/opt/csw|' \ + $(DESTDIR)/opt/csw/share/man/man8/dnsmasq.8 Property changes on: csw/mgar/pkg/dnsmasq/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/dnsmasq/trunk/checksums =================================================================== --- csw/mgar/pkg/dnsmasq/trunk/checksums (rev 0) +++ csw/mgar/pkg/dnsmasq/trunk/checksums 2012-03-02 21:04:42 UTC (rev 17273) @@ -0,0 +1 @@ +b5757ef2d7b651748eeebb88af29d7d6 dnsmasq-2.59.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 2 22:45:51 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 02 Mar 2012 21:45:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[17274] csw/mgar/pkg/vlc/trunk Message-ID: Revision: 17274 http://gar.svn.sourceforge.net/gar/?rev=17274&view=rev Author: wahwah Date: 2012-03-02 21:45:51 +0000 (Fri, 02 Mar 2012) Log Message: ----------- vlc/trunk: Building from a git snapshot Modified Paths: -------------- csw/mgar/pkg/vlc/trunk/Makefile csw/mgar/pkg/vlc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/vlc/trunk/files/0006-Define-Encoding-in-vlc.desktop.patch Removed Paths: ------------- csw/mgar/pkg/vlc/trunk/files/0001-Disable-strange-check-this-may-be-dangerous.patch csw/mgar/pkg/vlc/trunk/files/0002-Hack-around-missing-packed-pragma.patch csw/mgar/pkg/vlc/trunk/files/0003-Do-not-propagate-vlc-CFLAGS-to-linking.patch csw/mgar/pkg/vlc/trunk/files/0004-Bootstrap-on-Solaris.patch Modified: csw/mgar/pkg/vlc/trunk/Makefile =================================================================== --- csw/mgar/pkg/vlc/trunk/Makefile 2012-03-02 21:04:42 UTC (rev 17273) +++ csw/mgar/pkg/vlc/trunk/Makefile 2012-03-02 21:45:51 UTC (rev 17274) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = vlc -VERSION = 1.2-git +VERSION = 2.1-git GARTYPE = v2 CATEGORIES = apps @@ -13,20 +13,16 @@ # MASTER_SITES = http://download.videolan.org/pub/videolan/vlc/$(VERSION)/ # DISTFILES = $(DISTNAME).tar.bz2 -# Solaris port +# Building from the git master which has patches submitted by Maciej MASTER_SITES = http://repo.or.cz/w/vlc/solaris.git/snapshot/ -DISTFILES = 36ddbe70462f36a16c30c75e424cdc768f429fcd.tar.gz +DISTFILES = d843a2fc47bf6b9f4277310736b25caee8309ee7.tar.gz +NOTGITPATCH = 1 + DISTNAME = solaris -# WORKSRC = $(WORKDIR)/solaris +PATCHFILES += 0006-Define-Encoding-in-vlc.desktop.patch -# PATCHFILES += 0001-Disable-strange-check-this-may-be-dangerous.patch -# PATCHFILES += 0002-Hack-around-missing-packed-pragma.patch -# PATCHFILES += 0003-Do-not-propagate-vlc-CFLAGS-to-linking.patch -PATCHFILES += 0004-Bootstrap-on-Solaris.patch -PATCHFILES += 0005-Work-around-the-lack-of-dirfd.patch - # We need e.g. stdbool.h PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -39,9 +35,9 @@ BUILD_DEP_PKGS += CSWlibx11devel # This is for libxcb -EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include -EXTRA_LIB = /opt/csw/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +# EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include +# EXTRA_LIB = /opt/csw/X11/lib +# EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib # Sun Studio implements packed attributes differently and compilations bails out: # "include/vlc_codecs.h", line 36: #error: FIXME @@ -65,18 +61,20 @@ CONFIGURE_ARGS += $(DIRPATHS) # Not there yet, part of ffmpeg -CONFIGURE_ARGS += --disable-avcodec +# CONFIGURE_ARGS += --disable-avcodec -# x264.c:431:9: error: 'x264_open_gop_names' undeclared (first use in this -# function) -CONFIGURE_ARGS += --disable-x264 +# No QT4 yet +CONFIGURE_ARGS += --disable-qt4 +CONFIGURE_ARGS += --disable-skins2 -# No libpostproc yet -#CONFIGURE_ARGS += --disable-postproc +CONFIGURE_ARGS_i386 += --extra-cflags="-mfpmath=sse -msse" +CONFIGURE_ARGS_i386 += --extra-cxxflags="-mfpmath=sse -msse" -# No QT4 yet -CONFIGURE_ARGS += --disable-qt4 --disable-skins2 +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) +CONFIGURE_ARGS += --disable-mmx +CONFIGURE_ARGS += --disable-sse + # Taken from http://wiki.videolan.org/Solaris # CONFIGURE_ARGS += --disable-libgcrypt # CONFIGURE_ARGS += --disable-remoteosd @@ -88,7 +86,7 @@ # CONFIGURE_ARGS += --disable-a52 # CONFIGURE_ARGS += --disable-fribidi # CONFIGURE_ARGS += --with-gnu-ld=no -# CONFIGURE_ARGS += --disable-xcb +CONFIGURE_ARGS += --disable-xcb SKIPTEST = 1 @@ -96,40 +94,59 @@ # The catch-all package SPKG_DESC_CSWvlc = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWvlc += CSWfconfig +RUNTIME_DEP_PKGS_CSWvlc += CSWfribidi +RUNTIME_DEP_PKGS_CSWvlc += CSWliba52 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibavcodec53 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibavformat53 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibavutil51 RUNTIME_DEP_PKGS_CSWvlc += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWvlc += CSWlibdvdread RUNTIME_DEP_PKGS_CSWvlc += CSWlibflac8 RUNTIME_DEP_PKGS_CSWvlc += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWvlc += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWvlc += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWvlc += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWvlc += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWvlc += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibgnutls26 RUNTIME_DEP_PKGS_CSWvlc += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWvlc += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWvlc += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWvlc += CSWlibintl8 RUNTIME_DEP_PKGS_CSWvlc += CSWlibkate1 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibmad0 RUNTIME_DEP_PKGS_CSWvlc += CSWlibogg0 RUNTIME_DEP_PKGS_CSWvlc += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibpostproc52 RUNTIME_DEP_PKGS_CSWvlc += CSWlibproxy RUNTIME_DEP_PKGS_CSWvlc += CSWlibrsvg2-2 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibsamplerate0 RUNTIME_DEP_PKGS_CSWvlc += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWvlc += CSWlibsmbclient0 RUNTIME_DEP_PKGS_CSWvlc += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibspeexdsp1 RUNTIME_DEP_PKGS_CSWvlc += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWvlc += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibswscale2 RUNTIME_DEP_PKGS_CSWvlc += CSWlibtheora0 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibtheoradec1 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWvlc += CSWlibvlc5 RUNTIME_DEP_PKGS_CSWvlc += CSWlibvlccore5 RUNTIME_DEP_PKGS_CSWvlc += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWvlc += CSWlibvorbisenc2 +RUNTIME_DEP_PKGS_CSWvlc += CSWlibx264-120 RUNTIME_DEP_PKGS_CSWvlc += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWvlc += CSWlibz1 +RUNTIME_DEP_PKGS_CSWvlc += CSWlua RUNTIME_DEP_PKGS_CSWvlc += CSWsdlimage + CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/share|root/opt/csw/share/vlc/utils/audio-vlc-default.sh CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/share|root/opt/csw/share/vlc/utils/video-vlc-default.sh CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/vlc/intf-vcd.txt +CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/share|root/opt/csw/share/doc/vlc/vlc-thumb.c PACKAGES += CSWvlc-dev CATALOGNAME_CSWvlc-dev = vlc_dev @@ -155,9 +172,18 @@ RUNTIME_DEP_PKGS_CSWlibvlccore5 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibvlccore5 += CSWlibiconv2 +# Doesn't work...? +# CONFIG_SHELL = /opt/csw/bin/bash +# EXTRA_EXPORTS += CONFIG_SHELL + include gar/category.mk pre-configure-modulated: # bootstrap defines #!/bin/sh and $(dirname ...) - (cd $(WORKSRC) && $(CONFIGURE_ENV) bash ./bootstrap) + (cd $(WORKSRC) && $(CONFIGURE_ENV) \ + CONFIG_SHELL=/opt/csw/bin/bash \ + /opt/csw/bin/bash \ + ./bootstrap) @$(MAKECOOKIE) + +PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/vlc/trunk/checksums =================================================================== --- csw/mgar/pkg/vlc/trunk/checksums 2012-03-02 21:04:42 UTC (rev 17273) +++ csw/mgar/pkg/vlc/trunk/checksums 2012-03-02 21:45:51 UTC (rev 17274) @@ -1 +1,2 @@ -5dfeae611f841bf29549f0f2619b1c35 36ddbe70462f36a16c30c75e424cdc768f429fcd.tar.gz +bd09bc490ecb8d19f1561a438c48043b 0006-Work-around-the-lack-of-dirfd.patch +3857b512a3f1683178adef7e3c56e059 d843a2fc47bf6b9f4277310736b25caee8309ee7.tar.gz Deleted: csw/mgar/pkg/vlc/trunk/files/0001-Disable-strange-check-this-may-be-dangerous.patch =================================================================== --- csw/mgar/pkg/vlc/trunk/files/0001-Disable-strange-check-this-may-be-dangerous.patch 2012-03-02 21:04:42 UTC (rev 17273) +++ csw/mgar/pkg/vlc/trunk/files/0001-Disable-strange-check-this-may-be-dangerous.patch 2012-03-02 21:45:51 UTC (rev 17274) @@ -1,25 +0,0 @@ -From 3d21a9253d711ada5c766a9968009073791ee4eb Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 9 Nov 2011 13:22:04 +0100 -Subject: [PATCH] Disable strange check, this may be dangerous! - ---- - src/misc/threads.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/misc/threads.c b/src/misc/threads.c -index bbbb483..1eb612e 100644 ---- a/src/misc/threads.c -+++ b/src/misc/threads.c -@@ -250,6 +250,6 @@ void vlc_global_mutex (unsigned n, bool acquire) - vlc_mutex_unlock (lock); - - /* Compile-time assertion ;-) */ -- char enough_locks[(sizeof (locks) / sizeof (locks[0])) - VLC_MAX_MUTEX]; -- (void) enough_locks; -+ /* char enough_locks[(sizeof (locks) / sizeof (locks[0])) - VLC_MAX_MUTEX]; -+ (void) enough_locks; */ - } --- -1.7.6.1 - Deleted: csw/mgar/pkg/vlc/trunk/files/0002-Hack-around-missing-packed-pragma.patch =================================================================== --- csw/mgar/pkg/vlc/trunk/files/0002-Hack-around-missing-packed-pragma.patch 2012-03-02 21:04:42 UTC (rev 17273) +++ csw/mgar/pkg/vlc/trunk/files/0002-Hack-around-missing-packed-pragma.patch 2012-03-02 21:45:51 UTC (rev 17274) @@ -1,25 +0,0 @@ -From 7e4ffba8e64b9f1906d6a20ddca31e65bdd227c9 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 9 Nov 2011 14:59:05 +0100 -Subject: [PATCH] Hack around missing packed pragma - ---- - include/vlc_codecs.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h -index d97dcda..151f76c 100644 ---- a/include/vlc_codecs.h -+++ b/include/vlc_codecs.h -@@ -33,7 +33,7 @@ - #ifdef HAVE_ATTRIBUTE_PACKED - # define ATTR_PACKED __attribute__((__packed__)) - #else --# error FIXME -+# define ATTR_PACKED - #endif - - /* Structures exported to the demuxers and decoders */ --- -1.7.6.1 - Deleted: csw/mgar/pkg/vlc/trunk/files/0003-Do-not-propagate-vlc-CFLAGS-to-linking.patch =================================================================== --- csw/mgar/pkg/vlc/trunk/files/0003-Do-not-propagate-vlc-CFLAGS-to-linking.patch 2012-03-02 21:04:42 UTC (rev 17273) +++ csw/mgar/pkg/vlc/trunk/files/0003-Do-not-propagate-vlc-CFLAGS-to-linking.patch 2012-03-02 21:45:51 UTC (rev 17274) @@ -1,39 +0,0 @@ -From f49471683d319bc45d4af3d6b9f4799520ff1264 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 9 Nov 2011 15:21:40 +0100 -Subject: [PATCH] Do not propagate vlc CFLAGS to linking - ---- - bin/Makefile.am | 2 +- - bin/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/bin/Makefile.am b/bin/Makefile.am -index 19dfb57..117568a 100644 ---- a/bin/Makefile.am -+++ b/bin/Makefile.am -@@ -8,7 +8,7 @@ EXTRA_DIST = vlc_win32_rc.rc.in - - SUFFIXES = .rc.in .rc - --AM_CFLAGS = `$(VLC_CONFIG) --cflags vlc` -+AM_CFLAGS = - - - if !HAVE_WIN32 -diff --git a/bin/Makefile.in b/bin/Makefile.in -index 056bb04..d0acbf8 100644 ---- a/bin/Makefile.in -+++ b/bin/Makefile.in -@@ -646,7 +646,7 @@ vlcdatadir = @vlcdatadir@ - vlclibdir = @vlclibdir@ - EXTRA_DIST = vlc_win32_rc.rc.in - SUFFIXES = .rc.in .rc --AM_CFLAGS = `$(VLC_CONFIG) --cflags vlc` -+AM_CFLAGS = - @HAVE_WIN32_FALSE@@HAVE_WINCE_FALSE at vlc_SOURCES = vlc.c override.c - @HAVE_WIN32_TRUE at vlc_SOURCES = winvlc.c - @HAVE_WINCE_TRUE at vlc_SOURCES = winvlc.c --- -1.7.6.1 - Deleted: csw/mgar/pkg/vlc/trunk/files/0004-Bootstrap-on-Solaris.patch =================================================================== --- csw/mgar/pkg/vlc/trunk/files/0004-Bootstrap-on-Solaris.patch 2012-03-02 21:04:42 UTC (rev 17273) +++ csw/mgar/pkg/vlc/trunk/files/0004-Bootstrap-on-Solaris.patch 2012-03-02 21:45:51 UTC (rev 17274) @@ -1,71 +0,0 @@ -From 5d5c633d80070ec43f7780e89fe15602dbc0b078 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Sun, 19 Feb 2012 09:47:31 +0100 -Subject: [PATCH 1/2] Bootstrap on Solaris - -Solaris /bin/sh does not support "$( ... )" nor "if ! test ..." - -Tested on Solaris 10. ---- - bootstrap | 14 +++++++++++--- - modules/genmf | 6 ++++-- - 2 files changed, 15 insertions(+), 5 deletions(-) - -diff --git a/bootstrap b/bootstrap -index d315be2..1f478e2 100755 ---- a/bootstrap -+++ b/bootstrap -@@ -22,7 +22,7 @@ export CYGWIN - set -e - set -x - --cd "$(dirname "$0")" -+cd "`dirname "$0"`" - - ## - ## Check for various tools -@@ -66,8 +66,16 @@ fi - - # Check for autopoint (GNU gettext) - export AUTOPOINT --test "$AUTOPOINT" || AUTOPOINT=autopoint --if ! "$AUTOPOINT" --dry-run --force >/dev/null 2>&1; then -+if test "$AUTOPOINT"; then -+ : -+else -+ AUTOPOINT=autopoint -+fi -+if "$AUTOPOINT" --dry-run --force >/dev/null 2>&1; then -+ # Solaris /bin/sh does not support "if ! test ...", we have to invert the -+ # expression and use the "else" statement. -+ : -+else - AUTOPOINT=true - echo > ABOUT-NLS - fi -diff --git a/modules/genmf b/modules/genmf -index d7b2887..11cd702 100755 ---- a/modules/genmf -+++ b/modules/genmf -@@ -7,14 +7,16 @@ - ## Authors: Sam Hocevar - ## R?mi Denis-Courmont - --cd $(dirname "$0")/.. || exit 1 -+cd `dirname "$0"`/.. || exit 1 - - while test "$1" - do - printf "." - dir="$1" - modf="modules/${dir}/Modules.am" -- if ! test -f "$modf"; then -+ if test -f "$modf"; then -+ : -+ else - echo "$modf does not exist!" >&2 - exit 1 - fi --- -1.7.5.4 - Added: csw/mgar/pkg/vlc/trunk/files/0006-Define-Encoding-in-vlc.desktop.patch =================================================================== --- csw/mgar/pkg/vlc/trunk/files/0006-Define-Encoding-in-vlc.desktop.patch (rev 0) +++ csw/mgar/pkg/vlc/trunk/files/0006-Define-Encoding-in-vlc.desktop.patch 2012-03-02 21:45:51 UTC (rev 17274) @@ -0,0 +1,26 @@ +From 5d548d76d99791231058e1650bb608aa454a2d0d Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 28 Feb 2012 09:04:51 +0100 +Subject: [PATCH] Define "Encoding" in vlc.desktop + +"Encoding" is an obsolete key, but on Solaris 10 it seems to be necessary for +VLC to build. +--- + share/vlc.desktop.in | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/share/vlc.desktop.in b/share/vlc.desktop.in +index 741e983..141686e 100644 +--- a/share/vlc.desktop.in ++++ b/share/vlc.desktop.in +@@ -3,6 +3,7 @@ Version=1.0 + Name=VLC media player + GenericName=Media player + Comment=Read, capture, broadcast your multimedia streams ++Encoding=UTF-8 + Name[bn]=VLC ?????? ??????? + Comment[bn]=????? ???????????? ??????? ????, ??? ????? ??? ????? ??? + Name[br]=VLC lenner mediao? +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 2 23:04:35 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 02 Mar 2012 22:04:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[17275] csw/mgar/pkg/vlc/trunk/Makefile Message-ID: Revision: 17275 http://gar.svn.sourceforge.net/gar/?rev=17275&view=rev Author: wahwah Date: 2012-03-02 22:04:35 +0000 (Fri, 02 Mar 2012) Log Message: ----------- vlc/trunk: the sse flags make no sense, but it at least buids on x86 Modified Paths: -------------- csw/mgar/pkg/vlc/trunk/Makefile Modified: csw/mgar/pkg/vlc/trunk/Makefile =================================================================== --- csw/mgar/pkg/vlc/trunk/Makefile 2012-03-02 21:45:51 UTC (rev 17274) +++ csw/mgar/pkg/vlc/trunk/Makefile 2012-03-02 22:04:35 UTC (rev 17275) @@ -67,11 +67,10 @@ CONFIGURE_ARGS += --disable-qt4 CONFIGURE_ARGS += --disable-skins2 -CONFIGURE_ARGS_i386 += --extra-cflags="-mfpmath=sse -msse" -CONFIGURE_ARGS_i386 += --extra-cxxflags="-mfpmath=sse -msse" +EXTRA_CFLAGS_i386 += -mfpmath=sse -msse +EXTRA_CXXFLAGS_i386 += -mfpmath=sse -msse +EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCH)) -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) - CONFIGURE_ARGS += --disable-mmx CONFIGURE_ARGS += --disable-sse 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 Mar 2 23:57:07 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 02 Mar 2012 22:57:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[17276] csw/mgar/pkg/lang-python/python/trunk/Makefile Message-ID: Revision: 17276 http://gar.svn.sourceforge.net/gar/?rev=17276&view=rev Author: wahwah Date: 2012-03-02 22:57:07 +0000 (Fri, 02 Mar 2012) Log Message: ----------- lang-python/python/trunk: Build for Solaris 10 separately Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-03-02 22:04:35 UTC (rev 17275) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-03-02 22:57:07 UTC (rev 17276) @@ -43,8 +43,12 @@ # http://bugs.python.org/issue3770 # However, this bug is about better detection of SEM_VALUE_MAX in Solaris # http://bugs.python.org/issue3110 -# PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +# There are header differences between Solaris 9 and 10. Programs that include +# pyconfig.h from Solaris 9 installed on Solaris 10 can get wrong settings, +# e.g. wrt _X_OPEN_SOURCE. +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + # Patches PATCHFILES += faqwiz.diff PATCHFILES += makesetup.diff 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 Mar 3 01:20:37 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 03 Mar 2012 00:20:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17277] csw/mgar/pkg/apr/trunk Message-ID: Revision: 17277 http://gar.svn.sourceforge.net/gar/?rev=17277&view=rev Author: rthurner Date: 2012-03-03 00:20:37 +0000 (Sat, 03 Mar 2012) Log Message: ----------- apr, upgrade to apr-1.4.6 Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile csw/mgar/pkg/apr/trunk/checksums Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2012-03-02 22:57:07 UTC (rev 17276) +++ csw/mgar/pkg/apr/trunk/Makefile 2012-03-03 00:20:37 UTC (rev 17277) @@ -1,5 +1,5 @@ NAME = apr -VERSION = 1.4.5 +VERSION = 1.4.6 CATEGORIES = lib GARTYPE = v2 Modified: csw/mgar/pkg/apr/trunk/checksums =================================================================== --- csw/mgar/pkg/apr/trunk/checksums 2012-03-02 22:57:07 UTC (rev 17276) +++ csw/mgar/pkg/apr/trunk/checksums 2012-03-03 00:20:37 UTC (rev 17277) @@ -1 +1 @@ -97262fe54dddaf583eaaee3497a426e1 apr-1.4.5.tar.gz +76cc4457fbb71eefdafa27dba8f511fb apr-1.4.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Mar 3 02:53:52 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 03 Mar 2012 01:53:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17278] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 17278 http://gar.svn.sourceforge.net/gar/?rev=17278&view=rev Author: bdwalton Date: 2012-03-03 01:53:42 +0000 (Sat, 03 Mar 2012) Log Message: ----------- gar/v2: no longer forcibly add the origin remote since git sets this up properly by default now Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2012-03-03 00:20:37 UTC (rev 17277) +++ csw/mgar/gar/v2/gar.lib.mk 2012-03-03 01:53:42 UTC (rev 17278) @@ -78,25 +78,21 @@ git-http//%: @git clone --bare http://$* $(PARTIALDIR)/$(call GITPROJ,$*) @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ - git remote add origin http://$*; \ git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) git//%: @$(GIT_MAYBEPROXY) git clone --bare git://$* $(PARTIALDIR)/$(call GITPROJ,$*) @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ - git remote add origin git://$*; \ git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) git-file//%: @git clone --bare file:///$* $(PARTIALDIR)/$(call GITPROJ,$*) @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ - git remote add origin file://$*; \ git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) git-ssh//%: @git clone --bare ssh://$* $(PARTIALDIR)/$(call GITPROJ,$*) @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ - git remote add origin ssh://$*; \ git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) 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 Mar 3 10:26:59 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 03 Mar 2012 09:26:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17279] csw/mgar/pkg/vlc/trunk/Makefile Message-ID: Revision: 17279 http://gar.svn.sourceforge.net/gar/?rev=17279&view=rev Author: wahwah Date: 2012-03-03 09:26:59 +0000 (Sat, 03 Mar 2012) Log Message: ----------- vlc/trunk: Two dependencies only on sparc (not sure why). Modified Paths: -------------- csw/mgar/pkg/vlc/trunk/Makefile Modified: csw/mgar/pkg/vlc/trunk/Makefile =================================================================== --- csw/mgar/pkg/vlc/trunk/Makefile 2012-03-03 01:53:42 UTC (rev 17278) +++ csw/mgar/pkg/vlc/trunk/Makefile 2012-03-03 09:26:59 UTC (rev 17279) @@ -86,6 +86,8 @@ # CONFIGURE_ARGS += --disable-fribidi # CONFIGURE_ARGS += --with-gnu-ld=no CONFIGURE_ARGS += --disable-xcb +CONFIGURE_ARGS += --enable-theora +CONFIGURE_ARGS += --enable-sqlite SKIPTEST = 1 @@ -126,10 +128,8 @@ RUNTIME_DEP_PKGS_CSWvlc += CSWlibsmbclient0 RUNTIME_DEP_PKGS_CSWvlc += CSWlibspeex1 RUNTIME_DEP_PKGS_CSWvlc += CSWlibspeexdsp1 -RUNTIME_DEP_PKGS_CSWvlc += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWvlc += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWvlc += CSWlibswscale2 -RUNTIME_DEP_PKGS_CSWvlc += CSWlibtheora0 RUNTIME_DEP_PKGS_CSWvlc += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWvlc += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWvlc += CSWlibvlc5 @@ -142,6 +142,11 @@ RUNTIME_DEP_PKGS_CSWvlc += CSWlua RUNTIME_DEP_PKGS_CSWvlc += CSWsdlimage +# Only needed on Sparc. Not sure why, to be investigated. +RUNTIME_DEP_PKGS_CSWvlc_sparc += CSWlibtheora0 +RUNTIME_DEP_PKGS_CSWvlc_sparc += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWvlc += $(RUNTIME_DEP_PKGS_CSWvlc_$(GARCH)) + CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/share|root/opt/csw/share/vlc/utils/audio-vlc-default.sh CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/share|root/opt/csw/share/vlc/utils/video-vlc-default.sh CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/vlc/intf-vcd.txt 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 Mar 3 11:21:14 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 03 Mar 2012 10:21:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[17280] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 17280 http://gar.svn.sourceforge.net/gar/?rev=17280&view=rev Author: rthurner Date: 2012-03-03 10:21:13 +0000 (Sat, 03 Mar 2012) Log Message: ----------- subversion, upgrade to svn-1.7.3. put libraries in /opt/csw/lib instead /opt/csw/lib/svn 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-03-03 09:26:59 UTC (rev 17279) +++ csw/mgar/pkg/subversion/trunk/Makefile 2012-03-03 10:21:13 UTC (rev 17280) @@ -25,7 +25,7 @@ # http://subversion.apache.org/mailing-lists.html NAME = subversion -VERSION = 1.7.2 +VERSION = 1.7.3 CATEGORIES = utils GARTYPE = v2 @@ -217,7 +217,7 @@ # Relocate locations of foreign language bindings PATCHFILES += 0002-Fix-location-of-bindings.patch -SVNLIB = $(prefix)/lib/svn +SVNLIB = $(prefix)/lib JAVA_HOME = /usr/jdk1.6.0_20 #EXTRA_INC += $(prefix)/apache2/include Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2012-03-03 09:26:59 UTC (rev 17279) +++ csw/mgar/pkg/subversion/trunk/checksums 2012-03-03 10:21:13 UTC (rev 17280) @@ -1 +1 @@ -1e5dfffd27be080672e5a042564368a8 subversion-1.7.2.tar.bz2 +867fb0a5db00710cf8dce0bdfa094b3b subversion-1.7.3.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 Sat Mar 3 13:08:00 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 03 Mar 2012 12:08:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[17281] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 17281 http://gar.svn.sourceforge.net/gar/?rev=17281&view=rev Author: rthurner Date: 2012-03-03 12:08:00 +0000 (Sat, 03 Mar 2012) Log Message: ----------- subversion, this still does not work ... undo again ... Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2012-03-03 10:21:13 UTC (rev 17280) +++ csw/mgar/pkg/subversion/trunk/Makefile 2012-03-03 12:08:00 UTC (rev 17281) @@ -217,7 +217,7 @@ # Relocate locations of foreign language bindings PATCHFILES += 0002-Fix-location-of-bindings.patch -SVNLIB = $(prefix)/lib +SVNLIB = $(prefix)/lib/svn JAVA_HOME = /usr/jdk1.6.0_20 #EXTRA_INC += $(prefix)/apache2/include 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 Mar 4 00:23:38 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 03 Mar 2012 23:23:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[17282] csw/mgar/gar/v2/lib/python/integrate_catalogs.py Message-ID: Revision: 17282 http://gar.svn.sourceforge.net/gar/?rev=17282&view=rev Author: wahwah Date: 2012-03-03 23:23:38 +0000 (Sat, 03 Mar 2012) Log Message: ----------- integrate-catalogs: Prep work for parallel fetch The multiprocessing module is broken at the moment, a fix is underway. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/integrate_catalogs.py Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py =================================================================== --- csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-03-03 12:08:00 UTC (rev 17281) +++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-03-03 23:23:38 UTC (rev 17282) @@ -101,12 +101,25 @@ def GetDiffsByCatalogname(catrel_from, catrel_to, include_downgrades): rest_client = rest.RestClient() diffs_by_catalogname = {} + def GetCatalog(rest_client, r_catrel, r_arch, r_osrel): + catalog = rest_client.GetCatalog(r_catrel, r_arch, r_osrel) + return ((r_catrel, r_arch, r_osrel), catalog) + # TODO(maciej): Enable this once the multiprocessing module is fixed. + # https://www.opencsw.org/mantis/view.php?id=4894 + # proc_pool = multiprocessing.Pool(20) + catalogs_to_fetch_args = [] for arch in common_constants.PHYSICAL_ARCHITECTURES: + for osrel in common_constants.OS_RELS: + for catrel in (catrel_from, catrel_to): + catalogs_to_fetch_args.append((rest_client, catrel, arch, osrel)) + # Convert this to pool.map when multiprocessing if fixed. + catalogs = dict(map(lambda x: GetCatalog(*x), catalogs_to_fetch_args)) + for arch in common_constants.PHYSICAL_ARCHITECTURES: logging.debug("Architecture: %s", arch) for osrel in common_constants.OS_RELS: logging.debug("OS release: %s", osrel) - cat_from = rest_client.GetCatalog(catrel_from, arch, osrel) - cat_to = rest_client.GetCatalog(catrel_to, arch, osrel) + cat_from = catalogs[(catrel_from, arch, osrel)] + cat_to = catalogs[(catrel_to, arch, osrel)] # Should use catalog comparator, but the data format is different if cat_from is None: cat_from = [] 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 Mar 4 00:24:08 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 03 Mar 2012 23:24:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17283] csw/mgar/gar/v2/lib/python/rest.py Message-ID: Revision: 17283 http://gar.svn.sourceforge.net/gar/?rev=17283&view=rev Author: wahwah Date: 2012-03-03 23:24:08 +0000 (Sat, 03 Mar 2012) Log Message: ----------- rest-client: Use ?quick=true by default Cuts down the catalog fetch time from 3 minutes down to 20 seconds. 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-03-03 23:23:38 UTC (rev 17282) +++ csw/mgar/gar/v2/lib/python/rest.py 2012-03-03 23:24:08 UTC (rev 17283) @@ -49,7 +49,7 @@ 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/" % (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 Sun Mar 4 00:24:37 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 03 Mar 2012 23:24:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17284] csw/mgar/gar/v2/lib/python/checkpkg2.py Message-ID: Revision: 17284 http://gar.svn.sourceforge.net/gar/?rev=17284&view=rev Author: wahwah Date: 2012-03-03 23:24:36 +0000 (Sat, 03 Mar 2012) Log Message: ----------- checkpkg: Typo fix Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg2.py Modified: csw/mgar/gar/v2/lib/python/checkpkg2.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg2.py 2012-03-03 23:24:08 UTC (rev 17283) +++ csw/mgar/gar/v2/lib/python/checkpkg2.py 2012-03-03 23:24:36 UTC (rev 17284) @@ -28,7 +28,7 @@ can override them pasting the lines below to the GAR recipe.""" AFTER_OVERRIDES = """Please note that checkpkg isn't suggesting you should -simply add these overrides do the Makefile. It only informs what the overrides +simply add these overrides to the Makefile. It only informs what the overrides could look like. You need to understand what are the reported issues about and use your best judgement to decide whether to fix the underlying problems or override them. For more information, scroll up and read the detailed 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 Mar 4 00:25:14 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 03 Mar 2012 23:25:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[17285] csw/mgar/gar/v2/lib/python Message-ID: Revision: 17285 http://gar.svn.sourceforge.net/gar/?rev=17285&view=rev Author: wahwah Date: 2012-03-03 23:25:14 +0000 (Sat, 03 Mar 2012) Log Message: ----------- checkpkg: Remove soname grouping guesswork Checkpkg used to guess that if multiple libraries share the same soname version, they should go into a single package. libfoo-something.so.1 libfoo-otherthing.so.1 => CSWlibfoo suggested This caused increased checkpkg code complexity and guesses were often wrong and/or confusing. It is simpler to take each soname separately without trying to create package groups. Less magic in checkpkg allows maintainers to have a clearer understanding of what and why checkpkg suggests. In the rather rare cases when multiple libraries are bundled in one package, overrides can be used. These cases are rather rare, because the main package which used to bundle libraries is Boost, and it will be split into one-lib-per-package anyway. Other cases are rather marginal, and often involve bundline libraries with different soname versions (e.g. Kerberos private libs). Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/sharedlib_utils.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2012-03-03 23:24:36 UTC (rev 17284) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2012-03-03 23:25:14 UTC (rev 17285) @@ -1033,106 +1033,48 @@ else: soname = os.path.split(binary_info["path"])[1] linkable_shared_libs.append((soname, binary_info)) - check_names = True logging.debug("CheckSharedLibraryNamingPolicy(): " "linkable shared libs of %s: %s" % (pkgname, linkable_shared_libs)) - if len(linkable_shared_libs) > 1: - sonames = sorted(set([x[0] for x in linkable_shared_libs])) - tmp = su.MakePackageNameBySonameCollection(sonames) - if tmp: - multilib_pkgnames, multilib_catalogname = tmp - else: - multilib_pkgnames, multilib_catalogname = (None, None) - if not multilib_pkgnames: + for soname, binary_info in linkable_shared_libs: + tmp = su.MakePackageNameBySoname(soname) + policy_pkgname_list, policy_catalogname_list = tmp + if pkgname not in policy_pkgname_list: error_mgr.ReportError( - "non-uniform-lib-versions-in-package", - "sonames=%s" - % (",".join(sonames))) - messenger.Message( - "Package %s contains shared libraries, and their soname " - "versions are not in sync: %s. This means that " - "each soname is likely to be retired at a different time " - "and each soname is best placed in a separate package, " - "named after soname and version. " - % (pkgname, sonames)) - # If the sonames aren't uniform, there's no point in trying to match - # sonames versus pkgname. - messenger.SuggestGarLine( - "# Suggesting how to separate out shared libraries.") - messenger.SuggestGarLine( - "# You will most probably need to further edit these lines. " - "Use with caution!") - for soname, binary_info in linkable_shared_libs: - lib_path, lib_basename = os.path.split(binary_info["path"]) - tmp = su.MakePackageNameBySoname(soname) - policy_pkgname_list, policy_catalogname_list = tmp - pkginfo = pkg_data["pkginfo"] - description = " ".join(pkginfo["NAME"].split(" ")[2:]) - depchecks.SuggestLibraryPackage(error_mgr, messenger, - policy_pkgname_list[0], - policy_catalogname_list[0], - description, - lib_path, lib_basename, soname, - pkgname) + "shared-lib-pkgname-mismatch", + "file=%s " + "soname=%s " + "pkgname=%s " + "expected=%s" + % (binary_info["path"], + soname, pkgname, + ",".join(policy_pkgname_list))) - check_names = False - else: # len(linkable_shared_libs) > 1 - if pkgname not in multilib_pkgnames: - error_mgr.ReportError( - "shared-lib-pkgname-mismatch", - "sonames=%s " - "pkgname=%s " - "expected=%s " - % (",".join(sonames), pkgname, ",".join(multilib_pkgnames))) - messenger.Message( - "The collection of sonames (%s) " - "is expected to be in package " - "named %s, but the package name is %s. " - "More information: " - "http://wiki.opencsw.org/checkpkg-error-tags" - % (sonames, multilib_pkgnames, pkgname)) - check_names = False - if check_names: - for soname, binary_info in linkable_shared_libs: - tmp = su.MakePackageNameBySoname(soname) - policy_pkgname_list, policy_catalogname_list = tmp - if pkgname not in policy_pkgname_list: - error_mgr.ReportError( - "shared-lib-pkgname-mismatch", - "file=%s " - "soname=%s " - "pkgname=%s " - "expected=%s" - % (binary_info["path"], - soname, pkgname, - ",".join(policy_pkgname_list))) + suggested_pkgname = policy_pkgname_list[0] + lib_path, lib_basename = os.path.split(binary_info["path"]) + pkginfo = pkg_data["pkginfo"] + description = " ".join(pkginfo["NAME"].split(" ")[2:]) + depchecks.SuggestLibraryPackage(error_mgr, messenger, + suggested_pkgname, + policy_catalogname_list[0], + description, + lib_path, lib_basename, soname, + pkgname) - suggested_pkgname = policy_pkgname_list[0] - lib_path, lib_basename = os.path.split(binary_info["path"]) - pkginfo = pkg_data["pkginfo"] - description = " ".join(pkginfo["NAME"].split(" ")[2:]) - depchecks.SuggestLibraryPackage(error_mgr, messenger, - suggested_pkgname, - policy_catalogname_list[0], - description, - lib_path, lib_basename, soname, - pkgname) + messenger.OneTimeMessage( + soname, + "This shared library (%s) is in a directory indicating that it " + "is likely to be linked to by other programs. If this is the " + "case, the library is best packaged separately, in a package " + "with a library-specific name. Examples of such names include: " + "%s. If this library is not meant to be linked to by other " + "packages, it's best moved to a 'private' directory. " + "For example, instead of /opt/csw/lib/foo.so, " + "try /opt/csw/lib/projectname/foo.so. " + "More information: http://wiki.opencsw.org/checkpkg-error-tags" + % (binary_info["path"], policy_pkgname_list)) - messenger.OneTimeMessage( - soname, - "This shared library (%s) is in a directory indicating that it " - "is likely to be linked to by other programs. If this is the " - "case, the library is best packaged separately, in a package " - "with a library-specific name. Examples of such names include: " - "%s. If this library is not meant to be linked to by other " - "packages, it's best moved to a 'private' directory. " - "For example, instead of /opt/csw/lib/foo.so, " - "try /opt/csw/lib/projectname/foo.so. " - "More information: http://wiki.opencsw.org/checkpkg-error-tags" - % (binary_info["path"], policy_pkgname_list)) - def CheckSharedLibraryPkgDoesNotHaveTheSoFile(pkg_data, error_mgr, logger, messenger): """If it's a package with shared libraries, it should not contain the .so file. Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2012-03-03 23:24:36 UTC (rev 17284) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2012-03-03 23:25:14 UTC (rev 17285) @@ -171,70 +171,6 @@ return shared_libs -def GetCommonVersion(sonames): - versions = [] - for soname in sonames: - m = SONAME_VERSION_RE.search(soname) - if m: - versions.append(m.groupdict()["version"]) - else: - versions.append("") - versions_set = set(versions) - if len(versions_set) > 1 or not versions_set: - return (False, None) - else: - return (True, versions_set.pop()) - - -def ValidateCollectionName(l): - letters = "".join(re.findall(r"[a-zA-Z]", l)) - # Special case for libz - if len(letters) == 1 and letters[0] == 'z': return True - if len(letters) <= 1: - return False - return True - - -def MakePackageNameBySonameCollection(sonames): - """Finds a name for a collection of sonames. - - Try to find the largest common prefix in the sonames, and establish - whether there is a common version to them. - """ - common_version_exists, common_version = GetCommonVersion(sonames) - if not common_version_exists: - # If the sonames don't have a common version, they shouldn't be together - # in one package. - return None - common_substring_candidates = [] - for soname in sonames: - candidate = soname - # We always want such package to start with the prefix "lib". Therefore, - # we're stripping the prefix "lib" if it exists, and we're adding it back - # to the pkgname and soname at the end of the function. - if candidate.startswith("lib"): - candidate = candidate[3:] - m = re.search("\.so", candidate) - candidate = re.sub("\.so.*$", "", candidate) - common_substring_candidates.append(candidate) - lcs = CollectionLongestCommonSubstring(copy.copy(common_substring_candidates)) - if not ValidateCollectionName(lcs): - return None - pkgnames = [ - "CSW" + SonameToStringWithChar("lib%s%s" % (lcs, common_version), "-"), - ] - dashed = "CSW" + SonameToStringWithChar("lib%s-%s" % (lcs, common_version), "-") - if dashed not in pkgnames: - pkgnames.append(dashed) - catalognames = [ - SonameToStringWithChar("lib%s%s" % (lcs, common_version), "_"), - ] - underscored = SonameToStringWithChar("lib%s_%s" % (lcs, common_version), "_") - if underscored not in catalognames: - catalognames.append(underscored) - return pkgnames, catalognames - - def LongestCommonSubstring(S, T): """Stolen from Wikibooks @@ -256,16 +192,6 @@ return LCS -def CollectionLongestCommonSubstring(collection): - current_substring = collection.pop() - while collection and current_substring: - substring_set = LongestCommonSubstring(current_substring, - collection.pop()) - if substring_set: - current_substring = list(substring_set)[0] - return current_substring - - def IsBinary(file_info): """Returns True or False depending on file metadata.""" is_a_binary = False 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 Mar 4 13:29:06 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 04 Mar 2012 12:29:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17286] csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py Message-ID: Revision: 17286 http://gar.svn.sourceforge.net/gar/?rev=17286&view=rev Author: wahwah Date: 2012-03-04 12:29:06 +0000 (Sun, 04 Mar 2012) Log Message: ----------- checkpkg-inspect-stats: Display help first ...connect to the database second. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py Modified: csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py 2012-03-03 23:25:14 UTC (rev 17285) +++ csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py 2012-03-04 12:29:06 UTC (rev 17286) @@ -21,7 +21,6 @@ import configuration def main(): - configuration.SetUpSqlobjectConnection() usage = "Usage: %prog [ options ] file | md5 [ file | md5 [ ... ] ]" parser = optparse.OptionParser(usage) parser.add_option("-d", "--debug", dest="debug", @@ -35,6 +34,7 @@ else: logging.basicConfig(level=logging.INFO) logging.debug("Collecting statistics about given package files.") + configuration.SetUpSqlobjectConnection() pkgstat_objs = checkpkg.GetPackageStatsByFilenamesOrMd5s( args, options.debug) 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 Mar 4 13:29:39 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 04 Mar 2012 12:29:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17287] csw/mgar/gar/v2/lib/python/package_stats.py Message-ID: Revision: 17287 http://gar.svn.sourceforge.net/gar/?rev=17287&view=rev Author: wahwah Date: 2012-03-04 12:29:39 +0000 (Sun, 04 Mar 2012) Log Message: ----------- pkgdb: A few debug logging statements Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_stats.py Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2012-03-04 12:29:06 UTC (rev 17286) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2012-03-04 12:29:39 UTC (rev 17287) @@ -101,10 +101,15 @@ """ pkg_stats = self.GetDbObject() if not pkg_stats: + logging.debug("Could not get db object for %s", self.GetMd5sum()) return False if pkg_stats.stats_version != PACKAGE_STATS_VERSION: + logging.debug("Stats version mismatch: package=%s code=%s", + pkg_stats.stats_version, + PACKAGE_STATS_VERSION) return False elif pkg_stats.data_obj is None: + logging.debug("Could not find data object for %s", self.GetMd5sum()) return False else: return True This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 4 13:30:27 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 04 Mar 2012 12:30:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[17288] csw/mgar/gar/v2/lib/python Message-ID: Revision: 17288 http://gar.svn.sourceforge.net/gar/?rev=17288&view=rev Author: wahwah Date: 2012-03-04 12:30:27 +0000 (Sun, 04 Mar 2012) Log Message: ----------- pkgdb: Removing unit tests for removed code WRT [17285] Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2012-03-04 12:29:39 UTC (rev 17287) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2012-03-04 12:30:27 UTC (rev 17288) @@ -1341,12 +1341,6 @@ class TestCheckSharedLibraryNamingPolicy(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckSharedLibraryNamingPolicy' - def testNonUniformLibs(self): - self.pkg_data = neon_stats[0] - self.error_mgr_mock.ReportError( - 'non-uniform-lib-versions-in-package', - "sonames=libneon.so.26,libneon.so.27") - def testGood(self): self.pkg_data = bdb48_stats[0] Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2012-03-04 12:29:39 UTC (rev 17287) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2012-03-04 12:30:27 UTC (rev 17288) @@ -195,101 +195,6 @@ self.assertEqual("libpython3_1_1_0", su.SonameToStringWithChar("libpython3.1.so.1.0", "_")) -class GetCommonVersionUnitTest(unittest.TestCase): - - def testGetCommonVersionSimple(self): - sonames = ["libfoo.so.0", "libfoo_util.so.0"] - self.assertEqual((True, "0"), su.GetCommonVersion(sonames)) - - def testGetCommonVersionMore(self): - sonames = ["libfoo.so.0.2.1", "libfoo_util.so.0.2.1"] - self.assertEqual((True, "0.2.1"), su.GetCommonVersion(sonames)) - - def testGetCommonVersionInvalid(self): - sonames = ["libfoo.so.0.2.1", "libfoo_util.so.0.2.3"] - self.assertEqual((False, None), su.GetCommonVersion(sonames)) - - def testGetCommonVersionEndsWithSo(self): - sonames = ["libfoo1.so", "libfoo1.so"] - self.assertEqual((True, ""), su.GetCommonVersion(sonames)) - - -class MakePackageNameBySonameCollectionUnitTest(unittest.TestCase): - - def testMakePackageNameBySonameCollectionTwo(self): - sonames = ["libfoo.so.0", "libfoo_util.so.0"] - expected = ( - ["CSWlibfoo0"], - ["libfoo0"], - ) - self.assertEqual(expected, su.MakePackageNameBySonameCollection(sonames)) - - def testMakePackageNameBySonameCollectionRepeated(self): - sonames = ["libfoo.so.0", "libfoo.so.0"] - expected = ( - ["CSWlibfoo0"], - ["libfoo0"], - ) - self.assertEqual(expected, su.MakePackageNameBySonameCollection(sonames)) - - def testMakePackageNameBySonameCollectionBdb(self): - sonames = ["libfoo.so.0", "libfoo_util.so.0"] - expected = ( - ["CSWlibfoo0"], - ["libfoo0"], - ) - self.assertEqual(expected, su.MakePackageNameBySonameCollection(sonames)) - - def testMakePackageNameBySonameCollectionNoCommonVersion(self): - sonames = ["libfoo.so.0", "libfoo_util.so.1"] - self.assertEqual(None, su.MakePackageNameBySonameCollection(sonames)) - - def testMakePackageNameBySonameCollectionMultipleSo(self): - sonames = ["libfoo1.so", "libfoo1.so"] - expected = ( - ["CSWlibfoo1"], - ["libfoo1"], - ) - self.assertEqual(expected, su.MakePackageNameBySonameCollection(sonames)) - - def testMakePackageNameBySonameCollectionMultipleSoGlib2(self): - sonames = [ - "libgio-2.0.so.0", - "libglib-2.0.so.0", - "libgmodule-2.0.so.0", - "libgobject-2.0.so.0", - "libgthread-2.0.so.0", - ] - self.assertEqual(None, su.MakePackageNameBySonameCollection(sonames)) - - -class ValidateCollectionNameTest(unittest.TestCase): - - def testLetters(self): - self.assertEqual(True, su.ValidateCollectionName("foo")) - - def testOneLetter(self): - self.assertEqual(False, su.ValidateCollectionName("f")) - - def testNoLetters(self): - self.assertEqual(False, su.ValidateCollectionName("-2.0")) - - -class CommomSubstringTest(unittest.TestCase): - - def testLongestCommonSubstring_1(self): - self.assertEqual(set(["foo"]), su.LongestCommonSubstring("foo", "foo")) - - def testLongestCommonSubstring_2(self): - self.assertEqual(set([]), su.LongestCommonSubstring("foo", "bar")) - - def testLongestCommonSubstring_3(self): - self.assertEqual(set(["bar"]), su.LongestCommonSubstring("barfoobar", "bar")) - - def testLongestCommonSubstring_4(self): - self.assertEqual(set(['bcd', 'hij']), su.LongestCommonSubstring("abcdefghijk", "bcdhij")) - - class GetIsalistUnitTest(unittest.TestCase): def testGetIsalistSparc(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 4 13:30:56 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 04 Mar 2012 12:30:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[17289] csw/mgar/gar/v2/lib/python/sharedlib_utils.py Message-ID: Revision: 17289 http://gar.svn.sourceforge.net/gar/?rev=17289&view=rev Author: wahwah Date: 2012-03-04 12:30:56 +0000 (Sun, 04 Mar 2012) Log Message: ----------- pkgdb: Adding back a collection substring getter It's used in another function. 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-03-04 12:30:27 UTC (rev 17288) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2012-03-04 12:30:56 UTC (rev 17289) @@ -230,3 +230,13 @@ """Needs to be improved to escape more characters.""" s = s.replace(r'.', r'\.') return s + + +def CollectionLongestCommonSubstring(collection): + current_substring = collection.pop() + while collection and current_substring: + substring_set = LongestCommonSubstring(current_substring, + collection.pop()) + if substring_set: + current_substring = list(substring_set)[0] + return current_substring 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 Mar 4 15:55:21 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 04 Mar 2012 14:55:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17290] csw/mgar/gar/v2/lib/python/catalog_notifier.py Message-ID: Revision: 17290 http://gar.svn.sourceforge.net/gar/?rev=17290&view=rev Author: wahwah Date: 2012-03-04 14:55:21 +0000 (Sun, 04 Mar 2012) Log Message: ----------- catalog-notifier: Use the main SMTP host for sending notifications. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/catalog_notifier.py Modified: csw/mgar/gar/v2/lib/python/catalog_notifier.py =================================================================== --- csw/mgar/gar/v2/lib/python/catalog_notifier.py 2012-03-04 12:30:56 UTC (rev 17289) +++ csw/mgar/gar/v2/lib/python/catalog_notifier.py 2012-03-04 14:55:21 UTC (rev 17290) @@ -267,7 +267,7 @@ from_address = "Catalog update notifier " msg['From'] = from_address msg['To'] = email - s = smtplib.SMTP('localhost') + s = smtplib.SMTP('mail.opencsw.org') try: s.sendmail(from_address, [email], msg.as_string()) except smtplib.SMTPRecipientsRefused, 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 Sun Mar 4 15:55:52 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 04 Mar 2012 14:55:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17291] csw/mgar/gar/v2/lib/web Message-ID: Revision: 17291 http://gar.svn.sourceforge.net/gar/?rev=17291&view=rev Author: wahwah Date: 2012-03-04 14:55:52 +0000 (Sun, 04 Mar 2012) Log Message: ----------- pkgdb-web: use mod_wsgi Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py csw/mgar/gar/v2/lib/web/releases_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-03-04 14:55:21 UTC (rev 17290) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-03-04 14:55:52 UTC (rev 17291) @@ -2,6 +2,10 @@ # A webpy application to allow HTTP access to the checkpkg database. +import sys +import os +sys.path.append(os.path.join(os.path.split(__file__)[0], "..", "..")) + import web import sqlobject import json @@ -44,9 +48,7 @@ ) urls = urls_html + urls_rest -# render = web.template.render('templates/') -# render = web.template.render('/home/maciej/src/pkgdb_web/templates/') -render = web.template.render('/home/maciej/src/opencsw-git/gar/v2/' +render = web.template.render('/home/web/bin/gar/' 'lib/web/templates/') @@ -425,6 +427,7 @@ app = web.application(urls, globals()) main = app.wsgifunc() +application = app.wsgifunc() if __name__ == "__main__": Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2012-03-04 14:55:21 UTC (rev 17290) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2012-03-04 14:55:52 UTC (rev 17291) @@ -2,6 +2,10 @@ # A webpy application to allow HTTP access to the checkpkg database. +import sys +import os +sys.path.append(os.path.join(os.path.split(__file__)[0], "..", "..")) + import web import sqlobject import json @@ -13,8 +17,6 @@ from lib.python import opencsw from lib.python import common_constants import datetime -import os -import os.path import hashlib import logging @@ -257,8 +259,11 @@ web.webapi.internalerror = web.debugerror -app = web.application(urls, globals(), autoreload=False) -main = app.wsgifunc() +app = web.application(urls, globals()) +# main = app.wsgifunc() +application = app.wsgifunc() +from paste.exceptions.errormiddleware import ErrorMiddleware +application = ErrorMiddleware(application, debug=True) if __name__ == "__main__": logging.basicConfig(level=logging.INFO) 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 Mar 4 15:56:21 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 04 Mar 2012 14:56:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17292] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 17292 http://gar.svn.sourceforge.net/gar/?rev=17292&view=rev Author: wahwah Date: 2012-03-04 14:56:21 +0000 (Sun, 04 Mar 2012) Log Message: ----------- pkgdb: Resolve a basename to packages The same query that checkpkg does when looking for shared libraries. 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-03-04 14:55:52 UTC (rev 17291) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-03-04 14:56:21 UTC (rev 17292) @@ -38,6 +38,8 @@ r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/', 'Catalogs', r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgname-by-filename', 'PkgnameByFilename', + r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgnames-and-paths-by-basename', + 'PkgnamesAndPathsByBasename', # Query by catalog release, arch, OS release and catalogname r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/catalognames/([^/]+)/', 'Srv4ByCatAndCatalogname', r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgnames/([^/]+)/', 'Srv4ByCatAndPkgname', @@ -308,6 +310,28 @@ raise web.notfound() +class PkgnamesAndPathsByBasename(object): + def GET(self, catrel, arch, osrel): + ConnectToDatabase() + user_data = web.input() + basename = user_data.basename + send_filename = ( + '%s-%s-%s-%s-packages.txt' + % (catrel, arch, osrel, basename.replace('/', '-'))) + db_catalog = checkpkg_lib.Catalog() + try: + data = db_catalog.GetPathsAndPkgnamesByBasename( + basename, osrel, arch, catrel) + web.header( + 'Content-type', + 'application/x-vnd.opencsw.pkg;type=pkgname-list') + web.header('Content-Disposition', + 'attachment; filename=%s' % send_filename) + return json.dumps(data) + except sqlobject.main.SQLObjectNotFound, e: + raise web.notfound() + + class RestSrv4Detail(object): def GET(self, md5_sum): 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 Mar 4 15:56:50 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 04 Mar 2012 14:56:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[17293] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 17293 http://gar.svn.sourceforge.net/gar/?rev=17293&view=rev Author: wahwah Date: 2012-03-04 14:56:50 +0000 (Sun, 04 Mar 2012) Log Message: ----------- pkgdb: Allow to fetch package data from JavaScript from other websites 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-03-04 14:56:21 UTC (rev 17292) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-03-04 14:56:50 UTC (rev 17293) @@ -405,6 +405,7 @@ srv4 = res.getOne() mimetype, data = srv4.GetRestRepr() web.header('Content-type', mimetype) + web.header('Access-Control-Allow-Origin', '*') return json.dumps(data) except sqlobject.main.SQLObjectNotFound: return json.dumps(None) 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 Mar 4 15:57:21 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 04 Mar 2012 14:57:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17294] csw/mgar/gar/v2/lib/web/templates/index.html Message-ID: Revision: 17294 http://gar.svn.sourceforge.net/gar/?rev=17294&view=rev Author: wahwah Date: 2012-03-04 14:57:21 +0000 (Sun, 04 Mar 2012) Log Message: ----------- pkgdb: Links to other project resources Modified Paths: -------------- csw/mgar/gar/v2/lib/web/templates/index.html Modified: csw/mgar/gar/v2/lib/web/templates/index.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/index.html 2012-03-04 14:56:50 UTC (rev 17293) +++ csw/mgar/gar/v2/lib/web/templates/index.html 2012-03-04 14:57:21 UTC (rev 17294) @@ -34,6 +34,21 @@ patterns in the source code.

+

Project resources:

+

+ [ + Home page + | + Community Q&A + | + GAR + | + wiki + | + bugs + ] +

+ 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 Mar 4 15:57:50 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 04 Mar 2012 14:57:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[17295] csw/mgar/gar/v2/lib/web/releases_web.py Message-ID: Revision: 17295 http://gar.svn.sourceforge.net/gar/?rev=17295&view=rev Author: wahwah Date: 2012-03-04 14:57:49 +0000 (Sun, 04 Mar 2012) Log Message: ----------- releases: Change a warning message to a debug message. 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-03-04 14:57:21 UTC (rev 17294) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2012-03-04 14:57:49 UTC (rev 17295) @@ -124,7 +124,7 @@ sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad( osrel_name, arch_name, catrel_name) srv4 = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() - logging.warning("Srv4CatalogAssignment::GET srv4: %s", srv4.basename) + logging.debug("Srv4CatalogAssignment::GET srv4: %s", srv4.basename) srv4_in_c = models.Srv4FileInCatalog.selectBy( osrel=sqo_osrel, arch=sqo_arch, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 4 15:58:18 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 04 Mar 2012 14:58:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17296] csw/mgar/gar/v2/lib/python/models.py Message-ID: Revision: 17296 http://gar.svn.sourceforge.net/gar/?rev=17296&view=rev Author: wahwah Date: 2012-03-04 14:58:18 +0000 (Sun, 04 Mar 2012) Log Message: ----------- pkgdb: Add a missing function parameter Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2012-03-04 14:57:49 UTC (rev 17295) +++ csw/mgar/gar/v2/lib/python/models.py 2012-03-04 14:58:18 UTC (rev 17296) @@ -283,7 +283,7 @@ vendor_url = re.split(r"\s+", data["pkginfo"]["VENDOR"])[0] return vendor_url - def GetRestRepr(self): + def GetRestRepr(self, quick=False): mimetype = "application/x-vnd.opencsw.pkg;type=srv4-detail" # Slow subqueries, could be solved by caching in the db schema: # - self.pkginst.pkgname This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 4 21:46:41 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 04 Mar 2012 20:46:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[17297] csw/mgar/gar/v2/lib/web Message-ID: Revision: 17297 http://gar.svn.sourceforge.net/gar/?rev=17297&view=rev Author: wahwah Date: 2012-03-04 20:46:40 +0000 (Sun, 04 Mar 2012) Log Message: ----------- mGAR v2: No need for mod_python, we're running mod_wsgi now. Removed Paths: ------------- csw/mgar/gar/v2/lib/web/modpython_gateway.py Property Changed: ---------------- csw/mgar/gar/v2/lib/web/ Property changes on: csw/mgar/gar/v2/lib/web ___________________________________________________________________ Deleted: svn:externals - modpython http://svn.aminus.net/misc Deleted: csw/mgar/gar/v2/lib/web/modpython_gateway.py =================================================================== --- csw/mgar/gar/v2/lib/web/modpython_gateway.py 2012-03-04 14:58:18 UTC (rev 17296) +++ csw/mgar/gar/v2/lib/web/modpython_gateway.py 2012-03-04 20:46:40 UTC (rev 17297) @@ -1 +0,0 @@ -link modpython/modpython_gateway.py \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 5 08:50:02 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 05 Mar 2012 07:50:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[17298] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 17298 http://gar.svn.sourceforge.net/gar/?rev=17298&view=rev Author: wahwah Date: 2012-03-05 07:50:01 +0000 (Mon, 05 Mar 2012) Log Message: ----------- gcc4/trunk: version bump to 4.6.3 Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile csw/mgar/pkg/gcc4/trunk/checksums Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-03-04 20:46:40 UTC (rev 17297) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-03-05 07:50:01 UTC (rev 17298) @@ -1,7 +1,7 @@ # $Id$ NAME = gcc -VERSION = 4.6.2 +VERSION = 4.6.3 CATEGORIES = lang GARTYPE = v2 BASE_VERSION = $(shell echo $(VERSION) | gsed -e 's/^\([0-9]\+\.[0-9]\+\)\(.*\)/\1/') Modified: csw/mgar/pkg/gcc4/trunk/checksums =================================================================== --- csw/mgar/pkg/gcc4/trunk/checksums 2012-03-04 20:46:40 UTC (rev 17297) +++ csw/mgar/pkg/gcc4/trunk/checksums 2012-03-05 07:50:01 UTC (rev 17298) @@ -1 +1 @@ -028115c4fbfb6cfd75d6369f4a90d87e gcc-4.6.2.tar.bz2 +773092fe5194353b02bb0110052a972e gcc-4.6.3.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 Mar 5 09:41:11 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 05 Mar 2012 08:41:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17299] csw/mgar/pkg/boost/branches/boost-gcc/Makefile Message-ID: Revision: 17299 http://gar.svn.sourceforge.net/gar/?rev=17299&view=rev Author: wahwah Date: 2012-03-05 08:41:11 +0000 (Mon, 05 Mar 2012) Log Message: ----------- boost/branches/boost-gcc: library split Modified Paths: -------------- csw/mgar/pkg/boost/branches/boost-gcc/Makefile Modified: csw/mgar/pkg/boost/branches/boost-gcc/Makefile =================================================================== --- csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-03-05 07:50:01 UTC (rev 17298) +++ csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-03-05 08:41:11 UTC (rev 17299) @@ -4,6 +4,7 @@ VERSION = 1.49.0 CATEGORIES = lib GARTYPE = v2 +# GARTYPE = v2-build64only define BLURB Boost was begun by members of the C++ standards committee Library Working @@ -17,6 +18,8 @@ programming style of the Standard Template Library (STL). endef +DESCRIPTION = Free peer-reviewed portable C++ source libraries + MASTER_SITES = $(SF_MIRROR)/$(NAME)/ DISTVERSION = $(subst .,_,$(VERSION)) DISTNAME = $(NAME)_$(DISTVERSION) @@ -27,7 +30,7 @@ PATCHFILES += 0001-Don-t-try-to-use-fchmodat.patch -prefix = /opt/csw/gcc +prefix = /opt/csw/gxx # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=7586 @@ -40,16 +43,14 @@ PACKAGES += CSWboost$(COMPILER_SUFFIX_PKG) CATALOGNAME_CSWboost$(COMPILER_SUFFIX_PKG) += boost$(COMPILER_SUFFIX_CAT) -SPKG_DESC_CSWboost$(COMPILER_SUFFIX_PKG) = Boost libraries +SPKG_DESC_CSWboost$(COMPILER_SUFFIX_PKG) = $(DESCRIPTION) # The boost build system is hard to harness. CHECKPKG_OVERRIDES_CSWboost$(COMPILER_SUFFIX_PKG) += bad-rpath-entry -PACKAGES += CSWboost$(COMPILER_SUFFIX_PKG)devel -CATALOGNAME_CSWboost$(COMPILER_SUFFIX_PKG)devel = boost$(COMPILER_SUFFIX_CAT)_devel -SPKG_DESC_CSWboost$(COMPILER_SUFFIX_PKG)devel = Boost libraries, development files -PKGFILES_CSWboost$(COMPILER_SUFFIX_PKG)devel = $(PKGFILES_DEVEL) +PACKAGES += CSWboost$(COMPILER_SUFFIX_PKG)-dev +SPKG_DESC_CSWboost$(COMPILER_SUFFIX_PKG)-dev = $(DESCRIPTION), development files +PKGFILES_CSWboost$(COMPILER_SUFFIX_PKG)-dev = $(PKGFILES_DEVEL) - LICENSE = LICENSE_1_0.txt BUILD_DEP_PKGS += CSWstar @@ -58,19 +59,26 @@ BUILD_SCRIPTS = boost INSTALL_SCRIPTS = bjam +EXTRA_FLAGS = -std=c99 +EXTRA_LINKER_FLAGS = -R/opt/csw/lib/\\\$$ISALIST +BUILD64_ONLY = 1 + BUILD_ARGS += toolset=$(TOOLSET) BUILD_ARGS += --prefix=$(DESTDIR)$(prefix) BUILD_ARGS += --libdir=$(DESTDIR)$(libdir) BUILD_ARGS += link=shared -BUILD_ARGS += cflags="$(CFLAGS)" -BUILD_ARGS += cxxflags="$(CXXFLAGS)" -BUILD_ARGS += linkflags="$(LDFLAGS) $(LD_OPTIONS)" +BUILD_ARGS += cflags='$(CFLAGS)' +BUILD_ARGS += cxxflags='$(CXXFLAGS)' +BUILD_ARGS += linkflags='$(LDFLAGS) $(LD_OPTIONS)' # Stop on the first error BUILD_ARGS += -q # Display commands as you run them, I want to know what you are doing there BUILD_ARGS += -d+2 -BUILD_ARGS += include="/opt/csw/gcc/include" +BUILD_ARGS += include='/opt/csw/gcc/include' BUILD_ARGS += --debug-building +BUILD_ARGS += address-model=64 +# We don't have 64-bit Python +BUILD_ARGS += --without-python TEST_SCRIPTS = @@ -85,6 +93,222 @@ BJAM_PARALLELMFLAGS_current9x = -j 5 BJAM_PARALLELMFLAGS = $(BJAM_PARALLELMFLAGS_$(call modulation2host)) + +PACKAGES += CSWlibboost-chrono1-49-0-gxx +PKGFILES_CSWlibboost-chrono1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_chrono\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-chrono1-49-0-gxx += $(DESCRIPTION), libboost_chrono.so.1.49.0 + +PACKAGES += CSWlibboost-date-time1-49-0-gxx +PKGFILES_CSWlibboost-date-time1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_date_time\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-date-time1-49-0-gxx += $(DESCRIPTION), libboost_date_time.so.1.49.0 + +PACKAGES += CSWlibboost-filesystem1-49-0-gxx +PKGFILES_CSWlibboost-filesystem1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_filesystem\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-filesystem1-49-0-gxx += $(DESCRIPTION), libboost_filesystem.so.1.49.0 + +PACKAGES += CSWlibboost-graph1-49-0-gxx +PKGFILES_CSWlibboost-graph1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_graph\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-graph1-49-0-gxx += $(DESCRIPTION), libboost_graph.so.1.49.0 + +PACKAGES += CSWlibboost-iostreams1-49-0-gxx +PKGFILES_CSWlibboost-iostreams1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_iostreams\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-iostreams1-49-0-gxx += $(DESCRIPTION), libboost_iostreams.so.1.49.0 + +PACKAGES += CSWlibboost-math-c99-1-49-0-gxx +PKGFILES_CSWlibboost-math-c99-1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_math_c99\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-math-c99-1-49-0-gxx += $(DESCRIPTION), libboost_math_c99.so.1.49.0 + +PACKAGES += CSWlibboost-math-c99f1-49-0-gxx +PKGFILES_CSWlibboost-math-c99f1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_math_c99f\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-math-c99f1-49-0-gxx += $(DESCRIPTION), libboost_math_c99f.so.1.49.0 + +PACKAGES += CSWlibboost-math-c99l1-49-0-gxx +PKGFILES_CSWlibboost-math-c99l1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_math_c99l\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-math-c99l1-49-0-gxx += $(DESCRIPTION), libboost_math_c99l.so.1.49.0 + +PACKAGES += CSWlibboost-math-tr1-1-49-0-gxx +PKGFILES_CSWlibboost-math-tr1-1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_math_tr1\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-math-tr1-1-49-0-gxx += $(DESCRIPTION), libboost_math_tr1.so.1.49.0 + +PACKAGES += CSWlibboost-math-tr1f1-49-0-gxx +PKGFILES_CSWlibboost-math-tr1f1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_math_tr1f\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-math-tr1f1-49-0-gxx += $(DESCRIPTION), libboost_math_tr1f.so.1.49.0 + +PACKAGES += CSWlibboost-math-tr1l1-49-0-gxx +PKGFILES_CSWlibboost-math-tr1l1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_math_tr1l\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-math-tr1l1-49-0-gxx += $(DESCRIPTION), libboost_math_tr1l.so.1.49.0 + +PACKAGES += CSWlibboost-prexmon1-49-0-gxx +PKGFILES_CSWlibboost-prexmon1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_prg_exec_monitor\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-prexmon1-49-0-gxx += $(DESCRIPTION), libboost_prg_exec_monitor.so.1.49.0 + +PACKAGES += CSWlibboost-prog-opts1-49-0-gxx +PKGFILES_CSWlibboost-prog-opts1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_program_options\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-prog-opts1-49-0-gxx += $(DESCRIPTION), libboost_program_options.so.1.49.0 + +PACKAGES += CSWlibboost-random1-49-0-gxx +PKGFILES_CSWlibboost-random1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_random\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-random1-49-0-gxx += $(DESCRIPTION), libboost_random.so.1.49.0 + +PACKAGES += CSWlibboost-regex1-49-0-gxx +PKGFILES_CSWlibboost-regex1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_regex\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-regex1-49-0-gxx += $(DESCRIPTION), libboost_regex.so.1.49.0 + +PACKAGES += CSWlibboost-s13n1-49-0-gxx +PKGFILES_CSWlibboost-s13n1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_serialization\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-s13n1-49-0-gxx += $(DESCRIPTION), libboost_serialization.so.1.49.0 + +PACKAGES += CSWlibboost-signals1-49-0-gxx +PKGFILES_CSWlibboost-signals1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_signals\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-signals1-49-0-gxx += $(DESCRIPTION), libboost_signals.so.1.49.0 + +PACKAGES += CSWlibboost-system1-49-0-gxx +PKGFILES_CSWlibboost-system1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_system\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-system1-49-0-gxx += $(DESCRIPTION), libboost_system.so.1.49.0 + +PACKAGES += CSWlibboost-thread1-49-0-gxx +PKGFILES_CSWlibboost-thread1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_thread\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-thread1-49-0-gxx += $(DESCRIPTION), libboost_thread.so.1.49.0 + +PACKAGES += CSWlibboost-timer1-49-0-gxx +PKGFILES_CSWlibboost-timer1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_timer\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-timer1-49-0-gxx += $(DESCRIPTION), libboost_timer.so.1.49.0 + +PACKAGES += CSWlibboost-ut-fwk1-49-0-gxx +PKGFILES_CSWlibboost-ut-fwk1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_unit_test_framework\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-ut-fwk1-49-0-gxx += $(DESCRIPTION), libboost_unit_test_framework.so.1.49.0 + +PACKAGES += CSWlibboost-wave1-49-0-gxx +PKGFILES_CSWlibboost-wave1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_wave\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-wave1-49-0-gxx += $(DESCRIPTION), libboost_wave.so.1.49.0 + +PACKAGES += CSWlibboost-ws13n1-49-0-gxx +PKGFILES_CSWlibboost-ws13n1-49-0-gxx += $(call baseisadirs,$(libdir),libboost_wserialization\.so\.1\.49\.0(\.\d+)*) +SPKG_DESC_CSWlibboost-ws13n1-49-0-gxx += $(DESCRIPTION), libboost_wserialization.so.1.49.0 + +RUNTIME_DEP_PKGS_CSWlibboost-chrono1-49-0-gxx += CSWlibboost-system1-49-0-gxx +RUNTIME_DEP_PKGS_CSWlibboost-chrono1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-chrono1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-signals1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-signals1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-date-time1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-date-time1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-system1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-system1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-math-tr1-1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-math-tr1-1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-filesystem1-49-0-gxx += CSWlibboost-system1-49-0-gxx +RUNTIME_DEP_PKGS_CSWlibboost-filesystem1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-filesystem1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-graph1-49-0-gxx += CSWlibboost-regex1-49-0-gxx +RUNTIME_DEP_PKGS_CSWlibboost-graph1-49-0-gxx += CSWlibicudata48 +RUNTIME_DEP_PKGS_CSWlibboost-graph1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-graph1-49-0-gxx += CSWlibicuuc48 +RUNTIME_DEP_PKGS_CSWlibboost-graph1-49-0-gxx += CSWlibicui18n48 +RUNTIME_DEP_PKGS_CSWlibboost-graph1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-wave1-49-0-gxx += CSWlibboost-thread1-49-0-gxx +RUNTIME_DEP_PKGS_CSWlibboost-wave1-49-0-gxx += CSWlibboost-system1-49-0-gxx +RUNTIME_DEP_PKGS_CSWlibboost-wave1-49-0-gxx += CSWlibboost-date-time1-49-0-gxx +RUNTIME_DEP_PKGS_CSWlibboost-wave1-49-0-gxx += CSWlibboost-filesystem1-49-0-gxx +RUNTIME_DEP_PKGS_CSWlibboost-wave1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-wave1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-math-tr1f1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-math-tr1f1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-math-tr1l1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-math-tr1l1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-ut-fwk1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-ut-fwk1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-regex1-49-0-gxx += CSWlibicuuc48 +RUNTIME_DEP_PKGS_CSWlibboost-regex1-49-0-gxx += CSWlibicui18n48 +RUNTIME_DEP_PKGS_CSWlibboost-regex1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-regex1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-regex1-49-0-gxx += CSWlibicudata48 +RUNTIME_DEP_PKGS_CSWlibboost-ws13n1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-ws13n1-49-0-gxx += CSWlibboost-s13n1-49-0-gxx +RUNTIME_DEP_PKGS_CSWlibboost-ws13n1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-s13n1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-s13n1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-math-c99-1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-math-c99-1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-math-c99f1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-math-c99f1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-prexmon1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-filesystem1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-math-tr1-1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-math-c99l1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-thread1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-math-c99f1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-iostreams1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-signals1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-wave1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-system1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-ut-fwk1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-date-time1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-math-c99-1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-s13n1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-regex1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-ws13n1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-prog-opts1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-math-tr1l1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-math-tr1f1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-random1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-timer1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-chrono1-49-0-gxx +RUNTIME_DEP_PKGS_CSWboost-gcc-dev += CSWlibboost-graph1-49-0-gxx +RUNTIME_DEP_PKGS_CSWlibboost-prog-opts1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-prog-opts1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-prexmon1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-prexmon1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-iostreams1-49-0-gxx += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibboost-iostreams1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-iostreams1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-iostreams1-49-0-gxx += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibboost-timer1-49-0-gxx += CSWlibboost-system1-49-0-gxx +RUNTIME_DEP_PKGS_CSWlibboost-timer1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-timer1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-timer1-49-0-gxx += CSWlibboost-chrono1-49-0-gxx +RUNTIME_DEP_PKGS_CSWlibboost-thread1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-thread1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-random1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-random1-49-0-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibboost-math-c99l1-49-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibboost-math-c99l1-49-0-gxx += CSWlibstdc++6 + +# Overridees for bad-rpath-entry are needed because the Boost build system +# apparently interpolates $ISALIST, leaving us with "/opt/csw/lib/" +# with the slash at the end. +CHECKPKG_OVERRIDES_CSWlibboost-chrono1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-date-time1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-filesystem1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-graph1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-iostreams1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-math-c99-1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-math-c99f1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-math-c99l1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-math-tr1-1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-math-tr1f1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-math-tr1l1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-prexmon1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-prog-opts1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-random1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-regex1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-s13n1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-signals1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-system1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-thread1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-timer1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-ut-fwk1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-wave1-49-0-gxx += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibboost-ws13n1-49-0-gxx += bad-rpath-entry + +# The shared-lib-pkgname-mismatch overrides are here, because some pkgnames +# based on file names are too long and pkgmk can't handle them. +CHECKPKG_OVERRIDES_CSWlibboost-s13n1-49-0-gxx += shared-lib-pkgname-mismatch +CHECKPKG_OVERRIDES_CSWlibboost-ut-fwk1-49-0-gxx += shared-lib-pkgname-mismatch +CHECKPKG_OVERRIDES_CSWlibboost-prog-opts1-49-0-gxx += shared-lib-pkgname-mismatch +CHECKPKG_OVERRIDES_CSWlibboost-prexmon1-49-0-gxx += shared-lib-pkgname-mismatch +CHECKPKG_OVERRIDES_CSWlibboost-ws13n1-49-0-gxx += shared-lib-pkgname-mismatch + include gar/category.mk PYTHON_ROOT = $(prefix) 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 Mar 5 09:47:38 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 05 Mar 2012 08:47:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[17300] csw/mgar/pkg/boost/branches/boost-gcc/Makefile Message-ID: Revision: 17300 http://gar.svn.sourceforge.net/gar/?rev=17300&view=rev Author: wahwah Date: 2012-03-05 08:47:38 +0000 (Mon, 05 Mar 2012) Log Message: ----------- boost/branches/boost-gcc: use v2-build64only Modified Paths: -------------- csw/mgar/pkg/boost/branches/boost-gcc/Makefile Modified: csw/mgar/pkg/boost/branches/boost-gcc/Makefile =================================================================== --- csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-03-05 08:41:11 UTC (rev 17299) +++ csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-03-05 08:47:38 UTC (rev 17300) @@ -3,8 +3,8 @@ NAME = boost VERSION = 1.49.0 CATEGORIES = lib -GARTYPE = v2 -# GARTYPE = v2-build64only +# GARTYPE = v2 +GARTYPE = v2-build64only define BLURB Boost was begun by members of the C++ standards committee Library Working 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 Mar 5 10:15:04 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 05 Mar 2012 09:15:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[17301] csw/mgar/pkg/boost/branches/boost-gcc/Makefile Message-ID: Revision: 17301 http://gar.svn.sourceforge.net/gar/?rev=17301&view=rev Author: wahwah Date: 2012-03-05 09:15:04 +0000 (Mon, 05 Mar 2012) Log Message: ----------- boost/branches/boost-gcc: don't use git, it's too slow Modified Paths: -------------- csw/mgar/pkg/boost/branches/boost-gcc/Makefile Modified: csw/mgar/pkg/boost/branches/boost-gcc/Makefile =================================================================== --- csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-03-05 08:47:38 UTC (rev 17300) +++ csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-03-05 09:15:04 UTC (rev 17301) @@ -28,6 +28,9 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 # ISA_DEFAULT_sparc-5.10 = sparcv8plus +# It takes an awful lot of time. +NOTGITPATCH = 1 + PATCHFILES += 0001-Don-t-try-to-use-fchmodat.patch prefix = /opt/csw/gxx 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 Mar 5 10:32:58 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 05 Mar 2012 09:32:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[17302] csw/mgar/pkg/boost/branches/boost-gcc/Makefile Message-ID: Revision: 17302 http://gar.svn.sourceforge.net/gar/?rev=17302&view=rev Author: wahwah Date: 2012-03-05 09:32:58 +0000 (Mon, 05 Mar 2012) Log Message: ----------- boost/branches/boost-gcc: Fix a typo. Modified Paths: -------------- csw/mgar/pkg/boost/branches/boost-gcc/Makefile Modified: csw/mgar/pkg/boost/branches/boost-gcc/Makefile =================================================================== --- csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-03-05 09:15:04 UTC (rev 17301) +++ csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-03-05 09:32:58 UTC (rev 17302) @@ -29,7 +29,7 @@ # ISA_DEFAULT_sparc-5.10 = sparcv8plus # It takes an awful lot of time. -NOTGITPATCH = 1 +NOGITPATCH = 1 PATCHFILES += 0001-Don-t-try-to-use-fchmodat.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 5 15:39:58 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 05 Mar 2012 14:39:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[17303] csw/mgar/pkg/boost/branches/boost-gcc/Makefile Message-ID: Revision: 17303 http://gar.svn.sourceforge.net/gar/?rev=17303&view=rev Author: wahwah Date: 2012-03-05 14:39:58 +0000 (Mon, 05 Mar 2012) Log Message: ----------- boost/branches/boost-gcc: build 32-bits too Modified Paths: -------------- csw/mgar/pkg/boost/branches/boost-gcc/Makefile Modified: csw/mgar/pkg/boost/branches/boost-gcc/Makefile =================================================================== --- csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-03-05 09:32:58 UTC (rev 17302) +++ csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-03-05 14:39:58 UTC (rev 17303) @@ -3,8 +3,7 @@ NAME = boost VERSION = 1.49.0 CATEGORIES = lib -# GARTYPE = v2 -GARTYPE = v2-build64only +GARTYPE = v2 define BLURB Boost was begun by members of the C++ standards committee Library Working @@ -64,7 +63,7 @@ EXTRA_FLAGS = -std=c99 EXTRA_LINKER_FLAGS = -R/opt/csw/lib/\\\$$ISALIST -BUILD64_ONLY = 1 +BUILD64 = 1 BUILD_ARGS += toolset=$(TOOLSET) BUILD_ARGS += --prefix=$(DESTDIR)$(prefix) @@ -79,10 +78,14 @@ BUILD_ARGS += -d+2 BUILD_ARGS += include='/opt/csw/gcc/include' BUILD_ARGS += --debug-building -BUILD_ARGS += address-model=64 +BUILD_ARGS += address-model=$(MEMORYMODEL) # We don't have 64-bit Python BUILD_ARGS += --without-python +BUILD_ARGS_sparcv8plus = instruction-set=v9 +BUILD_ARGS_sparcv9 = instruction-set=v9 +BUILD_ARGS += $(BUILD_ARGS_$(ISA)) + TEST_SCRIPTS = JAMDIR_sparc = solarissparc 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 Mar 5 16:29:20 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 05 Mar 2012 15:29:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17304] csw/mgar/pkg/boost/branches/boost-gcc/Makefile Message-ID: Revision: 17304 http://gar.svn.sourceforge.net/gar/?rev=17304&view=rev Author: wahwah Date: 2012-03-05 15:29:20 +0000 (Mon, 05 Mar 2012) Log Message: ----------- Don't build the 'boost_gcc' package, because it's empty. Also, add an override. Modified Paths: -------------- csw/mgar/pkg/boost/branches/boost-gcc/Makefile Modified: csw/mgar/pkg/boost/branches/boost-gcc/Makefile =================================================================== --- csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-03-05 14:39:58 UTC (rev 17303) +++ csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-03-05 15:29:20 UTC (rev 17304) @@ -43,12 +43,6 @@ COMPILER_SUFFIX_PKG = -gcc COMPILER_SUFFIX_CAT = _gcc -PACKAGES += CSWboost$(COMPILER_SUFFIX_PKG) -CATALOGNAME_CSWboost$(COMPILER_SUFFIX_PKG) += boost$(COMPILER_SUFFIX_CAT) -SPKG_DESC_CSWboost$(COMPILER_SUFFIX_PKG) = $(DESCRIPTION) -# The boost build system is hard to harness. -CHECKPKG_OVERRIDES_CSWboost$(COMPILER_SUFFIX_PKG) += bad-rpath-entry - PACKAGES += CSWboost$(COMPILER_SUFFIX_PKG)-dev SPKG_DESC_CSWboost$(COMPILER_SUFFIX_PKG)-dev = $(DESCRIPTION), development files PKGFILES_CSWboost$(COMPILER_SUFFIX_PKG)-dev = $(PKGFILES_DEVEL) @@ -315,6 +309,8 @@ CHECKPKG_OVERRIDES_CSWlibboost-prexmon1-49-0-gxx += shared-lib-pkgname-mismatch CHECKPKG_OVERRIDES_CSWlibboost-ws13n1-49-0-gxx += shared-lib-pkgname-mismatch +CHECKPKG_OVERRIDES_CSWboost-gcc-dev += file-with-bad-content|/usr/share|root/opt/csw/gxx/include/boost/locale/generator.hpp + include gar/category.mk PYTHON_ROOT = $(prefix) 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 Mar 5 16:34:26 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 05 Mar 2012 15:34:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[17305] csw/mgar/pkg/lang-python/pygtk/trunk/Makefile Message-ID: Revision: 17305 http://gar.svn.sourceforge.net/gar/?rev=17305&view=rev Author: cgrzemba Date: 2012-03-05 15:34:26 +0000 (Mon, 05 Mar 2012) Log Message: ----------- lang-python/pygtk/trunk: update build dependencies Modified Paths: -------------- csw/mgar/pkg/lang-python/pygtk/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pygtk/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygtk/trunk/Makefile 2012-03-05 15:29:20 UTC (rev 17304) +++ csw/mgar/pkg/lang-python/pygtk/trunk/Makefile 2012-03-05 15:34:26 UTC (rev 17305) @@ -14,7 +14,7 @@ STRIP_LIBTOOL = 1 PACKAGES = CSWpy-gtk -BUILD_DEP_PKGS = CSWpkgconfig CSWpy-gobject CSWglib2devel CSWlibatkdevel CSWpangodevel CSWpy-cairo CSWlibcairodevel CSWlibxcbdevel +BUILD_DEP_PKGS = CSWpkgconfig CSWpygobject CSWlibglib2-dev CSWlibatk-dev CSWpangodevel CSWpycairo CSWlibcairo-dev CSWlibxcbdevel RUNTIME_DEP_PKGS_CSWpy-gtk = CSWpython CSWfconfig CSWftype2 CSWggettextrt RUNTIME_DEP_PKGS_CSWpy-gtk += CSWglib2 CSWgtk2 CSWlibatk CSWlibcairo RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibglade2 CSWlibxml2 CSWpango @@ -27,8 +27,8 @@ SPKG_CLASSES = none cswpycompile RUNTIME_DEP_PKGS += CSWcswclassutils -PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig -EXTRA_EXPORTS = PKG_CONFIG_PATH +# PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig +# EXTRA_EXPORTS = PKG_CONFIG_PATH CONFIGURE_ARGS = $(DIRPATHS) 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 Mar 5 23:55:17 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 05 Mar 2012 22:55:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17306] csw/mgar/pkg/lang-python/sqlobject/trunk Message-ID: Revision: 17306 http://gar.svn.sourceforge.net/gar/?rev=17306&view=rev Author: wahwah Date: 2012-03-05 22:55:17 +0000 (Mon, 05 Mar 2012) Log Message: ----------- lang-python/sqlobject/trunk: version bump to 1.2.2 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-03-05 15:34:26 UTC (rev 17305) +++ csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile 2012-03-05 22:55:17 UTC (rev 17306) @@ -3,7 +3,7 @@ # $Id$ NAME = SQLObject -VERSION = 0.15.0 +VERSION = 1.2.2 CATEGORIES = python GARTYPE = v2 DESCRIPTION = Object Relational Manager for Python @@ -12,7 +12,6 @@ SPKG_SOURCEURL = http://www.sqlobject.org/ MASTER_SITES = http://pypi.python.org/packages/source/S/$(NAME)/ DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz LICENSE = docs/SQLObject.txt PACKAGES = CSWpy-sqlobject RUNTIME_DEP_PKGS_CSWpy-sqlobject = CSWpy-formencode Modified: csw/mgar/pkg/lang-python/sqlobject/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/sqlobject/trunk/checksums 2012-03-05 15:34:26 UTC (rev 17305) +++ csw/mgar/pkg/lang-python/sqlobject/trunk/checksums 2012-03-05 22:55:17 UTC (rev 17306) @@ -1 +1 @@ -8c2babd0384840c8e3aadb753c105bbf SQLObject-0.15.0.tar.gz +732498925cfc211bb7b277f53901ca48 SQLObject-1.2.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 5 23:56:07 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 05 Mar 2012 22:56:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[17307] csw/mgar/pkg/lang-python/sqlobject/trunk/checksums Message-ID: Revision: 17307 http://gar.svn.sourceforge.net/gar/?rev=17307&view=rev Author: wahwah Date: 2012-03-05 22:56:07 +0000 (Mon, 05 Mar 2012) Log Message: ----------- lang-python/sqlobject/trunk: version bump to 1.2.2 (checksum) Modified Paths: -------------- csw/mgar/pkg/lang-python/sqlobject/trunk/checksums Modified: csw/mgar/pkg/lang-python/sqlobject/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/sqlobject/trunk/checksums 2012-03-05 22:55:17 UTC (rev 17306) +++ csw/mgar/pkg/lang-python/sqlobject/trunk/checksums 2012-03-05 22:56:07 UTC (rev 17307) @@ -1 +1 @@ -732498925cfc211bb7b277f53901ca48 SQLObject-1.2.0.tar.gz +b2f4e52112e54233a85c075e8af3c62d SQLObject-1.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 Tue Mar 6 10:13:06 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 06 Mar 2012 09:13:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17308] csw/mgar/pkg/scons/trunk Message-ID: Revision: 17308 http://gar.svn.sourceforge.net/gar/?rev=17308&view=rev Author: wahwah Date: 2012-03-06 09:13:05 +0000 (Tue, 06 Mar 2012) Log Message: ----------- scons/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/scons/trunk/Makefile csw/mgar/pkg/scons/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/scons/trunk/Makefile Modified: csw/mgar/pkg/scons/trunk/Makefile =================================================================== --- csw/mgar/pkg/scons/trunk/Makefile 2012-03-05 22:56:07 UTC (rev 17307) +++ csw/mgar/pkg/scons/trunk/Makefile 2012-03-06 09:13:05 UTC (rev 17308) @@ -1,5 +1,7 @@ +# $Id$ + NAME = scons -VERSION = 2.0.1 +VERSION = 2.1.0 CATEGORIES = python GARTYPE = v2 @@ -15,12 +17,13 @@ SF_PROJ = scons MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz SPKG_SOURCEURL = http://www.scons.org/ LICENSE = LICENSE.txt CONFIGURE_SCRIPTS = TEST_SCRIPTS = EXTRA_PAX_ARGS = -s ",\./opt/csw/man,./opt/csw/share/man," ARCHALL = 1 +PACKAGES = CSWscons EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/$(NAME)-$(VERSION)/SCons/.*\.py[co] +CHECKPKG_OVERRIDES_CSWscons += file-with-bad-content include gar/category.mk Property changes on: csw/mgar/pkg/scons/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/scons/trunk/checksums =================================================================== --- csw/mgar/pkg/scons/trunk/checksums 2012-03-05 22:56:07 UTC (rev 17307) +++ csw/mgar/pkg/scons/trunk/checksums 2012-03-06 09:13:05 UTC (rev 17308) @@ -1 +1 @@ -beca648b894cdbf85383fffc79516d18 scons-2.0.1.tar.gz +47daf989e303a045b76c11236df719df scons-2.1.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Mar 6 11:09:23 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 06 Mar 2012 10:09:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17309] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 17309 http://gar.svn.sourceforge.net/gar/?rev=17309&view=rev Author: dmichelsen Date: 2012-03-06 10:09:23 +0000 (Tue, 06 Mar 2012) Log Message: ----------- mGAR v2: Allow direct license in the Makefile with LICENSE_TEXT and LICENSE_TEXT_ 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-03-06 09:13:05 UTC (rev 17308) +++ csw/mgar/gar/v2/gar.pkg.mk 2012-03-06 10:09:23 UTC (rev 17309) @@ -714,15 +714,21 @@ $(if $(and $(filter $*,$(_PKG_SPECS)),$(or $(LICENSE),$(LICENSE_FULL),$(LICENSE_$*),$(LICENSE_FULL_$*))), \ LICENSEFILE=$(or $(call licensefile,$*),$(if $(_LICENSE_IS_DEFAULT),,$(error Cannot find license file for package $*))); \ LICENSEDIR=$(call licensedir,$*); \ - if [ -n "$$LICENSEFILE" ]; then \ - $(if $(or $(LICENSE_FULL),$(LICENSE_FULL_$*)), \ - if [ -f "$$LICENSEFILE" ]; then cp $$LICENSEFILE $(WORKDIR)/$*.copyright; fi;, \ - echo "Please see $$LICENSEDIR/license for license information." > $(WORKDIR)/$*.copyright; \ + $(if $(LICENSE_TEXT_$*)$(LICENSE_TEXT),\ + umask 022 && mkdir -p $(PKGROOT)$$LICENSEDIR && \ + echo "$(or $(LICENSE_TEXT_$*),$(LICENSE_TEXT))" > $(PKGROOT)$$LICENSEDIR/license;\ + echo "$(or $(LICENSE_TEXT_$*),$(LICENSE_TEXT))" > $(WORKDIR)/$*.copyright;\ + ,\ + if [ -n "$$LICENSEFILE" ]; then \ + $(if $(or $(LICENSE_FULL),$(LICENSE_FULL_$*)), \ + if [ -f "$$LICENSEFILE" ]; then cp $$LICENSEFILE $(WORKDIR)/$*.copyright; fi;, \ + echo "Please see $$LICENSEDIR/license for license information." > $(WORKDIR)/$*.copyright; \ + ) \ + umask 022 && mkdir -p $(PKGROOT)$$LICENSEDIR && \ + rm -f $(PKGROOT)$$LICENSEDIR/license && \ + cp $$LICENSEFILE $(PKGROOT)$$LICENSEDIR/license; \ + fi \ ) \ - umask 022 && mkdir -p $(PKGROOT)$$LICENSEDIR && \ - rm -f $(PKGROOT)$$LICENSEDIR/license && \ - cp $$LICENSEFILE $(PKGROOT)$$LICENSEDIR/license; \ - fi \ ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Mar 6 11:26:59 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 06 Mar 2012 10:26:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17310] csw/mgar/pkg/cpan/Tie-DBI/trunk Message-ID: Revision: 17310 http://gar.svn.sourceforge.net/gar/?rev=17310&view=rev Author: dmichelsen Date: 2012-03-06 10:26:59 +0000 (Tue, 06 Mar 2012) Log Message: ----------- cpan/Tie-DBI/trunk: Update to 1.05, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Tie-DBI/trunk/Makefile csw/mgar/pkg/cpan/Tie-DBI/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Tie-DBI/trunk/files/CSWpmtiedbi.gspec Modified: csw/mgar/pkg/cpan/Tie-DBI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Tie-DBI/trunk/Makefile 2012-03-06 10:09:23 UTC (rev 17309) +++ csw/mgar/pkg/cpan/Tie-DBI/trunk/Makefile 2012-03-06 10:26:59 UTC (rev 17310) @@ -1,18 +1,24 @@ NAME = Tie-DBI -VERSION = 1.02 +VERSION = 1.05 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = LDS +AUTHOR = TODDR -DESCRIPTION = tie hashes to DBI relational databases +DESCRIPTION = Tie hashes to DBI relational databases define BLURB - This module allows you to tie Perl associative arrays (hashes) to SQL - databases using the DBI interface. The tied hash is associated with a table - in a local or networked database. One column becomes the hash key. Each row - of the table becomes an associative array, from which individual fields can - be set or retrieved. endef -DISTFILES += CSWpmtiedbi.gspec +CATALOG_RELEASE = unstable +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ + +BUILD_DEP_PKGS += CSWpm-dbd-sqlite + +PACKAGES += CSWpm-tie-dbi +CATALOGNAME_CSWpm-tie-dbi = pm_tie_dbi +SPKG_DESC_CSWpm-tie-dbi = Tie hashes to DBI relational databases +ARCHALL_CSWpm-tie-dbi = 1 +RUNTIME_DEP_PKGS_CSWpm-tie-dbi += CSWpm-dbi +RUNTIME_DEP_PKGS_CSWpm-tie-dbi += CSWpm-dbd-sqlite + include gar/category.mk Modified: csw/mgar/pkg/cpan/Tie-DBI/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Tie-DBI/trunk/checksums 2012-03-06 10:09:23 UTC (rev 17309) +++ csw/mgar/pkg/cpan/Tie-DBI/trunk/checksums 2012-03-06 10:26:59 UTC (rev 17310) @@ -1,2 +1 @@ -664bb83574874ddf1f38eeb460b46aba download/CSWpmtiedbi.gspec -e2a8b9ea4e34d048e8811a55844131eb download/Tie-DBI-1.02.tar.gz +8bef1b1e4db79d1dcc871e87fbc68536 Tie-DBI-1.05.tar.gz Deleted: csw/mgar/pkg/cpan/Tie-DBI/trunk/files/CSWpmtiedbi.gspec =================================================================== --- csw/mgar/pkg/cpan/Tie-DBI/trunk/files/CSWpmtiedbi.gspec 2012-03-06 10:09:23 UTC (rev 17309) +++ csw/mgar/pkg/cpan/Tie-DBI/trunk/files/CSWpmtiedbi.gspec 2012-03-06 10:26:59 UTC (rev 17310) @@ -1,9 +0,0 @@ -%var bitname pm_tiedbi -%var pkgname CSWpmtiedbi -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1998, Lincoln D. Stein - -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 dmichelsen at users.sourceforge.net Tue Mar 6 11:32:26 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 06 Mar 2012 10:32:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[17311] csw/mgar/pkg/cpan Message-ID: Revision: 17311 http://gar.svn.sourceforge.net/gar/?rev=17311&view=rev Author: dmichelsen Date: 2012-03-06 10:32:26 +0000 (Tue, 06 Mar 2012) Log Message: ----------- cpan/Tie-Hash-DBD/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Tie-Hash-DBD/ csw/mgar/pkg/cpan/Tie-Hash-DBD/branches/ csw/mgar/pkg/cpan/Tie-Hash-DBD/tags/ csw/mgar/pkg/cpan/Tie-Hash-DBD/trunk/ csw/mgar/pkg/cpan/Tie-Hash-DBD/trunk/Makefile csw/mgar/pkg/cpan/Tie-Hash-DBD/trunk/checksums csw/mgar/pkg/cpan/Tie-Hash-DBD/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Tie-Hash-DBD/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Tie-Hash-DBD/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Tie-Hash-DBD/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Tie-Hash-DBD/trunk/Makefile 2012-03-06 10:32:26 UTC (rev 17311) @@ -0,0 +1,23 @@ +NAME = Tie-Hash-DBD +VERSION = 0.10 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = HMBRAND + +DESCRIPTION = Tie plain hashes to DBI interface +define BLURB +endef + +MODDIST = Tie-Hash-DBD-0.10.tgz + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ + +PACKAGES += CSWpm-tie-hash-dbd +CATALOGNAME_CSWpm-tie-hash-dbd = pm_tie_hash_dbd +SPKG_DESC_CSWpm-tie-hash-dbd = Tie plain hashes to DBI interface +ARCHALL_CSWpm-tie-hash-dbd = 1 +RUNTIME_DEP_PKGS_CSWpm-tie-hash-dbd += CSWpm-dbi + +include gar/category.mk Added: csw/mgar/pkg/cpan/Tie-Hash-DBD/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Tie-Hash-DBD/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Tie-Hash-DBD/trunk/checksums 2012-03-06 10:32:26 UTC (rev 17311) @@ -0,0 +1 @@ +a2bb4c5c8c3c7afb06cb1a81aa40a45d Tie-Hash-DBD-0.10.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Mar 6 16:07:22 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 06 Mar 2012 15:07:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[17312] csw/mgar/pkg/cpan/makemake Message-ID: Revision: 17312 http://gar.svn.sourceforge.net/gar/?rev=17312&view=rev Author: dmichelsen Date: 2012-03-06 15:07:21 +0000 (Tue, 06 Mar 2012) Log Message: ----------- cpan/makemake: Enhance license detection and check installed package Modified Paths: -------------- csw/mgar/pkg/cpan/makemake Modified: csw/mgar/pkg/cpan/makemake =================================================================== --- csw/mgar/pkg/cpan/makemake 2012-03-06 10:32:26 UTC (rev 17311) +++ csw/mgar/pkg/cpan/makemake 2012-03-06 15:07:21 UTC (rev 17312) @@ -97,18 +97,26 @@ #$mod->distribution->make; my $distdir = $mod->distribution->dir; -my ( @build_dep_pkgs, @runtime_dep_pkgs ); +my ( @build_dep_pkgs, @recommended_pkgs, @runtime_dep_pkgs ); +my $license; +my $license_resource; my $description; if ( -f "$distdir/META.yml" ) { my $meta = LoadFile("$distdir/META.yml"); - $description = $meta->{abstract} if ( exists $meta->{abstract} ); + + $description = $meta->{abstract} if ( exists $meta->{abstract} ); + $license = $meta->{license}; + $license_resource = $meta->{resources}->{license}; + my $req = $meta->{requires}; - my $recommends = $meta->{recommends}; + # my $recommends = $meta->{recommends}; my $build_requires = $meta->{build_requires}; @build_dep_pkgs = dep_pkgs($build_requires); + # @recommended_pkgs = dep_pkgs($recommends); @runtime_dep_pkgs = dep_pkgs($req); + } $description //= $mod->description; # Changed to defined from false or @@ -153,12 +161,19 @@ say {$mf_fh} "CATALOG_RELEASE = unstable"; say {$mf_fh} ""; +my $license_found; foreach my $file (qw(LICENSE LICENSE.LGPL COPYING Copying COPYRIGHT Artistic ARTISTIC GPL)) { if ( -f "$distdir/$file" ) { say {$mf_fh} "LICENSE = $file\n"; + $license_found = 1; last; } } +unless( $license_found ) { + print {$mf_fh} "LICENSE_TEXT = This module is licensed under the $license license"; + print {$mf_fh} ", please see for details $license_resource" if( defined $license_resource ); + print {$mf_fh} "\n\n"; +} if (@build_dep_pkgs) { foreach my $p (@build_dep_pkgs) { @@ -210,6 +225,7 @@ close($mf_fh) or warn($!); chdir("$name/trunk") or die($!); +system('mgar', 'spotless') == 0 or die($!); system('mgar', 'makesum') == 0 or die($!); system('mgar', 'package') == 0 or die($!); @@ -224,7 +240,7 @@ my $version = version->parse( $req->{$modname} ); if ( $modname eq "perl" ) { if ( version->parse($^V) < $version ) { - die "requires perl version $version"; + die "requires perl version $version, this is " . version->parse($^V); } next; } @@ -256,6 +272,20 @@ print STDERR "ERROR: Found package name '$pkg' is not consistent to the " . "canonical '$guessedpkg', please invoke makemake $modname\n"; } + + system( '/usr/bin/pkginfo', '-q', $pkg ); + + if ($? == -1) { + print "failed to execute: $!\n"; + } elsif ($? & 127) { + printf "child died with signal %d, %s coredump\n", + ($? & 127), ($? & 128) ? 'with' : 'without'; + } else { + my $ev = $? >> 8; + if( $ev ne 0 ) { + say STDERR "ERROR: The needed package $pkg is not installed"; + } + } } else { print STDERR "MISSING package for '$modname'\n"; 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 Mar 6 16:25:01 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 06 Mar 2012 15:25:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[17313] csw/mgar/pkg/gobject-introspection/trunk Message-ID: Revision: 17313 http://gar.svn.sourceforge.net/gar/?rev=17313&view=rev Author: cgrzemba Date: 2012-03-06 15:25:00 +0000 (Tue, 06 Mar 2012) Log Message: ----------- gobject-introspection/trunk: skip test target Modified Paths: -------------- csw/mgar/pkg/gobject-introspection/trunk/Makefile csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-04-big-ending.diff Added Paths: ----------- csw/mgar/pkg/gobject-introspection/trunk/files/0001-add-csw-include-path-to-common.mk.patch Modified: csw/mgar/pkg/gobject-introspection/trunk/Makefile =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/Makefile 2012-03-06 15:07:21 UTC (rev 17312) +++ csw/mgar/pkg/gobject-introspection/trunk/Makefile 2012-03-06 15:25:00 UTC (rev 17313) @@ -17,12 +17,94 @@ VENDOR_URL = http://live.gnome.org/GObjectIntrospection -PACKAGING_PLATFORMS = solaris10-sparc soalris10-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +# the warn tests fail, because it reports more warnings than expected +SKIPTEST ?= 1 BUILD_DEP_PKGS += CSWbison BUILD_DEP_PKGS += CSWlibffi-dev BUILD_DEP_PKGS += CSWgtk-doc +PACKAGES += CSWlibgirepository1-0-1 +CATALOGNAME_CSWlibgirepository1-0-1 = libgirepository1_0_1 +PKGFILES_CSWlibgirepository1-0-1 += $(call baseisadirs,$(libdir),libgirepository-1\.0\.so\.1\.0\.0) +PKGFILES_CSWlibgirepository1-0-1 += $(call baseisadirs,$(libdir),libgirepository-1\.0\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibgirepository1-0-1 += $(DESCRIPTION), libgirepository-1.0.so.1 +RUNTIME_DEP_PKGS_CSWlibgirepository1-0-1 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgirepository1-0-1 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgirepository1-0-1 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgirepository1-0-1 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgirepository1-0-1 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgirepository1-0-1 += CSWlibffi4 +RUNTIME_DEP_PKGS_CSWlibgirepository1-0-1 += CSWlibglib2-0-0 + +PACKAGES += CSWgobject-introspection-dev +CATALOGNAME_CSWgobject-introspection-dev = gobject_introspection_dev +SPKG_DESC_CSWgobject-introspection-dev += $(DESCRIPTION), development files +PKGFILES_CSWgobject-introspection-dev += /opt/csw/lib/libgirepository-1.0.so +RUNTIME_DEP_PKGS_CSWgobject-introspection-dev += CSWlibgirepository1-0-1 + +RUNTIME_DEP_PKGS_CSWgobject-introspection += CSWlibgirepository1-0-1 +RUNTIME_DEP_PKGS_CSWgobject-introspection += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgobject-introspection += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgobject-introspection += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgobject-introspection += CSWpython +RUNTIME_DEP_PKGS_CSWgobject-introspection += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgobject-introspection += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgobject-introspection += CSWlibffi4 +RUNTIME_DEP_PKGS_CSWgobject-introspection += CSWlibglib2-0-0 + +CHECKPKG_OVERRIDES_CSWgobject-introspection += file-with-bad-content|/usr/share|root/opt/csw/share/gir-1.0/Gio-2.0.gir +CHECKPKG_OVERRIDES_CSWgobject-introspection += file-with-bad-content|/usr/share|root/opt/csw/lib/gobject-introspection/giscanner/transformer.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += file-with-bad-content|/usr/share|root/opt/csw/lib/gobject-introspection/giscanner/transformer.py +CHECKPKG_OVERRIDES_CSWgobject-introspection += file-with-bad-content|/usr/share|root/opt/csw/lib/gobject-introspection/giscanner/transformer.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/__init__.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/__init__.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationmain.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationmain.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationparser.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationparser.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/ast.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/ast.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/cachestore.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/cachestore.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/codegen.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/codegen.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/config.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/config.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/dumper.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/dumper.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/gdumpparser.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/gdumpparser.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girparser.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girparser.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girwriter.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girwriter.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/introspectablepass.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/introspectablepass.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/libtoolimporter.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/libtoolimporter.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/maintransformer.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/maintransformer.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/message.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/message.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/odict.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/odict.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/scannermain.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/scannermain.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/shlibs.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/shlibs.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/sourcescanner.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/sourcescanner.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/testcodegen.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/testcodegen.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/transformer.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/transformer.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/utils.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/utils.pyo +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/xmlwriter.pyc +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/xmlwriter.pyo + # PACKAGES = CSWgobjintrospect # CATALOGNAME_CSWgobjintrospect = gobj_introspect # SPKG_DESC_CSWgobjintrospect = $(DESCRIPTION) Added: csw/mgar/pkg/gobject-introspection/trunk/files/0001-add-csw-include-path-to-common.mk.patch =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/files/0001-add-csw-include-path-to-common.mk.patch (rev 0) +++ csw/mgar/pkg/gobject-introspection/trunk/files/0001-add-csw-include-path-to-common.mk.patch 2012-03-06 15:25:00 UTC (rev 17313) @@ -0,0 +1,24 @@ +From 97a2692cce15dc08ba1fc0d6ce99526338c697b0 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Tue, 6 Mar 2012 13:37:40 +0100 +Subject: [PATCH] add csw include path to common.mk + +--- + common.mk | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/common.mk b/common.mk +index 40aff8a..24a6e3a 100644 +--- a/common.mk ++++ b/common.mk +@@ -15,6 +15,7 @@ INTROSPECTION_SCANNER = \ + INTROSPECTION_SCANNER_ARGS = \ + --verbose \ + -I$(top_srcdir) \ ++ -I$(includedir) \ + --add-include-path=$(srcdir) \ + --add-include-path=$(top_srcdir)/gir \ + --add-include-path=$(builddir) \ +-- +1.7.9 + Modified: csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-04-big-ending.diff =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-04-big-ending.diff 2012-03-06 15:07:21 UTC (rev 17312) +++ csw/mgar/pkg/gobject-introspection/trunk/files/gobject-introspection-04-big-ending.diff 2012-03-06 15:25:00 UTC (rev 17313) @@ -1,5 +1,3 @@ -diff --git a/girepository/ginfo.c b/girepository/ginfo.c -index b11cc8f..f099ee6 100644 --- a/girepository/ginfo.c +++ b/girepository/ginfo.c @@ -997,18 +997,38 @@ GIBaseInfo * 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 Mar 6 16:51:37 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 06 Mar 2012 15:51:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17314] csw/mgar/pkg/gobject-introspection/trunk/Makefile Message-ID: Revision: 17314 http://gar.svn.sourceforge.net/gar/?rev=17314&view=rev Author: cgrzemba Date: 2012-03-06 15:51:37 +0000 (Tue, 06 Mar 2012) Log Message: ----------- gobject-introspection/trunk: add main pkg to build recipe Modified Paths: -------------- csw/mgar/pkg/gobject-introspection/trunk/Makefile Modified: csw/mgar/pkg/gobject-introspection/trunk/Makefile =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/Makefile 2012-03-06 15:25:00 UTC (rev 17313) +++ csw/mgar/pkg/gobject-introspection/trunk/Makefile 2012-03-06 15:51:37 UTC (rev 17314) @@ -44,6 +44,8 @@ PKGFILES_CSWgobject-introspection-dev += /opt/csw/lib/libgirepository-1.0.so RUNTIME_DEP_PKGS_CSWgobject-introspection-dev += CSWlibgirepository1-0-1 +PACKAGES += CSWgobject-introspection +SPKG_DESC_CSWgobject-introspection += $(DESCRIPTION), bins RUNTIME_DEP_PKGS_CSWgobject-introspection += CSWlibgirepository1-0-1 RUNTIME_DEP_PKGS_CSWgobject-introspection += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWgobject-introspection += CSWlibgmodule2-0-0 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 Mar 6 17:02:30 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 06 Mar 2012 16:02:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[17315] csw/mgar/pkg/gobject-introspection/trunk/Makefile Message-ID: Revision: 17315 http://gar.svn.sourceforge.net/gar/?rev=17315&view=rev Author: cgrzemba Date: 2012-03-06 16:02:30 +0000 (Tue, 06 Mar 2012) Log Message: ----------- gobject-introspection/trunk: remove pyc- and pyo-obejcts from package Modified Paths: -------------- csw/mgar/pkg/gobject-introspection/trunk/Makefile Modified: csw/mgar/pkg/gobject-introspection/trunk/Makefile =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/Makefile 2012-03-06 15:51:37 UTC (rev 17314) +++ csw/mgar/pkg/gobject-introspection/trunk/Makefile 2012-03-06 16:02:30 UTC (rev 17315) @@ -60,52 +60,52 @@ CHECKPKG_OVERRIDES_CSWgobject-introspection += file-with-bad-content|/usr/share|root/opt/csw/lib/gobject-introspection/giscanner/transformer.pyc CHECKPKG_OVERRIDES_CSWgobject-introspection += file-with-bad-content|/usr/share|root/opt/csw/lib/gobject-introspection/giscanner/transformer.py CHECKPKG_OVERRIDES_CSWgobject-introspection += file-with-bad-content|/usr/share|root/opt/csw/lib/gobject-introspection/giscanner/transformer.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/__init__.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/__init__.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationmain.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationmain.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationparser.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationparser.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/ast.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/ast.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/cachestore.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/cachestore.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/codegen.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/codegen.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/config.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/config.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/dumper.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/dumper.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/gdumpparser.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/gdumpparser.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girparser.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girparser.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girwriter.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girwriter.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/introspectablepass.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/introspectablepass.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/libtoolimporter.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/libtoolimporter.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/maintransformer.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/maintransformer.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/message.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/message.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/odict.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/odict.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/scannermain.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/scannermain.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/shlibs.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/shlibs.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/sourcescanner.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/sourcescanner.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/testcodegen.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/testcodegen.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/transformer.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/transformer.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/utils.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/utils.pyo -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/xmlwriter.pyc -CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/xmlwriter.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/__init__.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/__init__.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationmain.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationmain.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationparser.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationparser.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/ast.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/ast.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/cachestore.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/cachestore.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/codegen.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/codegen.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/config.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/config.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/dumper.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/dumper.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/gdumpparser.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/gdumpparser.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girparser.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girparser.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girwriter.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girwriter.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/introspectablepass.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/introspectablepass.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/libtoolimporter.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/libtoolimporter.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/maintransformer.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/maintransformer.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/message.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/message.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/odict.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/odict.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/scannermain.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/scannermain.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/shlibs.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/shlibs.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/sourcescanner.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/sourcescanner.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/testcodegen.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/testcodegen.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/transformer.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/transformer.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/utils.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/utils.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/xmlwriter.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/xmlwriter.pyo # PACKAGES = CSWgobjintrospect # CATALOGNAME_CSWgobjintrospect = gobj_introspect @@ -125,6 +125,7 @@ #BUILD64 = 1 PYCOMPILE = 1 +EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc BUILD_OVERRIDE_VARS = V BUILD_OVERRIDE_VARS_V = 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 Mar 6 17:05:01 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 06 Mar 2012 16:05:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[17316] csw/mgar/pkg/gobject-introspection/trunk/Makefile Message-ID: Revision: 17316 http://gar.svn.sourceforge.net/gar/?rev=17316&view=rev Author: cgrzemba Date: 2012-03-06 16:05:00 +0000 (Tue, 06 Mar 2012) Log Message: ----------- gobject-introspection/trunk: remove checkpkg override Modified Paths: -------------- csw/mgar/pkg/gobject-introspection/trunk/Makefile Modified: csw/mgar/pkg/gobject-introspection/trunk/Makefile =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/Makefile 2012-03-06 16:02:30 UTC (rev 17315) +++ csw/mgar/pkg/gobject-introspection/trunk/Makefile 2012-03-06 16:05:00 UTC (rev 17316) @@ -57,9 +57,9 @@ RUNTIME_DEP_PKGS_CSWgobject-introspection += CSWlibglib2-0-0 CHECKPKG_OVERRIDES_CSWgobject-introspection += file-with-bad-content|/usr/share|root/opt/csw/share/gir-1.0/Gio-2.0.gir -CHECKPKG_OVERRIDES_CSWgobject-introspection += file-with-bad-content|/usr/share|root/opt/csw/lib/gobject-introspection/giscanner/transformer.pyc +# CHECKPKG_OVERRIDES_CSWgobject-introspection += file-with-bad-content|/usr/share|root/opt/csw/lib/gobject-introspection/giscanner/transformer.pyc CHECKPKG_OVERRIDES_CSWgobject-introspection += file-with-bad-content|/usr/share|root/opt/csw/lib/gobject-introspection/giscanner/transformer.py -CHECKPKG_OVERRIDES_CSWgobject-introspection += file-with-bad-content|/usr/share|root/opt/csw/lib/gobject-introspection/giscanner/transformer.pyo +# CHECKPKG_OVERRIDES_CSWgobject-introspection += file-with-bad-content|/usr/share|root/opt/csw/lib/gobject-introspection/giscanner/transformer.pyo # CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/__init__.pyc # CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/__init__.pyo # CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationmain.pyc 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 Mar 7 01:01:12 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 07 Mar 2012 00:01:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17317] csw/mgar/pkg/boost/branches/boost-gcc/Makefile Message-ID: Revision: 17317 http://gar.svn.sourceforge.net/gar/?rev=17317&view=rev Author: wahwah Date: 2012-03-07 00:01:12 +0000 (Wed, 07 Mar 2012) Log Message: ----------- boost/branches/boost-gcc: A note about 5.9 Modified Paths: -------------- csw/mgar/pkg/boost/branches/boost-gcc/Makefile Modified: csw/mgar/pkg/boost/branches/boost-gcc/Makefile =================================================================== --- csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-03-06 16:05:00 UTC (rev 17316) +++ csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-03-07 00:01:12 UTC (rev 17317) @@ -25,8 +25,10 @@ DISTFILES = $(DISTNAME).tar.bz2 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -# ISA_DEFAULT_sparc-5.10 = sparcv8plus +# If we wanted to build on 5.9, we'll need to build for sparcv8plus +ISA_DEFAULT_sparc-5.9 = sparcv8plus + # It takes an awful lot of time. NOGITPATCH = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 7 01:30:42 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 07 Mar 2012 00:30:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[17318] csw/mgar/pkg/autoconf/trunk/Makefile Message-ID: Revision: 17318 http://gar.svn.sourceforge.net/gar/?rev=17318&view=rev Author: wahwah Date: 2012-03-07 00:30:42 +0000 (Wed, 07 Mar 2012) Log Message: ----------- autoconf/trunk: removing ufiles regex Modified Paths: -------------- csw/mgar/pkg/autoconf/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/autoconf/trunk/Makefile Modified: csw/mgar/pkg/autoconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/autoconf/trunk/Makefile 2012-03-07 00:01:12 UTC (rev 17317) +++ csw/mgar/pkg/autoconf/trunk/Makefile 2012-03-07 00:30:42 UTC (rev 17318) @@ -1,3 +1,5 @@ +# $Id$ + NAME = autoconf VERSION = 2.68 CATEGORIES = devel @@ -14,8 +16,6 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - PATCHFILES = 0001-Prefer-CSW-tools.patch BUILD_DEP_PKGS = CSWhelp2man Property changes on: csw/mgar/pkg/autoconf/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 7 01:32:40 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 07 Mar 2012 00:32:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[17319] csw/mgar/pkg/autoconf/branches/autoconf-2.13/ Message-ID: Revision: 17319 http://gar.svn.sourceforge.net/gar/?rev=17319&view=rev Author: wahwah Date: 2012-03-07 00:32:39 +0000 (Wed, 07 Mar 2012) Log Message: ----------- autoconf: Branching to build 2.13 It's stupid, but: https://developer.mozilla.org/en/SpiderMonkey/Build_Documentation#Building_SpiderMonkey_tip "Note that autoconf version 2.13 is required. No later version will work." wat. Added Paths: ----------- csw/mgar/pkg/autoconf/branches/autoconf-2.13/ 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 Mar 7 01:50:47 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 07 Mar 2012 00:50:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[17320] csw/mgar/pkg/autoconf/branches/autoconf-2.13 Message-ID: Revision: 17320 http://gar.svn.sourceforge.net/gar/?rev=17320&view=rev Author: wahwah Date: 2012-03-07 00:50:47 +0000 (Wed, 07 Mar 2012) Log Message: ----------- autoconf/branches/autoconf-2.13: Using a version specific suffix Modified Paths: -------------- csw/mgar/pkg/autoconf/branches/autoconf-2.13/Makefile csw/mgar/pkg/autoconf/branches/autoconf-2.13/checksums Added Paths: ----------- csw/mgar/pkg/autoconf/branches/autoconf-2.13/files/0002-Use-DESTDIR.patch Modified: csw/mgar/pkg/autoconf/branches/autoconf-2.13/Makefile =================================================================== --- csw/mgar/pkg/autoconf/branches/autoconf-2.13/Makefile 2012-03-07 00:32:39 UTC (rev 17319) +++ csw/mgar/pkg/autoconf/branches/autoconf-2.13/Makefile 2012-03-07 00:50:47 UTC (rev 17320) @@ -1,7 +1,7 @@ # $Id$ NAME = autoconf -VERSION = 2.68 +VERSION = 2.13 CATEGORIES = devel GARTYPE = v2 @@ -16,8 +16,12 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES = 0001-Prefer-CSW-tools.patch +# PATCHFILES = 0001-Prefer-CSW-tools.patch +PATCHFILES += 0002-Use-DESTDIR.patch +PACKAGES += CSWautoconf2-13 +ARCHALL_CSWautoconf2-13 = 1 + BUILD_DEP_PKGS = CSWhelp2man # We need the Fortran runtime libs or the Fortran tests with fail @@ -27,16 +31,21 @@ VENDOR_URL = http://www.gnu.org/software/autoconf/ +datadir = $(prefix)/share/autoconf-$(VERSION) CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --program-suffix="-$(VERSION)" # Tests take a loooooonnng time. # TEST_SCRIPTS = EXTRA_MERGE_EXCLUDE_FILES = $(infodir)/standards.info +EXTRA_MERGE_EXCLUDE_FILES += $(infodir)/autoconf.info -CHECKPKG_OVERRIDES_CSWautoconf += missing-dependency|CSWemacscommon -CHECKPKG_OVERRIDES_CSWautoconf += surplus-dependency|CSWgm4 -CHECKPKG_OVERRIDES_CSWautoconf += surplus-dependency|CSWgawk +CHECKPKG_OVERRIDES_CSWautoconf2-13 += missing-dependency|CSWemacscommon +CHECKPKG_OVERRIDES_CSWautoconf2-13 += surplus-dependency|CSWgm4 +CHECKPKG_OVERRIDES_CSWautoconf2-13 += surplus-dependency|CSWgawk +CHECKPKG_OVERRIDES_CSWautoconf2-13 += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWautoconf2-13 += file-with-bad-content include gar/category.mk Modified: csw/mgar/pkg/autoconf/branches/autoconf-2.13/checksums =================================================================== --- csw/mgar/pkg/autoconf/branches/autoconf-2.13/checksums 2012-03-07 00:32:39 UTC (rev 17319) +++ csw/mgar/pkg/autoconf/branches/autoconf-2.13/checksums 2012-03-07 00:50:47 UTC (rev 17320) @@ -1 +1 @@ -c3b5247592ce694f7097873aa07d66fe autoconf-2.68.tar.gz +9de56d4a161a723228220b0f425dc711 autoconf-2.13.tar.gz Added: csw/mgar/pkg/autoconf/branches/autoconf-2.13/files/0002-Use-DESTDIR.patch =================================================================== --- csw/mgar/pkg/autoconf/branches/autoconf-2.13/files/0002-Use-DESTDIR.patch (rev 0) +++ csw/mgar/pkg/autoconf/branches/autoconf-2.13/files/0002-Use-DESTDIR.patch 2012-03-07 00:50:47 UTC (rev 17320) @@ -0,0 +1,75 @@ +From caba82c5071bff904afef3f403fd442394503a16 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 7 Mar 2012 01:43:01 +0100 +Subject: [PATCH] Use DESTDIR + +--- + Makefile.in | 24 ++++++++++++------------ + 1 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index a6c94d4..c07bdf6 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -137,23 +137,23 @@ installcheck: all install + cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@ + + installdirs: +- $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir) ++ $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) $(DESTDIR)$(acdatadir) + + install: all $(M4FILES) acconfig.h installdirs install-info + for p in $(ASCRIPTS); do \ +- $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ ++ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + done + for i in $(M4FROZEN); do \ +- $(INSTALL_DATA) $$i $(acdatadir)/$$i; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(acdatadir)/$$i; \ + done + for i in $(M4FILES) acconfig.h; do \ +- $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ ++ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(acdatadir)/$$i; \ + done + -if test -f autoscan; then \ +- $(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \ ++ $(INSTALL_PROGRAM) autoscan $(DESTDIR)$(bindir)/`echo autoscan|sed '$(transform)'`; \ + for i in acfunctions acheaders acidentifiers acprograms \ + acmakevars; do \ +- $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ ++ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(acdatadir)/$$i; \ + done; \ + else :; fi + +@@ -161,22 +161,22 @@ install: all $(M4FILES) acconfig.h installdirs install-info + install-info: info installdirs + if test -f autoconf.info; then \ + for i in *.info*; do \ +- $(INSTALL_DATA) $$i $(infodir)/$$i; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \ + done; \ + else \ + for i in $(srcdir)/*.info*; do \ +- $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ + done; \ + fi + + uninstall: + for p in $(SCRIPTS); do \ +- rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ ++ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + done +- rm -fr $(acdatadir) +- cd $(infodir) && rm -f autoconf.info* ++ rm -fr $(DESTDIR)$(acdatadir) ++ cd $(DESTDIR)$(infodir) && rm -f autoconf.info* + if test -f standards.info || test -f $(srcdir)/standards.info; \ +- then cd $(infodir) && rm -f standards.info*; fi ++ then cd $(DESTDIR)$(infodir) && rm -f standards.info*; fi + + ${srcdir}/configure: configure.in $(M4FILES) + cd $(srcdir) && \ +-- +1.7.9 + 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 Mar 7 11:40:40 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 07 Mar 2012 10:40:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[17321] csw/mgar/pkg/x264/trunk Message-ID: Revision: 17321 http://gar.svn.sourceforge.net/gar/?rev=17321&view=rev Author: janholzh Date: 2012-03-07 10:40:40 +0000 (Wed, 07 Mar 2012) Log Message: ----------- x264/trunk: update to new snapshot Modified Paths: -------------- csw/mgar/pkg/x264/trunk/Makefile csw/mgar/pkg/x264/trunk/checksums Modified: csw/mgar/pkg/x264/trunk/Makefile =================================================================== --- csw/mgar/pkg/x264/trunk/Makefile 2012-03-07 00:50:47 UTC (rev 17320) +++ csw/mgar/pkg/x264/trunk/Makefile 2012-03-07 10:40:40 UTC (rev 17321) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = x264 -VERSION = snapshot-20120211-2245 +VERSION = snapshot-20120306-2245 GARTYPE = v2 CATEGORIES = apps Modified: csw/mgar/pkg/x264/trunk/checksums =================================================================== --- csw/mgar/pkg/x264/trunk/checksums 2012-03-07 00:50:47 UTC (rev 17320) +++ csw/mgar/pkg/x264/trunk/checksums 2012-03-07 10:40:40 UTC (rev 17321) @@ -1 +1 @@ -b6f499b863370542304b213b9edc01d6 x264-snapshot-20120211-2245.tar.bz2 +438b90c8caa5c3957c081ba1bb10e6ca x264-snapshot-20120306-2245.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Mar 7 15:10:45 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 07 Mar 2012 14:10:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17322] csw/mgar/pkg/lang-python/pygobject/trunk/Makefile Message-ID: Revision: 17322 http://gar.svn.sourceforge.net/gar/?rev=17322&view=rev Author: cgrzemba Date: 2012-03-07 14:10:44 +0000 (Wed, 07 Mar 2012) Log Message: ----------- lang-python/pygobject/trunk: adjust package name Modified Paths: -------------- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2012-03-07 10:40:40 UTC (rev 17321) +++ csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2012-03-07 14:10:44 UTC (rev 17322) @@ -1,7 +1,6 @@ NAME = pygobject VERSION = 2.21.1 CATEGORIES = lang -GARTYPE = v2 RELVER = $(shell echo $(VERSION) | gsed -e 's/\.[0-9]\+$$//') DESCRIPTION = Python bindings for the GObject library @@ -20,22 +19,37 @@ SPKG_DESC_CSWpy-gobject = $(DESCRIPTION) PKGFILES_CSWpy-gobject = $(libdir)/python/site-packages/.* RUNTIME_DEP_PKGS_CSWpy-gobject += CSWpython -RUNTIME_DEP_PKGS_CSWpy-gobject += CSWglib2 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibpyglib-2-0-py0 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibpyglib2-0python0 OBSOLETED_BY_CSWpy-gobject = CSWpygobject -PACKAGES += CSWlibpyglib-2-0-py0 -SPKG_DESC_CSWlibpyglib-2-0-py0 = Runtime library for the Python GObject library -PKGFILES_CSWlibpyglib-2-0-py0 = $(libdir)/libpyglib-2.0-python.so.0.* -RUNTIME_DEP_PKGS_CSWlibpyglib-2-0-py0 += CSWglib2 -RUNTIME_DEP_PKGS_CSWlibpyglib-2-0-py0 += CSWlibintl8 +PACKAGES += CSWlibpyglib2-0python0 +CATALOGNAME_CSWlibpyglib2-0python0 = libpyglib2_0python0 +PKGFILES_CSWlibpyglib2-0python0 += $(call baseisadirs,$(libdir),libpyglib-2\.0-python\.so\.0\.0\.0) +PKGFILES_CSWlibpyglib2-0python0 += $(call baseisadirs,$(libdir),libpyglib-2\.0-python\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibpyglib2-0python0 += $(DESCRIPTION), libpyglib-2.0-python.so.0 +RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibglib2-0-0 + + +# PACKAGES += CSWlibpyglib-2-0-py0 +# SPKG_DESC_CSWlibpyglib-2-0-py0 = Runtime library for the Python GObject library +# PKGFILES_CSWlibpyglib-2-0-py0 = $(libdir)/libpyglib-2.0-python.so.0.* +# RUNTIME_DEP_PKGS_CSWlibpyglib-2-0-py0 += CSWglib2 +# RUNTIME_DEP_PKGS_CSWlibpyglib-2-0-py0 += CSWlibintl8 # soname results in a package name that is too long so it was shortened -CHECKPKG_OVERRIDES_CSWlibpyglib-2-0-py0 += shared-lib-pkgname-mismatch +# CHECKPKG_OVERRIDES_CSWlibpyglib-2-0-py0 += shared-lib-pkgname-mismatch PACKAGES += CSWpy-gobject-dev SPKG_DESC_CSWpy-gobject-dev = Development files for the Python GObject library -RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibpyglib-2-0-py0 +RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibpyglib2-0python0 RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWpython # These are just comments @@ -49,6 +63,7 @@ CONFIGURE_ARGS += --without-ffi ## Tests require gtk, but gtk requries gobject +TEST_TARGET = check TEST_SCRIPTS = EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Mar 7 17:05:50 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 07 Mar 2012 16:05:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[17323] csw/mgar/pkg/lang-python/pygobject/trunk/Makefile Message-ID: Revision: 17323 http://gar.svn.sourceforge.net/gar/?rev=17323&view=rev Author: cgrzemba Date: 2012-03-07 16:05:49 +0000 (Wed, 07 Mar 2012) Log Message: ----------- lang-python/pygobject/trunk: add OBSOLETED_BY Modified Paths: -------------- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2012-03-07 14:10:44 UTC (rev 17322) +++ csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2012-03-07 16:05:49 UTC (rev 17323) @@ -26,7 +26,7 @@ RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibpyglib2-0python0 -OBSOLETED_BY_CSWpy-gobject = CSWpygobject +OBSOLETED_BY_CSWpy-gobject += CSWpygobject PACKAGES += CSWlibpyglib2-0python0 CATALOGNAME_CSWlibpyglib2-0python0 = libpyglib2_0python0 @@ -51,6 +51,7 @@ SPKG_DESC_CSWpy-gobject-dev = Development files for the Python GObject library RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibpyglib2-0python0 RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWpython +OBSOLETED_BY_CSWpy-gobject-dev += CSWpygobject # These are just comments CHECKPKG_OVERRIDES_CSWpy-gobject-dev += file-with-bad-content|/usr/local|root/opt/csw/share/pygobject/2.0/codegen/defsgen.py 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 Mar 7 17:08:20 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Mar 2012 16:08:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17324] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators Message-ID: Revision: 17324 http://gar.svn.sourceforge.net/gar/?rev=17324&view=rev Author: dmichelsen Date: 2012-03-07 16:08:20 +0000 (Wed, 07 Mar 2012) Log Message: ----------- manual: Update tbd and add config files Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/configuring-services.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst 2012-03-07 16:05:49 UTC (rev 17323) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst 2012-03-07 16:08:20 UTC (rev 17324) @@ -155,14 +155,6 @@ pkgutil --deptree -Solaris 9/10/11 sparc vs. i386 -packaging strategy IPS may change -graphviz tree -pkgutil --deptree - -TBD: Identify packages depending on obsolete ones - - --------------------------- Setting up a private mirror --------------------------- Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/configuring-services.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/configuring-services.rst 2012-03-07 16:05:49 UTC (rev 17323) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/configuring-services.rst 2012-03-07 16:08:20 UTC (rev 17324) @@ -5,13 +5,29 @@ /etc/opt/csw vs. /opt/csw/etc ============================= -... +There are two locations where configuration files are stored. This may look confusing at first, +the reason is that we try to support both sparse zones and full zones as good as possible. +Remember that in a sparse root environment `/opt` is shared from the global zone. As a rule +of thumb configuration files which are specific to a zone are kept in `/etc/opt/csw` which is +also generally preferred (these are in fact most of the configuration files), whereas +`/opt/csw/etc` is used for configuration files which are globally set. Some packages honour +both locations, where the global `/opt/csw/etc` is read first and can be customized by +`/etc/opt/csw`, but this is specific to the package as not all upstream software allows +this easily. +There are some exceptions like Apache, where the configuration files are historically in +`/opt/csw/apache2/etc`, but these are likely to go away some time. + + preserveconf ============ -... +Configuration files are usually shipped as template with a `.CSW` suffix which is copied during installation +to the native name without the suffix. This file is meant to be user-adjustable. On package +deinstallation or update the template is deinstalled whereas the configuration file without suffix +is kept unless it hasn't been modified. + RC/SMF ====== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Mar 7 17:09:19 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 07 Mar 2012 16:09:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[17325] csw/mgar/pkg/php5_apc/trunk/Makefile Message-ID: Revision: 17325 http://gar.svn.sourceforge.net/gar/?rev=17325&view=rev Author: bdwalton Date: 2012-03-07 16:09:19 +0000 (Wed, 07 Mar 2012) Log Message: ----------- php5_apc/trunk: mark as sol10 only to match php5 Modified Paths: -------------- csw/mgar/pkg/php5_apc/trunk/Makefile Modified: csw/mgar/pkg/php5_apc/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5_apc/trunk/Makefile 2012-03-07 16:08:20 UTC (rev 17324) +++ csw/mgar/pkg/php5_apc/trunk/Makefile 2012-03-07 16:09:19 UTC (rev 17325) @@ -3,6 +3,9 @@ CATEGORIES = lang GARTYPE = v2 +# to match php5 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + DESCRIPTION = APC Extention for PHP define BLURB The Alternative PHP Cache (APC) is a free and open opcode cache for PHP. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Mar 8 00:13:41 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Wed, 07 Mar 2012 23:13:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[17326] csw/mgar/pkg/ganglia/branches Message-ID: Revision: 17326 http://gar.svn.sourceforge.net/gar/?rev=17326&view=rev Author: d_pocock Date: 2012-03-07 23:13:41 +0000 (Wed, 07 Mar 2012) Log Message: ----------- ganglia: create branch based on 3.2.X upstream release series Added Paths: ----------- csw/mgar/pkg/ganglia/branches/ganglia-3.2.0/ csw/mgar/pkg/ganglia/branches/ganglia-3.2.0/Makefile csw/mgar/pkg/ganglia/branches/ganglia-3.2.0/files/conf.php Removed Paths: ------------- csw/mgar/pkg/ganglia/branches/ganglia-3.2.0/Makefile csw/mgar/pkg/ganglia/branches/ganglia-3.2.0/files/conf.php Deleted: csw/mgar/pkg/ganglia/branches/ganglia-3.2.0/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2011-12-10 11:09:12 UTC (rev 16450) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.2.0/Makefile 2012-03-07 23:13:41 UTC (rev 17326) @@ -1,257 +0,0 @@ -NAME = ganglia -VERSION = 3.2.0 -CATEGORIES = utils - -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - -# How should we set this? -# There is a release number in configure.in, maybe use that? -# RELVER = - -USER_GMOND = nobody -# nobody shouldn't really be allowed to own any files -# maybe we should add a ganglia user to own the RRD files? -USER_GMETAD = nobody - -DESCRIPTION = A scalable distributed monitoring system -define BLURB - Ganglia is a scalable distributed monitoring system for high-performance computing - systems such as clusters and Grids. It is based on a hierarchical design targeted - at federations of clusters. -endef - -SF_PROJ = ganglia -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove -DISTFILES += httpd-ganglia.conf cswgmond cswgmetad - -PACKAGES = CSWlibganglia0 CSWgangliaagent CSWganglia-dev CSWgangliagmetad CSWgangliaweb CSWgangliamodpython - -CATALOGNAME_CSWganglia = ganglia -CATALOGNAME_CSWlibganglia0 = libganglia0 -CATALOGNAME_CSWgangliart = ganglia_rt_stub -CATALOGNAME_CSWgangliaagent = gangliaagent -CATALOGNAME_CSWgangliamodpython = gangliamodpython -CATALOGNAME_CSWganglia-dev = ganglia_dev -CATALOGNAME_CSWgangliagmetad = gangliagmetad -CATALOGNAME_CSWgangliaweb = gangliaweb - -OBSOLETED_BY_CSWlibganglia0 += CSWgangliart - -SPKG_DESC_CSWganglia = Dummy package -SPKG_DESC_CSWlibganglia0 = Ganglia runtime libraries -SPKG_DESC_CSWgangliaagent = Ganglia performance monitoring agent gmond -SPKG_DESC_CSWgangliamodpython = Ganglia agent module for Python metrics -SPKG_DESC_CSWganglia-dev = Ganglia headers for metric module development -SPKG_DESC_CSWgangliagmetad = Ganglia gmetad -SPKG_DESC_CSWgangliaweb = Ganglia web - -BUILD_DEP_PKGS = CSWexpat CSWlibconfuse-dev CSWapache2rt CSWapache2-dev CSWpcre -BUILD_DEP_PKGS += CSWrrdtool CSWrrdtool-dev - -RUNTIME_DEP_PKGS_CSWlibganglia0 = CSWlibexpat1 CSWlibconfuse0 CSWlibapr1-0 -RUNTIME_DEP_PKGS_CSWlibganglia0 += CSWlibpcre0 -RUNTIME_DEP_PKGS_CSWgangliaagent = CSWlibexpat1 CSWlibconfuse0 CSWlibapr1-0 -RUNTIME_DEP_PKGS_CSWgangliaagent += CSWlibganglia0 CSWlibpcre0 -RUNTIME_DEP_PKGS_CSWgangliamodpython = CSWgangliaagent -CHECKPKG_OVERRIDES_CSWgangliamodpython += surplus-dependency|CSWgangliaagent -RUNTIME_DEP_PKGS_CSWganglia-dev = CSWlibganglia0 -RUNTIME_DEP_PKGS_CSWgangliagmetad = CSWlibexpat1 CSWlibconfuse0 CSWlibapr1-0 -RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWlibganglia0 CSWgangliaagent CSWrrdtool -RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWlibrrd4 CSWlibpcre0 -CHECKPKG_OVERRIDES_CSWgangliagmetad += surplus-dependency|CSWgangliaagent -CHECKPKG_OVERRIDES_CSWgangliagmetad += surplus-dependency|CSWrrdtool -RUNTIME_DEP_PKGS_CSWgangliaweb = CSWgangliagmetad -RUNTIME_DEP_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2-modphp5 CSWrrdtool -CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWgangliagmetad -CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWrrdtool - -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) - -# This is attachment #45 from Ganglia bug -# http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77 -#PATCHFILES = $(NAME)-$(VERSION)-solaris-cc.patch - -# Uncomment this if we want to build both 32 bit and 64 bit binaries -# By default, only 32 bit binaries are built -#BUILD64 = 1 - -CONFIGURE_ARGS = $(DIRPATHS) - -# For compatibility on Solaris 10 -#CONFIGURE_ARGS += CFLAGS="-xc99" - -# Don't build gmetad (not tested yet on Solaris, more deps required to build) -#CONFIGURE_ARGS += --without-gmetad -CONFIGURE_ARGS += --with-gmetad - -# Reduce dependencies, no gettext: -CONFIGURE_ARGS += --disable-nls - -# Use apr from CSWapache2rt -CONFIGURE_ARGS += --with-libapr=/opt/csw/apache2/bin/apr-1-config - -# Use rrd from CSWlibrrd4 -CONFIGURE_ARGS += --with-librrd=/opt/csw - -# Use confuse from CSWlibconfuse0 -CONFIGURE_ARGS += --with-libconfuse=/opt/csw - -# Include the status module -CONFIGURE_ARGS += --with-status - -# When we enable this, modpython will have to go in a separate package, -# otherwise CSWgangliaagent will have lots of dependencies -# TODO: define a CSWgangliamodpython package -# Depends: some issues exist getting the Python support working on Solaris, -# Ganglia's configure.in needs to be further enhanced for this to work -CONFIGURE_ARGS += --disable-python -#CONFIGURE_ARGS += --with-python=/opt/csw - -# modgstatus - for Ganglia version and internal status metrics -CONFIGURE_ARGS += --enable-status - -# For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, -# so we skip it. This should be re-assessed with each new release -# from upstream. Proposed fixes for the test suite to be submitted -# upstream. -ifeq ($(VERSION),3.1.3) -TEST_SCRIPTS = -endif -ifeq ($(VERSION),3.1.4) -TEST_SCRIPTS = -endif -ifeq ($(VERSION),3.1.5) -TEST_SCRIPTS = -endif -ifeq ($(VERSION),3.1.6) -TEST_SCRIPTS = -endif -ifeq ($(VERSION),3.1.7) -TEST_SCRIPTS = -endif -ifeq ($(VERSION),3.2.0) -TEST_SCRIPTS = -endif - -#INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom - -WWWROOT = /opt/csw/share/www -WWWGANGLIA = $(WWWROOT)/ganglia -sysconfdir = /etc/opt/csw/ganglia -ETCGANGLIA = $(sysconfdir) - -PKGFILES_CSWganglia = -PKGFILES_CSWgangliaagent = /etc/opt/csw/ganglia/gmond.conf.CSW -PKGFILES_CSWgangliaagent += /etc/opt/csw/ganglia/modgstatus.conf.CSW -PKGFILES_CSWgangliaagent += /opt/csw/sbin/gmond -PKGFILES_CSWgangliaagent += /opt/csw/bin/gmetric -PKGFILES_CSWgangliaagent += /etc/opt/csw/init.d/cswgmond -PKGFILES_CSWgangliaagent += /opt/csw/share/man/man1/gmond.1 -PKGFILES_CSWgangliaagent += /opt/csw/share/man/man1/gmetric.1 -PKGFILES_CSWgangliaagent += /opt/csw/share/man/man5/gmond.conf.5 -PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modsys.so -PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modcpu.so -PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modnet.so -PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modmulticpu.so -PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modmem.so -PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modload.so -PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/moddisk.so -PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modproc.so -PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modgstatus.so - -PKGFILES_CSWlibganglia0 += $(call pkgfiles_lib,libganglia-3.2.0.0.so.0) - -CHECKPKG_OVERRIDES_CSWlibganglia0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libganglia-3.2.0.0.so.0.0.0|soname=libganglia-3.2.0.0.so.0|pkgname=CSWlibganglia0|expected=CSWlibganglia3-2-0-0-0 - -PKGFILES_CSWgangliamodpython = .*python.* - -PKGFILES_CSWganglia-dev = /opt/csw/include/ganglia.h -PKGFILES_CSWganglia-dev += /opt/csw/include/ganglia_gexec.h -PKGFILES_CSWganglia-dev += /opt/csw/include/gm_metric.h -PKGFILES_CSWganglia-dev += /opt/csw/include/gm_mmn.h -PKGFILES_CSWganglia-dev += /opt/csw/include/gm_msg.h -PKGFILES_CSWganglia-dev += /opt/csw/include/gm_protocol.h -PKGFILES_CSWganglia-dev += /opt/csw/include/gm_value.h -PKGFILES_CSWganglia-dev += /opt/csw/bin/ganglia-config -PKGFILES_CSWganglia-dev += $(libdir)/libganglia.so - -PKGFILES_CSWgangliagmetad = /opt/csw/sbin/gmetad -PKGFILES_CSWgangliagmetad += /etc/opt/csw/ganglia/gmetad.conf.CSW -PKGFILES_CSWgangliagmetad += /etc/opt/csw/init.d/cswgmetad -PKGFILES_CSWgangliagmetad += /var/opt/csw/ganglia/rrds -PKGFILES_CSWgangliagmetad += /opt/csw/share/man/man1/gmetad.1 - -PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* -PKGFILES_CSWgangliaweb += /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW - -PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf -PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf -PRESERVECONF += /etc/opt/csw/ganglia/gmetad.conf -PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modgstatus.conf -PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modpython.conf -PRESERVECONF += $(WWWGANGLIA)/conf.php - -# For gmond -INITSMF = /etc/opt/csw/init.d/cswgmond -# For gmetad -INITSMF += /etc/opt/csw/init.d/cswgmetad - -PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ -$$$$3 ~ /\/var\/opt\/csw\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ -{ print }' - - -#ARCHALL_CSWganglia-dev = 1 -ARCHALL_CSWgangliaweb = 1 -ARCHALL_CSWgangliamodpython = 1 - -include gar/category.mk - -post-install-modulated: - - at rm $(DESTDIR)/opt/csw/bin/gstat - @ginstall -D $(DOWNLOADDIR)/cswgmond \ - $(PKGROOT)/etc/opt/csw/init.d/cswgmond - @ginstall -D $(DOWNLOADDIR)/cswgmetad \ - $(PKGROOT)/etc/opt/csw/init.d/cswgmetad - @ginstall -d $(DESTDIR)$(WWWGANGLIA) - @find $(WORKSRC)/web -name .gitignore -exec rm '{}' \; - @cd $(WORKSRC)/web; \ - cp -R * $(DESTDIR)$(WWWGANGLIA) - @rm -rf $(DESTDIR)$(WWWGANGLIA)/conf.php - @ginstall -D $(FILEDIR)/conf.php \ - $(DESTDIR)$(WWWGANGLIA)/conf.php.CSW - @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in - @ginstall -D $(FILEDIR)/httpd-ganglia.conf \ - $(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW - @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d - @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ - > $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW - @echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \ - >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW - @ginstall -D $(FILEDIR)/gmetad.conf \ - $(DESTDIR)$(ETCGANGLIA)/gmetad.conf - @cd $(WORKSRC)/gmond/modules/conf.d ; \ - for CONF_FILE in *.conf ; \ - do cp -R "$${CONF_FILE}" $(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}.CSW" ; done - @cd $(FILEDIR)/conf.d ; \ - for CONF_FILE in *.conf ; \ - do cp -R "$${CONF_FILE}" $(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}.CSW" ; done - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf.CSW \ - $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf.CSW -ifeq ($(VERSION),3.1.2) - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf.CSW -endif - @ginstall -d $(DESTDIR)/var/opt/csw/ganglia/rrds - @ginstall -D $(WORKSRC)/gmond/gmond.conf.5 $(DESTDIR)$(mandir)/man5/gmond.conf.5 - @ginstall -D $(WORKSRC)/mans/gmetad.1 $(DESTDIR)$(mandir)/man1/gmetad.1 - @ginstall -D $(WORKSRC)/mans/gmond.1 $(DESTDIR)$(mandir)/man1/gmond.1 - @ginstall -D $(WORKSRC)/mans/gmetric.1 $(DESTDIR)$(mandir)/man1/gmetric.1 - - - Copied: csw/mgar/pkg/ganglia/branches/ganglia-3.2.0/Makefile (from rev 16457, csw/mgar/pkg/ganglia/trunk/Makefile) =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.2.0/Makefile (rev 0) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.2.0/Makefile 2012-03-07 23:13:41 UTC (rev 17326) @@ -0,0 +1,264 @@ +NAME = ganglia +VERSION = 3.2.0 +CATEGORIES = utils + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +# How should we set this? +# There is a release number in configure.in, maybe use that? +# RELVER = + +USER_GMOND = nobody +# nobody shouldn't really be allowed to own any files +# maybe we should add a ganglia user to own the RRD files? +USER_GMETAD = nobody + +DESCRIPTION = A scalable distributed monitoring system +define BLURB + Ganglia is a scalable distributed monitoring system for high-performance computing + systems such as clusters and Grids. It is based on a hierarchical design targeted + at federations of clusters. +endef + +SF_PROJ = ganglia +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove +DISTFILES += httpd-ganglia.conf cswgmond cswgmetad + +PACKAGES = CSWlibganglia0 CSWgangliaagent CSWganglia-dev CSWgangliagmetad CSWgangliaweb CSWgangliamodpython + +CATALOGNAME_CSWganglia = ganglia +CATALOGNAME_CSWlibganglia0 = libganglia0 +CATALOGNAME_CSWgangliart = ganglia_rt_stub +CATALOGNAME_CSWgangliaagent = gangliaagent +CATALOGNAME_CSWgangliamodpython = gangliamodpython +CATALOGNAME_CSWganglia-dev = ganglia_dev +CATALOGNAME_CSWgangliagmetad = gangliagmetad +CATALOGNAME_CSWgangliaweb = gangliaweb + +OBSOLETED_BY_CSWlibganglia0 += CSWgangliart + +SPKG_DESC_CSWganglia = Dummy package +SPKG_DESC_CSWlibganglia0 = Ganglia runtime libraries +SPKG_DESC_CSWgangliaagent = Ganglia performance monitoring agent gmond +SPKG_DESC_CSWgangliamodpython = Ganglia agent module for Python metrics +SPKG_DESC_CSWganglia-dev = Ganglia headers for metric module development +SPKG_DESC_CSWgangliagmetad = Ganglia gmetad +SPKG_DESC_CSWgangliaweb = Ganglia web + +BUILD_DEP_PKGS = CSWexpat CSWlibconfuse-dev CSWapache2rt CSWapache2-dev CSWpcre +BUILD_DEP_PKGS += CSWrrdtool CSWrrdtool-dev + +RUNTIME_DEP_PKGS_CSWlibganglia0 = CSWlibexpat1 CSWlibconfuse0 CSWlibapr1-0 +RUNTIME_DEP_PKGS_CSWlibganglia0 += CSWlibpcre0 +RUNTIME_DEP_PKGS_CSWgangliaagent = CSWlibexpat1 CSWlibconfuse0 CSWlibapr1-0 +RUNTIME_DEP_PKGS_CSWgangliaagent += CSWlibganglia0 CSWlibpcre0 +RUNTIME_DEP_PKGS_CSWgangliamodpython = CSWgangliaagent +CHECKPKG_OVERRIDES_CSWgangliamodpython += surplus-dependency|CSWgangliaagent +RUNTIME_DEP_PKGS_CSWganglia-dev = CSWlibganglia0 +RUNTIME_DEP_PKGS_CSWgangliagmetad = CSWlibexpat1 CSWlibconfuse0 CSWlibapr1-0 +RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWlibganglia0 CSWgangliaagent CSWrrdtool +RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWlibrrd4 CSWlibpcre0 +CHECKPKG_OVERRIDES_CSWgangliagmetad += surplus-dependency|CSWgangliaagent +CHECKPKG_OVERRIDES_CSWgangliagmetad += surplus-dependency|CSWrrdtool +RUNTIME_DEP_PKGS_CSWgangliaweb = CSWgangliagmetad +RUNTIME_DEP_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2-modphp5 CSWrrdtool +CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWgangliagmetad +CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWrrdtool + +# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +# This is attachment #45 from Ganglia bug +# http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77 +#PATCHFILES = $(NAME)-$(VERSION)-solaris-cc.patch + +# Uncomment this if we want to build both 32 bit and 64 bit binaries +# By default, only 32 bit binaries are built +#BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +# For compatibility on Solaris 10 +#CONFIGURE_ARGS += CFLAGS="-xc99" + +# Don't build gmetad (not tested yet on Solaris, more deps required to build) +#CONFIGURE_ARGS += --without-gmetad +CONFIGURE_ARGS += --with-gmetad + +# Reduce dependencies, no gettext: +CONFIGURE_ARGS += --disable-nls + +# Use apr from CSWapache2rt +CONFIGURE_ARGS += --with-libapr=/opt/csw/apache2/bin/apr-1-config + +# Use rrd from CSWlibrrd4 +CONFIGURE_ARGS += --with-librrd=/opt/csw + +# Use confuse from CSWlibconfuse0 +CONFIGURE_ARGS += --with-libconfuse=/opt/csw + +# Include the status module +CONFIGURE_ARGS += --with-status + +# When we enable this, modpython will have to go in a separate package, +# otherwise CSWgangliaagent will have lots of dependencies +# TODO: define a CSWgangliamodpython package +# Depends: some issues exist getting the Python support working on Solaris, +# Ganglia's configure.in needs to be further enhanced for this to work +CONFIGURE_ARGS += --disable-python +#CONFIGURE_ARGS += --with-python=/opt/csw + +# modgstatus - for Ganglia version and internal status metrics +CONFIGURE_ARGS += --enable-status + +# For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, +# so we skip it. This should be re-assessed with each new release +# from upstream. Proposed fixes for the test suite to be submitted +# upstream. +ifeq ($(VERSION),3.1.3) +TEST_SCRIPTS = +endif +ifeq ($(VERSION),3.1.4) +TEST_SCRIPTS = +endif +ifeq ($(VERSION),3.1.5) +TEST_SCRIPTS = +endif +ifeq ($(VERSION),3.1.6) +TEST_SCRIPTS = +endif +ifeq ($(VERSION),3.1.7) +TEST_SCRIPTS = +endif +ifeq ($(VERSION),3.2.0) +TEST_SCRIPTS = +endif + +#INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom + +WWWROOT = /opt/csw/share/www +WWWGANGLIA = $(WWWROOT)/ganglia +sysconfdir = /etc/opt/csw/ganglia +ETCGANGLIA = $(sysconfdir) + +PKGFILES_CSWganglia = +PKGFILES_CSWgangliaagent = /etc/opt/csw/ganglia/gmond.conf.CSW +PKGFILES_CSWgangliaagent += /etc/opt/csw/ganglia/modgstatus.conf.CSW +PKGFILES_CSWgangliaagent += /opt/csw/sbin/gmond +PKGFILES_CSWgangliaagent += /opt/csw/bin/gmetric +PKGFILES_CSWgangliaagent += /etc/opt/csw/init.d/cswgmond +PKGFILES_CSWgangliaagent += /opt/csw/share/man/man1/gmond.1 +PKGFILES_CSWgangliaagent += /opt/csw/share/man/man1/gmetric.1 +PKGFILES_CSWgangliaagent += /opt/csw/share/man/man5/gmond.conf.5 +PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modsys.so +PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modcpu.so +PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modnet.so +# this version is only for Linux users, get the package +# ganglia-modules-solaris for the Solaris modmulticpu.so +#PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modmulticpu.so +PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modmem.so +PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modload.so +PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/moddisk.so +PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modproc.so +PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modgstatus.so + +PKGFILES_CSWlibganglia0 += $(call pkgfiles_lib,libganglia-3.2.0.0.so.0) + +CHECKPKG_OVERRIDES_CSWlibganglia0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libganglia-3.2.0.0.so.0.0.0|soname=libganglia-3.2.0.0.so.0|pkgname=CSWlibganglia0|expected=CSWlibganglia3-2-0-0-0 + +PKGFILES_CSWgangliamodpython = .*python.* + +PKGFILES_CSWganglia-dev = /opt/csw/include/ganglia.h +PKGFILES_CSWganglia-dev += /opt/csw/include/ganglia_gexec.h +PKGFILES_CSWganglia-dev += /opt/csw/include/gm_metric.h +PKGFILES_CSWganglia-dev += /opt/csw/include/gm_mmn.h +PKGFILES_CSWganglia-dev += /opt/csw/include/gm_msg.h +PKGFILES_CSWganglia-dev += /opt/csw/include/gm_protocol.h +PKGFILES_CSWganglia-dev += /opt/csw/include/gm_value.h +PKGFILES_CSWganglia-dev += /opt/csw/bin/ganglia-config +PKGFILES_CSWganglia-dev += $(libdir)/libganglia.so + +PKGFILES_CSWgangliagmetad = /opt/csw/sbin/gmetad +PKGFILES_CSWgangliagmetad += /etc/opt/csw/ganglia/gmetad.conf.CSW +PKGFILES_CSWgangliagmetad += /etc/opt/csw/init.d/cswgmetad +PKGFILES_CSWgangliagmetad += /var/opt/csw/ganglia/rrds +PKGFILES_CSWgangliagmetad += /opt/csw/share/man/man1/gmetad.1 + +PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* +PKGFILES_CSWgangliaweb += /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW +PKGFILES_CSWgangliaweb += /var/opt/csw/ganglia/dwoo + +PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf +PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf +PRESERVECONF += /etc/opt/csw/ganglia/gmetad.conf +PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modgstatus.conf +PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modpython.conf +PRESERVECONF += $(WWWGANGLIA)/conf.php + +# For gmond +INITSMF = /etc/opt/csw/init.d/cswgmond +# For gmetad +INITSMF += /etc/opt/csw/init.d/cswgmetad + +PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ +$$$$3 ~ /\/var\/opt\/csw\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ +{ print }' + +PROTOTYPE_FILTER_CSWgangliaweb = awk '\ +$$$$3 ~ /\/var\/opt\/csw\/ganglia\/dwoo/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ +{ print }' + +#ARCHALL_CSWganglia-dev = 1 +ARCHALL_CSWgangliaweb = 1 +ARCHALL_CSWgangliamodpython = 1 + +include gar/category.mk + +post-install-modulated: + - at rm $(DESTDIR)/opt/csw/bin/gstat + @ginstall -D $(DOWNLOADDIR)/cswgmond \ + $(PKGROOT)/etc/opt/csw/init.d/cswgmond + @ginstall -D $(DOWNLOADDIR)/cswgmetad \ + $(PKGROOT)/etc/opt/csw/init.d/cswgmetad + @ginstall -d $(DESTDIR)$(WWWGANGLIA) + @find $(WORKSRC)/web -name .gitignore -exec rm '{}' \; + @cd $(WORKSRC)/web; \ + cp -R * $(DESTDIR)$(WWWGANGLIA) + @rm -rf $(DESTDIR)$(WWWGANGLIA)/conf.php + @ginstall -D $(FILEDIR)/conf.php \ + $(DESTDIR)$(WWWGANGLIA)/conf.php.CSW + @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in + @ginstall -D $(FILEDIR)/httpd-ganglia.conf \ + $(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW + @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d + @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ + > $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW + @echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \ + >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW + @ginstall -D $(FILEDIR)/gmetad.conf \ + $(DESTDIR)$(ETCGANGLIA)/gmetad.conf + @cd $(WORKSRC)/gmond/modules/conf.d ; \ + for CONF_FILE in *.conf ; \ + do cp -R "$${CONF_FILE}" $(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}.CSW" ; done + @cd $(FILEDIR)/conf.d ; \ + for CONF_FILE in *.conf ; \ + do cp -R "$${CONF_FILE}" $(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}.CSW" ; done + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf.CSW \ + $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf.CSW +ifeq ($(VERSION),3.1.2) + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf.CSW +endif + @ginstall -d $(DESTDIR)/var/opt/csw/ganglia/rrds + @ginstall -d $(DESTDIR)/var/opt/csw/ganglia/dwoo + @ginstall -D $(WORKSRC)/gmond/gmond.conf.5 $(DESTDIR)$(mandir)/man5/gmond.conf.5 + @ginstall -D $(WORKSRC)/mans/gmetad.1 $(DESTDIR)$(mandir)/man1/gmetad.1 + @ginstall -D $(WORKSRC)/mans/gmond.1 $(DESTDIR)$(mandir)/man1/gmond.1 + @ginstall -D $(WORKSRC)/mans/gmetric.1 $(DESTDIR)$(mandir)/man1/gmetric.1 + + + Deleted: csw/mgar/pkg/ganglia/branches/ganglia-3.2.0/files/conf.php =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/conf.php 2011-12-10 11:09:12 UTC (rev 16450) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.2.0/files/conf.php 2012-03-07 23:13:41 UTC (rev 17326) @@ -1,208 +0,0 @@ - "ff634f", - "75-100" =>"ffa15e", - "50-75" => "ffde5e", - "25-50" => "caff98", - "0-25" => "e2ecff", - "down" => "515151" -); - -# -# Load scaling -# -$load_scale = 1.0; - -# -# Default color for single metric graphs -# -$default_metric_color = "555555"; - -# -# Default metric -# -$default_metric = "load_one"; - -# -# remove the domainname from the FQDN hostnames in graphs -# (to help with long hostnames in small charts) -# -$strip_domainname = false; - -# -# Optional summary graphs -# -#$optional_graphs = array('packet'); - -# -# Time ranges -# Each value is the # of seconds in that range. -# -$time_ranges = array( - 'hour'=>3600, - 'day'=>86400, - 'week'=>604800, - 'month'=>2419200, - 'year'=>31449600 -); - -# this key must exist in $time_ranges -$default_time_range = 'hour'; - -# -# Graph sizes -# -$graph_sizes = array( - 'small'=>array( - 'height'=>40, - 'width'=>130, - 'fudge_0'=>0, - 'fudge_1'=>0, - 'fudge_2'=>0 - ), - 'medium'=>array( - 'height'=>75, - 'width'=>300, - 'fudge_0'=>0, - 'fudge_1'=>14, - 'fudge_2'=>28 - ), - 'large'=>array( - 'height'=>600, - 'width'=>800, - 'fudge_0'=>0, - 'fudge_1'=>0, - 'fudge_2'=>0 - ), - # this was the default value when no other size was provided. - 'default'=>array( - 'height'=>100, - 'width'=>400, - 'fudge_0'=>0, - 'fudge_1'=>0, - 'fudge_2'=>0 - ) -); -$default_graph_size = 'default'; -$graph_sizes_keys = array_keys( $graph_sizes ); - -# In earlier versions of gmetad, hostnames were handled in a case -# sensitive manner -# If your hostname directories have been renamed to lower case, -# set this option to 0 to disable backward compatibility. -# From version 3.2, backwards compatibility will be disabled by default. -# default: true (for gmetad < 3.2) -# default: false (for gmetad >= 3.2) -$case_sensitive_hostnames = false; -?> Copied: csw/mgar/pkg/ganglia/branches/ganglia-3.2.0/files/conf.php (from rev 16456, csw/mgar/pkg/ganglia/trunk/files/conf.php) =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.2.0/files/conf.php (rev 0) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.2.0/files/conf.php 2012-03-07 23:13:41 UTC (rev 17326) @@ -0,0 +1,218 @@ + "ff634f", + "75-100" =>"ffa15e", + "50-75" => "ffde5e", + "25-50" => "caff98", + "0-25" => "e2ecff", + "down" => "515151" +); + +# +# Load scaling +# +$load_scale = 1.0; + +# +# Default color for single metric graphs +# +$default_metric_color = "555555"; + +# +# Default metric +# +$default_metric = "load_one"; + +# +# remove the domainname from the FQDN hostnames in graphs +# (to help with long hostnames in small charts) +# +$strip_domainname = false; + +# +# Optional summary graphs +# +#$optional_graphs = array('packet'); + +# +# Time ranges +# Each value is the # of seconds in that range. +# +$time_ranges = array( + 'hour'=>3600, + 'day'=>86400, + 'week'=>604800, + 'month'=>2419200, + 'year'=>31449600 +); + +# this key must exist in $time_ranges +$default_time_range = 'hour'; + +# +# Graph sizes +# +$graph_sizes = array( + 'small'=>array( + 'height'=>40, + 'width'=>130, + 'fudge_0'=>0, + 'fudge_1'=>0, + 'fudge_2'=>0 + ), + 'medium'=>array( + 'height'=>75, + 'width'=>300, + 'fudge_0'=>0, + 'fudge_1'=>14, + 'fudge_2'=>28 + ), + 'large'=>array( + 'height'=>600, + 'width'=>800, + 'fudge_0'=>0, + 'fudge_1'=>0, + 'fudge_2'=>0 + ), + # this was the default value when no other size was provided. + 'default'=>array( + 'height'=>100, + 'width'=>400, + 'fudge_0'=>0, + 'fudge_1'=>0, + 'fudge_2'=>0 + ) +); +$default_graph_size = 'default'; +$graph_sizes_keys = array_keys( $graph_sizes ); + +# In earlier versions of gmetad, hostnames were handled in a case +# sensitive manner +# If your hostname directories have been renamed to lower case, +# set this option to 0 to disable backward compatibility. +# From version 3.2, backwards compatibility will be disabled by default. +# default: true (for gmetad < 3.2) +# default: false (for gmetad >= 3.2) +$case_sensitive_hostnames = false; +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Mar 8 00:18:49 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Wed, 07 Mar 2012 23:18:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[17327] csw/mgar/pkg/ganglia/trunk Message-ID: Revision: 17327 http://gar.svn.sourceforge.net/gar/?rev=17327&view=rev Author: d_pocock Date: 2012-03-07 23:18:49 +0000 (Wed, 07 Mar 2012) Log Message: ----------- ganglia: Update manifest to try and package 3.3.1 upstream release Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile csw/mgar/pkg/ganglia/trunk/checksums Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-07 23:13:41 UTC (rev 17326) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-07 23:18:49 UTC (rev 17327) @@ -1,5 +1,5 @@ NAME = ganglia -VERSION = 3.2.0 +VERSION = 3.3.1 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/ganglia/trunk/checksums =================================================================== --- csw/mgar/pkg/ganglia/trunk/checksums 2012-03-07 23:13:41 UTC (rev 17326) +++ csw/mgar/pkg/ganglia/trunk/checksums 2012-03-07 23:18:49 UTC (rev 17327) @@ -1 +1 @@ -4fbc028ab6a9b085703a9cff8e0d26c0 ganglia-3.2.0.tar.gz +93b46f84e554def5efc5c05ad61e9a1c ganglia-3.3.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Mar 8 00:32:12 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Wed, 07 Mar 2012 23:32:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17328] csw/mgar/pkg/ganglia/trunk/Makefile Message-ID: Revision: 17328 http://gar.svn.sourceforge.net/gar/?rev=17328&view=rev Author: d_pocock Date: 2012-03-07 23:32:11 +0000 (Wed, 07 Mar 2012) Log Message: ----------- ganglia: Update manifest to try and package 3.3.1 upstream release Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-07 23:18:49 UTC (rev 17327) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-07 23:32:11 UTC (rev 17328) @@ -139,6 +139,9 @@ ifeq ($(VERSION),3.2.0) TEST_SCRIPTS = endif +ifeq ($(VERSION),3.3.1) +TEST_SCRIPTS = +endif #INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Mar 8 03:13:20 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 08 Mar 2012 02:13:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17329] csw/mgar/pkg/git/trunk Message-ID: Revision: 17329 http://gar.svn.sourceforge.net/gar/?rev=17329&view=rev Author: bdwalton Date: 2012-03-08 02:13:20 +0000 (Thu, 08 Mar 2012) Log Message: ----------- git/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-03-07 23:32:11 UTC (rev 17328) +++ csw/mgar/pkg/git/trunk/Makefile 2012-03-08 02:13:20 UTC (rev 17329) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.7.9.2 +VERSION = 1.7.9.3 #PATCHLEVEL = rc1 CATEGORIES = devel GARTYPE = v2 Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2012-03-07 23:32:11 UTC (rev 17328) +++ csw/mgar/pkg/git/trunk/checksums 2012-03-08 02:13:20 UTC (rev 17329) @@ -1 +1 @@ -f2f0fc821ab074862c4a96de3f4cefbe git-1.7.9.2.tar.gz +f93b976649216d731fd9f9befb90a58c git-1.7.9.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Mar 8 03:45:41 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 08 Mar 2012 02:45:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[17330] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 17330 http://gar.svn.sourceforge.net/gar/?rev=17330&view=rev Author: bdwalton Date: 2012-03-08 02:45:40 +0000 (Thu, 08 Mar 2012) Log Message: ----------- git/trunk: drop fix for t3000 as upstream carries a better version Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-03-08 02:13:20 UTC (rev 17329) +++ csw/mgar/pkg/git/trunk/Makefile 2012-03-08 02:45:40 UTC (rev 17330) @@ -114,7 +114,6 @@ PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch PATCHFILES += 0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch -PATCHFILES += 0008-t0300-credentials-Word-around-a-solaris-bin-sh-bug.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files 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 Mar 8 08:29:17 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 08 Mar 2012 07:29:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17331] csw/mgar/pkg/lang-python/pygobject/trunk/Makefile Message-ID: Revision: 17331 http://gar.svn.sourceforge.net/gar/?rev=17331&view=rev Author: cgrzemba Date: 2012-03-08 07:29:16 +0000 (Thu, 08 Mar 2012) Log Message: ----------- lang-python/pygobject/trunk: change gar variable order in build recipe because problems with checkpkg Modified Paths: -------------- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2012-03-08 02:45:40 UTC (rev 17330) +++ csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2012-03-08 07:29:16 UTC (rev 17331) @@ -15,19 +15,6 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -PACKAGES += CSWpy-gobject -SPKG_DESC_CSWpy-gobject = $(DESCRIPTION) -PKGFILES_CSWpy-gobject = $(libdir)/python/site-packages/.* -RUNTIME_DEP_PKGS_CSWpy-gobject += CSWpython -RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibpyglib2-0python0 -OBSOLETED_BY_CSWpy-gobject += CSWpygobject - PACKAGES += CSWlibpyglib2-0python0 CATALOGNAME_CSWlibpyglib2-0python0 = libpyglib2_0python0 PKGFILES_CSWlibpyglib2-0python0 += $(call baseisadirs,$(libdir),libpyglib-2\.0-python\.so\.0\.0\.0) @@ -38,25 +25,29 @@ RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibglib2-0-0 - -# PACKAGES += CSWlibpyglib-2-0-py0 -# SPKG_DESC_CSWlibpyglib-2-0-py0 = Runtime library for the Python GObject library -# PKGFILES_CSWlibpyglib-2-0-py0 = $(libdir)/libpyglib-2.0-python.so.0.* -# RUNTIME_DEP_PKGS_CSWlibpyglib-2-0-py0 += CSWglib2 -# RUNTIME_DEP_PKGS_CSWlibpyglib-2-0-py0 += CSWlibintl8 -# soname results in a package name that is too long so it was shortened -# CHECKPKG_OVERRIDES_CSWlibpyglib-2-0-py0 += shared-lib-pkgname-mismatch - PACKAGES += CSWpy-gobject-dev +OBSOLETED_BY_CSWpy-gobject-dev += CSWpygobject SPKG_DESC_CSWpy-gobject-dev = Development files for the Python GObject library RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibpyglib2-0python0 RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWpython -OBSOLETED_BY_CSWpy-gobject-dev += CSWpygobject # These are just comments CHECKPKG_OVERRIDES_CSWpy-gobject-dev += file-with-bad-content|/usr/local|root/opt/csw/share/pygobject/2.0/codegen/defsgen.py CHECKPKG_OVERRIDES_CSWpy-gobject-dev += file-with-bad-content|/usr/local|root/opt/csw/share/pygobject/2.0/codegen/h2def.py +PACKAGES += CSWpy-gobject +OBSOLETED_BY_CSWpy-gobject += CSWpygobject +SPKG_DESC_CSWpy-gobject = $(DESCRIPTION) +PKGFILES_CSWpy-gobject = $(libdir)/python/site-packages/.* +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWpython +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibpyglib2-0python0 + PYCOMPILE = 1 STRIP_LIBTOOL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Mar 8 10:28:19 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Mar 2012 09:28:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[17332] csw/mgar/pkg/spidermonkey/trunk Message-ID: Revision: 17332 http://gar.svn.sourceforge.net/gar/?rev=17332&view=rev Author: wahwah Date: 2012-03-08 09:28:19 +0000 (Thu, 08 Mar 2012) Log Message: ----------- work on version 185 in progress Modified Paths: -------------- csw/mgar/pkg/spidermonkey/trunk/Makefile csw/mgar/pkg/spidermonkey/trunk/checksums Modified: csw/mgar/pkg/spidermonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/spidermonkey/trunk/Makefile 2012-03-08 07:29:16 UTC (rev 17331) +++ csw/mgar/pkg/spidermonkey/trunk/Makefile 2012-03-08 09:28:19 UTC (rev 17332) @@ -1,5 +1,7 @@ +# $Id$ + NAME = spidermonkey -VERSION = 1.7.0 +VERSION = 1.0.0 CATEGORIES = lib GARTYPE = v2 @@ -10,35 +12,42 @@ VENDOR_URL = http://www.mozilla.org/js/spidermonkey/ MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/js/ -DISTFILES = js-$(VERSION).tar.gz -UFILES_REGEX = js-(\d+(?:\.\d+)*).tar.gz +DISTFILES = js185-$(VERSION).tar.gz # the sun5.8 x86 config file is missing so # we are using our own #DISTFILES += SunOS5.8_i86pc.mk -DISTNAME = js +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +prefix = $(BUILD_PREFIX)/gxx -# we find the os string used by the makefile by using -# the same code (from config.mk) -OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/)) -# Attempt to differentiate between SunOS 5.4 and x86 5.4 -OS_CPUARCH := $(shell uname -m) -ifeq ($(OS_CPUARCH),i86pc) -OS_RELEASE := $(shell uname -r)_$(OS_CPUARCH) -else -OS_RELEASE := $(shell uname -r) -endif -OS_CONFIG := $(OS_ARCH)$(OS_OBJTYPE)$(OS_RELEASE) +DISTNAME = js-1.8.5 +# # we find the os string used by the makefile by using +# # the same code (from config.mk) +# OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/)) +# # Attempt to differentiate between SunOS 5.4 and x86 5.4 +# OS_CPUARCH := $(shell uname -m) +# ifeq ($(OS_CPUARCH),i86pc) +# OS_RELEASE := $(shell uname -r)_$(OS_CPUARCH) +# else +# OS_RELEASE := $(shell uname -r) +# endif +# OS_CONFIG := $(OS_ARCH)$(OS_OBJTYPE)$(OS_RELEASE) + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_SCRIPTS = +CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom TEST_SCRIPTS = INSTALL_SCRIPTS = custom +GARCOMPILER = GNU +BUILD_DEP_PKGS = CSWautoconf2-13 +BUILD_DEP_PKGS += CSWnspr-dev +BUILD_DEP_PKGS += CSWgcc4core +BUILD_DEP_PKGS += CSWgcc4g++ include gar/category.mk @@ -47,19 +56,37 @@ # it seems to be used to define special debug functions, # for developper only I suppose. # we just change it by echo to avoid error messages - perl -pi -e 's/whoami/echo/g' $(WORKSRC)/src/config.mk + # perl -pi -e 's/whoami/echo/g' $(WORKSRC)/src/config.mk -pre-build: +pre-configure-modulated: + (cd $(WORKSRC)/js/src && autoconf-2.13) + @$(MAKECOOKIE) + +configure-custom: + (cd $(WORKSRC)/js && mkdir -p objdir && cd objdir && \ + CFLAGS="-DJS_C_STRINGS_ARE_UTF8" \ + CXXFLAGS="-fshort-enums -DJS_C_STRINGS_ARE_UTF8" \ + CXX=/opt/csw/bin/g++ CC=/opt/csw/bin/gcc \ + ../src/configure \ + --disable-pedantic \ + --with-nspr-prefix=/opt/csw \ + --prefix=/opt/csw/gxx \ + --with-system-nspr) + @$(MAKECOOKIE) + +disabled-pre-build: # if we are on x86, we install our own config file # and remove the lock_SunOS.s cause the makefile # always tries to compile it (why so ?) - ( if [ "$(OS_CPUARCH)" = "i86pc" ]; then \ - cp $(WORKDIR)/SunOS5.8_i86pc.mk $(WORKSRC)/src/config; \ - rm -f $(WORKSRC)/src/lock_SunOS.s; \ - fi ) + # ( if [ "$(OS_CPUARCH)" = "i86pc" ]; then \ + # cp $(WORKDIR)/SunOS5.8_i86pc.mk $(WORKSRC)/src/config; \ + # rm -f $(WORKSRC)/src/lock_SunOS.s; \ + # fi ) build-custom: - cd $(WORKSRC)/src && BUILD_OPT=1 $(MAKE) -f Makefile.ref + # cd $(WORKSRC)/js/src && DISABLE_JIT=1 BUILD_OPT=1 $(MAKE) -f Makefile.ref + cd $(WORKSRC)/js/objdir && $(MAKE) + @$(MAKECOOKIE) install-custom: ginstall -d $(DESTDIR)$(includedir) Modified: csw/mgar/pkg/spidermonkey/trunk/checksums =================================================================== --- csw/mgar/pkg/spidermonkey/trunk/checksums 2012-03-08 07:29:16 UTC (rev 17331) +++ csw/mgar/pkg/spidermonkey/trunk/checksums 2012-03-08 09:28:19 UTC (rev 17332) @@ -1 +1 @@ -5571134c3863686b623ebe4e6b1f6fe6 js-1.7.0.tar.gz +a4574365938222adca0a6bd33329cb32 js185-1.0.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Mar 8 14:01:36 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 08 Mar 2012 13:01:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[17333] csw/mgar/pkg/ganglia/trunk/Makefile Message-ID: Revision: 17333 http://gar.svn.sourceforge.net/gar/?rev=17333&view=rev Author: d_pocock Date: 2012-03-08 13:01:35 +0000 (Thu, 08 Mar 2012) Log Message: ----------- ganglia: Update PCRE dependency to CSWlibpcre1 Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-08 09:28:19 UTC (rev 17332) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-08 13:01:35 UTC (rev 17333) @@ -52,15 +52,15 @@ BUILD_DEP_PKGS += CSWrrdtool CSWrrdtool-dev RUNTIME_DEP_PKGS_CSWlibganglia0 = CSWlibexpat1 CSWlibconfuse0 CSWlibapr1-0 -RUNTIME_DEP_PKGS_CSWlibganglia0 += CSWlibpcre0 +RUNTIME_DEP_PKGS_CSWlibganglia0 += CSWlibpcre1 RUNTIME_DEP_PKGS_CSWgangliaagent = CSWlibexpat1 CSWlibconfuse0 CSWlibapr1-0 -RUNTIME_DEP_PKGS_CSWgangliaagent += CSWlibganglia0 CSWlibpcre0 +RUNTIME_DEP_PKGS_CSWgangliaagent += CSWlibganglia0 CSWlibpcre1 RUNTIME_DEP_PKGS_CSWgangliamodpython = CSWgangliaagent CHECKPKG_OVERRIDES_CSWgangliamodpython += surplus-dependency|CSWgangliaagent RUNTIME_DEP_PKGS_CSWganglia-dev = CSWlibganglia0 RUNTIME_DEP_PKGS_CSWgangliagmetad = CSWlibexpat1 CSWlibconfuse0 CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWlibganglia0 CSWgangliaagent CSWrrdtool -RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWlibrrd4 CSWlibpcre0 +RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWlibrrd4 CSWlibpcre1 CHECKPKG_OVERRIDES_CSWgangliagmetad += surplus-dependency|CSWgangliaagent CHECKPKG_OVERRIDES_CSWgangliagmetad += surplus-dependency|CSWrrdtool RUNTIME_DEP_PKGS_CSWgangliaweb = CSWgangliagmetad This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Mar 8 14:30:37 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 08 Mar 2012 13:30:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17334] csw/mgar/pkg/ganglia/trunk/Makefile Message-ID: Revision: 17334 http://gar.svn.sourceforge.net/gar/?rev=17334&view=rev Author: d_pocock Date: 2012-03-08 13:30:37 +0000 (Thu, 08 Mar 2012) Log Message: ----------- ganglia: tweak SONAME version Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-08 13:01:35 UTC (rev 17333) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-08 13:30:37 UTC (rev 17334) @@ -1,5 +1,6 @@ NAME = ganglia VERSION = 3.3.1 +VERSION_U = 3_3_1 CATEGORIES = utils GARTYPE = v2 @@ -171,9 +172,9 @@ PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modproc.so PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modgstatus.so -PKGFILES_CSWlibganglia0 += $(call pkgfiles_lib,libganglia-3.2.0.0.so.0) +PKGFILES_CSWlibganglia0 += $(call pkgfiles_lib,libganglia-$(VERSION).0.so.0) -CHECKPKG_OVERRIDES_CSWlibganglia0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libganglia-3.2.0.0.so.0.0.0|soname=libganglia-3.2.0.0.so.0|pkgname=CSWlibganglia0|expected=CSWlibganglia3-2-0-0-0 +CHECKPKG_OVERRIDES_CSWlibganglia0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libganglia-$(VERSION).0.so.0.0.0|soname=libganglia-$(VERSION).0.so.0|pkgname=CSWlibganglia0|expected=CSWlibganglia$(VERSION_U)-0-0 PKGFILES_CSWgangliamodpython = .*python.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Mar 8 14:43:41 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 08 Mar 2012 13:43:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[17335] csw/mgar/pkg/ganglia/trunk/Makefile Message-ID: Revision: 17335 http://gar.svn.sourceforge.net/gar/?rev=17335&view=rev Author: d_pocock Date: 2012-03-08 13:43:40 +0000 (Thu, 08 Mar 2012) Log Message: ----------- ganglia: tweak SONAME version Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-08 13:30:37 UTC (rev 17334) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-08 13:43:40 UTC (rev 17335) @@ -1,6 +1,6 @@ NAME = ganglia VERSION = 3.3.1 -VERSION_U = 3_3_1 +VERSION_U = 3-3-1 CATEGORIES = utils GARTYPE = v2 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 Mar 8 16:20:34 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 08 Mar 2012 15:20:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[17336] csw/mgar/pkg/389-ds-base/trunk Message-ID: Revision: 17336 http://gar.svn.sourceforge.net/gar/?rev=17336&view=rev Author: cgrzemba Date: 2012-03-08 15:20:33 +0000 (Thu, 08 Mar 2012) Log Message: ----------- 389-ds-base/trunk: bump version 1.2.10.3 Modified Paths: -------------- csw/mgar/pkg/389-ds-base/trunk/Makefile csw/mgar/pkg/389-ds-base/trunk/checksums Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-03-08 13:43:40 UTC (rev 17335) +++ csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-03-08 15:20:33 UTC (rev 17336) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = 389-ds-base -VERSION = 1.2.10.2 +VERSION = 1.2.10.3 GARTYPE = v2 CATEGORIES = server @@ -21,6 +21,8 @@ LICENSE = LICENSE +GARCOMPILER = SOS12U3 + PATCHFILES += 0005-add-standard-path.patch PATCHFILES += 0006-replace-SV-sh-with-Posix-sh.patch PATCHFILES += 0005-smf-autoenable-no.patch @@ -28,7 +30,7 @@ # until Red Hat Bugzilla Bug 773617 is open do it yourself PATCHFILES += 0006-add-i386-platform-in-configure.ac.patch PATCHFILES += 0007-fixup-Makefile.am.patch -PATCHFILES += 0007-fixup-plugin_syntax.c.patch +# PATCHFILES += 0007-fixup-plugin_syntax.c.patch INITSMF = /etc/opt/csw/init.d/dirsrv RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssldap60 @@ -67,7 +69,6 @@ CHECKPKG_OVERRIDES_CSW389-ds-base += surplus-dependency|CSWlibnssdbm3 -# GARCOMPILER = SOS12U2 EXTRA_LIB = /opt/csw/bdb48/lib # remove -I/opt/csw/include CPPFLAGS = Modified: csw/mgar/pkg/389-ds-base/trunk/checksums =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/checksums 2012-03-08 13:43:40 UTC (rev 17335) +++ csw/mgar/pkg/389-ds-base/trunk/checksums 2012-03-08 15:20:33 UTC (rev 17336) @@ -1 +1 @@ -35b326f94ea122eba0b4d52d515ee628 389-ds-base-1.2.10.2.tar.bz2 +7c9c6cc2ef523980e816724215698fa6 389-ds-base-1.2.10.3.tar.bz2 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 Mar 8 16:46:42 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 08 Mar 2012 15:46:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[17337] csw/mgar/pkg/lang-python/pycairo/trunk/Makefile Message-ID: Revision: 17337 http://gar.svn.sourceforge.net/gar/?rev=17337&view=rev Author: cgrzemba Date: 2012-03-08 15:46:42 +0000 (Thu, 08 Mar 2012) Log Message: ----------- lang-python/pycairo/trunk: update build recipe Modified Paths: -------------- csw/mgar/pkg/lang-python/pycairo/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pycairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pycairo/trunk/Makefile 2012-03-08 15:20:33 UTC (rev 17336) +++ csw/mgar/pkg/lang-python/pycairo/trunk/Makefile 2012-03-08 15:46:42 UTC (rev 17337) @@ -12,22 +12,26 @@ MASTER_SITES = http://www.cairographics.org/releases/ DISTFILES = py2cairo-$(VERSION).tar.gz -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc + +PYCOMPILE = 1 +# EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES = none cswpycompile -RUNTIME_DEP_PKGS += CSWcswclassutils +PACKAGES = CSWpy-cairo +SPKG_DESC_CSWpy-cairo = $(DESCRIPTION); main +OBSOLETED_BY_CSWpy-cairo = CSWpycairo +RUNTIME_DEP_PKGS_CSWpy-cairo += CSWpython +RUNTIME_DEP_PKGS_CSWpy-cairo += CSWlibcairo2 + # We define upstream file regex so we can be notifed of # new upstream software release UFILES_REGEX = py2cairo-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWpy-cairo -CATALOGNAME = py_cairo -RUNTIME_DEP_PKGS = CSWlibcairo CSWpython - CAIRO_LIBS = -L/opt/csw/lib -R/opt/csw/lib/\$$ISALIST -lcairo CAIRO_CFLAGS = -I/opt/csw/include -I/opt/csw/include/cairo EXTRA_CONFIGURE_EXPORTS += CAIRO_LIBS CAIRO_CFLAGS + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Mar 8 18:06:38 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 08 Mar 2012 17:06:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[17338] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 17338 http://gar.svn.sourceforge.net/gar/?rev=17338&view=rev Author: bdwalton Date: 2012-03-08 17:06:38 +0000 (Thu, 08 Mar 2012) Log Message: ----------- gar/v2: do not rely on --remote parameter to git archive when extracting from an upstream git repo; cd to the bare repo and run command from there Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2012-03-08 15:46:42 UTC (rev 17337) +++ csw/mgar/gar/v2/gar.lib.mk 2012-03-08 17:06:38 UTC (rev 17338) @@ -606,7 +606,7 @@ # to supply an alternate target at their discretion git-extract-%: @echo " ===> Extracting Git Repo $(DOWNLOADDIR)/$* (Treeish: $(call GIT_TREEISH,$*))" - git --bare archive --prefix=$(NAME)-$(VERSION)/ --remote=file://$(abspath $(DOWNLOADDIR))/$*/ $(call GIT_TREEISH,$*) | gtar -xf - -C $(EXTRACTDIR) + ( cd $(abspath $(DOWNLOADDIR))/$*/; git --bare archive --prefix=$(NAME)-$(VERSION)/ $(call GIT_TREEISH,$*)) | gtar -xf - -C $(EXTRACTDIR) @$(MAKECOOKIE) # rule to extract files with unzip 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 Mar 9 13:19:14 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Mar 2012 12:19:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[17339] csw/mgar/pkg Message-ID: Revision: 17339 http://gar.svn.sourceforge.net/gar/?rev=17339&view=rev Author: dmichelsen Date: 2012-03-09 12:19:14 +0000 (Fri, 09 Mar 2012) Log Message: ----------- pidentd/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/pidentd/ csw/mgar/pkg/pidentd/Makefile csw/mgar/pkg/pidentd/branches/ csw/mgar/pkg/pidentd/tags/ csw/mgar/pkg/pidentd/trunk/ csw/mgar/pkg/pidentd/trunk/Makefile csw/mgar/pkg/pidentd/trunk/checksums csw/mgar/pkg/pidentd/trunk/files/ csw/mgar/pkg/pidentd/trunk/files/pidentd-3.0.19-ipv6-20080101.diff csw/mgar/pkg/pidentd/trunk/files/pidentd.diff Added: csw/mgar/pkg/pidentd/Makefile =================================================================== --- csw/mgar/pkg/pidentd/Makefile (rev 0) +++ csw/mgar/pkg/pidentd/Makefile 2012-03-09 12:19:14 UTC (rev 17339) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/pidentd/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/pidentd/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidentd/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pidentd/trunk/Makefile 2012-03-09 12:19:14 UTC (rev 17339) @@ -0,0 +1,50 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = pidentd +VERSION = 3.0.19 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = Portable ident daemon +define BLURB +endef + +MASTER_SITES = ftp://ftp.stack.nl/pub/users/johans/pidentd/ +DISTFILES = $(DISTNAME).tar.gz + +PATCHDIRLEVEL = 0 + +# From ftp://ftp.stack.nl/pub/users/johans/pidentd/ +PATCHFILES += pidentd-3.0.19-ipv6-20080101.diff.gz + +# From http://www.vlakno.cz/~rdivacky/pidentd.diff +PATCHFILES += pidentd.diff + +VENDOR_URL = http://www.lysator.liu.se/~pen/pidentd/ + +LICENSE = README + +PACKAGES += CSWpidentd +SPKG_DESC_CSWmypkg = Portable ident daemon +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWpidentd += CSWlibssl0-9-8 + +REINPLACEMENTS += ignoreisa +REINPLACE_MATCH_ignoreisa = ISA=" +REINPLACE_WITH_ignoreisa = ISA="IGNORE +REINPLACE_FILES_ignoreisa += configure + +BUILD64 = 1 +ISAEXEC = 1 + +# There is no testsuite +TEST_SCRIPTS = + +INSTALL_OVERRIDE_VARS += mandir +INSTALL_OVERRIDE_VAR_mandir = $(DESTDIR)$(mandir) +INSTALL_OVERRIDE_VARS += sbindir +INSTALL_OVERRIDE_VAR_sbindir = $(DESTDIR)$(sbindir) + +include gar/category.mk + Property changes on: csw/mgar/pkg/pidentd/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/pidentd/trunk/checksums =================================================================== --- csw/mgar/pkg/pidentd/trunk/checksums (rev 0) +++ csw/mgar/pkg/pidentd/trunk/checksums 2012-03-09 12:19:14 UTC (rev 17339) @@ -0,0 +1,2 @@ +887197d0c346b467449917666ee2a7a4 pidentd-3.0.19-ipv6-20080101.diff.gz +ee8d3608a2590827cf8b55caeb1d7b93 pidentd-3.0.19.tar.gz Added: csw/mgar/pkg/pidentd/trunk/files/pidentd-3.0.19-ipv6-20080101.diff =================================================================== --- csw/mgar/pkg/pidentd/trunk/files/pidentd-3.0.19-ipv6-20080101.diff (rev 0) +++ csw/mgar/pkg/pidentd/trunk/files/pidentd-3.0.19-ipv6-20080101.diff 2012-03-09 12:19:14 UTC (rev 17339) @@ -0,0 +1,1096 @@ +;; IPv6 patch for pidentd-3.0.18 +;; Sep 27, 2005 by Johan van Selst +;; based on an earlier patch +;; Feb 27, 2004 by Hajimu UMEMOTO +;; +--- configure.orig Tue Sep 27 20:47:40 2005 ++++ configure Tue Sep 27 20:47:42 2005 +@@ -2292,6 +2292,13 @@ case "$host" in + *-aix4.2* | *-aix4.3*) + host_os=aix42 + ;; ++ *-freebsd2* | *-freebsd3*) ++ host_os=freebsd2 ++ ;; ++ *-freebsd* ) ++ host_os=freebsd2 ++ CPPFLAGS="$CPPFLAGS -DHAVE_IPV6=1" ++ ;; + *-irix4*) + host_os=irix4 + cat >>confdefs.h <<\_ACEOF +--- src/conf.c.orig Thu Jan 21 01:00:33 1999 ++++ src/conf.c Tue Sep 27 20:45:52 2005 +@@ -115,15 +115,13 @@ + path, line, arg); + } + +-#if 0 /* Enable when we have a str2addr() */ + else if (strcasecmp(cp, "server:address") == 0) + { +- if (str2addr(arg, &listen_address) < 0) ++ if (str2addr(arg, &listen_addr) < 0) + syslog(LOG_ERR, "%s: %d: invalid address: %s", + path, line, arg); + } +-#endif +- ++ + else if (strcasecmp(cp, "server:user") == 0) + { + if (str2uid(arg, &server_uid, &server_gid) < 0) +--- src/idecrypt.c.orig Mon Apr 23 22:40:15 2001 ++++ src/idecrypt.c Tue Sep 27 20:45:52 2005 +@@ -90,14 +90,14 @@ + + + static char * +-decrypt_packet(unsigned char *packet) ++decrypt_packet(unsigned char *packet, int len) + { + union data r; +- int i, j; ++ int i, j, count; + time_t date_in_sec; + char *date_in_ascii; + char keybuf[1024+1]; +- char buf1[32], buf2[32]; ++ char buf1[40], buf2[40]; + struct sockaddr_gen ip_local, ip_remote; + int keyfile_fd; + des_cblock key_bin; +@@ -120,32 +120,29 @@ + keybuf[sizeof(keybuf)-1] = '\0'; + des_string_to_key(keybuf, &key_bin); + des_set_key(&key_bin, sched); +- +- +- for (i = 0, j = 0; i < 24; i += 3, j += 4) ++ ++ count = (len == 32) ? 24 : 48; ++ for (i = 0, j = 0; i < count; i += 3, j += 4) + { + r.chars[i ] = (to_bin[packet[j ]] << 2) + (to_bin[packet[j+1]] >> 4); + r.chars[i+1] = (to_bin[packet[j+1]] << 4) + (to_bin[packet[j+2]] >> 2); + r.chars[i+2] = (to_bin[packet[j+2]] << 6) + (to_bin[packet[j+3]]); + } +- +- des_ecb_encrypt((des_cblock *)&(r.longs[4]), +- (des_cblock *)&(r.longs[4]), +- sched, DES_DECRYPT); +- r.longs[4] ^= r.longs[2]; +- r.longs[5] ^= r.longs[3]; +- +- des_ecb_encrypt((des_cblock *)&(r.longs[2]), +- (des_cblock *)&(r.longs[2]), +- sched, DES_DECRYPT); +- +- r.longs[2] ^= r.longs[0]; +- r.longs[3] ^= r.longs[1]; ++ ++ count = (len == 32) ? 2 : 8; ++ for (i = count; i >= 0; i -= 2) { ++ des_ecb_encrypt((des_cblock *)&(r.longs[i+2]), ++ (des_cblock *)&(r.longs[i+2]), ++ sched, DES_DECRYPT); ++ r.longs[i+2] ^= r.longs[i ]; ++ r.longs[i+3] ^= r.longs[i+1]; ++ } + des_ecb_encrypt((des_cblock *)&(r.longs[0]), + (des_cblock *)&(r.longs[0]), + sched, DES_DECRYPT); + +- for (i = 1; i < 6; i++) ++ count = (len == 32) ? 6 : 12; ++ for (i = 1; i < count; i++) + { + r.longs[0] ^= r.longs[i]; + } +@@ -159,9 +156,37 @@ + GoodKey: + date_in_sec = ntohl(r.fields.date); + date_in_ascii = ctime(&date_in_sec); +- ++ ++#ifdef HAVE_IPV6 ++ if (len ==32) { ++ ip_local.sg_family = ip_remote.sg_family = AF_INET; ++#ifdef SIN6_LEN ++ ip_local.sg_sa.sa_len = sizeof(struct sockaddr_in); ++ ip_remote.sg_sa.sa_len = sizeof(struct sockaddr_in); ++#endif ++ ip_local.sg_sin.sin_addr.s_addr = r.fields.ip_local; ++ ip_remote.sg_sin.sin_addr.s_addr = r.fields.ip_remote; ++ ip_local.sg_sin.sin_port = r.fields.port_local; ++ ip_remote.sg_sin.sin_port = r.fields.port_remote; ++ } else { ++ ip_local.sg_family = ip_remote.sg_family = AF_INET6; ++#ifdef SIN6_LEN ++ ip_local.sg_sa.sa_len = sizeof(struct sockaddr_in6); ++ ip_remote.sg_sa.sa_len = sizeof(struct sockaddr_in6); ++#endif ++ memcpy(&ip_local.sg_sin6.sin6_addr, &r.fields6.ip_local, ++ sizeof(struct in6_addr)); ++ memcpy(&ip_remote.sg_sin6.sin6_addr, &r.fields6.ip_remote, ++ sizeof(struct in6_addr)); ++ ip_local.sg_sin6.sin6_port = r.fields6.port_local; ++ ip_remote.sg_sin6.sin6_port = r.fields6.port_remote; ++ } ++#else + memcpy(SGADDRP(ip_local), &(r.fields.ip_local), sizeof(ip_local)); + memcpy(SGADDRP(ip_remote), &(r.fields.ip_remote), sizeof(ip_remote)); ++ SGPORT(ip_local) = r.fields.port_local; ++ SGPORT(ip_remote) = r.fields.port_remote; ++#endif + + /* FIXME: uid_t isn't necessarily short. */ + #ifdef HAVE_SNPRINTF +@@ -173,10 +198,10 @@ + date_in_ascii, + ntohs(r.fields.uid), + s_inet_ntox(&ip_local, buf1, sizeof(buf1)), +- (unsigned) ntohs(r.fields.port_local), ++ (unsigned) ntohs(SGPORT(ip_local)), + s_inet_ntox(&ip_remote, buf2, sizeof(buf2)), +- (unsigned) ntohs(r.fields.port_remote)); +- ++ (unsigned) ntohs(SGPORT(ip_remote))); ++ + close(keyfile_fd); + return readable; + } +@@ -187,7 +212,7 @@ + { + int c; + int i; +- char buf[32]; ++ char buf[64]; + char *result; + + +@@ -204,32 +229,38 @@ + putchar(c); + continue; + } +- +- for (i = 0; i < 32; i++) ++ ++ for (i = 0; i < 64; i++) + { + c = getc(f); + if (c == EOF || c < 0 || c > 255) + break; ++#ifdef HAVE_IPV6 ++ if (i == 32 && c == ']') /* `]' is not base64 char */ ++ break; ++#else ++ if (i == 32) ++ break; ++#endif + if (!is_base_64[c]) + break; + buf[i] = c; + } +- +- if (i == 32) ++ ++ if (i == 64) + c = getc(f); +- +- if (i < 32 || c != ']') ++ ++ if ((i != 32 && i != 64) || c != ']') + { + putchar('['); + fwrite(buf, 1, i, stdout); + goto Same; + } +- +- +- if ((result = decrypt_packet((unsigned char *) buf)) == NULL) ++ ++ if ((result = decrypt_packet((unsigned char *) buf, i)) == NULL) + { + putchar('['); +- fwrite(buf, 1, 32, stdout); ++ fwrite(buf, 1, i, stdout); + putchar(']'); + } + else +--- src/k_freebsd2.c.orig Tue Sep 27 20:26:06 2005 ++++ src/k_freebsd2.c Tue Sep 27 20:26:06 2005 +@@ -0,0 +1,293 @@ ++/* ++** freebsd2.c - FreeBSD kernel access functions. ++** ++** Copyright (c) 1997 Peter Eriksson ++** Copyright (c) 2000-2004 Hajimu UMEMOTO ++** ++** This program is free software; you can redistribute it and/or ++** modify it as you wish - as long as you don't claim that you wrote ++** it. ++** ++** 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. ++*/ ++ ++#include "config.h" ++ ++#include ++#include ++#include ++#include ++#include ++#if __FreeBSD_version >= 800000 ++# define _WANT_FILE ++# include ++#else /* __FreeBSD < 8 */ ++# define _KERNEL ++# include ++# undef _KERNEL ++#endif /* __FreeBSD__ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "pidentd.h" ++ ++struct kainfo { ++ kvm_t *kd; ++ int nfile; ++ struct nlist nl[3]; ++}; ++ ++static int getbuf(struct kainfo *, u_long, char *, u_int, char *); ++static struct socket *getlist(struct kainfo *, struct inpcbhead *, ++ struct sockaddr_gen *, struct sockaddr_gen *); ++ ++int ++ka_init(void) ++{ ++ return 0; ++} ++ ++int ++ka_open(void **misc) ++{ ++ struct kainfo *kp = s_malloc(sizeof(struct kainfo)); ++ ++ /* ++ ** Open the kernel memory device ++ */ ++ kp->kd = (kvm_t *)kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL); ++ if (kp->kd == NULL) ++ { ++ syslog(LOG_ERR, "kvm_open: %m"); ++ s_free(kp); ++ return -1; ++ } ++ ++#define N_TCB 0 ++#define N_BTEXT 1 ++ kp->nl[N_TCB].n_name = "_tcb"; ++ kp->nl[N_BTEXT].n_name = "_btext"; ++ kp->nl[2].n_name = ""; ++ /* ++ ** Extract offsets to the needed variables in the kernel ++ */ ++ if (kvm_nlist(kp->kd, kp->nl) < 0) ++ { ++ syslog(LOG_ERR, "kvm_nlist: %m"); ++ kvm_close(kp->kd); ++ s_free(kp); ++ return -1; ++ } ++ ++ *misc = (void *)kp; ++ return 0; ++} ++ ++/* ++** Get a piece of kernel memory with error handling. ++** Returns 1 if call succeeded, else 0 (zero). ++*/ ++static int ++getbuf(struct kainfo *kp, unsigned long addr, char *buf, unsigned int len, ++ char *what) ++{ ++ if (addr < kp->nl[N_BTEXT].n_value || /* Overkill.. */ ++ addr >= (unsigned long)0xFFC00000 || ++ (addr + len) < kp->nl[N_BTEXT].n_value || ++ (addr + len) >= (unsigned long)0xffc00000) ++ { ++ syslog(LOG_ERR, ++ "getbuf: bad address (%08x not in %08x-0xFFC00000) - %s", ++ addr, kp->nl[N_BTEXT].n_value, what); ++ return 0; ++ } ++ ++ if (kvm_read(kp->kd, addr, buf, len) < 0) ++ { ++ syslog(LOG_ERR, "getbuf: kvm_read(%08x, %d) - %s : %m", ++ addr, len, what); ++ return 0; ++ } ++ ++ return 1; ++} ++ ++/* ++** Traverse the inpcb list until a match is found. ++** Returns NULL if no match. ++*/ ++static struct socket * ++getlist(struct kainfo *kp, struct inpcbhead *pcbhead, ++ struct sockaddr_gen *remote, struct sockaddr_gen *local) ++{ ++ struct inpcb *head, pcbp; ++ struct sockaddr_gen fsg, lsg; ++ int fam, fport, lport, alen; ++ char *faddr, *laddr, *paddr; ++ ++#ifdef HAVE_IPV6 ++ if (SGFAM(*remote) == AF_INET6 && ++ IN6_IS_ADDR_V4MAPPED(&remote->sg_sin6.sin6_addr)) ++ { ++ memset(&fsg, 0, sizeof(fsg)); ++ fsg.sg_family = AF_INET; ++ fsg.sg_sin.sin_port = remote->sg_sin6.sin6_port; ++ memcpy(&fsg.sg_sin.sin_addr, &remote->sg_sin6.sin6_addr.s6_addr[12], ++ sizeof(fsg.sg_sin.sin_addr)); ++ remote = &fsg; ++ } ++ if (SGFAM(*local) == AF_INET6 && ++ IN6_IS_ADDR_V4MAPPED(&local->sg_sin6.sin6_addr)) ++ { ++ memset(&lsg, 0, sizeof(fsg)); ++ lsg.sg_family = AF_INET; ++ lsg.sg_sin.sin_port = local->sg_sin6.sin6_port; ++ memcpy(&lsg.sg_sin.sin_addr, &local->sg_sin6.sin6_addr.s6_addr[12], ++ sizeof(lsg.sg_sin.sin_addr)); ++ local = &lsg; ++ } ++ if ((fam = SGFAM(*remote)) != SGFAM(*local)) ++ return NULL; ++#endif ++ faddr = (char *)SGADDRP(*remote); ++ laddr = (char *)SGADDRP(*local); ++ fport = SGPORT(*remote); ++ lport = SGPORT(*local); ++ ++ for (head = pcbhead->lh_first; head != NULL; ++ head = pcbp.inp_list.le_next) ++ { ++ if (!getbuf(kp, (u_long)head, (char *)&pcbp, sizeof(struct inpcb), ++ "tcblist")) ++ break; ++#ifdef HAVE_IPV6 ++ if (pcbp.inp_vflag & INP_IPV4) ++ { ++ if (fam != AF_INET) ++ continue; ++ paddr = (char *)&pcbp.inp_faddr; ++ alen = sizeof(struct in_addr); ++ } ++ else if (pcbp.inp_vflag & INP_IPV6) ++ { ++ if (fam != AF_INET6) ++ continue; ++ paddr = (char *)&pcbp.in6p_faddr; ++ alen = sizeof(struct in6_addr); ++ } ++ else ++ continue; ++#else ++ paddr = (char *)&pcbp.inp_faddr; ++ alen = sizeof(struct in_addr); ++#endif ++ if (memcmp(paddr, faddr, alen) == 0 && pcbp.inp_fport == fport && ++ pcbp.inp_lport == lport) ++ return pcbp.inp_socket; ++ } ++ ++ return NULL; ++} ++ ++#if __FreeBSD_version < 500000 ++#define ki_fd kp_proc.p_fd ++#define ki_ruid kp_eproc.e_pcred.p_ruid ++#define ki_uid kp_eproc.e_ucred.cr_uid ++#endif ++ ++/* ++** Return the user number for the connection owner ++*/ ++int ++ka_lookup(void *vp, struct kernel *kp) ++{ ++ struct inpcbhead tcb; ++ struct socket *sockp; ++ struct kinfo_proc *kgp; ++ int i, nentries; ++ struct kainfo *kip = vp; ++ ++ kgp = kvm_getprocs(kip->kd, KERN_PROC_ALL, 0, &nentries); ++ if (kgp == NULL) ++ { ++ syslog(LOG_ERR, "kvm_getprocs: %m"); ++ return -1; ++ } ++ ++ /* -------------------- TCP PCB LIST -------------------- */ ++ if (!getbuf(kip, kip->nl[N_TCB].n_value, (char*)&tcb, sizeof(tcb), "tcb")) ++ return -1; ++ ++ if ((sockp = getlist(kip, &tcb, &kp->remote, &kp->local)) == NULL) ++ return 0; ++ ++ /* ++ ** Locate the file descriptor that has the socket in question ++ ** open so that we can get the 'ucred' information ++ */ ++ for (i = 0; i < nentries; i++) ++ { ++ if (kgp[i].ki_fd != NULL) ++ { ++ struct filedesc pfd; ++ struct file **ofiles, ofile; ++ int j; ++ ++ if (!getbuf(kip, (u_long)kgp[i].ki_fd, (char *)&pfd, sizeof(pfd), ++ "pfd")) ++ return -1; ++ ++ ofiles = (struct file **)s_malloc(pfd.fd_nfiles * ++ sizeof(struct file *)); ++ if (!ofiles) ++ { ++ syslog(LOG_ERR, "s_malloc failed"); ++ return -1; ++ } ++ ++ if (!getbuf(kip, (u_long)pfd.fd_ofiles, (char *)ofiles, ++ pfd.fd_nfiles * sizeof(struct file *), "ofiles")) ++ { ++ s_free(ofiles); ++ return -1; ++ } ++ ++ for (j = 0; j < pfd.fd_nfiles; j++) ++ { ++ if (!ofiles[j]) /* might be sparse */ ++ continue; ++ ++ if (!getbuf(kip, (u_long)ofiles[j], (char *)&ofile, ++ sizeof(struct file), "ofile")) ++ { ++ s_free(ofiles); ++ return -1; ++ } ++ ++ if (ofile.f_count == 0) ++ continue; ++ ++ if (ofile.f_type == DTYPE_SOCKET && ++ (struct socket *)ofile.f_data == sockp) ++ { ++ kp->ruid = kgp[i].ki_ruid; ++ kp->euid = kgp[i].ki_uid; ++ s_free(ofiles); ++ return 1; ++ } ++ } ++ ++ s_free(ofiles); ++ } ++ } ++ ++ return -1; ++} +--- src/kernel.c.orig Sun Jun 13 09:47:52 2004 ++++ src/kernel.c Tue Sep 27 20:45:52 2005 +@@ -81,7 +81,7 @@ + { + struct kernel *kp; + int attempt; +- char buf1[32]; ++ char buf1[40]; + + + if (debug) +--- src/main.c.orig Wed Jan 8 22:57:05 2003 ++++ src/main.c Tue Sep 27 20:45:52 2005 +@@ -133,6 +133,8 @@ + int log_header = 0; + + ++ SGINIT(listen_addr); ++ + if (argv[0] != NULL) + { + char *cp; +@@ -166,7 +168,7 @@ + conf_parse(PATH_CFGFILE, 1); + + +- while ((c = getopt(argc, argv, "lNVEdhbwiIemnop:u:g:t:C:P:K:L:")) != -1) ++ while ((c = getopt(argc, argv, "lNVEdhbwiIemnop:a:u:g:t:C:P:K:L:")) != -1) + switch (c) + { + #ifdef HAVE_LIBDES +@@ -231,6 +233,13 @@ + } + break; + ++ case 'a': ++ if (str2addr(optarg, &listen_addr) < 0) ++ return EXIT_FAILURE; ++ if (SGPORT(listen_addr) != 0) ++ listen_port = ntohs(SGPORT(listen_addr)); ++ break; ++ + case 't': + if (str2int(optarg, &request_timeout) < 0) + { +@@ -324,6 +333,9 @@ + + return EXIT_FAILURE; + } ++ ++ if (SGFAM(listen_addr) != AF_UNSPEC) ++ SGPORT(listen_addr) = htons(listen_port); + + if (debug) + program_header(stderr); +--- src/pdes.c.orig Sun May 21 21:07:05 2000 ++++ src/pdes.c Tue Sep 27 20:45:52 2005 +@@ -109,13 +109,14 @@ + + + int +-pdes_encrypt(struct kernel *kp, +- char result[33]) ++pdes_encrypt(struct kernel *kp, char result[PDES_BUFSIZ]) + { + union data r; + int i, j; + time_t bt; +- ++ int family = AF_INET; ++ int count; ++ + + r.fields.random = s_random(); + /* FIXME: uid_t isn't necessarily short. */ +@@ -126,39 +127,62 @@ + + time(&bt); + r.fields.date = htonl(bt); +- ++ ++#ifdef HAVE_IPV6 ++ if (SGFAM(kp->remote) == AF_INET) { ++ r.fields.ip_local = kp->local.sg_sin.sin_addr.s_addr; ++ r.fields.ip_remote = kp->remote.sg_sin.sin_addr.s_addr; ++ r.fields.port_local = kp->local.sg_sin.sin_port; ++ r.fields.port_remote = kp->remote.sg_sin.sin_port; ++ } else if (IN6_IS_ADDR_V4MAPPED(&kp->remote.sg_sin6.sin6_addr)) { ++ memcpy(&r.fields.ip_local, &kp->local.sg_sin6.sin6_addr.s6_addr[12], ++ sizeof(r.fields.ip_local)); ++ memcpy(&r.fields.ip_remote, &kp->remote.sg_sin6.sin6_addr.s6_addr[12], ++ sizeof(r.fields.ip_remote)); ++ r.fields.port_local = kp->local.sg_sin6.sin6_port; ++ r.fields.port_remote = kp->remote.sg_sin6.sin6_port; ++ } else { ++ family = AF_INET6; ++ memcpy(r.fields6.ip_local, &kp->local.sg_sin6.sin6_addr, ++ sizeof(r.fields6.ip_local)); ++ memcpy(r.fields6.ip_remote, &kp->remote.sg_sin6.sin6_addr, ++ sizeof(r.fields6.ip_remote)); ++ r.fields6.port_local = kp->local.sg_sin6.sin6_port; ++ r.fields6.port_remote = kp->remote.sg_sin6.sin6_port; ++ } ++#else + r.fields.ip_local = kp->local.sin_addr.s_addr; + r.fields.ip_remote = kp->remote.sin_addr.s_addr; + r.fields.port_local = kp->local.sin_port; + r.fields.port_remote = kp->remote.sin_port; ++#endif + + r.fields.checksum = 0; +- for (i = 1; i < 6; i++) ++ count = (family == AF_INET) ? 6 : 12; ++ for (i = 1; i < count; i++) + r.longs[0] ^= r.longs[i]; + + des_ecb_encrypt((des_cblock *)&(r.longs[0]), (des_cblock *)&(r.longs[0]), + sched, DES_ENCRYPT); +- +- r.longs[2] ^= r.longs[0]; +- r.longs[3] ^= r.longs[1]; +- +- des_ecb_encrypt((des_cblock *)&(r.longs[2]), (des_cblock *)&(r.longs[2]), +- sched, DES_ENCRYPT); +- +- r.longs[4] ^= r.longs[2]; +- r.longs[5] ^= r.longs[3]; +- +- des_ecb_encrypt((des_cblock *)&(r.longs[4]), (des_cblock *)&(r.longs[4]), +- sched, DES_ENCRYPT); + +- for (i = 0, j = 0; i < 24; i+=3, j+=4) ++ count = (family == AF_INET) ? 4 : 10; ++ for (i = 0; i < count; i += 2) { ++ r.longs[i+2] ^= r.longs[i ]; ++ r.longs[i+3] ^= r.longs[i+1]; ++ ++ des_ecb_encrypt((des_cblock *)&(r.longs[i+2]), ++ (des_cblock *)&(r.longs[i+2]), sched, DES_ENCRYPT); ++ } ++ ++ count = (family == AF_INET) ? 24 : 48; ++ for (i = 0, j = 0; i < count; i+=3, j+=4) + { + result[j ] = to_asc[63 & (r.chars[i ] >> 2)]; + result[j+1] = to_asc[63 & ((r.chars[i ] << 4) + (r.chars[i+1] >> 4))]; + result[j+2] = to_asc[63 & ((r.chars[i+1] << 2) + (r.chars[i+2] >> 6))]; + result[j+3] = to_asc[63 & (r.chars[i+2])]; + } +- result[32] = '\0'; ++ result[(family == AF_INET) ? 32 : 64] = '\0'; + + return 0; + } +--- src/pdes.h.orig Thu Jan 21 00:59:26 1999 ++++ src/pdes.h Tue Sep 27 20:45:52 2005 +@@ -28,17 +28,44 @@ + uint16_t port_remote; + }; + ++#ifdef HAVE_IPV6 ++struct info6 ++{ ++ uint32_t checksum; ++ uint16_t random; ++ /* FIXME: uid_t isn't necessarily short. */ ++ uint16_t uid; ++ uint32_t date; ++ uint32_t ip_local[4]; ++ uint32_t ip_remote[4]; ++ uint16_t port_local; ++ uint16_t port_remote; ++}; ++#endif ++ + typedef union data + { + struct info fields; ++#ifdef HAVE_IPV6 ++ struct info6 fields6; ++ uint32_t longs[12]; ++ unsigned char chars[48]; ++#else + uint32_t longs[6]; + unsigned char chars[24]; ++#endif + } data; + ++#ifdef HAVE_IPV6 ++#define PDES_BUFSIZ 65 ++#else ++#define PDES_BUFSIZ 33 ++#endif ++ + struct kernel; + + extern int pdes_init(char *keyfile); +-extern int pdes_encrypt(struct kernel *kp, char buffer[33]); ++extern int pdes_encrypt(struct kernel *kp, char buffer[PDES_BUFSIZ]); + extern int pdes_decrypt(void); + + #endif +--- src/send.c.orig Mon Nov 25 08:46:11 2002 ++++ src/send.c Tue Sep 27 20:45:52 2005 +@@ -67,7 +67,7 @@ + struct sockaddr_gen *remote_addr) + { + char buf[1024]; +- char buf2[32]; ++ char buf2[40]; + + + s_snprintf(buf, sizeof(buf), +@@ -86,7 +86,7 @@ + send_result(int fd, + struct kernel *kp) + { +- char buf[2048], pbuf[2048], buf2[32]; ++ char buf[2048], pbuf[2048], buf2[40]; + struct passwd pwb, *pp = NULL; + uid_t uid; + +@@ -118,7 +118,7 @@ + #ifdef HAVE_LIBDES + if (encrypt_flag) + { +- char buffer[33]; ++ char buffer[PDES_BUFSIZ]; + + pdes_encrypt(kp, buffer); + s_snprintf(buf, sizeof(buf), +@@ -167,7 +167,7 @@ + send_version(int fd, + struct sockaddr_gen *remote_addr) + { +- char buf[1024], buf2[32]; ++ char buf[1024], buf2[40]; + + s_snprintf(buf, sizeof(buf), + "0 , 0 : X-VERSION : pidentd %s for %s (%s %s)\r\n", +--- src/server.c.orig Fri Mar 22 22:42:33 2002 ++++ src/server.c Tue Sep 27 20:45:52 2005 +@@ -25,11 +25,13 @@ + + + +-int listen_sock = -1; ++int listen_sock; + int listen_port = IPPORT_IDENT; +-int listen_addr = INADDR_ANY; ++struct sockaddr_gen listen_addr; + int listen_backlog = 256; + ++static int listen_fd[2] = { -1, -1 }; ++static int listen_nfds = 0; + + static int + unlimit_nofile(void) +@@ -58,14 +60,49 @@ + } + + ++static int ++server_socket(void) ++{ ++ static int one = 1; ++ ++ ++ listen_fd[listen_nfds] = socket(SGFAM(listen_addr), SOCK_STREAM, 0); ++ if (listen_fd[listen_nfds] < 0) ++ { ++ syslog(LOG_DEBUG, "socket(AF_INET, SOCK_STREAM) failed: %m"); ++ return -1; ++ } ++ ++ (void) setsockopt(listen_fd[listen_nfds], SOL_SOCKET, SO_REUSEADDR, ++ (void *) &one, sizeof(one)); ++#ifdef IPV6_V6ONLY ++ if (SGFAM(listen_addr) == AF_INET6) ++ (void) setsockopt(listen_fd[listen_nfds], IPPROTO_IPV6, IPV6_V6ONLY, ++ (void *) &one, sizeof(one)); ++#endif ++ ++ if (bind(listen_fd[listen_nfds], (struct sockaddr *) &listen_addr, ++ SGSOCKSIZE(listen_addr)) < 0) ++ { ++ syslog(LOG_DEBUG, "bind(port=%d) failed: %m", ++ ntohs(SGPORT(listen_addr))); ++ s_close(listen_fd[listen_nfds]); ++ listen_fd[listen_nfds] = -1; ++ return -1; ++ } ++ ++ listen_nfds++; ++ ++ return 0; ++} ++ ++ + int + server_init(void) + { +- static int one = 1; +- int nofile; +- struct sockaddr_in sin; +- +- ++ int nofile, i, err = 1; ++ ++ + /* + ** Increase the number of available file descriptors + ** to the maximum possible. +@@ -77,34 +114,49 @@ + + if (listen_sock < 0) + { +- listen_sock = socket(AF_INET, SOCK_STREAM, 0); +- if (listen_sock < 0) ++ if (SGFAM(listen_addr) == AF_UNSPEC) + { +- syslog(LOG_ERR, "socket(AF_INET, SOCK_STREAM) failed: %m"); +- return -1; ++#ifdef HAVE_IPV6 ++ SGFAM(listen_addr) = AF_INET6; ++ SGPORT(listen_addr) = htons(listen_port); ++ SGSETLEN(listen_addr); ++ err = (server_socket() < 0); ++ SGINIT(listen_addr); ++#endif ++ SGFAM(listen_addr) = AF_INET; ++ SGPORT(listen_addr) = htons(listen_port); ++ SGSETLEN(listen_addr); ++ err = (server_socket() < 0 && err); + } +- +- (void) setsockopt(listen_sock, SOL_SOCKET, SO_REUSEADDR, +- (void *) &one, sizeof(one)); +- +- memset(&sin, 0, sizeof(sin)); +- sin.sin_family = AF_INET; +- sin.sin_addr.s_addr = htonl(listen_addr); +- sin.sin_port = htons(listen_port); +- +- if (bind(listen_sock, (struct sockaddr *) &sin, sizeof(sin)) < 0) +- { +- syslog(LOG_ERR, "bind(port=%d) failed: %m", +- listen_port); ++ else ++ err = (server_socket() < 0); ++ if (err) { ++ syslog(LOG_ERR, "server_init: no socket is available"); + return -1; + } + } ++ else ++ { ++ listen_fd[0] = listen_sock; ++ listen_nfds++; ++ } + + /* We do this outside of the 'if' statement to support + some broken 'inetd' daemons... */ +- if (listen(listen_sock, listen_backlog) < 0) ++ err = 1; ++ for (i = 0; i < listen_nfds; i++) + { +- syslog(LOG_ERR, "listen(backlog=%d) failed: %m", listen_backlog); ++ if (listen(listen_fd[i], listen_backlog) < 0) ++ { ++ syslog(LOG_DEBUG, "listen(backlog=%d) failed: %m", listen_backlog); ++ s_close(listen_fd[i]); ++ listen_fd[i] = -1; ++ } ++ else ++ err = 0; ++ } ++ if (err) { ++ syslog(LOG_ERR, "server_init: failed to listen socket"); + return -1; + } + +@@ -115,28 +167,54 @@ + int + server_run(void) + { +- int fd; +- ++ fd_set readfds; ++ int fd, nfds, maxfd = -1, i; ++ ++ for (i = 0; i < listen_nfds; i++) ++ if (listen_fd[i] >= 0) ++ if (maxfd < listen_fd[i]) ++ maxfd = listen_fd[i]; ++ if (maxfd < 0) ++ return -1; ++ + while (1) + { +- fd = s_accept(listen_sock, NULL, NULL); +- if (fd < 0) +- { +- syslog(LOG_ERR, "accept() failed: %m"); +- +- switch (errno) +- { +- case EBADF: +- case EMFILE: +- case ENODEV: +- case ENOMEM: +- case ENOTSOCK: +- case EOPNOTSUPP: +- case EWOULDBLOCK: ++ FD_ZERO(&readfds); ++ for (i = 0; i < listen_nfds; i++) ++ if (listen_fd[i] >= 0) ++ FD_SET(listen_fd[i], &readfds); ++ if (maxfd < 0) ++ return -1; ++ nfds = select(maxfd + 1, &readfds, NULL, NULL, NULL); ++ if (listen_nfds <= 0) { ++ if (nfds < 0 && errno != EINTR) { ++ syslog(LOG_ERR, "select() failed: %m"); + return -1; + } ++ continue; + } ++ for (i = 0; i < listen_nfds; i++) { ++ if (FD_ISSET(listen_fd[i], &readfds)) { ++ fd = s_accept(listen_fd[i], NULL, NULL); ++ if (fd < 0) ++ { ++ syslog(LOG_ERR, "accept() failed: %m"); ++ ++ switch (errno) ++ { ++ case EBADF: ++ case EMFILE: ++ case ENODEV: ++ case ENOMEM: ++ case ENOTSOCK: ++ case EOPNOTSUPP: ++ case EWOULDBLOCK: ++ return -1; ++ } ++ } + +- request_run(fd, 0); ++ request_run(fd, 0); ++ } ++ } + } + } +--- src/server.h.orig Thu Jan 21 00:59:27 1999 ++++ src/server.h Tue Sep 27 20:26:06 2005 +@@ -17,7 +17,7 @@ + + extern int listen_sock; + extern int listen_port; +-extern int listen_addr; ++extern struct sockaddr_gen listen_addr; + extern int listen_backlog; + + +--- src/sockaddr.h.orig Fri Jan 14 23:46:31 2000 ++++ src/sockaddr.h Tue Sep 27 20:45:52 2005 +@@ -48,6 +48,14 @@ + #define SGADDRP(sag) ((SGFAM(sag) == AF_INET6 ? \ + (char *) &(sag).sg_sin6.sin6_addr : \ + (char *) &(sag).sg_sin.sin_addr)) ++ ++#define SGINIT(sag) (memset(&(sag), 0, sizeof((sag))), \ ++ ((sag).sg_family = AF_UNSPEC)) ++#ifdef SIN6_LEN ++#define SGSETLEN(sag) ((sag).sg_sa.sa_len = SGSOCKSIZE(sag)) ++#else ++#define SGSETLEN(sag) ++#endif + #else /* !HAVE_IPV6 */ + + #define sockaddr_gen sockaddr_in +@@ -56,6 +64,10 @@ + #define SGSOCKSIZE(sag) sizeof(struct sockaddr_in) + #define SGPORT(sag) ((sag).sin_port) + #define SGADDRP(sag) ((char *) &(sag).sin_addr) ++ ++#define SGINIT(sag) (memset(&(sag), 0, sizeof((sag))), \ ++ ((sag).sin_family = AF_INET)) ++#define SGSETLEN(sag) + + #endif /* HAVE_IPV6 */ + #endif +--- src/str2.c.orig Thu Jan 21 00:59:26 1999 ++++ src/str2.c Tue Sep 27 20:45:52 2005 +@@ -155,6 +155,75 @@ + + + ++/* XXX: Todo: Support hostnames and not just numbers */ ++int ++str2addr(const char *str, ++ struct sockaddr_gen *sg) ++{ ++ char *buf, *cp, *pp = NULL; ++ ++ ++ SGINIT(*sg); ++ ++ buf = s_strdup(str); ++ cp = buf; ++ ++#ifdef HAVE_IPV6 ++ if (*cp == '[') ++ { ++ /* IPv6 ala RFC 2732 */ ++ ++ ++cp; ++ pp = strchr(cp, ']'); ++ if (pp == NULL) ++ return -1; ++ ++ *pp++ = '\0'; ++ if (*pp == ':') ++ ++pp; ++ else ++ pp = NULL; ++ ++ SGFAM(*sg) = AF_INET6; ++ } ++ else ++ { ++ /* IPv4 */ ++ pp = strrchr(cp, ':'); ++ if (pp) ++ *pp++ = '\0'; ++ ++ SGFAM(*sg) = AF_INET; ++ } ++ ++ if (inet_pton(SGFAM(*sg), cp, SGADDRP(*sg)) != 1) ++ { ++ s_free(buf); ++ return -1; ++ } ++ ++#else ++ ++ /* Locate port part */ ++ pp = strrchr(cp, ':'); ++ if (pp) ++ *pp++ = '\0'; ++ ++ SGFAM(*sg) = AF_INET; ++ *(unsigned long *) SGADDRP(*sg) = inet_addr(cp); ++ ++#endif ++ ++ if (pp) ++ SGPORT(*sg) = htons(atoi(pp)); ++ SGSETLEN(*sg); ++ ++ s_free(buf); ++ return 0; ++} ++ ++ ++ + int + str2gid(const char *str, gid_t *out) + { +--- src/str2.h.orig Thu Jan 21 00:59:26 1999 ++++ src/str2.h Tue Sep 27 20:45:52 2005 +@@ -21,6 +21,7 @@ + extern int str2str(char *buf, char **out); + extern int str2bool(const char *buf, int *out); + extern int str2port(const char *str, int *out); ++extern int str2addr(const char *str, struct sockaddr_gen *sg); + extern int str2gid(const char *str, gid_t *out); + extern int str2uid(const char *str, uid_t *uid, gid_t *gid); + Added: csw/mgar/pkg/pidentd/trunk/files/pidentd.diff =================================================================== --- csw/mgar/pkg/pidentd/trunk/files/pidentd.diff (rev 0) +++ csw/mgar/pkg/pidentd/trunk/files/pidentd.diff 2012-03-09 12:19:14 UTC (rev 17339) @@ -0,0 +1,779 @@ +diff -druN src/ip_stack.h src/ip_stack.h +--- src/ip_stack.h 1970-01-01 01:00:00.000000000 +0100 ++++ src/ip_stack.h 2007-11-21 10:37:32.054244000 +0100 +@@ -0,0 +1,441 @@ ++/* ++ * CDDL HEADER START ++ * ++ * The contents of this file are subject to the terms of the ++ * Common Development and Distribution License (the "License"). ++ * You may not use this file except in compliance with the License. ++ * ++ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE ++ * or http://www.opensolaris.org/os/licensing. ++ * See the License for the specific language governing permissions ++ * and limitations under the License. ++ * ++ * When distributing Covered Code, include this CDDL HEADER in each ++ * file and include the License file at usr/src/OPENSOLARIS.LICENSE. ++ * If applicable, add the following below this CDDL HEADER, with the ++ * fields enclosed by brackets "[]" replaced with your own identifying ++ * information: Portions Copyright [yyyy] [name of copyright owner] ++ * ++ * CDDL HEADER END ++ */ ++ ++/* ++ * Copyright 2007 Sun Microsystems, Inc. All rights reserved. ++ * Use is subject to license terms. ++ */ ++ ++#ifndef _INET_IP_STACK_H ++#define _INET_IP_STACK_H ++ ++#pragma ident "@(#)ip_stack.h 1.7 07/09/25 SMI" ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include "netstack.h" ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#ifdef _KERNEL ++#include ++#include ++#include ++#include ++#endif /* _KERNEL */ ++ ++#ifdef _KERNEL ++ ++ ++/* ++ * IP statistics. ++ */ ++#define IP_STAT(ipst, x) ((ipst)->ips_ip_statistics.x.value.ui64++) ++#define IP_STAT_UPDATE(ipst, x, n) \ ++ ((ipst)->ips_ip_statistics.x.value.ui64 += (n)) ++ ++/* ++ * Named statistics. ++ * ++ * List of arbitrary name=value statistics. ++ */ ++ ++#if 0 ++typedef struct kstat_named { ++ char name[KSTAT_STRLEN]; /* name of counter */ ++ uchar_t data_type; /* data type */ ++ union { ++ char c[16]; /* enough for 128-bit ints */ ++ int32_t i32; ++ uint32_t ui32; ++ struct { ++ union { ++ char *ptr; /* NULL-term string */ ++#if defined(_KERNEL) && defined(_MULTI_DATAMODEL) ++ caddr32_t ptr32; ++#endif ++ char __pad[8]; /* 64-bit padding */ ++ } addr; ++ uint32_t len; /* # bytes for strlen + '\0' */ ++ } str; ++/* ++ * The int64_t and uint64_t types are not valid for a maximally conformant ++ * 32-bit compilation environment (cc -Xc) using compilers prior to the ++ * introduction of C99 conforming compiler (reference ISO/IEC 9899:1990). ++ * In these cases, the visibility of i64 and ui64 is only permitted for ++ * 64-bit compilation environments or 32-bit non-maximally conformant ++ * C89 or C90 ANSI C compilation environments (cc -Xt and cc -Xa). In the ++ * C99 ANSI C compilation environment, the long long type is supported. ++ * The _INT64_TYPE is defined by the implementation (see sys/int_types.h). ++ */ ++#if defined(_INT64_TYPE) ++ int64_t i64; ++ uint64_t ui64; ++#endif ++ long l; ++ ulong_t ul; ++ ++ /* These structure members are obsolete */ ++ ++ longlong_t ll; ++ u_longlong_t ull; ++ float f; ++ double d; ++ } value; /* value of counter */ ++} kstat_named_t; ++#endif ++ ++ ++typedef struct ip_stat { ++ kstat_named_t ipsec_fanout_proto; ++ kstat_named_t ip_udp_fannorm; ++ kstat_named_t ip_udp_fanmb; ++ kstat_named_t ip_udp_fanothers; ++ kstat_named_t ip_udp_fast_path; ++ kstat_named_t ip_udp_slow_path; ++ kstat_named_t ip_udp_input_err; ++ kstat_named_t ip_tcppullup; ++ kstat_named_t ip_tcpoptions; ++ kstat_named_t ip_multipkttcp; ++ kstat_named_t ip_tcp_fast_path; ++ kstat_named_t ip_tcp_slow_path; ++ kstat_named_t ip_tcp_input_error; ++ kstat_named_t ip_db_ref; ++ kstat_named_t ip_notaligned1; ++ kstat_named_t ip_notaligned2; ++ kstat_named_t ip_multimblk3; ++ kstat_named_t ip_multimblk4; ++ kstat_named_t ip_ipoptions; ++ kstat_named_t ip_classify_fail; ++ kstat_named_t ip_opt; ++ kstat_named_t ip_udp_rput_local; ++ kstat_named_t ipsec_proto_ahesp; ++ kstat_named_t ip_conn_flputbq; ++ kstat_named_t ip_conn_walk_drain; ++ kstat_named_t ip_out_sw_cksum; ++ kstat_named_t ip_in_sw_cksum; ++ kstat_named_t ip_trash_ire_reclaim_calls; ++ kstat_named_t ip_trash_ire_reclaim_success; ++ kstat_named_t ip_ire_arp_timer_expired; ++ kstat_named_t ip_ire_redirect_timer_expired; ++ kstat_named_t ip_ire_pmtu_timer_expired; ++ kstat_named_t ip_input_multi_squeue; ++ kstat_named_t ip_tcp_in_full_hw_cksum_err; ++ kstat_named_t ip_tcp_in_part_hw_cksum_err; ++ kstat_named_t ip_tcp_in_sw_cksum_err; ++ kstat_named_t ip_tcp_out_sw_cksum_bytes; ++ kstat_named_t ip_udp_in_full_hw_cksum_err; ++ kstat_named_t ip_udp_in_part_hw_cksum_err; ++ kstat_named_t ip_udp_in_sw_cksum_err; ++ kstat_named_t ip_udp_out_sw_cksum_bytes; ++ kstat_named_t ip_frag_mdt_pkt_out; ++ kstat_named_t ip_frag_mdt_discarded; ++ kstat_named_t ip_frag_mdt_allocfail; ++ kstat_named_t ip_frag_mdt_addpdescfail; ++ kstat_named_t ip_frag_mdt_allocd; ++} ip_stat_t; ++ ++ ++/* ++ * IP6 statistics. ++ */ ++#define IP6_STAT(ipst, x) ((ipst)->ips_ip6_statistics.x.value.ui64++) ++#define IP6_STAT_UPDATE(ipst, x, n) \ ++ ((ipst)->ips_ip6_statistics.x.value.ui64 += (n)) ++ ++typedef struct ip6_stat { ++ kstat_named_t ip6_udp_fast_path; ++ kstat_named_t ip6_udp_slow_path; ++ kstat_named_t ip6_udp_fannorm; ++ kstat_named_t ip6_udp_fanmb; ++ kstat_named_t ip6_out_sw_cksum; ++ kstat_named_t ip6_in_sw_cksum; ++ kstat_named_t ip6_tcp_in_full_hw_cksum_err; ++ kstat_named_t ip6_tcp_in_part_hw_cksum_err; ++ kstat_named_t ip6_tcp_in_sw_cksum_err; ++ kstat_named_t ip6_tcp_out_sw_cksum_bytes; ++ kstat_named_t ip6_udp_in_full_hw_cksum_err; ++ kstat_named_t ip6_udp_in_part_hw_cksum_err; ++ kstat_named_t ip6_udp_in_sw_cksum_err; ++ kstat_named_t ip6_udp_out_sw_cksum_bytes; ++ kstat_named_t ip6_frag_mdt_pkt_out; ++ kstat_named_t ip6_frag_mdt_discarded; ++ kstat_named_t ip6_frag_mdt_allocfail; ++ kstat_named_t ip6_frag_mdt_addpdescfail; ++ kstat_named_t ip6_frag_mdt_allocd; ++} ip6_stat_t; ++ ++typedef struct ire_stats { ++ uint64_t ire_stats_alloced; /* # of ires alloced */ ++ uint64_t ire_stats_freed; /* # of ires freed */ ++ uint64_t ire_stats_inserted; /* # of ires inserted in the bucket */ ++ uint64_t ire_stats_deleted; /* # of ires deleted from the bucket */ ++} ire_stats_t; ++ ++typedef struct mib2_ipIfStatsEntry { ++ ++ /* Local ifindex to identify the interface */ ++ DeviceIndex ipIfStatsIfIndex; ++ ++ /* forwarder? 1 gateway, 2 NOT gateway { ipv6MIBObjects 1} RW */ ++ int ipIfStatsForwarding; ++ /* default Hoplimit for IPv6 { ipv6MIBObjects 2} RW */ ++ int ipIfStatsDefaultHopLimit; ++#define ipIfStatsDefaultTTL ipIfStatsDefaultHopLimit ++ ++ int ipIfStatsEntrySize; ++ int ipIfStatsAddrEntrySize; ++ int ipIfStatsRouteEntrySize; ++ int ipIfStatsNetToMediaEntrySize; ++ int ipIfStatsMemberEntrySize; ++ int ipIfStatsGroupSourceEntrySize; ++ ++ /* # input datagrams (incl errors) { ipIfStatsEntry 3 } */ ++ Counter ipIfStatsInReceives; ++ /* # errors in IP headers and options { ipIfStatsEntry 7 } */ ++ Counter ipIfStatsInHdrErrors; ++ /* # exceeds outgoing link MTU(v6 only) { ipv6IfStatsEntry 3 } */ ++ Counter ipIfStatsInTooBigErrors; ++ /* # discarded due to no route to dest { ipIfStatsEntry 8 } */ ++ Counter ipIfStatsInNoRoutes; ++ /* # invalid or unsupported addresses { ipIfStatsEntry 9 } */ ++ Counter ipIfStatsInAddrErrors; ++ /* # unknown next header { ipIfStatsEntry 10 } */ ++ Counter ipIfStatsInUnknownProtos; ++ /* # too short packets { ipIfStatsEntry 11 } */ ++ Counter ipIfStatsInTruncatedPkts; ++ /* # discarded e.g. due to no buffers { ipIfStatsEntry 17 } */ ++ Counter ipIfStatsInDiscards; ++ /* # delivered to upper layer protocols { ipIfStatsEntry 18 } */ ++ Counter ipIfStatsInDelivers; ++ /* # forwarded out interface { ipIfStatsEntry 23 } */ ++ Counter ipIfStatsOutForwDatagrams; ++ /* # originated out interface { ipIfStatsEntry 20 } */ ++ Counter ipIfStatsOutRequests; ++ /* # discarded e.g. due to no buffers { ipIfStatsEntry 25 } */ ++ Counter ipIfStatsOutDiscards; ++ /* # sucessfully fragmented packets { ipIfStatsEntry 27 } */ ++ Counter ipIfStatsOutFragOKs; ++ /* # fragmentation failed { ipIfStatsEntry 28 } */ ++ Counter ipIfStatsOutFragFails; ++ /* # fragments created { ipIfStatsEntry 29 } */ ++ Counter ipIfStatsOutFragCreates; ++ /* # fragments to reassemble { ipIfStatsEntry 14 } */ ++ Counter ipIfStatsReasmReqds; ++ /* # packets after reassembly { ipIfStatsEntry 15 } */ ++ Counter ipIfStatsReasmOKs; ++ /* # reassembly failed { ipIfStatsEntry 16 } */ ++ Counter ipIfStatsReasmFails; ++ /* # received multicast packets { ipIfStatsEntry 34 } */ ++ Counter ipIfStatsInMcastPkts; ++ /* # transmitted multicast packets { ipIfStatsEntry 38 } */ ++ Counter ipIfStatsOutMcastPkts; ++ ++ /* ++ * In addition to defined MIBs ++ */ ++ ++ /* # discarded due to no route to dest { ipSystemStatsEntry 22 } */ ++ Counter ipIfStatsOutNoRoutes; ++ /* # of complete duplicates in reassembly */ ++ Counter ipIfStatsReasmDuplicates; ++ /* # of partial duplicates in reassembly */ ++ Counter ipIfStatsReasmPartDups; ++ /* # of packets not forwarded due to adminstrative reasons */ ++ Counter ipIfStatsForwProhibits; ++ /* # of UDP packets with bad UDP checksums */ ++ Counter udpInCksumErrs; ++#define udpIfStatsInCksumErrs udpInCksumErrs ++ /* # of UDP packets droped due to queue overflow */ ++ Counter udpInOverflows; ++#define udpIfStatsInOverflows udpInOverflows ++ /* ++ * # of RAW IP packets (all IP protocols except UDP, TCP ++ * and ICMP) droped due to queue overflow ++ */ ++ Counter rawipInOverflows; ++#define rawipIfStatsInOverflows rawipInOverflows ++ ++ /* ++ * # of IP packets received with the wrong version (i.e., not equal ++ * to ipIfStatsIPVersion) and that were dropped. ++ */ ++ Counter ipIfStatsInWrongIPVersion; ++ /* ++ * Depending on the value of ipIfStatsIPVersion, this counter tracks ++ * v4: # of IPv6 packets transmitted by ip_wput or, ++ * v6: # of IPv4 packets transmitted by ip_wput_v6. ++ */ ++ Counter ipIfStatsOutWrongIPVersion; ++ /* ++ * Depending on the value of ipIfStatsIPVersion, this counter tracks ++ * # of times ip_wput has switched to become ip_wput_v6, or vice versa. ++ */ ++ Counter ipIfStatsOutSwitchIPVersion; ++ ++ /* ++ * Fields defined in RFC 4293 ++ */ ++ ++ /* ip version { ipIfStatsEntry 1 } */ ++ int ipIfStatsIPVersion; ++ /* # input datagrams (incl errors) { ipIfStatsEntry 4 } */ ++ Counter64 ipIfStatsHCInReceives; ++ /* # input octets (incl errors) { ipIfStatsEntry 6 } */ ++ Counter64 ipIfStatsHCInOctets; ++ /* ++ * { ipIfStatsEntry 13 } ++ * # input datagrams for which a forwarding attempt was made ++ */ ++ Counter64 ipIfStatsHCInForwDatagrams; ++ /* # delivered to upper layer protocols { ipIfStatsEntry 19 } */ ++ Counter64 ipIfStatsHCInDelivers; ++ /* # originated out interface { ipIfStatsEntry 21 } */ ++ Counter64 ipIfStatsHCOutRequests; ++ /* # forwarded out interface { ipIfStatsEntry 23 } */ ++ Counter64 ipIfStatsHCOutForwDatagrams; ++ /* # dg's requiring fragmentation { ipIfStatsEntry 26 } */ ++ Counter ipIfStatsOutFragReqds; ++ /* # output datagrams { ipIfStatsEntry 31 } */ ++ Counter64 ipIfStatsHCOutTransmits; ++ /* # output octets { ipIfStatsEntry 33 } */ ++ Counter64 ipIfStatsHCOutOctets; ++ /* # received multicast datagrams { ipIfStatsEntry 35 } */ ++ Counter64 ipIfStatsHCInMcastPkts; ++ /* # received multicast octets { ipIfStatsEntry 37 } */ ++ Counter64 ipIfStatsHCInMcastOctets; ++ /* # transmitted multicast datagrams { ipIfStatsEntry 39 } */ ++ Counter64 ipIfStatsHCOutMcastPkts; ++ /* # transmitted multicast octets { ipIfStatsEntry 41 } */ ++ Counter64 ipIfStatsHCOutMcastOctets; ++ /* # received broadcast datagrams { ipIfStatsEntry 43 } */ ++ Counter64 ipIfStatsHCInBcastPkts; ++ /* # transmitted broadcast datagrams { ipIfStatsEntry 45 } */ ++ Counter64 ipIfStatsHCOutBcastPkts; ++ ++ /* ++ * Fields defined in mib2_ip_t ++ */ ++ ++ /* # of incoming packets that succeeded policy checks */ ++ Counter ipsecInSucceeded; ++#define ipsecIfStatsInSucceeded ipsecInSucceeded ++ /* # of incoming packets that failed policy checks */ ++ Counter ipsecInFailed; ++#define ipsecIfStatsInFailed ipsecInFailed ++ /* # of bad IP header checksums */ ++ Counter ipInCksumErrs; ++#define ipIfStatsInCksumErrs ipInCksumErrs ++ /* total # of segments recv'd with error { tcp 14 } */ ++ Counter tcpInErrs; ++#define tcpIfStatsInErrs tcpInErrs ++ /* # of recv'd dg's not deliverable (no appl.) { udp 2 } */ ++ Counter udpNoPorts; ++#define udpIfStatsNoPorts udpNoPorts ++} mib2_ipIfStatsEntry_t; ++ ++/* ++ * IP stack instances ++ */ ++struct ip_stack { ++ netstack_t *ips_netstack; /* Common netstack */ ++ ++ struct ipparam_s *ips_param_arr; /* ndd variable table */ ++ void *ips_ndp_arr; ++ ++ mib2_ipIfStatsEntry_t ips_ip_mib; /* SNMP fixed size info */ ++ mib2_icmp_t ips_icmp_mib; ++ /* ++ * IPv6 mibs when the interface (ill) is not known. ++ * When the ill is known the per-interface mib in the ill is used. ++ */ ++ mib2_ipIfStatsEntry_t ips_ip6_mib; ++ mib2_ipv6IfIcmpEntry_t ips_icmp6_mib; ++ ++ struct igmpstat ips_igmpstat; ++ ++ kstat_t *ips_ip_mibkp; /* kstat exporting ip_mib data */ ++ kstat_t *ips_icmp_mibkp; /* kstat exporting icmp_mib data */ ++ kstat_t *ips_ip_kstat; ++ ip_stat_t ips_ip_statistics; ++ kstat_t *ips_ip6_kstat; ++ ip6_stat_t ips_ip6_statistics; ++ ++/* ip.c */ ++ krwlock_t ips_ip_g_nd_lock; ++ kmutex_t ips_igmp_timer_lock; ++ kmutex_t ips_mld_timer_lock; ++ kmutex_t ips_ip_mi_lock; ++ kmutex_t ips_ip_addr_avail_lock; ++ krwlock_t ips_ill_g_lock; ++ krwlock_t ips_ipsec_capab_ills_lock; ++ /* protects the list of IPsec capable ills */ ++ void *ips_ipsec_capab_ills_ah; ++ void *ips_ipsec_capab_ills_esp; ++ ++ krwlock_t ips_ill_g_usesrc_lock; ++ ++ void *ips_illgrp_head_v4; /* Head of IPv4 ill groups */ ++ void *ips_illgrp_head_v6; /* Head of IPv6 ill groups */ ++ ++/* ipclassifier.c - keep in ip_stack_t */ ++ /* ipclassifier hash tables */ ++ void *ips_rts_clients; ++ void *ips_ipcl_conn_fanout; ++ void *ips_ipcl_bind_fanout; ++ void *ips_ipcl_proto_fanout; ++ void *ips_ipcl_proto_fanout_v6; ++ void *ips_ipcl_udp_fanout; ++ void *ips_ipcl_raw_fanout; ++ uint_t ips_ipcl_conn_fanout_size; ++ uint_t ips_ipcl_bind_fanout_size; ++ uint_t ips_ipcl_udp_fanout_size; ++ uint_t ips_ipcl_raw_fanout_size; ++ void *ips_ipcl_globalhash_fanout; ++ int ips_conn_g_index; ++}; ++typedef struct ip_stack ip_stack_t; ++ ++/* Finding an ip_stack_t */ ++#define CONNQ_TO_IPST(_q) (Q_TO_CONN(_q)->conn_netstack->netstack_ip) ++#define ILLQ_TO_IPST(_q) (((ill_t *)(_q)->q_ptr)->ill_ipst) ++ ++#else /* _KERNEL */ ++typedef int ip_stack_t; ++#endif /* _KERNEL */ ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* _INET_IP_STACK_H */ +diff -druN src/k_sunos510.c src/k_sunos510.c +--- src/k_sunos510.c 2005-10-18 11:22:04.000000000 +0200 ++++ src/k_sunos510.c 2007-11-21 12:47:00.717975000 +0100 +@@ -64,6 +64,9 @@ + #include + #include + ++#include "netstack.h" ++#include "ip_stack.h" ++ + uint_t ipcl_conn_fanout_size; + + #if !defined(IN6_V4_MAPPED_TO_INADDR) +@@ -154,7 +157,10 @@ + ka_open(void **misc) + { + struct kainfo *kp; +- ++ netstack_t netstack_head; ++ struct ip_stack ip_stack; ++ struct connf_s *ipcl_conn_fanout; ++ netstack_t *netstack_head_ptr; + + kp = s_malloc(sizeof(*kp)); + +@@ -168,10 +174,8 @@ + return -1; + } + +- +- kp->nl[0].n_name = "ipcl_conn_fanout"; +- kp->nl[1].n_name = "ipcl_conn_fanout_size"; +- kp->nl[2].n_name = NULL; ++ kp->nl[0].n_name = "netstack_head"; ++ kp->nl[1].n_name = NULL; + + /* + ** Extract offsets to the needed variables in the kernel +@@ -184,6 +188,39 @@ + return -1; + } + ++ if (!getbuf(kp->kd, kp->nl[0].n_value, (char *) &netstack_head_ptr, ++ sizeof(netstack_head_ptr), "netstack_head_ptr")) { ++ kvm_close(kp->kd); ++ s_free(kp); ++ syslog(LOG_ERR, "getbuf: can't get netstack_head_ptr"); ++ return -1; ++ } ++ ++ /* load netstack_head */ ++ if (!getbuf(kp->kd, netstack_head_ptr, (char *) &netstack_head, ++ sizeof(netstack_head), "netstack_head")) { ++ kvm_close(kp->kd); ++ s_free(kp); ++ syslog(LOG_ERR, "getbuf: can't get netstack_head "); ++ return -1; ++ } ++ ++ /* get ip_stack */ ++ if (!getbuf(kp->kd, netstack_head.netstack_ip, (char *) &ip_stack, ++ sizeof(ip_stack), "ip_stack")) { ++ kvm_close(kp->kd); ++ s_free(kp); ++ syslog(LOG_ERR, "getbuf: can't get ip_stack"); ++ return -1; ++ } ++ ++ kp->nl[0].n_name = "ipcl_conn_fanout"; ++ kp->nl[0].n_value = (long) ip_stack.ips_ipcl_conn_fanout; ++ kp->nl[1].n_name = "ipcl_conn_fanout_size"; ++ kp->nl[1].n_value = (long) ip_stack.ips_ipcl_conn_fanout_size; ++ kp->nl[2].n_name = NULL; ++ ++#if 0 + /* + * Read the two kernel values we need but won't change + */ +@@ -196,6 +233,9 @@ + syslog(LOG_ERR, "getbuf: can't get needed symbols"); + return -1; + } ++#endif ++ kp->hash_size = ip_stack.ips_ipcl_conn_fanout_size; ++ kp->hash_table = ip_stack.ips_ipcl_conn_fanout; + + *misc = (void *) kp; + return 0; +diff -druN src/netstack.h src/netstack.h +--- src/netstack.h 1970-01-01 01:00:00.000000000 +0100 ++++ src/netstack.h 2007-11-21 09:59:05.237496000 +0100 +@@ -0,0 +1,242 @@ ++/* ++ * CDDL HEADER START ++ * ++ * The contents of this file are subject to the terms of the ++ * Common Development and Distribution License (the "License"). ++ * You may not use this file except in compliance with the License. ++ * ++ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE ++ * or http://www.opensolaris.org/os/licensing. ++ * See the License for the specific language governing permissions ++ * and limitations under the License. ++ * ++ * When distributing Covered Code, include this CDDL HEADER in each ++ * file and include the License file at usr/src/OPENSOLARIS.LICENSE. ++ * If applicable, add the following below this CDDL HEADER, with the ++ * fields enclosed by brackets "[]" replaced with your own identifying ++ * information: Portions Copyright [yyyy] [name of copyright owner] ++ * ++ * CDDL HEADER END ++ */ ++ ++/* ++ * Copyright 2007 Sun Microsystems, Inc. All rights reserved. ++ * Use is subject to license terms. ++ */ ++#ifndef _SYS_NETSTACK_H ++#define _SYS_NETSTACK_H ++ ++#pragma ident "@(#)netstack.h 1.3 07/05/17 SMI" ++ ++#include ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* ++ * This allows various pieces in and around IP to have a separate instance ++ * for each instance of IP. This is used to support zones that have an ++ * exclusive stack. ++ * Pieces of software far removed from IP (e.g., kernel software ++ * sitting on top of TCP or UDP) probably should not use the netstack ++ * support; if such software wants to support separate zones it ++ * can do that using the zones framework (zone_key_create() etc) ++ * whether there is a shared IP stack or and exclusive IP stack underneath. ++ */ ++ ++/* ++ * Each netstack has an identifier. We reuse the zoneid allocation for ++ * this but have a separate typedef. Thus the shared stack (used by ++ * the global zone and other shared stack zones) have a zero ID, and ++ * the exclusive stacks have a netstackid that is the same as their zoneid. ++ */ ++typedef id_t netstackid_t; ++ ++#define GLOBAL_NETSTACKID 0 ++ ++/* ++ * One for each module which uses netstack support. ++ * Used in netstack_register(). ++ * ++ * The order of these is important for some modules both for ++ * the creation (which done in ascending order) and destruction (which is ++ * done ine in decending order). ++ */ ++#define NS_ALL -1 /* Match all */ ++#define NS_HOOK 0 ++#define NS_NETI 1 ++#define NS_ARP 2 ++#define NS_IP 3 ++#define NS_ICMP 4 ++#define NS_UDP 5 ++#define NS_TCP 6 ++#define NS_SCTP 7 ++#define NS_RTS 8 ++#define NS_IPSEC 9 ++#define NS_KEYSOCK 10 ++#define NS_SPDSOCK 11 ++#define NS_IPSECAH 12 ++#define NS_IPSECESP 13 ++#define NS_TUN 14 ++#define NS_IPF 15 ++#define NS_STR 16 /* autopush list etc */ ++#define NS_MAX (NS_STR+1) ++ ++/* ++ * One for every netstack in the system. ++ * We use a union so that the compilar and lint can provide type checking - ++ * in principle we could have ++ * #define netstack_arp netstack_modules[NS_ARP] ++ * etc, but that would imply void * types hence no type checking by the ++ * compiler. ++ * ++ * All the fields in netstack_t except netstack_next are protected by ++ * netstack_lock. netstack_next is protected by netstack_g_lock. ++ */ ++struct netstack { ++ union { ++ void *nu_modules[NS_MAX]; ++ struct { ++ struct hook_stack *nu_hook; ++ struct neti_stack *nu_neti; ++ struct arp_stack *nu_arp; ++ struct ip_stack *nu_ip; ++ struct icmp_stack *nu_icmp; ++ struct udp_stack *nu_udp; ++ struct tcp_stack *nu_tcp; ++ struct sctp_stack *nu_sctp; ++ struct rts_stack *nu_rts; ++ struct ipsec_stack *nu_ipsec; ++ struct keysock_stack *nu_keysock; ++ struct spd_stack *nu_spdsock; ++ struct ipsecah_stack *nu_ipsecah; ++ struct ipsecesp_stack *nu_ipsecesp; ++ struct tun_stack *nu_tun; ++ struct ipf_stack *nu_ipf; ++ struct str_stack *nu_str; ++ } nu_s; ++ } netstack_u; ++#define netstack_modules netstack_u.nu_modules ++#define netstack_hook netstack_u.nu_s.nu_hook ++#define netstack_neti netstack_u.nu_s.nu_neti ++#define netstack_arp netstack_u.nu_s.nu_arp ++#define netstack_ip netstack_u.nu_s.nu_ip ++#define netstack_icmp netstack_u.nu_s.nu_icmp ++#define netstack_udp netstack_u.nu_s.nu_udp ++#define netstack_tcp netstack_u.nu_s.nu_tcp ++#define netstack_sctp netstack_u.nu_s.nu_sctp ++#define netstack_rts netstack_u.nu_s.nu_rts ++#define netstack_ipsec netstack_u.nu_s.nu_ipsec ++#define netstack_keysock netstack_u.nu_s.nu_keysock ++#define netstack_spdsock netstack_u.nu_s.nu_spdsock ++#define netstack_ipsecah netstack_u.nu_s.nu_ipsecah ++#define netstack_ipsecesp netstack_u.nu_s.nu_ipsecesp ++#define netstack_tun netstack_u.nu_s.nu_tun ++#define netstack_ipf netstack_u.nu_s.nu_ipf ++#define netstack_str netstack_u.nu_s.nu_str ++ ++ uint16_t netstack_m_state[NS_MAX]; /* module state */ ++ ++ kmutex_t netstack_lock; ++ struct netstack *netstack_next; ++ netstackid_t netstack_stackid; ++ int netstack_numzones; /* Number of zones using this */ ++ int netstack_refcnt; /* Number of hold-rele */ ++ int netstack_flags; /* See below */ ++}; ++typedef struct netstack netstack_t; ++ ++/* netstack_flags values */ ++#define NSF_UNINIT 0x01 /* Not initialized */ ++#define NSF_CLOSING 0x02 /* Going away */ ++ ++/* ++ * State for each module for each stack - netstack_m_state[moduleid] ++ * Keeps track of pending actions to avoid holding looks when ++ * calling into the create/shutdown/destroy functions in the module. ++ */ ++#define NSS_CREATE_NEEDED 0x0001 ++#define NSS_CREATE_INPROGRESS 0x0002 ++#define NSS_CREATE_COMPLETED 0x0004 ++#define NSS_SHUTDOWN_NEEDED 0x0010 ++#define NSS_SHUTDOWN_INPROGRESS 0x0020 ++#define NSS_SHUTDOWN_COMPLETED 0x0040 ++#define NSS_DESTROY_NEEDED 0x0100 ++#define NSS_DESTROY_INPROGRESS 0x0200 ++#define NSS_DESTROY_COMPLETED 0x0400 ++ ++#define NSS_CREATE_ALL \ ++ (NSS_CREATE_NEEDED|NSS_CREATE_INPROGRESS|NSS_CREATE_COMPLETED) ++#define NSS_SHUTDOWN_ALL \ ++ (NSS_SHUTDOWN_NEEDED|NSS_SHUTDOWN_INPROGRESS|NSS_SHUTDOWN_COMPLETED) ++#define NSS_DESTROY_ALL \ ++ (NSS_DESTROY_NEEDED|NSS_DESTROY_INPROGRESS|NSS_DESTROY_COMPLETED) ++ ++/* ++ * One for each of the NS_* values. ++ */ ++struct netstack_registry { ++ int nr_flags; /* 0 if nothing registered */ ++ void *(*nr_create)(netstackid_t, netstack_t *); ++ void (*nr_shutdown)(netstackid_t, void *); ++ void (*nr_destroy)(netstackid_t, void *); ++}; ++ ++/* nr_flags values */ ++#define NRF_REGISTERED 0x01 ++ ++/* ++ * To support kstat_create_netstack() using kstat_add_zone we need ++ * to track both ++ * - all zoneids that use the global/shared stack ++ * - all kstats that have been added for the shared stack ++ */ ++ ++extern void netstack_init(void); ++extern void netstack_hold(netstack_t *); ++extern void netstack_rele(netstack_t *); ++extern netstack_t *netstack_find_by_cred(const cred_t *); ++extern netstack_t *netstack_find_by_stackid(netstackid_t); ++extern netstack_t *netstack_find_by_zoneid(zoneid_t); ++ ++extern zoneid_t netstackid_to_zoneid(netstackid_t); ++extern netstackid_t zoneid_to_netstackid(zoneid_t); ++ ++extern netstack_t *netstack_get_current(void); ++ ++/* ++ * Register interest in changes to the set of netstacks. ++ * The createfn and destroyfn are required, but the shutdownfn can be ++ * NULL. ++ * Note that due to the current zsd implementation, when the create ++ * function is called the zone isn't fully present, thus functions ++ * like zone_find_by_* will fail, hence the create function can not ++ * use many zones kernel functions including zcmn_err(). ++ */ ++extern void netstack_register(int, ++ void *(*)(netstackid_t, netstack_t *), ++ void (*)(netstackid_t, void *), ++ void (*)(netstackid_t, void *)); ++extern void netstack_unregister(int); ++extern kstat_t *kstat_create_netstack(char *, int, char *, char *, uchar_t, ++ uint_t, uchar_t, netstackid_t); ++extern void kstat_delete_netstack(kstat_t *, netstackid_t); ++ ++/* ++ * Simple support for walking all the netstacks. ++ * The caller of netstack_next() needs to call netstack_rele() when ++ * done with a netstack. ++ */ ++typedef int netstack_handle_t; ++ ++extern void netstack_next_init(netstack_handle_t *); ++extern void netstack_next_fini(netstack_handle_t *); ++extern netstack_t *netstack_next(netstack_handle_t *); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++ ++#endif /* _SYS_NETSTACK_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 9 13:59:07 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Mar 2012 12:59:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[17340] csw/mgar/pkg/pidentd/trunk/Makefile Message-ID: Revision: 17340 http://gar.svn.sourceforge.net/gar/?rev=17340&view=rev Author: dmichelsen Date: 2012-03-09 12:59:07 +0000 (Fri, 09 Mar 2012) Log Message: ----------- pidentd/trunk: Enable Solaris 10 as extra platform Modified Paths: -------------- csw/mgar/pkg/pidentd/trunk/Makefile Modified: csw/mgar/pkg/pidentd/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidentd/trunk/Makefile 2012-03-09 12:19:14 UTC (rev 17339) +++ csw/mgar/pkg/pidentd/trunk/Makefile 2012-03-09 12:59:07 UTC (rev 17340) @@ -21,6 +21,10 @@ # From http://www.vlakno.cz/~rdivacky/pidentd.diff PATCHFILES += pidentd.diff +# We need a specific version for each release +PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + VENDOR_URL = http://www.lysator.liu.se/~pen/pidentd/ LICENSE = README 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 Mar 9 15:03:26 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Mar 2012 14:03:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[17341] csw/mgar/pkg/pidentd/trunk/Makefile Message-ID: Revision: 17341 http://gar.svn.sourceforge.net/gar/?rev=17341&view=rev Author: dmichelsen Date: 2012-03-09 14:03:26 +0000 (Fri, 09 Mar 2012) Log Message: ----------- pidentd/trunk: Add start script, config templates and custom manifest Modified Paths: -------------- csw/mgar/pkg/pidentd/trunk/Makefile Modified: csw/mgar/pkg/pidentd/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidentd/trunk/Makefile 2012-03-09 12:59:07 UTC (rev 17340) +++ csw/mgar/pkg/pidentd/trunk/Makefile 2012-03-09 14:03:26 UTC (rev 17341) @@ -34,11 +34,44 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWpidentd += CSWlibssl0-9-8 +# This is ok as it references the DTD +CHECKPKG_OVERRIDES_CSWpidentd += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswidentd.xml + REINPLACEMENTS += ignoreisa REINPLACE_MATCH_ignoreisa = ISA=" REINPLACE_WITH_ignoreisa = ISA="IGNORE REINPLACE_FILES_ignoreisa += configure +REINPLACE_USRLOCAL += etc/identd.init + +REINPLACEMENTS += usrlocaletc +REINPLACE_MATCH_usrlocaletc = /usr/local/etc +REINPLACE_WITH_usrlocaletc = /etc/opt/csw +REINPLACE_FILES_usrlocaletc = etc/identd.conf + +REINPLACEMENTS += pidfile +REINPLACE_MATCH_pidfile = /etc/identd.pid +REINPLACE_WITH_pidfile = /var/run/identd.pid +REINPLACE_FILES_pidfile += src/pidentd.h +REINPLACE_FILES_pidfile += etc/identd.init +REINPLACE_FILES_pidfile += etc/identd.conf +REINPLACE_FILES_pidfile += doc/identd.8 + +REINPLACEMENTS += localconf +REINPLACE_MATCH_localconf = /etc/identd.conf +REINPLACE_WITH_localconf = $(sysconfdir)/identd.conf +REINPLACE_FILES_localconf += etc/identd.conf + +REINPLACEMENTS += daemon +REINPLACE_MATCH_daemon = /usr/sbin/in.identd +REINPLACE_WITH_daemon = $(sbindir)/identd +REINPLACE_FILES_daemon = etc/identd.xml + +REINPLACEMENTS += customsmf +REINPLACE_MATCH_customsmf = \# You.* +REINPLACE_WITH_customsmf = \# MANIFEST /var/opt/csw/svc/manifest/network/cswidentd.xml +REINPLACE_FILES_customsmf += etc/identd.init + BUILD64 = 1 ISAEXEC = 1 @@ -50,5 +83,21 @@ INSTALL_OVERRIDE_VARS += sbindir INSTALL_OVERRIDE_VAR_sbindir = $(DESTDIR)$(sbindir) +INITSMF += $(sysconfdir)/init.d/cswidentd + +PRESERVECONF += /etc/opt/csw/identd.conf +PRESERVECONF += /opt/csw/etc/identd.conf + include gar/category.mk +post-install-modulated: + ginstall -d $(DESTDIR)$(sysconfdir) + ginstall $(WORKSRC)/etc/identd.conf $(DESTDIR)$(sysconfdir) + ginstall -d $(DESTDIR)/opt/csw/etc + ginstall $(WORKSRC)/etc/identd.conf $(DESTDIR)/opt/csw/etc + ginstall -d $(DESTDIR)$(sysconfdir)/init.d + ginstall $(WORKSRC)/etc/identd.init $(DESTDIR)$(sysconfdir)/init.d/cswidentd + ginstall -d $(DESTDIR)/var/opt/csw/svc/manifest/network + ginstall $(WORKSRC)/etc/identd.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/cswidentd.xml + + 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 Mar 9 15:33:04 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 09 Mar 2012 14:33:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[17342] csw/mgar/pkg/lang-python/pygtk/trunk/Makefile Message-ID: Revision: 17342 http://gar.svn.sourceforge.net/gar/?rev=17342&view=rev Author: cgrzemba Date: 2012-03-09 14:33:04 +0000 (Fri, 09 Mar 2012) Log Message: ----------- lang-python/pygtk/trunk: version 2.17 and update the build recipe Modified Paths: -------------- csw/mgar/pkg/lang-python/pygtk/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pygtk/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygtk/trunk/Makefile 2012-03-09 14:03:26 UTC (rev 17341) +++ csw/mgar/pkg/lang-python/pygtk/trunk/Makefile 2012-03-09 14:33:04 UTC (rev 17342) @@ -13,15 +13,47 @@ DISTFILES = $(NAME)-$(VERSION).tar.bz2 STRIP_LIBTOOL = 1 +# mgar test fails with "GtkWarning: could not open display" +# however a gmake check works and finish successfull! +SKIPTEST = 1 + +PACKAGING_PLATFORMS=solaris10-i386 solaris10-sparc +BUILD_DEP_PKGS += CSWpkgconfig +BUILD_DEP_PKGS += CSWpygobject +BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWlibatk-dev +BUILD_DEP_PKGS += CSWpangodevel +BUILD_DEP_PKGS += CSWpycairo +BUILD_DEP_PKGS += CSWlibcairo-dev +BUILD_DEP_PKGS += CSWlibxcbdevel + PACKAGES = CSWpy-gtk -BUILD_DEP_PKGS = CSWpkgconfig CSWpygobject CSWlibglib2-dev CSWlibatk-dev CSWpangodevel CSWpycairo CSWlibcairo-dev CSWlibxcbdevel -RUNTIME_DEP_PKGS_CSWpy-gtk = CSWpython CSWfconfig CSWftype2 CSWggettextrt -RUNTIME_DEP_PKGS_CSWpy-gtk += CSWglib2 CSWgtk2 CSWlibatk CSWlibcairo -RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibglade2 CSWlibxml2 CSWpango - CATALOGNAME_CSWpy-gtk = py_gtk SPKG_DESC_CSWpy-gtk = $(DESCRIPTION) +OBSOLETED_BY_CSWpy-gtk = CSWpygtk +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWpython +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWfconfig +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibglade2 +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWpango +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgio2-0-0 +CHECKPKG_OVERRIDES_CSWpy-gtk += file-with-bad-content|/usr/share|root/opt/csw/share/gtk-doc/html/pygtk/class-gtkfilechooser.html +CHECKPKG_OVERRIDES_CSWpy-gtk += file-with-bad-content|/usr/local|root/opt/csw/share/gtk-doc/html/pygtk/class-gtkrcstyle.html +# pkg and classaction is obsolete +CHECKPKG_OVERRIDES_CSWpygtk += action-class-only-in-pkginfo|cswpycompile + EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' SPKG_CLASSES = none cswpycompile 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 Mar 9 16:00:46 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Mar 2012 15:00:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17343] csw/mgar/pkg/cpan Message-ID: Revision: 17343 http://gar.svn.sourceforge.net/gar/?rev=17343&view=rev Author: dmichelsen Date: 2012-03-09 15:00:46 +0000 (Fri, 09 Mar 2012) Log Message: ----------- cpan/POE-Component-Syndicator/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/POE-Component-Syndicator/ csw/mgar/pkg/cpan/POE-Component-Syndicator/branches/ csw/mgar/pkg/cpan/POE-Component-Syndicator/tags/ csw/mgar/pkg/cpan/POE-Component-Syndicator/trunk/ csw/mgar/pkg/cpan/POE-Component-Syndicator/trunk/Makefile csw/mgar/pkg/cpan/POE-Component-Syndicator/trunk/checksums csw/mgar/pkg/cpan/POE-Component-Syndicator/trunk/files/ Property changes on: csw/mgar/pkg/cpan/POE-Component-Syndicator/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/POE-Component-Syndicator/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/POE-Component-Syndicator/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/POE-Component-Syndicator/trunk/Makefile 2012-03-09 15:00:46 UTC (rev 17343) @@ -0,0 +1,22 @@ +NAME = POE-Component-Syndicator +VERSION = 0.06 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = HINRIK + +DESCRIPTION = A POE component base class which implements the Observer pattern +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +PACKAGES += CSWpm-poe-component-syndicator +CATALOGNAME_CSWpm-poe-component-syndicator = pm_poe_component_syndicator +SPKG_DESC_CSWpm-poe-component-syndicator = A POE component base class which implements the Observer pattern +ARCHALL_CSWpm-poe-component-syndicator = 1 +RUNTIME_DEP_PKGS_CSWpm-poe-component-syndicator += CSWpm-poe +RUNTIME_DEP_PKGS_CSWpm-poe-component-syndicator += CSWpm-object-pluggable + +include gar/category.mk Added: csw/mgar/pkg/cpan/POE-Component-Syndicator/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/POE-Component-Syndicator/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/POE-Component-Syndicator/trunk/checksums 2012-03-09 15:00:46 UTC (rev 17343) @@ -0,0 +1 @@ +dfa8019122225d9853263293002ff29b POE-Component-Syndicator-0.06.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 Mar 9 16:11:02 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Mar 2012 15:11:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[17344] csw/mgar/pkg/cpan Message-ID: Revision: 17344 http://gar.svn.sourceforge.net/gar/?rev=17344&view=rev Author: dmichelsen Date: 2012-03-09 15:11:02 +0000 (Fri, 09 Mar 2012) Log Message: ----------- cpan/POE-Component-IRC/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/POE-Component-IRC/ csw/mgar/pkg/cpan/POE-Component-IRC/branches/ csw/mgar/pkg/cpan/POE-Component-IRC/tags/ csw/mgar/pkg/cpan/POE-Component-IRC/trunk/ csw/mgar/pkg/cpan/POE-Component-IRC/trunk/Makefile csw/mgar/pkg/cpan/POE-Component-IRC/trunk/checksums csw/mgar/pkg/cpan/POE-Component-IRC/trunk/files/ Property changes on: csw/mgar/pkg/cpan/POE-Component-IRC/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/POE-Component-IRC/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/POE-Component-IRC/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/POE-Component-IRC/trunk/Makefile 2012-03-09 15:11:02 UTC (rev 17344) @@ -0,0 +1,26 @@ +NAME = POE-Component-IRC +VERSION = 6.78 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = HINRIK + +DESCRIPTION = A fully event-driven IRC client module +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +BUILD_DEP_PKGS += CSWpm-test-differences + +PACKAGES += CSWpm-poe-component-irc +CATALOGNAME_CSWpm-poe-component-irc = pm_poe_component_irc +SPKG_DESC_CSWpm-poe-component-irc = A fully event-driven IRC client module +ARCHALL_CSWpm-poe-component-irc = 1 +RUNTIME_DEP_PKGS_CSWpm-poe-component-irc += CSWpm-poe +RUNTIME_DEP_PKGS_CSWpm-poe-component-irc += CSWpm-poe-component-syndicator +RUNTIME_DEP_PKGS_CSWpm-poe-component-irc += CSWpm-poe-filter-ircd +RUNTIME_DEP_PKGS_CSWpm-poe-component-irc += CSWpm-irc-utils + +include gar/category.mk Added: csw/mgar/pkg/cpan/POE-Component-IRC/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/POE-Component-IRC/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/POE-Component-IRC/trunk/checksums 2012-03-09 15:11:02 UTC (rev 17344) @@ -0,0 +1 @@ +4e94881ab7a1e7ba0fbc82fe80841bd6 POE-Component-IRC-6.78.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 Mar 9 22:01:12 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Mar 2012 21:01:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17345] csw/mgar/pkg/opencsw-manual/trunk/files/ for-developers/index.rst Message-ID: Revision: 17345 http://gar.svn.sourceforge.net/gar/?rev=17345&view=rev Author: dmichelsen Date: 2012-03-09 21:01:11 +0000 (Fri, 09 Mar 2012) Log Message: ----------- developer-manual: Add info about PKG_CONFIG_PATH Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst 2012-03-09 15:11:02 UTC (rev 17344) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst 2012-03-09 21:01:11 UTC (rev 17345) @@ -17,8 +17,10 @@ CPPFLAGS="-I/opt/csw/include" LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib" + PKG_CONFIG_PATH="/opt/csw/lib/pkgconfig" If you're building a 64-bit binary, use these:: CPPFLAGS="-I/opt/csw/include" LDFLAGS="-L/opt/csw/lib/64 -R/opt/csw/lib/64" + PKG_CONFIG_PATH="/opt/csw/lib/64/pkgconfig" 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 Mar 9 22:17:34 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Mar 2012 21:17:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[17346] csw/mgar/pkg/gedit Message-ID: Revision: 17346 http://gar.svn.sourceforge.net/gar/?rev=17346&view=rev Author: dmichelsen Date: 2012-03-09 21:17:34 +0000 (Fri, 09 Mar 2012) Log Message: ----------- gedit: Move away old stuff Added Paths: ----------- csw/mgar/pkg/gedit/Makefile csw/mgar/pkg/gedit/branches/ csw/mgar/pkg/gedit/tags/ csw/mgar/pkg/gedit/tags/legacy/ csw/mgar/pkg/gedit/tags/legacy/Makefile csw/mgar/pkg/gedit/tags/legacy/copyright csw/mgar/pkg/gedit/tags/legacy/depend csw/mgar/pkg/gedit/tags/legacy/patchfile.preconf csw/mgar/pkg/gedit/tags/legacy/pkginfo csw/mgar/pkg/gedit/tags/legacy/prototype Removed Paths: ------------- csw/mgar/pkg/gedit/Makefile csw/mgar/pkg/gedit/trunk/Makefile csw/mgar/pkg/gedit/trunk/copyright csw/mgar/pkg/gedit/trunk/depend csw/mgar/pkg/gedit/trunk/patchfile.preconf csw/mgar/pkg/gedit/trunk/pkginfo csw/mgar/pkg/gedit/trunk/prototype Deleted: csw/mgar/pkg/gedit/Makefile =================================================================== --- csw/mgar/pkg/gedit/Makefile 2012-03-09 21:01:11 UTC (rev 17345) +++ csw/mgar/pkg/gedit/Makefile 2012-03-09 21:17:34 UTC (rev 17346) @@ -1,15 +0,0 @@ - -# This is somewhat of a "stub" Makefile, for -# directories managed by the "createpkg" TEMPLATES. -# -# Not all of targets listed here may actualy be supported by -# the subdir in question. But they are a goal - -DEFAULT_DIR=trunk - - -# The -C means you must use gmake, unfortunately. - -all package build garchive extract configure clean distclean reallyclean : - @echo Going to make $@ in $(DEFAULT_DIR) - $(MAKE) -C $(DEFAULT_DIR) $@ Copied: csw/mgar/pkg/gedit/Makefile (from rev 16968, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gedit/Makefile (rev 0) +++ csw/mgar/pkg/gedit/Makefile 2012-03-09 21:17:34 UTC (rev 17346) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Copied: csw/mgar/pkg/gedit/tags/legacy/Makefile (from rev 16968, csw/mgar/pkg/gedit/trunk/Makefile) =================================================================== --- csw/mgar/pkg/gedit/tags/legacy/Makefile (rev 0) +++ csw/mgar/pkg/gedit/tags/legacy/Makefile 2012-03-09 21:17:34 UTC (rev 17346) @@ -0,0 +1,172 @@ +# This file is from TEMPLATES/createpkg/Makefile.lib +# You MUST build this with gnu make, unfortunately. +# Mainly just because of the ARCH expansion, but also for "?=" + +# Customize your prototype file(s) as needed + +# Organization: variable defintions up top, +# targets in second half. +# Note that assignments with "?=" mean "assign if not already assigned. + +# for stupid intltool... +PATH := /opt/csw/gnu:$(PATH) + +# Where do we keep local downloads of software src files +ARCHIVEDIR ?= /home/src +ARCHIVENAME ?= gedit-2.30.3.tar.bz2 +EXTRACTPROG ?= /usr/sfw/bin/gtar jfx + +# Only use ONE here. The name is used for compat with 'gar'. +MASTER_SITES ?= http://ftp.gnome.org/pub/GNOME/sources/gedit/2.30 + +ARCH := $(shell /bin/uname -p) + +LDFLAGS_COMMON := + +SRCDIR= build/* + +# DO NOT specify the arch-64 stuff such as -m64 here. +# the individual targets will do that. + +CFLAGS_COMMON ?= -mt -xnorunpath -xO3 +CXXFLAGS_COMMON ?= -mt -norunpath -xO3 +CFLAGS_sparc ?= -xarch=v8 +CFLAGS_i386 ?= -xarch=386 + +# Keep this arch-neutral if possible. add arch-specific tweaks +# to arch-specific target +CONFIGURE=./configure --prefix=/opt/csw --enable-static=no + + + +CREATEPKG=createpkg -r `pwd`/build/*/cswstage + + +all: $(ARCH)-32 +#all: $(ARCH)-32 package + +# ARCH-XX handles configure, build, and stage for its own combo +# + +EXTRACTPROG ?= /bin/echo ERROR: need to set EXTRACTPROG ; exit 1 ; + + + +extract: build/.extract.done + +build/.extract.done: + test -d build || mkdir build + @if test -f $(ARCHIVEDIR)/$(ARCHIVENAME) ; then \ + echo Extracting $(ARCHIVENAME) under build dir... ;\ + ( cd build && $(EXTRACTPROG) $(ARCHIVEDIR)/$(ARCHIVENAME) ) ; \ + else echo Cannot extract - $(ARCHIVEDIR)/$(ARCHIVENAME) does not exist ;\ + exit 1; \ + fi + touch build/.extract.done + + +clean distclean: + @echo Calling $@ in $(SRCDIR) + $(MAKE) -C $(SRCDIR) $@ + + +reallyclean: distclean + @echo Removing any milestone files in build as well... + @rm -f build/.??* + @echo '(However, leaving src tree intact, with any patches in it)' + @echo '(If you want, you could rm -r build, then make extract once more)' + +garchive: + @echo Call the fetch target instead: it does the same thing. + + +# Downloads the source code to the common ARCHIVEDIR +fetch: $(ARCHIVEDIR)/$(ARCHIVENAME) + @echo fetch done + +$(ARCHIVEDIR)/$(ARCHIVENAME): + wget -P $(ARCHIVEDIR) $(MASTER_SITES)/$(ARCHIVENAME) + +patch: + @echo patch: patching is handled automatically as part of the configure phase. + +stage-preserved: + @if test -f preserve-$(ARCH).tar ; then \ + echo Copying preserved arch-specific files; \ + cat preserve-$(ARCH).tar |(cd $(SRCDIR)/cswstage && tar xvf -);\ + fi + @if test -f preserve.tar ; then \ + echo Copying preserved arch-neutral files; \ + cat preserve.tar |(cd $(SRCDIR)/cswstage && tar xvf -);\ + fi + +package: stage-preserved + $(CREATEPKG) + + +# split out generic $(ARCH) sections to platform-specific sections if needed. +# but it usually should not be neccessary + + +$(ARCH)-32 :: configure-$(ARCH)-32 build-$(ARCH)-32 stage-$(ARCH)-32 + @echo Completed $(ARCH)-32 configure, build and stage + touch build/.$(ARCH)-32.done + + + +build/.$(ARCH)-32.done: $(ARCH)-32 + +# Since we share the same src tree, we should only need to +# pre-configure patching one time for all. +build/.patch-preconf.done: build/.extract.done + if test -f patchfile.preconf ; then \ + gpatch -d $(SRCDIR) -p0 prototype + @echo Dont forget to add a COPYING line !! Copied: csw/mgar/pkg/gedit/tags/legacy/copyright (from rev 16968, csw/mgar/pkg/gedit/trunk/copyright) =================================================================== --- csw/mgar/pkg/gedit/tags/legacy/copyright (rev 0) +++ csw/mgar/pkg/gedit/tags/legacy/copyright 2012-03-09 21:17:34 UTC (rev 17346) @@ -0,0 +1,2 @@ +Please see /opt/csw/share/gtk-doc/html/gedit/COPYING for full license text +(GPL v2) Copied: csw/mgar/pkg/gedit/tags/legacy/depend (from rev 16968, csw/mgar/pkg/gedit/trunk/depend) =================================================================== --- csw/mgar/pkg/gedit/tags/legacy/depend (rev 0) +++ csw/mgar/pkg/gedit/tags/legacy/depend 2012-03-09 21:17:34 UTC (rev 17346) @@ -0,0 +1,13 @@ +P CSWenchant +P CSWfconfig +P CSWftype2 +P CSWgconf2 +P CSWggettextrt +P CSWglib2 +P CSWgtk2 +P CSWgtksourceview +P CSWlibatk +P CSWlibcairo +P CSWlibxml2 +P CSWpango +P CSWiso-codes Copied: csw/mgar/pkg/gedit/tags/legacy/patchfile.preconf (from rev 16968, csw/mgar/pkg/gedit/trunk/patchfile.preconf) =================================================================== --- csw/mgar/pkg/gedit/tags/legacy/patchfile.preconf (rev 0) +++ csw/mgar/pkg/gedit/tags/legacy/patchfile.preconf 2012-03-09 21:17:34 UTC (rev 17346) @@ -0,0 +1,14 @@ +--- tests/document-saver.c.orig 2010-06-26 23:08:00.628354438 +0200 ++++ tests/document-saver.c 2010-06-26 23:10:15.048708870 +0200 +@@ -27,6 +27,11 @@ + #include + #include + ++/* linux/bsd has it. others such as Solaris, do not */ ++#ifndef ACCESSPERMS ++#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) ++#endif ++ + #define DEFAULT_LOCAL_URI "/tmp/gedit-document-saver-test.txt" + #define DEFAULT_REMOTE_URI "sftp://localhost/tmp/gedit-document-saver-test.txt" + #define DEFAULT_CONTENT "hello world!" Copied: csw/mgar/pkg/gedit/tags/legacy/pkginfo (from rev 16968, csw/mgar/pkg/gedit/trunk/pkginfo) =================================================================== --- csw/mgar/pkg/gedit/tags/legacy/pkginfo (rev 0) +++ csw/mgar/pkg/gedit/tags/legacy/pkginfo 2012-03-09 21:17:34 UTC (rev 17346) @@ -0,0 +1,8 @@ +PKG=CSWgedit +NAME=gedit - The official GNOME text editor +VERSION=2.30.3,REV=2010.06.26 +CATEGORY=application +VENDOR=http://www.gnome.org/ packaged for CSW by Philip Brown +HOTLINE=http://www.opencsw.org/bugtrack/ +EMAIL=phil at opencsw.org +OPENCSW_REPOSITORY=https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/gedit/trunk Copied: csw/mgar/pkg/gedit/tags/legacy/prototype (from rev 16968, csw/mgar/pkg/gedit/trunk/prototype) =================================================================== --- csw/mgar/pkg/gedit/tags/legacy/prototype (rev 0) +++ csw/mgar/pkg/gedit/tags/legacy/prototype 2012-03-09 21:17:34 UTC (rev 17346) @@ -0,0 +1,698 @@ +i pkginfo +i copyright +i depend +d none /opt/csw/include 0755 root bin +d none /opt/csw/include/gedit-2.20 0755 root bin +d none /opt/csw/include/gedit-2.20/gedit 0755 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-status-combo-box.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-progress-message-area.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-message-type.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-file-chooser-dialog.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-encodings.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-encodings-combo-box.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-window.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-app.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-debug.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-prefs-manager-app.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-view.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-commands.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-message-bus.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-plugin.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-document.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-panel.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-tab.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-notebook.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-utils.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-message.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-help.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-prefs-manager.h 0644 root bin +f none /opt/csw/include/gedit-2.20/gedit/gedit-statusbar.h 0644 root bin +d none /opt/csw/etc 0755 root bin +d none /opt/csw/etc/gconf 0755 root bin +d none /opt/csw/etc/gconf/schemas 0755 root bin +f none /opt/csw/etc/gconf/schemas/gedit.schemas 0644 root bin +f none /opt/csw/etc/gconf/schemas/gedit-file-browser.schemas 0644 root bin +d none /opt/csw/bin 0755 root bin +s none /opt/csw/bin/gnome-text-editor=gedit +f none /opt/csw/bin/gedit 0755 root bin +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/gtk-doc 0755 root bin +d none /opt/csw/share/gtk-doc/html 0755 root bin +d none /opt/csw/share/gtk-doc/html/gedit 0755 root bin +f none /opt/csw/share/gtk-doc/html/gedit/COPYING=COPYING 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/index.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-encodings-option-menu.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/index.sgml 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-statusbar.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-document.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/style.css 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/ch01.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-tab.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-GeditPrintJob.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-app.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit.devhelp 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-GeditMessageType.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/left.png 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-progress-message-area.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-file-chooser-dialog.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/up.png 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/GeditPlugin.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-prefs-manager-app.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-print-job-preview.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-panel.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-encodings.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-notebook.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-convert.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-help.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-view.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/home.png 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-utils.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-debug.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/right.png 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/GeditMessage.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/GeditMessageBus.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-window.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit.devhelp2 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-metadata-manager.html 0644 root bin +f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-prefs-manager.html 0644 root bin +d none /opt/csw/share/applications 0755 root bin +f none /opt/csw/share/applications/gedit.desktop 0644 root bin +d none /opt/csw/share/omf 0755 root bin +d none /opt/csw/share/omf/gedit 0755 root bin +f none /opt/csw/share/omf/gedit/gedit-uk.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-ru.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-ja.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-de.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-ko.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-fi.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-el.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-fr.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-bg.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-pt_BR.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-ca.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-cs.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-th.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-zh_CN.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-it.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-sv.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-zh_HK.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-hu.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-es.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-zh_TW.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-da.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-ar.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-oc.omf 0644 root bin +f none /opt/csw/share/omf/gedit/gedit-C.omf 0644 root bin +d none /opt/csw/share/gnome 0755 root bin +d none /opt/csw/share/gnome/help 0755 root bin +d none /opt/csw/share/gnome/help/gedit 0755 root bin +d none /opt/csw/share/gnome/help/gedit/it 0755 root bin +f none /opt/csw/share/gnome/help/gedit/it/legal.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/it/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/it/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/it/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +s none /opt/csw/share/gnome/help/gedit/it/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +s none /opt/csw/share/gnome/help/gedit/it/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +s none /opt/csw/share/gnome/help/gedit/it/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/it/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +f none /opt/csw/share/gnome/help/gedit/it/figures/gedit_window.png 0644 root bin +d none /opt/csw/share/gnome/help/gedit/ca 0755 root bin +f none /opt/csw/share/gnome/help/gedit/ca/legal.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/ca/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/ca/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/ca/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +s none /opt/csw/share/gnome/help/gedit/ca/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +f none /opt/csw/share/gnome/help/gedit/ca/figures/gedit_window.png 0644 root bin +s none /opt/csw/share/gnome/help/gedit/ca/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +s none /opt/csw/share/gnome/help/gedit/ca/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/ca/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +d none /opt/csw/share/gnome/help/gedit/da 0755 root bin +d none /opt/csw/share/gnome/help/gedit/da/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/da/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/da/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +s none /opt/csw/share/gnome/help/gedit/da/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +s none /opt/csw/share/gnome/help/gedit/da/figures/gedit_window.png=../../C/figures/gedit_window.png +s none /opt/csw/share/gnome/help/gedit/da/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +s none /opt/csw/share/gnome/help/gedit/da/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +f none /opt/csw/share/gnome/help/gedit/da/legal.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/da/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/pt_BR 0755 root bin +d none /opt/csw/share/gnome/help/gedit/pt_BR/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/pt_BR/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +s none /opt/csw/share/gnome/help/gedit/pt_BR/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +s none /opt/csw/share/gnome/help/gedit/pt_BR/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/pt_BR/figures/gedit_window.png=../../C/figures/gedit_window.png +s none /opt/csw/share/gnome/help/gedit/pt_BR/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +s none /opt/csw/share/gnome/help/gedit/pt_BR/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +f none /opt/csw/share/gnome/help/gedit/pt_BR/gedit.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/pt_BR/legal.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/oc 0755 root bin +d none /opt/csw/share/gnome/help/gedit/oc/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/oc/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +s none /opt/csw/share/gnome/help/gedit/oc/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +s none /opt/csw/share/gnome/help/gedit/oc/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +s none /opt/csw/share/gnome/help/gedit/oc/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/oc/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +s none /opt/csw/share/gnome/help/gedit/oc/figures/gedit_window.png=../../C/figures/gedit_window.png +f none /opt/csw/share/gnome/help/gedit/oc/legal.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/oc/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/th 0755 root bin +f none /opt/csw/share/gnome/help/gedit/th/legal.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/th/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/th/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/th/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/th/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +s none /opt/csw/share/gnome/help/gedit/th/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +s none /opt/csw/share/gnome/help/gedit/th/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +s none /opt/csw/share/gnome/help/gedit/th/figures/gedit_window.png=../../C/figures/gedit_window.png +s none /opt/csw/share/gnome/help/gedit/th/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +d none /opt/csw/share/gnome/help/gedit/el 0755 root bin +f none /opt/csw/share/gnome/help/gedit/el/legal.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/el/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/el/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/el/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +s none /opt/csw/share/gnome/help/gedit/el/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/el/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +f none /opt/csw/share/gnome/help/gedit/el/figures/gedit_window.png 0644 root bin +s none /opt/csw/share/gnome/help/gedit/el/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +s none /opt/csw/share/gnome/help/gedit/el/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +d none /opt/csw/share/gnome/help/gedit/uk 0755 root bin +f none /opt/csw/share/gnome/help/gedit/uk/legal.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/uk/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/uk/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/uk/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/uk/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +s none /opt/csw/share/gnome/help/gedit/uk/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +s none /opt/csw/share/gnome/help/gedit/uk/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +s none /opt/csw/share/gnome/help/gedit/uk/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +f none /opt/csw/share/gnome/help/gedit/uk/figures/gedit_window.png 0644 root bin +d none /opt/csw/share/gnome/help/gedit/ja 0755 root bin +f none /opt/csw/share/gnome/help/gedit/ja/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/ja/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/ja/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +f none /opt/csw/share/gnome/help/gedit/ja/figures/gedit_window.png 0644 root bin +s none /opt/csw/share/gnome/help/gedit/ja/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +s none /opt/csw/share/gnome/help/gedit/ja/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/ja/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +s none /opt/csw/share/gnome/help/gedit/ja/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +f none /opt/csw/share/gnome/help/gedit/ja/legal.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/de 0755 root bin +f none /opt/csw/share/gnome/help/gedit/de/gedit.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/de/legal.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/de/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/de/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +s none /opt/csw/share/gnome/help/gedit/de/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +s none /opt/csw/share/gnome/help/gedit/de/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/de/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +f none /opt/csw/share/gnome/help/gedit/de/figures/gedit_window.png 0644 root bin +s none /opt/csw/share/gnome/help/gedit/de/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +d none /opt/csw/share/gnome/help/gedit/ru 0755 root bin +f none /opt/csw/share/gnome/help/gedit/ru/legal.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/ru/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/ru/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/ru/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/ru/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +s none /opt/csw/share/gnome/help/gedit/ru/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +s none /opt/csw/share/gnome/help/gedit/ru/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +s none /opt/csw/share/gnome/help/gedit/ru/figures/gedit_window.png=../../C/figures/gedit_window.png +s none /opt/csw/share/gnome/help/gedit/ru/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +d none /opt/csw/share/gnome/help/gedit/ko 0755 root bin +d none /opt/csw/share/gnome/help/gedit/ko/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/ko/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +s none /opt/csw/share/gnome/help/gedit/ko/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +f none /opt/csw/share/gnome/help/gedit/ko/figures/gedit_window.png 0644 root bin +s none /opt/csw/share/gnome/help/gedit/ko/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +s none /opt/csw/share/gnome/help/gedit/ko/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/ko/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +f none /opt/csw/share/gnome/help/gedit/ko/legal.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/ko/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/sv 0755 root bin +f none /opt/csw/share/gnome/help/gedit/sv/gedit.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/sv/legal.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/sv/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/sv/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/sv/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +s none /opt/csw/share/gnome/help/gedit/sv/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +f none /opt/csw/share/gnome/help/gedit/sv/figures/gedit_window.png 0644 root bin +s none /opt/csw/share/gnome/help/gedit/sv/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +s none /opt/csw/share/gnome/help/gedit/sv/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +d none /opt/csw/share/gnome/help/gedit/fi 0755 root bin +d none /opt/csw/share/gnome/help/gedit/fi/figures 0755 root bin +f none /opt/csw/share/gnome/help/gedit/fi/figures/gedit_window.png 0644 root bin +s none /opt/csw/share/gnome/help/gedit/fi/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +s none /opt/csw/share/gnome/help/gedit/fi/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/fi/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +s none /opt/csw/share/gnome/help/gedit/fi/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +s none /opt/csw/share/gnome/help/gedit/fi/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +f none /opt/csw/share/gnome/help/gedit/fi/legal.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/fi/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/zh_TW 0755 root bin +d none /opt/csw/share/gnome/help/gedit/zh_TW/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/zh_TW/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +s none /opt/csw/share/gnome/help/gedit/zh_TW/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +s none /opt/csw/share/gnome/help/gedit/zh_TW/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +f none /opt/csw/share/gnome/help/gedit/zh_TW/figures/gedit_window.png 0644 root bin +s none /opt/csw/share/gnome/help/gedit/zh_TW/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +s none /opt/csw/share/gnome/help/gedit/zh_TW/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +f none /opt/csw/share/gnome/help/gedit/zh_TW/legal.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/zh_TW/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/zh_HK 0755 root bin +d none /opt/csw/share/gnome/help/gedit/zh_HK/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/zh_HK/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +s none /opt/csw/share/gnome/help/gedit/zh_HK/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +f none /opt/csw/share/gnome/help/gedit/zh_HK/figures/gedit_window.png 0644 root bin +s none /opt/csw/share/gnome/help/gedit/zh_HK/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +s none /opt/csw/share/gnome/help/gedit/zh_HK/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/zh_HK/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +f none /opt/csw/share/gnome/help/gedit/zh_HK/gedit.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/zh_HK/legal.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/ar 0755 root bin +f none /opt/csw/share/gnome/help/gedit/ar/legal.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/ar/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/ar/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/ar/figures/gedit_window.png=../../C/figures/gedit_window.png +s none /opt/csw/share/gnome/help/gedit/ar/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +s none /opt/csw/share/gnome/help/gedit/ar/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +s none /opt/csw/share/gnome/help/gedit/ar/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +s none /opt/csw/share/gnome/help/gedit/ar/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +s none /opt/csw/share/gnome/help/gedit/ar/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +d none /opt/csw/share/gnome/help/gedit/cs 0755 root bin +d none /opt/csw/share/gnome/help/gedit/cs/figures 0755 root bin +f none /opt/csw/share/gnome/help/gedit/cs/figures/gedit_window.png 0644 root bin +s none /opt/csw/share/gnome/help/gedit/cs/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +s none /opt/csw/share/gnome/help/gedit/cs/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +s none /opt/csw/share/gnome/help/gedit/cs/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +s none /opt/csw/share/gnome/help/gedit/cs/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/cs/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +f none /opt/csw/share/gnome/help/gedit/cs/gedit.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/cs/legal.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/zh_CN 0755 root bin +f none /opt/csw/share/gnome/help/gedit/zh_CN/legal.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/zh_CN/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/zh_CN/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/zh_CN/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +s none /opt/csw/share/gnome/help/gedit/zh_CN/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +s none /opt/csw/share/gnome/help/gedit/zh_CN/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +s none /opt/csw/share/gnome/help/gedit/zh_CN/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +f none /opt/csw/share/gnome/help/gedit/zh_CN/figures/gedit_window.png 0644 root bin +s none /opt/csw/share/gnome/help/gedit/zh_CN/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +d none /opt/csw/share/gnome/help/gedit/fr 0755 root bin +f none /opt/csw/share/gnome/help/gedit/fr/legal.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/fr/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/fr/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/fr/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +f none /opt/csw/share/gnome/help/gedit/fr/figures/gedit_window.png 0644 root bin +s none /opt/csw/share/gnome/help/gedit/fr/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +f none /opt/csw/share/gnome/help/gedit/fr/figures/gedit_recent_files_menu_icon.png 0644 root bin +s none /opt/csw/share/gnome/help/gedit/fr/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +f none /opt/csw/share/gnome/help/gedit/fr/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/bg 0755 root bin +d none /opt/csw/share/gnome/help/gedit/bg/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/bg/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +f none /opt/csw/share/gnome/help/gedit/bg/figures/gedit_window.png 0644 root bin +s none /opt/csw/share/gnome/help/gedit/bg/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/bg/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +s none /opt/csw/share/gnome/help/gedit/bg/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +s none /opt/csw/share/gnome/help/gedit/bg/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +f none /opt/csw/share/gnome/help/gedit/bg/legal.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/bg/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/hu 0755 root bin +f none /opt/csw/share/gnome/help/gedit/hu/legal.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/hu/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/hu/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/hu/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +s none /opt/csw/share/gnome/help/gedit/hu/figures/gedit_window.png=../../C/figures/gedit_window.png +s none /opt/csw/share/gnome/help/gedit/hu/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +s none /opt/csw/share/gnome/help/gedit/hu/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/hu/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +s none /opt/csw/share/gnome/help/gedit/hu/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +d none /opt/csw/share/gnome/help/gedit/C 0755 root bin +f none /opt/csw/share/gnome/help/gedit/C/legal.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/C/gedit.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/C/figures 0755 root bin +f none /opt/csw/share/gnome/help/gedit/C/figures/gedit_window.png 0644 root bin +f none /opt/csw/share/gnome/help/gedit/C/figures/gedit_format_italic.png 0644 root bin +f none /opt/csw/share/gnome/help/gedit/C/figures/gedit_recent_files_menu_icon.png 0644 root bin +f none /opt/csw/share/gnome/help/gedit/C/figures/gedit_format_strikethrough.png 0644 root bin +f none /opt/csw/share/gnome/help/gedit/C/figures/gedit_format_underline.png 0644 root bin +f none /opt/csw/share/gnome/help/gedit/C/figures/gedit_format_bold.png 0644 root bin +d none /opt/csw/share/gnome/help/gedit/es 0755 root bin +f none /opt/csw/share/gnome/help/gedit/es/gedit.xml 0644 root bin +f none /opt/csw/share/gnome/help/gedit/es/legal.xml 0644 root bin +d none /opt/csw/share/gnome/help/gedit/es/figures 0755 root bin +s none /opt/csw/share/gnome/help/gedit/es/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png +s none /opt/csw/share/gnome/help/gedit/es/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png +s none /opt/csw/share/gnome/help/gedit/es/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png +s none /opt/csw/share/gnome/help/gedit/es/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png +f none /opt/csw/share/gnome/help/gedit/es/figures/gedit_window.png 0644 root bin +s none /opt/csw/share/gnome/help/gedit/es/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png +d none /opt/csw/share/gedit-2 0755 root bin +d none /opt/csw/share/gedit-2/ui 0755 root bin +f none /opt/csw/share/gedit-2/ui/gedit-preferences-dialog.ui 0644 root bin +f none /opt/csw/share/gedit-2/ui/gedit-ui.xml 0644 root bin +f none /opt/csw/share/gedit-2/ui/gedit-search-dialog.ui 0644 root bin +f none /opt/csw/share/gedit-2/ui/gedit-print-preferences.ui 0644 root bin +f none /opt/csw/share/gedit-2/ui/gedit-encodings-dialog.ui 0644 root bin +d none /opt/csw/share/gedit-2/plugins 0755 root bin +d none /opt/csw/share/gedit-2/plugins/time 0755 root bin +f none /opt/csw/share/gedit-2/plugins/time/gedit-time-dialog.ui 0644 root bin +f none /opt/csw/share/gedit-2/plugins/time/gedit-time-setup-dialog.ui 0644 root bin +d none /opt/csw/share/gedit-2/plugins/sort 0755 root bin +f none /opt/csw/share/gedit-2/plugins/sort/sort.ui 0644 root bin +d none /opt/csw/share/gedit-2/plugins/docinfo 0755 root bin +f none /opt/csw/share/gedit-2/plugins/docinfo/docinfo.ui 0644 root bin +d none /opt/csw/share/gedit-2/plugins/taglist 0755 root bin +f none /opt/csw/share/gedit-2/plugins/taglist/HTML.tags.gz 0644 root bin +f none /opt/csw/share/gedit-2/plugins/taglist/Latex.tags.gz 0644 root bin +f none /opt/csw/share/gedit-2/plugins/taglist/XUL.tags.gz 0644 root bin +f none /opt/csw/share/gedit-2/plugins/taglist/XSLT.tags.gz 0644 root bin +d none /opt/csw/share/gedit-2/plugins/spell 0755 root bin +f none /opt/csw/share/gedit-2/plugins/spell/spell-checker.ui 0644 root bin +f none /opt/csw/share/gedit-2/plugins/spell/languages-dialog.ui 0644 root bin +d none /opt/csw/share/gedit-2/plugins/filebrowser 0755 root bin +f none /opt/csw/share/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml 0644 root bin +d none /opt/csw/share/gedit-2/plugins/changecase 0755 root bin +d none /opt/csw/share/gedit-2/plugins/modelines 0755 root bin +f none /opt/csw/share/gedit-2/plugins/modelines/language-mappings 0644 root bin +d none /opt/csw/share/gedit-2/icons 0755 root bin +f none /opt/csw/share/gedit-2/icons/gedit-plugin.png 0644 root bin +d none /opt/csw/share/gedit-2/logo 0755 root bin +f none /opt/csw/share/gedit-2/logo/gedit-logo.png 0644 root bin +d none /opt/csw/share/locale 0755 root bin +d none /opt/csw/share/locale/lv 0755 root bin +d none /opt/csw/share/locale/lv/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/lv/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/br 0755 root bin +d none /opt/csw/share/locale/br/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/br/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/eu 0755 root bin +d none /opt/csw/share/locale/eu/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/eu/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/pt 0755 root bin +d none /opt/csw/share/locale/pt/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/pt/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/ko 0755 root bin +d none /opt/csw/share/locale/ko/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ko/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/az 0755 root bin +d none /opt/csw/share/locale/az/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/az/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/hy 0755 root bin +d none /opt/csw/share/locale/hy/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/hy/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/te 0755 root bin +d none /opt/csw/share/locale/te/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/te/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/sv 0755 root bin +d none /opt/csw/share/locale/sv/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/sv/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/fi 0755 root bin +d none /opt/csw/share/locale/fi/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/fi/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/ca at valencia 0755 root bin +d none /opt/csw/share/locale/ca at valencia/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ca at valencia/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/en_GB 0755 root bin +d none /opt/csw/share/locale/en_GB/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/en_GB/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/mk 0755 root bin +d none /opt/csw/share/locale/mk/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/mk/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/id 0755 root bin +d none /opt/csw/share/locale/id/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/id/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/ru 0755 root bin +d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ru/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/nn 0755 root bin +d none /opt/csw/share/locale/nn/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/nn/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/uk 0755 root bin +d none /opt/csw/share/locale/uk/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/uk/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/ja 0755 root bin +d none /opt/csw/share/locale/ja/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ja/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/de 0755 root bin +d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/de/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/ml 0755 root bin +d none /opt/csw/share/locale/ml/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ml/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/vi 0755 root bin +d none /opt/csw/share/locale/vi/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/vi/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/mr 0755 root bin +d none /opt/csw/share/locale/mr/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/mr/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/sq 0755 root bin +d none /opt/csw/share/locale/sq/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/sq/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/th 0755 root bin +d none /opt/csw/share/locale/th/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/th/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/ps 0755 root bin +d none /opt/csw/share/locale/ps/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ps/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/el 0755 root bin +d none /opt/csw/share/locale/el/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/el/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/la 0755 root bin +d none /opt/csw/share/locale/la/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/la/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/be 0755 root bin +d none /opt/csw/share/locale/be/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/be/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/am 0755 root bin +d none /opt/csw/share/locale/am/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/am/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/oc 0755 root bin +d none /opt/csw/share/locale/oc/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/oc/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/tr 0755 root bin +d none /opt/csw/share/locale/tr/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/tr/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/as 0755 root bin +d none /opt/csw/share/locale/as/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/as/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/sk 0755 root bin +d none /opt/csw/share/locale/sk/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/sk/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/da 0755 root bin +d none /opt/csw/share/locale/da/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/da/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/be at latin 0755 root bin +d none /opt/csw/share/locale/be at latin/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/be at latin/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/sr at latin 0755 root bin +d none /opt/csw/share/locale/sr at latin/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/sr at latin/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/nds 0755 root bin +d none /opt/csw/share/locale/nds/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/nds/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/is 0755 root bin +d none /opt/csw/share/locale/is/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/is/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/ro 0755 root bin +d none /opt/csw/share/locale/ro/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ro/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/it 0755 root bin +d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/it/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/ca 0755 root bin +d none /opt/csw/share/locale/ca/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ca/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/ta 0755 root bin +d none /opt/csw/share/locale/ta/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ta/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/sl 0755 root bin +d none /opt/csw/share/locale/sl/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/sl/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/tk 0755 root bin +d none /opt/csw/share/locale/tk/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/tk/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/sr 0755 root bin +d none /opt/csw/share/locale/sr/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/sr/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/hi 0755 root bin +d none /opt/csw/share/locale/hi/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/hi/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/pt_BR 0755 root bin +d none /opt/csw/share/locale/pt_BR/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/pt_BR/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/ku 0755 root bin +d none /opt/csw/share/locale/ku/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ku/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/crh 0755 root bin +d none /opt/csw/share/locale/crh/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/crh/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/ka 0755 root bin +d none /opt/csw/share/locale/ka/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ka/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/eo 0755 root bin +d none /opt/csw/share/locale/eo/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/eo/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/hu 0755 root bin +d none /opt/csw/share/locale/hu/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/hu/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/or 0755 root bin +d none /opt/csw/share/locale/or/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/or/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/wa 0755 root bin +d none /opt/csw/share/locale/wa/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/wa/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/es 0755 root bin +d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/es/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/pl 0755 root bin +d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/pl/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/gl 0755 root bin +d none /opt/csw/share/locale/gl/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/gl/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/ne 0755 root bin +d none /opt/csw/share/locale/ne/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ne/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/en_CA 0755 root bin +d none /opt/csw/share/locale/en_CA/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/en_CA/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/en at shaw 0755 root bin +d none /opt/csw/share/locale/en at shaw/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/en at shaw/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/mg 0755 root bin +d none /opt/csw/share/locale/mg/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/mg/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/ms 0755 root bin +d none /opt/csw/share/locale/ms/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ms/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/dz 0755 root bin +d none /opt/csw/share/locale/dz/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/dz/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/ast 0755 root bin +d none /opt/csw/share/locale/ast/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ast/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/gu 0755 root bin +d none /opt/csw/share/locale/gu/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/gu/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/ga 0755 root bin +d none /opt/csw/share/locale/ga/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ga/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/nb 0755 root bin +d none /opt/csw/share/locale/nb/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/nb/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/pa 0755 root bin +d none /opt/csw/share/locale/pa/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/pa/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/et 0755 root bin +d none /opt/csw/share/locale/et/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/et/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/bs 0755 root bin +d none /opt/csw/share/locale/bs/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/bs/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/bg 0755 root bin +d none /opt/csw/share/locale/bg/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/bg/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/kn 0755 root bin +d none /opt/csw/share/locale/kn/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/kn/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/hr 0755 root bin +d none /opt/csw/share/locale/hr/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/hr/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/si 0755 root bin +d none /opt/csw/share/locale/si/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/si/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/fr 0755 root bin +d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/fr/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/zh_HK 0755 root bin +d none /opt/csw/share/locale/zh_HK/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/zh_HK/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/zh_TW 0755 root bin +d none /opt/csw/share/locale/zh_TW/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/zh_TW/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/nl 0755 root bin +d none /opt/csw/share/locale/nl/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/nl/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/mn 0755 root bin +d none /opt/csw/share/locale/mn/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/mn/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/mi 0755 root bin +d none /opt/csw/share/locale/mi/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/mi/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/cs 0755 root bin +d none /opt/csw/share/locale/cs/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/cs/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/xh 0755 root bin +d none /opt/csw/share/locale/xh/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/xh/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/cy 0755 root bin +d none /opt/csw/share/locale/cy/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/cy/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/bn_IN 0755 root bin +d none /opt/csw/share/locale/bn_IN/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/bn_IN/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/zh_CN 0755 root bin +d none /opt/csw/share/locale/zh_CN/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/zh_CN/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/rw 0755 root bin +d none /opt/csw/share/locale/rw/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/rw/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/bn 0755 root bin +d none /opt/csw/share/locale/bn/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/bn/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/lt 0755 root bin +d none /opt/csw/share/locale/lt/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/lt/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/fa 0755 root bin +d none /opt/csw/share/locale/fa/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/fa/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/af 0755 root bin +d none /opt/csw/share/locale/af/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/af/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/he 0755 root bin +d none /opt/csw/share/locale/he/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/he/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/mai 0755 root bin +d none /opt/csw/share/locale/mai/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/mai/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/locale/ar 0755 root bin +d none /opt/csw/share/locale/ar/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ar/LC_MESSAGES/gedit.mo 0644 root bin +d none /opt/csw/share/man 0755 root bin +d none /opt/csw/share/man/man1 0755 root bin +f none /opt/csw/share/man/man1/gedit.1 0644 root bin +d none /opt/csw/lib 0755 root bin +d none /opt/csw/lib/pkgconfig 0755 root bin +f none /opt/csw/lib/pkgconfig/gedit-2.20.pc 0644 root bin +d none /opt/csw/lib/gedit-2 0755 root bin +d none /opt/csw/lib/gedit-2/plugin-loaders 0755 root bin +f none /opt/csw/lib/gedit-2/plugin-loaders/libcloader.so 0755 root bin +f none /opt/csw/lib/gedit-2/plugin-loaders/libcloader.la 0755 root bin +d none /opt/csw/lib/gedit-2/plugins 0755 root bin +f none /opt/csw/lib/gedit-2/plugins/libtaglist.la 0755 root bin +f none /opt/csw/lib/gedit-2/plugins/modelines.gedit-plugin 0644 root bin +f none /opt/csw/lib/gedit-2/plugins/libchangecase.la 0755 root bin +f none /opt/csw/lib/gedit-2/plugins/libspell.la 0755 root bin +f none /opt/csw/lib/gedit-2/plugins/libdocinfo.so 0755 root bin +f none /opt/csw/lib/gedit-2/plugins/libsort.la 0755 root bin +f none /opt/csw/lib/gedit-2/plugins/docinfo.gedit-plugin 0644 root bin +f none /opt/csw/lib/gedit-2/plugins/libsort.so 0755 root bin +f none /opt/csw/lib/gedit-2/plugins/libdocinfo.la 0755 root bin +f none /opt/csw/lib/gedit-2/plugins/changecase.gedit-plugin 0644 root bin +f none /opt/csw/lib/gedit-2/plugins/libspell.so 0755 root bin +f none /opt/csw/lib/gedit-2/plugins/libtaglist.so 0755 root bin +f none /opt/csw/lib/gedit-2/plugins/libchangecase.so 0755 root bin +f none /opt/csw/lib/gedit-2/plugins/libmodelines.so 0755 root bin +f none /opt/csw/lib/gedit-2/plugins/libfilebrowser.so 0755 root bin +f none /opt/csw/lib/gedit-2/plugins/time.gedit-plugin 0644 root bin +f none /opt/csw/lib/gedit-2/plugins/libtime.la 0755 root bin +f none /opt/csw/lib/gedit-2/plugins/filebrowser.gedit-plugin 0644 root bin +f none /opt/csw/lib/gedit-2/plugins/sort.gedit-plugin 0644 root bin +f none /opt/csw/lib/gedit-2/plugins/taglist.gedit-plugin 0644 root bin +f none /opt/csw/lib/gedit-2/plugins/libtime.so 0755 root bin +f none /opt/csw/lib/gedit-2/plugins/libfilebrowser.la 0755 root bin +f none /opt/csw/lib/gedit-2/plugins/spell.gedit-plugin 0644 root bin +f none /opt/csw/lib/gedit-2/plugins/libmodelines.la 0755 root bin +d none /opt/csw/libexec 0755 root bin +d none /opt/csw/libexec/gedit-2 0755 root bin +f none /opt/csw/libexec/gedit-2/gedit-bugreport.sh 0755 root bin Deleted: csw/mgar/pkg/gedit/trunk/Makefile =================================================================== --- csw/mgar/pkg/gedit/trunk/Makefile 2012-03-09 21:01:11 UTC (rev 17345) +++ csw/mgar/pkg/gedit/trunk/Makefile 2012-03-09 21:17:34 UTC (rev 17346) @@ -1,172 +0,0 @@ -# This file is from TEMPLATES/createpkg/Makefile.lib -# You MUST build this with gnu make, unfortunately. -# Mainly just because of the ARCH expansion, but also for "?=" - -# Customize your prototype file(s) as needed - -# Organization: variable defintions up top, -# targets in second half. -# Note that assignments with "?=" mean "assign if not already assigned. - -# for stupid intltool... -PATH := /opt/csw/gnu:$(PATH) - -# Where do we keep local downloads of software src files -ARCHIVEDIR ?= /home/src -ARCHIVENAME ?= gedit-2.30.3.tar.bz2 -EXTRACTPROG ?= /usr/sfw/bin/gtar jfx - -# Only use ONE here. The name is used for compat with 'gar'. -MASTER_SITES ?= http://ftp.gnome.org/pub/GNOME/sources/gedit/2.30 - -ARCH := $(shell /bin/uname -p) - -LDFLAGS_COMMON := - -SRCDIR= build/* - -# DO NOT specify the arch-64 stuff such as -m64 here. -# the individual targets will do that. - -CFLAGS_COMMON ?= -mt -xnorunpath -xO3 -CXXFLAGS_COMMON ?= -mt -norunpath -xO3 -CFLAGS_sparc ?= -xarch=v8 -CFLAGS_i386 ?= -xarch=386 - -# Keep this arch-neutral if possible. add arch-specific tweaks -# to arch-specific target -CONFIGURE=./configure --prefix=/opt/csw --enable-static=no - - - -CREATEPKG=createpkg -r `pwd`/build/*/cswstage - - -all: $(ARCH)-32 -#all: $(ARCH)-32 package - -# ARCH-XX handles configure, build, and stage for its own combo -# - -EXTRACTPROG ?= /bin/echo ERROR: need to set EXTRACTPROG ; exit 1 ; - - - -extract: build/.extract.done - -build/.extract.done: - test -d build || mkdir build - @if test -f $(ARCHIVEDIR)/$(ARCHIVENAME) ; then \ - echo Extracting $(ARCHIVENAME) under build dir... ;\ - ( cd build && $(EXTRACTPROG) $(ARCHIVEDIR)/$(ARCHIVENAME) ) ; \ - else echo Cannot extract - $(ARCHIVEDIR)/$(ARCHIVENAME) does not exist ;\ - exit 1; \ - fi - touch build/.extract.done - - -clean distclean: - @echo Calling $@ in $(SRCDIR) - $(MAKE) -C $(SRCDIR) $@ - - -reallyclean: distclean - @echo Removing any milestone files in build as well... - @rm -f build/.??* - @echo '(However, leaving src tree intact, with any patches in it)' - @echo '(If you want, you could rm -r build, then make extract once more)' - -garchive: - @echo Call the fetch target instead: it does the same thing. - - -# Downloads the source code to the common ARCHIVEDIR -fetch: $(ARCHIVEDIR)/$(ARCHIVENAME) - @echo fetch done - -$(ARCHIVEDIR)/$(ARCHIVENAME): - wget -P $(ARCHIVEDIR) $(MASTER_SITES)/$(ARCHIVENAME) - -patch: - @echo patch: patching is handled automatically as part of the configure phase. - -stage-preserved: - @if test -f preserve-$(ARCH).tar ; then \ - echo Copying preserved arch-specific files; \ - cat preserve-$(ARCH).tar |(cd $(SRCDIR)/cswstage && tar xvf -);\ - fi - @if test -f preserve.tar ; then \ - echo Copying preserved arch-neutral files; \ - cat preserve.tar |(cd $(SRCDIR)/cswstage && tar xvf -);\ - fi - -package: stage-preserved - $(CREATEPKG) - - -# split out generic $(ARCH) sections to platform-specific sections if needed. -# but it usually should not be neccessary - - -$(ARCH)-32 :: configure-$(ARCH)-32 build-$(ARCH)-32 stage-$(ARCH)-32 - @echo Completed $(ARCH)-32 configure, build and stage - touch build/.$(ARCH)-32.done - - - -build/.$(ARCH)-32.done: $(ARCH)-32 - -# Since we share the same src tree, we should only need to -# pre-configure patching one time for all. -build/.patch-preconf.done: build/.extract.done - if test -f patchfile.preconf ; then \ - gpatch -d $(SRCDIR) -p0 prototype - @echo Dont forget to add a COPYING line !! Deleted: csw/mgar/pkg/gedit/trunk/copyright =================================================================== --- csw/mgar/pkg/gedit/trunk/copyright 2012-03-09 21:01:11 UTC (rev 17345) +++ csw/mgar/pkg/gedit/trunk/copyright 2012-03-09 21:17:34 UTC (rev 17346) @@ -1,2 +0,0 @@ -Please see /opt/csw/share/gtk-doc/html/gedit/COPYING for full license text -(GPL v2) Deleted: csw/mgar/pkg/gedit/trunk/depend =================================================================== --- csw/mgar/pkg/gedit/trunk/depend 2012-03-09 21:01:11 UTC (rev 17345) +++ csw/mgar/pkg/gedit/trunk/depend 2012-03-09 21:17:34 UTC (rev 17346) @@ -1,13 +0,0 @@ -P CSWenchant -P CSWfconfig -P CSWftype2 -P CSWgconf2 -P CSWggettextrt -P CSWglib2 -P CSWgtk2 -P CSWgtksourceview -P CSWlibatk -P CSWlibcairo -P CSWlibxml2 -P CSWpango -P CSWiso-codes Deleted: csw/mgar/pkg/gedit/trunk/patchfile.preconf =================================================================== --- csw/mgar/pkg/gedit/trunk/patchfile.preconf 2012-03-09 21:01:11 UTC (rev 17345) +++ csw/mgar/pkg/gedit/trunk/patchfile.preconf 2012-03-09 21:17:34 UTC (rev 17346) @@ -1,14 +0,0 @@ ---- tests/document-saver.c.orig 2010-06-26 23:08:00.628354438 +0200 -+++ tests/document-saver.c 2010-06-26 23:10:15.048708870 +0200 -@@ -27,6 +27,11 @@ - #include - #include - -+/* linux/bsd has it. others such as Solaris, do not */ -+#ifndef ACCESSPERMS -+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) -+#endif -+ - #define DEFAULT_LOCAL_URI "/tmp/gedit-document-saver-test.txt" - #define DEFAULT_REMOTE_URI "sftp://localhost/tmp/gedit-document-saver-test.txt" - #define DEFAULT_CONTENT "hello world!" Deleted: csw/mgar/pkg/gedit/trunk/pkginfo =================================================================== --- csw/mgar/pkg/gedit/trunk/pkginfo 2012-03-09 21:01:11 UTC (rev 17345) +++ csw/mgar/pkg/gedit/trunk/pkginfo 2012-03-09 21:17:34 UTC (rev 17346) @@ -1,8 +0,0 @@ -PKG=CSWgedit -NAME=gedit - The official GNOME text editor -VERSION=2.30.3,REV=2010.06.26 -CATEGORY=application -VENDOR=http://www.gnome.org/ packaged for CSW by Philip Brown -HOTLINE=http://www.opencsw.org/bugtrack/ -EMAIL=phil at opencsw.org -OPENCSW_REPOSITORY=https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/gedit/trunk Deleted: csw/mgar/pkg/gedit/trunk/prototype =================================================================== --- csw/mgar/pkg/gedit/trunk/prototype 2012-03-09 21:01:11 UTC (rev 17345) +++ csw/mgar/pkg/gedit/trunk/prototype 2012-03-09 21:17:34 UTC (rev 17346) @@ -1,698 +0,0 @@ -i pkginfo -i copyright -i depend -d none /opt/csw/include 0755 root bin -d none /opt/csw/include/gedit-2.20 0755 root bin -d none /opt/csw/include/gedit-2.20/gedit 0755 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-status-combo-box.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-progress-message-area.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-message-type.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-file-chooser-dialog.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-encodings.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-encodings-combo-box.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-window.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-app.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-debug.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-prefs-manager-app.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-view.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-commands.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-message-bus.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-plugin.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-document.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-panel.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-tab.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-notebook.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-utils.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-message.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-help.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-prefs-manager.h 0644 root bin -f none /opt/csw/include/gedit-2.20/gedit/gedit-statusbar.h 0644 root bin -d none /opt/csw/etc 0755 root bin -d none /opt/csw/etc/gconf 0755 root bin -d none /opt/csw/etc/gconf/schemas 0755 root bin -f none /opt/csw/etc/gconf/schemas/gedit.schemas 0644 root bin -f none /opt/csw/etc/gconf/schemas/gedit-file-browser.schemas 0644 root bin -d none /opt/csw/bin 0755 root bin -s none /opt/csw/bin/gnome-text-editor=gedit -f none /opt/csw/bin/gedit 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/gtk-doc 0755 root bin -d none /opt/csw/share/gtk-doc/html 0755 root bin -d none /opt/csw/share/gtk-doc/html/gedit 0755 root bin -f none /opt/csw/share/gtk-doc/html/gedit/COPYING=COPYING 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/index.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-encodings-option-menu.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/index.sgml 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-statusbar.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-document.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/style.css 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/ch01.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-tab.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-GeditPrintJob.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-app.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit.devhelp 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-GeditMessageType.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/left.png 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-progress-message-area.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-file-chooser-dialog.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/up.png 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/GeditPlugin.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-prefs-manager-app.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-print-job-preview.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-panel.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-encodings.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-notebook.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-convert.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-help.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-view.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/home.png 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-utils.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-debug.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/right.png 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/GeditMessage.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/GeditMessageBus.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-window.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit.devhelp2 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-metadata-manager.html 0644 root bin -f none /opt/csw/share/gtk-doc/html/gedit/gedit-gedit-prefs-manager.html 0644 root bin -d none /opt/csw/share/applications 0755 root bin -f none /opt/csw/share/applications/gedit.desktop 0644 root bin -d none /opt/csw/share/omf 0755 root bin -d none /opt/csw/share/omf/gedit 0755 root bin -f none /opt/csw/share/omf/gedit/gedit-uk.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-ru.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-ja.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-de.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-ko.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-fi.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-el.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-fr.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-bg.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-pt_BR.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-ca.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-cs.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-th.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-zh_CN.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-it.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-sv.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-zh_HK.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-hu.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-es.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-zh_TW.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-da.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-ar.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-oc.omf 0644 root bin -f none /opt/csw/share/omf/gedit/gedit-C.omf 0644 root bin -d none /opt/csw/share/gnome 0755 root bin -d none /opt/csw/share/gnome/help 0755 root bin -d none /opt/csw/share/gnome/help/gedit 0755 root bin -d none /opt/csw/share/gnome/help/gedit/it 0755 root bin -f none /opt/csw/share/gnome/help/gedit/it/legal.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/it/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/it/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/it/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -s none /opt/csw/share/gnome/help/gedit/it/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -s none /opt/csw/share/gnome/help/gedit/it/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -s none /opt/csw/share/gnome/help/gedit/it/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/it/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -f none /opt/csw/share/gnome/help/gedit/it/figures/gedit_window.png 0644 root bin -d none /opt/csw/share/gnome/help/gedit/ca 0755 root bin -f none /opt/csw/share/gnome/help/gedit/ca/legal.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/ca/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/ca/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/ca/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -s none /opt/csw/share/gnome/help/gedit/ca/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -f none /opt/csw/share/gnome/help/gedit/ca/figures/gedit_window.png 0644 root bin -s none /opt/csw/share/gnome/help/gedit/ca/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -s none /opt/csw/share/gnome/help/gedit/ca/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/ca/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -d none /opt/csw/share/gnome/help/gedit/da 0755 root bin -d none /opt/csw/share/gnome/help/gedit/da/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/da/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/da/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -s none /opt/csw/share/gnome/help/gedit/da/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -s none /opt/csw/share/gnome/help/gedit/da/figures/gedit_window.png=../../C/figures/gedit_window.png -s none /opt/csw/share/gnome/help/gedit/da/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -s none /opt/csw/share/gnome/help/gedit/da/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -f none /opt/csw/share/gnome/help/gedit/da/legal.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/da/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/pt_BR 0755 root bin -d none /opt/csw/share/gnome/help/gedit/pt_BR/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/pt_BR/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -s none /opt/csw/share/gnome/help/gedit/pt_BR/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -s none /opt/csw/share/gnome/help/gedit/pt_BR/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/pt_BR/figures/gedit_window.png=../../C/figures/gedit_window.png -s none /opt/csw/share/gnome/help/gedit/pt_BR/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -s none /opt/csw/share/gnome/help/gedit/pt_BR/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -f none /opt/csw/share/gnome/help/gedit/pt_BR/gedit.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/pt_BR/legal.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/oc 0755 root bin -d none /opt/csw/share/gnome/help/gedit/oc/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/oc/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -s none /opt/csw/share/gnome/help/gedit/oc/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -s none /opt/csw/share/gnome/help/gedit/oc/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -s none /opt/csw/share/gnome/help/gedit/oc/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/oc/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -s none /opt/csw/share/gnome/help/gedit/oc/figures/gedit_window.png=../../C/figures/gedit_window.png -f none /opt/csw/share/gnome/help/gedit/oc/legal.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/oc/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/th 0755 root bin -f none /opt/csw/share/gnome/help/gedit/th/legal.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/th/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/th/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/th/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/th/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -s none /opt/csw/share/gnome/help/gedit/th/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -s none /opt/csw/share/gnome/help/gedit/th/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -s none /opt/csw/share/gnome/help/gedit/th/figures/gedit_window.png=../../C/figures/gedit_window.png -s none /opt/csw/share/gnome/help/gedit/th/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -d none /opt/csw/share/gnome/help/gedit/el 0755 root bin -f none /opt/csw/share/gnome/help/gedit/el/legal.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/el/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/el/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/el/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -s none /opt/csw/share/gnome/help/gedit/el/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/el/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -f none /opt/csw/share/gnome/help/gedit/el/figures/gedit_window.png 0644 root bin -s none /opt/csw/share/gnome/help/gedit/el/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -s none /opt/csw/share/gnome/help/gedit/el/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -d none /opt/csw/share/gnome/help/gedit/uk 0755 root bin -f none /opt/csw/share/gnome/help/gedit/uk/legal.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/uk/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/uk/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/uk/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/uk/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -s none /opt/csw/share/gnome/help/gedit/uk/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -s none /opt/csw/share/gnome/help/gedit/uk/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -s none /opt/csw/share/gnome/help/gedit/uk/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -f none /opt/csw/share/gnome/help/gedit/uk/figures/gedit_window.png 0644 root bin -d none /opt/csw/share/gnome/help/gedit/ja 0755 root bin -f none /opt/csw/share/gnome/help/gedit/ja/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/ja/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/ja/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -f none /opt/csw/share/gnome/help/gedit/ja/figures/gedit_window.png 0644 root bin -s none /opt/csw/share/gnome/help/gedit/ja/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -s none /opt/csw/share/gnome/help/gedit/ja/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/ja/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -s none /opt/csw/share/gnome/help/gedit/ja/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -f none /opt/csw/share/gnome/help/gedit/ja/legal.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/de 0755 root bin -f none /opt/csw/share/gnome/help/gedit/de/gedit.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/de/legal.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/de/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/de/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -s none /opt/csw/share/gnome/help/gedit/de/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -s none /opt/csw/share/gnome/help/gedit/de/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/de/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -f none /opt/csw/share/gnome/help/gedit/de/figures/gedit_window.png 0644 root bin -s none /opt/csw/share/gnome/help/gedit/de/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -d none /opt/csw/share/gnome/help/gedit/ru 0755 root bin -f none /opt/csw/share/gnome/help/gedit/ru/legal.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/ru/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/ru/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/ru/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/ru/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -s none /opt/csw/share/gnome/help/gedit/ru/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -s none /opt/csw/share/gnome/help/gedit/ru/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -s none /opt/csw/share/gnome/help/gedit/ru/figures/gedit_window.png=../../C/figures/gedit_window.png -s none /opt/csw/share/gnome/help/gedit/ru/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -d none /opt/csw/share/gnome/help/gedit/ko 0755 root bin -d none /opt/csw/share/gnome/help/gedit/ko/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/ko/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -s none /opt/csw/share/gnome/help/gedit/ko/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -f none /opt/csw/share/gnome/help/gedit/ko/figures/gedit_window.png 0644 root bin -s none /opt/csw/share/gnome/help/gedit/ko/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -s none /opt/csw/share/gnome/help/gedit/ko/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/ko/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -f none /opt/csw/share/gnome/help/gedit/ko/legal.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/ko/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/sv 0755 root bin -f none /opt/csw/share/gnome/help/gedit/sv/gedit.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/sv/legal.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/sv/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/sv/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/sv/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -s none /opt/csw/share/gnome/help/gedit/sv/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -f none /opt/csw/share/gnome/help/gedit/sv/figures/gedit_window.png 0644 root bin -s none /opt/csw/share/gnome/help/gedit/sv/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -s none /opt/csw/share/gnome/help/gedit/sv/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -d none /opt/csw/share/gnome/help/gedit/fi 0755 root bin -d none /opt/csw/share/gnome/help/gedit/fi/figures 0755 root bin -f none /opt/csw/share/gnome/help/gedit/fi/figures/gedit_window.png 0644 root bin -s none /opt/csw/share/gnome/help/gedit/fi/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -s none /opt/csw/share/gnome/help/gedit/fi/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/fi/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -s none /opt/csw/share/gnome/help/gedit/fi/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -s none /opt/csw/share/gnome/help/gedit/fi/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -f none /opt/csw/share/gnome/help/gedit/fi/legal.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/fi/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/zh_TW 0755 root bin -d none /opt/csw/share/gnome/help/gedit/zh_TW/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/zh_TW/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -s none /opt/csw/share/gnome/help/gedit/zh_TW/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -s none /opt/csw/share/gnome/help/gedit/zh_TW/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -f none /opt/csw/share/gnome/help/gedit/zh_TW/figures/gedit_window.png 0644 root bin -s none /opt/csw/share/gnome/help/gedit/zh_TW/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -s none /opt/csw/share/gnome/help/gedit/zh_TW/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -f none /opt/csw/share/gnome/help/gedit/zh_TW/legal.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/zh_TW/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/zh_HK 0755 root bin -d none /opt/csw/share/gnome/help/gedit/zh_HK/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/zh_HK/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -s none /opt/csw/share/gnome/help/gedit/zh_HK/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -f none /opt/csw/share/gnome/help/gedit/zh_HK/figures/gedit_window.png 0644 root bin -s none /opt/csw/share/gnome/help/gedit/zh_HK/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -s none /opt/csw/share/gnome/help/gedit/zh_HK/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/zh_HK/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -f none /opt/csw/share/gnome/help/gedit/zh_HK/gedit.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/zh_HK/legal.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/ar 0755 root bin -f none /opt/csw/share/gnome/help/gedit/ar/legal.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/ar/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/ar/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/ar/figures/gedit_window.png=../../C/figures/gedit_window.png -s none /opt/csw/share/gnome/help/gedit/ar/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -s none /opt/csw/share/gnome/help/gedit/ar/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -s none /opt/csw/share/gnome/help/gedit/ar/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -s none /opt/csw/share/gnome/help/gedit/ar/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -s none /opt/csw/share/gnome/help/gedit/ar/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -d none /opt/csw/share/gnome/help/gedit/cs 0755 root bin -d none /opt/csw/share/gnome/help/gedit/cs/figures 0755 root bin -f none /opt/csw/share/gnome/help/gedit/cs/figures/gedit_window.png 0644 root bin -s none /opt/csw/share/gnome/help/gedit/cs/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -s none /opt/csw/share/gnome/help/gedit/cs/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -s none /opt/csw/share/gnome/help/gedit/cs/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -s none /opt/csw/share/gnome/help/gedit/cs/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/cs/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -f none /opt/csw/share/gnome/help/gedit/cs/gedit.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/cs/legal.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/zh_CN 0755 root bin -f none /opt/csw/share/gnome/help/gedit/zh_CN/legal.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/zh_CN/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/zh_CN/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/zh_CN/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -s none /opt/csw/share/gnome/help/gedit/zh_CN/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -s none /opt/csw/share/gnome/help/gedit/zh_CN/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -s none /opt/csw/share/gnome/help/gedit/zh_CN/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -f none /opt/csw/share/gnome/help/gedit/zh_CN/figures/gedit_window.png 0644 root bin -s none /opt/csw/share/gnome/help/gedit/zh_CN/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -d none /opt/csw/share/gnome/help/gedit/fr 0755 root bin -f none /opt/csw/share/gnome/help/gedit/fr/legal.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/fr/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/fr/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/fr/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -f none /opt/csw/share/gnome/help/gedit/fr/figures/gedit_window.png 0644 root bin -s none /opt/csw/share/gnome/help/gedit/fr/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -f none /opt/csw/share/gnome/help/gedit/fr/figures/gedit_recent_files_menu_icon.png 0644 root bin -s none /opt/csw/share/gnome/help/gedit/fr/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -f none /opt/csw/share/gnome/help/gedit/fr/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/bg 0755 root bin -d none /opt/csw/share/gnome/help/gedit/bg/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/bg/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -f none /opt/csw/share/gnome/help/gedit/bg/figures/gedit_window.png 0644 root bin -s none /opt/csw/share/gnome/help/gedit/bg/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/bg/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -s none /opt/csw/share/gnome/help/gedit/bg/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -s none /opt/csw/share/gnome/help/gedit/bg/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -f none /opt/csw/share/gnome/help/gedit/bg/legal.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/bg/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/hu 0755 root bin -f none /opt/csw/share/gnome/help/gedit/hu/legal.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/hu/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/hu/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/hu/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -s none /opt/csw/share/gnome/help/gedit/hu/figures/gedit_window.png=../../C/figures/gedit_window.png -s none /opt/csw/share/gnome/help/gedit/hu/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -s none /opt/csw/share/gnome/help/gedit/hu/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/hu/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -s none /opt/csw/share/gnome/help/gedit/hu/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -d none /opt/csw/share/gnome/help/gedit/C 0755 root bin -f none /opt/csw/share/gnome/help/gedit/C/legal.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/C/gedit.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/C/figures 0755 root bin -f none /opt/csw/share/gnome/help/gedit/C/figures/gedit_window.png 0644 root bin -f none /opt/csw/share/gnome/help/gedit/C/figures/gedit_format_italic.png 0644 root bin -f none /opt/csw/share/gnome/help/gedit/C/figures/gedit_recent_files_menu_icon.png 0644 root bin -f none /opt/csw/share/gnome/help/gedit/C/figures/gedit_format_strikethrough.png 0644 root bin -f none /opt/csw/share/gnome/help/gedit/C/figures/gedit_format_underline.png 0644 root bin -f none /opt/csw/share/gnome/help/gedit/C/figures/gedit_format_bold.png 0644 root bin -d none /opt/csw/share/gnome/help/gedit/es 0755 root bin -f none /opt/csw/share/gnome/help/gedit/es/gedit.xml 0644 root bin -f none /opt/csw/share/gnome/help/gedit/es/legal.xml 0644 root bin -d none /opt/csw/share/gnome/help/gedit/es/figures 0755 root bin -s none /opt/csw/share/gnome/help/gedit/es/figures/gedit_format_strikethrough.png=../../C/figures/gedit_format_strikethrough.png -s none /opt/csw/share/gnome/help/gedit/es/figures/gedit_format_italic.png=../../C/figures/gedit_format_italic.png -s none /opt/csw/share/gnome/help/gedit/es/figures/gedit_format_underline.png=../../C/figures/gedit_format_underline.png -s none /opt/csw/share/gnome/help/gedit/es/figures/gedit_recent_files_menu_icon.png=../../C/figures/gedit_recent_files_menu_icon.png -f none /opt/csw/share/gnome/help/gedit/es/figures/gedit_window.png 0644 root bin -s none /opt/csw/share/gnome/help/gedit/es/figures/gedit_format_bold.png=../../C/figures/gedit_format_bold.png -d none /opt/csw/share/gedit-2 0755 root bin -d none /opt/csw/share/gedit-2/ui 0755 root bin -f none /opt/csw/share/gedit-2/ui/gedit-preferences-dialog.ui 0644 root bin -f none /opt/csw/share/gedit-2/ui/gedit-ui.xml 0644 root bin -f none /opt/csw/share/gedit-2/ui/gedit-search-dialog.ui 0644 root bin -f none /opt/csw/share/gedit-2/ui/gedit-print-preferences.ui 0644 root bin -f none /opt/csw/share/gedit-2/ui/gedit-encodings-dialog.ui 0644 root bin -d none /opt/csw/share/gedit-2/plugins 0755 root bin -d none /opt/csw/share/gedit-2/plugins/time 0755 root bin -f none /opt/csw/share/gedit-2/plugins/time/gedit-time-dialog.ui 0644 root bin -f none /opt/csw/share/gedit-2/plugins/time/gedit-time-setup-dialog.ui 0644 root bin -d none /opt/csw/share/gedit-2/plugins/sort 0755 root bin -f none /opt/csw/share/gedit-2/plugins/sort/sort.ui 0644 root bin -d none /opt/csw/share/gedit-2/plugins/docinfo 0755 root bin -f none /opt/csw/share/gedit-2/plugins/docinfo/docinfo.ui 0644 root bin -d none /opt/csw/share/gedit-2/plugins/taglist 0755 root bin -f none /opt/csw/share/gedit-2/plugins/taglist/HTML.tags.gz 0644 root bin -f none /opt/csw/share/gedit-2/plugins/taglist/Latex.tags.gz 0644 root bin -f none /opt/csw/share/gedit-2/plugins/taglist/XUL.tags.gz 0644 root bin -f none /opt/csw/share/gedit-2/plugins/taglist/XSLT.tags.gz 0644 root bin -d none /opt/csw/share/gedit-2/plugins/spell 0755 root bin -f none /opt/csw/share/gedit-2/plugins/spell/spell-checker.ui 0644 root bin -f none /opt/csw/share/gedit-2/plugins/spell/languages-dialog.ui 0644 root bin -d none /opt/csw/share/gedit-2/plugins/filebrowser 0755 root bin -f none /opt/csw/share/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml 0644 root bin -d none /opt/csw/share/gedit-2/plugins/changecase 0755 root bin -d none /opt/csw/share/gedit-2/plugins/modelines 0755 root bin -f none /opt/csw/share/gedit-2/plugins/modelines/language-mappings 0644 root bin -d none /opt/csw/share/gedit-2/icons 0755 root bin -f none /opt/csw/share/gedit-2/icons/gedit-plugin.png 0644 root bin -d none /opt/csw/share/gedit-2/logo 0755 root bin -f none /opt/csw/share/gedit-2/logo/gedit-logo.png 0644 root bin -d none /opt/csw/share/locale 0755 root bin -d none /opt/csw/share/locale/lv 0755 root bin -d none /opt/csw/share/locale/lv/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/lv/LC_MESSAGES/gedit.mo 0644 root bin -d none /opt/csw/share/locale/br 0755 root bin -d none /opt/csw/share/locale/br/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/br/LC_MESSAGES/gedit.mo 0644 root bin -d none /opt/csw/share/locale/eu 0755 root bin -d none /opt/csw/share/locale/eu/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/eu/LC_MESSAGES/gedit.mo 0644 root bin -d none /opt/csw/share/locale/pt 0755 root bin -d none /opt/csw/share/locale/pt/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/pt/LC_MESSAGES/gedit.mo 0644 root bin -d none /opt/csw/share/locale/ko 0755 root bin -d none /opt/csw/share/locale/ko/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/ko/LC_MESSAGES/gedit.mo 0644 root bin -d none /opt/csw/share/locale/az 0755 root bin -d none /opt/csw/share/locale/az/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/az/LC_MESSAGES/gedit.mo 0644 root bin -d none /opt/csw/share/locale/hy 0755 root bin -d none /opt/csw/share/locale/hy/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/hy/LC_MESSAGES/gedit.mo 0644 root bin -d none /opt/csw/share/locale/te 0755 root bin -d none /opt/csw/share/locale/te/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/te/LC_MESSAGES/gedit.mo 0644 root bin -d none /opt/csw/share/locale/sv 0755 root bin -d none /opt/csw/share/locale/sv/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/sv/LC_MESSAGES/gedit.mo 0644 root bin -d none /opt/csw/share/locale/fi 0755 root bin -d none /opt/csw/share/locale/fi/LC_MESSAGES 0755 root bin @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 9 22:36:36 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Mar 2012 21:36:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[17347] csw/mgar/pkg/gedit/trunk Message-ID: Revision: 17347 http://gar.svn.sourceforge.net/gar/?rev=17347&view=rev Author: dmichelsen Date: 2012-03-09 21:36:35 +0000 (Fri, 09 Mar 2012) Log Message: ----------- gedit: First GAR version Added Paths: ----------- csw/mgar/pkg/gedit/trunk/Makefile csw/mgar/pkg/gedit/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/gedit/trunk/ Property changes on: csw/mgar/pkg/gedit/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work cswstage build + work Added: csw/mgar/pkg/gedit/trunk/Makefile =================================================================== --- csw/mgar/pkg/gedit/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gedit/trunk/Makefile 2012-03-09 21:36:35 UTC (rev 17347) @@ -0,0 +1,23 @@ +# $Id: Makefile 16916 2012-01-26 13:25:13Z dmichelsen $ +NAME = gedit +VERSION = 2.30.4 +CATEGORIES = apps +GARTYPE = v2 + +DESCRIPTION = The official GNOME text editor +define BLURB +endef + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(DISTNAME).tar.bz2 + +PACKAGES += CSWgedit +RUNTIME_DEP_PKGS_CSWgedit += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgedit += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWgedit += CSWperl + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/gedit/trunk/checksums =================================================================== --- csw/mgar/pkg/gedit/trunk/checksums (rev 0) +++ csw/mgar/pkg/gedit/trunk/checksums 2012-03-09 21:36:35 UTC (rev 17347) @@ -0,0 +1 @@ +e1eecb0a92a1a363b3d375ec5ac0fb3b gedit-2.30.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 9 23:30:12 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 09 Mar 2012 22:30:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17348] csw/mgar/gar/v2/lib/python Message-ID: Revision: 17348 http://gar.svn.sourceforge.net/gar/?rev=17348&view=rev Author: wahwah Date: 2012-03-09 22:30:12 +0000 (Fri, 09 Mar 2012) Log Message: ----------- checkpkg: Support libraries in subdirs This is effectively an amendment to the shared libraries naming policy[1]. It does not affect packages which put libraries into /opt/csw/lib. Packages which put libraries into directories with additional prefixes, e.g. /opt/csw/bdb48/lib, are affected. The main issue is that there can be libraries with the same sonames put into two different directories. Each library should be put into a separate package, but since both libraries have identical sonames, the suggested package names would also be identical, which is an error. Therefore, the package names have to vary according to the prefix under which libraries are put. After this change, checkpkg will suggest adding the prefix at the end of the package name. For example, a library under /opt/csw/foo/lib/libbar.so.1 should be in a package named CSWlibbar1-foo. The immediate use of this change will be for the C++ libraries from Boost. There will be two sets of these libraries, one built with Sun Studio, put into /opt/csw/lib and one built with GCC, put into /opt/csw/gxx/lib. [1] http://wiki.opencsw.org/shared-libraries Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/lib/python/sharedlib_utils.py csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2012-03-09 21:36:35 UTC (rev 17347) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2012-03-09 22:30:12 UTC (rev 17348) @@ -1033,11 +1033,14 @@ else: soname = os.path.split(binary_info["path"])[1] linkable_shared_libs.append((soname, binary_info)) + else: + logging.debug("%r is not linkable", binary_info["path"]) logging.debug("CheckSharedLibraryNamingPolicy(): " "linkable shared libs of %s: %s" % (pkgname, linkable_shared_libs)) for soname, binary_info in linkable_shared_libs: - tmp = su.MakePackageNameBySoname(soname) + path = os.path.split(binary_info["path"])[0] + tmp = su.MakePackageNameBySoname(soname, path) policy_pkgname_list, policy_catalogname_list = tmp if pkgname not in policy_pkgname_list: error_mgr.ReportError( Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2012-03-09 21:36:35 UTC (rev 17347) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2012-03-09 22:30:12 UTC (rev 17348) @@ -635,7 +635,14 @@ 'depends': (('CSWlibfoo', None),), 'isalist': (), 'pkgmap': [], - } + 'files_metadata': [ + {'endian': 'Little endian', + 'machine_id': 3, + 'mime_type': 'application/x-sharedlib; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bin/bar/libfoo.so.1'}, + ], + } CSWlibfoo_DATA = { 'basic_stats': {'catalogname': 'libfoo', 'pkgname': 'CSWlibfoo', @@ -1341,10 +1348,40 @@ class TestCheckSharedLibraryNamingPolicy(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckSharedLibraryNamingPolicy' - def testGood(self): + def testBad(self): self.pkg_data = bdb48_stats[0] + self.error_mgr_mock.ReportError( + 'shared-lib-pkgname-mismatch', + 'file=opt/csw/bdb48/lib/libdb-4.8.so soname=libdb-4.8.so ' + 'pkgname=CSWbdb48 expected=CSWlibdb4-8-bdb48') + self.error_mgr_mock.ReportError( + 'shared-lib-pkgname-mismatch', + 'file=opt/csw/bdb48/lib/libdb_cxx-4.8.so soname=libdb_cxx-4.8.so ' + 'pkgname=CSWbdb48 expected=CSWlibdb-cxx4-8-bdb48') + self.error_mgr_mock.ReportError( + 'shared-lib-pkgname-mismatch', + 'file=opt/csw/bdb48/lib/libdb_java-4.8.so ' + 'soname=libdb_java-4.8.so pkgname=CSWbdb48 ' + 'expected=CSWlibdb-java4-8-bdb48') + self.error_mgr_mock.ReportError( + 'shared-lib-pkgname-mismatch', + 'file=opt/csw/bdb48/lib/libdb_tcl-4.8.so soname=libdb_tcl-4.8.so ' + 'pkgname=CSWbdb48 expected=CSWlibdb-tcl4-8-bdb48') + self.error_mgr_mock.ReportError( + 'shared-lib-pkgname-mismatch', + 'file=opt/csw/bdb48/lib/sparcv9/libdb-4.8.so soname=libdb-4.8.so ' + 'pkgname=CSWbdb48 expected=CSWlibdb4-8-bdb48') + self.error_mgr_mock.ReportError( + 'shared-lib-pkgname-mismatch', + 'file=opt/csw/bdb48/lib/sparcv9/libdb_cxx-4.8.so ' + 'soname=libdb_cxx-4.8.so pkgname=CSWbdb48 ' + 'expected=CSWlibdb-cxx4-8-bdb48') + self.error_mgr_mock.ReportError( + 'shared-lib-pkgname-mismatch', + 'file=opt/csw/bdb48/lib/sparcv9/libdb_java-4.8.so ' + 'soname=libdb_java-4.8.so pkgname=CSWbdb48 ' + 'expected=CSWlibdb-java4-8-bdb48') - class TestCheckSharedLibraryPkgDoesNotHaveTheSoFile(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckSharedLibraryPkgDoesNotHaveTheSoFile' Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2012-03-09 21:36:35 UTC (rev 17347) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2012-03-09 22:30:12 UTC (rev 17348) @@ -1,4 +1,5 @@ # $Id$ +# coding=utf-8 import copy import re @@ -46,20 +47,26 @@ pass -def IsLibraryLinkable(file_path): +def ParseLibPath(directory): arch_subdirs = (SPARCV8_PATHS + SPARCV8PLUS_PATHS + SPARCV9_PATHS + INTEL_386_PATHS + AMD64_PATHS) # Need to escape the plus signs because of the regex usage below. arch_subdirs = [x.replace(r"+", r"\+") for x in arch_subdirs] - linkable_re = re.compile(r"^opt/csw(/[a-z-_]+)?/lib(/(%s))?$" + linkable_re = re.compile(r"^/?opt/csw" + r"(/(?P[a-z0-9-_]+))?" + r"/lib(/(%s))?$" % "|".join(arch_subdirs)) + m = linkable_re.match(directory) + return m.groupdict() if m else False + +def IsLibraryLinkable(file_path): blacklist = [ # If it has two lib components, it's a private lib. re.compile(r"^opt/csw/.*lib.*lib.*"), re.compile(r"^opt/csw/share.*lib.*"), ] file_dir, file_basename = os.path.split(file_path) - if linkable_re.match(file_dir): + if ParseLibPath(file_dir): for regex in blacklist: if regex.match(file_dir): return False @@ -106,7 +113,15 @@ return c.join(parts).lower() -def MakePackageNameBySoname(soname): +def ExtractPrefix(path): + parsed = ParseLibPath(path) + if parsed: + return parsed["prefix"] + else: + return parsed + + +def MakePackageNameBySoname(soname, path=None): """Find the package name based on the soname. Returns a pair of pkgname, catalogname. @@ -149,14 +164,20 @@ else: keywords_pkgname[key] = "" keywords_catalogname[key] = "" - pkgname_list = [] + if path: + prefix = ExtractPrefix(path) + else: + prefix = None keywords_pkgname = AddSeparator(keywords_pkgname, "-") - pkgname_list.append( - "CSW%(basename)s%(sep)s%(version)s" % keywords_pkgname) + pkgname = "CSW%(basename)s%(sep)s%(version)s" % keywords_pkgname + if prefix: + pkgname += "-%s" % prefix + pkgname_list = [pkgname] keywords_catalogname = AddSeparator(keywords_catalogname, "_") - catalogname_list = [ - "%(basename)s%(sep)s%(version)s" % keywords_catalogname, - ] + catalogname = "%(basename)s%(sep)s%(version)s" % keywords_catalogname + if prefix: + catalogname += "_%s" % prefix + catalogname_list = [catalogname] return pkgname_list, catalogname_list Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2012-03-09 21:36:35 UTC (rev 17347) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2012-03-09 22:30:12 UTC (rev 17348) @@ -64,7 +64,11 @@ "opt/csw/boost-gcc/lib" "/libboost_wserialization.so.1.44.0")) + def testIsLibraryLinkableWithPrefix(self): + self.assertTrue( + su.IsLibraryLinkable("opt/csw/bdb48/lib/libdb-4.8.so")) + class MakePackageNameBySonameUnitTest(unittest.TestCase): def testMakePackageNameBySonameSimple(self): @@ -173,7 +177,37 @@ self.assertEqual(expected, su.MakePackageNameBySoname(soname)) + def testMakePackageNameBySonameWithPath(self): + soname = "libfoo.so.0" + path = "/opt/csw/gxx/lib" + expected = ( + ["CSWlibfoo0-gxx"], + ["libfoo0-gxx"], + ) + self.assertEqual(expected, su.MakePackageNameBySoname(soname, path)) + def testMakePackageNameBySonameWithPathSparcv9(self): + soname = "libfoo.so.0" + path = "/opt/csw/gxx/lib/sparcv9" + expected = ( + ["CSWlibfoo0-gxx"], + ["libfoo0-gxx"], + ) + self.assertEqual(expected, su.MakePackageNameBySoname(soname, path)) + + +class ParseLibPathTest(unittest.TestCase): + + def testSimple(self): + self.assertEquals({"prefix": None}, su.ParseLibPath("/opt/csw/lib")) + + def testPrefix(self): + self.assertEquals({"prefix": "gxx"}, su.ParseLibPath("/opt/csw/gxx/lib")) + + def testWithArch(self): + self.assertEquals({"prefix": "gxx"}, su.ParseLibPath("/opt/csw/gxx/lib/amd64")) + + class SanitizationUnitTest(unittest.TestCase): def testSanitizeWithChar(self): @@ -201,5 +235,17 @@ self.assertTrue("sparcv8plus+vis" in su.GetIsalist("sparc")) +class ExtractPrefixTest(unittest.TestCase): + + def testNoPrefix(self): + self.assertEquals(None, su.ExtractPrefix("/opt/csw/lib")) + + def testSimple(self): + self.assertEquals("gxx", su.ExtractPrefix("/opt/csw/gxx/lib")) + + def testWithArch(self): + self.assertEquals("gxx", su.ExtractPrefix("/opt/csw/gxx/lib/sparcv9")) + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 10 10:55:57 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 10 Mar 2012 09:55:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[17349] csw/mgar/pkg/spidermonkey/trunk Message-ID: Revision: 17349 http://gar.svn.sourceforge.net/gar/?rev=17349&view=rev Author: wahwah Date: 2012-03-10 09:55:57 +0000 (Sat, 10 Mar 2012) Log Message: ----------- spidermonkey/trunk: nearly there. The soname is still wrong, it should be libmozjs185.so.1.0.0 but is libmozjs185.so Modified Paths: -------------- csw/mgar/pkg/spidermonkey/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/spidermonkey/trunk/files/0001-Do-not-use-GNU-ld-flags-with-non-GNU-ld.patch csw/mgar/pkg/spidermonkey/trunk/files/0002-Do-not-use-fpclassify-on-Solaris.patch Modified: csw/mgar/pkg/spidermonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/spidermonkey/trunk/Makefile 2012-03-09 22:30:12 UTC (rev 17348) +++ csw/mgar/pkg/spidermonkey/trunk/Makefile 2012-03-10 09:55:57 UTC (rev 17349) @@ -14,29 +14,15 @@ MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/js/ DISTFILES = js185-$(VERSION).tar.gz -# the sun5.8 x86 config file is missing so -# we are using our own -#DISTFILES += SunOS5.8_i86pc.mk - PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 prefix = $(BUILD_PREFIX)/gxx DISTNAME = js-1.8.5 -# # we find the os string used by the makefile by using -# # the same code (from config.mk) -# OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/)) -# # Attempt to differentiate between SunOS 5.4 and x86 5.4 -# OS_CPUARCH := $(shell uname -m) -# ifeq ($(OS_CPUARCH),i86pc) -# OS_RELEASE := $(shell uname -r)_$(OS_CPUARCH) -# else -# OS_RELEASE := $(shell uname -r) -# endif -# OS_CONFIG := $(OS_ARCH)$(OS_OBJTYPE)$(OS_RELEASE) - CONFIGURE_ARGS = $(DIRPATHS) +LICENSE = js/src/README.html + CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom TEST_SCRIPTS = @@ -49,6 +35,17 @@ BUILD_DEP_PKGS += CSWgcc4core BUILD_DEP_PKGS += CSWgcc4g++ +PACKAGES = CSWspidermonkey-dev +SPKG_DESC_CSWspidermonkey-dev += $(DESCRIPTION), header files +PKGFILES_CSWspidermonkey-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWspidermonkey-dev += $(libdir)/libmozjs185.so + +PACKAGES += CSWlibmozjs185-gxx +PKGFILES_CSWlibmozjs185-gxx += $(call baseisadirs,$(libdir),libmozjs185\.so\.1\.0\.0) +SPKG_DESC_CSWlibmozjs185-gxx += $(DESCRIPTION), libmozjs185.so +RUNTIME_DEP_PKGS_CSWlibmozjs185-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibmozjs185-gxx += CSWlibstdc++6 + include gar/category.mk post-patch: @@ -71,33 +68,21 @@ --disable-pedantic \ --with-nspr-prefix=/opt/csw \ --prefix=/opt/csw/gxx \ - --with-system-nspr) + --with-system-nspr \ + --enable-threadsasafe \ + --with-ctypes) @$(MAKECOOKIE) -disabled-pre-build: - # if we are on x86, we install our own config file - # and remove the lock_SunOS.s cause the makefile - # always tries to compile it (why so ?) - # ( if [ "$(OS_CPUARCH)" = "i86pc" ]; then \ - # cp $(WORKDIR)/SunOS5.8_i86pc.mk $(WORKSRC)/src/config; \ - # rm -f $(WORKSRC)/src/lock_SunOS.s; \ - # fi ) - build-custom: # cd $(WORKSRC)/js/src && DISABLE_JIT=1 BUILD_OPT=1 $(MAKE) -f Makefile.ref cd $(WORKSRC)/js/objdir && $(MAKE) @$(MAKECOOKIE) install-custom: - ginstall -d $(DESTDIR)$(includedir) - cp $(WORKSRC)/src/*.h $(DESTDIR)$(includedir) - cp $(WORKSRC)/src/$(OS_CONFIG)_OPT.OBJ/*.h $(DESTDIR)$(includedir) - # - ginstall -d $(DESTDIR)$(libdir) - ginstall -D $(WORKSRC)/src/$(OS_CONFIG)_OPT.OBJ/libjs.so $(DESTDIR)$(libdir)/libjs.so - ginstall -D $(WORKSRC)/src/$(OS_CONFIG)_OPT.OBJ/libjs.a $(DESTDIR)$(libdir)/libjs.a - # - ginstall -d $(DESTDIR)$(bindir) - ginstall -D $(WORKSRC)/src/$(OS_CONFIG)_OPT.OBJ/js $(DESTDIR)$(bindir)/js - ginstall -D $(WORKSRC)/src/$(OS_CONFIG)_OPT.OBJ/jscpucfg $(DESTDIR)$(bindir)/jscpucfg - + cd $(WORKSRC)/js/objdir && $(MAKE) $(INSTALL_ENV) install + # Symlinks after installation are broken: they use absolute paths. + grm -v $(DESTDIR)/opt/csw/gxx/lib/libmozjs185.so + grm -v $(DESTDIR)/opt/csw/gxx/lib/libmozjs185.so.1.0 + gln -vs libmozjs185.so.1.0 $(DESTDIR)/opt/csw/gxx/lib/libmozjs185.so + gln -vs libmozjs185.so.1.0.0 $(DESTDIR)/opt/csw/gxx/lib/libmozjs185.so.1.0 + @$(MAKECOOKIE) Added: csw/mgar/pkg/spidermonkey/trunk/files/0001-Do-not-use-GNU-ld-flags-with-non-GNU-ld.patch =================================================================== --- csw/mgar/pkg/spidermonkey/trunk/files/0001-Do-not-use-GNU-ld-flags-with-non-GNU-ld.patch (rev 0) +++ csw/mgar/pkg/spidermonkey/trunk/files/0001-Do-not-use-GNU-ld-flags-with-non-GNU-ld.patch 2012-03-10 09:55:57 UTC (rev 17349) @@ -0,0 +1,99 @@ +From e89d165866a9877b708fc853136d3125aa1e17a7 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 10 Mar 2012 10:28:33 +0100 +Subject: [PATCH 1/2] Do not use GNU ld flags with non-GNU ld + +Fails on Solaris: + +rm -f libmozjs185.so +/opt/csw/bin/g++ -fno-rtti -fno-exceptions -fshort-enums +-DJS_C_STRINGS_ARE_UTF8 -fno-strict-aliasing -pthread -DNDEBUG -DTRIMMED +-O3 -fstrict-aliasing -fomit-frame-pointer -mcpu=v9 -DUSE_SYSTEM_MALLOC=1 +-DENABLE_ASSEMBLER=1 -DENABLE_JIT=1 -fPIC -shared -Wl,-h,libmozjs185.so -o +libmozjs185.so jsanalyze.o jsapi.o jsarena.o jsarray.o jsatom.o jsbool.o +jsclone.o jscntxt.o jscompartment.o jsdate.o jsdbgapi.o jsdhash.o jsdtoa.o +jsemit.o jsexn.o jsfriendapi.o jsfun.o jsgc.o jsgcchunk.o jsgcstats.o +jshash.o jsinterp.o jsinvoke.o jsiter.o jslock.o jslog2.o jsmath.o +jsnativestack.o jsnum.o jsobj.o json.o jsopcode.o jsparse.o jsproxy.o +jsprf.o jsprobes.o jspropertycache.o jspropertytree.o jsreflect.o +jsregexp.o jsscan.o jsscope.o jsscript.o jsstr.o jstypedarray.o jsutil.o +jswrapper.o jsxdrapi.o jsxml.o prmjtime.o sharkctl.o jstracer.o Assembler.o +Allocator.o CodeAlloc.o Containers.o Fragmento.o LIR.o njconfig.o +RegAlloc.o avmplus.o NativeSparc.o jsbuiltins.o VMPI.o Writer.o checks.o +conversions.o diy-fp.o v8-dtoa.o fast-dtoa.o platform.o utils.o +pcre_compile.o pcre_exec.o pcre_tables.o pcre_xclass.o +pcre_ucp_searchfuncs.o jsperf.o pm_stub.o -lpthread -Wl,-z,ignore +-Wl,-R,'$ORIGIN:$ORIGIN/..' -Wl,-z,lazyload -Wl,-z,combreloc -Wl,-z,muldefs + -Wl,-R/opt/csw/lib -L/opt/csw/lib -lplds4 -lplc4 -lnspr4 -L/opt/csw/lib +-lpthread -ldl -lposix4 -Wl,-soname,libmozjs185.so.1.0 -lsocket -lc -lm +-lpos +ix4 -ldl -lnsl -lsocket +ld: warning: option -o appears more than once, first setting taken +ld: fatal: file libmozjs185.so.1.0: open failed: No such file or directory +ld: fatal: File processing errors. No output written to libmozjs185.so +gmake[3]: *** [libmozjs185.so] Error 1 +gmake[3]: Leaving directory +`/home/maciej/src/opencsw/pkg/spidermonkey/trunk/work/solaris10-sparc/build-isa-sparcv8plus/js-1.8.5/js/objdir' + +The workaround is to remove the "-Wl,-soname,libmozjs185.so.1.0" bit, since +the soname is already defined by -Wl,-h,libmozjs185.so. + +After removing the "-Wl,-soname,libmozjs185.so.1.0" options, linking +succeeds and the library is there: + +/usr/ccs/bin/dump -Lv libmozjs185.so | grep SONAME +[11] SONAME libmozjs185.so + +Perhaps the "-Wl,-soname,libmozjs185.so.1.0" flag needs to be only added +conditionally, when using GNU ld. Also, the soname passed by the -h flag is +out of sync with the one passed by -Wl + +--- + js/src/Makefile.in | 2 ++ + js/src/config/autoconf.mk.in | 1 + + js/src/configure.in | 1 + + 3 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/js/src/Makefile.in b/js/src/Makefile.in +index a85e055..2ca1ebe 100644 +--- a/js/src/Makefile.in ++++ b/js/src/Makefile.in +@@ -871,9 +871,11 @@ else + SHLIB_ANY_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) + SHLIB_ABI_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_ABI_VERSION) + SHLIB_EXACT_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_VERSION) ++ifeq (1,$(GCC_USE_GNU_LD)) + $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-soname,$(notdir $(SHLIB_ABI_VER)) + endif + endif ++endif + + install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) + ifneq (,$(LIBRARY)) +diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in +index f4c8150..9ecccf6 100644 +--- a/js/src/config/autoconf.mk.in ++++ b/js/src/config/autoconf.mk.in +@@ -202,6 +202,7 @@ CXX_VERSION = @CXX_VERSION@ + + GNU_AS = @GNU_AS@ + GNU_LD = @GNU_LD@ ++GCC_USE_GNU_LD = @GCC_USE_GNU_LD@ + GNU_CC = @GNU_CC@ + GNU_CXX = @GNU_CXX@ + HAVE_GCC3_ABI = @HAVE_GCC3_ABI@ +diff --git a/js/src/configure.in b/js/src/configure.in +index 5d5365b..a96b2ff 100644 +--- a/js/src/configure.in ++++ b/js/src/configure.in +@@ -549,6 +549,7 @@ fi + if test "$GNU_CC"; then + if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then + GCC_USE_GNU_LD=1 ++ AC_SUBST(GCC_USE_GNU_LD) + fi + fi + +-- +1.7.9 + Added: csw/mgar/pkg/spidermonkey/trunk/files/0002-Do-not-use-fpclassify-on-Solaris.patch =================================================================== --- csw/mgar/pkg/spidermonkey/trunk/files/0002-Do-not-use-fpclassify-on-Solaris.patch (rev 0) +++ csw/mgar/pkg/spidermonkey/trunk/files/0002-Do-not-use-fpclassify-on-Solaris.patch 2012-03-10 09:55:57 UTC (rev 17349) @@ -0,0 +1,84 @@ +From 6970ef60a3217ef5d3af9aa9af6dcd258f63a563 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 10 Mar 2012 10:29:42 +0100 +Subject: [PATCH 2/2] Do not use fpclassify on Solaris + +This one comes up when building with GCC 4.6.2 on Solaris 10: + +/opt/csw/bin/g++ -o conversions.o -c -DOSTYPE=\"SunOS5\" -DOSARCH=SunOS +-DEXPORT_JS_API -D__STDC_LIMIT_MACROS -I../src -I. -I./dist/include +-I./dist/include/nsprpub -I/opt/csw/include/nspr -I../src +-I../src/assembler -I../src/yarr -fPIC -fno-rtti -fno-exceptions +-fshort-enums -DJS_C_STRINGS_ARE_UTF8 -fno-strict-aliasing -pthread + -DNDEBUG -DTRIMMED -O3 -fstrict-aliasing -fomit-frame-pointer -mcpu=v9 +-DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1 +-DMOZILLA_CLIENT -include ./js-confdefs.h -MD -MF .deps/conversions.pp +../src/v8-dtoa/conversions.cc +In file included from ../src/v8-dtoa/v8.h:47:0, + from ../src/v8-dtoa/conversions.cc:30: +../src/v8-dtoa/platform.h:70:5: error: expected unqualified-id before +'__extension__' +gmake[3]: *** [conversions.o] Error 1 + +I looked up this file: js/src/v8-dtoa/platform.h:70 + +And saw: + + #ifdef SOLARIS + int fpclassify(double x); + #endif // SOLARIS + +This looks innocent enough. But there's nothing about __extension__. So I +ran it through the preprocessor and saw what it expands to: + + # 70 "../src/v8-dtoa/platform.h" +int __extension__( { __typeof(double x) __x_c = (double x); +__builtin_isnan(__x_c) ? 4 : __builtin_isinf(__x_c) ? 3 : __extension__( { +__typeof(__x_c) __x_r = (__x_c); __extension__( { __typeof(__x_r) __x_f = +(__x_r); !__builtin_isnan(__x_f) && !__builtin_isinf(__x_f); }) && (sizeof +(__x_r) == sizeof (float) ? __builtin_fabsf(__x_r) >= +1.17549435082228750796873653722224568e-38F : sizeof (__x_r) == sizeof +(double) ? __builtin_fabs(__x_r) >= +double(2.22507385850720138309023271733240406e-308L) : +__builtin_fabsl(__x_r) >= 3.36210314311209350626267781732175260e-4932L); }) +? 2 : __x_c == (__typeof(__x_c)) 0 ? 0 : 1; }); + +This is rather scary. Also, seems like this bit of code is activated +specifically on Solaris. There is a similar ifdef in the platform.cc file. +I changed both "#ifdef SOLARIS" lines into "#ifdef +DO_NOT_TREAT_SOLARIS_DIFFERENTLY" and this made the compilation pass in +these files. +--- + js/src/v8-dtoa/platform.cc | 2 +- + js/src/v8-dtoa/platform.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/js/src/v8-dtoa/platform.cc b/js/src/v8-dtoa/platform.cc +index 97ec6b9..6af17af 100644 +--- a/js/src/v8-dtoa/platform.cc ++++ b/js/src/v8-dtoa/platform.cc +@@ -110,7 +110,7 @@ int fpclassify(double x) { + + #endif // _MSC_VER + +-#ifdef SOLARIS ++#ifdef DO_NOT_TREAT_SOLARIS_DIFFERENTLY + + #include + +diff --git a/js/src/v8-dtoa/platform.h b/js/src/v8-dtoa/platform.h +index 047f75a..69ace08 100644 +--- a/js/src/v8-dtoa/platform.h ++++ b/js/src/v8-dtoa/platform.h +@@ -66,7 +66,7 @@ int strncasecmp(const char* s1, const char* s2, int n); + + #endif // WIN32 + +-#ifdef SOLARIS ++#ifdef DO_NOT_TREAT_SOLARIS_DIFFERENTLY + int fpclassify(double x); + #endif // SOLARIS + +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 10 12:05:12 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 10 Mar 2012 11:05:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17350] csw/mgar/pkg/spidermonkey/trunk Message-ID: Revision: 17350 http://gar.svn.sourceforge.net/gar/?rev=17350&view=rev Author: wahwah Date: 2012-03-10 11:05:12 +0000 (Sat, 10 Mar 2012) Log Message: ----------- using the right soname Modified Paths: -------------- csw/mgar/pkg/spidermonkey/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/spidermonkey/trunk/files/0001-Do-not-use-fpclassify-on-Solaris.patch csw/mgar/pkg/spidermonkey/trunk/files/0002-Specify-the-right-SONAME-for-the-library.patch Removed Paths: ------------- csw/mgar/pkg/spidermonkey/trunk/files/0001-Do-not-use-GNU-ld-flags-with-non-GNU-ld.patch csw/mgar/pkg/spidermonkey/trunk/files/0002-Do-not-use-fpclassify-on-Solaris.patch csw/mgar/pkg/spidermonkey/trunk/files/SunOS5.8_i86pc.mk Modified: csw/mgar/pkg/spidermonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/spidermonkey/trunk/Makefile 2012-03-10 09:55:57 UTC (rev 17349) +++ csw/mgar/pkg/spidermonkey/trunk/Makefile 2012-03-10 11:05:12 UTC (rev 17350) @@ -19,7 +19,8 @@ DISTNAME = js-1.8.5 -CONFIGURE_ARGS = $(DIRPATHS) +PATCHFILES += 0001-Do-not-use-fpclassify-on-Solaris.patch +PATCHFILES += 0002-Specify-the-right-SONAME-for-the-library.patch LICENSE = js/src/README.html @@ -35,10 +36,10 @@ BUILD_DEP_PKGS += CSWgcc4core BUILD_DEP_PKGS += CSWgcc4g++ -PACKAGES = CSWspidermonkey-dev -SPKG_DESC_CSWspidermonkey-dev += $(DESCRIPTION), header files -PKGFILES_CSWspidermonkey-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWspidermonkey-dev += $(libdir)/libmozjs185.so +PACKAGES = CSWlibmozjs185-gxx-dev +SPKG_DESC_CSWlibmozjs185-gxx-dev += $(DESCRIPTION), header files +PKGFILES_CSWlibmozjs185-gxx-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibmozjs185-gxx-dev += $(libdir)/libmozjs185.so PACKAGES += CSWlibmozjs185-gxx PKGFILES_CSWlibmozjs185-gxx += $(call baseisadirs,$(libdir),libmozjs185\.so\.1\.0\.0) @@ -75,7 +76,7 @@ build-custom: # cd $(WORKSRC)/js/src && DISABLE_JIT=1 BUILD_OPT=1 $(MAKE) -f Makefile.ref - cd $(WORKSRC)/js/objdir && $(MAKE) + cd $(WORKSRC)/js/objdir && $(MAKE) $(PARALLELMFLAGS) @$(MAKECOOKIE) install-custom: Deleted: csw/mgar/pkg/spidermonkey/trunk/files/0001-Do-not-use-GNU-ld-flags-with-non-GNU-ld.patch =================================================================== --- csw/mgar/pkg/spidermonkey/trunk/files/0001-Do-not-use-GNU-ld-flags-with-non-GNU-ld.patch 2012-03-10 09:55:57 UTC (rev 17349) +++ csw/mgar/pkg/spidermonkey/trunk/files/0001-Do-not-use-GNU-ld-flags-with-non-GNU-ld.patch 2012-03-10 11:05:12 UTC (rev 17350) @@ -1,99 +0,0 @@ -From e89d165866a9877b708fc853136d3125aa1e17a7 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Sat, 10 Mar 2012 10:28:33 +0100 -Subject: [PATCH 1/2] Do not use GNU ld flags with non-GNU ld - -Fails on Solaris: - -rm -f libmozjs185.so -/opt/csw/bin/g++ -fno-rtti -fno-exceptions -fshort-enums --DJS_C_STRINGS_ARE_UTF8 -fno-strict-aliasing -pthread -DNDEBUG -DTRIMMED --O3 -fstrict-aliasing -fomit-frame-pointer -mcpu=v9 -DUSE_SYSTEM_MALLOC=1 --DENABLE_ASSEMBLER=1 -DENABLE_JIT=1 -fPIC -shared -Wl,-h,libmozjs185.so -o -libmozjs185.so jsanalyze.o jsapi.o jsarena.o jsarray.o jsatom.o jsbool.o -jsclone.o jscntxt.o jscompartment.o jsdate.o jsdbgapi.o jsdhash.o jsdtoa.o -jsemit.o jsexn.o jsfriendapi.o jsfun.o jsgc.o jsgcchunk.o jsgcstats.o -jshash.o jsinterp.o jsinvoke.o jsiter.o jslock.o jslog2.o jsmath.o -jsnativestack.o jsnum.o jsobj.o json.o jsopcode.o jsparse.o jsproxy.o -jsprf.o jsprobes.o jspropertycache.o jspropertytree.o jsreflect.o -jsregexp.o jsscan.o jsscope.o jsscript.o jsstr.o jstypedarray.o jsutil.o -jswrapper.o jsxdrapi.o jsxml.o prmjtime.o sharkctl.o jstracer.o Assembler.o -Allocator.o CodeAlloc.o Containers.o Fragmento.o LIR.o njconfig.o -RegAlloc.o avmplus.o NativeSparc.o jsbuiltins.o VMPI.o Writer.o checks.o -conversions.o diy-fp.o v8-dtoa.o fast-dtoa.o platform.o utils.o -pcre_compile.o pcre_exec.o pcre_tables.o pcre_xclass.o -pcre_ucp_searchfuncs.o jsperf.o pm_stub.o -lpthread -Wl,-z,ignore --Wl,-R,'$ORIGIN:$ORIGIN/..' -Wl,-z,lazyload -Wl,-z,combreloc -Wl,-z,muldefs - -Wl,-R/opt/csw/lib -L/opt/csw/lib -lplds4 -lplc4 -lnspr4 -L/opt/csw/lib --lpthread -ldl -lposix4 -Wl,-soname,libmozjs185.so.1.0 -lsocket -lc -lm --lpos -ix4 -ldl -lnsl -lsocket -ld: warning: option -o appears more than once, first setting taken -ld: fatal: file libmozjs185.so.1.0: open failed: No such file or directory -ld: fatal: File processing errors. No output written to libmozjs185.so -gmake[3]: *** [libmozjs185.so] Error 1 -gmake[3]: Leaving directory -`/home/maciej/src/opencsw/pkg/spidermonkey/trunk/work/solaris10-sparc/build-isa-sparcv8plus/js-1.8.5/js/objdir' - -The workaround is to remove the "-Wl,-soname,libmozjs185.so.1.0" bit, since -the soname is already defined by -Wl,-h,libmozjs185.so. - -After removing the "-Wl,-soname,libmozjs185.so.1.0" options, linking -succeeds and the library is there: - -/usr/ccs/bin/dump -Lv libmozjs185.so | grep SONAME -[11] SONAME libmozjs185.so - -Perhaps the "-Wl,-soname,libmozjs185.so.1.0" flag needs to be only added -conditionally, when using GNU ld. Also, the soname passed by the -h flag is -out of sync with the one passed by -Wl - ---- - js/src/Makefile.in | 2 ++ - js/src/config/autoconf.mk.in | 1 + - js/src/configure.in | 1 + - 3 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/js/src/Makefile.in b/js/src/Makefile.in -index a85e055..2ca1ebe 100644 ---- a/js/src/Makefile.in -+++ b/js/src/Makefile.in -@@ -871,9 +871,11 @@ else - SHLIB_ANY_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) - SHLIB_ABI_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_ABI_VERSION) - SHLIB_EXACT_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_VERSION) -+ifeq (1,$(GCC_USE_GNU_LD)) - $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-soname,$(notdir $(SHLIB_ABI_VER)) - endif - endif -+endif - - install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) - ifneq (,$(LIBRARY)) -diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in -index f4c8150..9ecccf6 100644 ---- a/js/src/config/autoconf.mk.in -+++ b/js/src/config/autoconf.mk.in -@@ -202,6 +202,7 @@ CXX_VERSION = @CXX_VERSION@ - - GNU_AS = @GNU_AS@ - GNU_LD = @GNU_LD@ -+GCC_USE_GNU_LD = @GCC_USE_GNU_LD@ - GNU_CC = @GNU_CC@ - GNU_CXX = @GNU_CXX@ - HAVE_GCC3_ABI = @HAVE_GCC3_ABI@ -diff --git a/js/src/configure.in b/js/src/configure.in -index 5d5365b..a96b2ff 100644 ---- a/js/src/configure.in -+++ b/js/src/configure.in -@@ -549,6 +549,7 @@ fi - if test "$GNU_CC"; then - if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then - GCC_USE_GNU_LD=1 -+ AC_SUBST(GCC_USE_GNU_LD) - fi - fi - --- -1.7.9 - Added: csw/mgar/pkg/spidermonkey/trunk/files/0001-Do-not-use-fpclassify-on-Solaris.patch =================================================================== --- csw/mgar/pkg/spidermonkey/trunk/files/0001-Do-not-use-fpclassify-on-Solaris.patch (rev 0) +++ csw/mgar/pkg/spidermonkey/trunk/files/0001-Do-not-use-fpclassify-on-Solaris.patch 2012-03-10 11:05:12 UTC (rev 17350) @@ -0,0 +1,84 @@ +From 4a181b296780fc80b4f2fb653324d37b2a611883 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 10 Mar 2012 10:29:42 +0100 +Subject: [PATCH 1/2] Do not use fpclassify on Solaris + +This one comes up when building with GCC 4.6.2 on Solaris 10: + +/opt/csw/bin/g++ -o conversions.o -c -DOSTYPE=\"SunOS5\" -DOSARCH=SunOS +-DEXPORT_JS_API -D__STDC_LIMIT_MACROS -I../src -I. -I./dist/include +-I./dist/include/nsprpub -I/opt/csw/include/nspr -I../src +-I../src/assembler -I../src/yarr -fPIC -fno-rtti -fno-exceptions +-fshort-enums -DJS_C_STRINGS_ARE_UTF8 -fno-strict-aliasing -pthread + -DNDEBUG -DTRIMMED -O3 -fstrict-aliasing -fomit-frame-pointer -mcpu=v9 +-DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1 +-DMOZILLA_CLIENT -include ./js-confdefs.h -MD -MF .deps/conversions.pp +../src/v8-dtoa/conversions.cc +In file included from ../src/v8-dtoa/v8.h:47:0, + from ../src/v8-dtoa/conversions.cc:30: +../src/v8-dtoa/platform.h:70:5: error: expected unqualified-id before +'__extension__' +gmake[3]: *** [conversions.o] Error 1 + +I looked up this file: js/src/v8-dtoa/platform.h:70 + +And saw: + + #ifdef SOLARIS + int fpclassify(double x); + #endif // SOLARIS + +This looks innocent enough. But there's nothing about __extension__. So I +ran it through the preprocessor and saw what it expands to: + + # 70 "../src/v8-dtoa/platform.h" +int __extension__( { __typeof(double x) __x_c = (double x); +__builtin_isnan(__x_c) ? 4 : __builtin_isinf(__x_c) ? 3 : __extension__( { +__typeof(__x_c) __x_r = (__x_c); __extension__( { __typeof(__x_r) __x_f = +(__x_r); !__builtin_isnan(__x_f) && !__builtin_isinf(__x_f); }) && (sizeof +(__x_r) == sizeof (float) ? __builtin_fabsf(__x_r) >= +1.17549435082228750796873653722224568e-38F : sizeof (__x_r) == sizeof +(double) ? __builtin_fabs(__x_r) >= +double(2.22507385850720138309023271733240406e-308L) : +__builtin_fabsl(__x_r) >= 3.36210314311209350626267781732175260e-4932L); }) +? 2 : __x_c == (__typeof(__x_c)) 0 ? 0 : 1; }); + +This is rather scary. Also, seems like this bit of code is activated +specifically on Solaris. There is a similar ifdef in the platform.cc file. +I changed both "#ifdef SOLARIS" lines into "#ifdef +DO_NOT_TREAT_SOLARIS_DIFFERENTLY" and this made the compilation pass in +these files. +--- + js/src/v8-dtoa/platform.cc | 2 +- + js/src/v8-dtoa/platform.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/js/src/v8-dtoa/platform.cc b/js/src/v8-dtoa/platform.cc +index 97ec6b9..6af17af 100644 +--- a/js/src/v8-dtoa/platform.cc ++++ b/js/src/v8-dtoa/platform.cc +@@ -110,7 +110,7 @@ int fpclassify(double x) { + + #endif // _MSC_VER + +-#ifdef SOLARIS ++#ifdef DO_NOT_TREAT_SOLARIS_DIFFERENTLY + + #include + +diff --git a/js/src/v8-dtoa/platform.h b/js/src/v8-dtoa/platform.h +index 047f75a..69ace08 100644 +--- a/js/src/v8-dtoa/platform.h ++++ b/js/src/v8-dtoa/platform.h +@@ -66,7 +66,7 @@ int strncasecmp(const char* s1, const char* s2, int n); + + #endif // WIN32 + +-#ifdef SOLARIS ++#ifdef DO_NOT_TREAT_SOLARIS_DIFFERENTLY + int fpclassify(double x); + #endif // SOLARIS + +-- +1.7.9 + Deleted: csw/mgar/pkg/spidermonkey/trunk/files/0002-Do-not-use-fpclassify-on-Solaris.patch =================================================================== --- csw/mgar/pkg/spidermonkey/trunk/files/0002-Do-not-use-fpclassify-on-Solaris.patch 2012-03-10 09:55:57 UTC (rev 17349) +++ csw/mgar/pkg/spidermonkey/trunk/files/0002-Do-not-use-fpclassify-on-Solaris.patch 2012-03-10 11:05:12 UTC (rev 17350) @@ -1,84 +0,0 @@ -From 6970ef60a3217ef5d3af9aa9af6dcd258f63a563 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Sat, 10 Mar 2012 10:29:42 +0100 -Subject: [PATCH 2/2] Do not use fpclassify on Solaris - -This one comes up when building with GCC 4.6.2 on Solaris 10: - -/opt/csw/bin/g++ -o conversions.o -c -DOSTYPE=\"SunOS5\" -DOSARCH=SunOS --DEXPORT_JS_API -D__STDC_LIMIT_MACROS -I../src -I. -I./dist/include --I./dist/include/nsprpub -I/opt/csw/include/nspr -I../src --I../src/assembler -I../src/yarr -fPIC -fno-rtti -fno-exceptions --fshort-enums -DJS_C_STRINGS_ARE_UTF8 -fno-strict-aliasing -pthread - -DNDEBUG -DTRIMMED -O3 -fstrict-aliasing -fomit-frame-pointer -mcpu=v9 --DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1 --DMOZILLA_CLIENT -include ./js-confdefs.h -MD -MF .deps/conversions.pp -../src/v8-dtoa/conversions.cc -In file included from ../src/v8-dtoa/v8.h:47:0, - from ../src/v8-dtoa/conversions.cc:30: -../src/v8-dtoa/platform.h:70:5: error: expected unqualified-id before -'__extension__' -gmake[3]: *** [conversions.o] Error 1 - -I looked up this file: js/src/v8-dtoa/platform.h:70 - -And saw: - - #ifdef SOLARIS - int fpclassify(double x); - #endif // SOLARIS - -This looks innocent enough. But there's nothing about __extension__. So I -ran it through the preprocessor and saw what it expands to: - - # 70 "../src/v8-dtoa/platform.h" -int __extension__( { __typeof(double x) __x_c = (double x); -__builtin_isnan(__x_c) ? 4 : __builtin_isinf(__x_c) ? 3 : __extension__( { -__typeof(__x_c) __x_r = (__x_c); __extension__( { __typeof(__x_r) __x_f = -(__x_r); !__builtin_isnan(__x_f) && !__builtin_isinf(__x_f); }) && (sizeof -(__x_r) == sizeof (float) ? __builtin_fabsf(__x_r) >= -1.17549435082228750796873653722224568e-38F : sizeof (__x_r) == sizeof -(double) ? __builtin_fabs(__x_r) >= -double(2.22507385850720138309023271733240406e-308L) : -__builtin_fabsl(__x_r) >= 3.36210314311209350626267781732175260e-4932L); }) -? 2 : __x_c == (__typeof(__x_c)) 0 ? 0 : 1; }); - -This is rather scary. Also, seems like this bit of code is activated -specifically on Solaris. There is a similar ifdef in the platform.cc file. -I changed both "#ifdef SOLARIS" lines into "#ifdef -DO_NOT_TREAT_SOLARIS_DIFFERENTLY" and this made the compilation pass in -these files. ---- - js/src/v8-dtoa/platform.cc | 2 +- - js/src/v8-dtoa/platform.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/js/src/v8-dtoa/platform.cc b/js/src/v8-dtoa/platform.cc -index 97ec6b9..6af17af 100644 ---- a/js/src/v8-dtoa/platform.cc -+++ b/js/src/v8-dtoa/platform.cc -@@ -110,7 +110,7 @@ int fpclassify(double x) { - - #endif // _MSC_VER - --#ifdef SOLARIS -+#ifdef DO_NOT_TREAT_SOLARIS_DIFFERENTLY - - #include - -diff --git a/js/src/v8-dtoa/platform.h b/js/src/v8-dtoa/platform.h -index 047f75a..69ace08 100644 ---- a/js/src/v8-dtoa/platform.h -+++ b/js/src/v8-dtoa/platform.h -@@ -66,7 +66,7 @@ int strncasecmp(const char* s1, const char* s2, int n); - - #endif // WIN32 - --#ifdef SOLARIS -+#ifdef DO_NOT_TREAT_SOLARIS_DIFFERENTLY - int fpclassify(double x); - #endif // SOLARIS - --- -1.7.9 - Added: csw/mgar/pkg/spidermonkey/trunk/files/0002-Specify-the-right-SONAME-for-the-library.patch =================================================================== --- csw/mgar/pkg/spidermonkey/trunk/files/0002-Specify-the-right-SONAME-for-the-library.patch (rev 0) +++ csw/mgar/pkg/spidermonkey/trunk/files/0002-Specify-the-right-SONAME-for-the-library.patch 2012-03-10 11:05:12 UTC (rev 17350) @@ -0,0 +1,72 @@ +From 964e24f35eaefccd996af4e698e61be2c3ad0145 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 10 Mar 2012 10:28:33 +0100 +Subject: [PATCH 2/2] Specify the right SONAME for the library + +This patch solves two problems: + +1. It cannot be assumed that GCC is used with GNU ld. Therefore, it needs to + be tested whether we can add the -soname option to the linker. + +2. There are two places in the code that specify the SONAME. One of them is + wrong, because specifies the SONAME equal to the file name. +--- + js/src/Makefile.in | 4 ++++ + js/src/config/autoconf.mk.in | 1 + + js/src/configure.in | 5 +++-- + 3 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/js/src/Makefile.in b/js/src/Makefile.in +index a85e055..1d9da83 100644 +--- a/js/src/Makefile.in ++++ b/js/src/Makefile.in +@@ -871,7 +871,11 @@ else + SHLIB_ANY_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) + SHLIB_ABI_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_ABI_VERSION) + SHLIB_EXACT_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_VERSION) ++ifeq (1,$(GCC_USE_GNU_LD)) + $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-soname,$(notdir $(SHLIB_ABI_VER)) ++else ++$(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-h,$(notdir $(SHLIB_ABI_VER)) ++endif + endif + endif + +diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in +index f4c8150..9ecccf6 100644 +--- a/js/src/config/autoconf.mk.in ++++ b/js/src/config/autoconf.mk.in +@@ -202,6 +202,7 @@ CXX_VERSION = @CXX_VERSION@ + + GNU_AS = @GNU_AS@ + GNU_LD = @GNU_LD@ ++GCC_USE_GNU_LD = @GCC_USE_GNU_LD@ + GNU_CC = @GNU_CC@ + GNU_CXX = @GNU_CXX@ + HAVE_GCC3_ABI = @HAVE_GCC3_ABI@ +diff --git a/js/src/configure.in b/js/src/configure.in +index 5d5365b..7d8f901 100644 +--- a/js/src/configure.in ++++ b/js/src/configure.in +@@ -549,6 +549,7 @@ fi + if test "$GNU_CC"; then + if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then + GCC_USE_GNU_LD=1 ++ AC_SUBST(GCC_USE_GNU_LD) + fi + fi + +@@ -1558,8 +1559,8 @@ dnl ======================================================== + if test "$GNU_CC"; then + # FIXME: Let us build with strict aliasing. bug 414641. + CFLAGS="$CFLAGS -fno-strict-aliasing" +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' + DSO_LDOPTS='-shared' + if test "$GCC_USE_GNU_LD"; then + # Don't allow undefined symbols in libraries +-- +1.7.9 + Deleted: csw/mgar/pkg/spidermonkey/trunk/files/SunOS5.8_i86pc.mk =================================================================== --- csw/mgar/pkg/spidermonkey/trunk/files/SunOS5.8_i86pc.mk 2012-03-10 09:55:57 UTC (rev 17349) +++ csw/mgar/pkg/spidermonkey/trunk/files/SunOS5.8_i86pc.mk 2012-03-10 11:05:12 UTC (rev 17350) @@ -1,87 +0,0 @@ -# -*- Mode: makefile -*- -# -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is Mozilla Communicator client code, released -# March 31, 1998. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -# -# Config stuff for SunOS5.5 -# - -AS = /usr/ccs/bin/as -ifndef NS_USE_NATIVE -CC = gcc -CCC = g++ -CFLAGS += -Wall -Wno-format -else -CC = cc -CCC = CC -endif - -RANLIB = echo - -#.c.o: -# $(CC) -c -MD $*.d $(CFLAGS) $< - -CPU_ARCH = x86 -GFX_ARCH = x - -OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -DSOLARIS -DHAVE_LOCALTIME_R -OS_LIBS = -lsocket -lnsl -ldl - -ASFLAGS += -P -L -K PIC -D_ASM -D__STDC__=0 - -HAVE_PURIFY = 1 - -NOSUCHFILE = /solaris-rm-f-sucks - -ifeq ($(OS_CPUARCH),i86pc) # i386 -ifeq ($(CC),gcc) # using gcc? -ifndef JS_NO_386 # do we want ultra? -ifdef JS_THREADSAFE # only in thread-safe mode -DEFINES += -Di386 -DEFINES += -Wa,-xarch=386,-Di386 -else -ASFLAGS += -xarch=386 -Di386 -endif -endif -endif -endif - -MKSHLIB = $(LD) -G - -# Use the editline library to provide line-editing support. -JS_EDITLINE = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 10 12:47:17 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 10 Mar 2012 11:47:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17351] csw/mgar/pkg/spidermonkey/trunk/Makefile Message-ID: Revision: 17351 http://gar.svn.sourceforge.net/gar/?rev=17351&view=rev Author: wahwah Date: 2012-03-10 11:47:17 +0000 (Sat, 10 Mar 2012) Log Message: ----------- spidermonkey/trunk: fix a linking problem on x86, adjust package name to the correct SONAME Modified Paths: -------------- csw/mgar/pkg/spidermonkey/trunk/Makefile Modified: csw/mgar/pkg/spidermonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/spidermonkey/trunk/Makefile 2012-03-10 11:05:12 UTC (rev 17350) +++ csw/mgar/pkg/spidermonkey/trunk/Makefile 2012-03-10 11:47:17 UTC (rev 17351) @@ -24,6 +24,8 @@ LICENSE = js/src/README.html +# EXTRA_LINKER_FLAGS = -mimpure-text + CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom TEST_SCRIPTS = @@ -41,11 +43,10 @@ PKGFILES_CSWlibmozjs185-gxx-dev += $(PKGFILES_DEVEL) PKGFILES_CSWlibmozjs185-gxx-dev += $(libdir)/libmozjs185.so -PACKAGES += CSWlibmozjs185-gxx -PKGFILES_CSWlibmozjs185-gxx += $(call baseisadirs,$(libdir),libmozjs185\.so\.1\.0\.0) -SPKG_DESC_CSWlibmozjs185-gxx += $(DESCRIPTION), libmozjs185.so -RUNTIME_DEP_PKGS_CSWlibmozjs185-gxx += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibmozjs185-gxx += CSWlibstdc++6 +PACKAGES += CSWlibmozjs185-1-0-gxx +PKGFILES_CSWlibmozjs185-1-0-gxx += $(call baseisadirs,$(libdir),libmozjs185\.so\.1\.0(\.\d+)*) +SPKG_DESC_CSWlibmozjs185-1-0-gxx += $(DESCRIPTION), libmozjs185.so.1.0 +RUNTIME_DEP_PKGS_CSWlibmozjs185-gxx += CSWlibmozjs185-1-0-gxx include gar/category.mk @@ -63,13 +64,15 @@ configure-custom: (cd $(WORKSRC)/js && mkdir -p objdir && cd objdir && \ CFLAGS="-DJS_C_STRINGS_ARE_UTF8" \ - CXXFLAGS="-fshort-enums -DJS_C_STRINGS_ARE_UTF8" \ - CXX=/opt/csw/bin/g++ CC=/opt/csw/bin/gcc \ + CXXFLAGS="-fshort-enums -mimpure-text -DJS_C_STRINGS_ARE_UTF8" \ + CXX=/opt/csw/bin/g++ \ + CC=/opt/csw/bin/gcc \ ../src/configure \ --disable-pedantic \ --with-nspr-prefix=/opt/csw \ --prefix=/opt/csw/gxx \ --with-system-nspr \ + --with-pthreads \ --enable-threadsasafe \ --with-ctypes) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 10 13:00:31 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 10 Mar 2012 12:00:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17352] csw/mgar/pkg/spidermonkey/trunk/Makefile Message-ID: Revision: 17352 http://gar.svn.sourceforge.net/gar/?rev=17352&view=rev Author: wahwah Date: 2012-03-10 12:00:31 +0000 (Sat, 10 Mar 2012) Log Message: ----------- spidermonkey/trunk: add dependencies Modified Paths: -------------- csw/mgar/pkg/spidermonkey/trunk/Makefile Modified: csw/mgar/pkg/spidermonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/spidermonkey/trunk/Makefile 2012-03-10 11:47:17 UTC (rev 17351) +++ csw/mgar/pkg/spidermonkey/trunk/Makefile 2012-03-10 12:00:31 UTC (rev 17352) @@ -42,11 +42,13 @@ SPKG_DESC_CSWlibmozjs185-gxx-dev += $(DESCRIPTION), header files PKGFILES_CSWlibmozjs185-gxx-dev += $(PKGFILES_DEVEL) PKGFILES_CSWlibmozjs185-gxx-dev += $(libdir)/libmozjs185.so +RUNTIME_DEP_PKGS_CSWlibmozjs185-gxx-dev += CSWlibmozjs185-1-0-gxx PACKAGES += CSWlibmozjs185-1-0-gxx PKGFILES_CSWlibmozjs185-1-0-gxx += $(call baseisadirs,$(libdir),libmozjs185\.so\.1\.0(\.\d+)*) SPKG_DESC_CSWlibmozjs185-1-0-gxx += $(DESCRIPTION), libmozjs185.so.1.0 -RUNTIME_DEP_PKGS_CSWlibmozjs185-gxx += CSWlibmozjs185-1-0-gxx +RUNTIME_DEP_PKGS_CSWlibmozjs185-1-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibmozjs185-1-0-gxx += CSWlibstdc++6 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 11 00:03:38 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 10 Mar 2012 23:03:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[17353] csw/mgar/pkg/mongodb/trunk Message-ID: Revision: 17353 http://gar.svn.sourceforge.net/gar/?rev=17353&view=rev Author: wahwah Date: 2012-03-10 23:03:37 +0000 (Sat, 10 Mar 2012) Log Message: ----------- mongodb/trunk: work in progress Modified Paths: -------------- csw/mgar/pkg/mongodb/trunk/Makefile csw/mgar/pkg/mongodb/trunk/checksums Modified: csw/mgar/pkg/mongodb/trunk/Makefile =================================================================== --- csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-10 12:00:31 UTC (rev 17352) +++ csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-10 23:03:37 UTC (rev 17353) @@ -3,9 +3,8 @@ # $Id$ NAME = mongodb -VERSION = 1.6.3 +VERSION = 2.0.3 -# http://fastdl.mongodb.org/src/mongodb-src-r1.6.3.tar.gz CATEGORIES = lib GARTYPE = v2 DESCRIPTION = A scalable, high-performance, open source, document-oriented database @@ -15,28 +14,37 @@ MASTER_SITES = http://fastdl.mongodb.org/src/ DISTNAME = $(NAME)-src-r$(VERSION) DISTFILES = $(DISTNAME).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_SCRIPTS = BUILD_SCRIPTS = mongo INSTALL_SCRIPTS = mongo TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) -# GARCOMPILER = GNU -PATCHFILES += 0001-Disabling-the-libstdc-check.patch + +GARCOMPILER = GNU + +# PATCHFILES += 0001-Disabling-the-libstdc-check.patch PATCHFILES += 0002-library-checking-by-locating-.so-files.patch -BUILD_DEP_PKGS = CSWboostdevel - # Depends on V8 which is available on Solaris 10 x86 only. +# Can only run on little-endian machines. PACKAGING_PLATFORMS = solaris10-i386 +# scons libboost-dev libpcre++-dev xulrunner-1.9.1-dev + +BUILD_DEP_PKGS += CSWboost-gcc-dev +BUILD_DEP_PKGS += CSWgcc4g++ +BUILD_DEP_PKGS += CSWlibmozjs185-gxx-dev +BUILD_DEP_PKGS += CSWlibpcre-dev +BUILD_DEP_PKGS += CSWscons + include gar/category.mk -# scons libboost-dev libpcre++-dev xulrunner-1.9.1-dev - build-mongo: - # (cd $(WORKSRC); $(BUILD_ENV) scons --extrapathdyn=/opt/csw,/opt/csw/gcc4 --cxx /opt/csw/gcc4/bin/g++ --usev8 all) - (cd $(WORKSRC); $(BUILD_ENV) scons --libpath=/opt/csw/lib --extrapathdyn=/opt/csw,/opt/SUNWspro/bin --cxx /opt/SUNWspro/bin/CC --release all) + (cd $(WORKSRC); LIBPATH=/opt/csw/gxx/lib \ + scons \ + --extrapath=/opt/csw,/opt/csw/gxx \ + --cxx=/opt/csw/bin/g++ \ + --release all) @$(MAKECOOKIE) install-mongo: Modified: csw/mgar/pkg/mongodb/trunk/checksums =================================================================== --- csw/mgar/pkg/mongodb/trunk/checksums 2012-03-10 12:00:31 UTC (rev 17352) +++ csw/mgar/pkg/mongodb/trunk/checksums 2012-03-10 23:03:37 UTC (rev 17353) @@ -1 +1 @@ -076b91f37ee434db80441e9028fe50a5 mongodb-src-r1.6.3.tar.gz +f588cae93196b94599ec50e3c4956592 mongodb-src-r2.0.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 11 00:42:53 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 10 Mar 2012 23:42:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[17354] csw/mgar/pkg Message-ID: Revision: 17354 http://gar.svn.sourceforge.net/gar/?rev=17354&view=rev Author: wahwah Date: 2012-03-10 23:42:53 +0000 (Sat, 10 Mar 2012) Log Message: ----------- snappy/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/snappy/ csw/mgar/pkg/snappy/Makefile csw/mgar/pkg/snappy/branches/ csw/mgar/pkg/snappy/tags/ csw/mgar/pkg/snappy/trunk/ csw/mgar/pkg/snappy/trunk/Makefile csw/mgar/pkg/snappy/trunk/checksums csw/mgar/pkg/snappy/trunk/files/ Added: csw/mgar/pkg/snappy/Makefile =================================================================== --- csw/mgar/pkg/snappy/Makefile (rev 0) +++ csw/mgar/pkg/snappy/Makefile 2012-03-10 23:42:53 UTC (rev 17354) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/snappy/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/snappy/trunk/Makefile =================================================================== --- csw/mgar/pkg/snappy/trunk/Makefile (rev 0) +++ csw/mgar/pkg/snappy/trunk/Makefile 2012-03-10 23:42:53 UTC (rev 17354) @@ -0,0 +1,19 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = snappy +VERSION = 1.0.5 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Brief description +define BLURB +endef + +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/snappy/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/snappy/trunk/checksums =================================================================== --- csw/mgar/pkg/snappy/trunk/checksums (rev 0) +++ csw/mgar/pkg/snappy/trunk/checksums 2012-03-10 23:42:53 UTC (rev 17354) @@ -0,0 +1 @@ +4c0af044e654f5983f4acbf00d1ac236 snappy-1.0.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 11 00:55:54 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 10 Mar 2012 23:55:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17355] csw/mgar/pkg/snappy/branches/snappy-gcc/ Message-ID: Revision: 17355 http://gar.svn.sourceforge.net/gar/?rev=17355&view=rev Author: wahwah Date: 2012-03-10 23:55:54 +0000 (Sat, 10 Mar 2012) Log Message: ----------- snappy: A branch for a GCC build Added Paths: ----------- csw/mgar/pkg/snappy/branches/snappy-gcc/ 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 Mar 11 01:24:45 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 00:24:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17356] csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile Message-ID: Revision: 17356 http://gar.svn.sourceforge.net/gar/?rev=17356&view=rev Author: wahwah Date: 2012-03-11 00:24:45 +0000 (Sun, 11 Mar 2012) Log Message: ----------- snappy/branches/snappy-gcc: a GCC build of snappy Modified Paths: -------------- csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile Modified: csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile =================================================================== --- csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile 2012-03-10 23:55:54 UTC (rev 17355) +++ csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile 2012-03-11 00:24:45 UTC (rev 17356) @@ -13,7 +13,25 @@ MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(DISTNAME).tar.gz +prefix = $(BUILD_PREFIX)/gxx +GARCOMPILER = GNU + CONFIGURE_ARGS = $(DIRPATHS) +PACKAGES += CSWsnappy-dev +CATALOGNAME_CSWsnappy-dev = snappy_dev +SPKG_DESC_CSWsnappy-dev += $(DESCRIPTION), development files +PKGFILES_CSWsnappy-dev += /opt/csw/gxx/lib/libsnappy.so +PKGFILES_CSWsnappy-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWsnappy-dev += CSWlibsnappy1-gxx + +PACKAGES += CSWlibsnappy1-gxx +CATALOGNAME_CSWlibsnappy1-gxx = libsnappy1_gxx +PKGFILES_CSWlibsnappy1-gxx += $(call baseisadirs,$(libdir),libsnappy\.so\.1\.1\.3) +PKGFILES_CSWlibsnappy1-gxx += $(call baseisadirs,$(libdir),libsnappy\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibsnappy1-gxx += $(DESCRIPTION), libsnappy.so.1 +RUNTIME_DEP_PKGS_CSWlibsnappy1-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsnappy1-gxx += CSWlibstdc++6 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 11 01:30:15 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 00:30:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[17357] csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile Message-ID: Revision: 17357 http://gar.svn.sourceforge.net/gar/?rev=17357&view=rev Author: wahwah Date: 2012-03-11 00:30:15 +0000 (Sun, 11 Mar 2012) Log Message: ----------- snappy/branches/snappy-gcc: The devel package also GCC-specific Modified Paths: -------------- csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile Modified: csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile =================================================================== --- csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile 2012-03-11 00:24:45 UTC (rev 17356) +++ csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile 2012-03-11 00:30:15 UTC (rev 17357) @@ -18,15 +18,13 @@ CONFIGURE_ARGS = $(DIRPATHS) -PACKAGES += CSWsnappy-dev -CATALOGNAME_CSWsnappy-dev = snappy_dev -SPKG_DESC_CSWsnappy-dev += $(DESCRIPTION), development files -PKGFILES_CSWsnappy-dev += /opt/csw/gxx/lib/libsnappy.so -PKGFILES_CSWsnappy-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWsnappy-dev += CSWlibsnappy1-gxx +PACKAGES += CSWsnappy-gcc-dev +SPKG_DESC_CSWsnappy-gcc-dev += $(DESCRIPTION), development files +PKGFILES_CSWsnappy-gcc-dev += /opt/csw/gxx/lib/libsnappy.so +PKGFILES_CSWsnappy-gcc-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWsnappy-gcc-dev += CSWlibsnappy1-gxx PACKAGES += CSWlibsnappy1-gxx -CATALOGNAME_CSWlibsnappy1-gxx = libsnappy1_gxx PKGFILES_CSWlibsnappy1-gxx += $(call baseisadirs,$(libdir),libsnappy\.so\.1\.1\.3) PKGFILES_CSWlibsnappy1-gxx += $(call baseisadirs,$(libdir),libsnappy\.so\.1(\.\d+)*) SPKG_DESC_CSWlibsnappy1-gxx += $(DESCRIPTION), libsnappy.so.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 11 01:35:09 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 00:35:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17358] csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile Message-ID: Revision: 17358 http://gar.svn.sourceforge.net/gar/?rev=17358&view=rev Author: wahwah Date: 2012-03-11 00:35:09 +0000 (Sun, 11 Mar 2012) Log Message: ----------- snappy/branches/snappy-gcc: Build for pentium_pro, because of __sync_fetch_and_add_4 Modified Paths: -------------- csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile Modified: csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile =================================================================== --- csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile 2012-03-11 00:30:15 UTC (rev 17357) +++ csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile 2012-03-11 00:35:09 UTC (rev 17358) @@ -16,6 +16,11 @@ prefix = $(BUILD_PREFIX)/gxx GARCOMPILER = GNU +# Undefined first referenced +# symbol in file +# __sync_fetch_and_add_4 snappy_unittest-snappy_unittest.o +ISA_DEFAULT_i386 = pentium_pro + CONFIGURE_ARGS = $(DIRPATHS) PACKAGES += CSWsnappy-gcc-dev 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 Mar 11 01:38:21 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 00:38:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17359] csw/mgar/pkg/spidermonkey/branches/js-1.7/ Message-ID: Revision: 17359 http://gar.svn.sourceforge.net/gar/?rev=17359&view=rev Author: wahwah Date: 2012-03-11 00:38:21 +0000 (Sun, 11 Mar 2012) Log Message: ----------- spidermonkey: A branch for version 1.7 Added Paths: ----------- csw/mgar/pkg/spidermonkey/branches/js-1.7/ 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 Mar 11 09:23:38 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 08:23:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[17360] csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile Message-ID: Revision: 17360 http://gar.svn.sourceforge.net/gar/?rev=17360&view=rev Author: wahwah Date: 2012-03-11 08:23:37 +0000 (Sun, 11 Mar 2012) Log Message: ----------- snappy/branches/snappy-gcc: Build on Solaris 10, not 9 Modified Paths: -------------- csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile Modified: csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile =================================================================== --- csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile 2012-03-11 00:38:21 UTC (rev 17359) +++ csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile 2012-03-11 08:23:37 UTC (rev 17360) @@ -13,13 +13,15 @@ MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(DISTNAME).tar.gz +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + prefix = $(BUILD_PREFIX)/gxx GARCOMPILER = GNU # Undefined first referenced # symbol in file # __sync_fetch_and_add_4 snappy_unittest-snappy_unittest.o -ISA_DEFAULT_i386 = pentium_pro +# ISA_DEFAULT_i386 = pentium_pro CONFIGURE_ARGS = $(DIRPATHS) 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 Mar 11 09:27:52 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 08:27:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17361] csw/mgar/pkg/pcre/branches/pcre-gcc/ Message-ID: Revision: 17361 http://gar.svn.sourceforge.net/gar/?rev=17361&view=rev Author: wahwah Date: 2012-03-11 08:27:52 +0000 (Sun, 11 Mar 2012) Log Message: ----------- pcre: A GCC branch. Added Paths: ----------- csw/mgar/pkg/pcre/branches/pcre-gcc/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Mar 11 09:55:56 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 11 Mar 2012 08:55:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[17362] csw/mgar/pkg/sendmail/trunk/Makefile Message-ID: Revision: 17362 http://gar.svn.sourceforge.net/gar/?rev=17362&view=rev Author: bonivart Date: 2012-03-11 08:55:55 +0000 (Sun, 11 Mar 2012) Log Message: ----------- sendmail/trunk: fix symlink Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2012-03-11 08:27:52 UTC (rev 17361) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2012-03-11 08:55:55 UTC (rev 17362) @@ -294,7 +294,7 @@ ginstall -m 644 $(DOWNLOADDIR)/$$file \ $(DESTDIR)$(sysconfdir)/mail/$$file; \ done ) - ln -s $(sharedstatedir)/sendmail/cf $(DESTDIR)$(sysconfdir)/mail/cf + ln -s $(sharedstatedir)/sendmail/cf/cf $(DESTDIR)$(sysconfdir)/mail/cf @# usergroup ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail/ 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 Mar 11 10:37:28 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 09:37:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[17363] csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile Message-ID: Revision: 17363 http://gar.svn.sourceforge.net/gar/?rev=17363&view=rev Author: wahwah Date: 2012-03-11 09:37:27 +0000 (Sun, 11 Mar 2012) Log Message: ----------- snappy/branches/snappy-gcc: Name the dev package CSWsnappy-gxx-dev for consistency. Modified Paths: -------------- csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile Modified: csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile =================================================================== --- csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile 2012-03-11 08:55:55 UTC (rev 17362) +++ csw/mgar/pkg/snappy/branches/snappy-gcc/Makefile 2012-03-11 09:37:27 UTC (rev 17363) @@ -25,11 +25,11 @@ CONFIGURE_ARGS = $(DIRPATHS) -PACKAGES += CSWsnappy-gcc-dev -SPKG_DESC_CSWsnappy-gcc-dev += $(DESCRIPTION), development files -PKGFILES_CSWsnappy-gcc-dev += /opt/csw/gxx/lib/libsnappy.so -PKGFILES_CSWsnappy-gcc-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWsnappy-gcc-dev += CSWlibsnappy1-gxx +PACKAGES += CSWsnappy-gxx-dev +SPKG_DESC_CSWsnappy-gxx-dev += $(DESCRIPTION), development files +PKGFILES_CSWsnappy-gxx-dev += /opt/csw/gxx/lib/libsnappy.so +PKGFILES_CSWsnappy-gxx-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWsnappy-gxx-dev += CSWlibsnappy1-gxx PACKAGES += CSWlibsnappy1-gxx PKGFILES_CSWlibsnappy1-gxx += $(call baseisadirs,$(libdir),libsnappy\.so\.1\.1\.3) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 11 10:51:55 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 09:51:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[17364] csw/mgar/pkg/spidermonkey/branches/js-1.7 Message-ID: Revision: 17364 http://gar.svn.sourceforge.net/gar/?rev=17364&view=rev Author: wahwah Date: 2012-03-11 09:51:55 +0000 (Sun, 11 Mar 2012) Log Message: ----------- Flavor 1.7 of spidermonkey builds. Modified Paths: -------------- csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile csw/mgar/pkg/spidermonkey/branches/js-1.7/checksums Added Paths: ----------- csw/mgar/pkg/spidermonkey/branches/js-1.7/files/0001-Set-the-SONAME-of-the-shared-library.patch Modified: csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile =================================================================== --- csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile 2012-03-11 09:37:27 UTC (rev 17363) +++ csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile 2012-03-11 09:51:55 UTC (rev 17364) @@ -1,7 +1,7 @@ # $Id$ NAME = spidermonkey -VERSION = 1.0.0 +VERSION = 1.7.0 CATEGORIES = lib GARTYPE = v2 @@ -12,44 +12,53 @@ VENDOR_URL = http://www.mozilla.org/js/spidermonkey/ MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/js/ -DISTFILES = js185-$(VERSION).tar.gz +DISTFILES = js-$(VERSION).tar.gz -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +# the sun5.8 x86 config file is missing so +# we are using our own +#DISTFILES += SunOS5.8_i86pc.mk + +PATCHFILES += 0001-Set-the-SONAME-of-the-shared-library.patch + prefix = $(BUILD_PREFIX)/gxx +GARCOMPILER = GNU -DISTNAME = js-1.8.5 +DISTNAME = js -PATCHFILES += 0001-Do-not-use-fpclassify-on-Solaris.patch -PATCHFILES += 0002-Specify-the-right-SONAME-for-the-library.patch +LICENSE = src/README.html -LICENSE = js/src/README.html +# we find the os string used by the makefile by using +# the same code (from config.mk) +OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/)) +# Attempt to differentiate between SunOS 5.4 and x86 5.4 +OS_CPUARCH := $(shell uname -m) +ifeq ($(OS_CPUARCH),i86pc) +OS_RELEASE := $(shell uname -r)_$(OS_CPUARCH) +else +OS_RELEASE := $(shell uname -r) +endif +OS_CONFIG := $(OS_ARCH)$(OS_OBJTYPE)$(OS_RELEASE) -# EXTRA_LINKER_FLAGS = -mimpure-text +CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_SCRIPTS = custom +CONFIGURE_SCRIPTS = BUILD_SCRIPTS = custom TEST_SCRIPTS = INSTALL_SCRIPTS = custom -GARCOMPILER = GNU +PACKAGES += CSWlibjs-gxx-dev +SPKG_DESC_CSWlibjs-gxx-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibjs-gxx-dev += $(libdir)/libjs.so +PKGFILES_CSWlibjs-gxx-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibjs-gxx-dev += CSWlibjs1-7-0-gxx -BUILD_DEP_PKGS = CSWautoconf2-13 -BUILD_DEP_PKGS += CSWnspr-dev -BUILD_DEP_PKGS += CSWgcc4core -BUILD_DEP_PKGS += CSWgcc4g++ +PACKAGES += CSWlibjs1-7-0-gxx +PKGFILES_CSWlibjs1-7-0-gxx += $(call baseisadirs,$(libdir),libjs\.so\.1\.7\.0) +SPKG_DESC_CSWlibjs1-7-0-gxx += $(DESCRIPTION), libjs.so.1.7.0 +RUNTIME_DEP_PKGS_CSWspidermonkey += CSWlibjs1-7-0-gxx -PACKAGES = CSWlibmozjs185-gxx-dev -SPKG_DESC_CSWlibmozjs185-gxx-dev += $(DESCRIPTION), header files -PKGFILES_CSWlibmozjs185-gxx-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWlibmozjs185-gxx-dev += $(libdir)/libmozjs185.so -RUNTIME_DEP_PKGS_CSWlibmozjs185-gxx-dev += CSWlibmozjs185-1-0-gxx +CHECKPKG_OVERRIDES_CSWlibjs1-7-0-gxx += binary-architecture-does-not-match-placement|file=opt/csw/gxx/lib/libjs.so.1.7.0|arch_id=18|arch_name=sparcv8+ -PACKAGES += CSWlibmozjs185-1-0-gxx -PKGFILES_CSWlibmozjs185-1-0-gxx += $(call baseisadirs,$(libdir),libmozjs185\.so\.1\.0(\.\d+)*) -SPKG_DESC_CSWlibmozjs185-1-0-gxx += $(DESCRIPTION), libmozjs185.so.1.0 -RUNTIME_DEP_PKGS_CSWlibmozjs185-1-0-gxx += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibmozjs185-1-0-gxx += CSWlibstdc++6 - include gar/category.mk post-patch: @@ -57,38 +66,36 @@ # it seems to be used to define special debug functions, # for developper only I suppose. # we just change it by echo to avoid error messages - # perl -pi -e 's/whoami/echo/g' $(WORKSRC)/src/config.mk - -pre-configure-modulated: - (cd $(WORKSRC)/js/src && autoconf-2.13) + perl -pi -e 's/whoami/echo/g' $(WORKSRC)/src/config.mk @$(MAKECOOKIE) -configure-custom: - (cd $(WORKSRC)/js && mkdir -p objdir && cd objdir && \ - CFLAGS="-DJS_C_STRINGS_ARE_UTF8" \ - CXXFLAGS="-fshort-enums -mimpure-text -DJS_C_STRINGS_ARE_UTF8" \ - CXX=/opt/csw/bin/g++ \ - CC=/opt/csw/bin/gcc \ - ../src/configure \ - --disable-pedantic \ - --with-nspr-prefix=/opt/csw \ - --prefix=/opt/csw/gxx \ - --with-system-nspr \ - --with-pthreads \ - --enable-threadsasafe \ - --with-ctypes) +pre-build: + # if we are on x86, we install our own config file + # and remove the lock_SunOS.s cause the makefile + # always tries to compile it (why so ?) + ( if [ "$(OS_CPUARCH)" = "i86pc" ]; then \ + cp $(WORKDIR)/SunOS5.8_i86pc.mk $(WORKSRC)/src/config; \ + rm -f $(WORKSRC)/src/lock_SunOS.s; \ + fi ) @$(MAKECOOKIE) build-custom: - # cd $(WORKSRC)/js/src && DISABLE_JIT=1 BUILD_OPT=1 $(MAKE) -f Makefile.ref - cd $(WORKSRC)/js/objdir && $(MAKE) $(PARALLELMFLAGS) + # Looks like it doesn't work with parallel builds. + # $(PARALLELMFLAGS) + cd $(WORKSRC)/src && BUILD_OPT=1 $(MAKE) -f Makefile.ref @$(MAKECOOKIE) install-custom: - cd $(WORKSRC)/js/objdir && $(MAKE) $(INSTALL_ENV) install - # Symlinks after installation are broken: they use absolute paths. - grm -v $(DESTDIR)/opt/csw/gxx/lib/libmozjs185.so - grm -v $(DESTDIR)/opt/csw/gxx/lib/libmozjs185.so.1.0 - gln -vs libmozjs185.so.1.0 $(DESTDIR)/opt/csw/gxx/lib/libmozjs185.so - gln -vs libmozjs185.so.1.0.0 $(DESTDIR)/opt/csw/gxx/lib/libmozjs185.so.1.0 + ginstall -d $(DESTDIR)$(includedir) + cp $(WORKSRC)/src/*.h $(DESTDIR)$(includedir) + cp $(WORKSRC)/src/$(OS_CONFIG)_OPT.OBJ/*.h $(DESTDIR)$(includedir) + # + ginstall -d $(DESTDIR)$(libdir) + ginstall -D $(WORKSRC)/src/$(OS_CONFIG)_OPT.OBJ/libjs.so $(DESTDIR)$(libdir)/libjs.so + # ginstall -D $(WORKSRC)/src/$(OS_CONFIG)_OPT.OBJ/libjs.a $(DESTDIR)$(libdir)/libjs.a + (cd $(DESTDIR)/$(libdir); mv libjs.so libjs.so.1.7.0; ln -s libjs.so.1.7.0 libjs.so) + # + ginstall -d $(DESTDIR)$(bindir) + ginstall -D $(WORKSRC)/src/$(OS_CONFIG)_OPT.OBJ/js $(DESTDIR)$(bindir)/js + ginstall -D $(WORKSRC)/src/$(OS_CONFIG)_OPT.OBJ/jscpucfg $(DESTDIR)$(bindir)/jscpucfg @$(MAKECOOKIE) Modified: csw/mgar/pkg/spidermonkey/branches/js-1.7/checksums =================================================================== --- csw/mgar/pkg/spidermonkey/branches/js-1.7/checksums 2012-03-11 09:37:27 UTC (rev 17363) +++ csw/mgar/pkg/spidermonkey/branches/js-1.7/checksums 2012-03-11 09:51:55 UTC (rev 17364) @@ -1 +1 @@ -a4574365938222adca0a6bd33329cb32 js185-1.0.0.tar.gz +5571134c3863686b623ebe4e6b1f6fe6 js-1.7.0.tar.gz Added: csw/mgar/pkg/spidermonkey/branches/js-1.7/files/0001-Set-the-SONAME-of-the-shared-library.patch =================================================================== --- csw/mgar/pkg/spidermonkey/branches/js-1.7/files/0001-Set-the-SONAME-of-the-shared-library.patch (rev 0) +++ csw/mgar/pkg/spidermonkey/branches/js-1.7/files/0001-Set-the-SONAME-of-the-shared-library.patch 2012-03-11 09:51:55 UTC (rev 17364) @@ -0,0 +1,25 @@ +From c09f2e7582231cbe2548093769c29efd488f5363 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 11 Mar 2012 09:50:19 +0100 +Subject: [PATCH] Set the SONAME of the shared library. + +--- + src/rules.mk | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/rules.mk b/src/rules.mk +index 8d484db..c3efbf6 100644 +--- a/src/rules.mk ++++ b/src/rules.mk +@@ -115,7 +115,7 @@ $(LIBRARY): $(LIB_OBJS) + $(RANLIB) $@ + + $(SHARED_LIBRARY): $(LIB_OBJS) +- $(MKSHLIB) -o $@ $(LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS) ++ $(MKSHLIB) -o $@ -h libjs.so.1.7.0 $(LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS) + endif + endif + +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 11 11:26:47 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 10:26:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[17365] csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile Message-ID: Revision: 17365 http://gar.svn.sourceforge.net/gar/?rev=17365&view=rev Author: wahwah Date: 2012-03-11 10:26:47 +0000 (Sun, 11 Mar 2012) Log Message: ----------- pcre/branches/pcre-gcc: GCC flavor of pcre Modified Paths: -------------- csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile Modified: csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile =================================================================== --- csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile 2012-03-11 09:51:55 UTC (rev 17364) +++ csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile 2012-03-11 10:26:47 UTC (rev 17365) @@ -21,58 +21,58 @@ VENDOR_URL = http://www.pcre.org -PACKAGES = CSWpcre -CATALOGNAME_CSWpcre = pcre -SPKG_DESC_CSWpcre = Perl-compatible regular expression tools -RUNTIME_DEP_PKGS_CSWpcre += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre1 -RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre16-0 -RUNTIME_DEP_PKGS_CSWpcre += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWpcre += CSWlibz1 -RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcreposix0 +prefix = $(BUILD_PREFIX)/gxx +GARCOMPILER = GNU -PACKAGES += CSWlibpcre-dev -SPKG_DESC_CSWlibpcre-dev = Development files for libpcre.so.1, libpcre16.so.0, libpcrecpp.so.0 and libpcreposix.so.0 -RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcre1 -RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcre16-0 -RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcreposix0 -RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcrecpp0 -PKGFILES_CSWlibpcre-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWlibpcre-dev += $(docdir)/.* -OBSOLETED_BY_CSWlibpcre-dev += CSWpcre-devel +PACKAGES = CSWpcre-gxx +CATALOGNAME_CSWpcre-gxx = pcre +SPKG_DESC_CSWpcre-gxx = Perl-compatible regular expression tools +RUNTIME_DEP_PKGS_CSWpcre-gxx += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWpcre-gxx += CSWlibpcre1-gxx +RUNTIME_DEP_PKGS_CSWpcre-gxx += CSWlibpcre16-0-gxx +RUNTIME_DEP_PKGS_CSWpcre-gxx += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWpcre-gxx += CSWlibz1 +RUNTIME_DEP_PKGS_CSWpcre-gxx += CSWlibpcreposix0-gxx + +PACKAGES += CSWlibpcre-gxx-dev +SPKG_DESC_CSWlibpcre-gxx-dev = Development files for libpcre.so.1, libpcre16.so.0, libpcrecpp.so.0 and libpcreposix.so.0 +RUNTIME_DEP_PKGS_CSWlibpcre-gxx-dev += CSWlibpcre1-gxx +RUNTIME_DEP_PKGS_CSWlibpcre-gxx-dev += CSWlibpcre16-0-gxx +RUNTIME_DEP_PKGS_CSWlibpcre-gxx-dev += CSWlibpcreposix0-gxx +RUNTIME_DEP_PKGS_CSWlibpcre-gxx-dev += CSWlibpcrecpp0-gxx +PKGFILES_CSWlibpcre-gxx-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibpcre-gxx-dev += $(docdir)/.* # Leave these in the docs for now -CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/pcre-config.txt -CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/pcre.txt -CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/README -CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/html/pcre-config.html -CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/html/pcresample.html -CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/html/pcredemo.html +CHECKPKG_OVERRIDES_CSWlibpcre-gxx-dev += file-with-bad-content -PACKAGES += CSWlibpcre1 -SPKG_DESC_CSWlibpcre1 = Perl-compatible regular expression tools, libpcre.so.1 -PKGFILES_CSWlibpcre1 = $(call pkgfiles_lib,libpcre.so.1) +PACKAGES += CSWlibpcre1-gxx +SPKG_DESC_CSWlibpcre1-gxx = Perl-compatible regular expression tools, libpcre.so.1 +PKGFILES_CSWlibpcre1-gxx = $(call pkgfiles_lib,libpcre.so.1) +RUNTIME_DEP_PKGS_CSWlibpcre1-gxx += CSWlibgcc-s1 -PACKAGES += CSWlibpcre16-0 -SPKG_DESC_CSWlibpcre16-0 = Perl-compatible regular expression tools, libpcre16.so.0 -PKGFILES_CSWlibpcre16-0 = $(call pkgfiles_lib,libpcre16.so.0) +PACKAGES += CSWlibpcre16-0-gxx +SPKG_DESC_CSWlibpcre16-0-gxx = Perl-compatible regular expression tools, libpcre16.so.0 +PKGFILES_CSWlibpcre16-0-gxx = $(call pkgfiles_lib,libpcre16.so.0) +RUNTIME_DEP_PKGS_CSWlibpcre16-0-gxx += CSWlibgcc-s1 -PACKAGES += CSWlibpcrecpp0 -SPKG_DESC_CSWlibpcrecpp0 += Perl-compatible regular expression tools, libpcrecpp.so.0 -PKGFILES_CSWlibpcrecpp0 += $(call pkgfiles_lib,libpcrecpp.so.0) -RUNTIME_DEP_PKGS_CSWlibpcrecpp0 += CSWlibpcre0 +PACKAGES += CSWlibpcrecpp0-gxx +SPKG_DESC_CSWlibpcrecpp0-gxx += Perl-compatible regular expression tools, libpcrecpp.so.0 +PKGFILES_CSWlibpcrecpp0-gxx += $(call pkgfiles_lib,libpcrecpp.so.0) +RUNTIME_DEP_PKGS_CSWlibpcrecpp0-gxx += CSWlibpcre1-gxx +RUNTIME_DEP_PKGS_CSWlibpcrecpp0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibpcrecpp0-gxx += CSWlibstdc++6 -PACKAGES += CSWlibpcreposix0 -SPKG_DESC_CSWlibpcreposix0 += Perl-compatible regular expression tools, libpcreposix.so.0 -PKGFILES_CSWlibpcreposix0 += $(call pkgfiles_lib,libpcreposix.so.0) -RUNTIME_DEP_PKGS_CSWlibpcreposix0 += CSWlibpcre0 +PACKAGES += CSWlibpcreposix0-gxx +SPKG_DESC_CSWlibpcreposix0-gxx += Perl-compatible regular expression tools, libpcreposix.so.0 +PKGFILES_CSWlibpcreposix0-gxx += $(call pkgfiles_lib,libpcreposix.so.0) +RUNTIME_DEP_PKGS_CSWlibpcreposix0-gxx += CSWlibpcre1-gxx +RUNTIME_DEP_PKGS_CSWlibpcreposix0-gxx += CSWlibgcc-s1 REINPLACE_USRLOCAL += doc/pcre-config.1 REINPLACE_USRLOCAL += doc/pcresample.3 BUILD64_LIBS_ONLY = 1 -EXTRA_LINKER_FLAGS = -norunpath - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-unicode-properties CONFIGURE_ARGS += --enable-pcregrep-libz @@ -86,6 +86,8 @@ # We need more than the default 8 MB of stack space TEST_SCRIPTS = custom +LD_OPTIONS = + include gar/category.mk # The testcases need 'diff -u' which Solaris 8 diff does not have, 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 Mar 11 11:36:11 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 10:36:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17366] csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile Message-ID: Revision: 17366 http://gar.svn.sourceforge.net/gar/?rev=17366&view=rev Author: wahwah Date: 2012-03-11 10:36:11 +0000 (Sun, 11 Mar 2012) Log Message: ----------- spidermonkey/branches/js-1.7: Fix the x86 build Modified Paths: -------------- csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile Modified: csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile =================================================================== --- csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile 2012-03-11 10:26:47 UTC (rev 17365) +++ csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile 2012-03-11 10:36:11 UTC (rev 17366) @@ -46,6 +46,9 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom +EXTRA_CFLAGS="-DJS_C_STRINGS_ARE_UTF8" +EXTRA_CXXFLAGS="-DJS_C_STRINGS_ARE_UTF8" + PACKAGES += CSWlibjs-gxx-dev SPKG_DESC_CSWlibjs-gxx-dev += $(DESCRIPTION), development files PKGFILES_CSWlibjs-gxx-dev += $(libdir)/libjs.so @@ -69,7 +72,7 @@ perl -pi -e 's/whoami/echo/g' $(WORKSRC)/src/config.mk @$(MAKECOOKIE) -pre-build: +pre-build-modulated: # if we are on x86, we install our own config file # and remove the lock_SunOS.s cause the makefile # always tries to compile it (why so ?) 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 Mar 11 11:56:59 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 10:56:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17367] csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile Message-ID: Revision: 17367 http://gar.svn.sourceforge.net/gar/?rev=17367&view=rev Author: wahwah Date: 2012-03-11 10:56:59 +0000 (Sun, 11 Mar 2012) Log Message: ----------- pcre/branches/pcre-gcc: Work around a compilation problem Modified Paths: -------------- csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile Modified: csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile =================================================================== --- csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile 2012-03-11 10:36:11 UTC (rev 17366) +++ csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile 2012-03-11 10:56:59 UTC (rev 17367) @@ -19,6 +19,8 @@ # http://bugs.exim.org/show_bug.cgi?id=1206 PATCHFILES += 0002-Remove-bashism.patch +ISA_DEFAULT_i386-5.9 = pentium_pro + VENDOR_URL = http://www.pcre.org prefix = $(BUILD_PREFIX)/gxx 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 Mar 11 12:04:27 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 11:04:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[17368] csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile Message-ID: Revision: 17368 http://gar.svn.sourceforge.net/gar/?rev=17368&view=rev Author: wahwah Date: 2012-03-11 11:04:27 +0000 (Sun, 11 Mar 2012) Log Message: ----------- pcre/branches/pcre-gcc: Fix the catalogname, use default. Modified Paths: -------------- csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile Modified: csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile =================================================================== --- csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile 2012-03-11 10:56:59 UTC (rev 17367) +++ csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile 2012-03-11 11:04:27 UTC (rev 17368) @@ -27,7 +27,6 @@ GARCOMPILER = GNU PACKAGES = CSWpcre-gxx -CATALOGNAME_CSWpcre-gxx = pcre SPKG_DESC_CSWpcre-gxx = Perl-compatible regular expression tools RUNTIME_DEP_PKGS_CSWpcre-gxx += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWpcre-gxx += CSWlibpcre1-gxx 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 Mar 11 12:08:51 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 11:08:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[17369] csw/mgar/pkg/spidermonkey/branches/js-1.7 Message-ID: Revision: 17369 http://gar.svn.sourceforge.net/gar/?rev=17369&view=rev Author: wahwah Date: 2012-03-11 11:08:51 +0000 (Sun, 11 Mar 2012) Log Message: ----------- spidermonkey/branches/js-1.7: Add a x86 config file Modified Paths: -------------- csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile Added Paths: ----------- csw/mgar/pkg/spidermonkey/branches/js-1.7/files/0003-Add-a-x86-configuration-file.patch Modified: csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile =================================================================== --- csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile 2012-03-11 11:04:27 UTC (rev 17368) +++ csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile 2012-03-11 11:08:51 UTC (rev 17369) @@ -19,6 +19,7 @@ #DISTFILES += SunOS5.8_i86pc.mk PATCHFILES += 0001-Set-the-SONAME-of-the-shared-library.patch +PATCHFILES += 0003-Add-a-x86-configuration-file.patch prefix = $(BUILD_PREFIX)/gxx GARCOMPILER = GNU Added: csw/mgar/pkg/spidermonkey/branches/js-1.7/files/0003-Add-a-x86-configuration-file.patch =================================================================== --- csw/mgar/pkg/spidermonkey/branches/js-1.7/files/0003-Add-a-x86-configuration-file.patch (rev 0) +++ csw/mgar/pkg/spidermonkey/branches/js-1.7/files/0003-Add-a-x86-configuration-file.patch 2012-03-11 11:08:51 UTC (rev 17369) @@ -0,0 +1,20 @@ +From b28bb55e3f340ec646914e283748a75779da639a Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 11 Mar 2012 12:04:44 +0100 +Subject: [PATCH] Add a x86 configuration file. + +--- + src/config/SunOS5.9_i86pc.mk | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + create mode 100644 src/config/SunOS5.9_i86pc.mk + +diff --git a/src/config/SunOS5.9_i86pc.mk b/src/config/SunOS5.9_i86pc.mk +new file mode 100644 +index 0000000..e6df87f +--- /dev/null ++++ b/src/config/SunOS5.9_i86pc.mk +@@ -0,0 +1 @@ ++include $(DEPTH)/config/SunOS5.5.mk +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 11 12:12:59 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 11:12:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17370] csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile Message-ID: Revision: 17370 http://gar.svn.sourceforge.net/gar/?rev=17370&view=rev Author: wahwah Date: 2012-03-11 11:12:58 +0000 (Sun, 11 Mar 2012) Log Message: ----------- pcre/branches/pcre-gcc: libgcc_s.so.1 is not there on Solaris 9 Modified Paths: -------------- csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile Modified: csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile =================================================================== --- csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile 2012-03-11 11:08:51 UTC (rev 17369) +++ csw/mgar/pkg/pcre/branches/pcre-gcc/Makefile 2012-03-11 11:12:58 UTC (rev 17370) @@ -89,6 +89,16 @@ LD_OPTIONS = +# These checks fail on Solaris 9, because there is no libgcc_s.so.1 installed +# on Solaris 9. However, the library does exist on Solaris 10, where these +# libraries would be run. Checkpkg currently doesn't handle this special case, +# so overrides are used. +CHECKPKG_OVERRIDES_CSWlibpcrecpp0-gxx += soname-not-found|libstdc++.so.6|is|needed|by|opt/csw/gxx/lib/amd64/libpcrecpp.so.0.0.0 +CHECKPKG_OVERRIDES_CSWlibpcrecpp0-gxx += soname-not-found|libgcc_s.so.1|is|needed|by|opt/csw/gxx/lib/amd64/libpcrecpp.so.0.0.0 +CHECKPKG_OVERRIDES_CSWlibpcre1-gxx += soname-not-found|libgcc_s.so.1|is|needed|by|opt/csw/gxx/lib/amd64/libpcre.so.1.0.0 +CHECKPKG_OVERRIDES_CSWlibpcreposix0-gxx += soname-not-found|libgcc_s.so.1|is|needed|by|opt/csw/gxx/lib/amd64/libpcreposix.so.0.0.0 +CHECKPKG_OVERRIDES_CSWlibpcre16-0-gxx += soname-not-found|libgcc_s.so.1|is|needed|by|opt/csw/gxx/lib/amd64/libpcre16.so.0.0.0 + include gar/category.mk # The testcases need 'diff -u' which Solaris 8 diff does not have, 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 Mar 11 13:09:18 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 12:09:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17371] csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile Message-ID: Revision: 17371 http://gar.svn.sourceforge.net/gar/?rev=17371&view=rev Author: wahwah Date: 2012-03-11 12:09:17 +0000 (Sun, 11 Mar 2012) Log Message: ----------- spidermonkey/branches/js-1.7: include *.tbl files Modified Paths: -------------- csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile Modified: csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile =================================================================== --- csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile 2012-03-11 11:12:58 UTC (rev 17370) +++ csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile 2012-03-11 12:09:17 UTC (rev 17371) @@ -92,6 +92,7 @@ install-custom: ginstall -d $(DESTDIR)$(includedir) cp $(WORKSRC)/src/*.h $(DESTDIR)$(includedir) + cp $(WORKSRC)/src/*.tbl $(DESTDIR)$(includedir) cp $(WORKSRC)/src/$(OS_CONFIG)_OPT.OBJ/*.h $(DESTDIR)$(includedir) # ginstall -d $(DESTDIR)$(libdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 11 13:40:31 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 12:40:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17372] csw/mgar/pkg/file/trunk/Makefile Message-ID: Revision: 17372 http://gar.svn.sourceforge.net/gar/?rev=17372&view=rev Author: wahwah Date: 2012-03-11 12:40:30 +0000 (Sun, 11 Mar 2012) Log Message: ----------- file/trunk: Data are required by the library Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2012-03-11 12:09:17 UTC (rev 17371) +++ csw/mgar/pkg/file/trunk/Makefile 2012-03-11 12:40:30 UTC (rev 17372) @@ -48,6 +48,7 @@ SPKG_DESC_CSWlibmagic1 += The library behind file(1), libmagic.so.1 PKGFILES_CSWlibmagic1 += $(call pkgfiles_lib,libmagic.so.1) RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibmagic-data CHECKPKG_OVERRIDES_CSWlibmagic1 += surplus-dependency|CSWlibmagic-data OBSOLETED_BY_CSWlibmagic1 += CSWlibmagic 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 Mar 11 15:25:06 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 14:25:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17373] csw/mgar/pkg/mongodb/trunk/Makefile Message-ID: Revision: 17373 http://gar.svn.sourceforge.net/gar/?rev=17373&view=rev Author: wahwah Date: 2012-03-11 14:25:05 +0000 (Sun, 11 Mar 2012) Log Message: ----------- it builds Modified Paths: -------------- csw/mgar/pkg/mongodb/trunk/Makefile Modified: csw/mgar/pkg/mongodb/trunk/Makefile =================================================================== --- csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-11 12:40:30 UTC (rev 17372) +++ csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-11 14:25:05 UTC (rev 17373) @@ -18,7 +18,6 @@ BUILD_SCRIPTS = mongo INSTALL_SCRIPTS = mongo TEST_SCRIPTS = -CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = GNU @@ -33,20 +32,36 @@ BUILD_DEP_PKGS += CSWboost-gcc-dev BUILD_DEP_PKGS += CSWgcc4g++ -BUILD_DEP_PKGS += CSWlibmozjs185-gxx-dev -BUILD_DEP_PKGS += CSWlibpcre-dev +# BUILD_DEP_PKGS += CSWlibmozjs185-gxx-dev +BUILD_DEP_PKGS += CSWlibjs-gxx-dev +BUILD_DEP_PKGS += CSWlibpcap-dev +BUILD_DEP_PKGS += CSWlibpcre-gxx-dev BUILD_DEP_PKGS += CSWscons +BUILD_DEP_PKGS += CSWsnappy-gxx-dev +SCONS_FLAGS += --libpath=/opt/csw/gxx/lib +SCONS_FLAGS += --extrapath=/opt/csw,/opt/csw/gxx +SCONS_FLAGS += --cxx=/opt/csw/bin/g++ +SCONS_FLAGS += --use-system-all +SCONS_FLAGS += --extralib=rt,pcre +SCONS_FLAGS += --release all + +SCONS_ENV = LIBPATH=/opt/csw/gxx/lib + include gar/category.mk build-mongo: - (cd $(WORKSRC); LIBPATH=/opt/csw/gxx/lib \ + (cd $(WORKSRC); \ + $(SCONS_ENV) \ scons \ - --extrapath=/opt/csw,/opt/csw/gxx \ - --cxx=/opt/csw/bin/g++ \ - --release all) + $(SCONS_FLAGS) \ @$(MAKECOOKIE) install-mongo: - (cd $(WORKSRC); $(INSTALL_ENV) scons -Q --prefix=$(DESTDIR)/opt/csw install) + (cd $(WORKSRC); \ + $(SCONS_ENV) \ + scons \ + $(SCONS_FLAGS) \ + -Q --prefix=$(DESTDIR)/opt/csw \ + install) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 11 15:25:36 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 14:25:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[17374] csw/mgar/pkg/mongodb/trunk/Makefile Message-ID: Revision: 17374 http://gar.svn.sourceforge.net/gar/?rev=17374&view=rev Author: wahwah Date: 2012-03-11 14:25:36 +0000 (Sun, 11 Mar 2012) Log Message: ----------- fix a typo Modified Paths: -------------- csw/mgar/pkg/mongodb/trunk/Makefile Modified: csw/mgar/pkg/mongodb/trunk/Makefile =================================================================== --- csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-11 14:25:05 UTC (rev 17373) +++ csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-11 14:25:36 UTC (rev 17374) @@ -54,7 +54,7 @@ (cd $(WORKSRC); \ $(SCONS_ENV) \ scons \ - $(SCONS_FLAGS) \ + $(SCONS_FLAGS)) @$(MAKECOOKIE) install-mongo: 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 Mar 11 15:49:42 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 14:49:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[17375] csw/mgar/pkg/mongodb/trunk/Makefile Message-ID: Revision: 17375 http://gar.svn.sourceforge.net/gar/?rev=17375&view=rev Author: wahwah Date: 2012-03-11 14:49:42 +0000 (Sun, 11 Mar 2012) Log Message: ----------- mongodb/trunk: small refactoring Modified Paths: -------------- csw/mgar/pkg/mongodb/trunk/Makefile Modified: csw/mgar/pkg/mongodb/trunk/Makefile =================================================================== --- csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-11 14:25:36 UTC (rev 17374) +++ csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-11 14:49:42 UTC (rev 17375) @@ -39,14 +39,14 @@ BUILD_DEP_PKGS += CSWscons BUILD_DEP_PKGS += CSWsnappy-gxx-dev -SCONS_FLAGS += --libpath=/opt/csw/gxx/lib -SCONS_FLAGS += --extrapath=/opt/csw,/opt/csw/gxx -SCONS_FLAGS += --cxx=/opt/csw/bin/g++ +SCONS_FLAGS += --libpath=$(libdir) +SCONS_FLAGS += --extrapath=$(BUILD_PREFIX),$(prefix) +SCONS_FLAGS += --cxx=$(BUILD_PREFIX)/bin/g++ SCONS_FLAGS += --use-system-all SCONS_FLAGS += --extralib=rt,pcre SCONS_FLAGS += --release all -SCONS_ENV = LIBPATH=/opt/csw/gxx/lib +SCONS_ENV = LIBPATH=$(libdir) include gar/category.mk @@ -62,6 +62,6 @@ $(SCONS_ENV) \ scons \ $(SCONS_FLAGS) \ - -Q --prefix=$(DESTDIR)/opt/csw \ + -Q --prefix=$(DESTDIR)$(BUILD_PREFIX) \ install) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 11 18:52:15 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 17:52:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[17376] csw/mgar/pkg/mongodb/trunk Message-ID: Revision: 17376 http://gar.svn.sourceforge.net/gar/?rev=17376&view=rev Author: wahwah Date: 2012-03-11 17:52:15 +0000 (Sun, 11 Mar 2012) Log Message: ----------- Hardcode OpenCSW paths in SConstruct Modified Paths: -------------- csw/mgar/pkg/mongodb/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/mongodb/trunk/files/0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch Modified: csw/mgar/pkg/mongodb/trunk/Makefile =================================================================== --- csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-11 14:49:42 UTC (rev 17375) +++ csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-11 17:52:15 UTC (rev 17376) @@ -21,14 +21,14 @@ GARCOMPILER = GNU -# PATCHFILES += 0001-Disabling-the-libstdc-check.patch PATCHFILES += 0002-library-checking-by-locating-.so-files.patch +PATCHFILES += 0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch # Depends on V8 which is available on Solaris 10 x86 only. # Can only run on little-endian machines. PACKAGING_PLATFORMS = solaris10-i386 -# scons libboost-dev libpcre++-dev xulrunner-1.9.1-dev +EXTRA_RUNPATH_DIRS = $(prefix)/gxx/lib BUILD_DEP_PKGS += CSWboost-gcc-dev BUILD_DEP_PKGS += CSWgcc4g++ @@ -39,14 +39,14 @@ BUILD_DEP_PKGS += CSWscons BUILD_DEP_PKGS += CSWsnappy-gxx-dev -SCONS_FLAGS += --libpath=$(libdir) -SCONS_FLAGS += --extrapath=$(BUILD_PREFIX),$(prefix) -SCONS_FLAGS += --cxx=$(BUILD_PREFIX)/bin/g++ +SCONS_FLAGS += --libpath=$(prefix)/gxx/lib +SCONS_FLAGS += --extrapath=$(prefix)/gxx,$(prefix) +SCONS_FLAGS += --cxx=$(prefix)/bin/g++ SCONS_FLAGS += --use-system-all SCONS_FLAGS += --extralib=rt,pcre SCONS_FLAGS += --release all -SCONS_ENV = LIBPATH=$(libdir) +SCONS_ENV = LIBPATH=$(prefix)/gxx/lib include gar/category.mk Added: csw/mgar/pkg/mongodb/trunk/files/0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch =================================================================== --- csw/mgar/pkg/mongodb/trunk/files/0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch (rev 0) +++ csw/mgar/pkg/mongodb/trunk/files/0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch 2012-03-11 17:52:15 UTC (rev 17376) @@ -0,0 +1,28 @@ +From 6ea5d8231df11e63384b0236ab4485294ca2f104 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 11 Mar 2012 17:48:51 +0000 +Subject: [PATCH] Hardcode OpenCSW specifics in the Solaris section + +If SConstruct has hardcoded Solaris paths, why not add OpenCSW specific +paths. +--- + SConstruct | 5 +- + shell/mongo_vstudio.cpp | 204 +++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 208 insertions(+), 1 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 2d0c86f..787a81c 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -543,7 +543,10 @@ elif "sunos5" == os.sys.platform: + nix = True + solaris = True + env.Append( CPPDEFINES=[ "__sunos__" ] ) +- env.Append( LIBS=["socket","resolv"] ) ++ env.Append( LIBS=["socket","resolv","rt"] ) ++ env.Append( CPPPATH=[ "/opt/csw/gxx/include", "/opt/csw/include" ] ) ++ env.Append( LIBPATH=[ "/opt/csw/gxx/lib", "/opt/csw/lib" ] ) ++ env.Append( LINKFLAGS=[ "-R/opt/csw/gxx/lib", "-R/opt/csw/lib" ] ) + + elif os.sys.platform.startswith( "freebsd" ): + nix = True This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 11 21:04:46 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 20:04:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17377] csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile Message-ID: Revision: 17377 http://gar.svn.sourceforge.net/gar/?rev=17377&view=rev Author: wahwah Date: 2012-03-11 20:04:46 +0000 (Sun, 11 Mar 2012) Log Message: ----------- spidermonkey/branches/js-1.7: pass the environment variables to gmake Modified Paths: -------------- csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile Modified: csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile =================================================================== --- csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile 2012-03-11 17:52:15 UTC (rev 17376) +++ csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile 2012-03-11 20:04:46 UTC (rev 17377) @@ -63,6 +63,9 @@ CHECKPKG_OVERRIDES_CSWlibjs1-7-0-gxx += binary-architecture-does-not-match-placement|file=opt/csw/gxx/lib/libjs.so.1.7.0|arch_id=18|arch_name=sparcv8+ +BUILD_OPT = 1 +EXTRA_BUILD_EXPORTS = BUILD_OPT + include gar/category.mk post-patch: @@ -86,7 +89,7 @@ build-custom: # Looks like it doesn't work with parallel builds. # $(PARALLELMFLAGS) - cd $(WORKSRC)/src && BUILD_OPT=1 $(MAKE) -f Makefile.ref + cd $(WORKSRC)/src && $(BUILD_ENV) $(MAKE) -f Makefile.ref @$(MAKECOOKIE) install-custom: 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 Mar 11 21:53:10 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 20:53:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[17378] csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile Message-ID: Revision: 17378 http://gar.svn.sourceforge.net/gar/?rev=17378&view=rev Author: wahwah Date: 2012-03-11 20:53:10 +0000 (Sun, 11 Mar 2012) Log Message: ----------- spidermonkey/branches/js-1.7: BUILD_ENV breaks it. Not sure why, but it makes the build system ignore CC and CXX Modified Paths: -------------- csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile Modified: csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile =================================================================== --- csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile 2012-03-11 20:04:46 UTC (rev 17377) +++ csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile 2012-03-11 20:53:10 UTC (rev 17378) @@ -64,7 +64,7 @@ CHECKPKG_OVERRIDES_CSWlibjs1-7-0-gxx += binary-architecture-does-not-match-placement|file=opt/csw/gxx/lib/libjs.so.1.7.0|arch_id=18|arch_name=sparcv8+ BUILD_OPT = 1 -EXTRA_BUILD_EXPORTS = BUILD_OPT +EXTRA_BUILD_EXPORTS = BUILD_OPT CC CXX include gar/category.mk @@ -89,7 +89,15 @@ build-custom: # Looks like it doesn't work with parallel builds. # $(PARALLELMFLAGS) - cd $(WORKSRC)/src && $(BUILD_ENV) $(MAKE) -f Makefile.ref + # This doesn't work. + # $(BUILD_ENV) + cd $(WORKSRC)/src && \ + CC=/opt/csw/bin/gcc \ + CXX=/opt/csw/bin/g++ \ + BUILD_OPT="$(BUILD_OPT)" \ + CFLAGS="-DJS_C_STRINGS_ARE_UTF8" \ + CXXFLAGS="-DJS_C_STRINGS_ARE_UTF8" \ + $(MAKE) -f Makefile.ref @$(MAKECOOKIE) install-custom: 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 Mar 11 22:17:57 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 11 Mar 2012 21:17:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[17379] csw/mgar/pkg/mongodb/trunk/Makefile Message-ID: Revision: 17379 http://gar.svn.sourceforge.net/gar/?rev=17379&view=rev Author: wahwah Date: 2012-03-11 21:17:57 +0000 (Sun, 11 Mar 2012) Log Message: ----------- mongodb/trunk: Add license and dependencies Modified Paths: -------------- csw/mgar/pkg/mongodb/trunk/Makefile Modified: csw/mgar/pkg/mongodb/trunk/Makefile =================================================================== --- csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-11 20:53:10 UTC (rev 17378) +++ csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-11 21:17:57 UTC (rev 17379) @@ -14,6 +14,9 @@ MASTER_SITES = http://fastdl.mongodb.org/src/ DISTNAME = $(NAME)-src-r$(VERSION) DISTFILES = $(DISTNAME).tar.gz + +LICENSE = APACHE-2.0.txt + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = mongo INSTALL_SCRIPTS = mongo @@ -48,6 +51,18 @@ SCONS_ENV = LIBPATH=$(prefix)/gxx/lib +RUNTIME_DEP_PKGS_CSWmongodb += CSWlibboost-filesystem1-49-0-gxx +RUNTIME_DEP_PKGS_CSWmongodb += CSWlibboost-prog-opts1-49-0-gxx +RUNTIME_DEP_PKGS_CSWmongodb += CSWlibboost-system1-49-0-gxx +RUNTIME_DEP_PKGS_CSWmongodb += CSWlibboost-thread1-49-0-gxx +RUNTIME_DEP_PKGS_CSWmongodb += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWmongodb += CSWlibjs1-7-0-gxx +RUNTIME_DEP_PKGS_CSWmongodb += CSWlibpcap1 +RUNTIME_DEP_PKGS_CSWmongodb += CSWlibpcre1-gxx +RUNTIME_DEP_PKGS_CSWmongodb += CSWlibpcrecpp0-gxx +RUNTIME_DEP_PKGS_CSWmongodb += CSWlibsnappy1-gxx +RUNTIME_DEP_PKGS_CSWmongodb += CSWlibstdc++6 + include gar/category.mk build-mongo: 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 Mar 12 09:01:53 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 Mar 2012 08:01:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[17380] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 17380 http://gar.svn.sourceforge.net/gar/?rev=17380&view=rev Author: dmichelsen Date: 2012-03-12 08:01:52 +0000 (Mon, 12 Mar 2012) Log Message: ----------- sudo/trunk: Reenable root sudo due to user request (John Immelman) Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2012-03-11 21:17:57 UTC (rev 17379) +++ csw/mgar/pkg/sudo/trunk/Makefile 2012-03-12 08:01:52 UTC (rev 17380) @@ -90,7 +90,6 @@ CONFIGURE_ARGS += --with-logpath=$(LOGPATH)/sudolog CONFIGURE_ARGS += --with-iologdir=$(IOLOGPATH) CONFIGURE_ARGS += --with-timedir=$(TIMEPATH) -CONFIGURE_ARGS += --disable-root-sudo CONFIGURE_ARGS += --with-project CONFIGURE_ARGS_LDAP-enabled += --with-ldap=$(prefix) 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 Mar 12 09:09:45 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 12 Mar 2012 08:09:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17381] csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile Message-ID: Revision: 17381 http://gar.svn.sourceforge.net/gar/?rev=17381&view=rev Author: wahwah Date: 2012-03-12 08:09:45 +0000 (Mon, 12 Mar 2012) Log Message: ----------- Build with Solaris Studio Accept that the build system ignores CC. Build with Solaris Studio and put the library into /opt/csw/lib. Modified Paths: -------------- csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile Modified: csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile =================================================================== --- csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile 2012-03-12 08:01:52 UTC (rev 17380) +++ csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile 2012-03-12 08:09:45 UTC (rev 17381) @@ -21,9 +21,6 @@ PATCHFILES += 0001-Set-the-SONAME-of-the-shared-library.patch PATCHFILES += 0003-Add-a-x86-configuration-file.patch -prefix = $(BUILD_PREFIX)/gxx -GARCOMPILER = GNU - DISTNAME = js LICENSE = src/README.html @@ -50,18 +47,18 @@ EXTRA_CFLAGS="-DJS_C_STRINGS_ARE_UTF8" EXTRA_CXXFLAGS="-DJS_C_STRINGS_ARE_UTF8" -PACKAGES += CSWlibjs-gxx-dev -SPKG_DESC_CSWlibjs-gxx-dev += $(DESCRIPTION), development files -PKGFILES_CSWlibjs-gxx-dev += $(libdir)/libjs.so -PKGFILES_CSWlibjs-gxx-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibjs-gxx-dev += CSWlibjs1-7-0-gxx +PACKAGES += CSWlibjs-dev +SPKG_DESC_CSWlibjs-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibjs-dev += $(libdir)/libjs.so +PKGFILES_CSWlibjs-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibjs-dev += CSWlibjs1-7-0 -PACKAGES += CSWlibjs1-7-0-gxx -PKGFILES_CSWlibjs1-7-0-gxx += $(call baseisadirs,$(libdir),libjs\.so\.1\.7\.0) -SPKG_DESC_CSWlibjs1-7-0-gxx += $(DESCRIPTION), libjs.so.1.7.0 -RUNTIME_DEP_PKGS_CSWspidermonkey += CSWlibjs1-7-0-gxx +PACKAGES += CSWlibjs1-7-0 +PKGFILES_CSWlibjs1-7-0 += $(call baseisadirs,$(libdir),libjs\.so\.1\.7\.0) +SPKG_DESC_CSWlibjs1-7-0 += $(DESCRIPTION), libjs.so.1.7.0 +RUNTIME_DEP_PKGS_CSWspidermonkey += CSWlibjs1-7-0 -CHECKPKG_OVERRIDES_CSWlibjs1-7-0-gxx += binary-architecture-does-not-match-placement|file=opt/csw/gxx/lib/libjs.so.1.7.0|arch_id=18|arch_name=sparcv8+ +CHECKPKG_OVERRIDES_CSWlibjs1-7-0 += binary-architecture-does-not-match-placement|file=opt/csw/lib/libjs.so.1.7.0|arch_id=18|arch_name=sparcv8+ BUILD_OPT = 1 EXTRA_BUILD_EXPORTS = BUILD_OPT CC CXX 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 Mar 12 09:33:06 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 Mar 2012 08:33:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17382] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 17382 http://gar.svn.sourceforge.net/gar/?rev=17382&view=rev Author: dmichelsen Date: 2012-03-12 08:33:06 +0000 (Mon, 12 Mar 2012) Log Message: ----------- sudo/trunk: Make sudoers 0440 fixing #4919 Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2012-03-12 08:09:45 UTC (rev 17381) +++ csw/mgar/pkg/sudo/trunk/Makefile 2012-03-12 08:33:06 UTC (rev 17382) @@ -115,6 +115,10 @@ PROTOTYPE_USER_iodir = root PROTOTYPE_GROUP_iodir = bin +PROTOTYPE_MODIFIERS += sudoers +PROTOTYPE_FILES_iodir = /etc/opt/csw/sudoers.CSW +PROTOTYPE_PERMS_iodir = 0440 + # Just copy the stuff together, the ldap modulations contains some more file, # apart from that they are the same. MERGE_SCRIPTS_isa-default-ldap-disabled = copy-all 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 Mar 12 10:02:18 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 Mar 2012 09:02:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17383] csw/mgar/pkg/gedit/trunk Message-ID: Revision: 17383 http://gar.svn.sourceforge.net/gar/?rev=17383&view=rev Author: dmichelsen Date: 2012-03-12 09:02:17 +0000 (Mon, 12 Mar 2012) Log Message: ----------- gedit/trunk: Add patch and dependencies Modified Paths: -------------- csw/mgar/pkg/gedit/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gedit/trunk/files/ csw/mgar/pkg/gedit/trunk/files/0001-Patch-from-Phil-to-add-ACCESSPERMS.patch Modified: csw/mgar/pkg/gedit/trunk/Makefile =================================================================== --- csw/mgar/pkg/gedit/trunk/Makefile 2012-03-12 08:33:06 UTC (rev 17382) +++ csw/mgar/pkg/gedit/trunk/Makefile 2012-03-12 09:02:17 UTC (rev 17383) @@ -8,16 +8,42 @@ define BLURB endef -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(DISTNAME).tar.bz2 +# Old patch from Phil +PATCHFILES += 0001-Patch-from-Phil-to-add-ACCESSPERMS.patch + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + PACKAGES += CSWgedit RUNTIME_DEP_PKGS_CSWgedit += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgedit += CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWgedit += CSWperl +RUNTIME_DEP_PKGS_CSWgedit += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgedit += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgedit += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWgedit += CSWlibgconf2-4 +RUNTIME_DEP_PKGS_CSWgedit += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgedit += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgedit += CSWenchant +RUNTIME_DEP_PKGS_CSWgedit += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgedit += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWgedit += CSWgtksourceview +RUNTIME_DEP_PKGS_CSWgedit += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgedit += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgedit += CSWpango +RUNTIME_DEP_PKGS_CSWgedit += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgedit += CSWfconfig +RUNTIME_DEP_PKGS_CSWgedit += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgedit += CSWlibatk1-0-0 +# These are just docs +CHECKPKG_OVERRIDES_CSWgedit += file-with-bad-content|/usr/share|root/opt/csw/share/gtk-doc/html/gedit/gedit-gedit-document.html +CHECKPKG_OVERRIDES_CSWgedit += file-with-bad-content|/usr/share|root/opt/csw/share/gtk-doc/html/gedit/gedit-gedit-view.html +CHECKPKG_OVERRIDES_CSWgedit += file-with-bad-content|/usr/share|root/opt/csw/share/gtk-doc/html/gedit/gedit-gedit-utils.html + +# There is one failing test, probably due to glib issues +SKIPTEST ?= 1 + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/gedit/trunk/files/0001-Patch-from-Phil-to-add-ACCESSPERMS.patch =================================================================== --- csw/mgar/pkg/gedit/trunk/files/0001-Patch-from-Phil-to-add-ACCESSPERMS.patch (rev 0) +++ csw/mgar/pkg/gedit/trunk/files/0001-Patch-from-Phil-to-add-ACCESSPERMS.patch 2012-03-12 09:02:17 UTC (rev 17383) @@ -0,0 +1,28 @@ +From 37c9568e6a474cf7ff1e125613b1a16c139e2074 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 9 Mar 2012 22:38:48 +0100 +Subject: [PATCH] Patch from Phil to add ACCESSPERMS + +--- + tests/document-saver.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/tests/document-saver.c b/tests/document-saver.c +index 9f44d5a..1fcb49c 100644 +--- a/tests/document-saver.c ++++ b/tests/document-saver.c +@@ -27,6 +27,11 @@ + #include + #include + ++/* linux/bsd has it. others such as Solaris, do not */ ++#ifndef ACCESSPERMS ++#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) ++#endif ++ + #define DEFAULT_LOCAL_URI "/tmp/gedit-document-saver-test.txt" + #define DEFAULT_REMOTE_URI "sftp://localhost/tmp/gedit-document-saver-test.txt" + #define DEFAULT_CONTENT "hello world!" +-- +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 Mar 12 10:26:09 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 Mar 2012 09:26:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17384] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 17384 http://gar.svn.sourceforge.net/gar/?rev=17384&view=rev Author: dmichelsen Date: 2012-03-12 09:26:09 +0000 (Mon, 12 Mar 2012) Log Message: ----------- sudo/trunk: Fix sudoers permissions... again. Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2012-03-12 09:02:17 UTC (rev 17383) +++ csw/mgar/pkg/sudo/trunk/Makefile 2012-03-12 09:26:09 UTC (rev 17384) @@ -116,8 +116,8 @@ PROTOTYPE_GROUP_iodir = bin PROTOTYPE_MODIFIERS += sudoers -PROTOTYPE_FILES_iodir = /etc/opt/csw/sudoers.CSW -PROTOTYPE_PERMS_iodir = 0440 +PROTOTYPE_FILES_sudoers = /etc/opt/csw/sudoers.CSW +PROTOTYPE_PERMS_sudoers = 0440 # Just copy the stuff together, the ldap modulations contains some more file, # apart from that they are the same. 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 Mar 12 11:58:49 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 Mar 2012 10:58:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[17385] csw/mgar/pkg/pigz/trunk Message-ID: Revision: 17385 http://gar.svn.sourceforge.net/gar/?rev=17385&view=rev Author: dmichelsen Date: 2012-03-12 10:58:49 +0000 (Mon, 12 Mar 2012) Log Message: ----------- pigz/trunk: Update to 2.2.4 Modified Paths: -------------- csw/mgar/pkg/pigz/trunk/Makefile csw/mgar/pkg/pigz/trunk/checksums Modified: csw/mgar/pkg/pigz/trunk/Makefile =================================================================== --- csw/mgar/pkg/pigz/trunk/Makefile 2012-03-12 09:26:09 UTC (rev 17384) +++ csw/mgar/pkg/pigz/trunk/Makefile 2012-03-12 10:58:49 UTC (rev 17385) @@ -1,5 +1,5 @@ NAME = pigz -VERSION = 2.1.7 +VERSION = 2.2.4 CATEGORIES = utils GARTYPE = v2 @@ -13,7 +13,6 @@ MASTER_SITES = http://www.zlib.net/pigz/ DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTNAME = $(NAME) DISTFILES += pigz-wrapper DISTFILES += unpigz-wrapper Modified: csw/mgar/pkg/pigz/trunk/checksums =================================================================== --- csw/mgar/pkg/pigz/trunk/checksums 2012-03-12 09:26:09 UTC (rev 17384) +++ csw/mgar/pkg/pigz/trunk/checksums 2012-03-12 10:58:49 UTC (rev 17385) @@ -1 +1 @@ -a09e1097fdc05ac0fff763bdb4d2d5e4 pigz-2.1.7.tar.gz +9df2a3c742524446fa4e797c17e8fd85 pigz-2.2.4.tar.gz 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 Mar 12 12:34:11 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Mon, 12 Mar 2012 11:34:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17386] csw/mgar/pkg/pidentd/trunk/Makefile Message-ID: Revision: 17386 http://gar.svn.sourceforge.net/gar/?rev=17386&view=rev Author: wilbury Date: 2012-03-12 11:34:11 +0000 (Mon, 12 Mar 2012) Log Message: ----------- pidentd/trunk: Add -b option to daemon, making it run as standalone Modified Paths: -------------- csw/mgar/pkg/pidentd/trunk/Makefile Modified: csw/mgar/pkg/pidentd/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidentd/trunk/Makefile 2012-03-12 10:58:49 UTC (rev 17385) +++ csw/mgar/pkg/pidentd/trunk/Makefile 2012-03-12 11:34:11 UTC (rev 17386) @@ -64,7 +64,7 @@ REINPLACEMENTS += daemon REINPLACE_MATCH_daemon = /usr/sbin/in.identd -REINPLACE_WITH_daemon = $(sbindir)/identd +REINPLACE_WITH_daemon = $(sbindir)/identd -b REINPLACE_FILES_daemon = etc/identd.xml REINPLACEMENTS += customsmf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 12 16:00:35 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 12 Mar 2012 15:00:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[17387] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 17387 http://gar.svn.sourceforge.net/gar/?rev=17387&view=rev Author: bdwalton Date: 2012-03-12 15:00:35 +0000 (Mon, 12 Mar 2012) Log Message: ----------- php5/trunk: cannot build the apache module and the cgi version at the same time so apxs2 must remain a modulation specific directive Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-03-12 11:34:11 UTC (rev 17386) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-03-12 15:00:35 UTC (rev 17387) @@ -247,7 +247,6 @@ CONFIGURE_ARGS += --with-config-file-scan-dir=$(sysconfdir)/conf.d CONFIGURE_ARGS += --enable-bcmath=shared CONFIGURE_ARGS += --enable-calendar=shared -CONFIGURE_ARGS += --enable-cli CONFIGURE_ARGS += --enable-ctype=shared CONFIGURE_ARGS += --enable-dba=shared CONFIGURE_ARGS += --enable-dom=shared @@ -277,7 +276,6 @@ CONFIGURE_ARGS += --enable-xmlreader=shared CONFIGURE_ARGS += --enable-xmlwriter=shared CONFIGURE_ARGS += --enable-zip=shared -CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs CONFIGURE_ARGS += --with-bz2=shared,$(prefix) CONFIGURE_ARGS += --with-curl=shared,$(prefix) CONFIGURE_ARGS += --with-curlwrappers @@ -328,9 +326,14 @@ CONFIGURE_ARGS += --with-xsl=shared,$(prefix) CONFIGURE_ARGS += --with-zlib-dir=$(prefix) CONFIGURE_ARGS += --with-zlib=$(prefix) +CONFIGURE_ARGS += --enable-cli +ifeq ($(SAPI),ap2) +CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs +endif + # Disable Tests (report submitted to PHP QA) -#SKIPTEST = 1 +SKIPTEST = 1 #ENABLE_CHECK = 0 TEST_TARGET = test 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 Mar 12 22:03:09 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 12 Mar 2012 21:03:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17388] csw/mgar/pkg/mongodb/trunk Message-ID: Revision: 17388 http://gar.svn.sourceforge.net/gar/?rev=17388&view=rev Author: wahwah Date: 2012-03-12 21:03:08 +0000 (Mon, 12 Mar 2012) Log Message: ----------- Work around a library finding problem. Also, update dependencies. Modified Paths: -------------- csw/mgar/pkg/mongodb/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/mongodb/trunk/files/0004-Try-Boost-libs-without-the-mt-suffix-first.patch Modified: csw/mgar/pkg/mongodb/trunk/Makefile =================================================================== --- csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-12 15:00:35 UTC (rev 17387) +++ csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-12 21:03:08 UTC (rev 17388) @@ -26,6 +26,7 @@ PATCHFILES += 0002-library-checking-by-locating-.so-files.patch PATCHFILES += 0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch +PATCHFILES += 0004-Try-Boost-libs-without-the-mt-suffix-first.patch # Depends on V8 which is available on Solaris 10 x86 only. # Can only run on little-endian machines. @@ -35,8 +36,7 @@ BUILD_DEP_PKGS += CSWboost-gcc-dev BUILD_DEP_PKGS += CSWgcc4g++ -# BUILD_DEP_PKGS += CSWlibmozjs185-gxx-dev -BUILD_DEP_PKGS += CSWlibjs-gxx-dev +BUILD_DEP_PKGS += CSWlibjs-dev BUILD_DEP_PKGS += CSWlibpcap-dev BUILD_DEP_PKGS += CSWlibpcre-gxx-dev BUILD_DEP_PKGS += CSWscons @@ -44,7 +44,7 @@ SCONS_FLAGS += --libpath=$(prefix)/gxx/lib SCONS_FLAGS += --extrapath=$(prefix)/gxx,$(prefix) -SCONS_FLAGS += --cxx=$(prefix)/bin/g++ +SCONS_FLAGS += --cxx=$(CXX) SCONS_FLAGS += --use-system-all SCONS_FLAGS += --extralib=rt,pcre SCONS_FLAGS += --release all @@ -56,7 +56,7 @@ RUNTIME_DEP_PKGS_CSWmongodb += CSWlibboost-system1-49-0-gxx RUNTIME_DEP_PKGS_CSWmongodb += CSWlibboost-thread1-49-0-gxx RUNTIME_DEP_PKGS_CSWmongodb += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWmongodb += CSWlibjs1-7-0-gxx +RUNTIME_DEP_PKGS_CSWmongodb += CSWlibjs1-7-0 RUNTIME_DEP_PKGS_CSWmongodb += CSWlibpcap1 RUNTIME_DEP_PKGS_CSWmongodb += CSWlibpcre1-gxx RUNTIME_DEP_PKGS_CSWmongodb += CSWlibpcrecpp0-gxx Added: csw/mgar/pkg/mongodb/trunk/files/0004-Try-Boost-libs-without-the-mt-suffix-first.patch =================================================================== --- csw/mgar/pkg/mongodb/trunk/files/0004-Try-Boost-libs-without-the-mt-suffix-first.patch (rev 0) +++ csw/mgar/pkg/mongodb/trunk/files/0004-Try-Boost-libs-without-the-mt-suffix-first.patch 2012-03-12 21:03:08 UTC (rev 17388) @@ -0,0 +1,34 @@ +From 7b0401af0182b887a7070ce4efbb3e7acd9ab9c4 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 12 Mar 2012 19:10:49 +0100 +Subject: [PATCH] Try Boost libs without the mt suffix first + +--- + SConstruct | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 787a81c..db429ee 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -945,13 +945,13 @@ def doConfigure( myenv , shell=False ): + print( "WARNING: old version of boost - you should consider upgrading" ) + + # this will add it if it exists and works +- myCheckLib( [ "boost_system" + boostCompiler + "-mt" + boostVersion , +- "boost_system" + boostCompiler + boostVersion ] ) ++ myCheckLib( [ "boost_system" + boostCompiler + boostVersion , ++ "boost_system" + boostCompiler + "-mt" + boostVersion ] ) + + for b in boostLibs: + l = "boost_" + b +- myCheckLib( [ l + boostCompiler + "-mt" + boostVersion , +- l + boostCompiler + boostVersion ] , ++ myCheckLib( [ l + boostCompiler + boostVersion , ++ l + boostCompiler + "-mt" + boostVersion ] , + release or not shell) + + if not conf.CheckCXXHeader( "execinfo.h" ): +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 12 23:26:08 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 12 Mar 2012 22:26:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17389] csw/mgar/pkg/mongodb/trunk/files/ 0001-Disabling-the-libstdc-check.patch Message-ID: Revision: 17389 http://gar.svn.sourceforge.net/gar/?rev=17389&view=rev Author: wahwah Date: 2012-03-12 22:26:08 +0000 (Mon, 12 Mar 2012) Log Message: ----------- mongodb: Removing an unnecessary patch Removed Paths: ------------- csw/mgar/pkg/mongodb/trunk/files/0001-Disabling-the-libstdc-check.patch Deleted: csw/mgar/pkg/mongodb/trunk/files/0001-Disabling-the-libstdc-check.patch =================================================================== --- csw/mgar/pkg/mongodb/trunk/files/0001-Disabling-the-libstdc-check.patch 2012-03-12 21:03:08 UTC (rev 17388) +++ csw/mgar/pkg/mongodb/trunk/files/0001-Disabling-the-libstdc-check.patch 2012-03-12 22:26:08 UTC (rev 17389) @@ -1,42 +0,0 @@ -From a13b7d40da0c25087c2054d8fd02a27a334bfd2b Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Tue, 19 Oct 2010 01:33:35 +0200 -Subject: [PATCH] Disabling the libstdc++ check - ---- - SConstruct | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/SConstruct b/SConstruct -index e3046ff..0feedc0 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -309,7 +309,8 @@ usePCH = not GetOption( "usePCH" ) is None - - justClientLib = (COMMAND_LINE_TARGETS == ['mongoclient']) - --env = Environment( MSVS_ARCH=msarch , tools = ["default", "gch"], toolpath = '.' ) -+env = Environment( MSVS_ARCH=msarch , tools = ["default", "gch"], toolpath = '.', -+ CPPPATH = ['/opt/csw/include', '/opt/csw/include/boost']) - if GetOption( "cxx" ) is not None: - env["CC"] = GetOption( "cxx" ) - env["CXX"] = GetOption( "cxx" ) -@@ -858,10 +859,11 @@ def doConfigure( myenv , needPcre=True , shell=False ): - print( "c++ compiler not installed!" ) - Exit(1) - -- if nix and not shell: -- if not conf.CheckLib( "stdc++" ): -- print( "can't find stdc++ library which is needed" ); -- Exit(1) -+ # libstdc++ is not necessary when compiling with Sun Studio -+ # if nix and not shell: -+ # if not conf.CheckLib( "stdc++" ): -+ # print( "can't find stdc++ library which is needed" ); -+ # Exit(1) - - def myCheckLib( poss , failIfNotFound=False , staticOnly=False): - --- -1.7.3 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Mar 13 00:36:57 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 12 Mar 2012 23:36:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[17390] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 17390 http://gar.svn.sourceforge.net/gar/?rev=17390&view=rev Author: bdwalton Date: 2012-03-12 23:36:56 +0000 (Mon, 12 Mar 2012) Log Message: ----------- php5/trunk: no need to have a .bak file when fixing the php.ini file Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-03-12 22:26:08 UTC (rev 17389) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-03-12 23:36:56 UTC (rev 17390) @@ -372,5 +372,5 @@ @(rm $(PKGROOT)/opt/csw/php5/extensions/phar) @echo " ==> Fixing php.ini: adding loadable session.so support" @( cd $(PKGROOT)/$(sysconfdir)/; \ - perl -pi.bak -e 's/extension=bz2.so/extension=session.so\n;extension=bz2.so/' php.ini.CSW; ) + perl -pi -e 's/extension=bz2.so/extension=session.so\n;extension=bz2.so/' php.ini.CSW; ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 13 09:06:09 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 13 Mar 2012 08:06:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17391] csw/mgar/pkg/postfix/trunk/Makefile Message-ID: Revision: 17391 http://gar.svn.sourceforge.net/gar/?rev=17391&view=rev Author: wahwah Date: 2012-03-13 08:06:08 +0000 (Tue, 13 Mar 2012) Log Message: ----------- postfix/trunk: switch to bdb48, update deps Modified Paths: -------------- csw/mgar/pkg/postfix/trunk/Makefile Modified: csw/mgar/pkg/postfix/trunk/Makefile =================================================================== --- csw/mgar/pkg/postfix/trunk/Makefile 2012-03-12 23:36:56 UTC (rev 17390) +++ csw/mgar/pkg/postfix/trunk/Makefile 2012-03-13 08:06:08 UTC (rev 17391) @@ -173,7 +173,7 @@ FEATURES += -DHAS_PCRE AUXLIBS += -lpcre BUILD_DEP_PKGS += CSWlibpcre-dev -RUNTIME_DEP_PKGS += CSWlibpcre0 +RUNTIME_DEP_PKGS += CSWlibpcre1 # Activate support for hash and btree lookup tables # http://www.postfix.org/DB_README.html. !! Takeaway: Use same DB as SASL !! @@ -182,32 +182,33 @@ # the SASL library, or Postfix itself ends up using the wrong version." # FEATURES += -DHAS_DB -INCLUDES += -I/opt/csw/bdb42/include -AUXLIBS += -L/opt/csw/bdb42/lib -R/opt/csw/bdb42/lib -ldb-4.2 -BUILD_DEP_PKGS += CSWbdb42devel -RUNTIME_DEP_PKGS += CSWbdb42 +INCLUDES += -I/opt/csw/bdb48/include +AUXLIBS += -L/opt/csw/bdb48/lib -R/opt/csw/bdb48/lib -ldb-4.8 +BUILD_DEP_PKGS += CSWbdb48devel +RUNTIME_DEP_PKGS += CSWbdb48 # Activate support for SSL/TLS # http://www.postfix.org/TLS_README.html FEATURES += -DUSE_TLS AUXLIBS += -lssl -lcrypto -BUILD_DEP_PKGS += CSWossldevel -RUNTIME_DEP_PKGS += CSWosslrt +BUILD_DEP_PKGS += CSWlibssl-dev +RUNTIME_DEP_PKGS += CSWlibssl0-9-8 # Activate support for Cyrus SASL (dovecot is incl. automatically) # http://www.postfix.org/SASL_README.html FEATURES += -DUSE_SASL_AUTH -DUSE_CYRUS_SASL INCLUDES += -I/opt/csw/include/sasl/ AUXLIBS += -lsasl2 -BUILD_DEP_PKGS += CSWsasl -RUNTIME_DEP_PKGS += CSWsasl +BUILD_DEP_PKGS += CSWsasl-dev +RUNTIME_DEP_PKGS += CSWlibsasl2-2 # Activate support for OpenLDAP # http://www.postfix.org/LDAP_README.html FEATURES += -DHAS_LDAP AUXLIBS += -lldap -llber -BUILD_DEP_PKGS += CSWoldapdevel -RUNTIME_DEP_PKGS += CSWoldaprt +BUILD_DEP_PKGS += CSWopenldap-dev +RUNTIME_DEP_PKGS += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS += CSWliblber2-4-2 # Activate support for MySQL # http://www.postfix.org/MYSQL_README.html @@ -225,7 +226,7 @@ AUXLIBS += -L/opt/csw/postgresql/lib/ -R/opt/csw/postgresql/lib/ AUXLIBS += -lpq BUILD_DEP_PKGS += CSWlibpq -RUNTIME_DEP_PKGS += CSWlibpq +RUNTIME_DEP_PKGS += CSWlibpq5 endif # Postgres package outdated, libs aren't located below /opt/csw/lib/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 13 09:55:13 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 13 Mar 2012 08:55:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[17392] csw/mgar/pkg/mongodb/trunk Message-ID: Revision: 17392 http://gar.svn.sourceforge.net/gar/?rev=17392&view=rev Author: wahwah Date: 2012-03-13 08:55:13 +0000 (Tue, 13 Mar 2012) Log Message: ----------- mongodb/trunk: add a startup script Modified Paths: -------------- csw/mgar/pkg/mongodb/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/mongodb/trunk/files/cswusergroup csw/mgar/pkg/mongodb/trunk/files/mongodb-smf-cas-trigger csw/mgar/pkg/mongodb/trunk/files/mongodb.conf csw/mgar/pkg/mongodb/trunk/files/mongodb.xml Modified: csw/mgar/pkg/mongodb/trunk/Makefile =================================================================== --- csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-13 08:06:08 UTC (rev 17391) +++ csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-13 08:55:13 UTC (rev 17392) @@ -63,6 +63,16 @@ RUNTIME_DEP_PKGS_CSWmongodb += CSWlibsnappy1-gxx RUNTIME_DEP_PKGS_CSWmongodb += CSWlibstdc++6 +PRESERVECONF = $(sysconfdir)/mongodb.conf + +PROTOTYPE_MODIFIERS = datadir +PROTOTYPE_FILES_datadir = $(localstatedir)/mongodb +PROTOTYPE_PERMS_datadir = 0700 +PROTOTYPE_USER_datadir = mongo +PROTOTYPE_CLASS_datadir = ugfiles + +USERGROUP = $(sysconfdir)/pkg/CSW$(NAME)/cswusergroup + include gar/category.mk build-mongo: @@ -79,4 +89,15 @@ $(SCONS_FLAGS) \ -Q --prefix=$(DESTDIR)$(BUILD_PREFIX) \ install) + ginstall -m 755 -d $(DESTDIR)$(sysconfdir) + ginstall -m 644 $(FILEDIR)/mongodb.conf $(DESTDIR)$(sysconfdir)/mongodb.conf + ginstall -m 700 -d $(DESTDIR)$(localstatedir)/mongodb + ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/pkg/CSW$(NAME) + ginstall -m 644 $(FILEDIR)/cswusergroup \ + $(DESTDIR)$(sysconfdir)/pkg/CSW$(NAME) + ginstall -m 644 $(FILEDIR)/mongodb.xml \ + $(DESTDIR)$(sysconfdir)/pkg/CSW$(NAME) + ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 644 $(FILEDIR)/mongodb-smf-cas-trigger \ + $(DESTDIR)$(sysconfdir)/init.d/mongodb @$(MAKECOOKIE) Added: csw/mgar/pkg/mongodb/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/mongodb/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/mongodb/trunk/files/cswusergroup 2012-03-13 08:55:13 UTC (rev 17392) @@ -0,0 +1 @@ +mongo:mongo:MongoDB database user:/var/opt/csw/mongodb:/bin/false:: Added: csw/mgar/pkg/mongodb/trunk/files/mongodb-smf-cas-trigger =================================================================== --- csw/mgar/pkg/mongodb/trunk/files/mongodb-smf-cas-trigger (rev 0) +++ csw/mgar/pkg/mongodb/trunk/files/mongodb-smf-cas-trigger 2012-03-13 08:55:13 UTC (rev 17392) @@ -0,0 +1 @@ +#MANIFEST /etc/opt/csw/pkg/CSWmongodb/mongodb.xml Added: csw/mgar/pkg/mongodb/trunk/files/mongodb.conf =================================================================== --- csw/mgar/pkg/mongodb/trunk/files/mongodb.conf (rev 0) +++ csw/mgar/pkg/mongodb/trunk/files/mongodb.conf 2012-03-13 08:55:13 UTC (rev 17392) @@ -0,0 +1,6 @@ +# This is an example config file for MongoDB. +dbpath = /var/opt/csw/mongodb +bind_ip = 127.0.0.1 +noauth = true # use 'true' for options that don't take an argument +verbose = true # to disable, comment out. +ipv6 = false Added: csw/mgar/pkg/mongodb/trunk/files/mongodb.xml =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/mongodb/trunk/files/mongodb.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 wahwah at users.sourceforge.net Tue Mar 13 10:13:41 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 13 Mar 2012 09:13:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[17393] csw/mgar/pkg/mongodb/trunk/Makefile Message-ID: Revision: 17393 http://gar.svn.sourceforge.net/gar/?rev=17393&view=rev Author: wahwah Date: 2012-03-13 09:13:40 +0000 (Tue, 13 Mar 2012) Log Message: ----------- mongodb/trunk: Add INITSMF Modified Paths: -------------- csw/mgar/pkg/mongodb/trunk/Makefile Modified: csw/mgar/pkg/mongodb/trunk/Makefile =================================================================== --- csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-13 08:55:13 UTC (rev 17392) +++ csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-13 09:13:40 UTC (rev 17393) @@ -72,6 +72,7 @@ PROTOTYPE_CLASS_datadir = ugfiles USERGROUP = $(sysconfdir)/pkg/CSW$(NAME)/cswusergroup +INITSMF = $(sysconfdir)/init.d/mongodb include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 13 10:25:45 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 13 Mar 2012 09:25:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17394] csw/mgar/pkg/mongodb/trunk/files/mongodb.xml Message-ID: Revision: 17394 http://gar.svn.sourceforge.net/gar/?rev=17394&view=rev Author: wahwah Date: 2012-03-13 09:25:44 +0000 (Tue, 13 Mar 2012) Log Message: ----------- mongodb/trunk: fixes for the manifest Modified Paths: -------------- csw/mgar/pkg/mongodb/trunk/files/mongodb.xml Modified: csw/mgar/pkg/mongodb/trunk/files/mongodb.xml =================================================================== (Binary files differ) 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 Mar 13 10:28:21 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 13 Mar 2012 09:28:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17395] csw/mgar/pkg/mongodb/trunk/files/mongodb.conf Message-ID: Revision: 17395 http://gar.svn.sourceforge.net/gar/?rev=17395&view=rev Author: wahwah Date: 2012-03-13 09:28:21 +0000 (Tue, 13 Mar 2012) Log Message: ----------- mongodb/trunk: by default, listen on external interfaces too Modified Paths: -------------- csw/mgar/pkg/mongodb/trunk/files/mongodb.conf Modified: csw/mgar/pkg/mongodb/trunk/files/mongodb.conf =================================================================== --- csw/mgar/pkg/mongodb/trunk/files/mongodb.conf 2012-03-13 09:25:44 UTC (rev 17394) +++ csw/mgar/pkg/mongodb/trunk/files/mongodb.conf 2012-03-13 09:28:21 UTC (rev 17395) @@ -1,6 +1,9 @@ # This is an example config file for MongoDB. +# to disable, comment out. +# use 'true' for options that don't take an argument +# verbose = true +# bind_ip = 127.0.0.1 + dbpath = /var/opt/csw/mongodb -bind_ip = 127.0.0.1 -noauth = true # use 'true' for options that don't take an argument -verbose = true # to disable, comment out. +noauth = true ipv6 = false 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 Mar 13 10:48:35 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 13 Mar 2012 09:48:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[17396] csw/mgar/pkg/mongodb/trunk/Makefile Message-ID: Revision: 17396 http://gar.svn.sourceforge.net/gar/?rev=17396&view=rev Author: wahwah Date: 2012-03-13 09:48:35 +0000 (Tue, 13 Mar 2012) Log Message: ----------- mongodb/trunk: The DTD triggers the bad content error. Modified Paths: -------------- csw/mgar/pkg/mongodb/trunk/Makefile Modified: csw/mgar/pkg/mongodb/trunk/Makefile =================================================================== --- csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-13 09:28:21 UTC (rev 17395) +++ csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-13 09:48:35 UTC (rev 17396) @@ -74,6 +74,9 @@ USERGROUP = $(sysconfdir)/pkg/CSW$(NAME)/cswusergroup INITSMF = $(sysconfdir)/init.d/mongodb +# The DTD triggers the error tag. +CHECKPKG_OVERRIDES_CSWmongodb += file-with-bad-content|/usr/share|root/etc/opt/csw/pkg/CSWmongodb/mongodb.xml + include gar/category.mk build-mongo: 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 Mar 13 12:15:35 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 13 Mar 2012 11:15:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[17397] csw/mgar/pkg/mongodb/trunk/files/mongodb.conf Message-ID: Revision: 17397 http://gar.svn.sourceforge.net/gar/?rev=17397&view=rev Author: wahwah Date: 2012-03-13 11:15:34 +0000 (Tue, 13 Mar 2012) Log Message: ----------- mongodb/trunk: Don't listen on external interfaces by default. Modified Paths: -------------- csw/mgar/pkg/mongodb/trunk/files/mongodb.conf Modified: csw/mgar/pkg/mongodb/trunk/files/mongodb.conf =================================================================== --- csw/mgar/pkg/mongodb/trunk/files/mongodb.conf 2012-03-13 09:48:35 UTC (rev 17396) +++ csw/mgar/pkg/mongodb/trunk/files/mongodb.conf 2012-03-13 11:15:34 UTC (rev 17397) @@ -2,8 +2,11 @@ # to disable, comment out. # use 'true' for options that don't take an argument # verbose = true -# bind_ip = 127.0.0.1 +# Listen only on localhost. Comment it out to make mongodb listen on external +# interfaces. +bind_ip = 127.0.0.1 + dbpath = /var/opt/csw/mongodb noauth = true ipv6 = false 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 Mar 13 14:59:26 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Mar 2012 13:59:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[17398] csw/mgar/pkg/manifold/trunk/Makefile Message-ID: Revision: 17398 http://gar.svn.sourceforge.net/gar/?rev=17398&view=rev Author: dmichelsen Date: 2012-03-13 13:59:25 +0000 (Tue, 13 Mar 2012) Log Message: ----------- manifold/trunk: Add dependency reported in #4920 Modified Paths: -------------- csw/mgar/pkg/manifold/trunk/Makefile Modified: csw/mgar/pkg/manifold/trunk/Makefile =================================================================== --- csw/mgar/pkg/manifold/trunk/Makefile 2012-03-13 11:15:34 UTC (rev 17397) +++ csw/mgar/pkg/manifold/trunk/Makefile 2012-03-13 13:59:25 UTC (rev 17398) @@ -22,6 +22,9 @@ # Python dependencies cannot be detected by checkpkg RUNTIME_DEP_PKGS_CSWmanifold += CSWgenshi CHECKPKG_OVERRIDES_CSWmanifold += surplus-dependency|CSWgenshi +# As reported in https://www.opencsw.org/mantis/view.php?id=4920 +RUNTIME_DEP_PKGS_CSWmanifold += CSWpysetuptools +CHECKPKG_OVERRIDES_CSWmanifold += surplus-dependency|CSWpysetuptools # That is the URL of the DTD to check against CHECKPKG_OVERRIDES_CSWmanifold += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/manifold/manifold.py 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 Mar 13 23:23:58 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 13 Mar 2012 22:23:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[17399] csw/mgar/pkg/lang-python Message-ID: Revision: 17399 http://gar.svn.sourceforge.net/gar/?rev=17399&view=rev Author: wahwah Date: 2012-03-13 22:23:58 +0000 (Tue, 13 Mar 2012) Log Message: ----------- mongodb: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/pymongo/trunk/Makefile csw/mgar/pkg/lang-python/pymongo/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/pymongo/ Modified: csw/mgar/pkg/lang-python/pymongo/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-gflags/trunk/Makefile 2012-03-10 23:42:53 UTC (rev 17354) +++ csw/mgar/pkg/lang-python/pymongo/trunk/Makefile 2012-03-13 22:23:58 UTC (rev 17399) @@ -2,24 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = python-gflags -VERSION = 1.3 +NAME = pymongo +VERSION = 2.1.1 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = python equivalent of google-gflags, a Google commandline flag implementation +DESCRIPTION = Python driver for MongoDB define BLURB - This project is the python equivalent of google-gflags, a Google commandline - flag implementation for C++. It is intended to be used in situations where a - project wants to mimic the command-line flag handling of a C++ app that uses - google-gflags, or for a Python app that, via swig or some other means, is - linked with a C++ app that uses google-gflags. endef -SPKG_SOURCEURL = http://code.google.com/p/python-gflags/ -MASTER_SITES = $(GOOGLE_MIRROR) -DISTNAME = $(NAME)-$(VERSION) -DISTFILES = $(DISTNAME).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWpy-gflags -CATALOGNAME = py_gflags -ARCHALL_CSWpy-gflags = 1 +TEST_SCRIPTS = +DISTFILES = $(DISTNAME).tar.gz +PACKAGES = CSWpy-mongo include gar/category.mk Modified: csw/mgar/pkg/lang-python/pymongo/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-gflags/trunk/checksums 2012-03-10 23:42:53 UTC (rev 17354) +++ csw/mgar/pkg/lang-python/pymongo/trunk/checksums 2012-03-13 22:23:58 UTC (rev 17399) @@ -1 +1 @@ -791a93cfbcea94e35576865c9c1e8ee3 python-gflags-1.3.tar.gz +fa0e171cf2538b77215ccff4f4126edd pymongo-2.1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 13 23:27:54 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 13 Mar 2012 22:27:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17400] csw/mgar/pkg/lang-python/pymongo/trunk/Makefile Message-ID: Revision: 17400 http://gar.svn.sourceforge.net/gar/?rev=17400&view=rev Author: wahwah Date: 2012-03-13 22:27:54 +0000 (Tue, 13 Mar 2012) Log Message: ----------- on x86, a C module is available Modified Paths: -------------- csw/mgar/pkg/lang-python/pymongo/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pymongo/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pymongo/trunk/Makefile 2012-03-13 22:23:58 UTC (rev 17399) +++ csw/mgar/pkg/lang-python/pymongo/trunk/Makefile 2012-03-13 22:27:54 UTC (rev 17400) @@ -12,4 +12,6 @@ TEST_SCRIPTS = DISTFILES = $(DISTNAME).tar.gz PACKAGES = CSWpy-mongo +RUNTIME_DEP_PKGS_CSWpy-mongo_i386 += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-mongo += $(RUNTIME_DEP_PKGS_CSWpy-mongo_$(GARCH)) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at opencsw.org Wed Mar 14 10:50:52 2012 From: bonivart at opencsw.org (Peter Bonivart) Date: Wed, 14 Mar 2012 10:50:52 +0100 Subject: [csw-devel] SF.net SVN: gar:[17391] csw/mgar/pkg/postfix/trunk/Makefile In-Reply-To: References: Message-ID: On Tue, Mar 13, 2012 at 9:06 AM, wrote: > Revision: 17391 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=17391&view=rev > Author: ? wahwah > Date: ? ? 2012-03-13 08:06:08 +0000 (Tue, 13 Mar 2012) > Log Message: > ----------- > postfix/trunk: switch to bdb48, update deps Didn't you get collisions with Sendmail? I got collisions with Postfix when I updated Sendmail and implemented alternatives, I also contacted Sebastian about doing the same in Postfix. # Some files collide with CSWpostfix ALTERNATIVES_CSWsendmail = sendmail ALTERNATIVE_sendmail = $(bindir)/mailq sendmail $(bindir)/mailq.sendmail 100 ALTERNATIVE_sendmail += $(bindir)/newaliases newaliases $(bindir)/newaliases.sendmail ALTERNATIVE_sendmail += $(mandir)/man1/mailq.1 mailq.1 $(mandir)/man1/mailq1.1.sendmail ALTERNATIVE_sendmail += $(mandir)/man1/newaliases.1 newaliases.1 $(mandir)/man1/newaliases.1.sendmail ALTERNATIVE_sendmail += $(mandir)/man5/aliases.5 aliases.5 $(mandir)/man5/aliases.5.sendmail /peter From wahwah at users.sourceforge.net Wed Mar 14 11:16:23 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 14 Mar 2012 10:16:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17401] csw/mgar/pkg/qt4-gcc/trunk Message-ID: Revision: 17401 http://gar.svn.sourceforge.net/gar/?rev=17401&view=rev Author: wahwah Date: 2012-03-14 10:16:23 +0000 (Wed, 14 Mar 2012) Log Message: ----------- qt4-gcc/trunk: work in progress Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile csw/mgar/pkg/qt4-gcc/trunk/checksums Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-03-13 22:27:54 UTC (rev 17400) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-03-14 10:16:23 UTC (rev 17401) @@ -1,6 +1,8 @@ +# $Id$ + NAME = qt -VERSION = 4.3.2 -GARTYPE = v1 +VERSION = 4.8.0 +GARTYPE = v2 CATEGORIES = lib DESCRIPTION = TrollTech C++ application framework @@ -9,28 +11,120 @@ development and internationalization. endef +prefix = $(BUILD_PREFIX)/gxx GARCOMPILER = GNU -MASTER_SITES = ftp://ftp.trolltech.com/qt/source/ -DISTNAME = qt-x11-opensource-src-$(VERSION) +MASTER_SITES = http://get.qt.nokia.com/qt/source/ +DISTNAME = qt-everywhere-opensource-src-$(VERSION) DISTFILES = $(DISTNAME).tar.gz -#DISTFILES += $(call admfiles,CSWqt4gcc,depend prototype) -DISTFILES += $(call admfiles,CSWqt4gcc,) -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = qt-x11-opensource-src-(\d+(?:\.\d+)*).tar.gz +LICENSE = README -#TMP_DIRPATHS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) --bindir=$(bindir -#) --sbindir=$(sbindir) --libexecdir=$(libexecdir) --datadir=$(datadir) --sysconf -#dir=$(sysconfdir) --sharedstatedir=$(sharedstatedir) --localstatedir=$(localstat -#edir) --libdir=$(libdir) --infodir=$(infodir) --lispdir=$(lispdir) --includedir= -$(includedir) --mandir=$(mandir) +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -CONFIGURE_ARGS = -platform solaris-g++ -confirm-license -prefix $(prefix) #-bindir=$(bindir) -libdir=$(libdir) -docdir= +# http://wiki.opencsw.org/porting-faq#toc9 +EXTRA_CFLAGS = -DSUN_OGL_NO_VERTEX_MACROS +EXTRA_CXXFLAGS = -DSUN_OGL_NO_VERTEX_MACROS -#CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += -platform solaris-g++ +CONFIGURE_ARGS += -opensource +CONFIGURE_ARGS += -prefix $(prefix) +CONFIGURE_ARGS += -no-qt3support +CONFIGURE_ARGS += -webkit +CONFIGURE_ARGS_sparc += -big-endian -host-big-endian +CONFIGURE_ARGS_i386 += -little-endian -host-big-endian +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) -# lyx doesn't have a test target -TEST_TARGET = +# TEST_TARGET = +INSTALL_ROOT = $(DESTDIR) +EXTRA_INSTALL_EXPORTS = INSTALL_ROOT + +PACKAGES += CSWqt4-gxx-dev +SPKG_DESC_CSWqt4-gxx-dev += $(DESCRIPTION), development files +PKGFILES_CSWqt4-gxx-dev += $(PKGFILES_DEVEL) + +PACKAGES += CSWqt4-gxx-doc +SPKG_DESC_CSWqt4-gxx-doc += $(DESCRIPTION), documentation +# Catch-all + +PACKGES += CSWlibqtgui4-gxx +PKGFILES_CSWlibqtgui4-gxx += $(call baseisadirs,$(libdir),libQtGui\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtgui4-gxx += $(DESCRIPTION), libQtGui.so.4 + +PACKAGES += CSWlibqthelp4-gxx +PKGFILES_CSWlibqthelp4-gxx += $(call baseisadirs,$(libdir),libQtHelp\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqthelp4-gxx += $(DESCRIPTION), libQtHelp.so.4 + +PACKAGES += CSWlibqtmultimedia4-gxx +PKGFILES_CSWlibqtmultimedia4-gxx += $(call baseisadirs,$(libdir),libQtMultimedia\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtmultimedia4-gxx += $(DESCRIPTION), libQtMultimedia.so.4 + +PACKAGES += CSWlibqtnetwork4-gxx +PKGFILES_CSWlibqtnetwork4-gxx += $(call baseisadirs,$(libdir),libQtNetwork\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtnetwork4-gxx += $(DESCRIPTION), libQtNetwork.so.4 + +PACKAGES += CSWlibqtopengl4-gxx +PKGFILES_CSWlibqtopengl4-gxx += $(call baseisadirs,$(libdir),libQtOpenGL\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtopengl4-gxx += $(DESCRIPTION), libQtOpenGL.so.4 + +PACKAGES += CSWlibqtscript4-gxx +PKGFILES_CSWlibqtscript4-gxx += $(call baseisadirs,$(libdir),libQtScript\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtscript4-gxx += $(DESCRIPTION), libQtScript.so.4 + +PACKAGES += CSWlibqtscripttools4-gxx +PKGFILES_CSWlibqtscripttools4-gxx += $(call baseisadirs,$(libdir),libQtScriptTools\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtscripttools4-gxx += $(DESCRIPTION), libQtScriptTools.so.4 + +PACKAGES += CSWlibqtsql4-gxx +PKGFILES_CSWlibqtsql4-gxx += $(call baseisadirs,$(libdir),libQtSql\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtsql4-gxx += $(DESCRIPTION), libQtSql.so.4 + +PACKAGES += CSWlibqtsvg4-gxx +PKGFILES_CSWlibqtsvg4-gxx += $(call baseisadirs,$(libdir),libQtSvg\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtsvg4-gxx += $(DESCRIPTION), libQtSvg.so.4 + +PACKAGES += CSWlibqttest4-gxx +PKGFILES_CSWlibqttest4-gxx += $(call baseisadirs,$(libdir),libQtTest\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqttest4-gxx += $(DESCRIPTION), libQtTest.so.4 + +PACKAGES += CSWlibphonon4-gxx +PKGFILES_CSWlibphonon4-gxx += $(call baseisadirs,$(libdir),libphonon\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibphonon4-gxx += $(DESCRIPTION), libphonon.so.4 + +PACKAGES += CSWlibqtclucene4-gxx +PKGFILES_CSWlibqtclucene4-gxx += $(call baseisadirs,$(libdir),libQtCLucene\.so\.4\.8\.0) +SPKG_DESC_CSWlibqtclucene4-gxx += $(DESCRIPTION), libQtCLucene.so.4 + +PACKAGES += CSWlibqtcore4-gxx +PKGFILES_CSWlibqtcore4-gxx += $(call baseisadirs,$(libdir),libQtCore\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtcore4-gxx += $(DESCRIPTION), libQtCore.so.4 + +PACKAGES += CSWlibqtdbus4-gxx +PKGFILES_CSWlibqtdbus4-gxx += $(call baseisadirs,$(libdir),libQtDBus\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtdbus4-gxx += $(DESCRIPTION), libQtDBus.so.4 + +PACKAGES += CSWlibqtdeclarative4-gxx +PKGFILES_CSWlibqtdeclarative4-gxx += $(call baseisadirs,$(libdir),libQtDeclarative\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtdeclarative4-gxx += $(DESCRIPTION), libQtDeclarative.so.4 + +PACKAGES += CSWlibqtdesigner4-gxx +PKGFILES_CSWlibqtdesigner4-gxx += $(call baseisadirs,$(libdir),libQtDesigner\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtdesigner4-gxx += $(DESCRIPTION), libQtDesigner.so.4 + +PACKAGES += CSWlibqtdesignercomponents4-gxx +PKGFILES_CSWlibqtdesignercomponents4-gxx += $(call baseisadirs,$(libdir),libQtDesignerComponents\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtdesignercomponents4-gxx += $(DESCRIPTION), libQtDesignerComponents.so.4 + +PACKAGES += CSWlibqtgui4-gxx +PKGFILES_CSWlibqtgui4-gxx += $(call baseisadirs,$(libdir),libQtGui\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtgui4-gxx += $(DESCRIPTION), libQtGui.so.4 + +PACKAGES += CSWlibqtxml4-gxx +PKGFILES_CSWlibqtxml4-gxx += $(call baseisadirs,$(libdir),libQtXml\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtxml4-gxx += $(DESCRIPTION), libQtXml.so.4 + +# These are code examples. +CHECKPKG_OVERRIDES_CSWqt4-gxx-doc += binary-architecture-does-not-match-placement + include gar/category.mk Modified: csw/mgar/pkg/qt4-gcc/trunk/checksums =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/checksums 2012-03-13 22:27:54 UTC (rev 17400) +++ csw/mgar/pkg/qt4-gcc/trunk/checksums 2012-03-14 10:16:23 UTC (rev 17401) @@ -1,3 +1 @@ -a60490b36099bdd10c4d2f55430075b3 download/qt-x11-opensource-src-4.3.2.tar.gz -c2286487b7a6d8f3a0b3a6f34eae20e5 download/CSWqt4gcc.gspec -d41d8cd98f00b204e9800998ecf8427e files/CSWqt4gcc.depend +e8a5fdbeba2927c948d9f477a6abe904 qt-everywhere-opensource-src-4.8.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Mar 14 15:48:08 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 14 Mar 2012 14:48:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17402] csw/mgar/pkg Message-ID: Revision: 17402 http://gar.svn.sourceforge.net/gar/?rev=17402&view=rev Author: dmichelsen Date: 2012-03-14 14:48:08 +0000 (Wed, 14 Mar 2012) Log Message: ----------- redis/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/redis/ csw/mgar/pkg/redis/Makefile csw/mgar/pkg/redis/branches/ csw/mgar/pkg/redis/tags/ csw/mgar/pkg/redis/trunk/ csw/mgar/pkg/redis/trunk/Makefile csw/mgar/pkg/redis/trunk/checksums csw/mgar/pkg/redis/trunk/files/ csw/mgar/pkg/redis/trunk/files/0001-backtrace-is-only-available-on-Solaris-11.patch Added: csw/mgar/pkg/redis/Makefile =================================================================== --- csw/mgar/pkg/redis/Makefile (rev 0) +++ csw/mgar/pkg/redis/Makefile 2012-03-14 14:48:08 UTC (rev 17402) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/redis/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/redis/trunk/Makefile =================================================================== --- csw/mgar/pkg/redis/trunk/Makefile (rev 0) +++ csw/mgar/pkg/redis/trunk/Makefile 2012-03-14 14:48:08 UTC (rev 17402) @@ -0,0 +1,43 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = redis +VERSION = 2.4.8 +GARTYPE = v2 +CATEGORIES = server + +DESCRIPTION = An advanced key-value store +define BLURB +endef + +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES += 0001-backtrace-is-only-available-on-Solaris-11.patch + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +PACKAGES += CSWredis +SPKG_DESC_CSWredis = An advanced key-value store +# PKGFILES is catchall + +GARCOMPILER = GCC4 + +# These are set in the Makefile and are not inherited when we force our CFLAGS in +EXTRA_CFLAGS += -std=c99 -pedantic -Wall -W -D__EXTENSIONS__ -D_XPG6 + +# There is no configure +CONFIGURE_SCRIPTS = + +BUILD_ARGS += V=1 + +TEST_TARGET = test + +# We need TCL 8.5 for this which we don't have yet +SKIPTEST ?= 1 + +INSTALL_OVERRIDE_VARS += PREFIX +INSTALL_OVERRIDE_VAR_PREFIX = $(DESTDIR)$(prefix) + +include gar/category.mk + Property changes on: csw/mgar/pkg/redis/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/redis/trunk/checksums =================================================================== --- csw/mgar/pkg/redis/trunk/checksums (rev 0) +++ csw/mgar/pkg/redis/trunk/checksums 2012-03-14 14:48:08 UTC (rev 17402) @@ -0,0 +1 @@ +ac776d25f238b142d3d526cfcdc621ab redis-2.4.8.tar.gz Added: csw/mgar/pkg/redis/trunk/files/0001-backtrace-is-only-available-on-Solaris-11.patch =================================================================== --- csw/mgar/pkg/redis/trunk/files/0001-backtrace-is-only-available-on-Solaris-11.patch (rev 0) +++ csw/mgar/pkg/redis/trunk/files/0001-backtrace-is-only-available-on-Solaris-11.patch 2012-03-14 14:48:08 UTC (rev 17402) @@ -0,0 +1,25 @@ +From d1163310acf3800e43c3d0cf92dfc543b1c874a8 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 14 Mar 2012 15:27:11 +0100 +Subject: [PATCH] backtrace() is only available on Solaris 11+ + +--- + src/config.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/config.h b/src/config.h +index 77fed7d..1057b8b 100644 +--- a/src/config.h ++++ b/src/config.h +@@ -25,7 +25,7 @@ + #endif + + /* Test for backtrace() */ +-#if defined(__APPLE__) || defined(__linux__) || defined(__sun) ++#if defined(__APPLE__) || defined(__linux__) + #define HAVE_BACKTRACE 1 + #endif + +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 14 16:12:34 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 14 Mar 2012 15:12:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[17403] csw/mgar/pkg/mysql5/branches/mysql-5.6.x/ Message-ID: Revision: 17403 http://gar.svn.sourceforge.net/gar/?rev=17403&view=rev Author: wahwah Date: 2012-03-14 15:12:33 +0000 (Wed, 14 Mar 2012) Log Message: ----------- mysql-5.6: Branch out to build 5.6 Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Wed Mar 14 16:46:23 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Wed, 14 Mar 2012 15:46:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17391] csw/mgar/pkg/postfix/trunk/Makefile In-Reply-To: References: Message-ID: 2012/3/14 Peter Bonivart : > On Tue, Mar 13, 2012 at 9:06 AM, ? wrote: >> Revision: 17391 >> ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=17391&view=rev >> Author: ? wahwah >> Date: ? ? 2012-03-13 08:06:08 +0000 (Tue, 13 Mar 2012) >> Log Message: >> ----------- >> postfix/trunk: switch to bdb48, update deps > > Didn't you get collisions with Sendmail? I got collisions with Postfix > when I updated Sendmail and implemented alternatives, I also contacted > Sebastian about doing the same in Postfix. No, I didn't get collisions. Maybe it's because the files have been removed from sendmail. > # Some files collide with CSWpostfix > ALTERNATIVES_CSWsendmail ?= sendmail > ALTERNATIVE_sendmail ?= $(bindir)/mailq sendmail $(bindir)/mailq.sendmail 100 > ALTERNATIVE_sendmail += $(bindir)/newaliases newaliases > $(bindir)/newaliases.sendmail > ALTERNATIVE_sendmail += $(mandir)/man1/mailq.1 mailq.1 > $(mandir)/man1/mailq1.1.sendmail > ALTERNATIVE_sendmail += $(mandir)/man1/newaliases.1 newaliases.1 > $(mandir)/man1/newaliases.1.sendmail > ALTERNATIVE_sendmail += $(mandir)/man5/aliases.5 aliases.5 > $(mandir)/man5/aliases.5.sendmail If you know how, just make the change to postfix and push it out. From wahwah at users.sourceforge.net Wed Mar 14 17:22:17 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 14 Mar 2012 16:22:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17404] csw/mgar/pkg/protobuf/branches/protobuf-gcc/ Message-ID: Revision: 17404 http://gar.svn.sourceforge.net/gar/?rev=17404&view=rev Author: wahwah Date: 2012-03-14 16:22:16 +0000 (Wed, 14 Mar 2012) Log Message: ----------- protobuf: Branching out to build protobuf with GCC. Added Paths: ----------- csw/mgar/pkg/protobuf/branches/protobuf-gcc/ 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 Mar 14 18:01:45 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 14 Mar 2012 17:01:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17405] csw/mgar/pkg/mysql5/branches/mysql-5.6.x Message-ID: Revision: 17405 http://gar.svn.sourceforge.net/gar/?rev=17405&view=rev Author: wahwah Date: 2012-03-14 17:01:45 +0000 (Wed, 14 Mar 2012) Log Message: ----------- mysql5/branches/mysql-5.6.x: it builds and packages. cool\! Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0005-Do-not-strip-RPATH-from-binaries.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2012-03-14 16:22:16 UTC (rev 17404) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2012-03-14 17:01:45 UTC (rev 17405) @@ -12,9 +12,9 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)5 -BASE_VERSION = 5.5 -PATCHLEVEL = 21 -ALTS_PRIO = 55 +BASE_VERSION = 5.6 +PATCHLEVEL = 4-m7 +ALTS_PRIO = 56 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server @@ -67,7 +67,8 @@ CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1 CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1 PATCHFILES += 0003-I-HATE-CMAKE.patch -PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch +# PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch +PATCHFILES += 0005-Do-not-strip-RPATH-from-binaries.patch PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2012-03-14 16:22:16 UTC (rev 17404) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2012-03-14 17:01:45 UTC (rev 17405) @@ -1 +1 @@ -86d6bd335054a0aed1756ed60574c16d mysql-5.5.21.tar.gz +3bba56b37faf33c0b9549bab36fb25f3 mysql-5.6.4-m7.tar.gz Added: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0005-Do-not-strip-RPATH-from-binaries.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0005-Do-not-strip-RPATH-from-binaries.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0005-Do-not-strip-RPATH-from-binaries.patch 2012-03-14 17:01:45 UTC (rev 17405) @@ -0,0 +1,27 @@ +From fd25893088c1f89c69e2bf81ee091a258fe99ca5 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 14 Mar 2012 16:47:21 +0100 +Subject: [PATCH] Do not strip RPATH from binaries + +--- + configure.cmake | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/configure.cmake b/configure.cmake +index bd5c4a4..caf8408 100644 +--- a/configure.cmake ++++ b/configure.cmake +@@ -57,6 +57,10 @@ ENDIF() + # other threads. + SET(SIGNAL_WITH_VIO_CLOSE 1) + ++# Don't strip runpath as it breaks the binaries that need libraries in ++# /opt/csw/lib. ++SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) ++ + # Always enable -Wall for gnu C/C++ + IF(CMAKE_COMPILER_IS_GNUCXX) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-parameter") +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 14 22:54:09 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 14 Mar 2012 21:54:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17406] csw/mgar/pkg/nodejs/trunk Message-ID: Revision: 17406 http://gar.svn.sourceforge.net/gar/?rev=17406&view=rev Author: wahwah Date: 2012-03-14 21:54:08 +0000 (Wed, 14 Mar 2012) Log Message: ----------- nodejs/trunk: it builds. Modified Paths: -------------- csw/mgar/pkg/nodejs/trunk/Makefile csw/mgar/pkg/nodejs/trunk/checksums Modified: csw/mgar/pkg/nodejs/trunk/Makefile =================================================================== --- csw/mgar/pkg/nodejs/trunk/Makefile 2012-03-14 17:01:45 UTC (rev 17405) +++ csw/mgar/pkg/nodejs/trunk/Makefile 2012-03-14 21:54:08 UTC (rev 17406) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = nodejs -VERSION = 0.6.7 +VERSION = 0.6.12 GARTYPE = v2 CATEGORIES = lib @@ -14,20 +14,32 @@ DISTNAME = node-v$(VERSION) DISTFILES += $(DISTNAME).tar.gz +LICENSE = LICENSE + PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +GARCOMPILER = GNU CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += --openssl-includes=$(includedir) CONFIGURE_ARGS += --openssl-libpath=$(libdir) -#CONFIGURE_SCRIPTS = custom -TEST_TARGET = check - EXTRA_CONFIGURE_EXPORTS += PWD CONFIGURE_ENV_PWD = $(abspath $(WORKSRC)) +RUNTIME_DEP_PKGS_CSWnodejs += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWnodejs += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWnodejs += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWnodejs += CSWlibz1 + +CHECKPKG_OVERRIDES_CSWnodejs += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWnodejs += file-with-bad-content + +TEST_SCRIPTS = + include gar/category.mk +PATH := /opt/csw/gnu:$(PATH) + configure-custom: cd $(WORKSRC) && /usr/bin/env -i $(CONFIGURE_ENV) PWD=$(abspath $(WORKSRC)) ./configure $(CONFIGURE_ARGS) @$(MAKECOOKIE) Modified: csw/mgar/pkg/nodejs/trunk/checksums =================================================================== --- csw/mgar/pkg/nodejs/trunk/checksums 2012-03-14 17:01:45 UTC (rev 17405) +++ csw/mgar/pkg/nodejs/trunk/checksums 2012-03-14 21:54:08 UTC (rev 17406) @@ -1 +1 @@ -e7b238356ea7fb230b956010931ca468 node-v0.6.7.tar.gz +a12766ae4003c9712927d1fa134ed9f6 node-v0.6.12.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 Mar 14 23:04:37 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 14 Mar 2012 22:04:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17407] csw/mgar/pkg/zabbix/trunk/Makefile Message-ID: Revision: 17407 http://gar.svn.sourceforge.net/gar/?rev=17407&view=rev Author: wahwah Date: 2012-03-14 22:04:36 +0000 (Wed, 14 Mar 2012) Log Message: ----------- zabbix/trunk: it happens to build. Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2012-03-14 21:54:08 UTC (rev 17406) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2012-03-14 22:04:36 UTC (rev 17407) @@ -3,7 +3,7 @@ # NAME = zabbix VERSION = 1.8.10 -GARTYPE = v2 +GARTYPE = v2-build64only CATEGORIES = server DESCRIPTION = Brief description @@ -16,21 +16,21 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -#BUILD64 = 1 -#BUILD_ISA_i386 = amd64 BUILD64_ONLY = 1 +RUNTIME_DEP_PKGS_CSWzabbix += CSWlibmysqlclient15 +RUNTIME_DEP_PKGS_CSWzabbix += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWzabbix += CSWlibz1 +RUNTIME_DEP_PKGS_CSWzabbix += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWzabbix += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWzabbix += CSWlibidn11 -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-mysql +CONFIGURE_ARGS += --with-libcurl +CONFIGURE_ARGS += --enable-server +CONFIGURE_ARGS += --enable-agent +CONFIGURE_ARGS += --enable-ipv6 -# 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) --with-mysql --with-libcurl --enable-server --enable-agent --enable-ipv6 - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 14 23:53:24 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 14 Mar 2012 22:53:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17408] csw/mgar/pkg/memcached/trunk Message-ID: Revision: 17408 http://gar.svn.sourceforge.net/gar/?rev=17408&view=rev Author: wahwah Date: 2012-03-14 22:53:23 +0000 (Wed, 14 Mar 2012) Log Message: ----------- Version bump. Sadly, a test is segfaulting. Assertion failed: fgets(buffer, sizeof(buffer), fp) != NULL, file testapp.c, line 397 gmake: *** [test] Abort (core dumped) Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile csw/mgar/pkg/memcached/trunk/checksums Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2012-03-14 22:04:36 UTC (rev 17407) +++ csw/mgar/pkg/memcached/trunk/Makefile 2012-03-14 22:53:23 UTC (rev 17408) @@ -1,7 +1,7 @@ # $Id$ NAME = memcached -VERSION = 1.4.9 +VERSION = 1.4.13 CATEGORIES = net GARTYPE = v2 @@ -22,7 +22,7 @@ # ## The addition of more status field made the data arrive in multiple packets ## leading to broken tests when it is not waited for more packages. -PATCHFILES += 0003-Make-sure-to-wait-for-data.patch +# PATCHFILES += 0003-Make-sure-to-wait-for-data.patch # ## Looks like the data structure is not clean on sparcv9 (only!) PATCHFILES += 0004-Make-sure-to-clean-ai_flags-in-testsuite-or-test-fai.patch @@ -47,8 +47,9 @@ BUILD64_LIBS_ONLY = 1 CONFIGURE_ARGS = $(DIRPATHS) # SASL is not 64 bit yet! -#CONFIGURE_ARGS += --enable-sasl -#CONFIGURE_ARGS += --enable-sasl-pwdb +CONFIGURE_ARGS_32 += --enable-sasl +CONFIGURE_ARGS_32 += --enable-sasl-pwdb +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORY_MODEL)) CONFIGURE_ARGS-sol5.10 += --enable-dtrace CONFIGURE_ARGS += $(CONFIGURE_ARGS-sol$(GAROSREL)) Modified: csw/mgar/pkg/memcached/trunk/checksums =================================================================== --- csw/mgar/pkg/memcached/trunk/checksums 2012-03-14 22:04:36 UTC (rev 17407) +++ csw/mgar/pkg/memcached/trunk/checksums 2012-03-14 22:53:23 UTC (rev 17408) @@ -1 +1 @@ -e55fd8144f3a36189f42c12ceb22832b memcached-1.4.9.tar.gz +6d18c6d25da945442fcc1187b3b63b7f memcached-1.4.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Mar 15 00:02:20 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 14 Mar 2012 23:02:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17409] csw/mgar/pkg/protobuf/branches/protobuf-gcc Message-ID: Revision: 17409 http://gar.svn.sourceforge.net/gar/?rev=17409&view=rev Author: wahwah Date: 2012-03-14 23:02:20 +0000 (Wed, 14 Mar 2012) Log Message: ----------- Version bump, GCC build Modified Paths: -------------- csw/mgar/pkg/protobuf/branches/protobuf-gcc/Makefile csw/mgar/pkg/protobuf/branches/protobuf-gcc/checksums Modified: csw/mgar/pkg/protobuf/branches/protobuf-gcc/Makefile =================================================================== --- csw/mgar/pkg/protobuf/branches/protobuf-gcc/Makefile 2012-03-14 22:53:23 UTC (rev 17408) +++ csw/mgar/pkg/protobuf/branches/protobuf-gcc/Makefile 2012-03-14 23:02:20 UTC (rev 17409) @@ -3,12 +3,9 @@ # $Id$ # http://code.google.com/p/protobuf/issues/detail?id=166 -# -# About using stlport4 -# http://developers.sun.com/solaris/articles/cmp_stlport_libCstd.html NAME = protobuf -VERSION = 2.3.0 +VERSION = 2.4.1 CATEGORIES = lib GARTYPE = v2 define BLURB @@ -20,81 +17,58 @@ DESCRIPTION = Google Protocol buffers MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PATCHFILES += 0001-Patches-from-GAR.patch -PATCHFILES += 0002-std-map-in-two-more-files.patch -PATCHFILES += OutputDirectoryIsFileError-unittest.patch -PATCHFILES += trailing-slash-test-fails-on-solaris-8-x86.patch LICENSE = COPYING.txt -EXTRA_CFLAGS = -EXTRA_CXXFLAGS = -library=stlport4 -library=no%Cstd -EXTRA_LDFLAGS = -lCrun -lm -BUILD64_LIBS_ONLY = 1 +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) PYCOMPILE = 1 -PACKAGES = CSWprotobuf -SPKG_DESC_CSWprotobuf = $(DESCRIPTION) +EXTRA_MERGE_EXCLUDE_FILES = .*.pyc -RUNTIME_DEP_PKGS_CSWprotobuf += CSWstlport -RUNTIME_DEP_PKGS_CSWprotobuf += CSWzlib -RUNTIME_DEP_PKGS_CSWprotobuf += CSWlibprotoc6 -RUNTIME_DEP_PKGS_CSWprotobuf += CSWlibprotobuf6 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +GARCOMPILER = GNU +prefix = $(BUILD_PREFIX)/gxx -# Libraries -PACKAGES += CSWlibprotobuf-lite6 -CATALOGNAME_CSWlibprotobuf-lite6 = libprotobuf_lite6 -SPKG_DESC_CSWlibprotobuf-lite6 = $(DESCRIPTION), libprotobuf-lite.so.6 -RUNTIME_DEP_PKGS_CSWlibprotobuf-lite6 += CSWzlib -RUNTIME_DEP_PKGS_CSWlibprotobuf-lite6 += CSWstlport -PKGFILES_CSWlibprotobuf-lite6 = .*libprotobuf-lite\.so\..* -CHECKPKG_OVERRIDES_CSWlibprotobuf-lite6 += bad-rpath-entry +PACKAGES += CSWlibprotobuf-lite7-gxx +PKGFILES_CSWlibprotobuf-lite7-gxx += $(call baseisadirs,$(libdir),libprotobuf-lite\.so\.7(\.\d+)*) +SPKG_DESC_CSWlibprotobuf-lite7-gxx += $(DESCRIPTION), libprotobuf-lite.so.7 +RUNTIME_DEP_PKGS_CSWlibprotobuf-lite7-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibprotobuf-lite7-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibprotobuf-lite7-gxx += CSWlibz1 -PACKAGES += CSWlibprotobuf6 -CATALOGNAME_CSWlibprotobuf6 = libprotobuf6 -SPKG_DESC_CSWlibprotobuf6 = $(DESCRIPTION), libprotobuf.so.6 -RUNTIME_DEP_PKGS_CSWlibprotobuf6 += CSWstlport -RUNTIME_DEP_PKGS_CSWlibprotobuf6 += CSWzlib -PKGFILES_CSWlibprotobuf6 = .*libprotobuf\.so\..* -CHECKPKG_OVERRIDES_CSWlibprotobuf6 += bad-rpath-entry +PACKAGES += CSWlibprotoc7-gxx +PKGFILES_CSWlibprotoc7-gxx += $(call baseisadirs,$(libdir),libprotoc\.so\.7(\.\d+)*) +SPKG_DESC_CSWlibprotoc7-gxx += $(DESCRIPTION), libprotoc.so.7 +RUNTIME_DEP_PKGS_CSWlibprotoc7-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibprotoc7-gxx += CSWlibprotobuf7-gxx +RUNTIME_DEP_PKGS_CSWlibprotoc7-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibprotoc7-gxx += CSWlibz1 -PACKAGES += CSWlibprotoc6 -CATALOGNAME_CSWlibprotoc6 = libprotoc6 -SPKG_DESC_CSWlibprotoc6 = $(DESCRIPTION), libprotoc.so.6 -RUNTIME_DEP_PKGS_CSWlibprotoc6 += CSWstlport -RUNTIME_DEP_PKGS_CSWlibprotoc6 += CSWzlib -PKGFILES_CSWlibprotoc6 = .*libprotoc\.so\..* -RUNTIME_DEP_PKGS_CSWlibprotoc6 += CSWlibprotobuf6 -CHECKPKG_OVERRIDES_CSWlibprotoc6 += bad-rpath-entry +PACKAGES += CSWlibprotobuf7-gxx +PKGFILES_CSWlibprotobuf7-gxx += $(call baseisadirs,$(libdir),libprotobuf\.so\.7(\.\d+)*) +SPKG_DESC_CSWlibprotobuf7-gxx += $(DESCRIPTION), libprotobuf.so.7 +RUNTIME_DEP_PKGS_CSWlibprotobuf7-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibprotobuf7-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibprotobuf7-gxx += CSWlibz1 # Devel package -PACKAGES += CSWprotobuf-devel -CATALOGNAME_CSWprotobuf-devel = protobuf_devel -SPKG_DESC_CSWprotobuf-devel = $(DESCRIPTION), header files -RUNTIME_DEP_PKGS_CSWprotobuf-devel += CSWprotobuf -RUNTIME_DEP_PKGS_CSWprotobuf-devel += CSWpy-protobuf -RUNTIME_DEP_PKGS_CSWprotobuf-devel += CSWlibprotobuf-lite6 -RUNTIME_DEP_PKGS_CSWprotobuf-devel += CSWlibprotobuf6 -RUNTIME_DEP_PKGS_CSWprotobuf-devel += CSWlibprotoc6 -PKGFILES_CSWprotobuf-devel = $(PKGFILES_DEVEL) +PACKAGES += CSWprotobuf-gxx-dev +SPKG_DESC_CSWprotobuf-gxx-dev = $(DESCRIPTION), header files +RUNTIME_DEP_PKGS_CSWprotobuf-gxx-dev += CSWpy-protobuf +RUNTIME_DEP_PKGS_CSWprotobuf-gxx-dev += CSWlibz1 +RUNTIME_DEP_PKGS_CSWprotobuf-gxx-dev += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWprotobuf-gxx-dev += CSWlibprotobuf7-gxx +RUNTIME_DEP_PKGS_CSWprotobuf-gxx-dev += CSWlibprotobuf-lite7-gxx +RUNTIME_DEP_PKGS_CSWprotobuf-gxx-dev += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWprotobuf-gxx-dev += CSWlibprotoc7-gxx +# Catch-all package # Python support PACKAGES += CSWpy-protobuf -CATALOGNAME_CSWpy-protobuf = py_protobuf -SPKG_DESC_CSWpy-protobuf= $(DESCRIPTION), Python support -RUNTIME_DEP_PKGS_CSWpy-protobuf += CSWprotobuf +SPKG_DESC_CSWpy-protobuf = $(DESCRIPTION), Python support RUNTIME_DEP_PKGS_CSWpy-protobuf += CSWpython PKGFILES_CSWpy-protobuf = $(libdir)/python.* ARCHALL_CSWpy-protobuf = 1 -CHECKPKG_OVERRIDES_CSWpy-protobuf += surplus-dependency|CSWprotobuf -# Empty transitional package -PACKAGES += CSWprotobuf-rt -CATALOGNAME_CSWprotobuf-rt = protobuf_rt -SPKG_DESC_CSWprotobuf-rt = An empty transitional package -PKGFILES_CSWprotobuf-rt = an-empty-package -ARCHALL_CSWprotobuf-rt = 1 - include gar/category.mk post-build-modulated: Modified: csw/mgar/pkg/protobuf/branches/protobuf-gcc/checksums =================================================================== --- csw/mgar/pkg/protobuf/branches/protobuf-gcc/checksums 2012-03-14 22:53:23 UTC (rev 17408) +++ csw/mgar/pkg/protobuf/branches/protobuf-gcc/checksums 2012-03-14 23:02:20 UTC (rev 17409) @@ -1 +1 @@ -65dba2c04923595b6f0a6a44d8106f0a protobuf-2.3.0.tar.gz +dc84e9912ea768baa1976cb7bbcea7b5 protobuf-2.4.1.tar.gz 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 Mar 15 10:24:10 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 15 Mar 2012 09:24:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[17410] csw/mgar/pkg/lang-python/pygtk/trunk/Makefile Message-ID: Revision: 17410 http://gar.svn.sourceforge.net/gar/?rev=17410&view=rev Author: cgrzemba Date: 2012-03-15 09:24:09 +0000 (Thu, 15 Mar 2012) Log Message: ----------- lang-python/pygtk/trunk: add run time dependencies Modified Paths: -------------- csw/mgar/pkg/lang-python/pygtk/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pygtk/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygtk/trunk/Makefile 2012-03-14 23:02:20 UTC (rev 17409) +++ csw/mgar/pkg/lang-python/pygtk/trunk/Makefile 2012-03-15 09:24:09 UTC (rev 17410) @@ -23,7 +23,7 @@ BUILD_DEP_PKGS += CSWlibglib2-dev BUILD_DEP_PKGS += CSWlibatk-dev BUILD_DEP_PKGS += CSWpangodevel -BUILD_DEP_PKGS += CSWpycairo +BUILD_DEP_PKGS += CSWpy-cairo BUILD_DEP_PKGS += CSWlibcairo-dev BUILD_DEP_PKGS += CSWlibxcbdevel @@ -48,8 +48,14 @@ RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWpygobject +RUNTIME_DEP_PKGS_CSWpy-gtk += CSWpy-cairo CHECKPKG_OVERRIDES_CSWpy-gtk += file-with-bad-content|/usr/share|root/opt/csw/share/gtk-doc/html/pygtk/class-gtkfilechooser.html CHECKPKG_OVERRIDES_CSWpy-gtk += file-with-bad-content|/usr/local|root/opt/csw/share/gtk-doc/html/pygtk/class-gtkrcstyle.html +# pygtk do not work without this +CHECKPKG_OVERRIDES_CSWpy-gtk += surplus-dependency|CSWpygobject +# gtk do not work without this +CHECKPKG_OVERRIDES_CSWpy-gtk += surplus-dependency|CSWpy-cairo # pkg and classaction is obsolete CHECKPKG_OVERRIDES_CSWpygtk += action-class-only-in-pkginfo|cswpycompile 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 Mar 15 11:49:57 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Mar 2012 10:49:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[17411] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 17411 http://gar.svn.sourceforge.net/gar/?rev=17411&view=rev Author: wahwah Date: 2012-03-15 10:49:56 +0000 (Thu, 15 Mar 2012) Log Message: ----------- checkpkg: Cope with unknown machine IDs 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-03-15 09:24:09 UTC (rev 17410) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2012-03-15 10:49:56 UTC (rev 17411) @@ -951,7 +951,15 @@ if "machine_id" not in metadata: continue logger.debug("CheckArchitecture(): %s", metadata) - machine_data = HACHOIR_MACHINES[metadata["machine_id"]] + machine_id = metadata["machine_id"] + if machine_id not in HACHOIR_MACHINES: + error_mgr.ReportError( + "binary-architecture-unknown", + "file=%s arch_id=%s" % ( + metadata["path"], + metadata["machine_id"])) + continue + machine_data = HACHOIR_MACHINES[machine_id] cpu_type = machine_data["name"] # allowed_paths needs to depend on the OS release. The OS release is # only available from the file name. @@ -967,7 +975,7 @@ "binary-architecture-does-not-match-placement", "file=%s arch_id=%s arch_name=%s" % ( metadata["path"], - metadata["machine_id"], + machine_id, cpu_type)) messenger.OneTimeMessage( "binary-placement", @@ -988,7 +996,7 @@ "binary-disallowed-placement", "file=%s arch_id=%s arch_name=%s bad_path=%s" % ( metadata["path"], - metadata["machine_id"], + machine_id, cpu_type, bad_path)) messenger.Message( 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 Mar 15 11:51:29 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Mar 2012 10:51:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[17412] csw/mgar/gar/v2/lib/python/integrate_catalogs.py Message-ID: Revision: 17412 http://gar.svn.sourceforge.net/gar/?rev=17412&view=rev Author: wahwah Date: 2012-03-15 10:51:29 +0000 (Thu, 15 Mar 2012) Log Message: ----------- integrate-catalogs: Save in json, not pickle Modified Paths: -------------- csw/mgar/gar/v2/lib/python/integrate_catalogs.py Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py =================================================================== --- csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-03-15 10:49:56 UTC (rev 17411) +++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-03-15 10:51:29 UTC (rev 17412) @@ -11,7 +11,7 @@ """ from Cheetah import Template -import cPickle +import json import catalog import common_constants import logging @@ -165,11 +165,11 @@ dest="catrel_to", default="testing", help="Catalog release to integrate to, e.g. 'testing'.") - parser.add_option("--from-pickle", dest="from_pickle", - help=("If specified, loads data from a pickle file instead of polling " + parser.add_option("--from-json", dest="from_json", + help=("If specified, loads data from a JSON file instead of polling " "the database.")) - parser.add_option("--save-pickle", dest="save_pickle", - help="If specified, saves pickled data to a file.") + parser.add_option("--save-json", dest="save_json", + help="If specified, saves JSON data to a file.") parser.add_option("-o", "--output-file", dest="output_file", help="Filename to save output to.") parser.add_option("--no-include-downgrades", dest="include_downgrades", @@ -181,9 +181,9 @@ raise UsageError("Please specify the output file. See --help.") catrel_from = options.catrel_from catrel_to = options.catrel_to - if options.from_pickle: - with open("tmp.pickle", "rb") as fd: - diffs_by_catalogname = cPickle.load(fd) + if options.from_json: + with open(options.from_json, "rb") as fd: + diffs_by_catalogname = json.load(fd) else: diffs_by_catalogname = GetDiffsByCatalogname( catrel_from, catrel_to, options.include_downgrades) @@ -193,9 +193,9 @@ "catrel_from": catrel_from, "prog": sys.argv[0], } - if options.save_pickle: - with open(options.save_pickle, "wb") as fd: - cPickle.dump(diffs_by_catalogname, fd) + if options.save_json: + with open(options.save_json, "wb") as fd: + json.dump(diffs_by_catalogname, fd) t = Template.Template(CATALOG_MOD_TMPL, searchList=[namespace]) if options.output_file: logging.info("Saving output to %s", options.output_file) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Mar 15 11:52:02 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Mar 2012 10:52:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[17413] csw/mgar/gar/v2/lib/python Message-ID: Revision: 17413 http://gar.svn.sourceforge.net/gar/?rev=17413&view=rev Author: wahwah Date: 2012-03-15 10:52:02 +0000 (Thu, 15 Mar 2012) Log Message: ----------- integrate-catalogs: Discern vers and REV changes When stabilizing a catalog, we want to push new package revision, but no version changes. When comparing catalogs, discern between version and revision upgrades. When generating the shell script, do annotate which one it is in the comments, to that it's easy to grep through the file and find all the revision updates. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/catalog.py csw/mgar/gar/v2/lib/python/catalog_test.py csw/mgar/gar/v2/lib/python/integrate_catalogs.py Modified: csw/mgar/gar/v2/lib/python/catalog.py =================================================================== --- csw/mgar/gar/v2/lib/python/catalog.py 2012-03-15 10:51:29 UTC (rev 17412) +++ csw/mgar/gar/v2/lib/python/catalog.py 2012-03-15 10:52:02 UTC (rev 17413) @@ -3,6 +3,7 @@ import os import re import logging +import opencsw class Error(Exception): @@ -202,5 +203,29 @@ updated_catalognames.add(catalogname) new_pkgs = [bc_b[x] for x in new_catalognames] removed_pkgs = [bc_a[x] for x in removed_catalognames] - updated_pkgs = [{"from": bc_a[x], "to": bc_b[x]} for x in updated_catalognames] + def UpdateData(_bc_a, _bc_b, catalogname): + a = bc_a[x] + b = bc_b[x] + cmp_result = opencsw.CompareVersions( + a["version"], + b["version"]) + if cmp_result < 0: + direction = "upgrade" + else: + direction = "downgrade" + return { + "from": a, + "to": b, + "type": self.DiffType(a, b), + "direction": direction, + } + updated_pkgs = [UpdateData(bc_a, bc_b, x) for x in updated_catalognames] return new_pkgs, removed_pkgs, updated_pkgs + + def DiffType(self, a, b): + va = opencsw.ParseVersionString(a["version"]) + vb = opencsw.ParseVersionString(b["version"]) + if va[0] == vb[0]: + return "revision" + else: + return "version" Modified: csw/mgar/gar/v2/lib/python/catalog_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/catalog_test.py 2012-03-15 10:51:29 UTC (rev 17412) +++ csw/mgar/gar/v2/lib/python/catalog_test.py 2012-03-15 10:52:02 UTC (rev 17413) @@ -106,6 +106,15 @@ self.assertFalse(updated_pkgs) self.assertEqual(1, len(removed_pkgs)) + def testUpdateOnly(self): + oc1 = catalog.OpencswCatalog(StringIO(CATALOG_LINE_1)) + oc2 = catalog.OpencswCatalog(StringIO(CATALOG_LINE_2)) + c = catalog.CatalogComparator() + new_pkgs, removed_pkgs, updated_pkgs = c.GetCatalogDiff(oc1, oc2) + self.assertFalse(new_pkgs) + self.assertFalse(removed_pkgs) + self.assertEquals("revision", updated_pkgs[0]["type"]) + if __name__ == '__main__': unittest.main() Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py =================================================================== --- csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-03-15 10:51:29 UTC (rev 17412) +++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-03-15 10:52:02 UTC (rev 17413) @@ -81,7 +81,8 @@ #else upgrade_# #end if -$catalogname +$catalogname# + # $diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["type"] #end if #end for """ @@ -98,7 +99,8 @@ return dict((x["catalogname"], x) for x in catalog) -def GetDiffsByCatalogname(catrel_from, catrel_to, include_downgrades): +def GetDiffsByCatalogname(catrel_from, catrel_to, include_downgrades, + include_version_changes): rest_client = rest.RestClient() diffs_by_catalogname = {} def GetCatalog(rest_client, r_catrel, r_arch, r_osrel): @@ -139,17 +141,13 @@ catalogname_d = diffs_by_catalogname.setdefault(pkg["catalogname"], {}) catalogname_d.setdefault("removed_pkgs", []).append((arch, osrel, pkg)) for pkg_pair in updated_pkgs: - # Upgrade or downgrade? - cmp_result = opencsw.CompareVersions( - pkg_pair["from"]["version"], - pkg_pair["to"]["version"]) - if cmp_result < 0: - direction = "upgrade" - else: - direction = "downgrade" - pkg_pair["direction"] = direction - pkg = pkg_pair["from"] - if direction == "upgrade" or include_downgrades: + update_decision_by_type = { + "revision": True, + "version": include_version_changes + } + if (update_decision_by_type[pkg_pair["type"]] + and (pkg_pair["direction"] == "upgrade" or include_downgrades)): + pkg = pkg_pair["from"] catalogname_d = diffs_by_catalogname.setdefault(pkg["catalogname"], {}) catalogname_d.setdefault("updated_pkgs", []).append((arch, osrel, pkg_pair)) return diffs_by_catalogname @@ -175,6 +173,10 @@ parser.add_option("--no-include-downgrades", dest="include_downgrades", default=True, action="store_false", help="Skip package downgrades.") + parser.add_option("--no-include-version-changes", + dest="include_version_changes", + default=True, action="store_false", + help="Skip version upgrades (only accept revision upgrades).") options, args = parser.parse_args() logging.basicConfig(level=logging.DEBUG) if not options.output_file: @@ -186,7 +188,8 @@ diffs_by_catalogname = json.load(fd) else: diffs_by_catalogname = GetDiffsByCatalogname( - catrel_from, catrel_to, options.include_downgrades) + catrel_from, catrel_to, options.include_downgrades, + options.include_version_changes) namespace = { "diffs_by_catalogname": diffs_by_catalogname, "catrel_to": catrel_to, 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 Mar 15 11:55:07 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 15 Mar 2012 10:55:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[17414] csw/mgar/pkg/re2c/trunk/Makefile Message-ID: Revision: 17414 http://gar.svn.sourceforge.net/gar/?rev=17414&view=rev Author: wilbury Date: 2012-03-15 10:55:07 +0000 (Thu, 15 Mar 2012) Log Message: ----------- re2c/trunk: Update PACKAGING_PLATFORMS Modified Paths: -------------- csw/mgar/pkg/re2c/trunk/Makefile Modified: csw/mgar/pkg/re2c/trunk/Makefile =================================================================== --- csw/mgar/pkg/re2c/trunk/Makefile 2012-03-15 10:52:02 UTC (rev 17413) +++ csw/mgar/pkg/re2c/trunk/Makefile 2012-03-15 10:55:07 UTC (rev 17414) @@ -26,6 +26,7 @@ # Compiling with GNU based on upstream bug-id # [ 2535084 ] re2c 0.13.5 not compile with Sun C GARCOMPILER = GNU +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc CONFIGURE_ARGS = $(DIRPATHS) 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 Mar 15 12:04:03 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 15 Mar 2012 11:04:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[17415] csw/mgar/pkg/re2c/trunk/Makefile Message-ID: Revision: 17415 http://gar.svn.sourceforge.net/gar/?rev=17415&view=rev Author: wilbury Date: 2012-03-15 11:04:02 +0000 (Thu, 15 Mar 2012) Log Message: ----------- re2c/trunk: Update dependencies and overrides Modified Paths: -------------- csw/mgar/pkg/re2c/trunk/Makefile Modified: csw/mgar/pkg/re2c/trunk/Makefile =================================================================== --- csw/mgar/pkg/re2c/trunk/Makefile 2012-03-15 10:55:07 UTC (rev 17414) +++ csw/mgar/pkg/re2c/trunk/Makefile 2012-03-15 11:04:02 UTC (rev 17415) @@ -21,8 +21,11 @@ DISTFILES = $(DISTNAME).tar.gz CATALOGNAME_CSWre2c = re2c SPKG_DESC_CSWre2c = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWre2c = CSWgcc4corert CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWre2c += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWre2c += CSWlibstdc++6 +CHECKPKG_OVERRIDES_CSWre2c += license-missing|/opt/csw/share/doc/re2c/license + # Compiling with GNU based on upstream bug-id # [ 2535084 ] re2c 0.13.5 not compile with Sun C GARCOMPILER = GNU 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 Mar 15 12:21:55 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 15 Mar 2012 11:21:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[17416] csw/mgar/pkg/re2c/trunk/ Message-ID: Revision: 17416 http://gar.svn.sourceforge.net/gar/?rev=17416&view=rev Author: wilbury Date: 2012-03-15 11:21:55 +0000 (Thu, 15 Mar 2012) Log Message: ----------- re2c/trunk: Update svn:ignore Property Changed: ---------------- csw/mgar/pkg/re2c/trunk/ Property changes on: csw/mgar/pkg/re2c/trunk ___________________________________________________________________ Added: svn:ignore + cookies work download 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 Mar 15 13:09:31 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 15 Mar 2012 12:09:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17417] csw/mgar/pkg/postfix/trunk Message-ID: Revision: 17417 http://gar.svn.sourceforge.net/gar/?rev=17417&view=rev Author: wilbury Date: 2012-03-15 12:09:31 +0000 (Thu, 15 Mar 2012) Log Message: ----------- postfix/trunk: Update to 2.8.9 Modified Paths: -------------- csw/mgar/pkg/postfix/trunk/Makefile csw/mgar/pkg/postfix/trunk/checksums Modified: csw/mgar/pkg/postfix/trunk/Makefile =================================================================== --- csw/mgar/pkg/postfix/trunk/Makefile 2012-03-15 11:21:55 UTC (rev 17416) +++ csw/mgar/pkg/postfix/trunk/Makefile 2012-03-15 12:09:31 UTC (rev 17417) @@ -21,7 +21,7 @@ # $Id$ # NAME = postfix -VERSION = 2.8.6 +VERSION = 2.8.9 CATEGORIES = server GARTYPE = v2 Modified: csw/mgar/pkg/postfix/trunk/checksums =================================================================== --- csw/mgar/pkg/postfix/trunk/checksums 2012-03-15 11:21:55 UTC (rev 17416) +++ csw/mgar/pkg/postfix/trunk/checksums 2012-03-15 12:09:31 UTC (rev 17417) @@ -1 +1 @@ -c9cb89bfa660379b71fab356d2bf426e postfix-2.8.6.tar.gz +512e2d13da6d25ba64fdf3a1c62190a1 postfix-2.8.9.tar.gz 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 Mar 15 13:10:46 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 15 Mar 2012 12:10:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17418] csw/mgar/pkg/postfix/trunk/Makefile Message-ID: Revision: 17418 http://gar.svn.sourceforge.net/gar/?rev=17418&view=rev Author: wilbury Date: 2012-03-15 12:10:46 +0000 (Thu, 15 Mar 2012) Log Message: ----------- postfix/trunk: Update PACKAGING_PLATFORMS Modified Paths: -------------- csw/mgar/pkg/postfix/trunk/Makefile Modified: csw/mgar/pkg/postfix/trunk/Makefile =================================================================== --- csw/mgar/pkg/postfix/trunk/Makefile 2012-03-15 12:09:31 UTC (rev 17417) +++ csw/mgar/pkg/postfix/trunk/Makefile 2012-03-15 12:10:46 UTC (rev 17418) @@ -42,6 +42,8 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz LICENSE = LICENSE TLS_LICENSE +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc + # Tag configuration files for handling via cswclassutils CONFIG_BASE := /etc/opt/csw/postfix/ CONFIG_FILES := access This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Thu Mar 15 14:35:34 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Thu, 15 Mar 2012 13:35:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[17418] csw/mgar/pkg/postfix/trunk/Makefile In-Reply-To: References: Message-ID: 2012/3/15 : > Revision: 17418 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=17418&view=rev > Author: ? wilbury > Date: ? ? 2012-03-15 12:10:46 +0000 (Thu, 15 Mar 2012) > Log Message: > ----------- > postfix/trunk: Update PACKAGING_PLATFORMS > > Modified Paths: > -------------- > ? ?csw/mgar/pkg/postfix/trunk/Makefile > > Modified: csw/mgar/pkg/postfix/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/postfix/trunk/Makefile 2012-03-15 12:09:31 UTC (rev 17417) > +++ csw/mgar/pkg/postfix/trunk/Makefile 2012-03-15 12:10:46 UTC (rev 17418) > @@ -42,6 +42,8 @@ > ?UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz > ?LICENSE ? ? ?= LICENSE TLS_LICENSE > > +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc Does the compilation fail in Solaris 9? If not delete these lines and run "gmake replatforms". Chances are, it'll just work. If not, mail maintainers@ with the error message. From wilbury at users.sourceforge.net Thu Mar 15 14:44:48 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 15 Mar 2012 13:44:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[17419] csw/mgar/pkg/postfix/trunk/Makefile Message-ID: Revision: 17419 http://gar.svn.sourceforge.net/gar/?rev=17419&view=rev Author: wilbury Date: 2012-03-15 13:44:48 +0000 (Thu, 15 Mar 2012) Log Message: ----------- postfix/trunk: Remove PACKAGING_PLATFORMS so we will give Solaris 9 a try Modified Paths: -------------- csw/mgar/pkg/postfix/trunk/Makefile Modified: csw/mgar/pkg/postfix/trunk/Makefile =================================================================== --- csw/mgar/pkg/postfix/trunk/Makefile 2012-03-15 12:10:46 UTC (rev 17418) +++ csw/mgar/pkg/postfix/trunk/Makefile 2012-03-15 13:44:48 UTC (rev 17419) @@ -42,8 +42,6 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz LICENSE = LICENSE TLS_LICENSE -PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc - # Tag configuration files for handling via cswclassutils CONFIG_BASE := /etc/opt/csw/postfix/ CONFIG_FILES := access 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 Mar 15 14:56:09 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 15 Mar 2012 13:56:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17420] csw/mgar/pkg/postfix/trunk/Makefile Message-ID: Revision: 17420 http://gar.svn.sourceforge.net/gar/?rev=17420&view=rev Author: wilbury Date: 2012-03-15 13:56:08 +0000 (Thu, 15 Mar 2012) Log Message: ----------- postfix/trunk: Build for Solaris 9 as well as for Solaris 10. Modified Paths: -------------- csw/mgar/pkg/postfix/trunk/Makefile Modified: csw/mgar/pkg/postfix/trunk/Makefile =================================================================== --- csw/mgar/pkg/postfix/trunk/Makefile 2012-03-15 13:44:48 UTC (rev 17419) +++ csw/mgar/pkg/postfix/trunk/Makefile 2012-03-15 13:56:08 UTC (rev 17420) @@ -42,6 +42,9 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz LICENSE = LICENSE TLS_LICENSE +PACKAGING_PLATFORMS += solaris9-i386 solaris9-sparc +PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc + # Tag configuration files for handling via cswclassutils CONFIG_BASE := /etc/opt/csw/postfix/ CONFIG_FILES := access 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 Mar 15 14:58:15 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 15 Mar 2012 13:58:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[17421] csw/mgar/pkg/postfix/trunk/Makefile Message-ID: Revision: 17421 http://gar.svn.sourceforge.net/gar/?rev=17421&view=rev Author: wilbury Date: 2012-03-15 13:58:14 +0000 (Thu, 15 Mar 2012) Log Message: ----------- postfix/trunk: Build for Solaris 9 as well as for Solaris 10, try #2. Modified Paths: -------------- csw/mgar/pkg/postfix/trunk/Makefile Modified: csw/mgar/pkg/postfix/trunk/Makefile =================================================================== --- csw/mgar/pkg/postfix/trunk/Makefile 2012-03-15 13:56:08 UTC (rev 17420) +++ csw/mgar/pkg/postfix/trunk/Makefile 2012-03-15 13:58:14 UTC (rev 17421) @@ -42,9 +42,6 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz LICENSE = LICENSE TLS_LICENSE -PACKAGING_PLATFORMS += solaris9-i386 solaris9-sparc -PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc - # Tag configuration files for handling via cswclassutils CONFIG_BASE := /etc/opt/csw/postfix/ CONFIG_FILES := access 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 Mar 15 15:08:08 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 15 Mar 2012 14:08:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17422] csw/mgar/pkg/postfix/trunk/Makefile Message-ID: Revision: 17422 http://gar.svn.sourceforge.net/gar/?rev=17422&view=rev Author: bonivart Date: 2012-03-15 14:08:07 +0000 (Thu, 15 Mar 2012) Log Message: ----------- postfix/trunk: add alternatives todo Modified Paths: -------------- csw/mgar/pkg/postfix/trunk/Makefile Modified: csw/mgar/pkg/postfix/trunk/Makefile =================================================================== --- csw/mgar/pkg/postfix/trunk/Makefile 2012-03-15 13:58:14 UTC (rev 17421) +++ csw/mgar/pkg/postfix/trunk/Makefile 2012-03-15 14:08:07 UTC (rev 17422) @@ -10,6 +10,15 @@ # # # TODO (release-critical prefixed with !, non release-critical with *) +# * Some files collide with CSWsendmail, the following are alternatives lines from +# the Sendmail package, they should be adapted to Postfix so Postfix and Sendmail +# can co-exist on the same system (and pass checkpkg file collision detection). +# ALTERNATIVES_CSWsendmail = sendmail +# ALTERNATIVE_sendmail = $(bindir)/mailq sendmail $(bindir)/mailq.sendmail 100 +# ALTERNATIVE_sendmail += $(bindir)/newaliases newaliases $(bindir)/newaliases.sendmail +# ALTERNATIVE_sendmail += $(mandir)/man1/mailq.1 mailq.1 $(mandir)/man1/mailq1.1.sendmail +# ALTERNATIVE_sendmail += $(mandir)/man1/newaliases.1 newaliases.1 $(mandir)/man1/newaliases.1.sendmail +# ALTERNATIVE_sendmail += $(mandir)/man5/aliases.5 aliases.5 $(mandir)/man5/aliases.5.sendmail # * Ship simple default configuration (restrict mynetworks to 127.0.0.1?) # * alias_database points to /etc/mail/aliases, symlink # /etc/opt/csw/postfix/aliases to /etc/mail/aliases? 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 Mar 15 18:44:53 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 15 Mar 2012 17:44:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[17423] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 17423 http://gar.svn.sourceforge.net/gar/?rev=17423&view=rev Author: bonivart Date: 2012-03-15 17:44:53 +0000 (Thu, 15 Mar 2012) Log Message: ----------- clamav/trunk: update to 0.97.4 Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2012-03-15 14:08:07 UTC (rev 17422) +++ csw/mgar/pkg/clamav/trunk/Makefile 2012-03-15 17:44:53 UTC (rev 17423) @@ -1,5 +1,5 @@ NAME = clamav -VERSION = 0.97.3 +VERSION = 0.97.4 #VERSION = 0.97rc #DISTNAME = $(NAME)-devel-latest CATEGORIES = apps @@ -59,7 +59,7 @@ PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 #PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -GARCOMPILER = GCC4 +GARCOMPILER = GNU # Seems to be a compiler bug forcing us to use -xO2 instead of -xO3 # http://bugs.sun.com/view_bug.do?bug_id=6683773 @@ -119,9 +119,9 @@ CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node15.html # We don't split to three separate packages -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.12|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.12|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6 -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.12|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.13|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.13|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.13|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6 include gar/category.mk Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2012-03-15 14:08:07 UTC (rev 17422) +++ csw/mgar/pkg/clamav/trunk/checksums 2012-03-15 17:44:53 UTC (rev 17423) @@ -1 +1 @@ -5cf25ed7778fa0cb6b140ad8f009befb clamav-0.97.3.tar.gz +dc1e5abc093b11f120e4eac94a7f78aa clamav-0.97.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 16 11:15:12 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Mar 2012 10:15:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17424] csw/mgar/pkg Message-ID: Revision: 17424 http://gar.svn.sourceforge.net/gar/?rev=17424&view=rev Author: dmichelsen Date: 2012-03-16 10:15:11 +0000 (Fri, 16 Mar 2012) Log Message: ----------- libmspack/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/libmspack/ csw/mgar/pkg/libmspack/Makefile csw/mgar/pkg/libmspack/branches/ csw/mgar/pkg/libmspack/tags/ csw/mgar/pkg/libmspack/trunk/ csw/mgar/pkg/libmspack/trunk/Makefile csw/mgar/pkg/libmspack/trunk/checksums csw/mgar/pkg/libmspack/trunk/files/ csw/mgar/pkg/libmspack/trunk/files/0001-Do-not-use-gcc-specific-flags.patch Added: csw/mgar/pkg/libmspack/Makefile =================================================================== --- csw/mgar/pkg/libmspack/Makefile (rev 0) +++ csw/mgar/pkg/libmspack/Makefile 2012-03-16 10:15:11 UTC (rev 17424) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/libmspack/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libmspack/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmspack/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libmspack/trunk/Makefile 2012-03-16 10:15:11 UTC (rev 17424) @@ -0,0 +1,37 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libmspack +VERSION = 0.3alpha +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = A library for Microsoft compression formats +define BLURB +endef + +MASTER_SITES = http://www.cabextract.org.uk/libmspack/ +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES += 0001-Do-not-use-gcc-specific-flags.patch + +VENDOR_URL = http://www.cabextract.org.uk/libmspack/ + +LICENSE = COPYING.LIB + +PACKAGES += CSWlibmspack0 +SPKG_DESC_CSWlibmspack0 = A library for Microsoft compression formats, libmspack.so.0 +PKGFILES_CSWlibmspack0 += $(call pkgfiles_lib,libmspack.so.0) + +PACKAGES += CSWlibmspack-dev +SPKG_DESC_CSWlibmspack-dev = Development files for libmspack.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibmspack-dev += CSWlibmspack0 + +# For __FUNCTION__ +EXTRA_CPPFLAGS = -features=extensions -D__FUNCTION__=__func__ + +BUILD64 = 1 + +include gar/category.mk + Property changes on: csw/mgar/pkg/libmspack/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libmspack/trunk/checksums =================================================================== --- csw/mgar/pkg/libmspack/trunk/checksums (rev 0) +++ csw/mgar/pkg/libmspack/trunk/checksums 2012-03-16 10:15:11 UTC (rev 17424) @@ -0,0 +1 @@ +08d08455b6d58ea649b35febd23f6386 libmspack-0.3alpha.tar.gz Added: csw/mgar/pkg/libmspack/trunk/files/0001-Do-not-use-gcc-specific-flags.patch =================================================================== --- csw/mgar/pkg/libmspack/trunk/files/0001-Do-not-use-gcc-specific-flags.patch (rev 0) +++ csw/mgar/pkg/libmspack/trunk/files/0001-Do-not-use-gcc-specific-flags.patch 2012-03-16 10:15:11 UTC (rev 17424) @@ -0,0 +1,25 @@ +From 39ff9ff0e2e8704279cad9acbeb49d6986ee8972 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 16 Mar 2012 10:42:08 +0100 +Subject: [PATCH] Do not use gcc-specific flags + +--- + Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 3bddc33..a90e040 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -320,7 +320,7 @@ EXTRA_DIST = $(srcdir)/debian/* $(srcdir)/doc/* $(srcdir)/test/test_files/*/* + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libmspack.pc + ACLOCAL_AMFLAGS = -I m4 +-AM_CFLAGS = -Wall -W -Wno-unused $(MSPACK_FLAGS) ++AM_CFLAGS = $(MSPACK_FLAGS) + AM_CPPFLAGS = -I$(top_srcdir)/mspack -I$(top_srcdir)/test + lib_LTLIBRARIES = libmspack.la + include_HEADERS = mspack/mspack.h +-- +1.7.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 Fri Mar 16 11:20:57 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 16 Mar 2012 10:20:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[17425] csw/mgar/pkg/cups/trunk Message-ID: Revision: 17425 http://gar.svn.sourceforge.net/gar/?rev=17425&view=rev Author: cgrzemba Date: 2012-03-16 10:20:57 +0000 (Fri, 16 Mar 2012) Log Message: ----------- cups/trunk: bump version 1.5.2 Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile csw/mgar/pkg/cups/trunk/checksums Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2012-03-16 10:15:11 UTC (rev 17424) +++ csw/mgar/pkg/cups/trunk/Makefile 2012-03-16 10:20:57 UTC (rev 17425) @@ -3,7 +3,7 @@ # $Id$ NAME = cups -VERSION = 1.5.0 +VERSION = 1.5.2 CATEGORIES = net GARTYPE = v2 Modified: csw/mgar/pkg/cups/trunk/checksums =================================================================== --- csw/mgar/pkg/cups/trunk/checksums 2012-03-16 10:15:11 UTC (rev 17424) +++ csw/mgar/pkg/cups/trunk/checksums 2012-03-16 10:20:57 UTC (rev 17425) @@ -1 +1 @@ -e54ed09ede2340fc3014913333520fe4 cups-1.5.0-source.tar.bz2 +9471d2a7c920cfbb17133c32d2e6866f cups-1.5.2-source.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 16 11:43:54 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Mar 2012 10:43:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17426] csw/mgar/pkg/zabbix/trunk/Makefile Message-ID: Revision: 17426 http://gar.svn.sourceforge.net/gar/?rev=17426&view=rev Author: dmichelsen Date: 2012-03-16 10:43:53 +0000 (Fri, 16 Mar 2012) Log Message: ----------- zabbix/trunk: Rework 32/64 bit and Solaris 9/10 buildings Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2012-03-16 10:20:57 UTC (rev 17425) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2012-03-16 10:43:53 UTC (rev 17426) @@ -6,31 +6,48 @@ GARTYPE = v2-build64only CATEGORIES = server -DESCRIPTION = Brief description +DESCRIPTION = Zabbix monitoring system define BLURB - Long description endef MASTER_SITES = $(SF_MIRROR) DISTFILES = $(DISTNAME).tar.gz -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -BUILD64_ONLY = 1 +# This is just for the server which is in 64 bit only on Solars 10 +BUILD64-5.9 = +BUILD64-5.10 = 1 +BUILD64 = $(BUILD64-$(GAROSREL)) -RUNTIME_DEP_PKGS_CSWzabbix += CSWlibmysqlclient15 -RUNTIME_DEP_PKGS_CSWzabbix += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWzabbix += CSWlibz1 -RUNTIME_DEP_PKGS_CSWzabbix += CSWlibssl0-9-8 -RUNTIME_DEP_PKGS_CSWzabbix += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWzabbix += CSWlibidn11 +PACKAGES += CSWzabbix-agent +SPKG_DESC_CSWzabbix-agent = Zabbix monitoring system agent +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibiconv2 +PACKAGES-5.10 += CSWzabbix-server +PACKAGES += $(PACKAGES-$(GAROSREL)) +SPKG_DESC_CSWzabbix-server = Zabbix monitoring system server +PKGFILES_CSWzabbix-server += $(call baseisadirs,$(sbindir),zabbix_server) +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient15 +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibz1 +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibidn11 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-mysql CONFIGURE_ARGS += --with-libcurl -CONFIGURE_ARGS += --enable-server CONFIGURE_ARGS += --enable-agent CONFIGURE_ARGS += --enable-ipv6 +# We build the server only on Solaris 10 and only on 64 bit +CONFIGURE_ARGS-5.9-32 += --disable-server +CONFIGURE_ARGS-5.10-32 += --disable-server +CONFIGURE_ARGS-5.10-64 += --enable-server +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)-$(MEMORYMODEL)) + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 16 12:04:16 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Mar 2012 11:04:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[17427] csw/mgar/pkg/zabbix/trunk/Makefile Message-ID: Revision: 17427 http://gar.svn.sourceforge.net/gar/?rev=17427&view=rev Author: dmichelsen Date: 2012-03-16 11:04:16 +0000 (Fri, 16 Mar 2012) Log Message: ----------- zabbix/trunk: Enable isaexec Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2012-03-16 10:43:53 UTC (rev 17426) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2012-03-16 11:04:16 UTC (rev 17427) @@ -20,6 +20,7 @@ BUILD64-5.9 = BUILD64-5.10 = 1 BUILD64 = $(BUILD64-$(GAROSREL)) +ISAEXEC = 1 PACKAGES += CSWzabbix-agent SPKG_DESC_CSWzabbix-agent = Zabbix monitoring system agent 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 Mar 16 12:06:40 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Mar 2012 11:06:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[17428] csw/mgar/pkg/zabbix/trunk/Makefile Message-ID: Revision: 17428 http://gar.svn.sourceforge.net/gar/?rev=17428&view=rev Author: dmichelsen Date: 2012-03-16 11:06:40 +0000 (Fri, 16 Mar 2012) Log Message: ----------- zabbix/trunk: Go back to standard GAR Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2012-03-16 11:04:16 UTC (rev 17427) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2012-03-16 11:06:40 UTC (rev 17428) @@ -3,7 +3,7 @@ # NAME = zabbix VERSION = 1.8.10 -GARTYPE = v2-build64only +GARTYPE = v2 CATEGORIES = server DESCRIPTION = Zabbix monitoring system This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 16 18:02:54 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Mar 2012 17:02:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17429] csw/mgar/pkg/gstreamer Message-ID: Revision: 17429 http://gar.svn.sourceforge.net/gar/?rev=17429&view=rev Author: dmichelsen Date: 2012-03-16 17:02:53 +0000 (Fri, 16 Mar 2012) Log Message: ----------- gstreamer: Move legacy to tags Added Paths: ----------- csw/mgar/pkg/gstreamer/branches/ csw/mgar/pkg/gstreamer/tags/ csw/mgar/pkg/gstreamer/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/gstreamer/trunk/legacy/ 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 Mar 16 18:06:02 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Mar 2012 17:06:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[17430] csw/mgar/pkg/cpan/Try-Tiny/trunk Message-ID: Revision: 17430 http://gar.svn.sourceforge.net/gar/?rev=17430&view=rev Author: dmichelsen Date: 2012-03-16 17:06:01 +0000 (Fri, 16 Mar 2012) Log Message: ----------- cpan/Try-Tiny/trunk: Update to 0.11 Modified Paths: -------------- csw/mgar/pkg/cpan/Try-Tiny/trunk/Makefile csw/mgar/pkg/cpan/Try-Tiny/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Try-Tiny/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/Try-Tiny/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Try-Tiny/trunk/Makefile 2012-03-16 17:02:53 UTC (rev 17429) +++ csw/mgar/pkg/cpan/Try-Tiny/trunk/Makefile 2012-03-16 17:06:01 UTC (rev 17430) @@ -1,19 +1,19 @@ NAME = Try-Tiny -VERSION = 0.09 +VERSION = 0.11 CATEGORIES = cpan GARTYPE = v2 AUTHOR = DOY -DESCRIPTION = Minimal try/catch with proper localization of errors +DESCRIPTION = Minimal try/catch with proper localization define BLURB endef +DISTFILES += COPYING + +CATALOG_RELEASE = unstable + PACKAGES += CSWpm-try-tiny -CATALOGNAME_CSWpm-try-tiny = pm_try_tiny -# There was no information if this is pure Perl or not. Please remove if necessary. +SPKG_DESC_CSWpm-try-tiny = Minimal try/catch with proper localization ARCHALL_CSWpm-try-tiny = 1 -# Licenses need to be redone -CHECKPKG_OVERRIDES_CSWpm-try-tiny += license-missing|/opt/csw/share/doc/pm_try_tiny/license - include gar/category.mk Modified: csw/mgar/pkg/cpan/Try-Tiny/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Try-Tiny/trunk/checksums 2012-03-16 17:02:53 UTC (rev 17429) +++ csw/mgar/pkg/cpan/Try-Tiny/trunk/checksums 2012-03-16 17:06:01 UTC (rev 17430) @@ -1 +1 @@ -e526aa7d80cbc690c4a20925a592c13c Try-Tiny-0.09.tar.gz +4d2c8ff385ac3513edf4c042dd0eacbe Try-Tiny-0.11.tar.gz Added: csw/mgar/pkg/cpan/Try-Tiny/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Try-Tiny/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Try-Tiny/trunk/files/COPYING 2012-03-16 17:06:01 UTC (rev 17430) @@ -0,0 +1,4 @@ +Copyright (c) 2009 Yuval Kogman. All rights reserved. +This program is free software; you can redistribute +it and/or modify it under the terms of the MIT license. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 16 18:10:08 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Mar 2012 17:10:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17431] csw/mgar/pkg/cpan/IO-String/trunk Message-ID: Revision: 17431 http://gar.svn.sourceforge.net/gar/?rev=17431&view=rev Author: dmichelsen Date: 2012-03-16 17:10:08 +0000 (Fri, 16 Mar 2012) Log Message: ----------- cpan/IO-String/trunk: Sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/IO-String/trunk/Makefile csw/mgar/pkg/cpan/IO-String/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/IO-String/trunk/files/CSWpmiostring.depend csw/mgar/pkg/cpan/IO-String/trunk/files/CSWpmiostring.gspec csw/mgar/pkg/cpan/IO-String/trunk/files/CSWpmiostring.prototype Modified: csw/mgar/pkg/cpan/IO-String/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-String/trunk/Makefile 2012-03-16 17:06:01 UTC (rev 17430) +++ csw/mgar/pkg/cpan/IO-String/trunk/Makefile 2012-03-16 17:10:08 UTC (rev 17431) @@ -4,16 +4,19 @@ GARTYPE = v2 AUTHOR = GAAS -DESCRIPTION = emulate file interface for in-core strings +DESCRIPTION = IO::File interface for in-core strings define BLURB - The IO::String module provides the IO::File interface for in-core strings. - An IO::String object can be attached to a string, and makes it possible to - use the normal file operations for reading or writing data, as well as for - seeking to various locations of the string. This is useful when you want to - use a library module that only provides an interface to file handles on data - that you have in a string variable. endef -DISTFILES = $(call admfiles,CSWpmiostring,depend prototype) +CATALOG_RELEASE = unstable +LICENSE_TEXT = This module is licensed under the Perl license + +PACKAGES += CSWpm-io-string +CATALOGNAME_CSWpm-io-string = pm_io_string +SPKG_DESC_CSWpm-io-string = IO::File interface for in-core strings +ARCHALL_CSWpm-io-string = 1 +OBSOLETED_BY_CSWpm-io-string += CSWpmiostring +CATALOGNAME_CSWpmiostring = pm_iostring_stub + include gar/category.mk Modified: csw/mgar/pkg/cpan/IO-String/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IO-String/trunk/checksums 2012-03-16 17:06:01 UTC (rev 17430) +++ csw/mgar/pkg/cpan/IO-String/trunk/checksums 2012-03-16 17:10:08 UTC (rev 17431) @@ -1,4 +1 @@ -ac36f3ef5a212195ff878eb5f2f81d6e download/CSWpmiostring.gspec -6e0d583c86d7f74b43769810714242aa download/CSWpmiostring.depend -cc5fabc58226bdb2e0ab3be8fe7ae760 download/CSWpmiostring.prototype -250e5424f290299fc3d6b5d1e9da3835 download/IO-String-1.08.tar.gz +250e5424f290299fc3d6b5d1e9da3835 IO-String-1.08.tar.gz Deleted: csw/mgar/pkg/cpan/IO-String/trunk/files/CSWpmiostring.depend =================================================================== Deleted: csw/mgar/pkg/cpan/IO-String/trunk/files/CSWpmiostring.gspec =================================================================== --- csw/mgar/pkg/cpan/IO-String/trunk/files/CSWpmiostring.gspec 2012-03-16 17:06:01 UTC (rev 17430) +++ csw/mgar/pkg/cpan/IO-String/trunk/files/CSWpmiostring.gspec 2012-03-16 17:10:08 UTC (rev 17431) @@ -1,9 +0,0 @@ -%var bitname pm_iostring -%var pkgname CSWpmiostring -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 1998-2004 Gisle Aas. - -This library is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/IO-String/trunk/files/CSWpmiostring.prototype =================================================================== --- csw/mgar/pkg/cpan/IO-String/trunk/files/CSWpmiostring.prototype 2012-03-16 17:06:01 UTC (rev 17430) +++ csw/mgar/pkg/cpan/IO-String/trunk/files/CSWpmiostring.prototype 2012-03-16 17:10:08 UTC (rev 17431) @@ -1,15 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/IO 0755 root bin -d none /opt/csw/lib/perl/csw/auto/IO/String 0755 root bin -f none /opt/csw/lib/perl/csw/auto/IO/String/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/IO::String.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/IO 0755 root bin -f none /opt/csw/share/perl/csw/IO/String.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 16 18:18:11 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Mar 2012 17:18:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17432] csw/mgar/pkg/cpan Message-ID: Revision: 17432 http://gar.svn.sourceforge.net/gar/?rev=17432&view=rev Author: dmichelsen Date: 2012-03-16 17:18:11 +0000 (Fri, 16 Mar 2012) Log Message: ----------- cpan/Test-Fatal/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Test-Fatal/ csw/mgar/pkg/cpan/Test-Fatal/branches/ csw/mgar/pkg/cpan/Test-Fatal/tags/ csw/mgar/pkg/cpan/Test-Fatal/trunk/ csw/mgar/pkg/cpan/Test-Fatal/trunk/Makefile csw/mgar/pkg/cpan/Test-Fatal/trunk/checksums csw/mgar/pkg/cpan/Test-Fatal/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Test-Fatal/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Test-Fatal/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Fatal/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Test-Fatal/trunk/Makefile 2012-03-16 17:18:11 UTC (rev 17432) @@ -0,0 +1,21 @@ +NAME = Test-Fatal +VERSION = 0.010 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = RJBS + +DESCRIPTION = Incredibly simple helpers for testing code with exceptions +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +PACKAGES += CSWpm-test-fatal +CATALOGNAME_CSWpm-test-fatal = pm_test_fatal +SPKG_DESC_CSWpm-test-fatal = Incredibly simple helpers for testing code with exceptions +ARCHALL_CSWpm-test-fatal = 1 +RUNTIME_DEP_PKGS_CSWpm-test-fatal += CSWpm-try-tiny + +include gar/category.mk Added: csw/mgar/pkg/cpan/Test-Fatal/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-Fatal/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Test-Fatal/trunk/checksums 2012-03-16 17:18:11 UTC (rev 17432) @@ -0,0 +1 @@ +d8052d4160e8d999cbeb574592f26541 Test-Fatal-0.010.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 Mar 16 18:30:34 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Mar 2012 17:30:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[17433] csw/mgar/pkg/cpan Message-ID: Revision: 17433 http://gar.svn.sourceforge.net/gar/?rev=17433&view=rev Author: dmichelsen Date: 2012-03-16 17:30:33 +0000 (Fri, 16 Mar 2012) Log Message: ----------- cpan/Redis/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Redis/ csw/mgar/pkg/cpan/Redis/branches/ csw/mgar/pkg/cpan/Redis/tags/ csw/mgar/pkg/cpan/Redis/trunk/ csw/mgar/pkg/cpan/Redis/trunk/Makefile csw/mgar/pkg/cpan/Redis/trunk/checksums csw/mgar/pkg/cpan/Redis/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Redis/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Redis/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Redis/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Redis/trunk/Makefile 2012-03-16 17:30:33 UTC (rev 17433) @@ -0,0 +1,26 @@ +NAME = Redis +VERSION = 1.951 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = MELO + +DESCRIPTION = Perl binding for Redis database +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +BUILD_DEP_PKGS += CSWpm-test-fatal +BUILD_DEP_PKGS += CSWpm-test-exception +BUILD_DEP_PKGS += CSWpm-io-string +BUILD_DEP_PKGS += CSWpm-test-deep + +PACKAGES += CSWpm-redis +CATALOGNAME_CSWpm-redis = pm_redis +SPKG_DESC_CSWpm-redis = Perl binding for Redis database +ARCHALL_CSWpm-redis = 1 +RUNTIME_DEP_PKGS_CSWpm-redis += CSWpm-try-tiny + +include gar/category.mk Added: csw/mgar/pkg/cpan/Redis/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Redis/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Redis/trunk/checksums 2012-03-16 17:30:33 UTC (rev 17433) @@ -0,0 +1 @@ +99c5bd9f9893c9ced5bd3fcbcdb101a9 Redis-1.951.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 16 19:06:51 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 16 Mar 2012 18:06:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[17434] csw/mgar/pkg/alpine/trunk Message-ID: Revision: 17434 http://gar.svn.sourceforge.net/gar/?rev=17434&view=rev Author: bdwalton Date: 2012-03-16 18:06:50 +0000 (Fri, 16 Mar 2012) Log Message: ----------- alpine/trunk: import a split out makefile into the main recipe Modified Paths: -------------- csw/mgar/pkg/alpine/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/alpine/trunk/files/install_scripts.mk Modified: csw/mgar/pkg/alpine/trunk/Makefile =================================================================== --- csw/mgar/pkg/alpine/trunk/Makefile 2012-03-16 17:30:33 UTC (rev 17433) +++ csw/mgar/pkg/alpine/trunk/Makefile 2012-03-16 18:06:50 UTC (rev 17434) @@ -54,11 +54,48 @@ CONFIGURE_ARGS += --with-spellcheck-prog=$(bindir)/aspell ## Libs that are not get set correctly in Makefiles -LIBS += -lm -lgssapi_krb5 -lkrb5 -lintl -liconv -export LIBS +EXTRA_LIBS += -lm -lgssapi_krb5 -lkrb5 -lintl -liconv RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv CSWtcl CSWsasl CSWosslrt RUNTIME_DEP_PKGS += CSWkrb5lib CSWlibnet CSWncurses CSWoldaprt -include files/install_scripts.mk include gar/category.mk + +PI_SCRIPTS = cleanup-web +PI_SCRIPTS += install-mlock +PI_SCRIPTS += install-web + +post-install-modulated: $(PI_SCRIPTS) + + +install-mlock: + @(echo "==> Installing mlock") + (ginstall -d $(DESTDIR)$(sbindir)) + @(gcp $(WORKSRC)/imap/mlock/mlock $(DESTDIR)$(sbindir)) + @$(MAKECOOKIE) + +cleanup-web: + @(grm -fr $(DESTDIR)/home) + +install-web: + @(echo "==> Installing Web Interface") + @(ginstall -d $(DESTDIR)$(libexecdir)/alpine-2.00) + @(gcp -R $(WORKSRC)/web/* $(DESTDIR)$(libexecdir)/alpine-2.00) + @(gcp $(WORKSRC)/web/src/pubcookie/wp_gssapi_proxy \ + $(DESTDIR)$(libexecdir)/alpine-2.00/bin) + @(gcp $(WORKSRC)/web/src/pubcookie/wp_tclsh \ + $(DESTDIR)$(libexecdir)/alpine-2.00/bin) + @(gcp $(WORKSRC)/web/src/pubcookie/wp_uidmapper \ + $(DESTDIR)$(libexecdir)/alpine-2.00/bin) + @(gcp $(WORKSRC)/web/src/pubcookie/wp_umc \ + $(DESTDIR)$(libexecdir)/alpine-2.00/bin) + @(gcp $(WORKSRC)/web/src/pubcookie/debug.cgi \ + $(DESTDIR)$(libexecdir)/alpine-2.00/bin) + @(grm -fr $(DESTDIR)$(libexecdir)/alpine-2.00/src) + @(grm -f $(DESTDIR)$(libexecdir)/alpine-2.00/bin/tclsh) + @(gln -s $(bindir)/tclsh \ + $(DESTDIR)$(libexecdir)/alpine-2.00/bin/tclsh) + @(cd $(DESTDIR)$(libexecdir); gln -s ./alpine-2.00 ./alpine) + + + Deleted: csw/mgar/pkg/alpine/trunk/files/install_scripts.mk =================================================================== --- csw/mgar/pkg/alpine/trunk/files/install_scripts.mk 2012-03-16 17:30:33 UTC (rev 17433) +++ csw/mgar/pkg/alpine/trunk/files/install_scripts.mk 2012-03-16 18:06:50 UTC (rev 17434) @@ -1,38 +0,0 @@ -PI_SCRIPTS = cleanup-web -PI_SCRIPTS += install-mlock -PI_SCRIPTS += install-web - -post-install-modulated: $(PI_SCRIPTS) - - -install-mlock: - @(echo "==> Installing mlock") - (ginstall -d $(DESTDIR)$(sbindir)) - @(gcp $(WORKSRC)/imap/mlock/mlock $(DESTDIR)$(sbindir)) - @$(MAKECOOKIE) - -cleanup-web: - @(grm -fr $(DESTDIR)/home) - -install-web: - @(echo "==> Installing Web Interface") - @(ginstall -d $(DESTDIR)$(libexecdir)/alpine-2.00) - @(gcp -R $(WORKSRC)/web/* $(DESTDIR)$(libexecdir)/alpine-2.00) - @(gcp $(WORKSRC)/web/src/pubcookie/wp_gssapi_proxy \ - $(DESTDIR)$(libexecdir)/alpine-2.00/bin) - @(gcp $(WORKSRC)/web/src/pubcookie/wp_tclsh \ - $(DESTDIR)$(libexecdir)/alpine-2.00/bin) - @(gcp $(WORKSRC)/web/src/pubcookie/wp_uidmapper \ - $(DESTDIR)$(libexecdir)/alpine-2.00/bin) - @(gcp $(WORKSRC)/web/src/pubcookie/wp_umc \ - $(DESTDIR)$(libexecdir)/alpine-2.00/bin) - @(gcp $(WORKSRC)/web/src/pubcookie/debug.cgi \ - $(DESTDIR)$(libexecdir)/alpine-2.00/bin) - @(grm -fr $(DESTDIR)$(libexecdir)/alpine-2.00/src) - @(grm -f $(DESTDIR)$(libexecdir)/alpine-2.00/bin/tclsh) - @(gln -s $(bindir)/tclsh \ - $(DESTDIR)$(libexecdir)/alpine-2.00/bin/tclsh) - @(cd $(DESTDIR)$(libexecdir); gln -s ./alpine-2.00 ./alpine) - - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Mar 17 03:29:19 2012 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 17 Mar 2012 02:29:19 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[616] web/wordpresscsw/wp-content/themes/opencsw/ packagesDAO.php Message-ID: Revision: 616 http://opencsw.svn.sourceforge.net/opencsw/?rev=616&view=rev Author: wbonnet Date: 2012-03-17 02:29:19 +0000 (Sat, 17 Mar 2012) Log Message: ----------- screen _stub packages from the global package list Modified Paths: -------------- web/wordpresscsw/wp-content/themes/opencsw/packagesDAO.php Modified: web/wordpresscsw/wp-content/themes/opencsw/packagesDAO.php =================================================================== --- web/wordpresscsw/wp-content/themes/opencsw/packagesDAO.php 2012-02-23 20:12:57 UTC (rev 615) +++ web/wordpresscsw/wp-content/themes/opencsw/packagesDAO.php 2012-03-17 02:29:19 UTC (rev 616) @@ -146,7 +146,7 @@ function getListOfPackages() { // Define the query used to retrieve the packages from the database - $sqlQuery = "select software, version, description, pkgname from packages order by software asc ; " ; + $sqlQuery = "select software, version, description, pkgname from packages where software not like '%_stub' order by software asc ; " ; // Execute the query to retrieve the row to update $this->execQuery($sqlQuery); 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 Mar 17 11:58:14 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 17 Mar 2012 10:58:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[17435] csw/mgar/pkg/lang-python/python-gflags/trunk Message-ID: Revision: 17435 http://gar.svn.sourceforge.net/gar/?rev=17435&view=rev Author: wahwah Date: 2012-03-17 10:58:14 +0000 (Sat, 17 Mar 2012) Log Message: ----------- lang-python/python-gflags/trunk: upgrade to 2.0 Modified Paths: -------------- csw/mgar/pkg/lang-python/python-gflags/trunk/Makefile csw/mgar/pkg/lang-python/python-gflags/trunk/checksums Modified: csw/mgar/pkg/lang-python/python-gflags/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-gflags/trunk/Makefile 2012-03-16 18:06:50 UTC (rev 17434) +++ csw/mgar/pkg/lang-python/python-gflags/trunk/Makefile 2012-03-17 10:58:14 UTC (rev 17435) @@ -3,10 +3,10 @@ # $Id$ NAME = python-gflags -VERSION = 1.3 +VERSION = 2.0 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = python equivalent of google-gflags, a Google commandline flag implementation +DESCRIPTION = Commandline flags module for Python define BLURB This project is the python equivalent of google-gflags, a Google commandline flag implementation for C++. It is intended to be used in situations where a @@ -18,7 +18,10 @@ MASTER_SITES = $(GOOGLE_MIRROR) DISTNAME = $(NAME)-$(VERSION) DISTFILES = $(DISTNAME).tar.gz + +UPSTREAM_MASTER_SITES = http://code.google.com/p/$(NAME)/downloads/list UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + PACKAGES = CSWpy-gflags CATALOGNAME = py_gflags ARCHALL_CSWpy-gflags = 1 Modified: csw/mgar/pkg/lang-python/python-gflags/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-gflags/trunk/checksums 2012-03-16 18:06:50 UTC (rev 17434) +++ csw/mgar/pkg/lang-python/python-gflags/trunk/checksums 2012-03-17 10:58:14 UTC (rev 17435) @@ -1 +1 @@ -791a93cfbcea94e35576865c9c1e8ee3 python-gflags-1.3.tar.gz +c3ab70218dbf945cc32c0cd64c51d162 python-gflags-2.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 17 13:01:51 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 17 Mar 2012 12:01:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[17436] csw/mgar/pkg/lang-python Message-ID: Revision: 17436 http://gar.svn.sourceforge.net/gar/?rev=17436&view=rev Author: wahwah Date: 2012-03-17 12:01:50 +0000 (Sat, 17 Mar 2012) Log Message: ----------- google-apputils: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/google-apputils/trunk/Makefile csw/mgar/pkg/lang-python/google-apputils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/google-apputils/ Modified: csw/mgar/pkg/lang-python/google-apputils/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-gflags/trunk/Makefile 2012-03-10 23:42:53 UTC (rev 17354) +++ csw/mgar/pkg/lang-python/google-apputils/trunk/Makefile 2012-03-17 12:01:50 UTC (rev 17436) @@ -2,24 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = python-gflags -VERSION = 1.3 +NAME = google-apputils +VERSION = 0.3.0 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = python equivalent of google-gflags, a Google commandline flag implementation +DESCRIPTION = Google Application Utilities for Python define BLURB - This project is the python equivalent of google-gflags, a Google commandline - flag implementation for C++. It is intended to be used in situations where a - project wants to mimic the command-line flag handling of a C++ app that uses - google-gflags, or for a Python app that, via swig or some other means, is - linked with a C++ app that uses google-gflags. endef -SPKG_SOURCEURL = http://code.google.com/p/python-gflags/ -MASTER_SITES = $(GOOGLE_MIRROR) -DISTNAME = $(NAME)-$(VERSION) -DISTFILES = $(DISTNAME).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWpy-gflags -CATALOGNAME = py_gflags -ARCHALL_CSWpy-gflags = 1 +DISTFILES = $(DISTNAME).tar.gz +PACKAGES = CSWpy-google-apputils +ARCHALL_CSWpy-google-apputils = 1 include gar/category.mk Modified: csw/mgar/pkg/lang-python/google-apputils/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-gflags/trunk/checksums 2012-03-10 23:42:53 UTC (rev 17354) +++ csw/mgar/pkg/lang-python/google-apputils/trunk/checksums 2012-03-17 12:01:50 UTC (rev 17436) @@ -1 +1 @@ -791a93cfbcea94e35576865c9c1e8ee3 python-gflags-1.3.tar.gz +235ab202502b850f8dd9bed28d772704 google-apputils-0.3.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 17 22:14:24 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 17 Mar 2012 21:14:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17437] csw/mgar/pkg/v8/trunk Message-ID: Revision: 17437 http://gar.svn.sourceforge.net/gar/?rev=17437&view=rev Author: wahwah Date: 2012-03-17 21:14:23 +0000 (Sat, 17 Mar 2012) Log Message: ----------- Second take at building V8 Since the last time, the build system changed from scons to GYP. I decided to have own SONAME versioning. Not sure if it's a great idea, but it'll work for now. There are some failing unit tests, I'll investigate it at some point. Modified Paths: -------------- csw/mgar/pkg/v8/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/v8/trunk/files/0001-Link-with-librt-on-Solaris-by-default.patch csw/mgar/pkg/v8/trunk/files/0002-Comment-out-unused-variables.patch csw/mgar/pkg/v8/trunk/files/0003-Cast-to-wint_t-which-is-what-lc-expects.patch Modified: csw/mgar/pkg/v8/trunk/Makefile =================================================================== --- csw/mgar/pkg/v8/trunk/Makefile 2012-03-17 12:01:50 UTC (rev 17436) +++ csw/mgar/pkg/v8/trunk/Makefile 2012-03-17 21:14:23 UTC (rev 17437) @@ -3,10 +3,7 @@ # $Id$ NAME = v8 -VERSION = 3.6.0 -DASH_VERSION = 3-6-0 -UNDER_VERSION = 3_6_0 -# VERSION = bleeding_edge +VERSION = 0.2012.03 DESCRIPTION = Open source JavaScript engine from Google CATEGORIES = lib GARTYPE = v2 @@ -20,63 +17,93 @@ NOCHECKSUM = bleeding_edge DISTNAME = bleeding_edge BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -BUILD_DEP_PKGS += CSWscons CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(NAME) INSTALL_SCRIPTS = $(NAME) -TEST_SCRIPTS = $(NAME) +TEST_SCRIPTS = GARCOMPILER = GNU SONAME_V = $(VERSION) +NOGITPATCH = 1 + PACKAGING_PLATFORMS = solaris10-i386 -PACKAGES += CSWlibv8-3-6-0 -CATALOGNAME_CSWlibv8-3-6-0 = libv8_3_6_0 -PKGFILES_CSWlibv8-3-6-0 += $(call baseisadirs,$(libdir),libv8-3\.6\.0\.so) -PKGFILES_CSWlibv8-3-6-0 += $(call baseisadirs,$(libdir),libv8-3\.6\.0\.so(\.\d+)*) -SPKG_DESC_CSWlibv8-3-6-0 += $(DESCRIPTION), libv8-3.6.0.so +LICENSE = LICENSE -PACKAGES += CSWlibv8-dev -SPKG_DESC_CSWlibv8-dev += $(DESCRIPTION), development files +# The V8 build system thinks we are on a 32-bit host and disallows a 64-bit +# build. +# BUILD64 = 1 -# 64-bit support via a special scons option; passing CFLAGS and CXXFLAGS does -# not work here. -SCONS_ARCH_isa-amd64 = arch=x64 -SCONS_ARCH += $(SCONS_ARCH_$(MODULATION)) +PATCHFILES += 0001-Link-with-librt-on-Solaris-by-default.patch +PATCHFILES += 0002-Comment-out-unused-variables.patch +PATCHFILES += 0003-Cast-to-wint_t-which-is-what-lc-expects.patch -LICENSE = LICENSE - -BUILD64 = 1 - -SCONS_ENV += CC=/opt/csw/gcc4/bin/gcc -SCONS_ENV += CXX=/opt/csw/gcc4/bin/g++ -SCONS_ENV += RANLIB=/opt/csw/gcc4/bin/ranlib +SCONS_ENV += CC=/opt/csw/bin/gcc +SCONS_ENV += CXX=/opt/csw/bin/g++ +SCONS_ENV += RANLIB=/opt/csw/bin/ranlib SCONS_ENV += LD=/opt/csw/bin/gld SCONS_ENV += AR=/opt/csw/bin/gar -SCONS_ENV += SHCXX=/opt/csw/gcc4/bin/g++ -SCONS_ENV += LINKFLAGS=-R/opt/csw/gcc4/lib +SCONS_ENV += SHCXX=/opt/csw/bin/g++ +SCONS_ENV += LINKFLAGS=-R/opt/csw/lib -SCONS_OPTS = visibility=default library=shared toolchain=gcc soname=on +LINK = $(CXX) +LD_ALTEXEC = /opt/csw/bin/gld +EXTRA_BUILD_EXPORTS = LINK LD_ALTEXEC +BUILD_OPTS += visibility=default +BUILD_OPTS += library=shared +BUILD_OPTS += toolchain=gcc +BUILD_OPTS += soname=on +BUILD_OPTS += soname_version=$(VERSION) + +GYPFLAGS = -D OS=solaris + +OBJDIR = $(abspath $(WORKDIR)/objdir) + +# 64-bit support via a special option; passing CFLAGS and CXXFLAGS does +# not work here. +# It would be better to use MEMORY_MODEL or something similar from GAR. +V8_TARGET_isa-pentium_pro = ia32 +V8_TARGET_isa-amd64 = x64 +V8_TARGET = $(V8_TARGET_$(MODULATION)) + +PACKAGES += CSWlibv8-dev +SPKG_DESC_CSWlibv8-dev += $(DESCRIPTION), development files +RUNTIME_DEP_PKGS_CSWlibv8-dev += CSWlibv8-0-2012-03 + +PACKAGES += CSWlibv8-0-2012-03 +PKGFILES_CSWlibv8-0-2012-03 += $(call baseisadirs,$(libdir),libv8\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibv8-0-2012-03 += $(DESCRIPTION), the shared library +RUNTIME_DEP_PKGS_CSWlibv8-0-2012-03 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibv8-0-2012-03 += CSWlibstdc++6 + include gar/category.mk +post-extract-modulated: + (cd $(WORKSRC); \ + gmake dependencies; \ + cd build/gyp; \ + svn update; \ + ) + @$(MAKECOOKIE) + build-$(NAME): - (cd $(WORKSRC); mkdir -p build-solaris; \ - cd build-solaris; \ - $(SCONS_ENV) \ - \ - scons \ - -Y .. \ - $(SCONS_ARCH) \ - $(SCONS_OPTS) \ - -j3 \ - ) + (cd $(WORKSRC); \ + $(BUILD_ENV) \ + gmake \ + $(PARALLELMFLAGS) \ + $(BUILD_OPTS) \ + $(V8_TARGET).release; \ + ) @$(MAKECOOKIE) install-$(NAME): ginstall -d -m 755 $(DESTDIR)$(libdir) - ginstall -m 755 $(WORKSRC)/build-solaris/lib$(NAME)-$(SONAME_V).so $(DESTDIR)$(libdir) - ln -sf lib$(NAME)-$(SONAME_V).so $(DESTDIR)$(libdir)/lib$(NAME).so + # ginstall -m 755 $(WORKSRC)/build-solaris/lib$(NAME)-$(SONAME_V).so $(DESTDIR)$(libdir) + ginstall -m 755 \ + $(WORKSRC)/out/$(V8_TARGET).release/obj.target/tools/gyp/lib$(NAME).so.$(SONAME_V) \ + $(DESTDIR)$(libdir) + ln -sf lib$(NAME).so.$(SONAME_V) $(DESTDIR)$(libdir)/lib$(NAME).so ginstall -d -m 755 $(DESTDIR)$(includedir) for f in $(WORKSRC)/include/*.h; do \ ginstall -m 644 $${f} $(DESTDIR)$(includedir); \ @@ -84,15 +111,4 @@ tree $(DESTDIR) @$(MAKECOOKIE) -test-$(NAME): - (cd $(WORKSRC)/build-solaris; \ - $(SCONS_ENV) scons -Y .. $(SCONS_OPTS) d8) - (cd $(WORKSRC)/build-solaris; \ - $(SCONS_ENV) \ - ../tools/test.py \ - --shell=d8 \ - -S toolchain=gcc \ - -S library=shared \ - -S soname=on \ - -S visibility=default \ - ) +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/v8/trunk/files/0001-Link-with-librt-on-Solaris-by-default.patch =================================================================== --- csw/mgar/pkg/v8/trunk/files/0001-Link-with-librt-on-Solaris-by-default.patch (rev 0) +++ csw/mgar/pkg/v8/trunk/files/0001-Link-with-librt-on-Solaris-by-default.patch 2012-03-17 21:14:23 UTC (rev 17437) @@ -0,0 +1,25 @@ +From 984e4cd19712fe343e5e89cf3178f7edf7cfde49 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 17 Mar 2012 16:14:05 +0100 +Subject: [PATCH 1/3] Link with librt on Solaris by default + +--- + tools/gyp/v8.gyp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp +index 764789a..26044d4 100644 +--- a/tools/gyp/v8.gyp ++++ b/tools/gyp/v8.gyp +@@ -712,7 +712,7 @@ + ['OS=="solaris"', { + 'link_settings': { + 'libraries': [ +- '-lsocket -lnsl', ++ '-lsocket -lnsl -lrt', + ]}, + 'sources': [ + '../../src/platform-solaris.cc', +-- +1.7.5.4 + Added: csw/mgar/pkg/v8/trunk/files/0002-Comment-out-unused-variables.patch =================================================================== --- csw/mgar/pkg/v8/trunk/files/0002-Comment-out-unused-variables.patch (rev 0) +++ csw/mgar/pkg/v8/trunk/files/0002-Comment-out-unused-variables.patch 2012-03-17 21:14:23 UTC (rev 17437) @@ -0,0 +1,32 @@ +From 75f5cb77a6c85eed7118a5fd2feafb97aa34ec2a Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 17 Mar 2012 16:14:33 +0100 +Subject: [PATCH 2/3] Comment out unused variables + +Otherwise the compilation breaks on them. +--- + src/platform-solaris.cc | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/platform-solaris.cc b/src/platform-solaris.cc +index 50ad353..967d4b6 100644 +--- a/src/platform-solaris.cc ++++ b/src/platform-solaris.cc +@@ -491,12 +491,12 @@ void Thread::set_name(const char* name) { + + + void Thread::Start() { +- pthread_attr_t* attr_ptr = NULL; ++ // pthread_attr_t* attr_ptr = NULL; + pthread_attr_t attr; + if (stack_size_ > 0) { + pthread_attr_init(&attr); + pthread_attr_setstacksize(&attr, static_cast(stack_size_)); +- attr_ptr = &attr; ++ // attr_ptr = &attr; + } + pthread_create(&data_->thread_, NULL, ThreadEntry, this); + ASSERT(data_->thread_ != kNoThread); +-- +1.7.5.4 + Added: csw/mgar/pkg/v8/trunk/files/0003-Cast-to-wint_t-which-is-what-lc-expects.patch =================================================================== --- csw/mgar/pkg/v8/trunk/files/0003-Cast-to-wint_t-which-is-what-lc-expects.patch (rev 0) +++ csw/mgar/pkg/v8/trunk/files/0003-Cast-to-wint_t-which-is-what-lc-expects.patch 2012-03-17 21:14:23 UTC (rev 17437) @@ -0,0 +1,25 @@ +From 4a75db1a8ceffd45248e773b1bbf062938446b60 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 17 Mar 2012 16:15:13 +0100 +Subject: [PATCH 3/3] Cast to wint_t which is what %lc expects. + +--- + test/cctest/test-compiler.cc | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/test/cctest/test-compiler.cc b/test/cctest/test-compiler.cc +index 9ca0b0a..2345449 100644 +--- a/test/cctest/test-compiler.cc ++++ b/test/cctest/test-compiler.cc +@@ -75,7 +75,7 @@ v8::Handle PrintExtension::Print(const v8::Arguments& args) { + uint16_t* string = NewArray(length + 1); + string_obj->Write(string); + for (int j = 0; j < length; j++) +- printf("%lc", static_cast(string[j])); ++ printf("%lc", static_cast(string[j])); + DeleteArray(string); + } + printf("\n"); +-- +1.7.5.4 + 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 Mar 18 07:51:10 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Mar 2012 06:51:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[17438] csw/mgar/pkg/libgmp/trunk Message-ID: Revision: 17438 http://gar.svn.sourceforge.net/gar/?rev=17438&view=rev Author: wahwah Date: 2012-03-18 06:51:09 +0000 (Sun, 18 Mar 2012) Log Message: ----------- libgmp/trunk: Version bump to 5.0.4 Modified Paths: -------------- csw/mgar/pkg/libgmp/trunk/Makefile csw/mgar/pkg/libgmp/trunk/checksums Modified: csw/mgar/pkg/libgmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgmp/trunk/Makefile 2012-03-17 21:14:23 UTC (rev 17437) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2012-03-18 06:51:09 UTC (rev 17438) @@ -1,7 +1,7 @@ # $Id$ NAME = gmp -VERSION = 5.0.2 +VERSION = 5.0.4 CATEGORIES = lib GARTYPE = v2 Modified: csw/mgar/pkg/libgmp/trunk/checksums =================================================================== --- csw/mgar/pkg/libgmp/trunk/checksums 2012-03-17 21:14:23 UTC (rev 17437) +++ csw/mgar/pkg/libgmp/trunk/checksums 2012-03-18 06:51:09 UTC (rev 17438) @@ -1 +1 @@ -0bbaedc82fb30315b06b1588b9077cd3 gmp-5.0.2.tar.bz2 +50c3edcb7c9438e04377ee9a1a061b79 gmp-5.0.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 18 07:56:54 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Mar 2012 06:56:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17439] csw/mgar/pkg/tightvnc/trunk Message-ID: Revision: 17439 http://gar.svn.sourceforge.net/gar/?rev=17439&view=rev Author: wahwah Date: 2012-03-18 06:56:54 +0000 (Sun, 18 Mar 2012) Log Message: ----------- tightvnc/trunk: Adding PATH to the startup script, https://www.opencsw.org/mantis/view.php?id=4658 Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile csw/mgar/pkg/tightvnc/trunk/files/cswvncserver Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2012-03-18 06:51:09 UTC (rev 17438) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2012-03-18 06:56:54 UTC (rev 17439) @@ -23,7 +23,6 @@ SPKG_SOURCEURL = http://www.tightvnc.org/ UPSTREAM_USE_SF = 1 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=14067 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)_unixsrc.tar.bz2 DISTNAME = vnc_unixsrc PKGFILES_CSWvncv = $(bindir)/vncviewer PKGFILES_CSWvncv += $(mandir)/man1/vncviewer\.1 Modified: csw/mgar/pkg/tightvnc/trunk/files/cswvncserver =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/cswvncserver 2012-03-18 06:51:09 UTC (rev 17438) +++ csw/mgar/pkg/tightvnc/trunk/files/cswvncserver 2012-03-18 06:56:54 UTC (rev 17439) @@ -6,6 +6,7 @@ # description: Starts and stops vncserver. \ # used to provide remote X administration services. +PATH=/opt/csw/bin:/usr/openwin/bin:/usr/bin VNCSERVERS="" ARGS="" VNCSERVERS_CONF="/etc/opt/csw/vncservers/vncservers" 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 Mar 18 08:09:05 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Mar 2012 07:09:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[17440] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 17440 http://gar.svn.sourceforge.net/gar/?rev=17440&view=rev Author: wahwah Date: 2012-03-18 07:09:05 +0000 (Sun, 18 Mar 2012) Log Message: ----------- qt4-gcc/trunk: Bad file content is okay in a doc package 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-03-18 06:56:54 UTC (rev 17439) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-03-18 07:09:05 UTC (rev 17440) @@ -126,5 +126,6 @@ # These are code examples. CHECKPKG_OVERRIDES_CSWqt4-gxx-doc += binary-architecture-does-not-match-placement +CHECKPKG_OVERRIDES_CSWqt4-gxx-doc += file-with-bad-content include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 18 09:27:14 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Mar 2012 08:27:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[17441] csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng. preinstall Message-ID: Revision: 17441 http://gar.svn.sourceforge.net/gar/?rev=17441&view=rev Author: wahwah Date: 2012-03-18 08:27:14 +0000 (Sun, 18 Mar 2012) Log Message: ----------- syslog_ng/trunk: Do not disable Solaris syslogd Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall Modified: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall 2012-03-18 07:09:05 UTC (rev 17440) +++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall 2012-03-18 08:27:14 UTC (rev 17441) @@ -3,10 +3,15 @@ # $Id$ # -if [ -x /usr/sbin/svcadm ]; then - echo "Disabling svc:/system/system-log:default" - /usr/sbin/svcadm disable svc:/system/system-log:default -fi +# Until we have a better solution. +# https://www.opencsw.org/mantis/view.php?id=4409 +# if [ -x /usr/sbin/svcadm ]; then +# echo "Disabling svc:/system/system-log:default" +# /usr/sbin/svcadm disable svc:/system/system-log:default +# fi +# +# When autoenable_daemons is not set to off, syslog_ng will attempt to start +# in the presence of the stock Solaris syslogd, and will fail. # The assumption is that this script is going to be run from the global zone # first. The -f option is for the rm command not to complain if it can't remove 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 Mar 18 13:44:14 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Mar 2012 12:44:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[17442] csw/mgar/pkg/syslog_ng/trunk Message-ID: Revision: 17442 http://gar.svn.sourceforge.net/gar/?rev=17442&view=rev Author: wahwah Date: 2012-03-18 12:44:14 +0000 (Sun, 18 Mar 2012) Log Message: ----------- syslog_ng/trunk: Renamed the package, version rollback to the one that builds Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile csw/mgar/pkg/syslog_ng/trunk/checksums Added Paths: ----------- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.cswreleasenotes csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.postremove csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.preinstall Removed Paths: ------------- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.cswreleasenotes csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2012-03-18 08:27:14 UTC (rev 17441) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2012-03-18 12:44:14 UTC (rev 17442) @@ -1,7 +1,7 @@ # $Id$ NAME = syslog-ng -VERSION = 3.3.3 +VERSION = 3.2.5 CATEGORIES = server GARTYPE = v2 @@ -16,9 +16,9 @@ DISTFILES = $(NAME)_$(VERSION).tar.gz DISTFILES += $(NAME).conf.CSW DISTFILES += cswsyslog_ng -DISTFILES += CSWsyslogng.preinstall -DISTFILES += CSWsyslogng.postremove -DISTFILES += CSWsyslogng.cswreleasenotes +DISTFILES += CSWsyslog-ng.preinstall +DISTFILES += CSWsyslog-ng.postremove +DISTFILES += CSWsyslog-ng.cswreleasenotes SPKG_SOURCEURL = http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/ INITSMF = /etc/opt/csw/init\.d/cswsyslog_ng @@ -33,6 +33,7 @@ CONFIGURE_ARGS += --enable-dynamic-linking CONFIGURE_ARGS += --enable-spoof-source=no CONFIGURE_ARGS += --enable-tcp-wrapper +CONFIGURE_ARGS += --enable-ssl GARCOMPILER = GNU TEST_SCRIPTS = @@ -41,33 +42,53 @@ # We need to be more pushy. EXTRA_LDFLAGS = -L/opt/csw/lib -lwrap -lsocket -PACKAGES = CSWsyslogng -SPKG_DESC_CSWsyslogng = $(DESCRIPTION) -CATALOGNAME_CSWsyslogng = syslog_ng -RUNTIME_DEP_PKGS_CSWsyslogng += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWsyslogng += CSWglib2 -RUNTIME_DEP_PKGS_CSWsyslogng += CSWlibevtlog0 -RUNTIME_DEP_PKGS_CSWsyslogng += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWsyslogng += CSWlibpcre0 -RUNTIME_DEP_PKGS_CSWsyslogng += CSWosslrt -RUNTIME_DEP_PKGS_CSWsyslogng += CSWtcpwrap - BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) BUILD_DEP_PKGS += CSWgcc4core BUILD_DEP_PKGS += CSWggettext BUILD_DEP_PKGS += CSWglib2devel BUILD_DEP_PKGS += CSWpkgconfig -CHECKPKG_OVERRIDES_CSWsyslogng-dev += catalogname-does-not-match-pkgname|pkgname=CSWsyslogng-dev|catalogname=syslog_ng_dev|expected-catalogname=syslogng_dev -CHECKPKG_OVERRIDES_CSWsyslogng += catalogname-does-not-match-pkgname|pkgname=CSWsyslogng|catalogname=syslog_ng|expected-catalogname=syslogng +PACKAGES = CSWsyslog-ng +SPKG_DESC_CSWsyslog-ng = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWglib2 +RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibdbi1 +RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibevtlog0 +RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibgnutls26 +RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibwrap1 +OBSOLETED_BY_CSWsyslog-ng = CSWsyslogng + +# It it were split, it'd look like this: +# PACKAGES += CSWlibsyslog-ng0 +# CATALOGNAME_CSWlibsyslog-ng0 = libsyslog_ng0 +# PKGFILES_CSWlibsyslog-ng0 += $(call baseisadirs,$(libdir),libsyslog-ng\.so\.0\.0\.0) +# PKGFILES_CSWlibsyslog-ng0 += $(call baseisadirs,$(libdir),libsyslog-ng\.so\.0(\.\d+)*) +# SPKG_DESC_CSWlibsyslog-ng0 += $(DESCRIPTION), libsyslog-ng.so.0 +# RUNTIME_DEP_PKGS_CSWlibsyslog-ng0 += CSWlibevtlog0 +# RUNTIME_DEP_PKGS_CSWlibsyslog-ng0 += CSWlibintl8 +# RUNTIME_DEP_PKGS_CSWlibsyslog-ng0 += CSWlibwrap1 +# RUNTIME_DEP_PKGS_CSWlibsyslog-ng0 += CSWlibgnutls26 +# RUNTIME_DEP_PKGS_CSWlibsyslog-ng0 += CSWlibgcc-s1 +# RUNTIME_DEP_PKGS_CSWlibsyslog-ng0 += CSWlibpcre1 +# RUNTIME_DEP_PKGS_CSWlibsyslog-ng0 += CSWglib2 +# +# PACKAGES += CSWsyslog-ng-dev +# CATALOGNAME_CSWsyslog-ng-dev = syslog_ng_dev +# SPKG_DESC_CSWsyslog-ng-dev += $(DESCRIPTION), development files +# PKGFILES_CSWsyslog-ng-dev += /opt/csw/lib/libsyslog-ng.so +# RUNTIME_DEP_PKGS_CSWsyslog-ng-dev += CSWlibsyslog-ng0 + # A reference to /usr/share/lib/zoneinfo -CHECKPKG_OVERRIDES_CSWsyslogng += file-with-bad-content|/usr/share|root/opt/csw/lib/libsyslog-ng.so.0.0.0 +CHECKPKG_OVERRIDES_CSWsyslog-ng += file-with-bad-content|/usr/share|root/opt/csw/lib/libsyslog-ng.so.0.0.0 # Not splitting the syslog-ng libraries. There are no known packages linking # to syslog's shared objects. -CHECKPKG_OVERRIDES_CSWsyslogng += shared-lib-package-contains-so-symlink -CHECKPKG_OVERRIDES_CSWsyslogng += shared-lib-pkgname-mismatch +CHECKPKG_OVERRIDES_CSWsyslog-ng += shared-lib-package-contains-so-symlink +CHECKPKG_OVERRIDES_CSWsyslog-ng += shared-lib-pkgname-mismatch # Missing TLS symbols EXTRA_LINKER_FLAGS = -lgnutls Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2012-03-18 08:27:14 UTC (rev 17441) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2012-03-18 12:44:14 UTC (rev 17442) @@ -1 +1 @@ -04b1804e8a5a1413c9b92428bc8227bb syslog-ng_3.3.3.tar.gz +60737452ce898f9dc7170dfdc9bfd732 syslog-ng_3.2.5.tar.gz Copied: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.cswreleasenotes (from rev 17354, csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.cswreleasenotes) =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.cswreleasenotes (rev 0) +++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.cswreleasenotes 2012-03-18 12:44:14 UTC (rev 17442) @@ -0,0 +1 @@ +The /usr/share reference is for finding /usr/share/lib/zoneinfo. Copied: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.postremove (from rev 17354, csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove) =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.postremove (rev 0) +++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.postremove 2012-03-18 12:44:14 UTC (rev 17442) @@ -0,0 +1,9 @@ +#!/bin/sh +# +# $Id$ +# + +if [ -x /usr/sbin/svcadm ]; then + echo "Enabling svc:/system/system-log:default" + /usr/sbin/svcadm enable svc:/system/system-log:default +fi Copied: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.preinstall (from rev 17441, csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall) =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.preinstall (rev 0) +++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.preinstall 2012-03-18 12:44:14 UTC (rev 17442) @@ -0,0 +1,26 @@ +#!/bin/sh +# +# $Id$ +# + +# Until we have a better solution. +# https://www.opencsw.org/mantis/view.php?id=4409 +# if [ -x /usr/sbin/svcadm ]; then +# echo "Disabling svc:/system/system-log:default" +# /usr/sbin/svcadm disable svc:/system/system-log:default +# fi +# +# When autoenable_daemons is not set to off, syslog_ng will attempt to start +# in the presence of the stock Solaris syslogd, and will fail. + +# The assumption is that this script is going to be run from the global zone +# first. The -f option is for the rm command not to complain if it can't remove +# the file. +for f in /opt/csw/var/syslog-ng.{ctl,persist}; do + if [ -r "${f}" ]; then + echo "Removing an obsolete file: '${f}'." + rm -f "${f}" + fi +done + +exit 0 Deleted: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.cswreleasenotes =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.cswreleasenotes 2012-03-18 08:27:14 UTC (rev 17441) +++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.cswreleasenotes 2012-03-18 12:44:14 UTC (rev 17442) @@ -1 +0,0 @@ -The /usr/share reference is for finding /usr/share/lib/zoneinfo. Deleted: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove 2012-03-18 08:27:14 UTC (rev 17441) +++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove 2012-03-18 12:44:14 UTC (rev 17442) @@ -1,9 +0,0 @@ -#!/bin/sh -# -# $Id$ -# - -if [ -x /usr/sbin/svcadm ]; then - echo "Enabling svc:/system/system-log:default" - /usr/sbin/svcadm enable svc:/system/system-log:default -fi Deleted: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall 2012-03-18 08:27:14 UTC (rev 17441) +++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall 2012-03-18 12:44:14 UTC (rev 17442) @@ -1,26 +0,0 @@ -#!/bin/sh -# -# $Id$ -# - -# Until we have a better solution. -# https://www.opencsw.org/mantis/view.php?id=4409 -# if [ -x /usr/sbin/svcadm ]; then -# echo "Disabling svc:/system/system-log:default" -# /usr/sbin/svcadm disable svc:/system/system-log:default -# fi -# -# When autoenable_daemons is not set to off, syslog_ng will attempt to start -# in the presence of the stock Solaris syslogd, and will fail. - -# The assumption is that this script is going to be run from the global zone -# first. The -f option is for the rm command not to complain if it can't remove -# the file. -for f in /opt/csw/var/syslog-ng.{ctl,persist}; do - if [ -r "${f}" ]; then - echo "Removing an obsolete file: '${f}'." - rm -f "${f}" - fi -done - -exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 18 13:44:45 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Mar 2012 12:44:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17443] csw/mgar/pkg Message-ID: Revision: 17443 http://gar.svn.sourceforge.net/gar/?rev=17443&view=rev Author: wahwah Date: 2012-03-18 12:44:45 +0000 (Sun, 18 Mar 2012) Log Message: ----------- libivykis/trunk: Initial commit, needed by syslog_ng, does not build Added Paths: ----------- csw/mgar/pkg/libivykis/ csw/mgar/pkg/libivykis/Makefile csw/mgar/pkg/libivykis/branches/ csw/mgar/pkg/libivykis/tags/ csw/mgar/pkg/libivykis/trunk/ csw/mgar/pkg/libivykis/trunk/Makefile csw/mgar/pkg/libivykis/trunk/checksums csw/mgar/pkg/libivykis/trunk/files/ Added: csw/mgar/pkg/libivykis/Makefile =================================================================== --- csw/mgar/pkg/libivykis/Makefile (rev 0) +++ csw/mgar/pkg/libivykis/Makefile 2012-03-18 12:44:45 UTC (rev 17443) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/libivykis/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libivykis/trunk/Makefile =================================================================== --- csw/mgar/pkg/libivykis/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libivykis/trunk/Makefile 2012-03-18 12:44:45 UTC (rev 17443) @@ -0,0 +1,27 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libivykis +VERSION = 0.26 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Async I/O-assisting library +define BLURB + libivykis is a thin wrapper over various OS'es implementation of I/O readiness + notification facilities (such as poll(2), kqueue(2)) and is mainly intended + for writing portable high-performance network servers. +endef + +MASTER_SITES = $(SF_MIRRORS) +# UPSTREAM_USE_SF = 1 +# UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)= +DISTNAME = ivykis-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) +# Need something like this, or fix the configure script +# CONFIGURE_ARGS = --host=core2-pc-solaris2.10 + +include gar/category.mk + Property changes on: csw/mgar/pkg/libivykis/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libivykis/trunk/checksums =================================================================== --- csw/mgar/pkg/libivykis/trunk/checksums (rev 0) +++ csw/mgar/pkg/libivykis/trunk/checksums 2012-03-18 12:44:45 UTC (rev 17443) @@ -0,0 +1 @@ +a753c0245b70e90c8d54e5981d114670 ivykis-0.26.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 18 14:19:57 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 18 Mar 2012 13:19:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[17444] csw/mgar/pkg/git/trunk Message-ID: Revision: 17444 http://gar.svn.sourceforge.net/gar/?rev=17444&view=rev Author: bdwalton Date: 2012-03-18 13:19:57 +0000 (Sun, 18 Mar 2012) Log Message: ----------- git/trunk: lets test the 1.7.10 release candidate Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-03-18 12:44:45 UTC (rev 17443) +++ csw/mgar/pkg/git/trunk/Makefile 2012-03-18 13:19:57 UTC (rev 17444) @@ -1,6 +1,6 @@ NAME = git -VERSION = 1.7.9.3 -#PATCHLEVEL = rc1 +VERSION = 1.7.10 +PATCHLEVEL = rc1 CATEGORIES = devel GARTYPE = v2 @@ -102,7 +102,7 @@ SPKG_DESC_CSWgit-dev = Headers and static libraries for Git MASTER_SITES = http://git-core.googlecode.com/files/ -DISTFILES += $(NAME)-$(VERSION).tar.gz +DISTFILES += $(NAME)-$(VERSION).$(PATCHLEVEL).tar.gz DISTFILES += CSWgit.postinstall PATCHFILES += 0001-Update-path-in-documentation-to-be-CSW-proper.patch Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2012-03-18 12:44:45 UTC (rev 17443) +++ csw/mgar/pkg/git/trunk/checksums 2012-03-18 13:19:57 UTC (rev 17444) @@ -1 +1 @@ -f93b976649216d731fd9f9befb90a58c git-1.7.9.3.tar.gz +79add1ac683766e01a8c16ac4fac09fe git-1.7.10.rc1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 18 16:14:06 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Mar 2012 15:14:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17445] csw/mgar/pkg/mongodb/trunk/Makefile Message-ID: Revision: 17445 http://gar.svn.sourceforge.net/gar/?rev=17445&view=rev Author: wahwah Date: 2012-03-18 15:14:06 +0000 (Sun, 18 Mar 2012) Log Message: ----------- mongodb/trunk: building it with V8 Modified Paths: -------------- csw/mgar/pkg/mongodb/trunk/Makefile Modified: csw/mgar/pkg/mongodb/trunk/Makefile =================================================================== --- csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-18 13:19:57 UTC (rev 17444) +++ csw/mgar/pkg/mongodb/trunk/Makefile 2012-03-18 15:14:06 UTC (rev 17445) @@ -34,11 +34,15 @@ EXTRA_RUNPATH_DIRS = $(prefix)/gxx/lib +# It is also possible to build MongoDB with SpiderMonkey. +# BUILD_DEP_PKGS += CSWlibjs-dev +# RUNTIME_DEP_PKGS_CSWmongodb += CSWlibjs1-7-0 + BUILD_DEP_PKGS += CSWboost-gcc-dev BUILD_DEP_PKGS += CSWgcc4g++ -BUILD_DEP_PKGS += CSWlibjs-dev BUILD_DEP_PKGS += CSWlibpcap-dev BUILD_DEP_PKGS += CSWlibpcre-gxx-dev +BUILD_DEP_PKGS += CSWlibv8-dev BUILD_DEP_PKGS += CSWscons BUILD_DEP_PKGS += CSWsnappy-gxx-dev @@ -48,6 +52,7 @@ SCONS_FLAGS += --use-system-all SCONS_FLAGS += --extralib=rt,pcre SCONS_FLAGS += --release all +SCONS_FLAGS += --usev8 SCONS_ENV = LIBPATH=$(prefix)/gxx/lib @@ -56,7 +61,7 @@ RUNTIME_DEP_PKGS_CSWmongodb += CSWlibboost-system1-49-0-gxx RUNTIME_DEP_PKGS_CSWmongodb += CSWlibboost-thread1-49-0-gxx RUNTIME_DEP_PKGS_CSWmongodb += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWmongodb += CSWlibjs1-7-0 +RUNTIME_DEP_PKGS_CSWmongodb += CSWlibv8-0-2012-03 RUNTIME_DEP_PKGS_CSWmongodb += CSWlibpcap1 RUNTIME_DEP_PKGS_CSWmongodb += CSWlibpcre1-gxx RUNTIME_DEP_PKGS_CSWmongodb += CSWlibpcrecpp0-gxx This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Sun Mar 18 18:13:59 2012 From: bwalton at opencsw.org (Ben Walton) Date: Sun, 18 Mar 2012 13:13:59 -0400 Subject: [csw-devel] proposed alteration to git patching mechanism Message-ID: <1332090324-sup-750@pinkfloyd.chass.utoronto.ca> Hi All, Maciej found a problem with the makepatch workflow he used and it boils down to: mgar configure vi ... mgar makepatch add PATCHFILES += ... to Makefile mgar reconfigure build The patch targets would then see an un-applied patch and trigger a chain of events that culminated in post-patch-gitsnap failing as the branches/tags it works on are already setup. The following patch fixes up some cookie files after creating the new patch file. It's sort of a cheap hack, but I don't see a nicer way to do this right now. (Suggestions welcomed.) Does anyone see a problem with committing this? Thanks -Ben Index: gar.mk =================================================================== --- gar.mk (revision 17428) +++ gar.mk (working copy) @@ -558,7 +558,14 @@ echo; \ echo " svn add" $$FILES_PATCHES; \ echo; \ - mv $$NEWPATCHES $(abspath $(FILEDIR)); ) \ + mv $$NEWPATCHES $(abspath $(FILEDIR)); \ + for p in $$NEWPATCHES; do \ + touch $(abspath $(COOKIEDIR))/normal-patch-$$p; \ + touch $(abspath $(COOKIEDIR))/patch-extract-$$p; \ + done; \ + touch $(abspath $(COOKIEDIR))/extract-modulated; \ + touch $(abspath $(COOKIEDIR))/patch-modulated; \ + touch $(abspath $(COOKIEDIR))/post-patch-gitsnap; ) \ fi; \ else \ echo "No extracted sources so we can't create patches..."; \ -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Sun Mar 18 18:31:07 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 18 Mar 2012 17:31:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[17446] csw/mgar/pkg/alpine/trunk/Makefile Message-ID: Revision: 17446 http://gar.svn.sourceforge.net/gar/?rev=17446&view=rev Author: bdwalton Date: 2012-03-18 17:31:07 +0000 (Sun, 18 Mar 2012) Log Message: ----------- alpine/trunk: we export extra LDFLAGS, not extra LIBS to modernize this recipe Modified Paths: -------------- csw/mgar/pkg/alpine/trunk/Makefile Modified: csw/mgar/pkg/alpine/trunk/Makefile =================================================================== --- csw/mgar/pkg/alpine/trunk/Makefile 2012-03-18 15:14:06 UTC (rev 17445) +++ csw/mgar/pkg/alpine/trunk/Makefile 2012-03-18 17:31:07 UTC (rev 17446) @@ -8,7 +8,7 @@ Alpine is a fast, easy to use email client that is suitable for both the inexperienced email user as well as for the most demanding of power users. Alpine is based on the Pine? Message System, which was also - developed at the University of Washington. Alpine can be learned by + developed at the University of Washington. Alpine can be learned by exploration and the use of context-sensitive help. The user experience is highly customizable through the use of the Alpine Setup command. endef @@ -54,7 +54,7 @@ CONFIGURE_ARGS += --with-spellcheck-prog=$(bindir)/aspell ## Libs that are not get set correctly in Makefiles -EXTRA_LIBS += -lm -lgssapi_krb5 -lkrb5 -lintl -liconv +EXTRA_LDFLAGS += -lm -lgssapi_krb5 -lkrb5 -lintl -liconv RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv CSWtcl CSWsasl CSWosslrt RUNTIME_DEP_PKGS += CSWkrb5lib CSWlibnet CSWncurses CSWoldaprt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 18 18:37:51 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 18 Mar 2012 17:37:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[17447] csw/mgar/pkg/alpine/trunk/Makefile Message-ID: Revision: 17447 http://gar.svn.sourceforge.net/gar/?rev=17447&view=rev Author: bdwalton Date: 2012-03-18 17:37:51 +0000 (Sun, 18 Mar 2012) Log Message: ----------- alpine/trunk: make CSWalpine obsolete CSWpine Modified Paths: -------------- csw/mgar/pkg/alpine/trunk/Makefile Modified: csw/mgar/pkg/alpine/trunk/Makefile =================================================================== --- csw/mgar/pkg/alpine/trunk/Makefile 2012-03-18 17:31:07 UTC (rev 17446) +++ csw/mgar/pkg/alpine/trunk/Makefile 2012-03-18 17:37:51 UTC (rev 17447) @@ -20,6 +20,7 @@ PACKAGES = CSWalpine CATALOGNAME_CSWalpine = alpine SPKG_DESC_CSWalpine = $(DESCRIPTION) +OBSOLETED_BY_CSWalpine = CSWpine # We define upstream file regex so we can be notifed of new # upstream software release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 18 18:44:25 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 18 Mar 2012 17:44:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17448] csw/mgar/pkg/alpine/trunk/Makefile Message-ID: Revision: 17448 http://gar.svn.sourceforge.net/gar/?rev=17448&view=rev Author: bdwalton Date: 2012-03-18 17:44:25 +0000 (Sun, 18 Mar 2012) Log Message: ----------- alpine/trunk: add the pine symlink since we now obsolete pine Modified Paths: -------------- csw/mgar/pkg/alpine/trunk/Makefile Modified: csw/mgar/pkg/alpine/trunk/Makefile =================================================================== --- csw/mgar/pkg/alpine/trunk/Makefile 2012-03-18 17:37:51 UTC (rev 17447) +++ csw/mgar/pkg/alpine/trunk/Makefile 2012-03-18 17:44:25 UTC (rev 17448) @@ -65,9 +65,14 @@ PI_SCRIPTS = cleanup-web PI_SCRIPTS += install-mlock PI_SCRIPTS += install-web +PI_SCRIPTS += install-pine-symlink post-install-modulated: $(PI_SCRIPTS) +install-pine-symlink: + @(echo "==> Installing the pine symlink") + @(cd $(DESTDIR)/$(bindir); ln -s alpine pine) + @$(MAKECOOKIE) install-mlock: @(echo "==> Installing mlock") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 18 18:49:21 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 18 Mar 2012 17:49:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17449] csw/mgar/pkg/alpine/trunk/Makefile Message-ID: Revision: 17449 http://gar.svn.sourceforge.net/gar/?rev=17449&view=rev Author: bdwalton Date: 2012-03-18 17:49:21 +0000 (Sun, 18 Mar 2012) Log Message: ----------- alpine/trunk: set the License file Modified Paths: -------------- csw/mgar/pkg/alpine/trunk/Makefile Modified: csw/mgar/pkg/alpine/trunk/Makefile =================================================================== --- csw/mgar/pkg/alpine/trunk/Makefile 2012-03-18 17:44:25 UTC (rev 17448) +++ csw/mgar/pkg/alpine/trunk/Makefile 2012-03-18 17:49:21 UTC (rev 17449) @@ -37,6 +37,8 @@ # http://mailman2.u.washington.edu/pipermail/alpine-info/2007-December/000047.html PATCHFILES = pubcookie.diff +LICENSE = LICENSE + NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-quotas This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 18 18:59:08 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 18 Mar 2012 17:59:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17450] csw/mgar/pkg/alpine/trunk/Makefile Message-ID: Revision: 17450 http://gar.svn.sourceforge.net/gar/?rev=17450&view=rev Author: bdwalton Date: 2012-03-18 17:59:07 +0000 (Sun, 18 Mar 2012) Log Message: ----------- alpine/trunk: modernize dependencies and add MAKECOOKIE on two of the postinstall steps Modified Paths: -------------- csw/mgar/pkg/alpine/trunk/Makefile Modified: csw/mgar/pkg/alpine/trunk/Makefile =================================================================== --- csw/mgar/pkg/alpine/trunk/Makefile 2012-03-18 17:49:21 UTC (rev 17449) +++ csw/mgar/pkg/alpine/trunk/Makefile 2012-03-18 17:59:07 UTC (rev 17450) @@ -59,8 +59,16 @@ ## Libs that are not get set correctly in Makefiles EXTRA_LDFLAGS += -lm -lgssapi_krb5 -lkrb5 -lintl -liconv -RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv CSWtcl CSWsasl CSWosslrt -RUNTIME_DEP_PKGS += CSWkrb5lib CSWlibnet CSWncurses CSWoldaprt +RUNTIME_DEP_PKGS_CSWalpine += CSWtcl +RUNTIME_DEP_PKGS_CSWalpine += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWalpine += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWalpine += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWalpine += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWalpine += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWalpine += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWalpine += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWalpine += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWalpine += CSWlibldap2-4-2 include gar/category.mk @@ -84,6 +92,7 @@ cleanup-web: @(grm -fr $(DESTDIR)/home) + @$(MAKECOOKIE) install-web: @(echo "==> Installing Web Interface") @@ -104,6 +113,4 @@ @(gln -s $(bindir)/tclsh \ $(DESTDIR)$(libexecdir)/alpine-2.00/bin/tclsh) @(cd $(DESTDIR)$(libexecdir); gln -s ./alpine-2.00 ./alpine) - - - + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 19 00:37:31 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Mar 2012 23:37:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17451] csw/mgar/pkg Message-ID: Revision: 17451 http://gar.svn.sourceforge.net/gar/?rev=17451&view=rev Author: wahwah Date: 2012-03-18 23:37:31 +0000 (Sun, 18 Mar 2012) Log Message: ----------- pil: Moving to lang-python Added Paths: ----------- csw/mgar/pkg/lang-python/pil/ Removed Paths: ------------- csw/mgar/pkg/pil/ 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 Mar 19 00:50:19 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 Mar 2012 23:50:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[17452] csw/mgar/pkg/lang-python/pil/trunk/Makefile Message-ID: Revision: 17452 http://gar.svn.sourceforge.net/gar/?rev=17452&view=rev Author: wahwah Date: 2012-03-18 23:50:19 +0000 (Sun, 18 Mar 2012) Log Message: ----------- lang-python/pil/trunk: Update for the dependencies Modified Paths: -------------- csw/mgar/pkg/lang-python/pil/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pil/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pil/trunk/Makefile 2012-03-18 23:37:31 UTC (rev 17451) +++ csw/mgar/pkg/lang-python/pil/trunk/Makefile 2012-03-18 23:50:19 UTC (rev 17452) @@ -15,40 +15,27 @@ MASTER_SITES = http://effbot.org/downloads/ DISTFILES = $(DISTNAME).tar.gz -PACKAGES = CSWpy-pil CSWpil +UFILES_REGEX = Imaging-(\d+(?:\.\d+)*).tar.gz +EXTRA_MERGE_EXCLUDE_FILES = .*\.pyc +PACKAGES = CSWpy-pil SPKG_DESC_CSWpy-pil = Python Imaging Library -SPKG_DESC_CSWpil = An empty transitional package - -CATALOGNAME_CSWpy-pil = py_pil -CATALOGNAME_CSWpil = pil - -ARCHALL_CSWpil = 1 - -PKGFILES_CSWpil = NONE - -RUNTIME_DEP_PKGS_CSWpy-pil += CSWftype2 -RUNTIME_DEP_PKGS_CSWpy-pil += CSWjpeg -RUNTIME_DEP_PKGS_CSWpy-pil += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWpy-pil += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWpy-pil += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWpy-pil += CSWliblcms1 +RUNTIME_DEP_PKGS_CSWpy-pil += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-pil += CSWlibz1 RUNTIME_DEP_PKGS_CSWpy-pil += CSWtcl RUNTIME_DEP_PKGS_CSWpy-pil += CSWtk -RUNTIME_DEP_PKGS_CSWpy-pil += CSWzlib -RUNTIME_DEP_PKGS_CSWpil += CSWpy-pil +CHECKPKG_OVERRIDES_CSWpy-pil += surplus-dependency|CSWtcl +CHECKPKG_OVERRIDES_CSWpy-pil += surplus-dependency|CSWtk -UFILES_REGEX = Imaging-(\d+(?:\.\d+)*).tar.gz -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyc - -# The empty transitional package still has the dependency on CSWpython added by -# GAR. It's not really necessary, becayse CSWpy-pil depends on Python too, but -# it doesn't do any harm either. +OBSOLETED_BY_CSWpy-pil = CSWpil CHECKPKG_OVERRIDES_CSWpil += surplus-dependency|CSWpython -# Transitional dependency. -CHECKPKG_OVERRIDES_CSWpil += surplus-dependency|CSWpy-pil TEST_SCRIPTS = LICENSE = README include gar/category.mk - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 19 09:52:08 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Mar 2012 08:52:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17453] csw/mgar/pkg/syslog_ng/trunk/Makefile Message-ID: Revision: 17453 http://gar.svn.sourceforge.net/gar/?rev=17453&view=rev Author: wahwah Date: 2012-03-19 08:52:08 +0000 (Mon, 19 Mar 2012) Log Message: ----------- syslog_ng/trunk: Set a name for the syslog stub package Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2012-03-18 23:50:19 UTC (rev 17452) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2012-03-19 08:52:08 UTC (rev 17453) @@ -61,6 +61,7 @@ RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibwrap1 OBSOLETED_BY_CSWsyslog-ng = CSWsyslogng +CATALOGNAME_CSWsyslogng = syslog_ng_stub # It it were split, it'd look like this: # PACKAGES += CSWlibsyslog-ng0 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 Mar 19 10:28:37 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Mar 2012 09:28:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17454] csw/mgar/pkg/syslog_ng/trunk/Makefile Message-ID: Revision: 17454 http://gar.svn.sourceforge.net/gar/?rev=17454&view=rev Author: wahwah Date: 2012-03-19 09:28:36 +0000 (Mon, 19 Mar 2012) Log Message: ----------- syslog_ng/trunk: Separate deps on 5.9 and 5.10 because of glib2 Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2012-03-19 08:52:08 UTC (rev 17453) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2012-03-19 09:28:36 UTC (rev 17454) @@ -24,6 +24,11 @@ INITSMF = /etc/opt/csw/init\.d/cswsyslog_ng SAMPLECONF = /etc/opt/csw/syslog-ng\.conf\.CSW +# Syslog links against glib2, which is packaged in different packages on +# Solaris 9 and Solaris 10. Therefore, we need to build separately on 9 and +# 10, and declare different dependencies. +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 # shared /opt/csw support: localstatedir = /var/opt/csw @@ -50,7 +55,6 @@ PACKAGES = CSWsyslog-ng SPKG_DESC_CSWsyslog-ng = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWglib2 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibdbi1 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibevtlog0 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibgcc-s1 @@ -60,6 +64,15 @@ RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibwrap1 +# Specifying different dependencies for 5.9 and 5.10. +RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibgmodule2-0-0 + +RUNTIME_DEP_PKGS_CSWsyslog-ng_5.9 += CSWglib2 + +RUNTIME_DEP_PKGS_CSWsyslog-ng += $(RUNTIME_DEP_PKGS_CSWsyslog-ng_$(GAROSREL)) + OBSOLETED_BY_CSWsyslog-ng = CSWsyslogng CATALOGNAME_CSWsyslogng = syslog_ng_stub This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aironskin at users.sourceforge.net Mon Mar 19 12:10:16 2012 From: aironskin at users.sourceforge.net (aironskin at users.sourceforge.net) Date: Mon, 19 Mar 2012 11:10:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[17455] csw/mgar/pkg/iozone/trunk Message-ID: Revision: 17455 http://gar.svn.sourceforge.net/gar/?rev=17455&view=rev Author: aironskin Date: 2012-03-19 11:10:16 +0000 (Mon, 19 Mar 2012) Log Message: ----------- iozone/trunk: Updated build recipe Modified Paths: -------------- csw/mgar/pkg/iozone/trunk/Makefile csw/mgar/pkg/iozone/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/iozone/trunk/files/CSWiozone.gspec csw/mgar/pkg/iozone/trunk/files/patch-vx_ioctl.diff csw/mgar/pkg/iozone/trunk/files/vx_ioctl.h Modified: csw/mgar/pkg/iozone/trunk/Makefile =================================================================== --- csw/mgar/pkg/iozone/trunk/Makefile 2012-03-19 09:28:36 UTC (rev 17454) +++ csw/mgar/pkg/iozone/trunk/Makefile 2012-03-19 11:10:16 UTC (rev 17455) @@ -1,58 +1,58 @@ NAME = iozone -VERSION = 3.291 +VERSION = 3.398 DISTVERSION = $(shell echo $(VERSION) | sed -e 's/\./_/g') -GARTYPE = v1 +GARTYPE = v2 CATEGORIES = apps -DESCRIPTION = IO benchmarking tool +DESCRIPTION = I/O benchmarking tool define BLURB IOzone is a filesystem benchmark tool. The benchmark generates and measures a variety of file operations. - Iozone has been ported to many machines and runs under - many operating systems. + The benchmark tests file I/O performance for the + following operations: Read, write, re-read, re-write, + read backwards, read strided, fread, fwrite, random + read, pread ,mmap, aio_read, aio_write endef VENDOR_URL = http://www.iozone.org/ MASTER_SITES = http://www.iozone.org/src/current/ -MASTER_SITES += http://www.iozone.org/docs/ +#MASTER_SITES += http://www.iozone.org/docs/ UFILES_REGEX = $(NAME)(\d+(?:\.\d+)*).tar DISTFILES = $(NAME)$(DISTVERSION).tar -DISTFILES += vx_ioctl.h -DISTFILES += $(call admfiles,CSWiozone) +#DISTFILES += vx_ioctl.h +#DISTFILES += $(call admfiles,CSWiozone) DISTNAME = $(NAME)$(DISTVERSION) -PATCHFILES = patch-vx_ioctl.diff +#PATCHFILES = patch-vx_ioctl.diff -DOCS = IOzone_msword_98.pdf +DOCS = IOzone_msword_98.pdf +DOCS += IOzone_msword_98.doc DOCS += Iozone_ps.gz -DOCS += IOzone_msword_98.doc DOCS += Run_rules.doc -WORKSRC = $(WORKDIR)/$(DISTNAME)/src/current -DOCSRC = $(WORKDIR)$(DISTNAME)/docs +WORKSRC = $(WORKDIR)$(DISTNAME)/src/current +DOCSRC = $(WORKDIR)$(DISTNAME)/docs -# Make sure the VxFS header is in place -EXTRA_INC = $(WORKSRC)/include/sys/fs -post-extract: - @mkdir -p $(WORKSRC)/include/sys/fs - @cp $(WORKDIR)/vx_ioctl.h $(WORKSRC) - @$(MAKECOOKIE) +# Make sure the VxFS header is in place (for Solaris8-64-VXFS) +#EXTRA_INC = $(WORKSRC)/include/sys/fs +#post-extract: +# @mkdir -p $(WORKSRC)/include/sys/fs +# @cp $(WORKDIR)/vx_ioctl.h $(WORKSRC) +# @$(MAKECOOKIE) -# We don't have this modern autoconfig-doodle-crap CONFIGURE_SCRIPTS = TEST_SCRIPTS = -BUILD_ARGS = Solaris8-64-VXFS +BUILD_ARGS = Solaris10 BUILD_SCRIPTS = $(WORKSRC)/makefile INSTALL_SCRIPTS = custom include gar/category.mk -# The install part from the Makefile is completely unrelocatable :-( install-custom: @echo " ==> Installing $(NAME)" - @ginstall -d $(DESTDIR)$(bindir) - @ginstall -d $(DESTDIR)$(mandir)/man6 + @ginstall -D $(WORKSRC)/iozone $(DESTDIR)$(bindir)/iozone + @ginstall -D $(DOCSRC)/iozone.1 $(DESTDIR)$(mandir)/man6/iozone.1 @$(MAKECOOKIE) Modified: csw/mgar/pkg/iozone/trunk/checksums =================================================================== --- csw/mgar/pkg/iozone/trunk/checksums 2012-03-19 09:28:36 UTC (rev 17454) +++ csw/mgar/pkg/iozone/trunk/checksums 2012-03-19 11:10:16 UTC (rev 17455) @@ -1,4 +1 @@ -fceb0146e50e714a6c4b3618489e4880 download/iozone3_291.tar -5c485e1e0f464c4c47b05140f383b4b2 download/vx_ioctl.h -84aa96a0593883e2e6a38504be8a0aec download/CSWiozone.gspec -bbf1f15160145b829dbc00b8c8c7b60e download/patch-vx_ioctl.diff +ac6e7534c77602a1c886f3bb8679ad2a iozone3_398.tar Deleted: csw/mgar/pkg/iozone/trunk/files/CSWiozone.gspec =================================================================== --- csw/mgar/pkg/iozone/trunk/files/CSWiozone.gspec 2012-03-19 09:28:36 UTC (rev 17454) +++ csw/mgar/pkg/iozone/trunk/files/CSWiozone.gspec 2012-03-19 11:10:16 UTC (rev 17455) @@ -1,4 +0,0 @@ -%var bitname iozone -%var pkgname CSWiozone -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/iozone/trunk/files/patch-vx_ioctl.diff =================================================================== --- csw/mgar/pkg/iozone/trunk/files/patch-vx_ioctl.diff 2012-03-19 09:28:36 UTC (rev 17454) +++ csw/mgar/pkg/iozone/trunk/files/patch-vx_ioctl.diff 2012-03-19 11:10:16 UTC (rev 17455) @@ -1,24 +0,0 @@ -diff -Naur tmp/iozone3_291/src/current/iozone.c work/root-blastwavepkg.d/iozone3_291/src/current/iozone.c ---- current/iozone.c 2008-03-03 16:38:17.000000000 +0100 -+++ current/iozone.c 2008-04-23 11:20:00.862783000 +0200 -@@ -338,7 +338,7 @@ - #endif - - #ifdef VXFS --#include -+#include "vx_ioctl.h" - #endif - - #ifdef unix -diff -Naur tmp/iozone3_291/src/current/libasync.c work/root-blastwavepkg.d/iozone3_291/src/current/libasync.c ---- current/libasync.c 2008-03-03 16:38:17.000000000 +0100 -+++ current/libasync.c 2008-04-23 11:20:09.562273000 +0200 -@@ -106,7 +106,7 @@ - #include - #endif - #ifdef VXFS --#include -+#include "vx_ioctl.h" - #endif - - #if defined(OSFV5) || defined(linux) Deleted: csw/mgar/pkg/iozone/trunk/files/vx_ioctl.h =================================================================== --- csw/mgar/pkg/iozone/trunk/files/vx_ioctl.h 2012-03-19 09:28:36 UTC (rev 17454) +++ csw/mgar/pkg/iozone/trunk/files/vx_ioctl.h 2012-03-19 11:10:16 UTC (rev 17455) @@ -1,135 +0,0 @@ -/* @(#)src/unix/pagecache/sol/common/kernel/base/vx_ioctl.h 3.15 10/05/00 14:53:28 - */ -/* #ident "@(#)vxfs:src/unix/pagecache/sol/common/kernel/base/vx_ioctl.h 3.15" */ - -/* - * Copyright (c) 2000 VERITAS Software Corporation. ALL RIGHTS RESERVED. - * UNPUBLISHED -- RIGHTS RESERVED UNDER THE COPYRIGHT - * LAWS OF THE UNITED STATES. USE OF A COPYRIGHT NOTICE - * IS PRECAUTIONARY ONLY AND DOES NOT IMPLY PUBLICATION - * OR DISCLOSURE. - * - * THIS SOFTWARE CONTAINS CONFIDENTIAL INFORMATION AND - * TRADE SECRETS OF VERITAS SOFTWARE. USE, DISCLOSURE, - * OR REPRODUCTION IS PROHIBITED WITHOUT THE PRIOR - * EXPRESS WRITTEN PERMISSION OF VERITAS SOFTWARE. - * - * RESTRICTED RIGHTS LEGEND - * USE, DUPLICATION, OR DISCLOSURE BY THE GOVERNMENT IS - * SUBJECT TO RESTRICTIONS AS SET FORTH IN SUBPARAGRAPH - * (C) (1) (ii) OF THE RIGHTS IN TECHNICAL DATA AND - * COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013. - * VERITAS SOFTWARE - * 1600 PLYMOUTH STREET, MOUNTAIN VIEW, CA 94043 - */ - -#ifndef _FS_VXFS_VX_IOCTL_H -#define _FS_VXFS_VX_IOCTL_H - -#include - -#define VX_IOCTL (('V' << 24) | ('X' << 16) | ('F' << 8)) - -/* - * User group ioctls - */ - -#define VX_SETCACHE (VX_IOCTL | 1) /* set cache advice */ -#define VX_GETCACHE (VX_IOCTL | 2) /* get cache advice */ -#define VX_GETFSOPT (VX_IOCTL | 5) /* get cache advice */ - -#if _FILE_OFFSET_BITS==64 -#define VX_SETEXT (VX_IOCTL | 39) -#define VX_GETEXT (VX_IOCTL | 40) -#else -#define VX_SETEXT (VX_IOCTL | 3) -#define VX_GETEXT (VX_IOCTL | 4) -#endif /*_FILE_OFFSET_BITS==64*/ - -struct vx_ext { - off_t ext_size; /* extent size in fs blocks */ - off_t reserve; /* space reservation in fs blocks */ - int a_flags; /* allocation flags */ -}; - -#ifdef _LP64 -#define VX_FREEZE_ALL (VX_IOCTL | 6) -#else -#define VX_FREEZE_ALL (VX_IOCTL | 41) -#endif /*_LP64*/ - -/* - * The VX_FREEZE_ALL ioctl uses the following structure - */ - -struct vx_freezeall { - int num; /* number of fd pointed to */ - int timeout; /* timeout value for the freeze all */ - int *fds; /* buffer for file descriptor list */ -}; - -/* - * Values for freeze and thaw ioctls. These must match the volume manager - * VOL_FREEZE and VOL_THAW ioctl values. - * - * These are in the user group as opposed to the admin group because we need - * to maintain backward binary compatibility with VxVM. - */ - -#ifndef VOLIOC -#define VOLIOC (('V' << 24) | ('O' << 16) | ('L' << 8)) -#endif /* VOLIOC */ - -#define VX_FREEZE (VOLIOC | 100) /* freeze the file system */ -#define VX_THAW (VOLIOC | 101) /* unfreeze the file system */ - -/* - * values for a_flags in vx_ext - */ - -#define VX_AFLAGS 0x3f /* valid flags for a_flags */ -#define VX_NOEXTEND 0x01 /* file is not to be extended */ -#define VX_TRIM 0x02 /* trim reservation to i_size on close */ -#define VX_CONTIGUOUS 0x04 /* file must be contiguously allocated */ -#define VX_ALIGN 0x08 /* extents allocated on extent boundaries */ -#define VX_NORESERVE 0x10 /* don't change i_reserve */ -#define VX_CHGSIZE 0x20 /* change i_size to match reservation */ - -/* - * vx_setcache flags - */ - -#define VX_ADVFLAGS 0x0003f /* valid advisory flags */ -#define VX_RANDOM 0x00001 /* file is accessed randomly */ -#define VX_SEQ 0x00002 /* file is accessed sequentially */ -#define VX_DIRECT 0x00004 /* perform direct (un-buffered) i/o */ -#define VX_NOREUSE 0x00008 /* do not cache file data */ -#define VX_DSYNC 0x00010 /* synchronous data i/o (not mtime) */ -#define VX_UNBUFFERED 0x00020 /* perform non-sync direct i/o */ - -/* - * Flags for VX_GETFSOPT - */ - -#define VX_FSO_NOLOG 0x0000001 /* mounted with VX_MS_NOLOG */ -#define VX_FSO_BLKCLEAR 0x0000002 /* mounted with VX_MS_BLKCLEAR */ -#define VX_FSO_NODATAINLOG 0x0000004 /* mounted with VX_MS_NODATAINLOG */ -#define VX_FSO_SNAPSHOT 0x0000008 /* is a snapshot */ -#define VX_FSO_SNAPPED 0x0000010 /* is being snapped */ -#define VX_FSO_VJFS 0x0000020 /* the kernel is VJFS */ -#define VX_FSO_DELAYLOG 0x0000040 /* mounted with VX_MS_DELAYLOG */ -#define VX_FSO_TMPLOG 0x0000080 /* mounted with VX_MS_TMPLOG */ -#define VX_FSO_CACHE_DIRECT 0x0000100 /* mounted with VX_MS_CACHE_DIRECT */ -#define VX_FSO_CACHE_DSYNC 0x0000200 /* mounted with VX_MS_CACHE_DSYNC */ -#define VX_FSO_CACHE_CLOSESYNC 0x0000400 /* mnt'd with VX_MS_CACHE_CLOSESYNC */ -#define VX_FSO_OSYNC_DIRECT 0x0001000 /* mounted with VX_MS_OSYNC_DIRECT */ -#define VX_FSO_OSYNC_DSYNC 0x0002000 /* mounted with VX_MS_OSYNC_DSYNC */ -#define VX_FSO_OSYNC_CLOSESYNC 0x0004000 /* mnt'd with VX_MS_OSYNC_CLOSESYNC */ -#define VX_FSO_FILESET 0x0010000 /* mounted as a file set */ -#define VX_FSO_CACHE_TMPCACHE 0x0020000 /* mnt'd with VX_MS_CACHE_TMPCACHE */ -#define VX_FSO_OSYNC_DELAY 0x0040000 /* mounted with VX_MS_OSYNC_DELAY */ -#define VX_FSO_CACHE_UNBUFFERED 0x0080000 /* mnt'd w/ VX_MS_CACHE_UNBUFFERED */ -#define VX_FSO_OSYNC_UNBUFFERED 0x0100000 /* mounted with VX_MS_UNBUFFERED */ -#define VX_FSO_QIO_ON 0x0200000 /* mounted with VX_MS_QIO_ON */ -#define VX_FSO_NOATIME 0x0400000 /* mounted with VX_MS_NOATIME */ - -#endif /* _FS_VXFS_VX_IOCTL_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Mar 19 13:12:30 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 19 Mar 2012 12:12:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[17456] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 17456 http://gar.svn.sourceforge.net/gar/?rev=17456&view=rev Author: dmichelsen Date: 2012-03-19 12:12:30 +0000 (Mon, 19 Mar 2012) Log Message: ----------- mGAR v2: Adjust build rules for makefile and GNUmakefile Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2012-03-19 11:10:16 UTC (rev 17455) +++ csw/mgar/gar/v2/gar.lib.mk 2012-03-19 12:12:30 UTC (rev 17456) @@ -846,12 +846,12 @@ build-%/makefile: @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 $* && /usr/bin/env -i $(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) @$(MAKECOOKIE) build-%/GNUmakefile: @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 $* && /usr/bin/env -i $(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) @$(MAKECOOKIE) build-%/Jamfile: 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 Mar 19 13:17:00 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 19 Mar 2012 12:17:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[17457] csw/mgar/pkg/iozone/trunk/Makefile Message-ID: Revision: 17457 http://gar.svn.sourceforge.net/gar/?rev=17457&view=rev Author: dmichelsen Date: 2012-03-19 12:17:00 +0000 (Mon, 19 Mar 2012) Log Message: ----------- iozone: Reorganize Makefile Modified Paths: -------------- csw/mgar/pkg/iozone/trunk/Makefile Modified: csw/mgar/pkg/iozone/trunk/Makefile =================================================================== --- csw/mgar/pkg/iozone/trunk/Makefile 2012-03-19 12:12:30 UTC (rev 17456) +++ csw/mgar/pkg/iozone/trunk/Makefile 2012-03-19 12:17:00 UTC (rev 17457) @@ -1,6 +1,6 @@ NAME = iozone VERSION = 3.398 -DISTVERSION = $(shell echo $(VERSION) | sed -e 's/\./_/g') +DISTVERSION = $(subst .,_,$(VERSION)) GARTYPE = v2 CATEGORIES = apps @@ -14,18 +14,13 @@ read, pread ,mmap, aio_read, aio_write endef -VENDOR_URL = http://www.iozone.org/ -MASTER_SITES = http://www.iozone.org/src/current/ -#MASTER_SITES += http://www.iozone.org/docs/ -UFILES_REGEX = $(NAME)(\d+(?:\.\d+)*).tar -DISTFILES = $(NAME)$(DISTVERSION).tar -#DISTFILES += vx_ioctl.h -#DISTFILES += $(call admfiles,CSWiozone) - -DISTNAME = $(NAME)$(DISTVERSION) - +MASTER_SITES += http://www.iozone.org/src/current/ +DISTNAME = $(NAME)$(DISTVERSION) +DISTFILES += $(DISTNAME).tar #PATCHFILES = patch-vx_ioctl.diff +VENDOR_URL = http://www.iozone.org/ + DOCS = IOzone_msword_98.pdf DOCS += IOzone_msword_98.doc DOCS += Iozone_ps.gz @@ -34,13 +29,6 @@ WORKSRC = $(WORKDIR)$(DISTNAME)/src/current DOCSRC = $(WORKDIR)$(DISTNAME)/docs -# Make sure the VxFS header is in place (for Solaris8-64-VXFS) -#EXTRA_INC = $(WORKSRC)/include/sys/fs -#post-extract: -# @mkdir -p $(WORKSRC)/include/sys/fs -# @cp $(WORKDIR)/vx_ioctl.h $(WORKSRC) -# @$(MAKECOOKIE) - CONFIGURE_SCRIPTS = TEST_SCRIPTS = @@ -53,6 +41,6 @@ install-custom: @echo " ==> Installing $(NAME)" - @ginstall -D $(WORKSRC)/iozone $(DESTDIR)$(bindir)/iozone - @ginstall -D $(DOCSRC)/iozone.1 $(DESTDIR)$(mandir)/man6/iozone.1 + ginstall -D $(WORKSRC)/iozone $(DESTDIR)$(bindir)/iozone + ginstall -D $(DOCSRC)/iozone.1 $(DESTDIR)$(mandir)/man6/iozone.1 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Mar 19 13:53:33 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 19 Mar 2012 12:53:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[17458] csw/mgar/pkg/bind/branches Message-ID: Revision: 17458 http://gar.svn.sourceforge.net/gar/?rev=17458&view=rev Author: dmichelsen Date: 2012-03-19 12:53:33 +0000 (Mon, 19 Mar 2012) Log Message: ----------- bind/branches/bind-with-dlz: Initial commit with DLZ plugin enabled Modified Paths: -------------- csw/mgar/pkg/bind/branches/bind-with-dlz/Makefile csw/mgar/pkg/bind/branches/bind-with-dlz/checksums Added Paths: ----------- csw/mgar/pkg/bind/branches/bind-with-dlz/ Modified: csw/mgar/pkg/bind/branches/bind-with-dlz/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2012-03-18 23:50:19 UTC (rev 17452) +++ csw/mgar/pkg/bind/branches/bind-with-dlz/Makefile 2012-03-19 12:53:33 UTC (rev 17458) @@ -2,15 +2,16 @@ # owner/group for device files? (root:sys) NAME = bind -VERSION = 9.8.1 +VERSION = 9.9.0 CATEGORIES = net GARTYPE = v2 # Enable these for Px-releases -RELEASE = P1 -DISTVERSION = $(VERSION)-$(RELEASE) +RELEASE = +RELEASE_SUFFIX = $(if $(RELEASE),-$(RELEASE)) +DISTVERSION = $(VERSION)$(RELEASE_SUFFIX) SPKG_VERSION = $(VERSION)$(RELEASE) -DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +DISTNAME = $(NAME)-$(VERSION)$(RELEASE_SUFFIX) WORKSRC = $(WORKDIR)/$(DISTNAME) DESCRIPTION = ISC BIND DNS reference implementation @@ -22,7 +23,7 @@ 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_SUFFIX)/ DISTFILES = $(DISTNAME).tar.gz # Disable these for Px-releases @@ -80,6 +81,9 @@ CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw CONFIGURE_ARGS += --localstatedir=/var/opt/csw/named +CONFIGURE_ARGS += --with-dlopen=yes +CONFIGURE_ARGS += --with-dlz-ldap=$(prefix) + EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la PKGFILES_CSWbind-dev = $(PKGFILES_DEVEL) Modified: csw/mgar/pkg/bind/branches/bind-with-dlz/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2012-03-18 23:50:19 UTC (rev 17452) +++ csw/mgar/pkg/bind/branches/bind-with-dlz/checksums 2012-03-19 12:53:33 UTC (rev 17458) @@ -1 +1 @@ -afa41f8203d50bedad65071f9b6f96d7 bind-9.8.1-P1.tar.gz +9281d0b04f711d28153ba1ab04a54026 bind-9.9.0.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 Mar 19 14:02:28 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 19 Mar 2012 13:02:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[17459] csw/mgar/pkg/libsigcpp/branches Message-ID: Revision: 17459 http://gar.svn.sourceforge.net/gar/?rev=17459&view=rev Author: janholzh Date: 2012-03-19 13:02:28 +0000 (Mon, 19 Mar 2012) Log Message: ----------- libsigcpp/branches/libsigcpp-gxx: add gcc branch Modified Paths: -------------- csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/Makefile Added Paths: ----------- csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/ Modified: csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/Makefile =================================================================== --- csw/mgar/pkg/libsigcpp/trunk/Makefile 2012-03-19 12:12:30 UTC (rev 17456) +++ csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/Makefile 2012-03-19 13:02:28 UTC (rev 17459) @@ -12,28 +12,26 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES += $(DISTNAME).tar.xz -PACKAGES = CSWlibsigc2-0-0 -SPKG_DESC_CSWlibsigc2-0-0 = Typesafe signal and callback system for C++, libsigc-2.0.so.0 -PKGFILES_CSWlibsigc2-0-0 += $(call pkgfiles_lib,libsigc-2.0.so.0) -OBSOLETED_BY_CSWlibsigc2-0-0 = CSWlibsigc++ -# CSWsigc++ is the previous package name -INCOMPATIBLE_PKGS_CSWlibsigc++ = CSWsigc++ +PACKAGES = CSWlibsigc2-0-0-gxx +SPKG_DESC_CSWlibsigc2-0-0-gxx = Typesafe signal and callback system for C++, libsigc-2.0.so.0-gxx +PKGFILES_CSWlibsigc2-0-0-gxx += $(call pkgfiles_lib,libsigc-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibsigc2-0-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsigc2-0-0-gxx += CSWlibstdc++6 -PACKAGES += CSWlibsigc-dev -SPKG_DESC_CSWlibsigc-dev = Header files for libsigc-2.0.so.0 +PACKAGES += CSWlibsigc-dev-gxx +SPKG_DESC_CSWlibsigc-dev-gxx = Header files for libsigc-2.0.so.0-gxx # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibsigc-dev = CSWlibsigc2-0-0 -OBSOLETED_BY_CSWlibsigc-dev = CSWlibsigc++devel -CATALOGNAME_CSWlibsigc++devel = libsigc++_devel_stub +RUNTIME_DEP_PKGS_CSWlibsigc-dev-gxx = CSWlibsigc2-0-0-gxx +#OBSOLETED_BY_CSWlibsigc-dev = CSWlibsigc++devel +#CATALOGNAME_CSWlibsigc++devel = libsigc++_devel_stub +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +GARCOMPILER = GNU +prefix = $(BUILD_PREFIX)/gxx + BUILD64_LIBS_ONLY = 1 -EXTRA_CXXFLAGS += -norunpath EXTRA_CONFIGURE_ENV = MAKE=gmake CONFIGURE_ARGS = $(DIRPATHS) --disable-static -# Do not strip -norunpath during libtool invocation -REINPLACE_MATCH = (\|-xarch=) -REINPLACE_WITH = |-norunpath$$1 -REINPLACE_FILES = build/ltmain.sh include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 19 15:46:28 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Mar 2012 14:46:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[17460] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 17460 http://gar.svn.sourceforge.net/gar/?rev=17460&view=rev Author: wahwah Date: 2012-03-19 14:46:28 +0000 (Mon, 19 Mar 2012) Log Message: ----------- mGAR v2: README.CSW support, base directories Before copying README.CSW, make sure that the base directory already exists. 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-03-19 13:02:28 UTC (rev 17459) +++ csw/mgar/gar/v2/gar.pkg.mk 2012-03-19 14:46:28 UTC (rev 17460) @@ -738,6 +738,11 @@ reset-merge-license: @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 \ + $(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;) \ + merge-distfile-%: $(DOWNLOADDIR) $(_DBG_MERGE)if test -f $(DOWNLOADDIR)/$*; then \ $(foreach P,$(_PKG_SPECS),mkdir -p $(PKGROOT)$(docdir)/$(call catalogname,$P);) \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 19 15:47:09 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Mar 2012 14:47:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17461] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 17461 http://gar.svn.sourceforge.net/gar/?rev=17461&view=rev Author: wahwah Date: 2012-03-19 14:47:09 +0000 (Mon, 19 Mar 2012) Log Message: ----------- pkgdb-web: Relative template path The script will be able to find the templates relative to its position. 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-03-19 14:46:28 UTC (rev 17460) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-03-19 14:47:09 UTC (rev 17461) @@ -50,8 +50,10 @@ ) urls = urls_html + urls_rest -render = web.template.render('/home/web/bin/gar/' - 'lib/web/templates/') +render = web.template.render( + os.path.join( + os.path.split(__file__)[0], + "lib/web/templates/")) class PkgStatsEncoder(json.JSONEncoder): 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 Mar 19 15:47:35 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Mar 2012 14:47:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[17462] csw/mgar/gar/v2/lib/web Message-ID: Revision: 17462 http://gar.svn.sourceforge.net/gar/?rev=17462&view=rev Author: wahwah Date: 2012-03-19 14:47:35 +0000 (Mon, 19 Mar 2012) Log Message: ----------- pkgdb-web: Overridden tags are greyed out In the list of error tags, grey out the overridden ones. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/static/pkgdb.css csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html Modified: csw/mgar/gar/v2/lib/web/static/pkgdb.css =================================================================== --- csw/mgar/gar/v2/lib/web/static/pkgdb.css 2012-03-19 14:47:09 UTC (rev 17461) +++ csw/mgar/gar/v2/lib/web/static/pkgdb.css 2012-03-19 14:47:35 UTC (rev 17462) @@ -1,16 +1,13 @@ -body { +body, p, th, td { font-family: sans-serif; font-size: 13px; } .annotation { font-size: 80%; } -.overridden { - color: gray; +.overridden, .overridden a, tr.overridden > td { + color: #DDD; } -.overridden a { - color: gray; -} ul.catalogname-list { list-style: none; margin: 0; @@ -20,3 +17,6 @@ margin: 0.2em; padding: 0; } +td.wordbag { + width: 30em; +} Modified: csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html 2012-03-19 14:47:09 UTC (rev 17461) +++ csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html 2012-03-19 14:47:35 UTC (rev 17462) @@ -18,7 +18,10 @@ $for tag in tags: $if tag.srv4_file.registered: - + $tag.srv4_file.basename @@ -31,7 +34,7 @@ $tag.catrel.name - + $tag.tag_info 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 Mar 19 15:47:58 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Mar 2012 14:47:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[17463] csw/mgar/gar/v2/lib/python Message-ID: Revision: 17463 http://gar.svn.sourceforge.net/gar/?rev=17463&view=rev Author: wahwah Date: 2012-03-19 14:47:57 +0000 (Mon, 19 Mar 2012) Log Message: ----------- checkpkg: A comment about libmagic problems Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py csw/mgar/gar/v2/lib/python/package.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2012-03-19 14:47:35 UTC (rev 17462) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2012-03-19 14:47:57 UTC (rev 17463) @@ -426,6 +426,12 @@ logging.error("magic_cookie.file(%s) returned None. Retrying.", full_path) self.magic_cookie = self._GetCookie() + # In practice, this retrying doesn't help. There seems to be + # something process-related which prevents libmagic from + # functioning. The only known workaround is to shutdown the + # process and run it again. + # + # The issues have been observed with file-5.04. return mime Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2012-03-19 14:47:35 UTC (rev 17462) +++ csw/mgar/gar/v2/lib/python/package.py 2012-03-19 14:47:57 UTC (rev 17463) @@ -426,6 +426,8 @@ def MakeAbsolutePath(self, p): return os.path.join(self.pkgpath, p) + + class PackageComparator(object): def __init__(self, file_name_a, file_name_b, 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 Mar 19 16:25:28 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Mar 2012 15:25:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[17464] csw/mgar/pkg Message-ID: Revision: 17464 http://gar.svn.sourceforge.net/gar/?rev=17464&view=rev Author: wahwah Date: 2012-03-19 15:25:28 +0000 (Mon, 19 Mar 2012) Log Message: ----------- mongoengine/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/mongoengine/ csw/mgar/pkg/mongoengine/Makefile csw/mgar/pkg/mongoengine/branches/ csw/mgar/pkg/mongoengine/tags/ csw/mgar/pkg/mongoengine/trunk/ csw/mgar/pkg/mongoengine/trunk/Makefile csw/mgar/pkg/mongoengine/trunk/checksums csw/mgar/pkg/mongoengine/trunk/files/ Added: csw/mgar/pkg/mongoengine/Makefile =================================================================== --- csw/mgar/pkg/mongoengine/Makefile (rev 0) +++ csw/mgar/pkg/mongoengine/Makefile 2012-03-19 15:25:28 UTC (rev 17464) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/mongoengine/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/mongoengine/trunk/Makefile =================================================================== --- csw/mgar/pkg/mongoengine/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mongoengine/trunk/Makefile 2012-03-19 15:25:28 UTC (rev 17464) @@ -0,0 +1,27 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = mongoengine +VERSION = 0.5 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = Document-Object Mapper for working with MongoDB from Python +define BLURB + Long description +endef + +VENDOR_URL = http://mongoengine.org/ + +MASTER_SITES = +# http://github.com/hmarr/mongoengine/tarball/v0.5 +# This tarball is made by hand. +DISTFILES = hmarr-mongoengine-v$(VERSION)-0-gde5b678.tar.gz +DISTNAME = hmarr-mongoengine-58635b2 + +TEST_SCRIPTS = +LICENSE = LICENSE + +ARCHALL_CSWpy-mongoengine = 1 + +include gar/category.mk Property changes on: csw/mgar/pkg/mongoengine/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/mongoengine/trunk/checksums =================================================================== --- csw/mgar/pkg/mongoengine/trunk/checksums (rev 0) +++ csw/mgar/pkg/mongoengine/trunk/checksums 2012-03-19 15:25:28 UTC (rev 17464) @@ -0,0 +1 @@ +67425f627872d33e171795101aeb7f32 hmarr-mongoengine-v0.5-0-gde5b678.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 Mar 19 16:32:10 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Mar 2012 15:32:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[17465] csw/mgar/pkg/mongoengine/trunk/Makefile Message-ID: Revision: 17465 http://gar.svn.sourceforge.net/gar/?rev=17465&view=rev Author: wahwah Date: 2012-03-19 15:32:09 +0000 (Mon, 19 Mar 2012) Log Message: ----------- mongoengine/trunk: add a dependency on pymongo Modified Paths: -------------- csw/mgar/pkg/mongoengine/trunk/Makefile Modified: csw/mgar/pkg/mongoengine/trunk/Makefile =================================================================== --- csw/mgar/pkg/mongoengine/trunk/Makefile 2012-03-19 15:25:28 UTC (rev 17464) +++ csw/mgar/pkg/mongoengine/trunk/Makefile 2012-03-19 15:32:09 UTC (rev 17465) @@ -23,5 +23,7 @@ LICENSE = LICENSE ARCHALL_CSWpy-mongoengine = 1 +RUNTIME_DEP_PKGS_CSWpy-mongoengine = CSWpy-mongo +CHECKPKG_OVERRIDES_CSWpy-mongoengine += surplus-dependency|CSWpy-mongo include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 19 18:30:42 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Mar 2012 17:30:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[17466] csw/mgar/pkg/alpine/trunk/Makefile Message-ID: Revision: 17466 http://gar.svn.sourceforge.net/gar/?rev=17466&view=rev Author: bdwalton Date: 2012-03-19 17:30:42 +0000 (Mon, 19 Mar 2012) Log Message: ----------- alpine/trunk: override a few usr/local references in broken-looking alpine web interface Modified Paths: -------------- csw/mgar/pkg/alpine/trunk/Makefile Modified: csw/mgar/pkg/alpine/trunk/Makefile =================================================================== --- csw/mgar/pkg/alpine/trunk/Makefile 2012-03-19 15:32:09 UTC (rev 17465) +++ csw/mgar/pkg/alpine/trunk/Makefile 2012-03-19 17:30:42 UTC (rev 17466) @@ -22,6 +22,14 @@ SPKG_DESC_CSWalpine = $(DESCRIPTION) OBSOLETED_BY_CSWalpine = CSWpine +# from the looks of things, I don't think this will work anyway. as this +# is a 'simple' update to stub out the original pine, i'm going to get these +# stand as they are +CHECKPKG_OVERRIDES_CSWalpine += file-with-bad-content|/usr/local|root/opt/csw/libexec/alpine-2.00/INSTALL +CHECKPKG_OVERRIDES_CSWalpine += file-with-bad-content|/usr/local|root/opt/csw/libexec/alpine-2.00/bin/usage.tcl +CHECKPKG_OVERRIDES_CSWalpine += file-with-bad-content|/usr/local|root/opt/csw/libexec/alpine-2.00/bin/debug.cgi +CHECKPKG_OVERRIDES_CSWalpine += file-with-bad-content|/usr/local|root/opt/csw/libexec/alpine-2.00/config/alpine.tcl + # We define upstream file regex so we can be notifed of new # upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 19 18:39:13 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Mar 2012 17:39:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[17467] csw/mgar/pkg/alpine/trunk/Makefile Message-ID: Revision: 17467 http://gar.svn.sourceforge.net/gar/?rev=17467&view=rev Author: bdwalton Date: 2012-03-19 17:39:13 +0000 (Mon, 19 Mar 2012) Log Message: ----------- alpine/trunk: fix usr/local references in man page Modified Paths: -------------- csw/mgar/pkg/alpine/trunk/Makefile Modified: csw/mgar/pkg/alpine/trunk/Makefile =================================================================== --- csw/mgar/pkg/alpine/trunk/Makefile 2012-03-19 17:30:42 UTC (rev 17466) +++ csw/mgar/pkg/alpine/trunk/Makefile 2012-03-19 17:39:13 UTC (rev 17467) @@ -122,3 +122,9 @@ $(DESTDIR)$(libexecdir)/alpine-2.00/bin/tclsh) @(cd $(DESTDIR)$(libexecdir); gln -s ./alpine-2.00 ./alpine) @$(MAKECOOKIE) + +post-merge: + @echo " ==> Fixing usr/local references..." + @(cd $(PKGROOT)/$(mandir)/man1/; \ + perl -pi -e 's#/usr/local#/opt/csw#g' alpine.1 ) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 19 18:49:51 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Mar 2012 17:49:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[17468] csw/mgar/pkg/alpine/trunk Message-ID: Revision: 17468 http://gar.svn.sourceforge.net/gar/?rev=17468&view=rev Author: bdwalton Date: 2012-03-19 17:49:51 +0000 (Mon, 19 Mar 2012) Log Message: ----------- alpine/trunk: add a path correction patch Modified Paths: -------------- csw/mgar/pkg/alpine/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/alpine/trunk/files/0001-alter-default-pine.info-path-for-csw-location.patch Modified: csw/mgar/pkg/alpine/trunk/Makefile =================================================================== --- csw/mgar/pkg/alpine/trunk/Makefile 2012-03-19 17:39:13 UTC (rev 17467) +++ csw/mgar/pkg/alpine/trunk/Makefile 2012-03-19 17:49:51 UTC (rev 17468) @@ -44,6 +44,7 @@ # Patch for solaris explained in the following thread # http://mailman2.u.washington.edu/pipermail/alpine-info/2007-December/000047.html PATCHFILES = pubcookie.diff +PATCHFILES += 0001-alter-default-pine.info-path-for-csw-location.patch LICENSE = LICENSE Added: csw/mgar/pkg/alpine/trunk/files/0001-alter-default-pine.info-path-for-csw-location.patch =================================================================== --- csw/mgar/pkg/alpine/trunk/files/0001-alter-default-pine.info-path-for-csw-location.patch (rev 0) +++ csw/mgar/pkg/alpine/trunk/files/0001-alter-default-pine.info-path-for-csw-location.patch 2012-03-19 17:49:51 UTC (rev 17468) @@ -0,0 +1,26 @@ +From c57d7ce0db92908089ca9ea4cc213a5192ccc79f Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Mon, 19 Mar 2012 18:46:54 +0100 +Subject: [PATCH] alter default pine.info path for csw location + +Signed-off-by: Ben Walton +--- + pith/filter.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/pith/filter.c b/pith/filter.c +index b471164..e17b8f3 100644 +--- a/pith/filter.c ++++ b/pith/filter.c +@@ -3134,7 +3134,7 @@ typedef struct _html_opts { + #endif + + #ifndef SYSTEM_PINE_INFO_PATH +-#define SYSTEM_PINE_INFO_PATH "/usr/local/lib/pine.info" ++#define SYSTEM_PINE_INFO_PATH "/opt/csw/lib/pine.info" + #endif + #define CHTML_VAR_EXPAND(S) (!strcmp(S, "PINE_INFO_PATH") \ + ? SYSTEM_PINE_INFO_PATH : S) +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 19 23:51:12 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Mar 2012 22:51:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17469] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 17469 http://gar.svn.sourceforge.net/gar/?rev=17469&view=rev Author: wahwah Date: 2012-03-19 22:51:12 +0000 (Mon, 19 Mar 2012) Log Message: ----------- mysql5/branches/mysql-5.0.x: update master sites Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-03-19 17:49:51 UTC (rev 17468) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-03-19 22:51:12 UTC (rev 17469) @@ -121,7 +121,7 @@ EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL/ +MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-5.0/ DISTFILES = mysql-$(VERSION).tar.gz DISTFILES += csw$(NAME).tpl DISTFILES += quick_start-csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Mar 20 01:40:48 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 20 Mar 2012 00:40:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[17470] csw/mgar/pkg/alpine/trunk/Makefile Message-ID: Revision: 17470 http://gar.svn.sourceforge.net/gar/?rev=17470&view=rev Author: bdwalton Date: 2012-03-20 00:40:48 +0000 (Tue, 20 Mar 2012) Log Message: ----------- alpine/trunk: override a few more checkpkg errors (usr/{local,share} refs) Modified Paths: -------------- csw/mgar/pkg/alpine/trunk/Makefile Modified: csw/mgar/pkg/alpine/trunk/Makefile =================================================================== --- csw/mgar/pkg/alpine/trunk/Makefile 2012-03-19 22:51:12 UTC (rev 17469) +++ csw/mgar/pkg/alpine/trunk/Makefile 2012-03-20 00:40:48 UTC (rev 17470) @@ -30,6 +30,13 @@ CHECKPKG_OVERRIDES_CSWalpine += file-with-bad-content|/usr/local|root/opt/csw/libexec/alpine-2.00/bin/debug.cgi CHECKPKG_OVERRIDES_CSWalpine += file-with-bad-content|/usr/local|root/opt/csw/libexec/alpine-2.00/config/alpine.tcl +# these are embedded strings in help text, etc that reference various +# defaults, possibile paths, etc. +CHECKPKG_OVERRIDES_CSWalpine += file-with-bad-content|/usr/local|root/opt/csw/bin/alpine +CHECKPKG_OVERRIDES_CSWalpine += file-with-bad-content|/usr/share|root/opt/csw/bin/rpdump +CHECKPKG_OVERRIDES_CSWalpine += file-with-bad-content|/usr/share|root/opt/csw/bin/rpload +CHECKPKG_OVERRIDES_CSWalpine += file-with-bad-content|/usr/share|root/opt/csw/bin/alpine + # We define upstream file regex so we can be notifed of new # upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Mar 20 03:07:48 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 20 Mar 2012 02:07:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[17471] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 17471 http://gar.svn.sourceforge.net/gar/?rev=17471&view=rev Author: bdwalton Date: 2012-03-20 02:07:48 +0000 (Tue, 20 Mar 2012) Log Message: ----------- when using makepatch, update cookies for the new patch and the patch and extract and gitsnap targets; allows easy re-running of makepatch and also reconfigure, etc Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2012-03-20 00:40:48 UTC (rev 17470) +++ csw/mgar/gar/v2/gar.mk 2012-03-20 02:07:48 UTC (rev 17471) @@ -558,7 +558,14 @@ echo; \ echo " svn add" $$FILES_PATCHES; \ echo; \ - mv $$NEWPATCHES $(abspath $(FILEDIR)); ) \ + mv $$NEWPATCHES $(abspath $(FILEDIR)); \ + for p in $$NEWPATCHES; do \ + touch $(abspath $(COOKIEDIR))/normal-patch-$$p; \ + touch $(abspath $(COOKIEDIR))/patch-extract-$$p; \ + done; \ + touch $(abspath $(COOKIEDIR))/extract-modulated; \ + touch $(abspath $(COOKIEDIR))/patch-modulated; \ + touch $(abspath $(COOKIEDIR))/post-patch-gitsnap; ) \ fi; \ else \ echo "No extracted sources so we can't create patches..."; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Tue Mar 20 03:08:41 2012 From: bwalton at opencsw.org (Ben Walton) Date: Mon, 19 Mar 2012 22:08:41 -0400 Subject: [csw-devel] proposed alteration to git patching mechanism In-Reply-To: <1332090324-sup-750@pinkfloyd.chass.utoronto.ca> References: <1332090324-sup-750@pinkfloyd.chass.utoronto.ca> Message-ID: <1332209303-sup-2637@pinkfloyd.chass.utoronto.ca> Excerpts from Ben Walton's message of Sun Mar 18 13:13:59 -0400 2012: > The following patch fixes up some cookie files after creating the > new patch file. It's sort of a cheap hack, but I don't see a nicer > way to do this right now. (Suggestions welcomed.) This has been pushed. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From dmichelsen at users.sourceforge.net Tue Mar 20 09:08:37 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Mar 2012 08:08:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17472] csw/mgar/pkg/tcl85/trunk Message-ID: Revision: 17472 http://gar.svn.sourceforge.net/gar/?rev=17472&view=rev Author: dmichelsen Date: 2012-03-20 08:08:37 +0000 (Tue, 20 Mar 2012) Log Message: ----------- tcl85/trunk: Update to 8.5.11 and rework packages Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile csw/mgar/pkg/tcl85/trunk/checksums Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2012-03-20 02:07:48 UTC (rev 17471) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2012-03-20 08:08:37 UTC (rev 17472) @@ -1,5 +1,5 @@ NAME = tcl8.5 -VERSION = 8.5.10 +VERSION = 8.5.11 CATEGORIES = lang GARTYPE = v2 @@ -28,32 +28,33 @@ PATCHDIR = $(WORKDIR)/$(DISTNAME) PATCHFILES = soname.diff PATCHFILES += tcl.m4.patch -PATCHFILES += tcl-dtrace.patch +# PATCHFILES += tcl-dtrace.patch -PACKAGES = CSWtcl -PACKAGES += CSWlibtcl8-5-0 -PACKAGES += CSWtcl-dev - -ALTERNATIVES_PRIO = 850 - # The dependencies on the ISAs differ, here's from tcl-x.y.z/unix/tcl.m4: # # # On Solaris 5.x i386 with the sunpro compiler we need to link # # with sunmath to get floating point rounding control -# -RUNTIME_DEP_PKGS_CSWtcl-i386 = CSWsunmath -RUNTIME_DEP_PKGS_CSWtcl += CSWlibtcl8-5-0 -RUNTIME_DEP_PKGS_CSWtcl += $(RUNTIME_DEP_PKGS_CSWtcl-$(GARCH)) + +PACKAGES = CSWtcl +SPKG_DESC_CSWtcl = Tcl meta package +RUNTIME_DEP_PKGS_CSWtcl += CSWlibtcl8-5-0 +RUNTIME_DEP_PKGS_CSWtcl-i386 = CSWsunmath +RUNTIME_DEP_PKGS_CSWtcl += $(RUNTIME_DEP_PKGS_CSWtcl-$(GARCH)) + +SPKG_DESC_CSWtcl8-5 = Tcl programming language v8.5 + +PACKAGES += CSWlibtcl8-5-0 +SPKG_DESC_CSWlibtcl8-5-0 = $(DESCRIPTION), libraries +PKGFILES_CSWlibtcl8-5-0 += $(call pkgfiles_lib,libtcl8.5.so.0) RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-i386 += CSWsunmath -RUNTIME_DEP_PKGS_CSWlibtcl8-5-0 += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-$(GARCH)) -RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtcl8-5-0 +RUNTIME_DEP_PKGS_CSWlibtcl8-5-0 += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-$(GARCH)) -SPKG_DESC_CSWtcl8-5 = $(DESCRIPTION) -SPKG_DESC_CSWlibtcl8-5-0 = $(DESCRIPTION), libraries -SPKG_DESC_CSWtcl-dev = $(DESCRIPTION), development files +PACKAGES += CSWtcl-dev +SPKG_DESC_CSWtcl-dev = $(DESCRIPTION), development files +PKGFILES_CSWtcl-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtcl8-5-0 -PKGFILES_CSWlibtcl8-5-0 = $(call pkgfiles_lib,libtcl8.5.so.0) -PKGFILES_CSWtcl8-5-dev = $(PKGFILES_DEVEL) +ALTERNATIVES_PRIO = 850 ALTERNATIVES_CSWtcl8_5 += tcl8_5 ALTERNATIVE_tcl8_5 += $(bindir)/tclsh $(ALTERNATIVES_PRIO) @@ -89,13 +90,13 @@ pre-configure-modulated: @echo " ==> Regenerating build tools..." - @(cd $(WORKSRC) ; cp -p ../license.terms .; $(prefix)/bin/autoreconf -if ) + (cd $(WORKSRC) ; cp -p ../license.terms .; $(prefix)/bin/autoreconf -if ) @$(MAKECOOKIE) pre-test-modulated: @# Need to manually create symlink to latest version @echo Creating symlinks for libtcl8.5.so - @(cd $(WORKSRC) ; \ + (cd $(WORKSRC) ; \ mv $(REN_LIBTCL) $(REN_LIBTCL).0 ; \ ln -sf $(REN_LIBTCL).0 $(REN_LIBTCL) ) @$(MAKECOOKIE) @@ -103,8 +104,8 @@ post-install-modulated: @# Need to manually create symlink to latest version - it will be handled by alternatives @echo Creating tclsh link - @ln -s $(REN_TCLSH) $(INSTALLISADIR)/$(bindir)/tclsh - @perl -pi -e "s|/usr/local|$(prefix)|g" $(INSTALLISADIR)/$(libdir)/tclConfig.sh - @perl -pi -e "s|/usr/local|$(prefix)|g" $(INSTALLISADIR)/$(prefix)/share/man/man1/tclsh.1 + ln -s $(REN_TCLSH) $(INSTALLISADIR)/$(bindir)/tclsh + perl -pi -e "s|/usr/local|$(prefix)|g" $(INSTALLISADIR)/$(libdir)/tclConfig.sh + perl -pi -e "s|/usr/local|$(prefix)|g" $(INSTALLISADIR)/$(prefix)/share/man/man1/tclsh.1 @$(MAKECOOKIE) Modified: csw/mgar/pkg/tcl85/trunk/checksums =================================================================== --- csw/mgar/pkg/tcl85/trunk/checksums 2012-03-20 02:07:48 UTC (rev 17471) +++ csw/mgar/pkg/tcl85/trunk/checksums 2012-03-20 08:08:37 UTC (rev 17472) @@ -1,6 +1 @@ -dc8664f3dc92693aaaad68785e4426ae configure.patch -cc9b1bd7ddf8e27e97ef464806885349 tcl.m4.patch -a08eaf8467c0631937067c1948dd326b tcl8.5.10-src.tar.gz -3c9c100904b6ba774a679ad7f2b4a036 tclInt.h.patch -1dea9df5cd9579dce4746cf5d428aa1a tcl-dtrace.patch -1d6c493907986871a90c7c9612520ffd soname.diff +b01a9691c83990b3db0ce62d1012ca67 tcl8.5.11-src.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 Mar 20 09:12:20 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Mar 2012 08:12:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17473] csw/mgar/pkg/tcl85/trunk/Makefile Message-ID: Revision: 17473 http://gar.svn.sourceforge.net/gar/?rev=17473&view=rev Author: dmichelsen Date: 2012-03-20 08:12:20 +0000 (Tue, 20 Mar 2012) Log Message: ----------- tcl85/trunk: Add packaging platforms, minor cleanup Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2012-03-20 08:08:37 UTC (rev 17472) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2012-03-20 08:12:20 UTC (rev 17473) @@ -12,8 +12,9 @@ DISTNAME = $(SF_PROJ)$(VERSION) DISTFILES = $(DISTNAME)-src.tar.gz -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894 -UPSTREAM_USE_SF = 1 +# Separate build for Solaris 10 with DTrace support +PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 VENDOR_URL = http://www.tcl.tk/ LICENSE = license.terms @@ -36,13 +37,11 @@ # # with sunmath to get floating point rounding control PACKAGES = CSWtcl -SPKG_DESC_CSWtcl = Tcl meta package +SPKG_DESC_CSWtcl = Tcl programming language 8.5 RUNTIME_DEP_PKGS_CSWtcl += CSWlibtcl8-5-0 RUNTIME_DEP_PKGS_CSWtcl-i386 = CSWsunmath RUNTIME_DEP_PKGS_CSWtcl += $(RUNTIME_DEP_PKGS_CSWtcl-$(GARCH)) -SPKG_DESC_CSWtcl8-5 = Tcl programming language v8.5 - PACKAGES += CSWlibtcl8-5-0 SPKG_DESC_CSWlibtcl8-5-0 = $(DESCRIPTION), libraries PKGFILES_CSWlibtcl8-5-0 += $(call pkgfiles_lib,libtcl8.5.so.0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From igalic at users.sourceforge.net Tue Mar 20 11:03:54 2012 From: igalic at users.sourceforge.net (igalic at users.sourceforge.net) Date: Tue, 20 Mar 2012 10:03:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17474] csw/mgar/pkg Message-ID: Revision: 17474 http://gar.svn.sourceforge.net/gar/?rev=17474&view=rev Author: igalic Date: 2012-03-20 10:03:54 +0000 (Tue, 20 Mar 2012) Log Message: ----------- trafficserver: Adding makefile for trafficserver (3.0.4) - this is a work in progress Added Paths: ----------- csw/mgar/pkg/trafficserver/ csw/mgar/pkg/trafficserver/Makefile csw/mgar/pkg/trafficserver/branches/ csw/mgar/pkg/trafficserver/tags/ csw/mgar/pkg/trafficserver/trunk/ csw/mgar/pkg/trafficserver/trunk/Makefile csw/mgar/pkg/trafficserver/trunk/checksums csw/mgar/pkg/trafficserver/trunk/files/ Added: csw/mgar/pkg/trafficserver/Makefile =================================================================== --- csw/mgar/pkg/trafficserver/Makefile (rev 0) +++ csw/mgar/pkg/trafficserver/Makefile 2012-03-20 10:03:54 UTC (rev 17474) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/trafficserver/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/trafficserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/trafficserver/trunk/Makefile (rev 0) +++ csw/mgar/pkg/trafficserver/trunk/Makefile 2012-03-20 10:03:54 UTC (rev 17474) @@ -0,0 +1,40 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = trafficserver +VERSION = 3.0.4 +GARTYPE = v2 +CATEGORIES = server + +DESCRIPTION = Apache Traffic Server is fast, scalable and extensible HTTP/1.1 compliant caching proxy server. +define BLURB + Apache Traffic Server is fast, scalable and extensible HTTP/1.1 compliant caching proxy server +endef + +MASTER_SITES = http://people.apache.org/~zwoop/rel-candidates/ +DISTFILES = $(DISTNAME).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-openssl=$(prefix) +CONFIGURE_ARGS += --with-tcl=$(libdir) +CONFIGURE_ARGS += --with-zlib=$(prefix) +CONFIGURE_ARGS += --with-pcre=$(prefix) +CONFIGURE_ARGS += --with-lzma=$(prefix) +CONFIGURE_ARGS += --with-expat=$(prefix) +CONFIGURE_ARGS += --with-user=$(shell /opt/csw/gnu/id -nu) +CONFIGURE_ARGS += --with-group=$(shell /opt/csw/gnu/id -ng) + +PROTOTYPE_MODIFIERS = config data +PROTOTYPE_FILES_config = $(sysconfdir) +PROTOTYPE_CLASS_config = cswconffile +PROTOTYPE_USER_config = nobody +PROTOTYPE_GROUP_config = $(shell id -ng nobody) +PROTOTYPE_FILES_data = $(datadir) +PROTOTYPE_FILES_data = $(datadir) + +PACKAGING_PLATFORMS = solaris10-i386 +SKIP_MODULATIONS = isa-i386 isa-pentium_pro +BUILD64 = 1 + +include gar/category.mk + Property changes on: csw/mgar/pkg/trafficserver/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/trafficserver/trunk/checksums =================================================================== --- csw/mgar/pkg/trafficserver/trunk/checksums (rev 0) +++ csw/mgar/pkg/trafficserver/trunk/checksums 2012-03-20 10:03:54 UTC (rev 17474) @@ -0,0 +1 @@ +90e259fb09cb7439c6908f1f5344c40f trafficserver-3.0.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Mar 20 11:25:37 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Mar 2012 10:25:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17475] csw/mgar/pkg/cpan/List-MoreUtils/trunk Message-ID: Revision: 17475 http://gar.svn.sourceforge.net/gar/?rev=17475&view=rev Author: dmichelsen Date: 2012-03-20 10:25:37 +0000 (Tue, 20 Mar 2012) Log Message: ----------- cpan/List-MoreUtils/trunk: Update to 0.33 and sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/List-MoreUtils/trunk/Makefile csw/mgar/pkg/cpan/List-MoreUtils/trunk/checksums Modified: csw/mgar/pkg/cpan/List-MoreUtils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/List-MoreUtils/trunk/Makefile 2012-03-20 10:03:54 UTC (rev 17474) +++ csw/mgar/pkg/cpan/List-MoreUtils/trunk/Makefile 2012-03-20 10:25:37 UTC (rev 17475) @@ -1,23 +1,21 @@ NAME = List-MoreUtils -VERSION = 0.22 +VERSION = 0.33 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = VPARSEVAL +AUTHOR = ADAMK DESCRIPTION = Provide the stuff missing in List::Util define BLURB - List::MoreUtils provides some trivial but commonly needed functionality on - lists which is not going to go into List::Util. endef -PACKAGES = CSWpmlistmoreutils -CATALOGNAME = pm_listmoreutils +CATALOG_RELEASE = unstable -# This is the old package with the broken name -INCOMPATIBLE_PKGS = CSWpmlistmoreut +LICENSE = LICENSE -include gar/category.mk +PACKAGES += CSWpm-list-moreutils +CATALOGNAME_CSWpm-list-moreutils = pm_list_moreutils +SPKG_DESC_CSWpm-list-moreutils = Provide the stuff missing in List::Util +OBSOLETED_BY_CSWpm-list-moreutils += CSWpmlistmoreutils +CATALOGNAME_CSWpmlistmoreutils = pm_listmoreutils_stub -pre-merge-modulated: - @cd $(WORKSRC) && sed -n '/^Copyright/,$$p' README > COPYING - @$(MAKECOOKIE) +include gar/category.mk Modified: csw/mgar/pkg/cpan/List-MoreUtils/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/List-MoreUtils/trunk/checksums 2012-03-20 10:03:54 UTC (rev 17474) +++ csw/mgar/pkg/cpan/List-MoreUtils/trunk/checksums 2012-03-20 10:25:37 UTC (rev 17475) @@ -1,3 +1 @@ -5a72a33ec7bb26379fed5587f72acbce download/CSWpmlistmoreut.gspec -4f1db3f098e386b8c0a34fafe2948c29 download/CSWpmlistmoreut.prototype -3a6ec506f40662ab1296c48c5eb72016 download/List-MoreUtils-0.22.tar.gz +8a33c84028cc2ff3e92c92434b326c0f List-MoreUtils-0.33.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 Mar 20 11:34:40 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Mar 2012 10:34:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[17476] csw/mgar/pkg/cpan/Test-Requires/trunk/Makefile Message-ID: Revision: 17476 http://gar.svn.sourceforge.net/gar/?rev=17476&view=rev Author: dmichelsen Date: 2012-03-20 10:34:40 +0000 (Tue, 20 Mar 2012) Log Message: ----------- cpan/Test-Requires/trunk: Update to makemake Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Requires/trunk/Makefile Modified: csw/mgar/pkg/cpan/Test-Requires/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Requires/trunk/Makefile 2012-03-20 10:25:37 UTC (rev 17475) +++ csw/mgar/pkg/cpan/Test-Requires/trunk/Makefile 2012-03-20 10:34:40 UTC (rev 17476) @@ -8,11 +8,14 @@ define BLURB endef +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ + PACKAGES += CSWpm-test-requires CATALOGNAME_CSWpm-test-requires = pm_test_requires +SPKG_DESC_CSWpm-test-requires = Checks to see if the module can be loaded +# There was no information if this is pure Perl or not. Please remove if necessary. ARCHALL_CSWpm-test-requires = 1 -# This whole license thing needs to be reworked -CHECKPKG_OVERRIDES_CSWpm-test-requires += license-missing|/opt/csw/share/doc/pm_test_requires/license - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Mar 20 11:36:05 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Mar 2012 10:36:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[17477] csw/mgar/pkg/cpan/Scope-Guard/trunk Message-ID: Revision: 17477 http://gar.svn.sourceforge.net/gar/?rev=17477&view=rev Author: dmichelsen Date: 2012-03-20 10:36:05 +0000 (Tue, 20 Mar 2012) Log Message: ----------- cpan/Scope-Guard/trunk: Update to 0.20 and sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Scope-Guard/trunk/Makefile csw/mgar/pkg/cpan/Scope-Guard/trunk/checksums Modified: csw/mgar/pkg/cpan/Scope-Guard/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Scope-Guard/trunk/Makefile 2012-03-20 10:34:40 UTC (rev 17476) +++ csw/mgar/pkg/cpan/Scope-Guard/trunk/Makefile 2012-03-20 10:36:05 UTC (rev 17477) @@ -1,21 +1,23 @@ NAME = Scope-Guard -VERSION = 0.03 +VERSION = 0.20 CATEGORIES = cpan GARTYPE = v2 AUTHOR = CHOCOLATE -DESCRIPTION = lexically scoped resource management +DESCRIPTION = Lexically-scoped resource management define BLURB - This module provides a convenient way to perform cleanup or other - forms of resource management at the end of a scope. It is particularly - useful when dealing with exceptions: the Scope::Guard constructor takes - a reference to a subroutine that is guaranteed to be called even if the - thread of execution is aborted prematurely. This effectively allows - lexically-scoped "promises" to be made that are automatically honoured - by perl's garbage collector. endef -PACKAGES = CSWpmscopeguard -CATALOGNAME = pm_scopeguard +CATALOG_RELEASE = unstable +LICENSE_TEXT = This module is licensed under the perl license + +PACKAGES += CSWpm-scope-guard +CATALOGNAME_CSWpm-scope-guard = pm_scope_guard +SPKG_DESC_CSWpm-scope-guard = Lexically-scoped resource management +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-scope-guard = 1 +OBSOLETED_BY_CSWpm-scope-guard += CSWpmscopeguard +CATALOGNAME_CSWpmscopeguard = pm_scopeguard_stub + include gar/category.mk Modified: csw/mgar/pkg/cpan/Scope-Guard/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Scope-Guard/trunk/checksums 2012-03-20 10:34:40 UTC (rev 17476) +++ csw/mgar/pkg/cpan/Scope-Guard/trunk/checksums 2012-03-20 10:36:05 UTC (rev 17477) @@ -1 +1 @@ -a33ab0a31d837b94797e61050afff894 Scope-Guard-0.03.tar.gz +495d5ae16a2df8128fd068c386c9d4ac Scope-Guard-0.20.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 Mar 20 11:45:34 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Mar 2012 10:45:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[17478] csw/mgar/pkg/cpan/Devel-StackTrace/trunk/Makefile Message-ID: Revision: 17478 http://gar.svn.sourceforge.net/gar/?rev=17478&view=rev Author: dmichelsen Date: 2012-03-20 10:45:34 +0000 (Tue, 20 Mar 2012) Log Message: ----------- cpan/Devel-StackTrace/trunk: Fix obsoleted stub catalog name Modified Paths: -------------- csw/mgar/pkg/cpan/Devel-StackTrace/trunk/Makefile Modified: csw/mgar/pkg/cpan/Devel-StackTrace/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Devel-StackTrace/trunk/Makefile 2012-03-20 10:36:05 UTC (rev 17477) +++ csw/mgar/pkg/cpan/Devel-StackTrace/trunk/Makefile 2012-03-20 10:45:34 UTC (rev 17478) @@ -8,13 +8,15 @@ define BLURB endef +CATALOG_RELEASE = unstable + LICENSE = LICENSE PACKAGES += CSWpm-devel-stacktrace CATALOGNAME_CSWpm-devel-stacktrace = pm_devel_stacktrace -SPKG_DESC_CSWpm-devel-stacktrace = $(DESCRIPTION) +SPKG_DESC_CSWpm-devel-stacktrace = An object representing a stack trace ARCHALL_CSWpm-devel-stacktrace = 1 -OBSOLETED_BY_CSWpm-devel-stacktrace = CSWpmdevstacktrace -CATALOGNAME_CSWpmdevstacktrace = pm_devstacktrace +OBSOLETED_BY_CSWpm-devel-stacktrace += CSWpmdevstacktrace +CATALOGNAME_CSWpmdevstacktrace = pm_devstacktrace_stub include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Mar 20 11:48:47 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Mar 2012 10:48:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[17479] csw/mgar/pkg/cpan Message-ID: Revision: 17479 http://gar.svn.sourceforge.net/gar/?rev=17479&view=rev Author: dmichelsen Date: 2012-03-20 10:48:46 +0000 (Tue, 20 Mar 2012) Log Message: ----------- cpan/Encode-Locale/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Encode-Locale/ csw/mgar/pkg/cpan/Encode-Locale/branches/ csw/mgar/pkg/cpan/Encode-Locale/tags/ csw/mgar/pkg/cpan/Encode-Locale/trunk/ csw/mgar/pkg/cpan/Encode-Locale/trunk/Makefile csw/mgar/pkg/cpan/Encode-Locale/trunk/checksums csw/mgar/pkg/cpan/Encode-Locale/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Encode-Locale/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Encode-Locale/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Encode-Locale/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Encode-Locale/trunk/Makefile 2012-03-20 10:48:46 UTC (rev 17479) @@ -0,0 +1,21 @@ +NAME = Encode-Locale +VERSION = 1.03 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = GAAS + +DESCRIPTION = Determine the locale encoding +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license + +PACKAGES += CSWpm-encode-locale +CATALOGNAME_CSWpm-encode-locale = pm_encode_locale +SPKG_DESC_CSWpm-encode-locale = Determine the locale encoding +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-encode-locale = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Encode-Locale/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Encode-Locale/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Encode-Locale/trunk/checksums 2012-03-20 10:48:46 UTC (rev 17479) @@ -0,0 +1 @@ +de8422d068634e7c1068dab4e18b452f Encode-Locale-1.03.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Mar 20 11:51:06 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Mar 2012 10:51:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17480] csw/mgar/pkg/cpan/Class-Inspector/trunk Message-ID: Revision: 17480 http://gar.svn.sourceforge.net/gar/?rev=17480&view=rev Author: dmichelsen Date: 2012-03-20 10:51:06 +0000 (Tue, 20 Mar 2012) Log Message: ----------- cpan/Class-Inspector/trunk: Update to 1.27, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Class-Inspector/trunk/Makefile csw/mgar/pkg/cpan/Class-Inspector/trunk/checksums Modified: csw/mgar/pkg/cpan/Class-Inspector/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-Inspector/trunk/Makefile 2012-03-20 10:48:46 UTC (rev 17479) +++ csw/mgar/pkg/cpan/Class-Inspector/trunk/Makefile 2012-03-20 10:51:06 UTC (rev 17480) @@ -1,23 +1,23 @@ NAME = Class-Inspector -VERSION = 1.24 +VERSION = 1.27 CATEGORIES = cpan GARTYPE = v2 AUTHOR = ADAMK DESCRIPTION = Get information about a class and its structure define BLURB - Class::Inspector allows you to get information about a loaded class. Most or - all of this information can be found in other ways, but they arn't always - very friendly, and usually involve a relatively high level of Perl wizardry, - or strange or unusual looking code. Class::Inspector attempts to provide an - easier, more friendly interface to this information. endef +CATALOG_RELEASE = unstable + LICENSE = LICENSE -PACKAGES = CSWpmclassinspector -CATALOGNAME = pm_classinspector +PACKAGES += CSWpm-class-inspector +CATALOGNAME_CSWpm-class-inspector = pm_class_inspector +SPKG_DESC_CSWpm-class-inspector = Get information about a class and its structure +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-class-inspector = 1 +OBSOLETED_BY_CSWpm-class-inspector += CSWpmclassinspector +CATALOGNAME_CSWpmclassinspector = pm_classinspector_stub -ARCHALL = 1 - include gar/category.mk Modified: csw/mgar/pkg/cpan/Class-Inspector/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Class-Inspector/trunk/checksums 2012-03-20 10:48:46 UTC (rev 17479) +++ csw/mgar/pkg/cpan/Class-Inspector/trunk/checksums 2012-03-20 10:51:06 UTC (rev 17480) @@ -1 +1 @@ -609189b49f64d329a6e413e0a6d8724a download/Class-Inspector-1.24.tar.gz +52e6391cae3c2abdfcd1d450b42bba7e Class-Inspector-1.27.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue Mar 20 15:04:02 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 20 Mar 2012 14:04:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[17481] csw/mgar/pkg/mrtg/trunk Message-ID: Revision: 17481 http://gar.svn.sourceforge.net/gar/?rev=17481&view=rev Author: idogan23 Date: 2012-03-20 14:04:02 +0000 (Tue, 20 Mar 2012) Log Message: ----------- mrtg: bump version to: 2.17.3 Modified Paths: -------------- csw/mgar/pkg/mrtg/trunk/Makefile csw/mgar/pkg/mrtg/trunk/checksums Modified: csw/mgar/pkg/mrtg/trunk/Makefile =================================================================== --- csw/mgar/pkg/mrtg/trunk/Makefile 2012-03-20 10:51:06 UTC (rev 17480) +++ csw/mgar/pkg/mrtg/trunk/Makefile 2012-03-20 14:04:02 UTC (rev 17481) @@ -1,5 +1,5 @@ NAME = mrtg -VERSION = 2.17.2 +VERSION = 2.17.3 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/mrtg/trunk/checksums =================================================================== --- csw/mgar/pkg/mrtg/trunk/checksums 2012-03-20 10:51:06 UTC (rev 17480) +++ csw/mgar/pkg/mrtg/trunk/checksums 2012-03-20 14:04:02 UTC (rev 17481) @@ -1 +1 @@ -f4c251ef883da2509188711eff4577ad mrtg-2.17.2.tar.gz +c803f671d04367ee719039ea71fb5b37 mrtg-2.17.3.tar.gz 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 Mar 20 16:52:44 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 20 Mar 2012 15:52:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[17482] csw/mgar/pkg/poppler/trunk Message-ID: Revision: 17482 http://gar.svn.sourceforge.net/gar/?rev=17482&view=rev Author: cgrzemba Date: 2012-03-20 15:52:43 +0000 (Tue, 20 Mar 2012) Log Message: ----------- poppler/trunk: bump version 0.14.4, sanitize package names Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile csw/mgar/pkg/poppler/trunk/checksums Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2012-03-20 14:04:02 UTC (rev 17481) +++ csw/mgar/pkg/poppler/trunk/Makefile 2012-03-20 15:52:43 UTC (rev 17482) @@ -1,7 +1,7 @@ # $Id$ NAME = poppler -VERSION = 0.12.4 +VERSION = 0.14.4 CATEGORIES = lib GARTYPE = v2 @@ -15,102 +15,90 @@ DISTFILES += old_libs_i386.tar.bz2 DISTFILES += old_libs_sparc.tar.bz2 -PACKAGES = CSWpoppler CSWlibpoppler CSWlibpopplerdev CSWlibpopplerdoc -CATALOGNAME_CSWpoppler = poppler -CATALOGNAME_CSWlibpoppler = libpoppler -CATALOGNAME_CSWlibpopplerdev = libpoppler_devel -CATALOGNAME_CSWlibpopplerdoc = libpoppler_doc -SPKG_DESC_CSWpoppler = $(DESCRIPTION) - legacy compat package -SPKG_DESC_CSWlibpoppler = $(DESCRIPTION) -SPKG_DESC_CSWlibpopplerdev = $(DESCRIPTION) - developer package -SPKG_DESC_CSWlibpopplerdoc = $(DESCRIPTION) - documentation +GARCOMPILER = SOS12U3 +PACKAGING_PLATFORMS = Solaris10-sparc Solaris10-i386 -PKGFILES_CSWpoppler= no files -PKGFILES_CSWlibpoppler= $(PKGFILES_RT) -PKGFILES_CSWlibpopplerdev = $(PKGFILES_DEVEL) -PKGFILES_CSWlibpopplerdoc = $(sharedstatedir)/gtk-doc/.* +PATCHFILES += missing-includes.patch -#INCOMPATIBLE_PKGS_CSWpoppler = CSWxpdf +# UPSTREAM_MASTER_SITES = +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -#RUNTIME_DEP_PKGS_CSWpoppler += CSWfconfig -#RUNTIME_DEP_PKGS_CSWpoppler += CSWftype2 -#RUNTIME_DEP_PKGS_CSWpoppler += CSWjpeg -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler -#RUNTIME_DEP_PKGS_CSWpoppler += CSWlibxml2 -#RUNTIME_DEP_PKGS_CSWpoppler += CSWlcmsrt -#RUNTIME_DEP_PKGS_CSWpoppler += CSWpng +# BUILD64_LIBS_ONLY = 1 -RUNTIME_DEP_PKGS_CSWlibpoppler += CSWlcmsrt -RUNTIME_DEP_PKGS_CSWlibpoppler += CSWpng -RUNTIME_DEP_PKGS_CSWlibpoppler += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibpoppler += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibpoppler += CSWggettextrt -RUNTIME_DEP_PKGS_CSWlibpoppler += CSWglib2 -RUNTIME_DEP_PKGS_CSWlibpoppler += CSWgtk2 -RUNTIME_DEP_PKGS_CSWlibpoppler += CSWiconv -RUNTIME_DEP_PKGS_CSWlibpoppler += CSWjpeg -RUNTIME_DEP_PKGS_CSWlibpoppler += CSWlibcairo -RUNTIME_DEP_PKGS_CSWlibpoppler += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWlibpoppler += CSWpango -RUNTIME_DEP_PKGS_CSWlibpoppler += CSWzlib +PACKAGES += CSWlibpoppler-cpp0 +CATALOGNAME_CSWlibpoppler-cpp0 = libpoppler_cpp0 +PKGFILES_CSWlibpoppler-cpp0 += $(call baseisadirs,$(libdir),libpoppler-cpp\.so\.0\.1\.0) +PKGFILES_CSWlibpoppler-cpp0 += $(call baseisadirs,$(libdir),libpoppler-cpp\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibpoppler-cpp0 += $(DESCRIPTION), libpoppler-cpp.so.0 +RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibpoppler7 +RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibpopplerdev += CSWlibpoppler +PACKAGES += CSWlibpoppler-glib5 +CATALOGNAME_CSWlibpoppler-glib5 = libpoppler_glib5 +OBSOLETED_BY_CSWlibpoppler-glib5 = CSWlibpoppler -ARCHALL_CSWpoppler = 1 -ARCHALL_CSWlibpopplerdoc = 1 +PKGFILES_CSWlibpoppler-glib5 += $(call baseisadirs,$(libdir),libpoppler-glib\.so\.5\.0\.0) +PKGFILES_CSWlibpoppler-glib5 += $(call baseisadirs,$(libdir),libpoppler-glib\.so\.5(\.\d+)*) +SPKG_DESC_CSWlibpoppler-glib5 += $(DESCRIPTION), libpoppler-glib.so.5 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWpango +RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibpoppler7 -CHECKPKG_OVERRIDES_CSWpoppler += surplus-dependency|CSWlibpoppler -CHECKPKG_OVERRIDES_CSWlibpopplerdev += surplus-dependency|CSWlibpoppler -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/lib/64 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/amd64 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7/amd64 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/usr/ccs/lib/amd64 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/usr/lib/64 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/lib/64 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/amd64 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7/amd64 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/usr/ccs/lib/amd64 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/usr/lib/64 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/lib -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib/rw7 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/lib -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/lib -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib/rw7 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/lib -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib/v8 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib/v8 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/v8 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib/v8 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib/v8 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/v8 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/lib/sparcv9 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib/sparc/64 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7/v9 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/sparc/64 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/lib/sparcv9 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib/sparc/64 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7/v9 -CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/sparc/64 -CHECKPKG_OVERRIDES_CSWlibpoppler += surplus-dependency|CSWiconv +PACKAGES += CSWlibpoppler7 +CATALOGNAME_CSWlibpoppler7 = libpoppler7 +PKGFILES_CSWlibpoppler7 += $(call baseisadirs,$(libdir),libpoppler\.so\.7\.0\.0) +PKGFILES_CSWlibpoppler7 += $(call baseisadirs,$(libdir),libpoppler\.so\.7(\.\d+)*) +SPKG_DESC_CSWlibpoppler7 += $(DESCRIPTION), libpoppler.so.7 +RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWliblcms1 -PATCHFILES += missing-includes.patch +PACKAGES += CSWpoppler-dev +CATALOGNAME_CSWpoppler-dev = poppler_dev +OBSOLETED_BY_CSWpoppler-dev = CSWlibpopplerdev +SPKG_DESC_CSWpoppler-dev += $(DESCRIPTION), development files +PKGFILES_CSWpoppler-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler7 +RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler-cpp0 +RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler-glib5 -# UPSTREAM_MASTER_SITES = -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler-cpp0 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler7 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWpoppler += CSWpango +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWpoppler += CSWfconfig +RUNTIME_DEP_PKGS_CSWpoppler += CSWliblcms1 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler-glib5 -BUILD64_LIBS_ONLY = 1 - # Fix for making sure libtool doesn't pick up libpoppler.so from /opt/csw/lib # when relinking libpoppler-glib during install phaze EXTRA_SOS_LD_FLAGS += -L$(abspath $(WORKSRC)/poppler/.libs) +# EXTRA_CXXFLAGS += -D__EXTENSIONS__ +EXTRA_LINKER_FLAGS = -norunpath -xnorunpath CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/poppler/trunk/checksums =================================================================== --- csw/mgar/pkg/poppler/trunk/checksums 2012-03-20 14:04:02 UTC (rev 17481) +++ csw/mgar/pkg/poppler/trunk/checksums 2012-03-20 15:52:43 UTC (rev 17482) @@ -1,4 +1 @@ -bf4abf5006e4a812d00567eeea42faaa missing-includes.patch -776b02d90c238f08b9a8900d8e4a2580 old_libs_i386.tar.bz2 -eabd006c9b65bac874297157c8b774cb old_libs_sparc.tar.bz2 -4155346f9369b192569ce9184ff73e43 poppler-0.12.4.tar.gz +a40fe96e1115f648ce4689e667743530 poppler-0.14.4.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 Mar 21 10:26:46 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 21 Mar 2012 09:26:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17483] csw/mgar/pkg/ffmpeg/trunk Message-ID: Revision: 17483 http://gar.svn.sourceforge.net/gar/?rev=17483&view=rev Author: janholzh Date: 2012-03-21 09:26:45 +0000 (Wed, 21 Mar 2012) Log Message: ----------- ffmpeg/trunk: update to Version 0.10.2 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-03-20 15:52:43 UTC (rev 17482) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-03-21 09:26:45 UTC (rev 17483) @@ -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 = 0.10 +VERSION = 0.10.2 CATEGORIES = lib GARTYPE = v2 @@ -31,7 +31,7 @@ BUILD_DEP_PKGS += CSWlibtheora-dev BUILD_DEP_PKGS += CSWlibvorbis-dev -BUILD_DEP_PKGS += CSWx264-dev +BUILD_DEP_PKGS += CSWlibx264-dev PACKAGES += CSWlibavcodec53 SPKG_DESC_CSWlibavcodec53 = FFMPEG library libavcodec.so.53 Modified: csw/mgar/pkg/ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/checksums 2012-03-20 15:52:43 UTC (rev 17482) +++ csw/mgar/pkg/ffmpeg/trunk/checksums 2012-03-21 09:26:45 UTC (rev 17483) @@ -1 +1 @@ -dc665cc599a739e3c5262ccdac13d129 ffmpeg-0.10.tar.bz2 +de1bd5fc4bbf3ef730a5361ee596fedd ffmpeg-0.10.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Wed Mar 21 10:36:19 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 21 Mar 2012 09:36:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[17484] csw/mgar/pkg/x264/trunk Message-ID: Revision: 17484 http://gar.svn.sourceforge.net/gar/?rev=17484&view=rev Author: janholzh Date: 2012-03-21 09:36:19 +0000 (Wed, 21 Mar 2012) Log Message: ----------- x264/trunk: update to git:5c85e0a Modified Paths: -------------- csw/mgar/pkg/x264/trunk/Makefile csw/mgar/pkg/x264/trunk/checksums Added Paths: ----------- 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-03-21 09:26:45 UTC (rev 17483) +++ csw/mgar/pkg/x264/trunk/Makefile 2012-03-21 09:36:19 UTC (rev 17484) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = x264 -VERSION = snapshot-20120306-2245 +VERSION = 5c85e0a GARTYPE = v2 CATEGORIES = apps @@ -12,9 +12,14 @@ endef VENDOR_URL = http://www.videolan.org/developers/x264.html -MASTER_SITES = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ -DISTFILES = $(DISTNAME).tar.bz2 +#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 = 5c85e0a2b7992fcaab09418e3fcefc613cffc743 +# This Patch file needs to be updated on every new version! +PATCHFILES += 0001-replace-version.sh.patch + # 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 @@ -49,25 +54,25 @@ RUNTIME_DEP_PKGS_CSWx264 += CSWlibswscale2 RUNTIME_DEP_PKGS_CSWx264 += CSWlibavutil51 -PACKAGES += CSWlibx264-120 -CATALOGNAME_CSWlibx264-120 = libx264_120 -PKGFILES_CSWlibx264-120 += $(call baseisadirs,$(libdir),libx264\.so\.120) -PKGFILES_CSWlibx264-120 += $(call baseisadirs,$(libdir),libx264\.so\.120(\.\d+)*) -SPKG_DESC_CSWlibx264-120 += $(DESCRIPTION), libx264.so.120 -RUNTIME_DEP_PKGS_CSWlibx264-120 += CSWlibgcc-s1 +PACKAGES += CSWlibx264-122 +CATALOGNAME_CSWlibx264-122 = libx264_122 +PKGFILES_CSWlibx264-120 += $(call baseisadirs,$(libdir),libx264\.so\.122) +PKGFILES_CSWlibx264-120 += $(call baseisadirs,$(libdir),libx264\.so\.122(\.\d+)*) +SPKG_DESC_CSWlibx264-120 += $(DESCRIPTION), libx264.so.122 +RUNTIME_DEP_PKGS_CSWlibx264-122 += 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-120 +RUNTIME_DEP_PKGS_CSWlibx264-dev += CSWlibx264-122 #Some overrides CHECKPKG_OVERRIDES += pkginfo-description-not-starting-with-uppercase -CHECKPKG_OVERRIDES_CSWlibx264-120 += pkginfo-description-not-starting-with-uppercase +CHECKPKG_OVERRIDES_CSWlibx264-122 += pkginfo-description-not-starting-with-uppercase # seems to be checkpkg bug: -CHECKPKG_OVERRIDES_CSWlibx264-120 += non-uniform-lib-versions-in-package|sonames=libx264.so.120 +CHECKPKG_OVERRIDES_CSWlibx264-122 += non-uniform-lib-versions-in-package|sonames=libx264.so.122 Modified: csw/mgar/pkg/x264/trunk/checksums =================================================================== --- csw/mgar/pkg/x264/trunk/checksums 2012-03-21 09:26:45 UTC (rev 17483) +++ csw/mgar/pkg/x264/trunk/checksums 2012-03-21 09:36:19 UTC (rev 17484) @@ -1 +1 @@ -438b90c8caa5c3957c081ba1bb10e6ca x264-snapshot-20120306-2245.tar.bz2 +5db063ff42e04b8b093f6776e4242312 c522ad1fed167d0e985e4f9dcdee042473cf74db.tar.gz Added: csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch =================================================================== --- csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch (rev 0) +++ csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch 2012-03-21 09:36:19 UTC (rev 17484) @@ -0,0 +1,47 @@ +From 6d62d0bfa41a80d0afb547ec87e20ea8cc9c0740 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Wed, 21 Mar 2012 10:12:19 +0100 +Subject: [PATCH] replace version.sh + +--- + version.sh | 29 ++++++----------------------- + 1 files changed, 6 insertions(+), 23 deletions(-) + +diff --git a/version.sh b/version.sh +index 5466ef2..a1d43eb 100755 +--- a/version.sh ++++ b/version.sh +@@ -1,24 +1,7 @@ + #!/bin/bash +-[ -n "$1" ] && cd $1 +-git rev-list HEAD | sort > config.git-hash +-LOCALVER=`wc -l config.git-hash | awk '{print $1}'` +-if [ $LOCALVER \> 1 ] ; then +- VER=`git rev-list origin/master | sort | join config.git-hash - | wc -l | awk '{print $1}'` +- VER_DIFF=$(($LOCALVER-$VER)) +- echo "#define X264_REV $VER" +- echo "#define X264_REV_DIFF $VER_DIFF" +- if [ $VER_DIFF != 0 ] ; then +- VER="$VER+$VER_DIFF" +- fi +- if git status | grep -q "modified:" ; then +- VER="${VER}M" +- fi +- VER="$VER $(git rev-list HEAD -n 1 | cut -c 1-7)" +- echo "#define X264_VERSION \" r$VER\"" +-else +- echo "#define X264_VERSION \"\"" +- VER="x" +-fi +-rm -f config.git-hash +-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 2184" ++echo "#define X264_REV_DIFF 0" ++echo '#define X264_VERSION " r2184 5c85e0a"' ++echo '#define X264_POINTVER "0.122.2184 5c85e0a"' ++exit 0 +-- +1.7.9 + 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 Mar 21 10:39:16 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 21 Mar 2012 09:39:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[17485] csw/mgar/pkg/x264/trunk/Makefile Message-ID: Revision: 17485 http://gar.svn.sourceforge.net/gar/?rev=17485&view=rev Author: janholzh Date: 2012-03-21 09:39:16 +0000 (Wed, 21 Mar 2012) Log Message: ----------- x264/trunk: fix small change I missed Modified Paths: -------------- csw/mgar/pkg/x264/trunk/Makefile Modified: csw/mgar/pkg/x264/trunk/Makefile =================================================================== --- csw/mgar/pkg/x264/trunk/Makefile 2012-03-21 09:36:19 UTC (rev 17484) +++ csw/mgar/pkg/x264/trunk/Makefile 2012-03-21 09:39:16 UTC (rev 17485) @@ -56,9 +56,9 @@ PACKAGES += CSWlibx264-122 CATALOGNAME_CSWlibx264-122 = libx264_122 -PKGFILES_CSWlibx264-120 += $(call baseisadirs,$(libdir),libx264\.so\.122) -PKGFILES_CSWlibx264-120 += $(call baseisadirs,$(libdir),libx264\.so\.122(\.\d+)*) -SPKG_DESC_CSWlibx264-120 += $(DESCRIPTION), libx264.so.122 +PKGFILES_CSWlibx264-122 += $(call baseisadirs,$(libdir),libx264\.so\.122) +PKGFILES_CSWlibx264-122 += $(call baseisadirs,$(libdir),libx264\.so\.122(\.\d+)*) +SPKG_DESC_CSWlibx264-122 += $(DESCRIPTION), libx264.so.122 RUNTIME_DEP_PKGS_CSWlibx264-122 += CSWlibgcc-s1 PACKAGES += CSWlibx264-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Wed Mar 21 10:43:06 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Wed, 21 Mar 2012 09:43:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17486] csw/mgar/pkg/ganglia/trunk Message-ID: Revision: 17486 http://gar.svn.sourceforge.net/gar/?rev=17486&view=rev Author: d_pocock Date: 2012-03-21 09:43:06 +0000 (Wed, 21 Mar 2012) Log Message: ----------- ganglia: Update version info for 3.3.3 Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile csw/mgar/pkg/ganglia/trunk/checksums Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-21 09:39:16 UTC (rev 17485) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-21 09:43:06 UTC (rev 17486) @@ -1,6 +1,6 @@ NAME = ganglia -VERSION = 3.3.1 -VERSION_U = 3-3-1 +VERSION = 3.3.3 +VERSION_U = 3-3-3 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/ganglia/trunk/checksums =================================================================== --- csw/mgar/pkg/ganglia/trunk/checksums 2012-03-21 09:39:16 UTC (rev 17485) +++ csw/mgar/pkg/ganglia/trunk/checksums 2012-03-21 09:43:06 UTC (rev 17486) @@ -1 +1 @@ -93b46f84e554def5efc5c05ad61e9a1c ganglia-3.3.1.tar.gz +568fad6c6744b625543559187240b731 ganglia-3.3.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Mar 21 11:10:26 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Mar 2012 10:10:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[17487] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 17487 http://gar.svn.sourceforge.net/gar/?rev=17487&view=rev Author: dmichelsen Date: 2012-03-21 10:10:26 +0000 (Wed, 21 Mar 2012) Log Message: ----------- mGAR v2: Add all files when BUILD64_ONLY is set Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2012-03-21 09:43:06 UTC (rev 17486) +++ csw/mgar/gar/v2/gar.mk 2012-03-21 10:10:26 UTC (rev 17487) @@ -780,6 +780,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) 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)) MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED)) 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 Mar 21 11:44:19 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Mar 2012 10:44:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[17488] csw/mgar/pkg/libtasn1/trunk Message-ID: Revision: 17488 http://gar.svn.sourceforge.net/gar/?rev=17488&view=rev Author: dmichelsen Date: 2012-03-21 10:44:18 +0000 (Wed, 21 Mar 2012) Log Message: ----------- libtasn1/trunk: Update to 2.12 Modified Paths: -------------- csw/mgar/pkg/libtasn1/trunk/Makefile csw/mgar/pkg/libtasn1/trunk/checksums Modified: csw/mgar/pkg/libtasn1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtasn1/trunk/Makefile 2012-03-21 10:10:26 UTC (rev 17487) +++ csw/mgar/pkg/libtasn1/trunk/Makefile 2012-03-21 10:44:18 UTC (rev 17488) @@ -1,5 +1,5 @@ NAME = libtasn1 -VERSION = 2.11 +VERSION = 2.12 CATEGORIES = lib GARTYPE = v2 Modified: csw/mgar/pkg/libtasn1/trunk/checksums =================================================================== --- csw/mgar/pkg/libtasn1/trunk/checksums 2012-03-21 10:10:26 UTC (rev 17487) +++ csw/mgar/pkg/libtasn1/trunk/checksums 2012-03-21 10:44:18 UTC (rev 17488) @@ -1 +1 @@ -232ddb48d8607f15bc061d99aabad2cd libtasn1-2.11.tar.gz +4eba39fb962d6cf5a370267eae8ff52b libtasn1-2.12.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 Mar 21 13:05:59 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 21 Mar 2012 12:05:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17489] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 17489 http://gar.svn.sourceforge.net/gar/?rev=17489&view=rev Author: janholzh Date: 2012-03-21 12:05:59 +0000 (Wed, 21 Mar 2012) Log Message: ----------- ffmpeg/trunk: update to use new libx264 version Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-03-21 10:44:18 UTC (rev 17488) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-03-21 12:05:59 UTC (rev 17489) @@ -49,7 +49,7 @@ RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibx264-120 +RUNTIME_DEP_PKGS_CSWlibavcodec53 += CSWlibx264-122 PACKAGES += CSWlibavdevice53 SPKG_DESC_CSWlibavdevice53 = FFMPEG library libavdevice.so.53 @@ -68,7 +68,7 @@ RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibx264-120 +RUNTIME_DEP_PKGS_CSWlibavdevice53 += CSWlibx264-122 PACKAGES += CSWlibavfilter2 SPKG_DESC_CSWlibavfilter2 = FFMPEG library libavfilter.so.2 @@ -89,7 +89,7 @@ RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibspeex1 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibtheoraenc1 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibx264-120 +RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibx264-122 PACKAGES += CSWlibavformat53 SPKG_DESC_CSWlibavformat53 = FFMPEG library libavformat.so.53 @@ -107,7 +107,7 @@ RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibx264-120 +RUNTIME_DEP_PKGS_CSWlibavformat53 += CSWlibx264-122 PACKAGES += CSWlibavutil51 SPKG_DESC_CSWlibavutil51 = FFMPEG library libavutil.so.51 @@ -123,7 +123,7 @@ RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibspeex1 RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibtheoraenc1 -RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibx264-120 +RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibx264-122 PACKAGES += CSWlibpostproc52 SPKG_DESC_CSWlibpostproc52 = FFMPEG library libpostproc.so.52 @@ -140,7 +140,7 @@ RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibx264-120 +RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibx264-122 PACKAGES += CSWlibswscale2 SPKG_DESC_CSWlibswscale2 = FFMPEG library libswscale.so.2 @@ -157,7 +157,7 @@ RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibx264-120 +RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibx264-122 PACKAGES += CSWlibswresample0 SPKG_DESC_CSWlibswresample0 = FFMPEG library libswresample.so.0 @@ -174,7 +174,7 @@ RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibx264-120 +RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibx264-122 PACKAGES += CSWffmpeg-dev @@ -212,7 +212,7 @@ RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavfilter2 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibspeex1 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibpostproc52 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibx264-120 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibx264-122 # These are all examples CHECKPKG_OVERRIDES_CSWffmpeg += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ffmpeg.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Wed Mar 21 14:42:34 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Wed, 21 Mar 2012 13:42:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[17490] csw/mgar/pkg/libconfuse/trunk/Makefile Message-ID: Revision: 17490 http://gar.svn.sourceforge.net/gar/?rev=17490&view=rev Author: d_pocock Date: 2012-03-21 13:42:33 +0000 (Wed, 21 Mar 2012) Log Message: ----------- libconfuse: build for Solaris 9 Modified Paths: -------------- csw/mgar/pkg/libconfuse/trunk/Makefile Modified: csw/mgar/pkg/libconfuse/trunk/Makefile =================================================================== --- csw/mgar/pkg/libconfuse/trunk/Makefile 2012-03-21 12:05:59 UTC (rev 17489) +++ csw/mgar/pkg/libconfuse/trunk/Makefile 2012-03-21 13:42:33 UTC (rev 17490) @@ -18,7 +18,7 @@ DISTNAME = confuse-$(VERSION) DISTFILES += $(DISTNAME).tar.gz -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +#PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 LICENSE = AUTHORS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aironskin at users.sourceforge.net Wed Mar 21 15:01:46 2012 From: aironskin at users.sourceforge.net (aironskin at users.sourceforge.net) Date: Wed, 21 Mar 2012 14:01:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17491] csw/mgar/pkg/iozone/trunk Message-ID: Revision: 17491 http://gar.svn.sourceforge.net/gar/?rev=17491&view=rev Author: aironskin Date: 2012-03-21 14:01:46 +0000 (Wed, 21 Mar 2012) Log Message: ----------- iozone/trunk: Updated build recipe. Works on Sol10, not on Sol9 yet. Modified Paths: -------------- csw/mgar/pkg/iozone/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff csw/mgar/pkg/iozone/trunk/files/patch_manfile.diff csw/mgar/pkg/iozone/trunk/files/patch_vxioctl.diff csw/mgar/pkg/iozone/trunk/files/vx_ioctl.h Modified: csw/mgar/pkg/iozone/trunk/Makefile =================================================================== --- csw/mgar/pkg/iozone/trunk/Makefile 2012-03-21 13:42:33 UTC (rev 17490) +++ csw/mgar/pkg/iozone/trunk/Makefile 2012-03-21 14:01:46 UTC (rev 17491) @@ -14,25 +14,33 @@ read, pread ,mmap, aio_read, aio_write endef -MASTER_SITES += http://www.iozone.org/src/current/ -DISTNAME = $(NAME)$(DISTVERSION) -DISTFILES += $(DISTNAME).tar -#PATCHFILES = patch-vx_ioctl.diff +VENDOR_URL = http://www.iozone.org/ +MASTER_SITES = http://www.iozone.org/src/current/ -VENDOR_URL = http://www.iozone.org/ +DISTNAME = $(NAME)$(DISTVERSION) +WORKSRC = $(WORKDIR)/$(DISTNAME)/src/current +DOCSRC = $(WORKDIR)$(DISTNAME)/docs -DOCS = IOzone_msword_98.pdf -DOCS += IOzone_msword_98.doc -DOCS += Iozone_ps.gz -DOCS += Run_rules.doc +DISTFILES = $(DISTNAME).tar +DISTFILES += vx_ioctl.h -WORKSRC = $(WORKDIR)$(DISTNAME)/src/current -DOCSRC = $(WORKDIR)$(DISTNAME)/docs +PATCHFILES = patch_makefile.diff +PATCHFILES += patch_manfile.diff +PATCHFILES += patch_vxioctl.diff +DOCS = IOzone_msword_98.pdf +DOCS += IOzone_msword_98.doc +DOCS += Iozone_ps.gz +DOCS += Run_rules.doc + +post-extract-modulated: + cp $(FILEDIR)/vx_ioctl.h $(WORKSRC)/ + @$(MAKECOOKIE) + CONFIGURE_SCRIPTS = TEST_SCRIPTS = -BUILD_ARGS = Solaris10 +BUILD_ARGS = Solaris8-64-VXFS BUILD_SCRIPTS = $(WORKSRC)/makefile INSTALL_SCRIPTS = custom @@ -42,5 +50,9 @@ install-custom: @echo " ==> Installing $(NAME)" ginstall -D $(WORKSRC)/iozone $(DESTDIR)$(bindir)/iozone - ginstall -D $(DOCSRC)/iozone.1 $(DESTDIR)$(mandir)/man6/iozone.1 + ginstall -D $(DOCSRC)/iozone.1 $(DESTDIR)$(mandir)/man8/iozone.8 + ginstall -D $(DOCSRC)/IOzone_msword_98.pdf $(DESTDIR)$(docdir)/iozone/IOzone_msword_98.pdf + ginstall $(DOCSRC)/IOzone_msword_98.doc $(DESTDIR)$(docdir)/iozone/IOzone_msword_98.doc + ginstall $(DOCSRC)/Iozone_ps.gz $(DESTDIR)$(docdir)/iozone/Iozone_ps.gz + ginstall $(DOCSRC)/Run_rules.doc $(DESTDIR)$(docdir)/iozone/Run_rules.doc @$(MAKECOOKIE) Added: csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff =================================================================== --- csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff (rev 0) +++ csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff 2012-03-21 14:01:46 UTC (rev 17491) @@ -0,0 +1,51 @@ +From 0cdc6ee9569d94b7c720f0b9210e3ce08e73f484 Mon Sep 17 00:00:00 2001 +From: Stefan Schnyder +Date: Wed, 21 Mar 2012 12:30:26 +0100 +Subject: [PATCH] Replaced deprecated option (generic64) and removed include + +--- + src/current/makefile | 16 ++++++---------- + 1 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/src/current/makefile b/src/current/makefile +index eb1fbec..70bb6b3 100644 +--- a/src/current/makefile ++++ b/src/current/makefile +@@ -443,10 +443,9 @@ Solaris8-64: iozone_solaris8-64.o libasync.o libbif.o + # Solaris 64 bit build with threads, largefiles, async I/O, and Vxfs + # + Solaris8-64-VXFS: iozone_solaris8-64-VXFS.o libasync.o libbif.o +- $(CC) $(LDFLAGS) -fast -xtarget=generic64 -v -I/opt/VRTSvxfs/include/ +- iozone_solaris8-64-VXFS.o libasync.o libbif.o \ +- -lthread -lpthread -lposix4 -lnsl -laio \ +- -lsocket -o iozone ++ $(CC) $(LDFLAGS) -fast -m64 -v iozone_solaris8-64-VXFS.o \ ++ libasync.o libbif.o -lthread -lpthread -lposix4 -lnsl \ ++ -laio -lsocket -o iozone + + # + # Windows build requires Cygwin development environment. You +@@ -1196,17 +1195,14 @@ iozone_solaris8-64-VXFS.o: iozone.c libasync.c libbif.c + @echo "" + @echo "Building iozone for Solaris8-64-VXFS" + @echo "" +- $(CC) -fast -xtarget=generic64 -v -c -I/opt/VRTSvxfs/include/ -Dunix \ +- -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \ ++ $(CC) -fast -m64 -v -c -Dunix -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \ + -D__LP64__ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ + -DNAME='"Solaris8-64"' -Dsolaris -DHAVE_PREAD \ + $(CFLAGS) iozone.c -o iozone_solaris8-64-VXFS.o +- $(CC) -fast -xtarget=generic64 -v -c -I/opt/VRTSvxfs/include/ -Dunix \ +- -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \ ++ $(CC) -fast -m64 -v -c -Dunix -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \ + -D__LP64__ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ + -Dsolaris -DHAVE_PREAD $(CFLAGS) libasync.c -o libasync.o +- $(CC) -fast -xtarget=generic64 -v -c -I/opt/VRTSvxfs/include/ -Dunix \ +- -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \ ++ $(CC) -fast -m64 -v -c -Dunix -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \ + -D__LP64__ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ + -Dsolaris -DHAVE_PREAD $(CFLAGS) libbif.c -o libbif.o + +-- +1.7.9 + Added: csw/mgar/pkg/iozone/trunk/files/patch_manfile.diff =================================================================== --- csw/mgar/pkg/iozone/trunk/files/patch_manfile.diff (rev 0) +++ csw/mgar/pkg/iozone/trunk/files/patch_manfile.diff 2012-03-21 14:01:46 UTC (rev 17491) @@ -0,0 +1,22 @@ +From 6fd37055f0e15d77b18e9ff64f248e86ee793ecb Mon Sep 17 00:00:00 2001 +From: Stefan Schnyder +Date: Wed, 21 Mar 2012 11:29:04 +0100 +Subject: [PATCH] Move from man1 to man8 + +--- + docs/iozone.1 | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/docs/iozone.1 b/docs/iozone.1 +index 170b9d3..f7ccacd 100644 +--- a/docs/iozone.1 ++++ b/docs/iozone.1 +@@ -1,4 +1,4 @@ +-.TH IOZONE 1 ++.TH IOZONE 8 + .SH NAME + Iozone \- Filesystem Benchmark + .SH SYNOPSIS +-- +1.7.9 + Added: csw/mgar/pkg/iozone/trunk/files/patch_vxioctl.diff =================================================================== --- csw/mgar/pkg/iozone/trunk/files/patch_vxioctl.diff (rev 0) +++ csw/mgar/pkg/iozone/trunk/files/patch_vxioctl.diff 2012-03-21 14:01:46 UTC (rev 17491) @@ -0,0 +1,40 @@ +From 07945d661f107a4f7fd4b9dd06207ffa43a3e99d Mon Sep 17 00:00:00 2001 +From: Stefan Schnyder +Date: Wed, 21 Mar 2012 12:37:43 +0100 +Subject: [PATCH] Use vx_ioctl.h in BUILDSRC instead of + /opt/VRTSvxfs/include/sys/fs/ + +--- + src/current/iozone.c | 2 +- + src/current/libasync.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/current/iozone.c b/src/current/iozone.c +index 38f9da8..de96dcb 100644 +--- a/src/current/iozone.c ++++ b/src/current/iozone.c +@@ -369,7 +369,7 @@ typedef long long off64_t; + #endif + + #ifdef VXFS +-#include ++#include "vx_ioctl.h" + #endif + + #ifdef unix +diff --git a/src/current/libasync.c b/src/current/libasync.c +index adb14a6..01b5a85 100644 +--- a/src/current/libasync.c ++++ b/src/current/libasync.c +@@ -106,7 +106,7 @@ + #include + #endif + #ifdef VXFS +-#include ++#include "vx_ioctl.h" + #endif + + #if defined(OSFV5) || defined(linux) +-- +1.7.9 + Added: csw/mgar/pkg/iozone/trunk/files/vx_ioctl.h =================================================================== --- csw/mgar/pkg/iozone/trunk/files/vx_ioctl.h (rev 0) +++ csw/mgar/pkg/iozone/trunk/files/vx_ioctl.h 2012-03-21 14:01:46 UTC (rev 17491) @@ -0,0 +1,147 @@ +/* $Id: vx_ioctl.h,v 4.11 2007/06/11 02:00:26 adey Exp $ */ +/* #ident "@(#)vxfs:$RCSfile: vx_ioctl.h,v $ $Revision: 4.11 $" */ + +/* + * $Copyright: Copyright (c) 2009 Symantec Corporation. + * All rights reserved. + * + * THIS SOFTWARE CONTAINS CONFIDENTIAL INFORMATION AND TRADE SECRETS OF + * SYMANTEC CORPORATION. USE, DISCLOSURE OR REPRODUCTION IS PROHIBITED + * WITHOUT THE PRIOR EXPRESS WRITTEN PERMISSION OF SYMANTEC CORPORATION. + * + * The Licensed Software and Documentation are deemed to be commercial + * computer software as defined in FAR 12.212 and subject to restricted + * rights as defined in FAR Section 52.227-19 "Commercial Computer + * Software - Restricted Rights" and DFARS 227.7202, "Rights in + * Commercial Computer Software or Commercial Computer Software + * Documentation", as applicable, and any successor regulations. Any use, + * modification, reproduction release, performance, display or disclosure + * of the Licensed Software and Documentation by the U.S. Government + * shall be solely in accordance with the terms of this Agreement. $ + */ + +#ifndef _FS_VXFS_VX_IOCTL_H +#define _FS_VXFS_VX_IOCTL_H + +#include + +#define VX_IOCTL (('V' << 24) | ('X' << 16) | ('F' << 8)) + +/* + * User group ioctls + */ + +#define VX_SETCACHE (VX_IOCTL | 1) /* set cache advice */ +#define VX_GETCACHE (VX_IOCTL | 2) /* get cache advice */ +#define VX_GETFSOPT (VX_IOCTL | 5) /* get cache advice */ + +#if _FILE_OFFSET_BITS==64 +#define VX_SETEXT (VX_IOCTL | 39) +#define VX_GETEXT (VX_IOCTL | 40) +#else +#define VX_SETEXT (VX_IOCTL | 3) +#define VX_GETEXT (VX_IOCTL | 4) +#endif /*_FILE_OFFSET_BITS==64*/ + +struct vx_ext { + off_t ext_size; /* extent size in fs blocks */ + off_t reserve; /* space reservation in fs blocks */ + int a_flags; /* allocation flags */ +}; + +#ifdef _LP64 +#define VX_FREEZE_ALL (VX_IOCTL | 6) +#else +#define VX_FREEZE_ALL (VX_IOCTL | 41) +#endif /*_LP64*/ + +#ifdef __LP64__ +#define VX_NATTR_IOCTL (VX_IOCTL | 9) +#else +#define VX_NATTR_IOCTL (VX_IOCTL | 44) +#endif /*__LP64__*/ + +/* + * The VX_FREEZE_ALL ioctl uses the following structure + */ + +struct vx_freezeall { + int num; /* number of fd pointed to */ + int timeout; /* timeout value for the freeze all */ + int *fds; /* buffer for file descriptor list */ +}; + +/* + * Values for freeze and thaw ioctls. These must match the volume manager + * VOL_FREEZE and VOL_THAW ioctl values. + * + * These are in the user group as opposed to the admin group because we need + * to maintain backward binary compatibility with VxVM. + */ + +#ifndef VOLIOC +#define VOLIOC (('V' << 24) | ('O' << 16) | ('L' << 8)) +#endif /* VOLIOC */ + +#define VX_FREEZE (VOLIOC | 100) /* freeze the file system */ +#define VX_THAW (VOLIOC | 101) /* unfreeze the file system */ + +/* + * values for a_flags in vx_ext + */ + +#define VX_AFLAGS 0x7f /* valid flags for a_flags */ +#define VX_NOEXTEND 0x01 /* file is not to be extended */ +#define VX_TRIM 0x02 /* trim reservation to i_size on close */ +#define VX_CONTIGUOUS 0x04 /* file must be contiguously allocated */ +#define VX_ALIGN 0x08 /* extents allocated on extent boundaries */ +#define VX_NORESERVE 0x10 /* don't change i_reserve */ +#define VX_CHGSIZE 0x20 /* change i_size to match reservation */ +#define VX_GROWFILE 0x40 /* same is CHGSIZE, but for non-root users */ + +/* + * vx_setcache flags + */ + +#define VX_ADVFLAGS 0x000ff /* valid advisory flags */ +#define VX_RANDOM 0x00001 /* file is accessed randomly */ +#define VX_SEQ 0x00002 /* file is accessed sequentially */ +#define VX_DIRECT 0x00004 /* perform direct (un-buffered) i/o */ +#define VX_NOREUSE 0x00008 /* do not cache file data */ +#define VX_DSYNC 0x00010 /* synchronous data i/o (not mtime) */ +#define VX_UNBUFFERED 0x00020 /* perform non-sync direct i/o */ +#define VX_ERA 0x00040 /* enable enhanced read ahead */ +#define VX_CONCURRENT 0x00080 /* enable concurrent i/o */ + +/* + * Flags for VX_GETFSOPT + */ + +#define VX_FSO_NOLOG 0x0000001 /* mounted with VX_MS_NOLOG */ +#define VX_FSO_BLKCLEAR 0x0000002 /* mounted with VX_MS_BLKCLEAR */ +#define VX_FSO_NODATAINLOG 0x0000004 /* mounted with VX_MS_NODATAINLOG */ +#define VX_FSO_SNAPSHOT 0x0000008 /* is a snapshot */ +#define VX_FSO_SNAPPED 0x0000010 /* is being snapped */ +#define VX_FSO_VJFS 0x0000020 /* the kernel is VJFS */ +#define VX_FSO_DELAYLOG 0x0000040 /* mounted with VX_MS_DELAYLOG */ +#define VX_FSO_TMPLOG 0x0000080 /* mounted with VX_MS_TMPLOG */ +#define VX_FSO_CACHE_DIRECT 0x0000100 /* mounted with VX_MS_CACHE_DIRECT */ +#define VX_FSO_CACHE_DSYNC 0x0000200 /* mounted with VX_MS_CACHE_DSYNC */ +#define VX_FSO_CACHE_CLOSESYNC 0x0000400 /* mnt'd with VX_MS_CACHE_CLOSESYNC */ +#define VX_FSO_OSYNC_DIRECT 0x0001000 /* mounted with VX_MS_OSYNC_DIRECT */ +#define VX_FSO_OSYNC_DSYNC 0x0002000 /* mounted with VX_MS_OSYNC_DSYNC */ +#define VX_FSO_OSYNC_CLOSESYNC 0x0004000 /* mnt'd with VX_MS_OSYNC_CLOSESYNC */ +#define VX_FSO_FILESET 0x0010000 /* mounted as a file set */ +#define VX_FSO_CACHE_TMPCACHE 0x0020000 /* mnt'd with VX_MS_CACHE_TMPCACHE */ +#define VX_FSO_OSYNC_DELAY 0x0040000 /* mounted with VX_MS_OSYNC_DELAY */ +#define VX_FSO_CACHE_UNBUFFERED 0x0080000 /* mnt'd w/ VX_MS_CACHE_UNBUFFERED */ +#define VX_FSO_OSYNC_UNBUFFERED 0x0100000 /* mounted with VX_MS_UNBUFFERED */ +#define VX_FSO_QIO_ON 0x0200000 /* mounted with VX_MS_QIO_ON */ +#define VX_FSO_NOATIME 0x0400000 /* mounted with VX_MS_NOATIME */ +#define VX_FSO_NOMTIME 0x0800000 /* mounted with VX_MS_NOMTIME */ +#define VX_FSO_CDS_ADAPTIVE 0x1000000 /* mounted with VX_MS_CDS_ADAPTIVE */ +#define VX_FSO_CDS_MANDATORY 0x2000000 /* mounted with VX_MS_CDS_MANDATORY */ +#define VX_FSO_TRANFLUSH 0x4000000 /* mounted with VX_MS_TRANFLUSH */ +#define VX_FSO_MNTLOCK 0x8000000 /* mounted with VX_MS_MNTLOCK */ + +#endif /* _FS_VXFS_VX_IOCTL_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aironskin at users.sourceforge.net Wed Mar 21 15:25:49 2012 From: aironskin at users.sourceforge.net (aironskin at users.sourceforge.net) Date: Wed, 21 Mar 2012 14:25:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[17492] csw/mgar/pkg/iozone/trunk/Makefile Message-ID: Revision: 17492 http://gar.svn.sourceforge.net/gar/?rev=17492&view=rev Author: aironskin Date: 2012-03-21 14:25:48 +0000 (Wed, 21 Mar 2012) Log Message: ----------- iozone/trunk: Builds now on Sol9, but the post-extract is with static paths Modified Paths: -------------- csw/mgar/pkg/iozone/trunk/Makefile Modified: csw/mgar/pkg/iozone/trunk/Makefile =================================================================== --- csw/mgar/pkg/iozone/trunk/Makefile 2012-03-21 14:01:46 UTC (rev 17491) +++ csw/mgar/pkg/iozone/trunk/Makefile 2012-03-21 14:25:48 UTC (rev 17492) @@ -33,10 +33,6 @@ DOCS += Iozone_ps.gz DOCS += Run_rules.doc -post-extract-modulated: - cp $(FILEDIR)/vx_ioctl.h $(WORKSRC)/ - @$(MAKECOOKIE) - CONFIGURE_SCRIPTS = TEST_SCRIPTS = @@ -47,6 +43,11 @@ include gar/category.mk +post-extract-modulated: + mkdir -p work/solaris9-sparc/build-isa-sparcv8/$(DISTNAME)/src/current + cp $(FILEDIR)/vx_ioctl.h work/solaris9-sparc/build-isa-sparcv8/$(DISTNAME)/src/current + @$(MAKECOOKIE) + install-custom: @echo " ==> Installing $(NAME)" ginstall -D $(WORKSRC)/iozone $(DESTDIR)$(bindir)/iozone 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 Mar 21 15:52:59 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Mar 2012 14:52:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17493] csw/mgar/pkg/cpan/File-ShareDir/trunk/Makefile Message-ID: Revision: 17493 http://gar.svn.sourceforge.net/gar/?rev=17493&view=rev Author: dmichelsen Date: 2012-03-21 14:52:59 +0000 (Wed, 21 Mar 2012) Log Message: ----------- cpan/File-ShareDir/trunk: Update to makemake Modified Paths: -------------- csw/mgar/pkg/cpan/File-ShareDir/trunk/Makefile Modified: csw/mgar/pkg/cpan/File-ShareDir/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-ShareDir/trunk/Makefile 2012-03-21 14:25:48 UTC (rev 17492) +++ csw/mgar/pkg/cpan/File-ShareDir/trunk/Makefile 2012-03-21 14:52:59 UTC (rev 17493) @@ -8,16 +8,17 @@ define BLURB endef +CATALOG_RELEASE = unstable + LICENSE = LICENSE PACKAGES += CSWpm-file-sharedir CATALOGNAME_CSWpm-file-sharedir = pm_file_sharedir -# There was no information if this is pure Perl or not. Please remove if necessary. +SPKG_DESC_CSWpm-file-sharedir = Locate per-dist and per-module shared files ARCHALL_CSWpm-file-sharedir = 1 -RUNTIME_DEP_PKGS_CSWpm-file-sharedir = CSWpmclassinspector +RUNTIME_DEP_PKGS_CSWpm-file-sharedir += CSWpm-class-inspector -# These are examples +CHECKPKG_OVERRIDES_CSWpm-file-sharedir += file-with-bad-content|/usr/share|root/opt/csw/share/man/man3/File::ShareDir.3perl CHECKPKG_OVERRIDES_CSWpm-file-sharedir += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/File/ShareDir.pm -CHECKPKG_OVERRIDES_CSWpm-file-sharedir += file-with-bad-content|/usr/share|root/opt/csw/share/man/man3/File::ShareDir.3perl include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Mar 21 15:53:59 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Mar 2012 14:53:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17494] csw/mgar/pkg/cpan Message-ID: Revision: 17494 http://gar.svn.sourceforge.net/gar/?rev=17494&view=rev Author: dmichelsen Date: 2012-03-21 14:53:59 +0000 (Wed, 21 Mar 2012) Log Message: ----------- cpan/HTTP-Message/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/HTTP-Message/ csw/mgar/pkg/cpan/HTTP-Message/branches/ csw/mgar/pkg/cpan/HTTP-Message/tags/ csw/mgar/pkg/cpan/HTTP-Message/trunk/ csw/mgar/pkg/cpan/HTTP-Message/trunk/Makefile csw/mgar/pkg/cpan/HTTP-Message/trunk/checksums csw/mgar/pkg/cpan/HTTP-Message/trunk/files/ Property changes on: csw/mgar/pkg/cpan/HTTP-Message/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/HTTP-Message/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTTP-Message/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/HTTP-Message/trunk/Makefile 2012-03-21 14:53:59 UTC (rev 17494) @@ -0,0 +1,26 @@ +NAME = HTTP-Message +VERSION = 6.03 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = GAAS + +DESCRIPTION = HTTP style messages +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license + +PACKAGES += CSWpm-http-message +CATALOGNAME_CSWpm-http-message = pm_http_message +SPKG_DESC_CSWpm-http-message = HTTP style messages +ARCHALL_CSWpm-http-message = 1 +RUNTIME_DEP_PKGS_CSWpm-http-message += CSWpm-uri +RUNTIME_DEP_PKGS_CSWpm-http-message += CSWpm-encode-locale +RUNTIME_DEP_PKGS_CSWpm-http-message += CSWpm-html-parser +RUNTIME_DEP_PKGS_CSWpm-http-message += CSWpm-libwww-perl +OBSOLETED_BY_CSWpm-http-message += CSWpm-libwww-perl +CATALOGNAME_CSWpm-libwww-perl = pm_libwww_perl_stub + +include gar/category.mk Added: csw/mgar/pkg/cpan/HTTP-Message/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/HTTP-Message/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/HTTP-Message/trunk/checksums 2012-03-21 14:53:59 UTC (rev 17494) @@ -0,0 +1 @@ +d41b22c7c01b974f2b4e85d401a6b552 HTTP-Message-6.03.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Mar 21 15:54:44 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Mar 2012 14:54:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[17495] csw/mgar/pkg/cpan/Test-SharedFork/trunk Message-ID: Revision: 17495 http://gar.svn.sourceforge.net/gar/?rev=17495&view=rev Author: dmichelsen Date: 2012-03-21 14:54:44 +0000 (Wed, 21 Mar 2012) Log Message: ----------- cpan/Test-SharedFork/trunk: Update to 0.20 Modified Paths: -------------- csw/mgar/pkg/cpan/Test-SharedFork/trunk/Makefile csw/mgar/pkg/cpan/Test-SharedFork/trunk/checksums Modified: csw/mgar/pkg/cpan/Test-SharedFork/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-SharedFork/trunk/Makefile 2012-03-21 14:53:59 UTC (rev 17494) +++ csw/mgar/pkg/cpan/Test-SharedFork/trunk/Makefile 2012-03-21 14:54:44 UTC (rev 17495) @@ -1,17 +1,22 @@ NAME = Test-SharedFork -VERSION = 0.16 +VERSION = 0.20 CATEGORIES = cpan GARTYPE = v2 AUTHOR = TOKUHIROM -DESCRIPTION = fork test +DESCRIPTION = Fork test define BLURB endef -LICENSE = README +CATALOG_RELEASE = unstable +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ + +BUILD_DEP_PKGS += CSWpm-test-requires + PACKAGES += CSWpm-test-sharedfork CATALOGNAME_CSWpm-test-sharedfork = pm_test_sharedfork +SPKG_DESC_CSWpm-test-sharedfork = Fork test # There was no information if this is pure Perl or not. Please remove if necessary. ARCHALL_CSWpm-test-sharedfork = 1 Modified: csw/mgar/pkg/cpan/Test-SharedFork/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-SharedFork/trunk/checksums 2012-03-21 14:53:59 UTC (rev 17494) +++ csw/mgar/pkg/cpan/Test-SharedFork/trunk/checksums 2012-03-21 14:54:44 UTC (rev 17495) @@ -1 +1 @@ -ee0469b14d48bbd651f2ec5465f61a52 Test-SharedFork-0.16.tar.gz +ca30a6fbfd546065883821ae3d7a8ca9 Test-SharedFork-0.20.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Mar 21 15:58:00 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Mar 2012 14:58:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[17496] csw/mgar/pkg/cpan/HTTP-Message/ Message-ID: Revision: 17496 http://gar.svn.sourceforge.net/gar/?rev=17496&view=rev Author: dmichelsen Date: 2012-03-21 14:58:00 +0000 (Wed, 21 Mar 2012) Log Message: ----------- cpan/HTTP-Message: This is in fact libwww Removed Paths: ------------- csw/mgar/pkg/cpan/HTTP-Message/ 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 Mar 21 16:04:44 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Mar 2012 15:04:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[17497] csw/mgar/pkg/cpan Message-ID: Revision: 17497 http://gar.svn.sourceforge.net/gar/?rev=17497&view=rev Author: dmichelsen Date: 2012-03-21 15:04:44 +0000 (Wed, 21 Mar 2012) Log Message: ----------- cpan/Class-Accessor-Lite/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Class-Accessor-Lite/ csw/mgar/pkg/cpan/Class-Accessor-Lite/branches/ csw/mgar/pkg/cpan/Class-Accessor-Lite/tags/ csw/mgar/pkg/cpan/Class-Accessor-Lite/trunk/ csw/mgar/pkg/cpan/Class-Accessor-Lite/trunk/Makefile csw/mgar/pkg/cpan/Class-Accessor-Lite/trunk/checksums csw/mgar/pkg/cpan/Class-Accessor-Lite/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Class-Accessor-Lite/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Class-Accessor-Lite/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-Accessor-Lite/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Class-Accessor-Lite/trunk/Makefile 2012-03-21 15:04:44 UTC (rev 17497) @@ -0,0 +1,21 @@ +NAME = Class-Accessor-Lite +VERSION = 0.05 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = KAZUHO + +DESCRIPTION = A minimalistic variant of Class::Accessor +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ + +PACKAGES += CSWpm-class-accessor-lite +CATALOGNAME_CSWpm-class-accessor-lite = pm_class_accessor_lite +SPKG_DESC_CSWpm-class-accessor-lite = A minimalistic variant of Class::Accessor +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-class-accessor-lite = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Class-Accessor-Lite/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Class-Accessor-Lite/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Class-Accessor-Lite/trunk/checksums 2012-03-21 15:04:44 UTC (rev 17497) @@ -0,0 +1 @@ +c487f0ebe2038363b68e9e68ae4beb54 Class-Accessor-Lite-0.05.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aironskin at users.sourceforge.net Wed Mar 21 16:07:58 2012 From: aironskin at users.sourceforge.net (aironskin at users.sourceforge.net) Date: Wed, 21 Mar 2012 15:07:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[17498] csw/mgar/pkg/iozone/trunk/Makefile Message-ID: Revision: 17498 http://gar.svn.sourceforge.net/gar/?rev=17498&view=rev Author: aironskin Date: 2012-03-21 15:07:58 +0000 (Wed, 21 Mar 2012) Log Message: ----------- iozone/trunk: The post-extract is fixed. It builds now on both Solaris9 & Solaris10 Modified Paths: -------------- csw/mgar/pkg/iozone/trunk/Makefile Modified: csw/mgar/pkg/iozone/trunk/Makefile =================================================================== --- csw/mgar/pkg/iozone/trunk/Makefile 2012-03-21 15:04:44 UTC (rev 17497) +++ csw/mgar/pkg/iozone/trunk/Makefile 2012-03-21 15:07:58 UTC (rev 17498) @@ -18,7 +18,6 @@ MASTER_SITES = http://www.iozone.org/src/current/ DISTNAME = $(NAME)$(DISTVERSION) -WORKSRC = $(WORKDIR)/$(DISTNAME)/src/current DOCSRC = $(WORKDIR)$(DISTNAME)/docs DISTFILES = $(DISTNAME).tar @@ -37,20 +36,20 @@ TEST_SCRIPTS = BUILD_ARGS = Solaris8-64-VXFS -BUILD_SCRIPTS = $(WORKSRC)/makefile +BUILD_SCRIPTS = $(WORKSRC)/src/current/makefile INSTALL_SCRIPTS = custom include gar/category.mk post-extract-modulated: - mkdir -p work/solaris9-sparc/build-isa-sparcv8/$(DISTNAME)/src/current - cp $(FILEDIR)/vx_ioctl.h work/solaris9-sparc/build-isa-sparcv8/$(DISTNAME)/src/current + mkdir -p $(WORKSRC)/src/current + cp $(FILEDIR)/vx_ioctl.h $(WORKSRC)/src/current @$(MAKECOOKIE) install-custom: @echo " ==> Installing $(NAME)" - ginstall -D $(WORKSRC)/iozone $(DESTDIR)$(bindir)/iozone + ginstall -D $(WORKSRC)/src/current/iozone $(DESTDIR)$(bindir)/iozone ginstall -D $(DOCSRC)/iozone.1 $(DESTDIR)$(mandir)/man8/iozone.8 ginstall -D $(DOCSRC)/IOzone_msword_98.pdf $(DESTDIR)$(docdir)/iozone/IOzone_msword_98.pdf ginstall $(DOCSRC)/IOzone_msword_98.doc $(DESTDIR)$(docdir)/iozone/IOzone_msword_98.doc 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 Mar 21 16:09:50 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Mar 2012 15:09:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[17499] csw/mgar/pkg/cpan/Filesys-Notify-Simple/trunk Message-ID: Revision: 17499 http://gar.svn.sourceforge.net/gar/?rev=17499&view=rev Author: dmichelsen Date: 2012-03-21 15:09:49 +0000 (Wed, 21 Mar 2012) Log Message: ----------- cpan/Filesys-Notify-Simple/trunk: Update to 0.08 Modified Paths: -------------- csw/mgar/pkg/cpan/Filesys-Notify-Simple/trunk/Makefile csw/mgar/pkg/cpan/Filesys-Notify-Simple/trunk/checksums Modified: csw/mgar/pkg/cpan/Filesys-Notify-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Filesys-Notify-Simple/trunk/Makefile 2012-03-21 15:07:58 UTC (rev 17498) +++ csw/mgar/pkg/cpan/Filesys-Notify-Simple/trunk/Makefile 2012-03-21 15:09:49 UTC (rev 17499) @@ -1,5 +1,5 @@ NAME = Filesys-Notify-Simple -VERSION = 0.07 +VERSION = 0.08 CATEGORIES = cpan GARTYPE = v2 AUTHOR = MIYAGAWA @@ -8,10 +8,13 @@ define BLURB endef -LICENSE = README +CATALOG_RELEASE = unstable +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ + PACKAGES += CSWpm-filesys-notify-simple CATALOGNAME_CSWpm-filesys-notify-simple = pm_filesys_notify_simple +SPKG_DESC_CSWpm-filesys-notify-simple = Simple and dumb file system watcher # There was no information if this is pure Perl or not. Please remove if necessary. ARCHALL_CSWpm-filesys-notify-simple = 1 Modified: csw/mgar/pkg/cpan/Filesys-Notify-Simple/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Filesys-Notify-Simple/trunk/checksums 2012-03-21 15:07:58 UTC (rev 17498) +++ csw/mgar/pkg/cpan/Filesys-Notify-Simple/trunk/checksums 2012-03-21 15:09:49 UTC (rev 17499) @@ -1 +1 @@ -4842ff56a79a7db0b779ce21e71bd291 Filesys-Notify-Simple-0.07.tar.gz +82a1ae968a457c7dc37367ab43a97da8 Filesys-Notify-Simple-0.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 Wed Mar 21 16:10:15 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Mar 2012 15:10:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[17500] csw/mgar/pkg/cpan/Hash-MultiValue/trunk Message-ID: Revision: 17500 http://gar.svn.sourceforge.net/gar/?rev=17500&view=rev Author: dmichelsen Date: 2012-03-21 15:10:14 +0000 (Wed, 21 Mar 2012) Log Message: ----------- cpan/Hash-MultiValue/trunk: Update to 0.12 Modified Paths: -------------- csw/mgar/pkg/cpan/Hash-MultiValue/trunk/Makefile csw/mgar/pkg/cpan/Hash-MultiValue/trunk/checksums Modified: csw/mgar/pkg/cpan/Hash-MultiValue/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Hash-MultiValue/trunk/Makefile 2012-03-21 15:09:49 UTC (rev 17499) +++ csw/mgar/pkg/cpan/Hash-MultiValue/trunk/Makefile 2012-03-21 15:10:14 UTC (rev 17500) @@ -1,17 +1,21 @@ NAME = Hash-MultiValue -VERSION = 0.08 +VERSION = 0.12 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = MIYAGAWA +AUTHOR = ARISTOTLE DESCRIPTION = Store multiple values per key define BLURB endef -LICENSE = README +CATALOG_RELEASE = unstable +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ + PACKAGES += CSWpm-hash-multivalue CATALOGNAME_CSWpm-hash-multivalue = pm_hash_multivalue +SPKG_DESC_CSWpm-hash-multivalue = Store multiple values per key +# There was no information if this is pure Perl or not. Please remove if necessary. ARCHALL_CSWpm-hash-multivalue = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/Hash-MultiValue/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Hash-MultiValue/trunk/checksums 2012-03-21 15:09:49 UTC (rev 17499) +++ csw/mgar/pkg/cpan/Hash-MultiValue/trunk/checksums 2012-03-21 15:10:14 UTC (rev 17500) @@ -1 +1 @@ -d8e2ae6a0685d52641b3a5de20ae4116 Hash-MultiValue-0.08.tar.gz +a8016cd3e90b21e759703e248ae83c26 Hash-MultiValue-0.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Wed Mar 21 17:53:45 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Wed, 21 Mar 2012 16:53:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17501] csw/mgar/pkg/ganglia/trunk/Makefile Message-ID: Revision: 17501 http://gar.svn.sourceforge.net/gar/?rev=17501&view=rev Author: d_pocock Date: 2012-03-21 16:53:44 +0000 (Wed, 21 Mar 2012) Log Message: ----------- ganglia: Adapt for Solaris 9 or 10 build. Exclude test scripts for 3.3.3 Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-21 15:10:14 UTC (rev 17500) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-21 16:53:44 UTC (rev 17501) @@ -4,7 +4,7 @@ CATEGORIES = utils GARTYPE = v2 -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +#PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 # How should we set this? # There is a release number in configure.in, maybe use that? @@ -143,6 +143,9 @@ ifeq ($(VERSION),3.3.1) TEST_SCRIPTS = endif +ifeq ($(VERSION),3.3.3) +TEST_SCRIPTS = +endif #INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom 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 Mar 21 20:56:38 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 21 Mar 2012 19:56:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[17502] csw/mgar/pkg/lang-python/mod_python/trunk/Makefile Message-ID: Revision: 17502 http://gar.svn.sourceforge.net/gar/?rev=17502&view=rev Author: wahwah Date: 2012-03-21 19:56:38 +0000 (Wed, 21 Mar 2012) Log Message: ----------- lang-python/mod_python/trunk: Removed the dependency on python_rt Modified Paths: -------------- csw/mgar/pkg/lang-python/mod_python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/mod_python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mod_python/trunk/Makefile 2012-03-21 16:53:44 UTC (rev 17501) +++ csw/mgar/pkg/lang-python/mod_python/trunk/Makefile 2012-03-21 19:56:38 UTC (rev 17502) @@ -1,3 +1,5 @@ +# $Id$ + NAME = mod_python VERSION = 3.3.1 CATEGORIES = server @@ -3,5 +5,5 @@ GARTYPE = v2 -DESCRIPTION = an Apache/Python integration module +DESCRIPTION = Apache/Python integration module define BLURB Mod_python is an Apache module that embeds the Python language interpreter @@ -10,34 +12,46 @@ faster and more powerful applications than plain CGI. endef -MASTER_SITES = http://www.ibiblio.org/pub/mirrors/apache/httpd/modpython/ +MASTER_SITES = http://archive.apache.org/dist/httpd/modpython/ DISTFILES = $(NAME)-$(VERSION).tgz DISTFILES += postinstall preremove space -PACKAGES = CSWap2modpython - -RUNTIME_DEP_PKGS_CSWap2modpython = CSWap2prefork CSWpython-rt -CATALOGNAME_CSWap2modpython = ap2_modpython -SPKG_DESC_CSWap2modpython = an Apache/Python integration module - STRIP_LIBTOOL = 1 PATCHFILES += connobject.diff EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc -PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES = none cswpycompile -RUNTIME_DEP_PKGS += CSWcswclassutils +PYCOMPILE = 1 -# We define upstream file regex so we can be notifed of -# new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs CONFIGURE_ARGS += --with-python=$(bindir)/python CONFIGURE_ARGS += --with-flex=$(bindir)/flex-2.5.35 CONFIGURE_ARGS += --with-python-src=../python +LICENSE = LICENSE + +PACKAGES = CSWap2modpython +SPKG_DESC_CSWap2modpython = an Apache/Python integration module +CATALOGNAME_CSWap2modpython = ap2_modpython +RUNTIME_DEP_PKGS_CSWap2modpython += CSWpython +RUNTIME_DEP_PKGS_CSWap2modpython += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWap2modpython += CSWapache2 +RUNTIME_DEP_PKGS_CSWap2modpython += CSWap2prefork + +CHECKPKG_OVERRIDES_CSWap2modpython += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ap2_modpython/README +CHECKPKG_OVERRIDES_CSWap2modpython += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ap2_modpython/doc-html/dir-other-pp.html +CHECKPKG_OVERRIDES_CSWap2modpython += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ap2_modpython/doc-html/inst-configure.html +CHECKPKG_OVERRIDES_CSWap2modpython += file-with-bad-content|/usr/share|root/opt/csw/share/doc/ap2_modpython/README + +CHECKPKG_OVERRIDES_CSWap2modpython += catalogname-does-not-match-pkgname|pkgname=CSWap2modpython|catalogname=ap2_modpython|expected-catalogname=ap2modpython + +CHECKPKG_OVERRIDES_CSWap2modpython += pkginfo-description-not-starting-with-uppercase|an|Apache/Python|integration|module +CHECKPKG_OVERRIDES_CSWap2modpython += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWap2modpython += catalogname-does-not-start-with-py_ + +CHECKPKG_OVERRIDES_CSWap2modpython += missing-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWap2modpython += surplus-dependency|CSWap2prefork + include gar/category.mk DESTDOC = $(DESTDIR)$(docdir)/ap2_modpython 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 Mar 21 21:30:16 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Mar 2012 20:30:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[17503] csw/mgar/pkg/cpan/Devel-StackTrace-AsHTML/trunk/ Makefile Message-ID: Revision: 17503 http://gar.svn.sourceforge.net/gar/?rev=17503&view=rev Author: dmichelsen Date: 2012-03-21 20:30:16 +0000 (Wed, 21 Mar 2012) Log Message: ----------- cpan/Devel-StackTrace-AsHTML/trunk: Update to makemake Modified Paths: -------------- csw/mgar/pkg/cpan/Devel-StackTrace-AsHTML/trunk/Makefile Modified: csw/mgar/pkg/cpan/Devel-StackTrace-AsHTML/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Devel-StackTrace-AsHTML/trunk/Makefile 2012-03-21 19:56:38 UTC (rev 17502) +++ csw/mgar/pkg/cpan/Devel-StackTrace-AsHTML/trunk/Makefile 2012-03-21 20:30:16 UTC (rev 17503) @@ -8,12 +8,15 @@ define BLURB endef -LICENSE = README +CATALOG_RELEASE = unstable +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ + PACKAGES += CSWpm-devel-stacktrace-ashtml CATALOGNAME_CSWpm-devel-stacktrace-ashtml = pm_devel_stacktrace_ashtml +SPKG_DESC_CSWpm-devel-stacktrace-ashtml = Displays stack trace in HTML # There was no information if this is pure Perl or not. Please remove if necessary. ARCHALL_CSWpm-devel-stacktrace-ashtml = 1 -RUNTIME_DEP_PKGS_CSWpm-devel-stacktrace-ashtml = CSWpmdevstacktrace +RUNTIME_DEP_PKGS_CSWpm-devel-stacktrace-ashtml += CSWpm-devel-stacktrace include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Mar 21 21:31:21 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Mar 2012 20:31:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17504] csw/mgar/pkg/cpan/Test-TCP/trunk Message-ID: Revision: 17504 http://gar.svn.sourceforge.net/gar/?rev=17504&view=rev Author: dmichelsen Date: 2012-03-21 20:31:20 +0000 (Wed, 21 Mar 2012) Log Message: ----------- cpan/Test-TCP/trunk: Update to 1.15 Modified Paths: -------------- csw/mgar/pkg/cpan/Test-TCP/trunk/Makefile csw/mgar/pkg/cpan/Test-TCP/trunk/checksums Modified: csw/mgar/pkg/cpan/Test-TCP/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-TCP/trunk/Makefile 2012-03-21 20:30:16 UTC (rev 17503) +++ csw/mgar/pkg/cpan/Test-TCP/trunk/Makefile 2012-03-21 20:31:20 UTC (rev 17504) @@ -1,23 +1,22 @@ NAME = Test-TCP -VERSION = 1.11 +VERSION = 1.15 CATEGORIES = cpan GARTYPE = v2 AUTHOR = TOKUHIROM -DESCRIPTION = testing TCP program +DESCRIPTION = Testing TCP program define BLURB endef +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ + PACKAGES += CSWpm-test-tcp CATALOGNAME_CSWpm-test-tcp = pm_test_tcp +SPKG_DESC_CSWpm-test-tcp = Testing TCP program # There was no information if this is pure Perl or not. Please remove if necessary. ARCHALL_CSWpm-test-tcp = 1 -RUNTIME_DEP_PKGS_CSWpm-test-tcp = CSWpm-test-sharedfork +RUNTIME_DEP_PKGS_CSWpm-test-tcp += CSWpm-test-sharedfork -# This has not been released yet -CHECKPKG_OVERRIDES_CSWpm-test-tcp += license-missing|/opt/csw/share/doc/pm_test_tcp/license - -# There really is no license -CHECKPKG_OVERRIDES_CSWpm-test-tcp += unidentified-dependency|CSWpm-test-sharedfork - include gar/category.mk Modified: csw/mgar/pkg/cpan/Test-TCP/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-TCP/trunk/checksums 2012-03-21 20:30:16 UTC (rev 17503) +++ csw/mgar/pkg/cpan/Test-TCP/trunk/checksums 2012-03-21 20:31:20 UTC (rev 17504) @@ -1 +1 @@ -9dd3f0e3f4a8e2fb697180492418ac8c Test-TCP-1.11.tar.gz +34a449920cff4a591d4a65a28b354d0a Test-TCP-1.15.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Mar 21 21:43:46 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Mar 2012 20:43:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17505] csw/mgar/pkg/cpan/Plack/trunk Message-ID: Revision: 17505 http://gar.svn.sourceforge.net/gar/?rev=17505&view=rev Author: dmichelsen Date: 2012-03-21 20:43:46 +0000 (Wed, 21 Mar 2012) Log Message: ----------- cpan/Plack/trunk: Update to 0.9986 Modified Paths: -------------- csw/mgar/pkg/cpan/Plack/trunk/Makefile csw/mgar/pkg/cpan/Plack/trunk/checksums Modified: csw/mgar/pkg/cpan/Plack/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Plack/trunk/Makefile 2012-03-21 20:31:20 UTC (rev 17504) +++ csw/mgar/pkg/cpan/Plack/trunk/Makefile 2012-03-21 20:43:46 UTC (rev 17505) @@ -1,5 +1,5 @@ NAME = Plack -VERSION = 0.9970 +VERSION = 0.9986 CATEGORIES = cpan GARTYPE = v2 AUTHOR = MIYAGAWA @@ -8,34 +8,26 @@ define BLURB endef -BUILD_DEP_PKGS += CSWpm-test-requires +CATALOG_RELEASE = unstable -LICENSE = README +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ +BUILD_DEP_PKGS += CSWpm-test-requires + PACKAGES += CSWpm-plack CATALOGNAME_CSWpm-plack = pm_plack +SPKG_DESC_CSWpm-plack = Perl Superglue for Web frameworks and Web Servers (PSGI toolkit) # There was no information if this is pure Perl or not. Please remove if necessary. ARCHALL_CSWpm-plack = 1 -RUNTIME_DEP_PKGS_CSWpm-plack += CSWpm-try-tiny -RUNTIME_DEP_PKGS_CSWpm-plack += CSWpm-hash-multivalue -RUNTIME_DEP_PKGS_CSWpm-plack += CSWpmuri -RUNTIME_DEP_PKGS_CSWpm-plack += CSWpmdevstacktrace +RUNTIME_DEP_PKGS_CSWpm-plack += CSWpm-filesys-notify-simple RUNTIME_DEP_PKGS_CSWpm-plack += CSWpm-http-body +RUNTIME_DEP_PKGS_CSWpm-plack += CSWpm-uri +RUNTIME_DEP_PKGS_CSWpm-plack += CSWpm-devel-stacktrace-ashtml +RUNTIME_DEP_PKGS_CSWpm-plack += CSWpm-libwww-perl +RUNTIME_DEP_PKGS_CSWpm-plack += CSWpm-try-tiny +RUNTIME_DEP_PKGS_CSWpm-plack += CSWpm-devel-stacktrace RUNTIME_DEP_PKGS_CSWpm-plack += CSWpm-test-tcp RUNTIME_DEP_PKGS_CSWpm-plack += CSWpm-file-sharedir -RUNTIME_DEP_PKGS_CSWpm-plack += CSWpm-filesys-notify-simple -RUNTIME_DEP_PKGS_CSWpm-plack += CSWpm-devel-stacktrace-ashtml -RUNTIME_DEP_PKGS_CSWpm-plack += CSWpmlibwww +RUNTIME_DEP_PKGS_CSWpm-plack += CSWpm-hash-multivalue -BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWpm-plack) - -# These have not been released -CHECKPKG_OVERRIDES_CSWpm-plack += unidentified-dependency|CSWpm-try-tiny -CHECKPKG_OVERRIDES_CSWpm-plack += unidentified-dependency|CSWpm-hash-multivalue -CHECKPKG_OVERRIDES_CSWpm-plack += unidentified-dependency|CSWpm-http-body -CHECKPKG_OVERRIDES_CSWpm-plack += unidentified-dependency|CSWpm-test-tcp -CHECKPKG_OVERRIDES_CSWpm-plack += unidentified-dependency|CSWpm-file-sharedir -CHECKPKG_OVERRIDES_CSWpm-plack += unidentified-dependency|CSWpm-filesys-notify-simple -CHECKPKG_OVERRIDES_CSWpm-plack += unidentified-dependency|CSWpm-devel-stacktrace-ashtml - include gar/category.mk Modified: csw/mgar/pkg/cpan/Plack/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Plack/trunk/checksums 2012-03-21 20:31:20 UTC (rev 17504) +++ csw/mgar/pkg/cpan/Plack/trunk/checksums 2012-03-21 20:43:46 UTC (rev 17505) @@ -1 +1 @@ -c3510e1502925ab1971da10aa4204143 Plack-0.9970.tar.gz +90d63ab0dc479136906db43ab9a99df1 Plack-0.9986.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Mar 21 21:48:21 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Mar 2012 20:48:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17506] csw/mgar/pkg/cpan Message-ID: Revision: 17506 http://gar.svn.sourceforge.net/gar/?rev=17506&view=rev Author: dmichelsen Date: 2012-03-21 20:48:21 +0000 (Wed, 21 Mar 2012) Log Message: ----------- cpan/Proc-Wait3/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Proc-Wait3/ csw/mgar/pkg/cpan/Proc-Wait3/branches/ csw/mgar/pkg/cpan/Proc-Wait3/tags/ csw/mgar/pkg/cpan/Proc-Wait3/trunk/ csw/mgar/pkg/cpan/Proc-Wait3/trunk/Makefile csw/mgar/pkg/cpan/Proc-Wait3/trunk/checksums csw/mgar/pkg/cpan/Proc-Wait3/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Proc-Wait3/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Proc-Wait3/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Proc-Wait3/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Proc-Wait3/trunk/Makefile 2012-03-21 20:48:21 UTC (rev 17506) @@ -0,0 +1,19 @@ +NAME = Proc-Wait3 +VERSION = 0.04 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = CTILMES + +DESCRIPTION = Perl extension for wait3 system call +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +PACKAGES += CSWpm-proc-wait3 +CATALOGNAME_CSWpm-proc-wait3 = pm_proc_wait3 +SPKG_DESC_CSWpm-proc-wait3 = Perl extension for wait3 system call + +include gar/category.mk Added: csw/mgar/pkg/cpan/Proc-Wait3/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Proc-Wait3/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Proc-Wait3/trunk/checksums 2012-03-21 20:48:21 UTC (rev 17506) @@ -0,0 +1 @@ +d87ce5f3557eb86bfa5bafb9f2e028e3 Proc-Wait3-0.04.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Mar 21 21:59:25 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Mar 2012 20:59:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17507] csw/mgar/pkg/cpan Message-ID: Revision: 17507 http://gar.svn.sourceforge.net/gar/?rev=17507&view=rev Author: dmichelsen Date: 2012-03-21 20:59:24 +0000 (Wed, 21 Mar 2012) Log Message: ----------- cpan/Parallel-Prefork/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Parallel-Prefork/ csw/mgar/pkg/cpan/Parallel-Prefork/branches/ csw/mgar/pkg/cpan/Parallel-Prefork/tags/ csw/mgar/pkg/cpan/Parallel-Prefork/trunk/ csw/mgar/pkg/cpan/Parallel-Prefork/trunk/Makefile csw/mgar/pkg/cpan/Parallel-Prefork/trunk/checksums csw/mgar/pkg/cpan/Parallel-Prefork/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Parallel-Prefork/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Parallel-Prefork/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Parallel-Prefork/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Parallel-Prefork/trunk/Makefile 2012-03-21 20:59:24 UTC (rev 17507) @@ -0,0 +1,28 @@ +NAME = Parallel-Prefork +VERSION = 0.13 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = KAZUHO + +DESCRIPTION = A simple prefork server framework +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ + +BUILD_DEP_PKGS += CSWpm-test-sharedfork +BUILD_DEP_PKGS += CSWpm-test-requires + +PACKAGES += CSWpm-parallel-prefork +CATALOGNAME_CSWpm-parallel-prefork = pm_parallel_prefork +SPKG_DESC_CSWpm-parallel-prefork = A simple prefork server framework +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-parallel-prefork = 1 +RUNTIME_DEP_PKGS_CSWpm-parallel-prefork += CSWpm-class-accessor-lite +RUNTIME_DEP_PKGS_CSWpm-parallel-prefork += CSWpm-scope-guard +RUNTIME_DEP_PKGS_CSWpm-parallel-prefork += CSWpm-list-moreutils +RUNTIME_DEP_PKGS_CSWpm-parallel-prefork += CSWpm-proc-wait3 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Parallel-Prefork/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Parallel-Prefork/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Parallel-Prefork/trunk/checksums 2012-03-21 20:59:24 UTC (rev 17507) @@ -0,0 +1 @@ +d7802062d8f925b1f933de93d24c0fab Parallel-Prefork-0.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Mar 21 21:59:54 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Mar 2012 20:59:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17508] csw/mgar/pkg/cpan Message-ID: Revision: 17508 http://gar.svn.sourceforge.net/gar/?rev=17508&view=rev Author: dmichelsen Date: 2012-03-21 20:59:54 +0000 (Wed, 21 Mar 2012) Log Message: ----------- cpan/Server-Starter/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Server-Starter/ csw/mgar/pkg/cpan/Server-Starter/branches/ csw/mgar/pkg/cpan/Server-Starter/tags/ csw/mgar/pkg/cpan/Server-Starter/trunk/ csw/mgar/pkg/cpan/Server-Starter/trunk/Makefile csw/mgar/pkg/cpan/Server-Starter/trunk/checksums csw/mgar/pkg/cpan/Server-Starter/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Server-Starter/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Server-Starter/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Server-Starter/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Server-Starter/trunk/Makefile 2012-03-21 20:59:54 UTC (rev 17508) @@ -0,0 +1,24 @@ +NAME = Server-Starter +VERSION = 0.11 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = KAZUHO + +DESCRIPTION = A superdaemon for hot-deploying server programs +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ + +PACKAGES += CSWpm-server-starter +CATALOGNAME_CSWpm-server-starter = pm_server_starter +SPKG_DESC_CSWpm-server-starter = A superdaemon for hot-deploying server programs +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-server-starter = 1 +RUNTIME_DEP_PKGS_CSWpm-server-starter += CSWpm-scope-guard +RUNTIME_DEP_PKGS_CSWpm-server-starter += CSWpm-list-moreutils +RUNTIME_DEP_PKGS_CSWpm-server-starter += CSWpm-proc-wait3 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Server-Starter/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Server-Starter/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Server-Starter/trunk/checksums 2012-03-21 20:59:54 UTC (rev 17508) @@ -0,0 +1 @@ +037d75831a23ca76cd306d678b20332e Server-Starter-0.11.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Mar 21 22:06:37 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Mar 2012 21:06:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17509] csw/mgar/pkg/cpan Message-ID: Revision: 17509 http://gar.svn.sourceforge.net/gar/?rev=17509&view=rev Author: dmichelsen Date: 2012-03-21 21:06:36 +0000 (Wed, 21 Mar 2012) Log Message: ----------- cpan/Starlet/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Starlet/ csw/mgar/pkg/cpan/Starlet/branches/ csw/mgar/pkg/cpan/Starlet/tags/ csw/mgar/pkg/cpan/Starlet/trunk/ csw/mgar/pkg/cpan/Starlet/trunk/Makefile csw/mgar/pkg/cpan/Starlet/trunk/checksums csw/mgar/pkg/cpan/Starlet/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Starlet/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Starlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Starlet/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Starlet/trunk/Makefile 2012-03-21 21:06:36 UTC (rev 17509) @@ -0,0 +1,26 @@ +NAME = Starlet +VERSION = 0.14 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = KAZUHO + +DESCRIPTION = A simple, high-performance PSGI/Plack HTTP server +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ + +BUILD_DEP_PKGS += CSWpm-test-tcp + +PACKAGES += CSWpm-starlet +CATALOGNAME_CSWpm-starlet = pm_starlet +SPKG_DESC_CSWpm-starlet = A simple, high-performance PSGI/Plack HTTP server +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-starlet = 1 +RUNTIME_DEP_PKGS_CSWpm-starlet += CSWpm-parallel-prefork +RUNTIME_DEP_PKGS_CSWpm-starlet += CSWpm-server-starter +RUNTIME_DEP_PKGS_CSWpm-starlet += CSWpm-plack + +include gar/category.mk Added: csw/mgar/pkg/cpan/Starlet/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Starlet/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Starlet/trunk/checksums 2012-03-21 21:06:36 UTC (rev 17509) @@ -0,0 +1 @@ +936bd736f65b8d96ada877bf4b2bc506 Starlet-0.14.tar.gz 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 Mar 22 09:08:05 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 22 Mar 2012 08:08:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[17510] csw/mgar/pkg/poppler/trunk Message-ID: Revision: 17510 http://gar.svn.sourceforge.net/gar/?rev=17510&view=rev Author: cgrzemba Date: 2012-03-22 08:08:04 +0000 (Thu, 22 Mar 2012) Log Message: ----------- poppler/trunk: add ltmain runpath patch Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/poppler/trunk/files/ltmain.patch Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2012-03-21 21:06:36 UTC (rev 17509) +++ csw/mgar/pkg/poppler/trunk/Makefile 2012-03-22 08:08:04 UTC (rev 17510) @@ -19,6 +19,7 @@ PACKAGING_PLATFORMS = Solaris10-sparc Solaris10-i386 PATCHFILES += missing-includes.patch +PATCHFILES += ltmain.patch # UPSTREAM_MASTER_SITES = UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz Added: csw/mgar/pkg/poppler/trunk/files/ltmain.patch =================================================================== --- csw/mgar/pkg/poppler/trunk/files/ltmain.patch (rev 0) +++ csw/mgar/pkg/poppler/trunk/files/ltmain.patch 2012-03-22 08:08:04 UTC (rev 17510) @@ -0,0 +1,11 @@ +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-xnorunpath|-norunpath) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" 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 Mar 22 10:32:49 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 22 Mar 2012 09:32:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[17511] csw/mgar/pkg/evince/trunk Message-ID: Revision: 17511 http://gar.svn.sourceforge.net/gar/?rev=17511&view=rev Author: cgrzemba Date: 2012-03-22 09:32:49 +0000 (Thu, 22 Mar 2012) Log Message: ----------- evince/trunk: bump version 2.30.3 Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile csw/mgar/pkg/evince/trunk/checksums Added Paths: ----------- csw/mgar/pkg/evince/trunk/files/0001-honor-aclocal_flags.patch Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2012-03-22 08:08:04 UTC (rev 17510) +++ csw/mgar/pkg/evince/trunk/Makefile 2012-03-22 09:32:49 UTC (rev 17511) @@ -3,25 +3,36 @@ # $Id$ NAME = evince -GNOME_VERSION = 2.24 -VERSION = $(GNOME_VERSION).2 +GNOME_VERSION = 2.30 +VERSION = $(GNOME_VERSION).3 CATEGORIES = gnome GARTYPE = v2 DESCRIPTION = Document viewer for multiple document formats define BLURB endef -GARFLAVOR = DBG + +# GARFLAVOR = DBG +# GARCOMPILER=GNU +GARCOMPILER=SOS12U3 SPKG_SOURCEURL = http://projects.gnome.org/evince/ MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(NAME)/$(GNOME_VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +PATCHFILES += 0001-honor-aclocal_flags.patch + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS_DBG = --enable-debug -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) -EXTRA_CFLAGS_DBG = -g -EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARFLAVOR)) +# CONFIGURE_ARGS_DBG = --enable-debug +# CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) + +# EXTRA_CFLAGS_DBG = -g +# EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARFLAVOR)) +# EXTRA_CXXFLAGS += -DPOPPLER_WITH_GDK +EXTRA_CXXFLAGS += -DHAVE_POPPLER_PAGE_RENDER -DPOPPLER_HAS_CAIRO + STRIP_LIBTOOL = 1 -EXTRA_LD_OPTIONS = /opt/csw/X11/lib/libX11.so -lm +EXTRA_LD_OPTIONS = -lm +# EXTRA_LD_OPTIONS = /opt/csw/X11/lib/libX11.so -lm # There are no shared-object dependencies on CSWdbus, but it's required for # evince to work. RUNTIME_DEP_PKGS_CSWevince += CSWdbus @@ -55,4 +66,12 @@ RUNTIME_DEP_PKGS_CSWevince += CSWzlib BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWevince) + include gar/category.mk + +pre-configure-modulated: + cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force + cd $(WORKSRC) && autoreconf + @$(MAKECOOKIE) + +PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/evince/trunk/checksums =================================================================== --- csw/mgar/pkg/evince/trunk/checksums 2012-03-22 08:08:04 UTC (rev 17510) +++ csw/mgar/pkg/evince/trunk/checksums 2012-03-22 09:32:49 UTC (rev 17511) @@ -1 +1 @@ -9b190961795bcb0394502597470420db evince-2.24.2.tar.gz +4614e108cc4fda94bac2a242e490408a evince-2.30.3.tar.gz Added: csw/mgar/pkg/evince/trunk/files/0001-honor-aclocal_flags.patch =================================================================== --- csw/mgar/pkg/evince/trunk/files/0001-honor-aclocal_flags.patch (rev 0) +++ csw/mgar/pkg/evince/trunk/files/0001-honor-aclocal_flags.patch 2012-03-22 09:32:49 UTC (rev 17511) @@ -0,0 +1,22 @@ +From e43d918efb08a9049d6489a854f3171aa4330609 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Mon, 19 Mar 2012 16:09:43 +0100 +Subject: [PATCH] honor aclocal_flags + +--- + Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 4647ca4..8488dc3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-ACLOCAL_AMFLAGS = -I m4 ++ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 + + # Set the minimum required Windows version to Windows 2000 (0x0500). + if PLATFORM_WIN32 +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Mar 22 11:34:09 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 22 Mar 2012 10:34:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17512] csw/mgar/pkg/ganglia/trunk/Makefile Message-ID: Revision: 17512 http://gar.svn.sourceforge.net/gar/?rev=17512&view=rev Author: d_pocock Date: 2012-03-22 10:34:09 +0000 (Thu, 22 Mar 2012) Log Message: ----------- ganglia: move test case comments to top of Makefile. Change format of library name. Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-22 09:32:49 UTC (rev 17511) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-22 10:34:09 UTC (rev 17512) @@ -1,6 +1,12 @@ NAME = ganglia VERSION = 3.3.3 VERSION_U = 3-3-3 +# Unit tests don't seem to run on Solaris, so it is disabled +# As soon as Ganglia test cases are fixed to run on Solaris, +# this line should be commented out so that mgar will call `make check' +# automatically for us +TEST_SCRIPTS = + CATEGORIES = utils GARTYPE = v2 @@ -118,35 +124,6 @@ # modgstatus - for Ganglia version and internal status metrics CONFIGURE_ARGS += --enable-status -# For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, -# so we skip it. This should be re-assessed with each new release -# from upstream. Proposed fixes for the test suite to be submitted -# upstream. -ifeq ($(VERSION),3.1.3) -TEST_SCRIPTS = -endif -ifeq ($(VERSION),3.1.4) -TEST_SCRIPTS = -endif -ifeq ($(VERSION),3.1.5) -TEST_SCRIPTS = -endif -ifeq ($(VERSION),3.1.6) -TEST_SCRIPTS = -endif -ifeq ($(VERSION),3.1.7) -TEST_SCRIPTS = -endif -ifeq ($(VERSION),3.2.0) -TEST_SCRIPTS = -endif -ifeq ($(VERSION),3.3.1) -TEST_SCRIPTS = -endif -ifeq ($(VERSION),3.3.3) -TEST_SCRIPTS = -endif - #INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom WWWROOT = /opt/csw/share/www @@ -175,9 +152,9 @@ PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modproc.so PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modgstatus.so -PKGFILES_CSWlibganglia0 += $(call pkgfiles_lib,libganglia-$(VERSION).0.so.0) +PKGFILES_CSWlibganglia0 += $(call pkgfiles_lib,libganglia-$(VERSION).so.0) -CHECKPKG_OVERRIDES_CSWlibganglia0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libganglia-$(VERSION).0.so.0.0.0|soname=libganglia-$(VERSION).0.so.0|pkgname=CSWlibganglia0|expected=CSWlibganglia$(VERSION_U)-0-0 +CHECKPKG_OVERRIDES_CSWlibganglia0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libganglia-$(VERSION).so.0.0.0|soname=libganglia-$(VERSION).so.0|pkgname=CSWlibganglia0|expected=CSWlibganglia$(VERSION_U)-0 PKGFILES_CSWgangliamodpython = .*python.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Mar 22 11:42:43 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 22 Mar 2012 10:42:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[17513] csw/mgar/pkg/ganglia/trunk Message-ID: Revision: 17513 http://gar.svn.sourceforge.net/gar/?rev=17513&view=rev Author: d_pocock Date: 2012-03-22 10:42:42 +0000 (Thu, 22 Mar 2012) Log Message: ----------- ganglia: update for building 3.3.4 Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile csw/mgar/pkg/ganglia/trunk/checksums Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-22 10:34:09 UTC (rev 17512) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-22 10:42:42 UTC (rev 17513) @@ -1,6 +1,6 @@ NAME = ganglia -VERSION = 3.3.3 -VERSION_U = 3-3-3 +VERSION = 3.3.4 +VERSION_U = 3-3-4 # Unit tests don't seem to run on Solaris, so it is disabled # As soon as Ganglia test cases are fixed to run on Solaris, # this line should be commented out so that mgar will call `make check' Modified: csw/mgar/pkg/ganglia/trunk/checksums =================================================================== --- csw/mgar/pkg/ganglia/trunk/checksums 2012-03-22 10:34:09 UTC (rev 17512) +++ csw/mgar/pkg/ganglia/trunk/checksums 2012-03-22 10:42:42 UTC (rev 17513) @@ -1 +1 @@ -568fad6c6744b625543559187240b731 ganglia-3.3.3.tar.gz +d7a29490d20d51e0c8e71830dc50f99f ganglia-3.3.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Thu Mar 22 12:07:53 2012 From: dam at opencsw.org (Dagobert Michelsen) Date: Thu, 22 Mar 2012 12:07:53 +0100 Subject: [csw-devel] Fwd: SF.net SVN: gar:[17513] csw/mgar/pkg/ganglia/trunk References: Message-ID: <619B7298-9261-48FC-ABB9-A2BB38163779@opencsw.org> Hi Daniel, Anfang der weitergeleiteten E-Mail: > Von: d_pocock at users.sourceforge.net > Datum: 22. M?rz 2012 11:42:43 MEZ > An: devel at lists.opencsw.org > Betreff: [csw-devel] SF.net SVN: gar:[17513] csw/mgar/pkg/ganglia/trunk > Antwort an: Broadcasts commit logs for build descriptions and GAR > > Revision: 17513 > http://gar.svn.sourceforge.net/gar/?rev=17513&view=rev > Author: d_pocock > Date: 2012-03-22 10:42:42 +0000 (Thu, 22 Mar 2012) > Log Message: > ----------- > ganglia: update for building 3.3.4 > > Modified Paths: > -------------- > csw/mgar/pkg/ganglia/trunk/Makefile > csw/mgar/pkg/ganglia/trunk/checksums > > Modified: csw/mgar/pkg/ganglia/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-22 10:34:09 UTC (rev 17512) > +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-22 10:42:42 UTC (rev 17513) > @@ -1,6 +1,6 @@ > NAME = ganglia > -VERSION = 3.3.3 > -VERSION_U = 3-3-3 > +VERSION = 3.3.4 > +VERSION_U = 3-3-4 I suggest VERSION_U = $(subst .,-,$(VERSION)) Best regards -- Dago > # Unit tests don't seem to run on Solaris, so it is disabled > # As soon as Ganglia test cases are fixed to run on Solaris, > # this line should be commented out so that mgar will call `make check' > > Modified: csw/mgar/pkg/ganglia/trunk/checksums > =================================================================== > --- csw/mgar/pkg/ganglia/trunk/checksums 2012-03-22 10:34:09 UTC (rev 17512) > +++ csw/mgar/pkg/ganglia/trunk/checksums 2012-03-22 10:42:42 UTC (rev 17513) > @@ -1 +1 @@ > -568fad6c6744b625543559187240b731 ganglia-3.3.3.tar.gz > +d7a29490d20d51e0c8e71830dc50f99f ganglia-3.3.4.tar.gz > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel From d_pocock at users.sourceforge.net Thu Mar 22 12:11:11 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 22 Mar 2012 11:11:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17514] csw/mgar/pkg/ganglia/trunk/Makefile Message-ID: Revision: 17514 http://gar.svn.sourceforge.net/gar/?rev=17514&view=rev Author: d_pocock Date: 2012-03-22 11:11:11 +0000 (Thu, 22 Mar 2012) Log Message: ----------- ganglia: derive version string for library name automatically Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-22 10:42:42 UTC (rev 17513) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-22 11:11:11 UTC (rev 17514) @@ -1,6 +1,6 @@ NAME = ganglia VERSION = 3.3.4 -VERSION_U = 3-3-4 +VERSION_U = $(subst .,-,$(VERSION)) # Unit tests don't seem to run on Solaris, so it is disabled # As soon as Ganglia test cases are fixed to run on Solaris, # this line should be commented out so that mgar will call `make check' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From igalic at users.sourceforge.net Thu Mar 22 12:12:52 2012 From: igalic at users.sourceforge.net (igalic at users.sourceforge.net) Date: Thu, 22 Mar 2012 11:12:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17515] csw/mgar/pkg/trafficserver/trunk/Makefile Message-ID: Revision: 17515 http://gar.svn.sourceforge.net/gar/?rev=17515&view=rev Author: igalic Date: 2012-03-22 11:12:51 +0000 (Thu, 22 Mar 2012) Log Message: ----------- trafficserver: drop SKIP_MODULATIONS, preserveconf simplify PROTOTYPE_s Modified Paths: -------------- csw/mgar/pkg/trafficserver/trunk/Makefile Modified: csw/mgar/pkg/trafficserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/trafficserver/trunk/Makefile 2012-03-22 11:11:11 UTC (rev 17514) +++ csw/mgar/pkg/trafficserver/trunk/Makefile 2012-03-22 11:12:51 UTC (rev 17515) @@ -14,7 +14,12 @@ MASTER_SITES = http://people.apache.org/~zwoop/rel-candidates/ DISTFILES = $(DISTNAME).tar.bz2 +PACKAGING_PLATFORMS = solaris10-i386 +BUILD64_ONLY = 1 +ISAEXEC = 1 + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/$(NAME) CONFIGURE_ARGS += --with-openssl=$(prefix) CONFIGURE_ARGS += --with-tcl=$(libdir) CONFIGURE_ARGS += --with-zlib=$(prefix) @@ -24,17 +29,11 @@ CONFIGURE_ARGS += --with-user=$(shell /opt/csw/gnu/id -nu) CONFIGURE_ARGS += --with-group=$(shell /opt/csw/gnu/id -ng) -PROTOTYPE_MODIFIERS = config data -PROTOTYPE_FILES_config = $(sysconfdir) -PROTOTYPE_CLASS_config = cswconffile -PROTOTYPE_USER_config = nobody -PROTOTYPE_GROUP_config = $(shell id -ng nobody) -PROTOTYPE_FILES_data = $(datadir) -PROTOTYPE_FILES_data = $(datadir) +PROTOTYPE_MODIFIERS += data +PROTOTYPE_FILES_data += $(sysconfdir)/?.* +PROTOTYPE_FILES_data += $(datarootdir)/?.* +PROTOTYPE_USER_data = nobody +PROTOTYPE_GROUP_data = nobody -PACKAGING_PLATFORMS = solaris10-i386 -SKIP_MODULATIONS = isa-i386 isa-pentium_pro -BUILD64 = 1 - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 22 12:17:30 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 22 Mar 2012 11:17:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[17516] csw/mgar/pkg/trafficserver/trunk/ Message-ID: Revision: 17516 http://gar.svn.sourceforge.net/gar/?rev=17516&view=rev Author: dmichelsen Date: 2012-03-22 11:17:29 +0000 (Thu, 22 Mar 2012) Log Message: ----------- trafficserver/trunk: Remove externals Property Changed: ---------------- csw/mgar/pkg/trafficserver/trunk/ Property changes on: csw/mgar/pkg/trafficserver/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + work Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Mar 22 12:34:22 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 22 Mar 2012 11:34:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[17517] csw/mgar/pkg/ganglia/trunk/Makefile Message-ID: Revision: 17517 http://gar.svn.sourceforge.net/gar/?rev=17517&view=rev Author: d_pocock Date: 2012-03-22 11:34:22 +0000 (Thu, 22 Mar 2012) Log Message: ----------- ganglia: remove Debian artefacts from www tree Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-22 11:17:29 UTC (rev 17516) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-22 11:34:22 UTC (rev 17517) @@ -215,6 +215,8 @@ @cd $(WORKSRC)/web; \ cp -R * $(DESTDIR)$(WWWGANGLIA) @rm -rf $(DESTDIR)$(WWWGANGLIA)/conf.php + @rm -rf $(DESTDIR)$(WWWGANGLIA)/debian + @rm -rf $(DESTDIR)$(WWWGANGLIA)/ganglia-web/debian @ginstall -D $(FILEDIR)/conf.php \ $(DESTDIR)$(WWWGANGLIA)/conf.php.CSW @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 22 13:46:11 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 22 Mar 2012 12:46:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17518] csw/mgar/pkg/trafficserver/trunk/Makefile Message-ID: Revision: 17518 http://gar.svn.sourceforge.net/gar/?rev=17518&view=rev Author: dmichelsen Date: 2012-03-22 12:46:11 +0000 (Thu, 22 Mar 2012) Log Message: ----------- trafficserver/trunk: Fix datadir Modified Paths: -------------- csw/mgar/pkg/trafficserver/trunk/Makefile Modified: csw/mgar/pkg/trafficserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/trafficserver/trunk/Makefile 2012-03-22 11:34:22 UTC (rev 17517) +++ csw/mgar/pkg/trafficserver/trunk/Makefile 2012-03-22 12:46:11 UTC (rev 17518) @@ -31,7 +31,7 @@ PROTOTYPE_MODIFIERS += data PROTOTYPE_FILES_data += $(sysconfdir)/?.* -PROTOTYPE_FILES_data += $(datarootdir)/?.* +PROTOTYPE_FILES_data += $(datadir)/?.* PROTOTYPE_USER_data = nobody PROTOTYPE_GROUP_data = nobody This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From igalic at users.sourceforge.net Thu Mar 22 14:10:46 2012 From: igalic at users.sourceforge.net (igalic at users.sourceforge.net) Date: Thu, 22 Mar 2012 13:10:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17519] csw/mgar/pkg/hwloc/trunk Message-ID: Revision: 17519 http://gar.svn.sourceforge.net/gar/?rev=17519&view=rev Author: igalic Date: 2012-03-22 13:10:46 +0000 (Thu, 22 Mar 2012) Log Message: ----------- hwloc/trunk: bump versions, disable DBG Modified Paths: -------------- csw/mgar/pkg/hwloc/trunk/Makefile csw/mgar/pkg/hwloc/trunk/checksums Modified: csw/mgar/pkg/hwloc/trunk/Makefile =================================================================== --- csw/mgar/pkg/hwloc/trunk/Makefile 2012-03-22 12:46:11 UTC (rev 17518) +++ csw/mgar/pkg/hwloc/trunk/Makefile 2012-03-22 13:10:46 UTC (rev 17519) @@ -1,7 +1,7 @@ # $Id$ # NAME = hwloc -VERSION = 1.2.1 +VERSION = 1.4.1 GARTYPE = v2 CATEGORIES = devel @@ -10,7 +10,7 @@ The Portable Hardware Locality (hwloc) software package provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various system attributes such as cache and memory information. It primarily aims at helping applications with gathering information about modern computing hardware so as to exploit it accordingly and efficiently. endef -MASTER_SITES = http://www.open-mpi.org/software/hwloc/v1.2/downloads/ +MASTER_SITES = http://www.open-mpi.org/software/hwloc/v1.4/downloads/ DISTFILES = $(DISTNAME).tar.gz PACKAGES = CSWhwloc @@ -43,7 +43,7 @@ BUILD64_LIBS_ONLY = 1 -GARFLAVOR = DBG +#GARFLAVOR = DBG include gar/category.mk Modified: csw/mgar/pkg/hwloc/trunk/checksums =================================================================== --- csw/mgar/pkg/hwloc/trunk/checksums 2012-03-22 12:46:11 UTC (rev 17518) +++ csw/mgar/pkg/hwloc/trunk/checksums 2012-03-22 13:10:46 UTC (rev 17519) @@ -1 +1 @@ -dc654612daf292b90d642a05d84ff1e6 hwloc-1.2.1.tar.gz +d8b28f45d6a841087a6094a2183f4673 hwloc-1.4.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From igalic at users.sourceforge.net Thu Mar 22 14:21:40 2012 From: igalic at users.sourceforge.net (igalic at users.sourceforge.net) Date: Thu, 22 Mar 2012 13:21:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[17520] csw/mgar/pkg/hwloc/trunk/Makefile Message-ID: Revision: 17520 http://gar.svn.sourceforge.net/gar/?rev=17520&view=rev Author: igalic Date: 2012-03-22 13:21:40 +0000 (Thu, 22 Mar 2012) Log Message: ----------- hwloc/trunk: Disable s9 builds. Modified Paths: -------------- csw/mgar/pkg/hwloc/trunk/Makefile Modified: csw/mgar/pkg/hwloc/trunk/Makefile =================================================================== --- csw/mgar/pkg/hwloc/trunk/Makefile 2012-03-22 13:10:46 UTC (rev 17519) +++ csw/mgar/pkg/hwloc/trunk/Makefile 2012-03-22 13:21:40 UTC (rev 17520) @@ -13,6 +13,9 @@ MASTER_SITES = http://www.open-mpi.org/software/hwloc/v1.4/downloads/ DISTFILES = $(DISTNAME).tar.gz +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc +BUILD64_LIBS_ONLY = 1 + PACKAGES = CSWhwloc PACKAGES += CSWhwloc-dev PACKAGES += CSWhwloc-doc @@ -41,9 +44,5 @@ CONFIGURE_ARGS = $(DIRPATHS) #CONFIGURE_ARGS += --disable-visibility -BUILD64_LIBS_ONLY = 1 - -#GARFLAVOR = DBG - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From igalic at users.sourceforge.net Thu Mar 22 14:39:47 2012 From: igalic at users.sourceforge.net (igalic at users.sourceforge.net) Date: Thu, 22 Mar 2012 13:39:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[17521] csw/mgar/pkg/hwloc/trunk/Makefile Message-ID: Revision: 17521 http://gar.svn.sourceforge.net/gar/?rev=17521&view=rev Author: igalic Date: 2012-03-22 13:39:47 +0000 (Thu, 22 Mar 2012) Log Message: ----------- hwloc/trunk: Bump SO version. Modified Paths: -------------- csw/mgar/pkg/hwloc/trunk/Makefile Modified: csw/mgar/pkg/hwloc/trunk/Makefile =================================================================== --- csw/mgar/pkg/hwloc/trunk/Makefile 2012-03-22 13:21:40 UTC (rev 17520) +++ csw/mgar/pkg/hwloc/trunk/Makefile 2012-03-22 13:39:47 UTC (rev 17521) @@ -19,25 +19,25 @@ PACKAGES = CSWhwloc PACKAGES += CSWhwloc-dev PACKAGES += CSWhwloc-doc -PACKAGES += CSWlibhwloc3 +PACKAGES += CSWlibhwloc5 ARCHALL_CSWhwloc-doc = 1 SPKG_DESC_CSWhwloc += $(DESCRIPTION) SPKG_DESC_CSWhwloc-dev += $(DESCRIPTION), development files SPKG_DESC_CSWhwloc-doc += $(DESCRIPTION), documentation -SPKG_DESC_CSWlibhwloc3 += $(DESCRIPTION), runtime +SPKG_DESC_CSWlibhwloc5 += $(DESCRIPTION), runtime -PKGFILES_CSWlibhwloc3 = $(call pkgfiles_lib,libhwloc.so.3) +PKGFILES_CSWlibhwloc5 = $(call pkgfiles_lib,libhwloc.so.5) PKGFILES_CSWhwloc-dev = $(PKGFILES_DEVEL) PKGFILES_CSWhwloc-doc = $(PKGFILES_DOC) RUNTIME_DEP_PKGS_CSWhwloc = CSWlibcairo2 RUNTIME_DEP_PKGS_CSWhwloc += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWhwloc += CSWlibhwloc3 -RUNTIME_DEP_PKGS_CSWlibhwloc3 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWhwloc += CSWlibhwloc5 +RUNTIME_DEP_PKGS_CSWlibhwloc5 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWhwloc-dev = CSWhwloc -RUNTIME_DEP_PKGS_CSWhwloc-dev += CSWlibhwloc3 +RUNTIME_DEP_PKGS_CSWhwloc-dev += CSWlibhwloc5 #BUILDDEPS = CSWautoconf 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 Mar 22 16:13:30 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 22 Mar 2012 15:13:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[17522] csw/mgar/pkg/evince/trunk/Makefile Message-ID: Revision: 17522 http://gar.svn.sourceforge.net/gar/?rev=17522&view=rev Author: cgrzemba Date: 2012-03-22 15:13:29 +0000 (Thu, 22 Mar 2012) Log Message: ----------- evince/trunk: polish build dependencies Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2012-03-22 13:39:47 UTC (rev 17521) +++ csw/mgar/pkg/evince/trunk/Makefile 2012-03-22 15:13:29 UTC (rev 17522) @@ -11,9 +11,6 @@ define BLURB endef -# GARFLAVOR = DBG -# GARCOMPILER=GNU -GARCOMPILER=SOS12U3 SPKG_SOURCEURL = http://projects.gnome.org/evince/ MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(NAME)/$(GNOME_VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.gz @@ -21,7 +18,13 @@ PATCHFILES += 0001-honor-aclocal_flags.patch +# GARFLAVOR = DBG +# GARCOMPILER=GNU +GARCOMPILER=SOS12U3 +STRIP_LIBTOOL = 1 + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-introspection # CONFIGURE_ARGS_DBG = --enable-debug # CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) @@ -29,6 +32,7 @@ # EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARFLAVOR)) # EXTRA_CXXFLAGS += -DPOPPLER_WITH_GDK EXTRA_CXXFLAGS += -DHAVE_POPPLER_PAGE_RENDER -DPOPPLER_HAS_CAIRO +EXTRA_CFLAGS += -I/opt/csw/include/nautilus -I/opt/csw/include/gnome-vfs-2.0 STRIP_LIBTOOL = 1 EXTRA_LD_OPTIONS = -lm @@ -65,7 +69,33 @@ RUNTIME_DEP_PKGS_CSWevince += CSWtiff RUNTIME_DEP_PKGS_CSWevince += CSWzlib -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWevince) +BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWlibgconf-dev +BUILD_DEP_PKGS += CSWgnomedocutils +BUILD_DEP_PKGS += CSWintltool +BUILD_DEP_PKGS += CSWlibgtk2-dev +BUILD_DEP_PKGS += CSWlibxml2-dev +BUILD_DEP_PKGS += CSWgnomeicontheme +BUILD_DEP_PKGS += CSWsunx11devel +BUILD_DEP_PKGS += CSWlibgtk2-dev +BUILD_DEP_PKGS += CSWgnomekeyring-dev +BUILD_DEP_PKGS += CSWlibdbus-glib-dev +BUILD_DEP_PKGS += CSWpoppler-dev +BUILD_DEP_PKGS += CSWlibcairo-dev +BUILD_DEP_PKGS += CSWlibspectre-dev +BUILD_DEP_PKGS += CSWlibdjvulibre-dev +BUILD_DEP_PKGS += CSWgobject-introspection-dev +BUILD_DEP_PKGS += CSWbinutils +BUILD_DEP_PKGS += CSWgnulinks +BUILD_DEP_PKGS += CSWtetex +BUILD_DEP_PKGS += CSWpangodevel +BUILD_DEP_PKGS += CSWlibpixman-dev +BUILD_DEP_PKGS += CSWlibfreetype-dev +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibatk-dev +BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWgnomevfs2-dev +BUILD_DEP_PKGS += CSWpy-libxml2 include gar/category.mk @@ -75,3 +105,4 @@ @$(MAKECOOKIE) PATH := /opt/csw/gnu:$(PATH) +AM_DEFAULT_VERBOSITY := 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Mar 22 17:55:20 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 22 Mar 2012 16:55:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17523] csw/mgar/pkg/ganglia/trunk/Makefile Message-ID: Revision: 17523 http://gar.svn.sourceforge.net/gar/?rev=17523&view=rev Author: d_pocock Date: 2012-03-22 16:55:20 +0000 (Thu, 22 Mar 2012) Log Message: ----------- ganglia: add extra dependencies for new web UI Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-22 15:13:29 UTC (rev 17522) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-22 16:55:20 UTC (rev 17523) @@ -72,6 +72,8 @@ CHECKPKG_OVERRIDES_CSWgangliagmetad += surplus-dependency|CSWrrdtool RUNTIME_DEP_PKGS_CSWgangliaweb = CSWgangliagmetad RUNTIME_DEP_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2-modphp5 CSWrrdtool +RUNTIME_DEP_PKGS_CSWgangliaweb += CSWphp5-gd +RUNTIME_DEP_PKGS_CSWgangliaweb += CSWphp5-json CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWgangliagmetad CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWrrdtool This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Mar 22 18:09:02 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 22 Mar 2012 17:09:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[17524] csw/mgar/pkg/ganglia/trunk/Makefile Message-ID: Revision: 17524 http://gar.svn.sourceforge.net/gar/?rev=17524&view=rev Author: d_pocock Date: 2012-03-22 17:09:02 +0000 (Thu, 22 Mar 2012) Log Message: ----------- ganglia: create extra directories/perms required for new web UI Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-22 16:55:20 UTC (rev 17523) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-22 17:09:02 UTC (rev 17524) @@ -132,6 +132,7 @@ WWWGANGLIA = $(WWWROOT)/ganglia sysconfdir = /etc/opt/csw/ganglia ETCGANGLIA = $(sysconfdir) +VARGANGLIA = /var/opt/csw/ganglia PKGFILES_CSWganglia = PKGFILES_CSWgangliaagent = /etc/opt/csw/ganglia/gmond.conf.CSW @@ -173,12 +174,13 @@ PKGFILES_CSWgangliagmetad = /opt/csw/sbin/gmetad PKGFILES_CSWgangliagmetad += /etc/opt/csw/ganglia/gmetad.conf.CSW PKGFILES_CSWgangliagmetad += /etc/opt/csw/init.d/cswgmetad -PKGFILES_CSWgangliagmetad += /var/opt/csw/ganglia/rrds +PKGFILES_CSWgangliagmetad += $(VARGANGLIA)/rrds PKGFILES_CSWgangliagmetad += /opt/csw/share/man/man1/gmetad.1 PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* PKGFILES_CSWgangliaweb += /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW -PKGFILES_CSWgangliaweb += /var/opt/csw/ganglia/dwoo +PKGFILES_CSWgangliaweb += $(VARGANGLIA)/dwoo +PKGFILES_CSWgangliaweb += $(VARGANGLIA)/conf PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf @@ -198,6 +200,7 @@ PROTOTYPE_FILTER_CSWgangliaweb = awk '\ $$$$3 ~ /\/var\/opt\/csw\/ganglia\/dwoo/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ +$$$$3 ~ /\/var\/opt\/csw\/ganglia\/conf/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ { print }' #ARCHALL_CSWganglia-dev = 1 @@ -242,8 +245,9 @@ ifeq ($(VERSION),3.1.2) @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf.CSW endif - @ginstall -d $(DESTDIR)/var/opt/csw/ganglia/rrds - @ginstall -d $(DESTDIR)/var/opt/csw/ganglia/dwoo + @ginstall -d $(DESTDIR)$(VARGANGLIA)/rrds + @ginstall -d $(DESTDIR)$(VARGANGLIA)/dwoo + @ginstall -d $(DESTDIR)$(VARGANGLIA)/conf @ginstall -D $(WORKSRC)/gmond/gmond.conf.5 $(DESTDIR)$(mandir)/man5/gmond.conf.5 @ginstall -D $(WORKSRC)/mans/gmetad.1 $(DESTDIR)$(mandir)/man1/gmetad.1 @ginstall -D $(WORKSRC)/mans/gmond.1 $(DESTDIR)$(mandir)/man1/gmond.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Mar 22 18:09:29 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 22 Mar 2012 17:09:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[17525] csw/mgar/pkg/ganglia/trunk/files/conf.php Message-ID: Revision: 17525 http://gar.svn.sourceforge.net/gar/?rev=17525&view=rev Author: d_pocock Date: 2012-03-22 17:09:29 +0000 (Thu, 22 Mar 2012) Log Message: ----------- ganglia: adapt conf.php for new web UI Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/files/conf.php Modified: csw/mgar/pkg/ganglia/trunk/files/conf.php =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/conf.php 2012-03-22 17:09:02 UTC (rev 17524) +++ csw/mgar/pkg/ganglia/trunk/files/conf.php 2012-03-22 17:09:29 UTC (rev 17525) @@ -1,218 +1,10 @@ "ff634f", - "75-100" =>"ffa15e", - "50-75" => "ffde5e", - "25-50" => "caff98", - "0-25" => "e2ecff", - "down" => "515151" -); - -# -# Load scaling -# -$load_scale = 1.0; - -# -# Default color for single metric graphs -# -$default_metric_color = "555555"; - -# -# Default metric -# -$default_metric = "load_one"; - -# -# remove the domainname from the FQDN hostnames in graphs -# (to help with long hostnames in small charts) -# -$strip_domainname = false; - -# -# Optional summary graphs -# -#$optional_graphs = array('packet'); - -# -# Time ranges -# Each value is the # of seconds in that range. -# -$time_ranges = array( - 'hour'=>3600, - 'day'=>86400, - 'week'=>604800, - 'month'=>2419200, - 'year'=>31449600 -); - -# this key must exist in $time_ranges -$default_time_range = 'hour'; - -# -# Graph sizes -# -$graph_sizes = array( - 'small'=>array( - 'height'=>40, - 'width'=>130, - 'fudge_0'=>0, - 'fudge_1'=>0, - 'fudge_2'=>0 - ), - 'medium'=>array( - 'height'=>75, - 'width'=>300, - 'fudge_0'=>0, - 'fudge_1'=>14, - 'fudge_2'=>28 - ), - 'large'=>array( - 'height'=>600, - 'width'=>800, - 'fudge_0'=>0, - 'fudge_1'=>0, - 'fudge_2'=>0 - ), - # this was the default value when no other size was provided. - 'default'=>array( - 'height'=>100, - 'width'=>400, - 'fudge_0'=>0, - 'fudge_1'=>0, - 'fudge_2'=>0 - ) -); -$default_graph_size = 'default'; -$graph_sizes_keys = array_keys( $graph_sizes ); - -# In earlier versions of gmetad, hostnames were handled in a case -# sensitive manner -# If your hostname directories have been renamed to lower case, -# set this option to 0 to disable backward compatibility. -# From version 3.2, backwards compatibility will be disabled by default. -# default: true (for gmetad < 3.2) -# default: false (for gmetad >= 3.2) -$case_sensitive_hostnames = false; +$conf['rrdtool'] = "/opt/csw/bin/rrdtool"; ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Mar 22 18:38:39 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 22 Mar 2012 17:38:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17526] csw/mgar/pkg/ganglia/trunk/Makefile Message-ID: Revision: 17526 http://gar.svn.sourceforge.net/gar/?rev=17526&view=rev Author: d_pocock Date: 2012-03-22 17:38:38 +0000 (Thu, 22 Mar 2012) Log Message: ----------- ganglia: add extra dependencies for new web UI (eliminate surplus dependency errors) Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-22 17:09:29 UTC (rev 17525) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-22 17:38:38 UTC (rev 17526) @@ -77,6 +77,8 @@ CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWgangliagmetad CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWrrdtool +CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWphp5-gd +CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWphp5-json # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 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 Mar 23 08:17:52 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 23 Mar 2012 07:17:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17527] csw/mgar/pkg/evince/trunk/Makefile Message-ID: Revision: 17527 http://gar.svn.sourceforge.net/gar/?rev=17527&view=rev Author: cgrzemba Date: 2012-03-23 07:17:51 +0000 (Fri, 23 Mar 2012) Log Message: ----------- evince/trunk: skip test because it needs dogtail Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2012-03-22 17:38:38 UTC (rev 17526) +++ csw/mgar/pkg/evince/trunk/Makefile 2012-03-23 07:17:51 UTC (rev 17527) @@ -24,26 +24,23 @@ STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-introspection +# CONFIGURE_ARGS += --enable-introspection # CONFIGURE_ARGS_DBG = --enable-debug # CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) +# use dogtail which we dont have +TEST_TARGET = + # EXTRA_CFLAGS_DBG = -g # EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARFLAVOR)) # EXTRA_CXXFLAGS += -DPOPPLER_WITH_GDK EXTRA_CXXFLAGS += -DHAVE_POPPLER_PAGE_RENDER -DPOPPLER_HAS_CAIRO EXTRA_CFLAGS += -I/opt/csw/include/nautilus -I/opt/csw/include/gnome-vfs-2.0 -STRIP_LIBTOOL = 1 EXTRA_LD_OPTIONS = -lm # EXTRA_LD_OPTIONS = /opt/csw/X11/lib/libX11.so -lm # There are no shared-object dependencies on CSWdbus, but it's required for # evince to work. -RUNTIME_DEP_PKGS_CSWevince += CSWdbus -CHECKPKG_OVERRIDES_CSWevince += surplus-dependency|CSWdbus -# Shared MIME info is needed to detect file types -RUNTIME_DEP_PKGS_CSWevince += CSWsharedmimeinfo -CHECKPKG_OVERRIDES_CSWevince += surplus-dependency|CSWsharedmimeinfo # Shared libraries RUNTIME_DEP_PKGS_CSWevince += CSWdbusglib @@ -68,6 +65,11 @@ RUNTIME_DEP_PKGS_CSWevince += CSWpango RUNTIME_DEP_PKGS_CSWevince += CSWtiff RUNTIME_DEP_PKGS_CSWevince += CSWzlib +RUNTIME_DEP_PKGS_CSWevince += CSWdbus +CHECKPKG_OVERRIDES_CSWevince += surplus-dependency|CSWdbus +# Shared MIME info is needed to detect file types +RUNTIME_DEP_PKGS_CSWevince += CSWsharedmimeinfo +CHECKPKG_OVERRIDES_CSWevince += surplus-dependency|CSWsharedmimeinfo BUILD_DEP_PKGS += CSWlibglib2-dev BUILD_DEP_PKGS += CSWlibgconf-dev 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 Mar 23 13:42:57 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 23 Mar 2012 12:42:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[17528] csw/mgar/pkg/evince/trunk/Makefile Message-ID: Revision: 17528 http://gar.svn.sourceforge.net/gar/?rev=17528&view=rev Author: cgrzemba Date: 2012-03-23 12:42:57 +0000 (Fri, 23 Mar 2012) Log Message: ----------- evince/trunk: add checkpkg hints to build recipe Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2012-03-23 07:17:51 UTC (rev 17527) +++ csw/mgar/pkg/evince/trunk/Makefile 2012-03-23 12:42:57 UTC (rev 17528) @@ -7,7 +7,7 @@ VERSION = $(GNOME_VERSION).3 CATEGORIES = gnome GARTYPE = v2 -DESCRIPTION = Document viewer for multiple document formats +DESCRIPTION = Document viewer for multiple document formats: pdf, ps ,dvi define BLURB endef @@ -38,11 +38,86 @@ EXTRA_CFLAGS += -I/opt/csw/include/nautilus -I/opt/csw/include/gnome-vfs-2.0 EXTRA_LD_OPTIONS = -lm +EXTRA_LINKER_FLAG = -norunpath -xnorunpath # EXTRA_LD_OPTIONS = /opt/csw/X11/lib/libX11.so -lm # There are no shared-object dependencies on CSWdbus, but it's required for # evince to work. -# Shared libraries +PACKAGES += CSWlibevdocument2 +CATALOGNAME_CSWlibevdocument2 = libevdocument2 +PKGFILES_CSWlibevdocument2 += $(call baseisadirs,$(libdir),libevdocument\.so\.2\.0\.0) +PKGFILES_CSWlibevdocument2 += $(call baseisadirs,$(libdir),libevdocument\.so\.2(\.\d+)*) +SPKG_DESC_CSWlibevdocument2 += $(DESCRIPTION), libevdocument.so.2 +RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWpango +RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibevdocument2 += CSWlibgio2-0-0 + +PACKAGES += CSWlibevview2 +CATALOGNAME_CSWlibevview2 = libevview2 +PKGFILES_CSWlibevview2 += $(call baseisadirs,$(libdir),libevview\.so\.2\.0\.0) +PKGFILES_CSWlibevview2 += $(call baseisadirs,$(libdir),libevview\.so\.2(\.\d+)*) +SPKG_DESC_CSWlibevview2 += $(DESCRIPTION), libevview.so.2 +RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibevdocument2 +RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibevview2 += CSWpango +RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibevview2 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWevince-dev += CSWlibevdocument2 +RUNTIME_DEP_PKGS_CSWevince-dev += CSWlibevview2 + +PACKAGES += CSWevince-dev +CATALOGNAME_CSWevince-dev = evince_dev +SPKG_DESC_CSWevince-dev += $(DESCRIPTION), development files +PKGFILES_CSWevince-dev += $(PKGFILES_DEVEL) + +SPKG_DESC_CSWevince += $(DESCRIPTION), base +RUNTIME_DEP_PKGS_CSWevince += CSWlibevdocument2 +RUNTIME_DEP_PKGS_CSWevince += CSWlibevview2 +RUNTIME_DEP_PKGS_CSWevince += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWevince += CSWlibdjvulibre21 +RUNTIME_DEP_PKGS_CSWevince += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWevince += CSWlibpoppler-glib5 +RUNTIME_DEP_PKGS_CSWevince += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWevince += CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWevince += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWevince += CSWlibz1 +RUNTIME_DEP_PKGS_CSWevince += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWevince += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWevince += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWevince += CSWlibdbus-glib1-2 +RUNTIME_DEP_PKGS_CSWevince += CSWlibspectre1 +RUNTIME_DEP_PKGS_CSWevince += CSWlibpoppler7 +RUNTIME_DEP_PKGS_CSWevince += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWevince += CSWlibgconf2-4 +RUNTIME_DEP_PKGS_CSWevince += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWevince += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWevince += CSWlibgnome-keyring0 +RUNTIME_DEP_PKGS_CSWevince += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWevince += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWevince += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWevince += CSWlibatk1-0-0 + RUNTIME_DEP_PKGS_CSWevince += CSWdbusglib RUNTIME_DEP_PKGS_CSWevince += CSWdjvulibrert RUNTIME_DEP_PKGS_CSWevince += CSWfconfig @@ -70,6 +145,16 @@ # Shared MIME info is needed to detect file types RUNTIME_DEP_PKGS_CSWevince += CSWsharedmimeinfo CHECKPKG_OVERRIDES_CSWevince += surplus-dependency|CSWsharedmimeinfo +# Solaris10 paths: these are resuts of cmd: +# $ scrollkeeper-config --pkglocalstatedir +CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib +CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper +CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/C +CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/C/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/C/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/TOC +CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/index +CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/scrollkeeper_docs BUILD_DEP_PKGS += CSWlibglib2-dev BUILD_DEP_PKGS += CSWlibgconf-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 23 14:46:26 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 23 Mar 2012 13:46:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[17529] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 17529 http://gar.svn.sourceforge.net/gar/?rev=17529&view=rev Author: bdwalton Date: 2012-03-23 13:46:26 +0000 (Fri, 23 Mar 2012) Log Message: ----------- apache2/trunk: version bump to 2.2.22 Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile csw/mgar/pkg/apache2/trunk/checksums Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2012-03-23 12:42:57 UTC (rev 17528) +++ csw/mgar/pkg/apache2/trunk/Makefile 2012-03-23 13:46:26 UTC (rev 17529) @@ -1,7 +1,7 @@ # $Id$ NAME = httpd -VERSION = 2.2.21 +VERSION = 2.2.22 CATEGORIES = server GARTYPE = v2 Modified: csw/mgar/pkg/apache2/trunk/checksums =================================================================== --- csw/mgar/pkg/apache2/trunk/checksums 2012-03-23 12:42:57 UTC (rev 17528) +++ csw/mgar/pkg/apache2/trunk/checksums 2012-03-23 13:46:26 UTC (rev 17529) @@ -1 +1 @@ -b24ca6db942a4f8e57c357e5e3058d31 httpd-2.2.21.tar.gz +d77fa5af23df96a8af68ea8114fa6ce1 httpd-2.2.22.tar.gz 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 Mar 23 14:52:27 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 23 Mar 2012 13:52:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[17530] csw/mgar/pkg/powerdns/trunk Message-ID: Revision: 17530 http://gar.svn.sourceforge.net/gar/?rev=17530&view=rev Author: wilbury Date: 2012-03-23 13:52:27 +0000 (Fri, 23 Mar 2012) Log Message: ----------- powerdns/trunk: Update to 3.0.1 Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile csw/mgar/pkg/powerdns/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/powerdns/trunk/ Property changes on: csw/mgar/pkg/powerdns/trunk ___________________________________________________________________ Added: svn:ignore + work download cookies Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-03-23 13:46:26 UTC (rev 17529) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-03-23 13:52:27 UTC (rev 17530) @@ -1,5 +1,5 @@ NAME = pdns -VERSION = 2.9.22 +VERSION = 3.0.1 CATEGORIES = server GARTYPE = v2 @@ -14,7 +14,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += LICENSE DISTFILES += cswpdns -PATCHFILES += 0001-stdint.h-patch.patch +# PATCHFILES += 0001-stdint.h-patch.patch # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz @@ -26,19 +26,25 @@ CATALOGNAME = powerdns LICENSE = $(FILEDIR)/LICENSE -GARCOMPILER = GCC3 -PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +GARCOMPILER = GNU +# PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 SKIPTEST = 1 -EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/mysql +BUILD64_ONLY = 1 +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw/pdns -CONFIGURE_ARGS += --with-mysql=/opt/csw/mysql5 +CONFIGURE_ARGS += --sysconfdir=/etc/$(prefix)/pdns +CONFIGURE_ARGS += --with-mysql=$(prefix) +CONFIGURE_ARGS += --with-boost=/opt/csw/gxx RUNTIME_DEP_PKGS_CSWpdns += CSWzlib -RUNTIME_DEP_PKGS_CSWpdns += CSWgcc3core -RUNTIME_DEP_PKGS_CSWpdns += CSWgcc3g++ -RUNTIME_DEP_PKGS_CSWpdns += CSWmysql5rt +RUNTIME_DEP_PKGS_CSWpdns += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpdns += CSWlibmysqlclient15 +RUNTIME_DEP_PKGS_CSWpdns += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWpdns += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWpdns += CSWboostrt +BUILD_DEP_PKGS = CSWmysql5devel CSWboostdevel INITSMF = /etc/opt/csw/init.d/cswpdns PRESERVECONF = /etc/opt/csw/pdns/pdns.conf Modified: csw/mgar/pkg/powerdns/trunk/checksums =================================================================== --- csw/mgar/pkg/powerdns/trunk/checksums 2012-03-23 13:46:26 UTC (rev 17529) +++ csw/mgar/pkg/powerdns/trunk/checksums 2012-03-23 13:52:27 UTC (rev 17530) @@ -1,4 +1 @@ -532949f5046c424fc6e8970e0e269d24 0001-stdint.h-patch.patch -b234ee4d69f5fce4486a80fdaf4a4263 LICENSE -8bf1c6c58ca47f3accb98b71e9af8024 cswpdns -8a6ff842733aca885577eb54e983a1ff pdns-2.9.22.tar.gz +a67763b2b45d9f3504a24607c5b4068d pdns-3.0.1.tar.gz 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 Mar 23 14:54:47 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 23 Mar 2012 13:54:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[17531] csw/mgar/pkg/powerdns/trunk/Makefile Message-ID: Revision: 17531 http://gar.svn.sourceforge.net/gar/?rev=17531&view=rev Author: wilbury Date: 2012-03-23 13:54:47 +0000 (Fri, 23 Mar 2012) Log Message: ----------- powerdns/trunk: Update build dependencies Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-03-23 13:52:27 UTC (rev 17530) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-03-23 13:54:47 UTC (rev 17531) @@ -44,7 +44,7 @@ RUNTIME_DEP_PKGS_CSWpdns += CSWgcc4corert RUNTIME_DEP_PKGS_CSWpdns += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWpdns += CSWboostrt -BUILD_DEP_PKGS = CSWmysql5devel CSWboostdevel +BUILD_DEP_PKGS = CSWmysql-dev CSWboostdevel INITSMF = /etc/opt/csw/init.d/cswpdns PRESERVECONF = /etc/opt/csw/pdns/pdns.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 23 15:15:58 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 23 Mar 2012 14:15:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[17532] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 17532 http://gar.svn.sourceforge.net/gar/?rev=17532&view=rev Author: bdwalton Date: 2012-03-23 14:15:57 +0000 (Fri, 23 Mar 2012) Log Message: ----------- apache2/trunk: update dependencies for newly split libraries Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2012-03-23 13:54:47 UTC (rev 17531) +++ csw/mgar/pkg/apache2/trunk/Makefile 2012-03-23 14:15:57 UTC (rev 17532) @@ -89,7 +89,8 @@ SPKG_DESC_CSWapache2c = A stub for the old apache2c package. RUNTIME_DEP_PKGS_CSWapache2 += CSWlibiconv2 CSWosslutils -RUNTIME_DEP_PKGS_CSWapache2 += CSWoldaprt CSWosslrt CSWlibz1 +RUNTIME_DEP_PKGS_CSWapache2 += CSWliblber2-4-2 CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWapache2 += CSWlibssl0-9-8 CSWlibz1 RUNTIME_DEP_PKGS_CSWapache2 += CSWbdb48 CSWlibexpat1 RUNTIME_DEP_PKGS_CSWapache2 += CSWlibaprutil1-0 CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWapache2 += CSWapache2c CSWperl CSWapache2-utils @@ -104,7 +105,7 @@ RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibexpat1 RUNTIME_DEP_PKGS_CSWapache2-utils += CSWbdb48 -RUNTIME_DEP_PKGS_CSWapache2-utils += CSWosslrt +RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWapache2-utils += CSWperl RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 CSWapache2c 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 Mar 24 04:02:18 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 24 Mar 2012 03:02:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17533] csw/mgar/pkg/git/trunk Message-ID: Revision: 17533 http://gar.svn.sourceforge.net/gar/?rev=17533&view=rev Author: bdwalton Date: 2012-03-24 03:02:18 +0000 (Sat, 24 Mar 2012) Log Message: ----------- git/trunk: update to next rc Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-03-23 14:15:57 UTC (rev 17532) +++ csw/mgar/pkg/git/trunk/Makefile 2012-03-24 03:02:18 UTC (rev 17533) @@ -1,6 +1,7 @@ NAME = git VERSION = 1.7.10 -PATCHLEVEL = rc1 +PATCHLEVEL = rc2 +DISTNAME = $(NAME)-$(VERSION).$(PATCHLEVEL) CATEGORIES = devel GARTYPE = v2 @@ -102,7 +103,7 @@ SPKG_DESC_CSWgit-dev = Headers and static libraries for Git MASTER_SITES = http://git-core.googlecode.com/files/ -DISTFILES += $(NAME)-$(VERSION).$(PATCHLEVEL).tar.gz +DISTFILES += $(DISTNAME).tar.gz DISTFILES += CSWgit.postinstall PATCHFILES += 0001-Update-path-in-documentation-to-be-CSW-proper.patch @@ -152,7 +153,7 @@ BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ ASCIIDOC_NO_ROFF=YesPlease \ - all doc + all INSTALL_ARGS = INSTALLDIRS=vendor \ install-man install-html Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2012-03-23 14:15:57 UTC (rev 17532) +++ csw/mgar/pkg/git/trunk/checksums 2012-03-24 03:02:18 UTC (rev 17533) @@ -1 +1 @@ -79add1ac683766e01a8c16ac4fac09fe git-1.7.10.rc1.tar.gz +1c4d847289aadd2d8620c82139c3feee git-1.7.10.rc2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 24 10:27:58 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 24 Mar 2012 09:27:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[17534] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 17534 http://gar.svn.sourceforge.net/gar/?rev=17534&view=rev Author: wahwah Date: 2012-03-24 09:27:58 +0000 (Sat, 24 Mar 2012) Log Message: ----------- mysql5/branches/mysql-5.0.x: Version bump to 5.0.96 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-03-24 03:02:18 UTC (rev 17533) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-03-24 09:27:58 UTC (rev 17534) @@ -8,7 +8,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)5 BASE_VERSION = 5.0 -PATCHLEVEL = 95 +PATCHLEVEL = 96 ALTS_PRIO = 50 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2012-03-24 03:02:18 UTC (rev 17533) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2012-03-24 09:27:58 UTC (rev 17534) @@ -1 +1 @@ -3959d47a893b45b5ff70939d485d832c mysql-5.0.95.tar.gz +bf280949049161aa68cf29e600d9ec79 mysql-5.0.96.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 24 18:40:56 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 24 Mar 2012 17:40:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[17535] csw/mgar/pkg/gcc4/branches/gcc-4.6.x/ Message-ID: Revision: 17535 http://gar.svn.sourceforge.net/gar/?rev=17535&view=rev Author: wahwah Date: 2012-03-24 17:40:56 +0000 (Sat, 24 Mar 2012) Log Message: ----------- gcc: Branching out the 4.6 series, 4.7 will be in trunk Added Paths: ----------- csw/mgar/pkg/gcc4/branches/gcc-4.6.x/ Property changes on: csw/mgar/pkg/gcc4/branches/gcc-4.6.x ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:mergeinfo + /csw/mgar/pkg/gcc4/branches/ada-enable:16158-16379 /csw/mgar/pkg/gcc4/branches/bootstrap-4.6:15321-15435 /csw/mgar/pkg/gcc4/branches/opt-csw-prefix:15436-15623 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Sat Mar 24 21:44:09 2012 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Sat, 24 Mar 2012 20:44:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17536] csw/mgar/pkg/facter/trunk Message-ID: Revision: 17536 http://gar.svn.sourceforge.net/gar/?rev=17536&view=rev Author: phipsy Date: 2012-03-24 20:44:08 +0000 (Sat, 24 Mar 2012) Log Message: ----------- facter: 1.6.6 Modified Paths: -------------- csw/mgar/pkg/facter/trunk/Makefile csw/mgar/pkg/facter/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-bug-7038-prtdiag.patch Modified: csw/mgar/pkg/facter/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter/trunk/Makefile 2012-03-24 17:40:56 UTC (rev 17535) +++ csw/mgar/pkg/facter/trunk/Makefile 2012-03-24 20:44:08 UTC (rev 17536) @@ -3,7 +3,7 @@ # $Id$ NAME = facter -VERSION = 1.6.4 +VERSION = 1.6.6 CATEGORIES = apps GARTYPE = v2 @@ -27,8 +27,6 @@ RUNTIME_DEP_PKGS = CSWruby18 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -# PATCHFILES += 0001-puppetlabs-bug-7038-prtdiag.patch - ARCHALL = 1 CONFIGURE_SCRIPTS = BUILD_SCRIPTS = Modified: csw/mgar/pkg/facter/trunk/checksums =================================================================== --- csw/mgar/pkg/facter/trunk/checksums 2012-03-24 17:40:56 UTC (rev 17535) +++ csw/mgar/pkg/facter/trunk/checksums 2012-03-24 20:44:08 UTC (rev 17536) @@ -3,3 +3,4 @@ 435553aace9781ecff5dae593abc15fa facter-1.5.9.tar.gz bf7e384bf247935e973cfd7bf5592dfe facter-1.6.0.tar.gz bd7224e2f5b3743c3a81fb7680c26729 facter-1.6.4.tar.gz +47670a59301d6c3e31a1c68747b139c8 facter-1.6.6.tar.gz Deleted: csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-bug-7038-prtdiag.patch =================================================================== --- csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-bug-7038-prtdiag.patch 2012-03-24 17:40:56 UTC (rev 17535) +++ csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-bug-7038-prtdiag.patch 2012-03-24 20:44:08 UTC (rev 17536) @@ -1,76 +0,0 @@ -From c112d39f68a2c378e6e9c6a7e33b67ac4a701deb Mon Sep 17 00:00:00 2001 -From: Mark Phillips -Date: Fri, 8 Jul 2011 16:35:07 +0200 -Subject: [PATCH] puppetlabs bug 7038 prtdiag - ---- - lib/facter/util/manufacturer.rb | 7 ++++--- - lib/facter/util/prtdiag.rb | 29 +++++++++++++++++++++++++++++ - 2 files changed, 33 insertions(+), 3 deletions(-) - create mode 100644 lib/facter/util/prtdiag.rb - -diff --git a/lib/facter/util/manufacturer.rb b/lib/facter/util/manufacturer.rb -index 8e9bde2..33389c9 100644 ---- a/lib/facter/util/manufacturer.rb -+++ b/lib/facter/util/manufacturer.rb -@@ -1,6 +1,8 @@ - # mamufacturer.rb - # Support methods for manufacturer specific facts - -+require 'facter/util/prtdiag' -+ - module Facter::Manufacturer - - def self.get_dmi_table() -@@ -62,11 +64,10 @@ module Facter::Manufacturer - end - - def self.prtdiag_sparc_find_system_info() -- # Parses prtdiag for a SPARC architecture string, won't work with Solaris x86 -- output = Facter::Util::Resolution.exec('/usr/sbin/prtdiag') - -+ # Parses prtdiag for a SPARC architecture string, won't work with Solaris x86 - # System Configuration: Sun Microsystems sun4u Sun SPARC Enterprise M3000 Server -- sysconfig = output.split("\n")[0] -+ sysconfig = Facter::Util::Prtdiag.system_configuration - if sysconfig =~ /^System Configuration:\s+(.+?)\s+(sun\d+\S+)\s+(.+)/ then - Facter.add('manufacturer') do - setcode do -diff --git a/lib/facter/util/prtdiag.rb b/lib/facter/util/prtdiag.rb -new file mode 100644 -index 0000000..5edce5b ---- /dev/null -+++ b/lib/facter/util/prtdiag.rb -@@ -0,0 +1,29 @@ -+# Module to safely query prtdiag -+# -+# prtdiag will fail if it is called on a non-solaris host, or if it is in a -+# zone, and it will hang if a service that prtdiag relies on is crashed. -+# This should abstract safely retrieving information from prtdiag -+ -+require 'timeout' -+ -+module Facter::Util::Prtdiag -+ -+ def self.system_configuration -+ begin -+ Timeout.timeout(6) do -+ output = Facter::Util::Resolution.exec('/usr/sbin/prtdiag') -+ if output -+ output.each_line do |pd| -+ return pd if pd =~ /System Configuration/ -+ end -+ end -+ end -+ rescue Timeout::Error => detail -+ warn "Timed out while calling prtdiag" -+ # This call avoids zombies -- basically, create a thread that will -+ # dezombify all of the child processes that we're ignoring because -+ # of the timeout. -+ Thread.new { Process.waitall } -+ end -+ end -+end --- -1.7.6 - 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 Mar 24 22:22:20 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 24 Mar 2012 21:22:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17537] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 17537 http://gar.svn.sourceforge.net/gar/?rev=17537&view=rev Author: wahwah Date: 2012-03-24 21:22:20 +0000 (Sat, 24 Mar 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: Version bump to 5.5.22 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-03-24 20:44:08 UTC (rev 17536) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-03-24 21:22:20 UTC (rev 17537) @@ -13,7 +13,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)5 BASE_VERSION = 5.5 -PATCHLEVEL = 21 +PATCHLEVEL = 22 ALTS_PRIO = 55 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2012-03-24 20:44:08 UTC (rev 17536) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2012-03-24 21:22:20 UTC (rev 17537) @@ -1 +1 @@ -86d6bd335054a0aed1756ed60574c16d mysql-5.5.21.tar.gz +c5b151a70e9ceed5308f108f1ece7b3b mysql-5.5.22.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 24 22:27:52 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 24 Mar 2012 21:27:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17538] csw/mgar/pkg/lang-python/supybot/trunk/Makefile Message-ID: Revision: 17538 http://gar.svn.sourceforge.net/gar/?rev=17538&view=rev Author: wahwah Date: 2012-03-24 21:27:52 +0000 (Sat, 24 Mar 2012) Log Message: ----------- lang-python/supybot/trunk: removing the dependency on CSWpysqlite Modified Paths: -------------- csw/mgar/pkg/lang-python/supybot/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/lang-python/supybot/trunk/Makefile Modified: csw/mgar/pkg/lang-python/supybot/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/supybot/trunk/Makefile 2012-03-24 21:22:20 UTC (rev 17537) +++ csw/mgar/pkg/lang-python/supybot/trunk/Makefile 2012-03-24 21:27:52 UTC (rev 17538) @@ -1,3 +1,5 @@ +# $Id$ + NAME = supybot VERSION = 0.83.4.1 CATEGORIES = python @@ -20,7 +22,7 @@ LICENSE = LICENSE ARCHALL = 1 -RUNTIME_DEP_PKGS = CSWpysqlite CSWtwisted +RUNTIME_DEP_PKGS = CSWtwisted EXTRA_PAX_ARGS = '-s,ChangeLog$$,changelog,p' TEST_SCRIPTS = @@ -29,7 +31,6 @@ CHECKPKG_OVERRIDES_CSWsupybot += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWsupybot += surplus-dependency|CSWtwisted CHECKPKG_OVERRIDES_CSWsupybot += surplus-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWsupybot += surplus-dependency|CSWpysqlite include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/supybot/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Mar 24 22:29:39 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 24 Mar 2012 21:29:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17539] csw/mgar/pkg/swaks/trunk Message-ID: Revision: 17539 http://gar.svn.sourceforge.net/gar/?rev=17539&view=rev Author: bonivart Date: 2012-03-24 21:29:39 +0000 (Sat, 24 Mar 2012) Log Message: ----------- swaks/trunk: update to 20120320.0 Modified Paths: -------------- csw/mgar/pkg/swaks/trunk/Makefile csw/mgar/pkg/swaks/trunk/checksums Added Paths: ----------- csw/mgar/pkg/swaks/trunk/files/0001-use-csw-perl.patch Removed Paths: ------------- csw/mgar/pkg/swaks/trunk/files/CSWswaks.depend csw/mgar/pkg/swaks/trunk/files/CSWswaks.gspec Modified: csw/mgar/pkg/swaks/trunk/Makefile =================================================================== --- csw/mgar/pkg/swaks/trunk/Makefile 2012-03-24 21:27:52 UTC (rev 17538) +++ csw/mgar/pkg/swaks/trunk/Makefile 2012-03-24 21:29:39 UTC (rev 17539) @@ -1,22 +1,22 @@ NAME = swaks -VERSION = 20061116.0 -GARTYPE = v1 +VERSION = 20120320.0 +GARTYPE = v2 CATEGORIES = utils DESCRIPTION = Swiss Army Knife SMTP define BLURB -Command line SMTP testing, including TLS and AUTH + Command line SMTP testing, including TLS and AUTH endef -#http://jetmore.net/john/code/swaks.20061116.0 +MASTER_SITES = http://jetmore.net/john/code/swaks/ +DISTFILES = $(NAME)-$(VERSION).tar.gz -MASTER_SITES = http://jetmore.net/john/code/swaks -DISTFILES = $(NAME)-$(VERSION) -DISTFILES += $(call admfiles,CSW$(NAME), depend) +LICENSE = LICENSE -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*) +PATCHFILES += 0001-use-csw-perl.patch +ARCHALL = 1 + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = INSTALL_SCRIPTS = custom @@ -26,6 +26,8 @@ install-custom: @echo "==> Installing $(NAME) in $(WORKSRC)" - @mkdir $(DESTDIR)/opt/csw/bin - @cp $(DOWNLOADDIR)/$(NAME)-$(VERSION) $(DESTDIR)/opt/csw/bin/swaks + @ginstall -d -m 755 $(DESTDIR)$(bindir) + @cp $(WORKSRC)/$(NAME) $(DESTDIR)$(bindir) + @ginstall -d -m 755 $(DESTDIR)$(docdir)/$(NAME) + @cp $(WORKSRC)/doc/* $(DESTDIR)$(docdir)/$(NAME) @$(MAKECOOKIE) Modified: csw/mgar/pkg/swaks/trunk/checksums =================================================================== --- csw/mgar/pkg/swaks/trunk/checksums 2012-03-24 21:27:52 UTC (rev 17538) +++ csw/mgar/pkg/swaks/trunk/checksums 2012-03-24 21:29:39 UTC (rev 17539) @@ -1,3 +1 @@ -0be5dfe89ec415f0296680d61b3e4849 download/swaks-20061116.0 -68cea3ddbe6732f4df98baf4abedeaee download/CSWswaks.gspec -208cbd1622d0cf42e0114920596264f9 download/CSWswaks.depend +1c0b8cfc92aa4a36f3136c15d4f87e9b swaks-20120320.0.tar.gz Added: csw/mgar/pkg/swaks/trunk/files/0001-use-csw-perl.patch =================================================================== --- csw/mgar/pkg/swaks/trunk/files/0001-use-csw-perl.patch (rev 0) +++ csw/mgar/pkg/swaks/trunk/files/0001-use-csw-perl.patch 2012-03-24 21:29:39 UTC (rev 17539) @@ -0,0 +1,22 @@ +From 12a3030c7f6627cda8fb7cca288d4121a9c13669 Mon Sep 17 00:00:00 2001 +From: Peter Bonivart +Date: Sat, 24 Mar 2012 22:23:04 +0100 +Subject: [PATCH] use csw perl + +--- + swaks | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/swaks b/swaks +index 57aec45..24ac49f 100755 +--- a/swaks ++++ b/swaks +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/opt/csw/bin/perl + + # use 'swaks --help' to view documentation for this program + # +-- +1.7.9 + Deleted: csw/mgar/pkg/swaks/trunk/files/CSWswaks.depend =================================================================== --- csw/mgar/pkg/swaks/trunk/files/CSWswaks.depend 2012-03-24 21:27:52 UTC (rev 17538) +++ csw/mgar/pkg/swaks/trunk/files/CSWswaks.depend 2012-03-24 21:29:39 UTC (rev 17539) @@ -1 +0,0 @@ -P CSWpmnetdns - Perl interface to the DNS resolver Deleted: csw/mgar/pkg/swaks/trunk/files/CSWswaks.gspec =================================================================== --- csw/mgar/pkg/swaks/trunk/files/CSWswaks.gspec 2012-03-24 21:27:52 UTC (rev 17538) +++ csw/mgar/pkg/swaks/trunk/files/CSWswaks.gspec 2012-03-24 21:29:39 UTC (rev 17539) @@ -1,3 +0,0 @@ -%var bitname swaks -%var pkgname CSWswaks -%include url file://%{PKGLIB}/csw_dyndepend.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Sat Mar 24 22:36:20 2012 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Sat, 24 Mar 2012 21:36:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17540] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 17540 http://gar.svn.sourceforge.net/gar/?rev=17540&view=rev Author: phipsy Date: 2012-03-24 21:36:19 +0000 (Sat, 24 Mar 2012) Log Message: ----------- puppet: 2.7.12 Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2012-03-24 21:29:39 UTC (rev 17539) +++ csw/mgar/pkg/puppet/trunk/Makefile 2012-03-24 21:36:19 UTC (rev 17540) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet -VERSION = 2.7.11 +VERSION = 2.7.12 CATEGORIES = apps GARTYPE = v2 @@ -29,7 +29,7 @@ DISTFILES += CSWpuppet.postinstall # pkgutil.rb https://raw.github.com/domcleal/puppet/tickets/master/8011c/lib/puppet/provider/package/pkgutil.rb # Should be headed into 2.7 code - supports -t REPO -# Still not in 2.7.10 as of 19-Feb-12 +# Still not in 2.7.12 as of 24-Mar-12 DISTFILES += pkgutil.rb DISTFILES += README.CSW DISTFILES += puppet.conf.example-CSW Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2012-03-24 21:29:39 UTC (rev 17539) +++ csw/mgar/pkg/puppet/trunk/checksums 2012-03-24 21:36:19 UTC (rev 17540) @@ -11,3 +11,4 @@ 474c11eeb3c6fc6dabe83b2f4510d038 puppet-2.7.9.tar.gz 64cca5cd88b8df10eb0d3829470890cc puppet-2.7.10.tar.gz ca1141b3c7d077a128d20458db3b4102 puppet-2.7.11.tar.gz +be0a220cb66fe149bdbc08a9790fc2d1 puppet-2.7.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 24 22:38:06 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 24 Mar 2012 21:38:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17541] csw/mgar/pkg/lang-python/supybot/trunk/Makefile Message-ID: Revision: 17541 http://gar.svn.sourceforge.net/gar/?rev=17541&view=rev Author: wahwah Date: 2012-03-24 21:38:06 +0000 (Sat, 24 Mar 2012) Log Message: ----------- lang-python/supybot/trunk: Correct a pax related syntax problem in pcopy Modified Paths: -------------- csw/mgar/pkg/lang-python/supybot/trunk/Makefile Modified: csw/mgar/pkg/lang-python/supybot/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/supybot/trunk/Makefile 2012-03-24 21:36:19 UTC (rev 17540) +++ csw/mgar/pkg/lang-python/supybot/trunk/Makefile 2012-03-24 21:38:06 UTC (rev 17541) @@ -24,13 +24,15 @@ ARCHALL = 1 RUNTIME_DEP_PKGS = CSWtwisted -EXTRA_PAX_ARGS = '-s,ChangeLog$$,changelog,p' +EXTRA_PAX_ARGS = -s ",ChangeLog$$,changelog,p" TEST_SCRIPTS = +PACKAGES = CSWsupybot CHECKPKG_OVERRIDES_CSWsupybot += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWsupybot += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWsupybot += surplus-dependency|CSWtwisted CHECKPKG_OVERRIDES_CSWsupybot += surplus-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWsupybot += file-with-bad-content include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 24 23:36:31 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 24 Mar 2012 22:36:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17542] csw/mgar/pkg/lang-python/twisted/trunk Message-ID: Revision: 17542 http://gar.svn.sourceforge.net/gar/?rev=17542&view=rev Author: wahwah Date: 2012-03-24 22:36:30 +0000 (Sat, 24 Mar 2012) Log Message: ----------- lang-python/twisted/trunk: Version bump to 12.0.0 Modified Paths: -------------- csw/mgar/pkg/lang-python/twisted/trunk/Makefile csw/mgar/pkg/lang-python/twisted/trunk/checksums Modified: csw/mgar/pkg/lang-python/twisted/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/twisted/trunk/Makefile 2012-03-24 21:38:06 UTC (rev 17541) +++ csw/mgar/pkg/lang-python/twisted/trunk/Makefile 2012-03-24 22:36:30 UTC (rev 17542) @@ -3,7 +3,7 @@ # $Id$ NAME = twisted -MAJ_VERSION = 10.2 +MAJ_VERSION = 12.0 PATCHLEVEL = 0 VERSION = $(MAJ_VERSION).$(PATCHLEVEL) CATEGORIES = python @@ -17,7 +17,7 @@ UPSTREAM_NAME = Twisted DISTNAME = $(UPSTREAM_NAME)-$(VERSION) -MASTER_SITES = http://tmrc.mit.edu/mirror/$(NAME)/$(UPSTREAM_NAME)/$(MAJ_VERSION)/ +MASTER_SITES = http://pypi.python.org/packages/source/T/Twisted/ DISTFILES = $(DISTNAME).tar.bz2 TEST_SCRIPTS = LICENSE = LICENSE Modified: csw/mgar/pkg/lang-python/twisted/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/twisted/trunk/checksums 2012-03-24 21:38:06 UTC (rev 17541) +++ csw/mgar/pkg/lang-python/twisted/trunk/checksums 2012-03-24 22:36:30 UTC (rev 17542) @@ -1 +1 @@ -73da62c793269eade8121da336b01ba5 Twisted-10.2.0.tar.bz2 +cf49a8676c21c50faf1b42b528049471 Twisted-12.0.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Mar 25 04:23:01 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 25 Mar 2012 02:23:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[17543] csw/mgar/pkg/git/trunk Message-ID: Revision: 17543 http://gar.svn.sourceforge.net/gar/?rev=17543&view=rev Author: bdwalton Date: 2012-03-25 02:23:00 +0000 (Sun, 25 Mar 2012) Log Message: ----------- git/trunk: add two patches to fix a sh-spawning bug that affects us because sh is not posix compliant Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0008-run-command.c-Define-SHELL_PATH-macro-for-use-in-pre.patch csw/mgar/pkg/git/trunk/files/0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-03-24 22:36:30 UTC (rev 17542) +++ csw/mgar/pkg/git/trunk/Makefile 2012-03-25 02:23:00 UTC (rev 17543) @@ -115,6 +115,8 @@ PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch PATCHFILES += 0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch +PATCHFILES += 0008-run-command.c-Define-SHELL_PATH-macro-for-use-in-pre.patch +PATCHFILES += 0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files @@ -150,6 +152,7 @@ CONFIGURE_ARGS += --with-gitconfig=$(sysconfdir)/gitconfig CONFIGURE_ARGS += --with-pager=/opt/csw/bin/less CONFIGURE_ARGS += --without-python +CONFIGURE_ARGS += --with-sane-tool-path=/opt/csw/gnu:/opt/csw/bin:/usr/xpg6/bin:/usr/xpg4/bin BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ ASCIIDOC_NO_ROFF=YesPlease \ Added: csw/mgar/pkg/git/trunk/files/0008-run-command.c-Define-SHELL_PATH-macro-for-use-in-pre.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0008-run-command.c-Define-SHELL_PATH-macro-for-use-in-pre.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0008-run-command.c-Define-SHELL_PATH-macro-for-use-in-pre.patch 2012-03-25 02:23:00 UTC (rev 17543) @@ -0,0 +1,48 @@ +From 22b0d13eb6983c26f4322d158cb339dc4d907844 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 24 Mar 2012 22:12:43 -0400 +Subject: [PATCH 1/2] run-command.c: Define SHELL_PATH macro for use in + prepare_shell_cmd + +The shell spawned in run-command.c:prepare_shell_cmd was hard coded to +'sh'. Instead, make this a macro named SHELL_PATH so that it can be +overridden by the build system. Use 'sh' as the default to preserve +original behaviour and ensure that a value is always set. + +This avoids a situation where some commands were spawned using a +different shell than the one configured at build time. Previously, it +was possible for things to be executed by a non-POSIX shell depending +on the user's PATH. + +Signed-off-by: Ben Walton +--- + run-command.c | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/run-command.c b/run-command.c +index 1db8abf..f005a31 100644 +--- a/run-command.c ++++ b/run-command.c +@@ -4,6 +4,10 @@ + #include "sigchain.h" + #include "argv-array.h" + ++#ifndef SHELL_PATH ++# define SHELL_PATH "sh" ++#endif ++ + struct child_to_clean { + pid_t pid; + struct child_to_clean *next; +@@ -90,7 +94,7 @@ static const char **prepare_shell_cmd(const char **argv) + die("BUG: shell command is empty"); + + if (strcspn(argv[0], "|&;<>()$`\\\"' \t\n*?[#~=%") != strlen(argv[0])) { +- nargv[nargc++] = "sh"; ++ nargv[nargc++] = SHELL_PATH; + nargv[nargc++] = "-c"; + + if (argc < 2) +-- +1.7.5.4 + Added: csw/mgar/pkg/git/trunk/files/0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch 2012-03-25 02:23:00 UTC (rev 17543) @@ -0,0 +1,31 @@ +From 108e986bc5da901b6447afb3ce9687384ad90249 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 24 Mar 2012 22:10:17 -0400 +Subject: [PATCH 2/2] Makefile: Set EXTRA_CPPFLAGS during the compilation of + run-command + +When building run-command.o, we want to pass in a define for +SHELL_PATH to ensure that the shell configured at build time is used +at run time when spawning external commands. + +Signed-off-by: Ben Walton +--- + Makefile | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/Makefile b/Makefile +index be1957a..344e2e0 100644 +--- a/Makefile ++++ b/Makefile +@@ -1913,6 +1913,8 @@ builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \ + '-DGIT_MAN_PATH="$(mandir_SQ)"' \ + '-DGIT_INFO_PATH="$(infodir_SQ)"' + ++run-command.o: EXTRA_CPPFLAGS = -DSHELL_PATH='"$(SHELL_PATH)"' ++ + $(BUILT_INS): git$X + $(QUIET_BUILT_IN)$(RM) $@ && \ + ln git$X $@ 2>/dev/null || \ +-- +1.7.5.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Mar 25 09:52:20 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 25 Mar 2012 07:52:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17544] csw/mgar/pkg/swaks/trunk/Makefile Message-ID: Revision: 17544 http://gar.svn.sourceforge.net/gar/?rev=17544&view=rev Author: bonivart Date: 2012-03-25 07:52:20 +0000 (Sun, 25 Mar 2012) Log Message: ----------- swaks/trunk: add perl dep Modified Paths: -------------- csw/mgar/pkg/swaks/trunk/Makefile Modified: csw/mgar/pkg/swaks/trunk/Makefile =================================================================== --- csw/mgar/pkg/swaks/trunk/Makefile 2012-03-25 02:23:00 UTC (rev 17543) +++ csw/mgar/pkg/swaks/trunk/Makefile 2012-03-25 07:52:20 UTC (rev 17544) @@ -15,8 +15,13 @@ PATCHFILES += 0001-use-csw-perl.patch +RUNTIME_DEP_PKGS += CSWperl + ARCHALL = 1 +# Checkpkg does not know we forced CSW perl to be used +CHECKPKG_OVERRIDES_CSWswaks += surplus-dependency|CSWperl + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = INSTALL_SCRIPTS = custom 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 Mar 25 19:40:49 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Mar 2012 17:40:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[17545] csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Message-ID: Revision: 17545 http://gar.svn.sourceforge.net/gar/?rev=17545&view=rev Author: wahwah Date: 2012-03-25 17:40:49 +0000 (Sun, 25 Mar 2012) Log Message: ----------- checkpkg: MakePackageNameBySoname unit test fix The function did the right thing, the test data were wrong. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2012-03-25 07:52:20 UTC (rev 17544) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils_test.py 2012-03-25 17:40:49 UTC (rev 17545) @@ -182,7 +182,7 @@ path = "/opt/csw/gxx/lib" expected = ( ["CSWlibfoo0-gxx"], - ["libfoo0-gxx"], + ["libfoo0_gxx"], ) self.assertEqual(expected, su.MakePackageNameBySoname(soname, path)) @@ -191,7 +191,7 @@ path = "/opt/csw/gxx/lib/sparcv9" expected = ( ["CSWlibfoo0-gxx"], - ["libfoo0-gxx"], + ["libfoo0_gxx"], ) self.assertEqual(expected, su.MakePackageNameBySoname(soname, path)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 25 19:45:42 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Mar 2012 17:45:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[17546] csw/mgar/gar/v2/lib/python/inspective_package_test. py Message-ID: Revision: 17546 http://gar.svn.sourceforge.net/gar/?rev=17546&view=rev Author: wahwah Date: 2012-03-25 17:45:42 +0000 (Sun, 25 Mar 2012) Log Message: ----------- checkpkg: ListBinaries unit test fix It's necessary to mock out the os.access function. 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-03-25 17:40:49 UTC (rev 17545) +++ csw/mgar/gar/v2/lib/python/inspective_package_test.py 2012-03-25 17:45:42 UTC (rev 17546) @@ -21,12 +21,14 @@ class InspectivePackageUnitTest(mox.MoxTestBase): - def testInstantiate(self): + def testListBinaries(self): self.mox.StubOutWithMock(hachoir_parser, 'createParser', use_mock_anything=True) hachoir_parser_mock = self.mox.CreateMockAnything() hachoir_parser.createParser( u'/fake/path/CSWfoo/root/foo-file').AndReturn(hachoir_parser_mock) + self.mox.StubOutWithMock(os, 'access') + os.access(u'/fake/path/CSWfoo/root/foo-file', os.R_OK).AndReturn(True) machine_mock = self.mox.CreateMockAnything() machine_mock.value = 2 hachoir_parser_mock.__getitem__('/header/machine').AndReturn(machine_mock) @@ -64,7 +66,7 @@ ip.pkginfo_dict = { "BASEDIR": "", } - self.assertEqual(["foo-file"], ip.ListBinaries()) + self.assertEqual([u'/fake/path/CSWfoo/root/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 wahwah at users.sourceforge.net Sun Mar 25 19:46:13 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Mar 2012 17:46:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[17547] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 17547 http://gar.svn.sourceforge.net/gar/?rev=17547&view=rev Author: wahwah Date: 2012-03-25 17:46:13 +0000 (Sun, 25 Mar 2012) Log Message: ----------- pkgdb-web: Connect to the database in the entry pt Don't establish the db connection during a query, do that in the entry point 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-03-25 17:45:42 UTC (rev 17546) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-03-25 17:46:13 UTC (rev 17547) @@ -87,7 +87,6 @@ class Srv4List(object): def GET(self): - ConnectToDatabase() pkgs = models.Srv4FileStats.select().orderBy('-mtime')[:30] now = datetime.datetime.now() def Ago(timedelta): @@ -101,7 +100,6 @@ class Srv4Detail(object): def GET(self, md5_sum): - ConnectToDatabase() try: pkg = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() overrides = pkg.GetOverridesResult() @@ -131,7 +129,6 @@ class Catalogname(object): def GET(self, catalogname): - ConnectToDatabase() try: pkgs = models.Srv4FileStats.selectBy( catalogname=catalogname, @@ -143,7 +140,6 @@ class CatalognameList(object): def GET(self): - ConnectToDatabase() try: connection = models.Srv4FileStats._connection rows = connection.queryAll(connection.sqlrepr( @@ -161,7 +157,6 @@ class Srv4DetailFiles(object): def GET(self, md5_sum): - ConnectToDatabase() srv4 = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() files = models.CswFile.selectBy(srv4_file=srv4) return render.Srv4DetailFiles(srv4, files) @@ -169,7 +164,6 @@ class CatalogList(object): def GET(self): - ConnectToDatabase() archs = models.Architecture.select() osrels = models.OsRelease.select() catrels = models.CatalogRelease.select() @@ -188,7 +182,6 @@ class CatalogDetail(object): def GET(self, catrel_name, arch_name, osrel_name): - ConnectToDatabase() cat_name = " ".join((catrel_name, arch_name, osrel_name)) sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad( osrel_name, arch_name, catrel_name) @@ -198,7 +191,6 @@ class MaintainerList(object): def GET(self): - ConnectToDatabase() maintainers = models.Maintainer.select().orderBy('email') names = [tuple(x.email.split("@") + [x]) for x in maintainers] return render.MaintainerList(names) @@ -206,7 +198,6 @@ class MaintainerDetail(object): def GET(self, id): - ConnectToDatabase() maintainer = models.Maintainer.selectBy(id=id).getOne() pkgs = models.Srv4FileStats.select( sqlobject.AND( @@ -219,14 +210,12 @@ class RestMaintainerDetail(object): def GET(self, id): - ConnectToDatabase() maintainer = models.Maintainer.selectBy(id=id).getOne() return json.dumps(maintainer.GetRestRepr()) class MaintainerCheckpkgReport(object): def GET(self, id): - ConnectToDatabase() maintainer = models.Maintainer.selectBy(id=id).getOne() pkgs = models.Srv4FileStats.select( sqlobject.AND( @@ -249,7 +238,6 @@ class ErrorTagDetail(object): def GET(self, tag_name): - ConnectToDatabase() join = [ sqlbuilder.INNERJOINOn(None, models.Srv4FileStats, @@ -267,7 +255,6 @@ class ErrorTagList(object): def GET(self): - ConnectToDatabase() connection = models.CheckpkgErrorTag._connection rows = connection.queryAll(connection.sqlrepr( sqlbuilder.Select( @@ -279,7 +266,6 @@ class Catalogs(object): def GET(self, catrel_name, arch_name, osrel_name): - ConnectToDatabase() sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad( osrel_name, arch_name, catrel_name) pkgs = list(models.GetCatPackagesResult(sqo_osrel, sqo_arch, sqo_catrel)) @@ -294,7 +280,6 @@ class PkgnameByFilename(object): def GET(self, catrel, arch, osrel): - ConnectToDatabase() user_data = web.input() filename = user_data.filename send_filename = ( @@ -314,7 +299,6 @@ class PkgnamesAndPathsByBasename(object): def GET(self, catrel, arch, osrel): - ConnectToDatabase() user_data = web.input() basename = user_data.basename send_filename = ( @@ -337,7 +321,6 @@ class RestSrv4Detail(object): def GET(self, md5_sum): - ConnectToDatabase() try: pkg = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() mimetype, data_structure = pkg.GetRestRepr() @@ -351,7 +334,6 @@ class RestSrv4DetailFiles(object): def GET(self, md5_sum): - ConnectToDatabase() try: pkg = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() files = models.CswFile.selectBy(srv4_file=pkg) @@ -372,7 +354,6 @@ class RestSrv4FullStats(object): def GET(self, md5_sum): - ConnectToDatabase() try: pkg = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() data_structure = pkg.GetStatsStruct() @@ -452,10 +433,15 @@ web.webapi.internalerror = web.debugerror -app = web.application(urls, globals()) -main = app.wsgifunc() -application = app.wsgifunc() +def app_wrapper(): + ConnectToDatabase() + app = web.application(urls, globals()) + logging.basicConfig(level=logging.DEBUG) + return app.wsgifunc() +application = app_wrapper() + + if __name__ == "__main__": app.run() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 25 19:46:44 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Mar 2012 17:46:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[17548] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 17548 http://gar.svn.sourceforge.net/gar/?rev=17548&view=rev Author: wahwah Date: 2012-03-25 17:46:43 +0000 (Sun, 25 Mar 2012) Log Message: ----------- pkgdb: Add python-mysql to dependencies Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2012-03-25 17:46:13 UTC (rev 17547) +++ csw/mgar/gar/v2/lib/python/README 2012-03-25 17:46:43 UTC (rev 17548) @@ -74,6 +74,7 @@ for Ubuntu. sudo aptitude install \ + python-mysql \ python-cheetah \ python-hachoir-parser \ python-magic \ 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 Mar 25 19:47:16 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Mar 2012 17:47:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[17549] csw/mgar/gar/v2/lib/python Message-ID: Revision: 17549 http://gar.svn.sourceforge.net/gar/?rev=17549&view=rev Author: wahwah Date: 2012-03-25 17:47:16 +0000 (Sun, 25 Mar 2012) Log Message: ----------- pkgdb: Removed unused DataSource class from models Modified Paths: -------------- csw/mgar/gar/v2/lib/python/database.py csw/mgar/gar/v2/lib/python/models.py Modified: csw/mgar/gar/v2/lib/python/database.py =================================================================== --- csw/mgar/gar/v2/lib/python/database.py 2012-03-25 17:46:43 UTC (rev 17548) +++ csw/mgar/gar/v2/lib/python/database.py 2012-03-25 17:47:16 UTC (rev 17549) @@ -19,7 +19,6 @@ m.CheckpkgErrorTag, m.CheckpkgOverride, m.CswConfig, - m.DataSource, m.Host, m.Maintainer, m.OsRelease, Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2012-03-25 17:46:43 UTC (rev 17548) +++ csw/mgar/gar/v2/lib/python/models.py 2012-03-25 17:47:16 UTC (rev 17549) @@ -9,14 +9,6 @@ from sqlobject import sqlbuilder import cPickle -class DataSource(sqlobject.SQLObject): - """Represents: a /var/sadm/install/contents file, or CSW catalog. - - - "filesystem" - - "catalog" - """ - name = sqlobject.UnicodeCol(length=255, unique=True, notNone=True) - class CatalogReleaseType(sqlobject.SQLObject): "Unstable, testing, stable." name = sqlobject.UnicodeCol(length=255, unique=True, notNone=True) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 25 19:47:45 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Mar 2012 17:47:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17550] csw/mgar/gar/v2/lib/python/models.py Message-ID: Revision: 17550 http://gar.svn.sourceforge.net/gar/?rev=17550&view=rev Author: wahwah Date: 2012-03-25 17:47:45 +0000 (Sun, 25 Mar 2012) Log Message: ----------- pkgdb: Whitespace cleanup Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2012-03-25 17:47:16 UTC (rev 17549) +++ csw/mgar/gar/v2/lib/python/models.py 2012-03-25 17:47:45 UTC (rev 17550) @@ -13,6 +13,7 @@ "Unstable, testing, stable." name = sqlobject.UnicodeCol(length=255, unique=True, notNone=True) + class CatalogRelease(sqlobject.SQLObject): "Release names: potato, etc." name = sqlobject.UnicodeCol(length=255, unique=True, notNone=True) @@ -29,6 +30,7 @@ def __unicode__(self): return u"OS release: %s" % self.full_name + class Architecture(sqlobject.SQLObject): "One of: 'sparc', 'x86'." name = sqlobject.UnicodeCol(length=40, unique=True, notNone=True) @@ -36,6 +38,7 @@ def __unicode__(self): return u"Architecture: %s" % self.name + class Maintainer(sqlobject.SQLObject): """The maintainer of the package, identified by the e-mail address.""" email = sqlobject.UnicodeCol(length=255, unique=True, notNone=True) @@ -67,18 +70,21 @@ fqdn = sqlobject.UnicodeCol(length=255, unique=True, notNone=True) arch = sqlobject.ForeignKey('Architecture', notNone=True) + class CswConfig(sqlobject.SQLObject): option_key = sqlobject.UnicodeCol(length=255, unique=True) float_value = sqlobject.FloatCol(default=None) int_value = sqlobject.IntCol(default=None) str_value = sqlobject.UnicodeCol(default=None) + class Pkginst(sqlobject.SQLObject): pkgname = sqlobject.UnicodeCol(length=255, unique=True, notNone=True) catalogname = sqlobject.UnicodeCol(default=None) pkg_desc = sqlobject.UnicodeCol(default=None) srv4_files = sqlobject.MultipleJoin('Srv4FileStats') + class CswFile(sqlobject.SQLObject): """Represents a file in a catalog. @@ -105,6 +111,7 @@ def __unicode__(self): return u"File: %s" % os.path.join(self.path, self.basename) + class Srv4FileStatsBlob(sqlobject.SQLObject): """Holds pickled data structures. 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 Mar 25 19:48:20 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Mar 2012 17:48:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17551] csw/mgar/gar/v2/lib/python/inspective_package.py Message-ID: Revision: 17551 http://gar.svn.sourceforge.net/gar/?rev=17551&view=rev Author: wahwah Date: 2012-03-25 17:48:20 +0000 (Sun, 25 Mar 2012) Log Message: ----------- pkgdb: Refactor getting file metadata Split it off into a separate function. 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-03-25 17:47:45 UTC (rev 17550) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2012-03-25 17:48:20 UTC (rev 17551) @@ -21,6 +21,55 @@ import hachoir_core.config hachoir_core.config.quiet = True + +ROOT_RE = re.compile(r"^(reloc|root)/") + + +def StripRe(x, strip_re): + return re.sub(strip_re, "", x) + + +def GetFileMetadata(file_magic, base_dir, file_path): + full_path = unicode(os.path.join(base_dir, file_path)) + if not os.access(full_path, os.R_OK): + return {} + file_info = { + "path": StripRe(file_path, ROOT_RE), + "mime_type": file_magic.GetFileMimeType(full_path) + } + if base_dir: + file_info["path"] = os.path.join(base_dir, file_info["path"]) + if not file_info["mime_type"]: + logging.error("Could not establish the mime type of %s", + full_path) + # We really don't want that, as it misses binaries. + msg = ( + "It was not possible to establish the mime type of %s. " + "It's a known problem which occurs when indexing a large " + "number of packages in a single run. " + "It's probably caused by a bug in libmagic, or a bug in " + "libmagic Python bindings. " + "Currently, there is no fix for it. " + "You have to restart your process - it " + "will probably finish successfully when do you that." + % full_path) + raise package.PackageError(msg) + if sharedlib_utils.IsBinary(file_info): + parser = hp.createParser(full_path) + if not parser: + logging.warning("Can't parse file %s", file_path) + else: + 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: + logging.warning( + "Error in hachoir_parser processing %s", file_path) + return file_info + + class InspectivePackage(package.DirectoryFormatPackage): """Extends DirectoryFormatPackage to allow package inspection.""" @@ -41,41 +90,11 @@ all_files = self.GetAllFilePaths() def StripRe(x, strip_re): return re.sub(strip_re, "", x) - root_re = re.compile(r"^(reloc|root)/") file_magic = FileMagic() basedir = self.GetBasedir() for file_path in all_files: full_path = unicode(self.MakeAbsolutePath(file_path)) - file_info = { - "path": StripRe(file_path, root_re), - "mime_type": file_magic.GetFileMimeType(full_path) - } - if basedir: - file_info["path"] = os.path.join(basedir, file_info["path"]) - if not file_info["mime_type"]: - logging.error("Could not establish the mime type of %s", - full_path) - # We really don't want that, as it misses binaries. - msg = ( - "It was not possible to establish the mime type of %s. " - "It's a known problem which occurs when indexing a large " - "number of packages in a single run. " - "It's probably caused by a bug in libmagic, or a bug in " - "libmagic Python bindings. " - "Currently, there is no fix for it. " - "You have to restart your process - it " - "will probably finish successfully when do you that." - % full_path) - raise package.PackageError(msg) - if sharedlib_utils.IsBinary(file_info): - parser = hp.createParser(full_path) - if not parser: - logging.warning("Can't parse file %s", file_path) - else: - 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 + file_info = GetFileMetadata(file_magic, self.pkgpath, full_path) self.files_metadata.append(file_info) return self.files_metadata 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 Mar 25 19:48:49 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Mar 2012 17:48:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[17552] csw/mgar/gar/v2/lib/python/inspective_package.py Message-ID: Revision: 17552 http://gar.svn.sourceforge.net/gar/?rev=17552&view=rev Author: wahwah Date: 2012-03-25 17:48:49 +0000 (Sun, 25 Mar 2012) Log Message: ----------- checkpkg: Do not use aliases of modules It throws off the linter, and makes it less obvious which module is used. 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-03-25 17:48:20 UTC (rev 17551) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2012-03-25 17:48:49 UTC (rev 17552) @@ -2,7 +2,7 @@ import os import re import logging -import hachoir_parser as hp +import hachoir_parser import sharedlib_utils import magic import copy @@ -55,7 +55,7 @@ % full_path) raise package.PackageError(msg) if sharedlib_utils.IsBinary(file_info): - parser = hp.createParser(full_path) + parser = hachoir_parser.createParser(full_path) if not parser: logging.warning("Can't parse file %s", file_path) else: 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 Mar 25 19:49:19 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Mar 2012 17:49:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[17553] csw/mgar/gar/v2/lib/python/inspective_package.py Message-ID: Revision: 17553 http://gar.svn.sourceforge.net/gar/?rev=17553&view=rev Author: wahwah Date: 2012-03-25 17:49:18 +0000 (Sun, 25 Mar 2012) Log Message: ----------- pkgdb: When hachoir fails, display the exception When indexing the whole filesystem, hachoir_parser fails on a number of files. For now, we're catching the exception and moving on. It might bite us later, but I have no good idea how to deal with it right now. This change makes the exception message be printed to stdout. 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-03-25 17:48:49 UTC (rev 17552) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2012-03-25 17:49:18 UTC (rev 17553) @@ -66,7 +66,7 @@ file_info["endian"] = parser["/header/endian"].display except hachoir_core.field.field.MissingField, e: logging.warning( - "Error in hachoir_parser processing %s", file_path) + "Error in hachoir_parser processing %s: %r", file_path, e) return file_info 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 Mar 25 21:36:14 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Mar 2012 19:36:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[17554] csw/mgar/pkg/lang-python/mod_python/trunk/Makefile Message-ID: Revision: 17554 http://gar.svn.sourceforge.net/gar/?rev=17554&view=rev Author: wahwah Date: 2012-03-25 19:36:14 +0000 (Sun, 25 Mar 2012) Log Message: ----------- lang-python/mod_python/trunk: Removing the dep on the apache2 prefork package Modified Paths: -------------- csw/mgar/pkg/lang-python/mod_python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/mod_python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mod_python/trunk/Makefile 2012-03-25 17:49:18 UTC (rev 17553) +++ csw/mgar/pkg/lang-python/mod_python/trunk/Makefile 2012-03-25 19:36:14 UTC (rev 17554) @@ -36,7 +36,6 @@ RUNTIME_DEP_PKGS_CSWap2modpython += CSWpython RUNTIME_DEP_PKGS_CSWap2modpython += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWap2modpython += CSWapache2 -RUNTIME_DEP_PKGS_CSWap2modpython += CSWap2prefork CHECKPKG_OVERRIDES_CSWap2modpython += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ap2_modpython/README CHECKPKG_OVERRIDES_CSWap2modpython += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ap2_modpython/doc-html/dir-other-pp.html @@ -50,7 +49,6 @@ CHECKPKG_OVERRIDES_CSWap2modpython += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWap2modpython += missing-dependency|CSWapache2 -CHECKPKG_OVERRIDES_CSWap2modpython += surplus-dependency|CSWap2prefork include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Mar 26 02:30:26 2012 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 26 Mar 2012 00:30:26 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[617] web/wordpresscsw/wp-content/themes/opencsw/ maintainersDAO.php Message-ID: Revision: 617 http://opencsw.svn.sourceforge.net/opencsw/?rev=617&view=rev Author: wbonnet Date: 2012-03-26 00:30:25 +0000 (Mon, 26 Mar 2012) Log Message: ----------- Mask stub packages from list of packages owned by a maintainer Modified Paths: -------------- web/wordpresscsw/wp-content/themes/opencsw/maintainersDAO.php Modified: web/wordpresscsw/wp-content/themes/opencsw/maintainersDAO.php =================================================================== --- web/wordpresscsw/wp-content/themes/opencsw/maintainersDAO.php 2012-03-17 02:29:19 UTC (rev 616) +++ web/wordpresscsw/wp-content/themes/opencsw/maintainersDAO.php 2012-03-26 00:30:25 UTC (rev 617) @@ -227,7 +227,7 @@ function getPackageListForMaintainer($maintName) { // Define the query used to retrieve the packages from the database - $sqlQuery = "select pkgname, description, software, vendorurl from packages where maintlogin = '" . $maintName . "' order by pkgname asc; " ; + $sqlQuery = "select pkgname, description, software, vendorurl from packages where maintlogin = '" . $maintName . "' and software not like '%_stub' order by pkgname asc; " ; // Execute the query to retrieve the row to update $this->execQuery($sqlQuery); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 26 03:09:04 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 26 Mar 2012 01:09:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[17555] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 17555 http://gar.svn.sourceforge.net/gar/?rev=17555&view=rev Author: bdwalton Date: 2012-03-26 01:09:04 +0000 (Mon, 26 Mar 2012) Log Message: ----------- git/trunk: drop some pre-configure steps that are not needed when using the tarball vs the .git repo Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-03-25 19:36:14 UTC (rev 17554) +++ csw/mgar/pkg/git/trunk/Makefile 2012-03-26 01:09:04 UTC (rev 17555) @@ -202,13 +202,6 @@ # gnu must come first so xpg4/sed isn't found first. PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH) -# git doesn't track the configure file, it needs to be built when using -# source right from the repo. -pre-configure-modulated: - @(cd $(WORKSRC); echo $(VERSION) > version; \ - $(MAKE) configure ) - @$(MAKECOOKIE) - # force the elisp extension to be built too. post-build-modulated: @echo Builing Emacs Git extension This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 26 03:28:10 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 26 Mar 2012 01:28:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[17556] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 17556 http://gar.svn.sourceforge.net/gar/?rev=17556&view=rev Author: bdwalton Date: 2012-03-26 01:28:10 +0000 (Mon, 26 Mar 2012) Log Message: ----------- git/trunk: force the use of gdiff as our cmp tool for test use Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-03-26 01:09:04 UTC (rev 17555) +++ csw/mgar/pkg/git/trunk/Makefile 2012-03-26 01:28:10 UTC (rev 17556) @@ -202,6 +202,11 @@ # gnu must come first so xpg4/sed isn't found first. PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH) +post-configure-modulated: + @echo "Forcing GIT_TEST_CMP tool" + @( cd $(WORKSRC); echo 'GIT_TEST_CMP=gdiff' > config.mak ) + @$(MAKECOOKIE) + # force the elisp extension to be built too. post-build-modulated: @echo Builing Emacs Git extension 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 Mar 26 10:37:18 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 26 Mar 2012 08:37:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17557] csw/mgar/pkg/evince/trunk/Makefile Message-ID: Revision: 17557 http://gar.svn.sourceforge.net/gar/?rev=17557&view=rev Author: cgrzemba Date: 2012-03-26 08:37:18 +0000 (Mon, 26 Mar 2012) Log Message: ----------- evince/trunk: add PACKAGING_PLATFORMS on build recipe Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2012-03-26 01:28:10 UTC (rev 17556) +++ csw/mgar/pkg/evince/trunk/Makefile 2012-03-26 08:37:18 UTC (rev 17557) @@ -16,13 +16,15 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PATCHFILES += 0001-honor-aclocal_flags.patch - # GARFLAVOR = DBG # GARCOMPILER=GNU GARCOMPILER=SOS12U3 STRIP_LIBTOOL = 1 +PATCHFILES += 0001-honor-aclocal_flags.patch + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + CONFIGURE_ARGS = $(DIRPATHS) # CONFIGURE_ARGS += --enable-introspection # CONFIGURE_ARGS_DBG = --enable-debug 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 Mar 26 11:02:04 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 26 Mar 2012 09:02:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[17558] csw/mgar/pkg/evince/trunk/Makefile Message-ID: Revision: 17558 http://gar.svn.sourceforge.net/gar/?rev=17558&view=rev Author: cgrzemba Date: 2012-03-26 09:02:04 +0000 (Mon, 26 Mar 2012) Log Message: ----------- evince/trunk: correct typo EXTRA_LINKER_FLAGS Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2012-03-26 08:37:18 UTC (rev 17557) +++ csw/mgar/pkg/evince/trunk/Makefile 2012-03-26 09:02:04 UTC (rev 17558) @@ -40,7 +40,7 @@ EXTRA_CFLAGS += -I/opt/csw/include/nautilus -I/opt/csw/include/gnome-vfs-2.0 EXTRA_LD_OPTIONS = -lm -EXTRA_LINKER_FLAG = -norunpath -xnorunpath +EXTRA_LINKER_FLAGS = -norunpath -xnorunpath # EXTRA_LD_OPTIONS = /opt/csw/X11/lib/libX11.so -lm # There are no shared-object dependencies on CSWdbus, but it's required for # evince to work. 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 Mar 26 11:33:44 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 26 Mar 2012 09:33:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[17559] csw/mgar/pkg/evince/trunk/Makefile Message-ID: Revision: 17559 http://gar.svn.sourceforge.net/gar/?rev=17559&view=rev Author: cgrzemba Date: 2012-03-26 09:33:44 +0000 (Mon, 26 Mar 2012) Log Message: ----------- evince/trunk: add main package Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2012-03-26 09:02:04 UTC (rev 17558) +++ csw/mgar/pkg/evince/trunk/Makefile 2012-03-26 09:33:44 UTC (rev 17559) @@ -93,6 +93,7 @@ SPKG_DESC_CSWevince-dev += $(DESCRIPTION), development files PKGFILES_CSWevince-dev += $(PKGFILES_DEVEL) +PACKAGES += CSWevince SPKG_DESC_CSWevince += $(DESCRIPTION), base RUNTIME_DEP_PKGS_CSWevince += CSWlibevdocument2 RUNTIME_DEP_PKGS_CSWevince += CSWlibevview2 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 Mar 26 12:33:08 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 26 Mar 2012 10:33:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17560] csw/mgar/pkg/evince/trunk/Makefile Message-ID: Revision: 17560 http://gar.svn.sourceforge.net/gar/?rev=17560&view=rev Author: cgrzemba Date: 2012-03-26 10:33:08 +0000 (Mon, 26 Mar 2012) Log Message: ----------- evince/trunk: correct runtime dependencies and discouraged-path-in-pkgmap because of scrollkeeper location Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2012-03-26 09:33:44 UTC (rev 17559) +++ csw/mgar/pkg/evince/trunk/Makefile 2012-03-26 10:33:08 UTC (rev 17560) @@ -121,44 +121,117 @@ RUNTIME_DEP_PKGS_CSWevince += CSWlibtiff3 RUNTIME_DEP_PKGS_CSWevince += CSWlibatk1-0-0 -RUNTIME_DEP_PKGS_CSWevince += CSWdbusglib -RUNTIME_DEP_PKGS_CSWevince += CSWdjvulibrert RUNTIME_DEP_PKGS_CSWevince += CSWfconfig -RUNTIME_DEP_PKGS_CSWevince += CSWftype2 -RUNTIME_DEP_PKGS_CSWevince += CSWgconf2 -RUNTIME_DEP_PKGS_CSWevince += CSWggettextrt -RUNTIME_DEP_PKGS_CSWevince += CSWglib2 -RUNTIME_DEP_PKGS_CSWevince += CSWgnomekeyring RUNTIME_DEP_PKGS_CSWevince += CSWgnomevfs2 -RUNTIME_DEP_PKGS_CSWevince += CSWgtk2 -RUNTIME_DEP_PKGS_CSWevince += CSWlibatk -RUNTIME_DEP_PKGS_CSWevince += CSWlibcairo -RUNTIME_DEP_PKGS_CSWevince += CSWlibdbus -RUNTIME_DEP_PKGS_CSWevince += CSWlibglade2 -RUNTIME_DEP_PKGS_CSWevince += CSWlibice -RUNTIME_DEP_PKGS_CSWevince += CSWlibsm -RUNTIME_DEP_PKGS_CSWevince += CSWlibx11 -RUNTIME_DEP_PKGS_CSWevince += CSWlibxml2 RUNTIME_DEP_PKGS_CSWevince += CSWnautilus RUNTIME_DEP_PKGS_CSWevince += CSWpango -RUNTIME_DEP_PKGS_CSWevince += CSWtiff -RUNTIME_DEP_PKGS_CSWevince += CSWzlib -RUNTIME_DEP_PKGS_CSWevince += CSWdbus -CHECKPKG_OVERRIDES_CSWevince += surplus-dependency|CSWdbus -# Shared MIME info is needed to detect file types -RUNTIME_DEP_PKGS_CSWevince += CSWsharedmimeinfo -CHECKPKG_OVERRIDES_CSWevince += surplus-dependency|CSWsharedmimeinfo # Solaris10 paths: these are resuts of cmd: # $ scrollkeeper-config --pkglocalstatedir -CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib -CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper -CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/C -CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/C/scrollkeeper_cl.xml -CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/C/scrollkeeper_extended_cl.xml -CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/TOC -CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/index -CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/scrollkeeper_docs +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/C +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/C/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/C/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/TOC +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/am +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/am/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/am/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/az +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/az/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/az/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/be +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/be/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/be/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ca +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ca/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ca/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/cs +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/cs/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/cs/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/da +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/da/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/da/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/de +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/de/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/de/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/el +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/el/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/el/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/es +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/es/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/es/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/fr +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/fr/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/fr/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/hu +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/hu/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/hu/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/index +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/it +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/it/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/it/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ja +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ja/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ja/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/kn +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/kn/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/kn/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ko +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ko/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ko/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/nl +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/nl/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/nl/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/no +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/no/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/no/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/pl +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/pl/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/pl/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/pt_BR +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/pt_BR/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/pt_BR/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ro +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ro/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ro/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ru +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ru/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ru/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/scrollkeeper_docs +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/sk +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/sk/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/sk/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/sl +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/sl/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/sl/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/sr +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/sr/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/sr/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/sr at Latn +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/sr at Latn/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/sr at Latn/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/sv +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/sv/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/sv/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/tr +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/tr/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/tr/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/uk +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/uk/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/uk/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/vi +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/vi/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/vi/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/zh_CN +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/zh_CN/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/zh_CN/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/zh_TW +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/zh_TW/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/zh_TW/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/scrollkeeper_docs + + BUILD_DEP_PKGS += CSWlibglib2-dev BUILD_DEP_PKGS += CSWlibgconf-dev BUILD_DEP_PKGS += CSWgnomedocutils This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Mon Mar 26 13:13:23 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Mon, 26 Mar 2012 11:13:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17561] csw/mgar/pkg/ganglia/trunk/Makefile Message-ID: Revision: 17561 http://gar.svn.sourceforge.net/gar/?rev=17561&view=rev Author: d_pocock Date: 2012-03-26 11:13:22 +0000 (Mon, 26 Mar 2012) Log Message: ----------- ganglia: add dependency on session module Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-26 10:33:08 UTC (rev 17560) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-26 11:13:22 UTC (rev 17561) @@ -74,11 +74,13 @@ RUNTIME_DEP_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2-modphp5 CSWrrdtool RUNTIME_DEP_PKGS_CSWgangliaweb += CSWphp5-gd RUNTIME_DEP_PKGS_CSWgangliaweb += CSWphp5-json +RUNTIME_DEP_PKGS_CSWgangliaweb += CSWphp5-session CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWgangliagmetad CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWrrdtool CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWphp5-gd CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWphp5-json +CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWphp5-session # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 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 Mar 26 13:14:52 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 26 Mar 2012 11:14:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17562] csw/mgar/pkg/scrollkeeper/trunk/Makefile Message-ID: Revision: 17562 http://gar.svn.sourceforge.net/gar/?rev=17562&view=rev Author: cgrzemba Date: 2012-03-26 11:14:52 +0000 (Mon, 26 Mar 2012) Log Message: ----------- scrollkeeper/trunk: update build recipe for new localstatedir and runtime dependencies Modified Paths: -------------- csw/mgar/pkg/scrollkeeper/trunk/Makefile Modified: csw/mgar/pkg/scrollkeeper/trunk/Makefile =================================================================== --- csw/mgar/pkg/scrollkeeper/trunk/Makefile 2012-03-26 11:13:22 UTC (rev 17561) +++ csw/mgar/pkg/scrollkeeper/trunk/Makefile 2012-03-26 11:14:52 UTC (rev 17562) @@ -3,7 +3,7 @@ CATEGORIES = utils GARTYPE = v2 -DESCRIPTION = a cataloging system for documentation on open systems +DESCRIPTION = Cataloging system for documentation on open systems define BLURB ScrollKeeper is a cataloging system for documentation on open systems. It manages documentation metadata (as specified by the Open Source Metadata @@ -29,7 +29,22 @@ PATCHFILES = Makefile.in.diff +RUNTIME_DEP_PKGS_CSWscrollkeeper += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWscrollkeeper += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWscrollkeeper += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWscrollkeeper += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWscrollkeeper += CSWlibz1 + +PRESERVECONF = $(sysconfdir)/scrollkeeper.conf + +CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/local|root/opt/csw/share/doc/scrollkeeper-0.3.14/scrollkeeper-spec.txt +CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/scrollkeeper.conf.5 +CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/share|root/opt/csw/share/doc/scrollkeeper-0.3.14/scrollkeeper-spec.txt +CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/share|root/opt/csw/share/man/man5/scrollkeeper.conf.5 +CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/share|root/opt/csw/share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/writing_scrollkeeper_omf_files.xml + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-omfdirs=/opt/csw/share/omf:/usr/share/omf TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Mon Mar 26 13:21:15 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Mon, 26 Mar 2012 11:21:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[17563] csw/mgar/pkg/ganglia/trunk Message-ID: Revision: 17563 http://gar.svn.sourceforge.net/gar/?rev=17563&view=rev Author: d_pocock Date: 2012-03-26 11:21:15 +0000 (Mon, 26 Mar 2012) Log Message: ----------- ganglia: add dwoo_cache directory Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile csw/mgar/pkg/ganglia/trunk/files/conf.php Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-26 11:14:52 UTC (rev 17562) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-26 11:21:15 UTC (rev 17563) @@ -183,6 +183,7 @@ PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* PKGFILES_CSWgangliaweb += /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW +PKGFILES_CSWgangliaweb += $(VARGANGLIA)/dwoo_cache PKGFILES_CSWgangliaweb += $(VARGANGLIA)/dwoo PKGFILES_CSWgangliaweb += $(VARGANGLIA)/conf @@ -204,6 +205,7 @@ PROTOTYPE_FILTER_CSWgangliaweb = awk '\ $$$$3 ~ /\/var\/opt\/csw\/ganglia\/dwoo/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ +$$$$3 ~ /\/var\/opt\/csw\/ganglia\/dwoo_cache/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ $$$$3 ~ /\/var\/opt\/csw\/ganglia\/conf/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ { print }' @@ -251,6 +253,7 @@ endif @ginstall -d $(DESTDIR)$(VARGANGLIA)/rrds @ginstall -d $(DESTDIR)$(VARGANGLIA)/dwoo + @ginstall -d $(DESTDIR)$(VARGANGLIA)/dwoo_cache @ginstall -d $(DESTDIR)$(VARGANGLIA)/conf @ginstall -D $(WORKSRC)/gmond/gmond.conf.5 $(DESTDIR)$(mandir)/man5/gmond.conf.5 @ginstall -D $(WORKSRC)/mans/gmetad.1 $(DESTDIR)$(mandir)/man1/gmetad.1 Modified: csw/mgar/pkg/ganglia/trunk/files/conf.php =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/conf.php 2012-03-26 11:14:52 UTC (rev 17562) +++ csw/mgar/pkg/ganglia/trunk/files/conf.php 2012-03-26 11:21:15 UTC (rev 17563) @@ -3,6 +3,7 @@ $conf['gmetad_root'] = "/var/opt/csw/ganglia"; $conf['rrds'] = "${conf['gmetad_root']}/rrds"; $conf['dwoo_compiled_dir'] = "${conf['gmetad_root']}/dwoo"; +$conf['dwoo_cache_dir'] = "${conf['gmetad_root']}/dwoo_cache"; $conf['views_dir'] = $conf['gmetad_root'] . '/conf'; $conf['conf_dir'] = $conf['gmetad_root'] . '/conf'; 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 Mar 26 13:32:20 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 26 Mar 2012 11:32:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17564] csw/mgar/pkg/scrollkeeper/trunk/Makefile Message-ID: Revision: 17564 http://gar.svn.sourceforge.net/gar/?rev=17564&view=rev Author: cgrzemba Date: 2012-03-26 11:32:20 +0000 (Mon, 26 Mar 2012) Log Message: ----------- scrollkeeper/trunk: add checkpkg hints Modified Paths: -------------- csw/mgar/pkg/scrollkeeper/trunk/Makefile Modified: csw/mgar/pkg/scrollkeeper/trunk/Makefile =================================================================== --- csw/mgar/pkg/scrollkeeper/trunk/Makefile 2012-03-26 11:21:15 UTC (rev 17563) +++ csw/mgar/pkg/scrollkeeper/trunk/Makefile 2012-03-26 11:32:20 UTC (rev 17564) @@ -42,6 +42,8 @@ CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/share|root/opt/csw/share/doc/scrollkeeper-0.3.14/scrollkeeper-spec.txt CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/share|root/opt/csw/share/man/man5/scrollkeeper.conf.5 CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/share|root/opt/csw/share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/writing_scrollkeeper_omf_files.xml +# path /usr/share/omf is not bad in general +CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/share|root/etc/opt/csw/scrollkeeper.conf.CSW CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-omfdirs=/opt/csw/share/omf:/usr/share/omf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Mon Mar 26 18:56:50 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Mon, 26 Mar 2012 16:56:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[17565] csw/mgar/pkg/ganglia/trunk Message-ID: Revision: 17565 http://gar.svn.sourceforge.net/gar/?rev=17565&view=rev Author: d_pocock Date: 2012-03-26 16:56:50 +0000 (Mon, 26 Mar 2012) Log Message: ----------- ganglia: update for building 3.3.5 Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile csw/mgar/pkg/ganglia/trunk/checksums Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-26 11:32:20 UTC (rev 17564) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-26 16:56:50 UTC (rev 17565) @@ -1,5 +1,5 @@ NAME = ganglia -VERSION = 3.3.4 +VERSION = 3.3.5 VERSION_U = $(subst .,-,$(VERSION)) # Unit tests don't seem to run on Solaris, so it is disabled # As soon as Ganglia test cases are fixed to run on Solaris, Modified: csw/mgar/pkg/ganglia/trunk/checksums =================================================================== --- csw/mgar/pkg/ganglia/trunk/checksums 2012-03-26 11:32:20 UTC (rev 17564) +++ csw/mgar/pkg/ganglia/trunk/checksums 2012-03-26 16:56:50 UTC (rev 17565) @@ -1 +1 @@ -d7a29490d20d51e0c8e71830dc50f99f ganglia-3.3.4.tar.gz +a5b1c98b7e460cc43be0c527f40fea1b ganglia-3.3.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Mon Mar 26 21:15:06 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Mon, 26 Mar 2012 19:15:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17566] csw/mgar/pkg/ganglia/trunk/files/conf.php Message-ID: Revision: 17566 http://gar.svn.sourceforge.net/gar/?rev=17566&view=rev Author: d_pocock Date: 2012-03-26 19:15:06 +0000 (Mon, 26 Mar 2012) Log Message: ----------- ganglia: re-define other relative paths after changing conf_dir base Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/files/conf.php Modified: csw/mgar/pkg/ganglia/trunk/files/conf.php =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/conf.php 2012-03-26 16:56:50 UTC (rev 17565) +++ csw/mgar/pkg/ganglia/trunk/files/conf.php 2012-03-26 19:15:06 UTC (rev 17566) @@ -7,5 +7,8 @@ $conf['views_dir'] = $conf['gmetad_root'] . '/conf'; $conf['conf_dir'] = $conf['gmetad_root'] . '/conf'; +$conf['overlay_events_file'] = $conf['conf_dir'] . "/events.json"; +$conf['overlay_events_color_map_file'] = $conf['conf_dir'] . "/event_color.json"; + $conf['rrdtool'] = "/opt/csw/bin/rrdtool"; ?> 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 Mar 26 22:01:44 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 26 Mar 2012 20:01:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[17567] csw/mgar/pkg/pca/trunk Message-ID: Revision: 17567 http://gar.svn.sourceforge.net/gar/?rev=17567&view=rev Author: dmichelsen Date: 2012-03-26 20:01:44 +0000 (Mon, 26 Mar 2012) Log Message: ----------- pca/trunk: Update to 20120326-01 Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2012-03-26 19:15:06 UTC (rev 17566) +++ csw/mgar/pkg/pca/trunk/Makefile 2012-03-26 20:01:44 UTC (rev 17567) @@ -1,5 +1,5 @@ NAME = pca -VERSION = 20120119-01 +VERSION = 20120326-01 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2012-03-26 19:15:06 UTC (rev 17566) +++ csw/mgar/pkg/pca/trunk/checksums 2012-03-26 20:01:44 UTC (rev 17567) @@ -2,4 +2,4 @@ def9838b9f704ec17a32dd2aeec8bf02 clean 3027cc2e36a52704e4443cb5c7a91427 cleanup_sadm 9032b788b8a494082368ea0881146078 mkxref -889f960f31531cb79d04aa3c25d2bb46 pca-20120119-01 +25008a7f871b93f28806053fd9abfad3 pca-20120326-01 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 Mar 27 00:26:14 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 26 Mar 2012 22:26:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[17568] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 17568 http://gar.svn.sourceforge.net/gar/?rev=17568&view=rev Author: wahwah Date: 2012-03-26 22:26:14 +0000 (Mon, 26 Mar 2012) Log Message: ----------- pkgdb-web: Add a missing logging import 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-03-26 20:01:44 UTC (rev 17567) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-03-26 22:26:14 UTC (rev 17568) @@ -9,7 +9,9 @@ import web import sqlobject import json +import logging import pprint + from lib.python import models from lib.python import configuration from lib.python import pkgdb 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 Mar 27 00:26:59 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 26 Mar 2012 22:26:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17569] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 17569 http://gar.svn.sourceforge.net/gar/?rev=17569&view=rev Author: wahwah Date: 2012-03-26 22:26:58 +0000 (Mon, 26 Mar 2012) Log Message: ----------- pkgdb-web: Correct the template path resolution The file is already in lib/web, so the path only needs the templates/ element. 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-03-26 22:26:14 UTC (rev 17568) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-03-26 22:26:58 UTC (rev 17569) @@ -52,10 +52,8 @@ ) urls = urls_html + urls_rest -render = web.template.render( - os.path.join( - os.path.split(__file__)[0], - "lib/web/templates/")) +templatedir = os.path.join(os.path.dirname(__file__), "templates/") +render = web.template.render(templatedir) class PkgStatsEncoder(json.JSONEncoder): 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 Mar 27 00:27:26 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 26 Mar 2012 22:27:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[17570] csw/mgar/gar/v2/lib/python/integrate_catalogs.py Message-ID: Revision: 17570 http://gar.svn.sourceforge.net/gar/?rev=17570&view=rev Author: wahwah Date: 2012-03-26 22:27:26 +0000 (Mon, 26 Mar 2012) Log Message: ----------- integrate-catalogs: Display version transitions When tagging version changes, specify the exact version transition. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/integrate_catalogs.py Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py =================================================================== --- csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-03-26 22:26:58 UTC (rev 17569) +++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-03-26 22:27:26 UTC (rev 17570) @@ -82,8 +82,11 @@ upgrade_# #end if $catalogname# - # $diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["type"] + # $diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["type"] # +#if $diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["type"] == 'version' +$diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["from"]["version"] to $diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["to"]["version"] #end if +#end if #end for """ 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 Mar 27 00:27:53 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 26 Mar 2012 22:27:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[17571] csw/mgar/gar/v2/lib/python/integrate_catalogs.py Message-ID: Revision: 17571 http://gar.svn.sourceforge.net/gar/?rev=17571&view=rev Author: wahwah Date: 2012-03-26 22:27:53 +0000 (Mon, 26 Mar 2012) Log Message: ----------- integrate-catalogs: Display msg when loading JSON Just to give the user a sense of what's happening. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/integrate_catalogs.py Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py =================================================================== --- csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-03-26 22:27:26 UTC (rev 17570) +++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-03-26 22:27:53 UTC (rev 17571) @@ -188,6 +188,7 @@ catrel_to = options.catrel_to if options.from_json: with open(options.from_json, "rb") as fd: + logging.info("Loading %s", options.from_json) diffs_by_catalogname = json.load(fd) else: diffs_by_catalogname = GetDiffsByCatalogname( 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 Mar 27 07:45:48 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 27 Mar 2012 05:45:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[17572] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 17572 http://gar.svn.sourceforge.net/gar/?rev=17572&view=rev Author: wahwah Date: 2012-03-27 05:45:48 +0000 (Tue, 27 Mar 2012) Log Message: ----------- gcc4/trunk: version bump to 4.7.0, build for sparcv8+ by default Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile csw/mgar/pkg/gcc4/trunk/checksums Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-03-26 22:27:53 UTC (rev 17571) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-03-27 05:45:48 UTC (rev 17572) @@ -1,7 +1,7 @@ # $Id$ NAME = gcc -VERSION = 4.6.3 +VERSION = 4.7.0 CATEGORIES = lang GARTYPE = v2 BASE_VERSION = $(shell echo $(VERSION) | gsed -e 's/^\([0-9]\+\.[0-9]\+\)\(.*\)/\1/') @@ -72,12 +72,15 @@ # there could be some abstractions in gar.conf.mk, but at the moment there # aren't so let's specify architectures by hand. # -# This avoids the sparcv8+ binaries. -CPU_sparc_32 = v8 +# // This avoids the sparcv8+ binaries. +# We no longer avoid sparcv8+ binaries. +ISA_DEFAULT_sparc = sparcv8plus +CPU_sparc_32 = v9 CPU_sparc_64 = v9 CPU_i386_32 = i386 CPU_i386_64 = x86-64 + CONFIGURE_ARGS_sparc += --with-cpu=$(CPU_$(GARCH)_32) CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) @@ -484,7 +487,7 @@ CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += discouraged-path-in-pkgmap # It needs the core compiler. CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += surplus-dependency|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_CSWgcc4ada += file-with-bad-content +CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += file-with-bad-content RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibiconv2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibppl-c4 Modified: csw/mgar/pkg/gcc4/trunk/checksums =================================================================== --- csw/mgar/pkg/gcc4/trunk/checksums 2012-03-26 22:27:53 UTC (rev 17571) +++ csw/mgar/pkg/gcc4/trunk/checksums 2012-03-27 05:45:48 UTC (rev 17572) @@ -1 +1 @@ -773092fe5194353b02bb0110052a972e gcc-4.6.3.tar.bz2 +2a0f1d99fda235c29d40b561f81d9a77 gcc-4.7.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Mar 27 12:37:23 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 Mar 2012 10:37:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17573] csw/mgar/pkg Message-ID: Revision: 17573 http://gar.svn.sourceforge.net/gar/?rev=17573&view=rev Author: dmichelsen Date: 2012-03-27 10:37:22 +0000 (Tue, 27 Mar 2012) Log Message: ----------- mod_pagespeed: Initial commit, uses strange build system Modified Paths: -------------- csw/mgar/pkg/mod_pagespeed/trunk/Makefile csw/mgar/pkg/mod_pagespeed/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mod_pagespeed/ Removed Paths: ------------- csw/mgar/pkg/mod_pagespeed/trunk/files/0001-Fix-install-destination.patch Modified: csw/mgar/pkg/mod_pagespeed/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_auth_kerb/trunk/Makefile 2012-03-26 22:27:53 UTC (rev 17571) +++ csw/mgar/pkg/mod_pagespeed/trunk/Makefile 2012-03-27 10:37:22 UTC (rev 17573) @@ -1,5 +1,5 @@ -NAME = mod_auth_kerb -VERSION = 5.4 +NAME = mod_pagespeed +VERSION = 0.10.21.2 CATEGORIES = server GARTYPE = v2 @@ -10,34 +10,23 @@ however, need to supply your own RADIUS server to perform the actual authentication. endef -SF_PROJ = modauthkerb -MASTER_SITES = $(SF_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +GOOGLE_PROJ = modpagespeed +MASTER_SITES = svn-http://modpagespeed.googlecode.com/svn/tags/ +DISTFILES += $(VERSION) +NOCHECKSUM += $(VERSION) +DISTNAME = $(VERSION) -# Apply patch until this is fixed: -# https://sourceforge.net/tracker/?func=detail&atid=464524&aid=3172644&group_id=51775 -PATCHFILES += 0001-Fix-install-destination.patch +VENDOR_URL = http://code.google.com/p/modpagespeed/ -VENDOR_URL = http://modauthkerb.sourceforge.net/ -LICENSE = LICENSE +PACKAGES = CSWap2-mod-pagespeed +RUNTIME_DEP_PKGS_CSWap2-mod-pagespeed += CSWapache2 +CHECKPKG_OVERRIDES_CSWap2-mod-pagespeed += surplus-dependency|CSWapache2 -PACKAGES = CSWap2modauthkerb -CATALOGNAME = ap2_mod_auth_kerb -CHECKPKG_OVERRIDES_CSWap2modauthkerb += catalogname-does-not-match-pkgname|pkgname=CSWap2modauthkerb|catalogname=ap2_mod_auth_kerb|expected-catalogname=ap2modauthkerb -RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWapache2 -CHECKPKG_OVERRIDES_CSWap2modauthkerb += surplus-dependency|CSWapache2 - # Apache paths AP2_ROOT = $(prefix)/apache2 AP2_LIBEXEC = $(DESTDIR)$(AP2_ROOT)/libexec CONFIGURE_ARGS += $(DIRPATHS) -CONFIGURE_ARGS += --without-krb4 -CONFIGURE_ARGS += --with-krb5=$(prefix) CONFIGURE_ARGS += --with-apache=$(prefix)/apache2 # The package does not provide a check Modified: csw/mgar/pkg/mod_pagespeed/trunk/checksums =================================================================== --- csw/mgar/pkg/mod_auth_kerb/trunk/checksums 2012-03-26 22:27:53 UTC (rev 17571) +++ csw/mgar/pkg/mod_pagespeed/trunk/checksums 2012-03-27 10:37:22 UTC (rev 17573) @@ -1 +0,0 @@ -642b81763ad3ca81dba359cb952da5e3 mod_auth_kerb-5.4.tar.gz Deleted: csw/mgar/pkg/mod_pagespeed/trunk/files/0001-Fix-install-destination.patch =================================================================== --- csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Fix-install-destination.patch 2012-03-26 22:27:53 UTC (rev 17571) +++ csw/mgar/pkg/mod_pagespeed/trunk/files/0001-Fix-install-destination.patch 2012-03-27 10:37:22 UTC (rev 17573) @@ -1,37 +0,0 @@ -From f60dd9c4b6212a72c125f40f4112795ee22c2fe9 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 4 Feb 2011 12:25:23 +0100 -Subject: [PATCH] Fix install destination - ---- - Makefile.in | 2 +- - apxs.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 36f6046..6c1cb62 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -16,7 +16,7 @@ src/mod_auth_kerb.so: src/mod_auth_kerb.c $(SPNEGO_SRCS) - ./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "${SPNEGO_SRCS}" "${APXS}" "-c" "src/mod_auth_kerb.c" - - install: -- ./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "${SPNEGO_SRCS}" "${APXS}" "-c -i" "src/mod_auth_kerb.c" -+ ./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "" "${APXS}" "-i -S LIBEXECDIR=$(AP2_LIBEXEC)" "src/mod_auth_kerb.la" - - clean: - for i in . src spnegokrb5; do \ -diff --git a/apxs.sh b/apxs.sh -index cdb3e65..dfe893a 100755 ---- a/apxs.sh -+++ b/apxs.sh -@@ -1,5 +1,5 @@ - #!/bin/sh - cppflags=`[ -n "$1" ] && echo $1 | sed -e 's/\([^ ]*\)/-Wc,\1/g'` - ldflags=`[ -n "$2" ] && echo $2 | sed -e 's/\([^ ]*\)/-Wl,\1/g'` --ret=eval "$4" $5 $cppflags $ldflags src/mod_auth_kerb.c $3 -+ret=eval "$4" $5 $cppflags $ldflags $6 $3 - exit $ret --- -1.7.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Mar 27 22:39:27 2012 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 27 Mar 2012 20:39:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[17574] csw/mgar/pkg/dovecot/trunk Message-ID: Revision: 17574 http://gar.svn.sourceforge.net/gar/?rev=17574&view=rev Author: jake_goerzen Date: 2012-03-27 20:39:27 +0000 (Tue, 27 Mar 2012) Log Message: ----------- dovecot: update to version 2.0.19; update runtime deps 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-03-27 10:37:22 UTC (rev 17573) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2012-03-27 20:39:27 UTC (rev 17574) @@ -2,7 +2,7 @@ # - SSL certs to /etc/opt/csw/ssl? # - /var/run/dovecot instead of /var/opt/csw/run? NAME = dovecot -VERSION = 2.0.17 +VERSION = 2.0.19 CATEGORIES = server GARTYPE = v2 @@ -40,8 +40,9 @@ RUNTIME_DEP_PKGS_CSWdovecot += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWdovecot += CSWlibpq RUNTIME_DEP_PKGS_CSWdovecot += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWdovecot += CSWosslrt -RUNTIME_DEP_PKGS_CSWdovecot += CSWoldaprt +RUNTIME_DEP_PKGS_CSWdovecot += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWdovecot += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWdovecot += CSWlibldap2-4-2 PKGFILES_CSWdovecot-dev = $(PKGFILES_DEVEL) Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2012-03-27 10:37:22 UTC (rev 17573) +++ csw/mgar/pkg/dovecot/trunk/checksums 2012-03-27 20:39:27 UTC (rev 17574) @@ -1 +1 @@ -41c10dffa56e228b9176833db2efaac5 dovecot-2.0.17.tar.gz +57b06c02bb7acd72bcc9d682fa2603ad dovecot-2.0.19.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 Mar 28 12:09:30 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 28 Mar 2012 10:09:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[17575] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 17575 http://gar.svn.sourceforge.net/gar/?rev=17575&view=rev Author: wahwah Date: 2012-03-28 10:09:30 +0000 (Wed, 28 Mar 2012) Log Message: ----------- gcc4/trunk: Building on Solaris 10 only. Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-03-27 20:39:27 UTC (rev 17574) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-03-28 10:09:30 UTC (rev 17575) @@ -19,9 +19,11 @@ DISTFILES = $(DISTNAME).tar.bz2 MASTER_SITES = $(GNU_MIRROR)/$(NAME)-$(VERSION)/ -LIBOBJC = 3 +LIBOBJC = 4 -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +# We're not building GCC-4.7 on Solaris 9, because GCC-4.7 requires the +# sparcv8+ architecture. +# PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 # GIT init takes a long time. @@ -66,8 +68,8 @@ CONFIGURE_ARGS += --enable-libssp CONFIGURE_ARGS += --enable-objc-gc CONFIGURE_ARGS += --enable-threads=posix -CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,java,objc -CONFIGURE_ARGS += --with-system-zlib=/opt/csw +CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,go,java,objc +CONFIGURE_ARGS += --with-system-zlib=$(BUILD_PREFIX) # there could be some abstractions in gar.conf.mk, but at the moment there # aren't so let's specify architectures by hand. @@ -113,7 +115,7 @@ SKIPTEST ?= 1 # Used multiple times in package definitions -JAVA_LIB_VERSION = 12 +JAVA_LIB_VERSION = 13 ALTERNATIVES_PRIO = 460 @@ -458,8 +460,8 @@ 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-gc3 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc3 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc-gc$(LIBOBJC) +RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc$(LIBOBJC) RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibppl-c4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibppl9 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibpwl5 @@ -514,6 +516,27 @@ JAVA_BINARIES += gkeytool gnative2ascii gorbd grmic grmid grmregistry JAVA_BINARIES += gserialver gtnameserv jcf-dump jv-convert rebuild-gcj-db +# GCC-4.7 contains assembler specific to sparcv9, incompatible with sparcv8. +# If we wanted to build it on Solaris 9, we would have to add these overrides. +# CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_$(PKG_BASENAME)g++ += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_$(PKG_BASENAME)gfortran += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_CSWlibffi4 += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_CSWlibgcc-s1 += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_CSWlibgcj$(JAVA_LIB_VERSION) += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_CSWlibgcj-tools$(JAVA_LIB_VERSION) += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_CSWlibgfortran3 += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_CSWlibgij$(JAVA_LIB_VERSION) += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_CSWlibgomp1 += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_CSWlibobjc$(LIBOBJC) += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_CSWlibobjc-gc$(LIBOBJC) += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_CSWlibssp0 += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_CSWlibstdc++6 += binary-architecture-does-not-match-placement + 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 wahwah at users.sourceforge.net Wed Mar 28 21:08:40 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 28 Mar 2012 19:08:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[17576] csw/mgar/pkg/gcc4/trunk/files/customize_specs.sh Message-ID: Revision: 17576 http://gar.svn.sourceforge.net/gar/?rev=17576&view=rev Author: wahwah Date: 2012-03-28 19:08:40 +0000 (Wed, 28 Mar 2012) Log Message: ----------- gcc4/trunk: filter out surplus $(VERSION) directories Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/files/customize_specs.sh Modified: csw/mgar/pkg/gcc4/trunk/files/customize_specs.sh =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/customize_specs.sh 2012-03-28 10:09:30 UTC (rev 17575) +++ csw/mgar/pkg/gcc4/trunk/files/customize_specs.sh 2012-03-28 19:08:40 UTC (rev 17576) @@ -20,5 +20,10 @@ -e \ '/\*lib:/,+1 s+%.*+& %{m64:-R /opt/csw/lib/64 } %{!m64:-R /opt/csw/lib}+' \ specs - gmv -v specs "$(gfind ${DESTDIR}/opt/csw/lib -name ${VERSION} -type d -print)" + # Since the inclusion of the Go language, there are 3 directories named + # $(VERSION). Two of them are related to the language, and can be filtered + # out by matching "/go/". + target="$(gfind ${DESTDIR}/opt/csw/lib -name ${VERSION} -type d -print \ + | ggrep -v /go/)" + gmv -v specs "${target}" fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Mar 29 04:24:39 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 29 Mar 2012 02:24:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17577] csw/mgar/pkg/git/trunk Message-ID: Revision: 17577 http://gar.svn.sourceforge.net/gar/?rev=17577&view=rev Author: bdwalton Date: 2012-03-29 02:24:38 +0000 (Thu, 29 Mar 2012) Log Message: ----------- git/trunk: update to 1.7.10rc3 Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-03-28 19:08:40 UTC (rev 17576) +++ csw/mgar/pkg/git/trunk/Makefile 2012-03-29 02:24:38 UTC (rev 17577) @@ -1,6 +1,6 @@ NAME = git VERSION = 1.7.10 -PATCHLEVEL = rc2 +PATCHLEVEL = rc3 DISTNAME = $(NAME)-$(VERSION).$(PATCHLEVEL) CATEGORIES = devel GARTYPE = v2 Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2012-03-28 19:08:40 UTC (rev 17576) +++ csw/mgar/pkg/git/trunk/checksums 2012-03-29 02:24:38 UTC (rev 17577) @@ -1 +1 @@ -1c4d847289aadd2d8620c82139c3feee git-1.7.10.rc2.tar.gz +3b59d5dacfc60ea278ba4c479a78f77e git-1.7.10.rc3.tar.gz 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 Mar 29 13:34:38 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 29 Mar 2012 11:34:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[17578] csw/mgar/pkg/evince/trunk/Makefile Message-ID: Revision: 17578 http://gar.svn.sourceforge.net/gar/?rev=17578&view=rev Author: cgrzemba Date: 2012-03-29 11:34:38 +0000 (Thu, 29 Mar 2012) Log Message: ----------- evince/trunk: add dependency CSWdbus Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2012-03-29 02:24:38 UTC (rev 17577) +++ csw/mgar/pkg/evince/trunk/Makefile 2012-03-29 11:34:38 UTC (rev 17578) @@ -85,13 +85,13 @@ RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibevview2 += CSWfconfig RUNTIME_DEP_PKGS_CSWlibevview2 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWevince-dev += CSWlibevdocument2 -RUNTIME_DEP_PKGS_CSWevince-dev += CSWlibevview2 PACKAGES += CSWevince-dev CATALOGNAME_CSWevince-dev = evince_dev SPKG_DESC_CSWevince-dev += $(DESCRIPTION), development files PKGFILES_CSWevince-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWevince-dev += CSWlibevdocument2 +RUNTIME_DEP_PKGS_CSWevince-dev += CSWlibevview2 PACKAGES += CSWevince SPKG_DESC_CSWevince += $(DESCRIPTION), base @@ -120,11 +120,13 @@ RUNTIME_DEP_PKGS_CSWevince += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWevince += CSWlibtiff3 RUNTIME_DEP_PKGS_CSWevince += CSWlibatk1-0-0 - RUNTIME_DEP_PKGS_CSWevince += CSWfconfig RUNTIME_DEP_PKGS_CSWevince += CSWgnomevfs2 RUNTIME_DEP_PKGS_CSWevince += CSWnautilus RUNTIME_DEP_PKGS_CSWevince += CSWpango +RUNTIME_DEP_PKGS_CSWevince += CSWdbus +# at least the machine-id file must exist, dbus-daemon creates this +CHECKPKG_OVERRIDES_CSWevince += surplus-dependency|CSWdbus # Solaris10 paths: these are resuts of cmd: # $ scrollkeeper-config --pkglocalstatedir CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Thu Mar 29 13:39:56 2012 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Thu, 29 Mar 2012 11:39:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[17579] csw/mgar/pkg/puppet/trunk/Makefile Message-ID: Revision: 17579 http://gar.svn.sourceforge.net/gar/?rev=17579&view=rev Author: phipsy Date: 2012-03-29 11:39:56 +0000 (Thu, 29 Mar 2012) Log Message: ----------- puppet: 2.7.12 borked. do not use Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2012-03-29 11:34:38 UTC (rev 17578) +++ csw/mgar/pkg/puppet/trunk/Makefile 2012-03-29 11:39:56 UTC (rev 17579) @@ -7,6 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet +# 2.7.12 is broken, don't use it! (http://projects.puppetlabs.com/issues/13204) VERSION = 2.7.12 CATEGORIES = apps GARTYPE = v2 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 Mar 29 19:49:38 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Mar 2012 17:49:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[17580] csw/mgar/pkg/bind/branches/bind-with-dlz/Makefile Message-ID: Revision: 17580 http://gar.svn.sourceforge.net/gar/?rev=17580&view=rev Author: dmichelsen Date: 2012-03-29 17:49:37 +0000 (Thu, 29 Mar 2012) Log Message: ----------- bind/branches/bind-with-dlz: Tiny addition Modified Paths: -------------- csw/mgar/pkg/bind/branches/bind-with-dlz/Makefile Modified: csw/mgar/pkg/bind/branches/bind-with-dlz/Makefile =================================================================== --- csw/mgar/pkg/bind/branches/bind-with-dlz/Makefile 2012-03-29 11:39:56 UTC (rev 17579) +++ csw/mgar/pkg/bind/branches/bind-with-dlz/Makefile 2012-03-29 17:49:37 UTC (rev 17580) @@ -73,6 +73,9 @@ RUNTIME_DEP_PKGS_CSWbindchroot = CSWbind ARCHALL_CSWbindchroot = 1 +# Make sure to have -I/opt/csw/include in CFLAGS or just the libxml2 include path is added and compilation fails on readline.h +EXTRA_CFLAGS += $(CPPFLAGS) + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libtool CONFIGURE_ARGS += --with-openssl=/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aironskin at users.sourceforge.net Fri Mar 30 12:20:27 2012 From: aironskin at users.sourceforge.net (aironskin at users.sourceforge.net) Date: Fri, 30 Mar 2012 10:20:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[17581] csw/mgar/pkg/iozone/trunk/Makefile Message-ID: Revision: 17581 http://gar.svn.sourceforge.net/gar/?rev=17581&view=rev Author: aironskin Date: 2012-03-30 10:20:27 +0000 (Fri, 30 Mar 2012) Log Message: ----------- iozone/trunk: Build recipe updated (still incomplete) Modified Paths: -------------- csw/mgar/pkg/iozone/trunk/Makefile Modified: csw/mgar/pkg/iozone/trunk/Makefile =================================================================== --- csw/mgar/pkg/iozone/trunk/Makefile 2012-03-29 17:49:37 UTC (rev 17580) +++ csw/mgar/pkg/iozone/trunk/Makefile 2012-03-30 10:20:27 UTC (rev 17581) @@ -35,13 +35,28 @@ CONFIGURE_SCRIPTS = TEST_SCRIPTS = -BUILD_ARGS = Solaris8-64-VXFS +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 solaris11-sparc solaris11-i386 + +BUILD64 = 1 +BUILD_ARGS_5.9_sparc_32 = Solaris +BUILD_ARGS_5.9_sparc_64 = Solaris8-64-VXFS +BUILD_ARGS_5.10_sparc_32 = Solaris10 +BUILD_ARGS_5.10_sparc_64 = Solaris10cc +BUILD_ARGS_5.11_sparc_32 = Solaris10 +BUILD_ARGS_5.11_sparc_64 = Solaris10cc +BUILD_ARGS_5.9_i386_64 = Solaris8-64-VXFS +BUILD_ARGS_5.10_i386_32 = Solaris10 +BUILD_ARGS_5.10_i386_64 = Solaris10cc +BUILD_ARGS_5.11_i386_32 = Solaris10 +BUILD_ARGS_5.11_i386_64 = Solaris10cc +BUILD_ARGS += $(BUILD_ARGS_$(GAROSREL)_$(GARCH)_$(MEMORY_MODEL)) BUILD_SCRIPTS = $(WORKSRC)/src/current/makefile INSTALL_SCRIPTS = custom include gar/category.mk +# Put the VxFS header file into the build directory post-extract-modulated: mkdir -p $(WORKSRC)/src/current cp $(FILEDIR)/vx_ioctl.h $(WORKSRC)/src/current This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.