From bdwalton at users.sourceforge.net Fri Apr 1 03:01:51 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 01 Apr 2011 01:01:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14034] csw/mgar/pkg/rbgems Message-ID: Revision: 14034 http://gar.svn.sourceforge.net/gar/?rev=14034&view=rev Author: bdwalton Date: 2011-04-01 01:01:51 +0000 (Fri, 01 Apr 2011) Log Message: ----------- add libxml-ruby Added Paths: ----------- csw/mgar/pkg/rbgems/libxml-ruby/ csw/mgar/pkg/rbgems/libxml-ruby/Makefile csw/mgar/pkg/rbgems/libxml-ruby/branches/ csw/mgar/pkg/rbgems/libxml-ruby/tags/ csw/mgar/pkg/rbgems/libxml-ruby/trunk/ csw/mgar/pkg/rbgems/libxml-ruby/trunk/files/ Copied: csw/mgar/pkg/rbgems/libxml-ruby/Makefile (from rev 13986, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/rbgems/libxml-ruby/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/libxml-ruby/Makefile 2011-04-01 01:01:51 UTC (rev 14034) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/rbgems/libxml-ruby/trunk ___________________________________________________________________ Added: svn:ignore + work Added: 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 bdwalton at users.sourceforge.net Fri Apr 1 03:03:25 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 01 Apr 2011 01:03:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14035] csw/mgar/pkg/rbgems/libxml-ruby/trunk Message-ID: Revision: 14035 http://gar.svn.sourceforge.net/gar/?rev=14035&view=rev Author: bdwalton Date: 2011-04-01 01:03:25 +0000 (Fri, 01 Apr 2011) Log Message: ----------- rbgems/libxml-ruby/trunk: add Makefile(?) and checksums Added Paths: ----------- csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile csw/mgar/pkg/rbgems/libxml-ruby/trunk/checksums Added: csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile 2011-04-01 01:03:25 UTC (rev 14035) @@ -0,0 +1,11 @@ +NAME = libxml-ruby +VERSION = 1.1.4 +CATEGORIES = rbgems + +DESCRIPTION = Ruby libxml bindings + +define BLURB + The Libxml-Ruby project provides Ruby language bindings for the GNOMELibxml2 XML tolkit. It is fre software, released under the MITLicense. Libxml-ruby's primary advantage over REXML is performance -if sped is your ned, these are god libraries to consider, asdemonstrated by the informal benchmark below. +endef + +include gar/category.mk Added: csw/mgar/pkg/rbgems/libxml-ruby/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/libxml-ruby/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/libxml-ruby/trunk/checksums 2011-04-01 01:03:25 UTC (rev 14035) @@ -0,0 +1 @@ +6415e8499dfe226dd0f0659b8e3b0b3b libxml-ruby-1.1.4.gem 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 Apr 1 03:14:15 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 01 Apr 2011 01:14:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[14036] csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile Message-ID: Revision: 14036 http://gar.svn.sourceforge.net/gar/?rev=14036&view=rev Author: bdwalton Date: 2011-04-01 01:14:15 +0000 (Fri, 01 Apr 2011) Log Message: ----------- rbgems/libxml-ruby/trunk: set build flags so we find the csw xml2-config Modified Paths: -------------- csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile Modified: csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile 2011-04-01 01:03:25 UTC (rev 14035) +++ csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile 2011-04-01 01:14:15 UTC (rev 14036) @@ -8,4 +8,6 @@ The Libxml-Ruby project provides Ruby language bindings for the GNOMELibxml2 XML tolkit. It is fre software, released under the MITLicense. Libxml-ruby's primary advantage over REXML is performance -if sped is your ned, these are god libraries to consider, asdemonstrated by the informal benchmark below. endef +GEM_BUILD_FLAGS += --with-xml2-config=$(bindir)/xml2-config + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Apr 1 03:17:12 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 01 Apr 2011 01:17:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[14037] csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile Message-ID: Revision: 14037 http://gar.svn.sourceforge.net/gar/?rev=14037&view=rev Author: bdwalton Date: 2011-04-01 01:17:12 +0000 (Fri, 01 Apr 2011) Log Message: ----------- rbgems/libxml-ruby/trunk: set license for this gem Modified Paths: -------------- csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile Modified: csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile 2011-04-01 01:14:15 UTC (rev 14036) +++ csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile 2011-04-01 01:17:12 UTC (rev 14037) @@ -10,4 +10,6 @@ GEM_BUILD_FLAGS += --with-xml2-config=$(bindir)/xml2-config +LICENSE = LICENSE + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Apr 1 03:18:01 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 01 Apr 2011 01:18:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14038] csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile Message-ID: Revision: 14038 http://gar.svn.sourceforge.net/gar/?rev=14038&view=rev Author: bdwalton Date: 2011-04-01 01:18:01 +0000 (Fri, 01 Apr 2011) Log Message: ----------- rbgems/libxml-ruby/trunk: set deps Modified Paths: -------------- csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile Modified: csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile 2011-04-01 01:17:12 UTC (rev 14037) +++ csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile 2011-04-01 01:18:01 UTC (rev 14038) @@ -8,6 +8,8 @@ The Libxml-Ruby project provides Ruby language bindings for the GNOMELibxml2 XML tolkit. It is fre software, released under the MITLicense. Libxml-ruby's primary advantage over REXML is performance -if sped is your ned, these are god libraries to consider, asdemonstrated by the informal benchmark below. endef +RUNTIME_DEP_PKGS = CSWiconv CSWlibruby1 CSWlibxml2-2 CSWzlib + GEM_BUILD_FLAGS += --with-xml2-config=$(bindir)/xml2-config LICENSE = LICENSE 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 Apr 1 03:25:37 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 01 Apr 2011 01:25:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14039] csw/mgar/gar/v2/categories/rbgems/category.mk Message-ID: Revision: 14039 http://gar.svn.sourceforge.net/gar/?rev=14039&view=rev Author: bdwalton Date: 2011-04-01 01:25:37 +0000 (Fri, 01 Apr 2011) Log Message: ----------- .buildsys/v2/categories/rbgems: set a default merge exclusion for the rbgems category Modified Paths: -------------- csw/mgar/gar/v2/categories/rbgems/category.mk Modified: csw/mgar/gar/v2/categories/rbgems/category.mk =================================================================== --- csw/mgar/gar/v2/categories/rbgems/category.mk 2011-04-01 01:18:01 UTC (rev 14038) +++ csw/mgar/gar/v2/categories/rbgems/category.mk 2011-04-01 01:25:37 UTC (rev 14039) @@ -38,6 +38,8 @@ # Ruby module dependencies can not be properly tracked right now _CATEGORY_CHECKPKG_OVERRIDES = surplus-dependency +_MERGE_EXCLUDE_CATEGORY ?= .*\.o + # gem specification actionmailer-2.3.8.gem # -> YAML for # - dependency generation 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 Apr 1 03:43:51 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 01 Apr 2011 01:43:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14040] csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile Message-ID: Revision: 14040 http://gar.svn.sourceforge.net/gar/?rev=14040&view=rev Author: bdwalton Date: 2011-04-01 01:43:50 +0000 (Fri, 01 Apr 2011) Log Message: ----------- rbgems/libxml-ruby/trunk: add checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile Modified: csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile 2011-04-01 01:25:37 UTC (rev 14039) +++ csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile 2011-04-01 01:43:50 UTC (rev 14040) @@ -14,4 +14,11 @@ LICENSE = LICENSE +CHECKPKG_OVERRIDES_CSWgem-libxml-ruby += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/ext/mingw/build.rake +CHECKPKG_OVERRIDES_CSWgem-libxml-ruby += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/ext/libxml/extconf.rb +CHECKPKG_OVERRIDES_CSWgem-libxml-ruby += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/ext/libxml/libxml_ruby.so +CHECKPKG_OVERRIDES_CSWgem-libxml-ruby += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/ext/libxml/Makefile +CHECKPKG_OVERRIDES_CSWgem-libxml-ruby += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/lib/libxml_ruby.so +CHECKPKG_OVERRIDES_CSWgem-libxml-ruby += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/doc/libxml-ruby-1.1.4/rdoc/ext/libxml/Makefile.html + 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 Apr 1 11:23:48 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Apr 2011 09:23:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14041] csw/mgar/gar/v2-defaultchange/gar.pkg.mk Message-ID: Revision: 14041 http://gar.svn.sourceforge.net/gar/?rev=14041&view=rev Author: dmichelsen Date: 2011-04-01 09:23:48 +0000 (Fri, 01 Apr 2011) Log Message: ----------- mGAR v2: Fix error when using 'pkglist' target on obsoleted packages Modified Paths: -------------- csw/mgar/gar/v2-defaultchange/gar.pkg.mk Modified: csw/mgar/gar/v2-defaultchange/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-defaultchange/gar.pkg.mk 2011-04-01 01:43:50 UTC (rev 14040) +++ csw/mgar/gar/v2-defaultchange/gar.pkg.mk 2011-04-01 09:23:48 UTC (rev 14041) @@ -124,7 +124,7 @@ # define pkgname $(strip - $(if $(filter $(1),$(PACKAGES)), + $(if $(filter $(1),$(PACKAGES) $(OBSOLETED_PKGS)), $(1), $(shell perl -F'\s+' -ane 'print "$$F[2]" if( $$F[0] eq "%var" && $$F[1] eq "pkgname")' files/$(1).gspec) ) 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 Apr 1 15:37:51 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Apr 2011 13:37:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14042] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 14042 http://gar.svn.sourceforge.net/gar/?rev=14042&view=rev Author: dmichelsen Date: 2011-04-01 13:37:51 +0000 (Fri, 01 Apr 2011) Log Message: ----------- perl: Remove unused stuff and replace conditional by assignment for consistency Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2011-04-01 09:23:48 UTC (rev 14041) +++ csw/mgar/pkg/perl/trunk/Makefile 2011-04-01 13:37:51 UTC (rev 14042) @@ -17,6 +17,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz +# Make extra Solaris 10 package with DTrace support PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 @@ -44,10 +45,6 @@ DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz) -# Dependencies -#LIBDEPS += bdb48/lib -LIBDEPS += lib/gdbm - # Custom configure CONFIGURE_SCRIPTS = perl @@ -88,9 +85,8 @@ CONFIGURE_ARGS += -Dusethreads # When built on Solaris 10, enable DTrace support -ifeq ($(shell uname -r), 5.10) - CONFIGURE_ARGS += -Dusedtrace -endif +EXTRA_CONFIGURE_ARGS-5.10 = -Dusedtrace +CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS-$(GAROSREL)) CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 1 15:58:03 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Apr 2011 13:58:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14043] csw/mgar/pkg/cpan Message-ID: Revision: 14043 http://gar.svn.sourceforge.net/gar/?rev=14043&view=rev Author: dmichelsen Date: 2011-04-01 13:58:03 +0000 (Fri, 01 Apr 2011) Log Message: ----------- cpan/Parallel-ForkManager: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Parallel-ForkManager/ csw/mgar/pkg/cpan/Parallel-ForkManager/branches/ csw/mgar/pkg/cpan/Parallel-ForkManager/tags/ csw/mgar/pkg/cpan/Parallel-ForkManager/trunk/ csw/mgar/pkg/cpan/Parallel-ForkManager/trunk/Makefile csw/mgar/pkg/cpan/Parallel-ForkManager/trunk/checksums csw/mgar/pkg/cpan/Parallel-ForkManager/trunk/files/ csw/mgar/pkg/cpan/Parallel-ForkManager/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Parallel-ForkManager/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Parallel-ForkManager/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Parallel-ForkManager/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Parallel-ForkManager/trunk/Makefile 2011-04-01 13:58:03 UTC (rev 14043) @@ -0,0 +1,19 @@ +NAME = Parallel-ForkManager +VERSION = 0.7.9 +CATEGORIES = cpan +AUTHOR = DLUX + +DESCRIPTION = A simple parallel processing fork manager +define BLURB +endef + +DISTFILES += COPYING + +CATALOG_RELEASE = unstable + +PACKAGES += CSWpm-parallel-forkmanager +CATALOGNAME_CSWpm-parallel-forkmanager = pm_parallel_forkmanager +ARCHALL_CSWpm-parallel-forkmanager = 1 + +include gar/category.mk + Added: csw/mgar/pkg/cpan/Parallel-ForkManager/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Parallel-ForkManager/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Parallel-ForkManager/trunk/checksums 2011-04-01 13:58:03 UTC (rev 14043) @@ -0,0 +1 @@ +b49dbc6fafb697945d33ffbded0009f7 Parallel-ForkManager-0.7.9.tar.gz Added: csw/mgar/pkg/cpan/Parallel-ForkManager/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Parallel-ForkManager/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Parallel-ForkManager/trunk/files/COPYING 2011-04-01 13:58:03 UTC (rev 14043) @@ -0,0 +1,5 @@ +Copyright (c) 2000-2010 Szab?, Bal?zs (dLux) + +All right reserved. This program is free software; you can redistribute it +and/or modify it under the same terms as Perl itself. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 1 16:21:23 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Apr 2011 14:21:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[14044] csw/mgar/pkg/cpan/makemake Message-ID: Revision: 14044 http://gar.svn.sourceforge.net/gar/?rev=14044&view=rev Author: dmichelsen Date: 2011-04-01 14:21:23 +0000 (Fri, 01 Apr 2011) Log Message: ----------- cpan/makemake: Add more fixes Modified Paths: -------------- csw/mgar/pkg/cpan/makemake Modified: csw/mgar/pkg/cpan/makemake =================================================================== --- csw/mgar/pkg/cpan/makemake 2011-04-01 13:58:03 UTC (rev 14043) +++ csw/mgar/pkg/cpan/makemake 2011-04-01 14:21:23 UTC (rev 14044) @@ -3,6 +3,7 @@ use strict; use warnings; +use File::chdir; use CPAN; use YAML qw(LoadFile); use File::Path; @@ -11,6 +12,15 @@ use version 0.77; # get latest bug-fixes and API use Data::Dumper; +# 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, @@ -148,6 +158,8 @@ my $modname = shift @ARGV; +my $cpandir = $CWD; + logoutput(); my $mod = (CPAN::Shell->expand("Module", $modname))[0]; endlog(); @@ -223,52 +235,65 @@ $description = ucfirst( $description ); chomp( $description ); -print "NAME = $name\n"; -print "VERSION = $fileversion\n"; -print "CATEGORIES = cpan\n"; -print "AUTHOR = $author\n"; -print "\n"; -print "DESCRIPTION = $description\n"; -print "define BLURB\n"; -print "endef\n"; -print "\n"; +# Come back from cpan module build directory to GAR cpan/ +$CWD = $cpandir; +if( ! -d $name ) { + system( "pwd; gmake newpkg-$name" ); +} + +open( MF, ">$name/trunk/Makefile" ) or die "Couldn't write to $name/trunk/Makefile"; + +print MF "NAME = $name\n"; +print MF "VERSION = $fileversion\n"; +print MF "CATEGORIES = cpan\n"; +print MF "AUTHOR = $author\n"; +print MF "\n"; +print MF "DESCRIPTION = $description\n"; +print MF "define BLURB\n"; +print MF "endef\n"; +print MF "\n"; + my $upstreaminfo = 0; if( $notstandard ) { - print "MASTER_SITES = \$(addsuffix ${notstandard},\$(CPAN_MIRRORS))\n"; + print MF "MASTER_SITES = \$(addsuffix ${notstandard},\$(CPAN_MIRRORS))\n"; $upstreaminfo = 1; } if( $fileonly ne "${name}-${fileversion}.tar.gz" ) { - print "MODDIST = $fileonly\n"; + print MF "MODDIST = $fileonly\n"; $upstreaminfo = 1; } -print "\n" if( $upstreaminfo ); +print MF "\n" if( $upstreaminfo ); if( @build_dep_pkgs ) { foreach my $p (@build_dep_pkgs) { - print "BUILD_DEP_PKGS += $p\n"; + print MF "BUILD_DEP_PKGS += $p\n"; } - print "\n"; + print MF "\n"; } -print "CATALOG_RELEASE = unstable\n"; -print "\n"; +print MF "CATALOG_RELEASE = unstable\n"; +print MF "\n"; -print "PACKAGES += $cswpkg\n"; -print "CATALOGNAME_$cswpkg = $cswcatalog\n"; +print MF "PACKAGES += $cswpkg\n"; +print MF "CATALOGNAME_$cswpkg = $cswcatalog\n"; # Do we have the package in the catalog and has it the same name? # dam at login [login]:/home/dam > curl -s http://buildfarm.opencsw.org/pkgdb/rest/catalogs/current/sparc/SunOS5.9/pkgnames/CSWvim/ # {"maintainer_full_name": "Dagobert Michelsen", "version_string": "7.3.055,REV=2010.11.25", "basename": "vim-7.3.055,REV=2010.11.25-SunOS5.9-sparc-CSW.pkg.gz", "maintainer_email": "dam at opencsw.org", "mtime": "2010-11-27 05:31:11", "file_basename": "vim-7.3.055,REV=2010.11.25-SunOS5.9-sparc-CSW.pkg.gz", "arch": "sparc", "osrel": "SunOS5.9", "size": 1026296, "md5_sum": "96bda1535071daa08372ceee7787b17b", "pkgname": "CSWvim", "rev": "2010.11.25", "filename_arch": "sparc", "version": "7.3.055,REV=2010.11.25", "cadam at login [login]:/home/dam > # Or does it need to be obsoleted? -print "# There was no information if this is pure Perl or not. Please remove if necessary.\n" if( $archall == 2 ); -print "ARCHALL_$cswpkg = 1\n" if( $archall ); +print MF "# There was no information if this is pure Perl or not. Please remove if necessary.\n" if( $archall == 2 ); +print MF "ARCHALL_$cswpkg = 1\n" if( $archall ); foreach my $p (@runtime_dep_pkgs) { - print "RUNTIME_DEP_PKGS_$cswpkg += $p\n"; + print MF "RUNTIME_DEP_PKGS_$cswpkg += $p\n"; } -print "\n"; +print MF "\n"; -print "include gar/category.mk\n"; +print MF "include gar/category.mk\n"; + +close( MF ); + +system( "cd $name/trunk; gmake makesum; gmake package "); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 1 23:18:56 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Apr 2011 21:18:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[14045] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 14045 http://gar.svn.sourceforge.net/gar/?rev=14045&view=rev Author: dmichelsen Date: 2011-04-01 21:18:56 +0000 (Fri, 01 Apr 2011) Log Message: ----------- perl: Add 64 bit, still experimental Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2011-04-01 14:21:23 UTC (rev 14044) +++ csw/mgar/pkg/perl/trunk/Makefile 2011-04-01 21:18:56 UTC (rev 14045) @@ -37,6 +37,10 @@ CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl +# We contain libperl.so and libperl.so.5.12.3 +CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink +CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch + # Core module updates # Not used at the moment, leave one as example #MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ @@ -52,8 +56,13 @@ INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 5.10.1 5.12.0 5.12.1 # Force use of db-4.8 -PERL_LIBS += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -lperl +# TBD: Reinsert libperl.so, see below. +PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -lperl +PERL_LIBS-64 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc +PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) +BUILD64 = 1 + # Configuration flags CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION) CONFIGURE_ARGS += -Dcc=$(CC) @@ -73,26 +82,31 @@ CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)" CONFIGURE_ARGS += -Dperladmin="root at localhost" CONFIGURE_ARGS += -Dprefix=$(prefix) +CONFIGURE_ARGS += -Dbin=$(bindir) +CONFIGURE_ARGS += -Dscriptdir=$(bindir) CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION) CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1 CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3 CONFIGURE_ARGS += -Dsiteprefix=/usr -CONFIGURE_ARGS += -Duselargefiles CONFIGURE_ARGS += -Duseshrplib CONFIGURE_ARGS += -Dusesitecustomize CONFIGURE_ARGS += -Dusethreads # When built on Solaris 10, enable DTrace support -EXTRA_CONFIGURE_ARGS-5.10 = -Dusedtrace -CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS-$(GAROSREL)) +CONFIGURE_ARGS-5.10 = -Dusedtrace +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) +# Largefiles is on by default for 64 bit +CONFIGURE_ARGS-32 += -Duselargefiles +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) + CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw CONFIGURE_ARGS += -Dvendorprefix=$(prefix) CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)" -CONFIGURE_ARGS += -Dlibsdirs=" /usr/lib /opt/csw/lib" +CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)" CONFIGURE_ARGS += -Dsed=$(bindir)/gsed EXTRA_LIB += $(prefix)/bdb48/lib @@ -105,8 +119,16 @@ # https://www.opencsw.org/mantis/view.php?id=4544 EXTRA_CFLAGS = $(CPPFLAGS) -EXTRA_LDFLAGS = -L$(libdir) -lperl +# Adding -lperl requires that libperl.so is available during compilation, which is not +# the case on bootstrapping. However, we require explicit libperl linkage or programs +# embedding perl will have problems with duplicated static variables. +# XXX Investigate further after 64 bit has built +EXTRA_LDFLAGS-32 = -L$(libdir) -lperl +EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) +# We want 64 bit binaries +MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) + EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* @@ -137,6 +159,9 @@ include gar/category.mk +# This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and +# the one in $WORKSRC has not been built yet +# TBD: Investigate post-extract-modulated: mkdir -p $(WORKSRC) gln -s libperl.so.5.12.3 $(WORKSRC)/libperl.so 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 Apr 2 02:42:48 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Apr 2011 00:42:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14046] csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile Message-ID: Revision: 14046 http://gar.svn.sourceforge.net/gar/?rev=14046&view=rev Author: bdwalton Date: 2011-04-02 00:42:48 +0000 (Sat, 02 Apr 2011) Log Message: ----------- rbgems/libxml-ruby/trunk: correct libruby dep after update was released Modified Paths: -------------- csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile Modified: csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile 2011-04-01 21:18:56 UTC (rev 14045) +++ csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile 2011-04-02 00:42:48 UTC (rev 14046) @@ -8,7 +8,7 @@ The Libxml-Ruby project provides Ruby language bindings for the GNOMELibxml2 XML tolkit. It is fre software, released under the MITLicense. Libxml-ruby's primary advantage over REXML is performance -if sped is your ned, these are god libraries to consider, asdemonstrated by the informal benchmark below. endef -RUNTIME_DEP_PKGS = CSWiconv CSWlibruby1 CSWlibxml2-2 CSWzlib +RUNTIME_DEP_PKGS = CSWiconv CSWlibruby18-1 CSWlibxml2-2 CSWzlib GEM_BUILD_FLAGS += --with-xml2-config=$(bindir)/xml2-config This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 2 13:23:44 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Apr 2011 11:23:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[14047] csw/mgar/gar/v2/lib/python/inspective_package_test. py Message-ID: Revision: 14047 http://gar.svn.sourceforge.net/gar/?rev=14047&view=rev Author: wahwah Date: 2011-04-02 11:23:44 +0000 (Sat, 02 Apr 2011) Log Message: ----------- inspective_package_test.py: Backward compatilibity To support libmagic 5.04 and 5.05. 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 2011-04-02 00:42:48 UTC (rev 14046) +++ csw/mgar/gar/v2/lib/python/inspective_package_test.py 2011-04-02 11:23:44 UTC (rev 14047) @@ -37,7 +37,11 @@ self.mox.StubOutWithMock(magic, 'open') magic.open(0).AndReturn(magic_cookie_mock) magic_cookie_mock.load() - magic_cookie_mock.setflags(magic.MIME) + if "MAGIC_MIME" in dir(magic): + flag = magic.MAGIC_MIME + elif "MIME" in dir(magic): + flag = magic.MIME + magic_cookie_mock.setflags(flag) magic_cookie_mock.file( u'/fake/path/CSWfoo/root/foo-file').AndReturn( "application/x-executable") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 2 13:24:06 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Apr 2011 11:24:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14048] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14048 http://gar.svn.sourceforge.net/gar/?rev=14048&view=rev Author: wahwah Date: 2011-04-02 11:24:06 +0000 (Sat, 02 Apr 2011) Log Message: ----------- package.py: Move inspective functions Two functions that need access to unpackage package moved to inspective_package.py. 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 2011-04-02 11:23:44 UTC (rev 14047) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2011-04-02 11:24:06 UTC (rev 14048) @@ -284,7 +284,77 @@ % (repr(line), common_re)) return response + def GetDependencies(self): + """Gets dependencies information. + Returns: + A tuple of (list, list) of depends and i_depends. + """ + # The collection of dependencies needs to be a list (as opposed to + # a set) because there might be duplicates and it's necessary to + # carry that information. + depends = [] + i_depends = [] + depend_file_path = os.path.join(self.directory, "install", "depend") + if os.path.exists(depend_file_path): + with open(depend_file_path, "r") as fd: + for line in fd: + fields = re.split(c.WS_RE, line) + if len(fields) < 2: + logging.warning("Bad depends line: %s", repr(line)) + if fields[0] == "P": + pkgname = fields[1] + pkg_desc = " ".join(fields[1:]) + depends.append((pkgname, pkg_desc)) + if fields[0] == "I": + pkgname = fields[1] + i_depends.append(pkgname) + return depends, i_depends + + def GetObsoletedBy(self): + """Collects obsolescence information from the package if it exists + + Documentation: + http://wiki.opencsw.org/obsoleting-packages + + Returns: + + A dictionary of "has_obsolete_info", "syntax_ok" and + "obsoleted_by" where obsoleted_by is a list of (pkgname, + catalogname) tuples and has_obsolete_info and syntax_ok are + booleans. + + If the package has not been obsoleted or the package predates the + implementation of this mechanism, obsoleted_by is an empty list + and has_obsolete_info will be False. + + If the package provides obsolescence information but the format of + the information is invalid, syntax_ok will be False and the list + may be empty. It will always contain the valid entries. + """ + + has_obsolete_info = False + obsoleted_syntax_ok = True + obsoleted_by = [] + obsoleted_by_path = os.path.join(self.directory, "install", "obsolete") + + if os.path.exists(obsoleted_by_path): + has_obsolete_info = True + with open(obsoleted_by_path, "r") as fd: + for line in fd: + fields = re.split(c.WS_RE, line) + if len(fields) < 2: + obsoleted_syntax_ok = False + logging.warning("Bad line in obsolete file: %s", repr(line)) + continue + pkgname, catalogname = fields[0:2] + obsoleted_by.append((pkgname, catalogname)) + + return { "syntax_ok": obsoleted_syntax_ok, + "obsoleted_by": obsoleted_by, + "has_obsolete_info": has_obsolete_info } + + class FileMagic(object): """Libmagic sometimes returns None, which I think is a bug. Trying to come up with a way to work around that. It might not even be Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2011-04-02 11:23:44 UTC (rev 14047) +++ csw/mgar/gar/v2/lib/python/package.py 2011-04-02 11:24:06 UTC (rev 14048) @@ -341,76 +341,6 @@ pkginfo_name = "%s - %s" % (catalog_name, description) self.SetPkginfoEntry("NAME", pkginfo_name) - def GetDependencies(self): - """Gets dependencies information. - - Returns: - A tuple of (list, list) of depends and i_depends. - """ - # The collection of dependencies needs to be a list (as opposed to - # a set) because there might be duplicates and it's necessary to - # carry that information. - depends = [] - i_depends = [] - depend_file_path = os.path.join(self.directory, "install", "depend") - if os.path.exists(depend_file_path): - with open(depend_file_path, "r") as fd: - for line in fd: - fields = re.split(c.WS_RE, line) - if len(fields) < 2: - logging.warning("Bad depends line: %s", repr(line)) - if fields[0] == "P": - pkgname = fields[1] - pkg_desc = " ".join(fields[1:]) - depends.append((pkgname, pkg_desc)) - if fields[0] == "I": - pkgname = fields[1] - i_depends.append(pkgname) - return depends, i_depends - - def GetObsoletedBy(self): - """Collects obsolescence information from the package if it exists - - Documentation: - http://wiki.opencsw.org/obsoleting-packages - - Returns: - - A dictionary of "has_obsolete_info", "syntax_ok" and - "obsoleted_by" where obsoleted_by is a list of (pkgname, - catalogname) tuples and has_obsolete_info and syntax_ok are - booleans. - - If the package has not been obsoleted or the package predates the - implementation of this mechanism, obsoleted_by is an empty list - and has_obsolete_info will be False. - - If the package provides obsolescence information but the format of - the information is invalid, syntax_ok will be False and the list - may be empty. It will always contain the valid entries. - """ - - has_obsolete_info = False - obsoleted_syntax_ok = True - obsoleted_by = [] - obsoleted_by_path = os.path.join(self.directory, "install", "obsolete") - - if os.path.exists(obsoleted_by_path): - has_obsolete_info = True - with open(obsoleted_by_path, "r") as fd: - for line in fd: - fields = re.split(c.WS_RE, line) - if len(fields) < 2: - obsoleted_syntax_ok = False - logging.warning("Bad line in obsolete file: %s", repr(line)) - continue - pkgname, catalogname = fields[0:2] - obsoleted_by.append((pkgname, catalogname)) - - return { "syntax_ok": obsoleted_syntax_ok, - "obsoleted_by": obsoleted_by, - "has_obsolete_info": has_obsolete_info } - def CheckPkgpathExists(self): if not os.path.isdir(self.directory): raise PackageError("%s does not exist or is not a directory" 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 Apr 2 13:24:30 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Apr 2011 11:24:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[14049] csw/mgar/gar/v2/lib/python/package_stats_test.py Message-ID: Revision: 14049 http://gar.svn.sourceforge.net/gar/?rev=14049&view=rev Author: wahwah Date: 2011-04-02 11:24:30 +0000 (Sat, 02 Apr 2011) Log Message: ----------- package_stats_test.py: Adjust call order in tests Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_stats_test.py Modified: csw/mgar/gar/v2/lib/python/package_stats_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats_test.py 2011-04-02 11:24:06 UTC (rev 14048) +++ csw/mgar/gar/v2/lib/python/package_stats_test.py 2011-04-02 11:24:30 UTC (rev 14049) @@ -46,10 +46,11 @@ mock_dirpkg.GetCatalogname().AndReturn("mock_catalogname") mock_srv4.GetMd5sum().AndReturn("mock md5sum") mock_srv4.GetSize().AndReturn(42) + mock_dirpkg.GetDependencies().AndReturn(([], [])) mock_dirpkg.ListBinaries().AndReturn([]) mock_dirpkg.GetBinaryDumpInfo().AndReturn([]) - mock_dirpkg.GetDependencies().AndReturn(([], [])) mock_srv4.GetPkgchkOutput().AndReturn((0, "", "")) + mock_dirpkg.GetObsoletedBy().AndReturn(([], [])) mock_dirpkg.GetParsedPkginfo().AndReturn({ "ARCH": "sparc", "EMAIL": "maintainer at example.com", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 2 14:03:03 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Apr 2011 12:03:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14050] csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test. py Message-ID: Revision: 14050 http://gar.svn.sourceforge.net/gar/?rev=14050&view=rev Author: wahwah Date: 2011-04-02 12:03:02 +0000 (Sat, 02 Apr 2011) Log Message: ----------- submitpkg-test: Use /usr/bin/env to allow /usr/bin To run on systems where python2.6 is not under /opt/csw/bin. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py 2011-04-02 11:24:30 UTC (rev 14049) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py 2011-04-02 12:03:02 UTC (rev 14050) @@ -1,4 +1,4 @@ -#!/opt/csw/bin/python2.6 +#!/usr/bin/env python2.6 import unittest import submit_to_newpkgs as stn 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 Apr 2 14:03:40 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Apr 2011 12:03:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14051] csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test. py Message-ID: Revision: 14051 http://gar.svn.sourceforge.net/gar/?rev=14051&view=rev Author: wahwah Date: 2011-04-02 12:03:40 +0000 (Sat, 02 Apr 2011) Log Message: ----------- submitpkg-test: Use unittest2 if possible Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py 2011-04-02 12:03:02 UTC (rev 14050) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py 2011-04-02 12:03:40 UTC (rev 14051) @@ -1,6 +1,11 @@ #!/usr/bin/env python2.6 -import unittest +# Try to use unittest2, fall back to unittest +try: + import unittest2 as unittest +except ImportError: + import unittest + import submit_to_newpkgs as stn import tag 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 Apr 2 14:04:16 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Apr 2011 12:04:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[14052] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14052 http://gar.svn.sourceforge.net/gar/?rev=14052&view=rev Author: wahwah Date: 2011-04-02 12:04:15 +0000 (Sat, 02 Apr 2011) Log Message: ----------- submitpkg: Better warnings about missing pkgs Evaluating not just architectures, but architecture+os release duples. This way submitpkg can detect missing packages from a set with packages specific to 5.9 and 5.10. For example: foo-5.9-sparc foo-5.9-i386 foo-5.10-sparc What's missing? foo-5.10-i386. submitpkg can now detect that. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2011-04-02 12:03:40 UTC (rev 14051) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2011-04-02 12:04:15 UTC (rev 14052) @@ -34,6 +34,7 @@ import sys import opencsw import tag +import common_constants CONFIG_INFO = """Create a file in ~/.releases.ini with the following content: @@ -118,29 +119,62 @@ parsed_filename["vendortag"]))) return tags + def _CheckMissingArchs(self, files_with_metadata): + tags = [] + catalognames_by_arch = {} + # We check all the OS releases that are included in the file set. + # We won't report a missing i386-SunOS5.8 package if there was no + # SunOS5.8 package in the set. + osrels = set(x[1]["osrel"] for x in files_with_metadata) + # Prepopulate sets, so that we have one set per each arch-osrel pair + # that is applicable to this set of files. + for arch in common_constants.PHYSICAL_ARCHITECTURES: + for osrel in osrels: + key = arch, osrel + catalognames_by_arch[key] = set() + # Assign files from the set to appropriate set. + for file_path, file_metadata in files_with_metadata: + catalogname = file_metadata["catalogname"] + if file_metadata["arch"] == "all": + archs = common_constants.PHYSICAL_ARCHITECTURES + else: + archs = [file_metadata["arch"]] + osrel = file_metadata["osrel"] + for arch in archs: + key = arch, osrel + catalognames_by_arch[key].add(catalogname) + missing = {} + for key1, set1 in catalognames_by_arch.iteritems(): + for catalogname in set1: + for key2, set2 in catalognames_by_arch.iteritems(): + if catalogname not in set2: + arch, osrel = key2 + missing_key = arch, osrel, catalogname + missing.setdefault(missing_key, set()).add( + "Because %s-%s-%s exists" % (catalogname, key1[0], key1[1])) + for arch, osrel, catalogname in missing: + error_tag_name = "%s-%s-missing" % (arch, osrel) + tags.append(tag.CheckpkgTag(None, error_tag_name, catalogname)) + return tags + def CheckFiles(self, file_list): """Checks a set of files. Returns error tags.""" - catalognames_by_arch = { - "i386": set(), - "sparc": set(), - } files_with_metadata = [] for file_path in file_list: pkg_path, basename = os.path.split(file_path) parsed = opencsw.ParsePackageFileName(basename) + catalogname = parsed["catalogname"] files_with_metadata.append((basename, parsed)) if parsed["arch"] == "all": - for arch in ("i386", "sparc"): - catalognames_by_arch[arch].add(parsed["catalogname"]) + archs = common_constants.PHYSICAL_ARCHITECTURES else: - catalognames_by_arch[parsed["arch"]].add(parsed["catalogname"]) - i386 = catalognames_by_arch["i386"] - sparc = catalognames_by_arch["sparc"] + archs = [parsed["arch"]] + for arch in archs: + for osrel in common_constants.OS_RELS: + key = arch, osrel + # catalognames_by_arch.setdefault(key, set()).add(catalogname) tags = [] - for catalogname in i386.difference(sparc): - tags.append(tag.CheckpkgTag(None, "sparc-arch-missing", catalogname)) - for catalogname in sparc.difference(i386): - tags.append(tag.CheckpkgTag(None, "i386-arch-missing", catalogname)) + tags.extend(self._CheckMissingArchs(files_with_metadata)) tags.extend(self._CheckUncommitted(files_with_metadata)) return tags Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py 2011-04-02 12:03:40 UTC (rev 14051) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py 2011-04-02 12:04:15 UTC (rev 14052) @@ -22,11 +22,23 @@ class FileSetCheckerUnitTest(unittest.TestCase): - def testNsprFiles(self): + def testMissingArchitecture(self): fc = stn.FileSetChecker() - expected = [tag.CheckpkgTag(None, 'i386-arch-missing', 'libnspr4')] + expected = [tag.CheckpkgTag(None, 'i386-SunOS5.9-missing', 'libnspr4')] self.assertEqual(expected, fc.CheckFiles(SAMPLE_FILES)) + def testMissingArchitectureWithOsrel(self): + files = [ + 'foo-1.0,REV=2011.03.30-SunOS5.9-i386-CSW.pkg.gz', + 'foo-1.0,REV=2011.03.30-SunOS5.9-sparc-CSW.pkg.gz', + 'foo-1.0,REV=2011.03.30-SunOS5.10-i386-CSW.pkg.gz', + # Intentionally missing + # 'foo-1.0,REV=2011.03.30-SunOS5.10-sparc-CSW.pkg.gz', + ] + fc = stn.FileSetChecker() + expected = [tag.CheckpkgTag(None, 'sparc-SunOS5.10-missing', 'foo')] + self.assertEqual(expected, fc.CheckFiles(files)) + def testUncommitted(self): fc = stn.FileSetChecker() expected = [ 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 Apr 2 14:04:48 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Apr 2011 12:04:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14053] csw/mgar/gar/v2/lib/python/tag.py Message-ID: Revision: 14053 http://gar.svn.sourceforge.net/gar/?rev=14053&view=rev Author: wahwah Date: 2011-04-02 12:04:48 +0000 (Sat, 02 Apr 2011) Log Message: ----------- checkpkg: A comment for the tag class Modified Paths: -------------- csw/mgar/gar/v2/lib/python/tag.py Modified: csw/mgar/gar/v2/lib/python/tag.py =================================================================== --- csw/mgar/gar/v2/lib/python/tag.py 2011-04-02 12:04:15 UTC (rev 14052) +++ csw/mgar/gar/v2/lib/python/tag.py 2011-04-02 12:04:48 UTC (rev 14053) @@ -5,8 +5,13 @@ import configuration as c class CheckpkgTag(object): - """Represents a tag to be written to the checkpkg tag file.""" + """Represents a tag to be written to the checkpkg tag file. + This class is only used by submitpkg. The main tag class lives in the + models.py file. The main difference is that this class does not need + a database. + """ + def __init__(self, pkgname, tag_name, tag_info=None, severity=None, msg=None): self.pkgname = pkgname self.tag_name = tag_name This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 2 14:05:31 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Apr 2011 12:05:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14054] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14054 http://gar.svn.sourceforge.net/gar/?rev=14054&view=rev Author: wahwah Date: 2011-04-02 12:05:31 +0000 (Sat, 02 Apr 2011) Log Message: ----------- checkpkg: FileSetChecker in a separate file This class will be reused in csw-upload-pkg, so it needs to live in a separate file. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/file_set_checker.py csw/mgar/gar/v2/lib/python/file_set_checker_test.py Added: csw/mgar/gar/v2/lib/python/file_set_checker.py =================================================================== --- csw/mgar/gar/v2/lib/python/file_set_checker.py (rev 0) +++ csw/mgar/gar/v2/lib/python/file_set_checker.py 2011-04-02 12:05:31 UTC (rev 14054) @@ -0,0 +1,92 @@ +#!/opt/csw/bin/python2.6 +# coding=utf-8 +# vim:set sw=2 ts=2 sts=2 expandtab: + +import tag +import os +import opencsw +import common_constants + +class FileSetChecker(object): + """Checks a file name set. + + Doesn't check anything about package contents. The purpose of this + class is to identify problems with the file set itself, e.g. an + uncommitted package or a missing i386 package. + """ + + def _CheckUncommitted(self, files_with_metadata): + tags = [] + expected_vendor_tag = "CSW" + for filename, parsed_filename in files_with_metadata: + if parsed_filename["vendortag"] != expected_vendor_tag: + tags.append(tag.CheckpkgTag( + None, + "bad-vendor-tag", + "%s expected=%s actual=%s" + % (parsed_filename["catalogname"], + expected_vendor_tag, + parsed_filename["vendortag"]))) + return tags + + def _CheckMissingArchs(self, files_with_metadata): + tags = [] + catalognames_by_arch = {} + # We check all the OS releases that are included in the file set. + # We won't report a missing i386-SunOS5.8 package if there was no + # SunOS5.8 package in the set. + osrels = set(x[1]["osrel"] for x in files_with_metadata) + # Prepopulate sets, so that we have one set per each arch-osrel pair + # that is applicable to this set of files. + for arch in common_constants.PHYSICAL_ARCHITECTURES: + for osrel in osrels: + key = arch, osrel + catalognames_by_arch[key] = set() + # Assign files from the set to appropriate set. + for file_path, file_metadata in files_with_metadata: + catalogname = file_metadata["catalogname"] + if file_metadata["arch"] == "all": + archs = common_constants.PHYSICAL_ARCHITECTURES + else: + archs = [file_metadata["arch"]] + osrel = file_metadata["osrel"] + for arch in archs: + key = arch, osrel + catalognames_by_arch[key].add(catalogname) + missing = {} + for key1, set1 in catalognames_by_arch.iteritems(): + for catalogname in set1: + for key2, set2 in catalognames_by_arch.iteritems(): + if catalogname not in set2: + arch, osrel = key2 + missing_key = arch, osrel, catalogname + missing.setdefault(missing_key, set()).add( + "Because %s-%s-%s exists" % (catalogname, key1[0], key1[1])) + for arch, osrel, catalogname in missing: + error_tag_name = "%s-%s-missing" % (arch, osrel) + tags.append(tag.CheckpkgTag(None, error_tag_name, catalogname)) + return tags + + def CheckFiles(self, file_list): + """Checks a set of files. Returns error tags.""" + files_with_metadata = [] + for file_path in file_list: + pkg_path, basename = os.path.split(file_path) + parsed = opencsw.ParsePackageFileName(basename) + catalogname = parsed["catalogname"] + files_with_metadata.append((basename, parsed)) + if parsed["arch"] == "all": + archs = common_constants.PHYSICAL_ARCHITECTURES + else: + archs = [parsed["arch"]] + for arch in archs: + for osrel in common_constants.OS_RELS: + key = arch, osrel + # catalognames_by_arch.setdefault(key, set()).add(catalogname) + tags = [] + tags.extend(self._CheckMissingArchs(files_with_metadata)) + tags.extend(self._CheckUncommitted(files_with_metadata)) + return tags + + + Copied: csw/mgar/gar/v2/lib/python/file_set_checker_test.py (from rev 14053, csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py) =================================================================== --- csw/mgar/gar/v2/lib/python/file_set_checker_test.py (rev 0) +++ csw/mgar/gar/v2/lib/python/file_set_checker_test.py 2011-04-02 12:05:31 UTC (rev 14054) @@ -0,0 +1,58 @@ +#!/usr/bin/env python2.6 +# coding=utf-8 +# vim:set sw=2 ts=2 sts=2 expandtab: + +# Try to use unittest2, fall back to unittest +try: + import unittest2 as unittest +except ImportError: + import unittest + +import file_set_checker +import tag + +SAMPLE_FILES = [ + # This file intentionally missing. + # '/home/experimental/maciej/libnspr4-4.8.6,REV=2010.10.16-SunOS5.9-i386-CSW.pkg.gz', + '/home/experimental/maciej/libnspr4-4.8.6,REV=2010.10.16-SunOS5.9-sparc-CSW.pkg.gz', + '/home/experimental/maciej/libnspr4_devel-4.8.6,REV=2010.10.16-SunOS5.9-i386-CSW.pkg.gz', + '/home/experimental/maciej/libnspr4_devel-4.8.6,REV=2010.10.16-SunOS5.9-sparc-CSW.pkg.gz', + '/home/experimental/maciej/nspr-4.8.6,REV=2010.10.16-SunOS5.9-all-CSW.pkg.gz', + '/home/experimental/maciej/nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-i386-CSW.pkg.gz', + '/home/experimental/maciej/nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-sparc-CSW.pkg.gz', +] + +class FileSetCheckerUnitTest(unittest.TestCase): + + def testMissingArchitecture(self): + fc = file_set_checker.FileSetChecker() + expected = [tag.CheckpkgTag(None, 'i386-SunOS5.9-missing', 'libnspr4')] + self.assertEqual(expected, fc.CheckFiles(SAMPLE_FILES)) + + def testMissingArchitectureWithOsrel(self): + files = [ + 'foo-1.0,REV=2011.03.30-SunOS5.9-i386-CSW.pkg.gz', + 'foo-1.0,REV=2011.03.30-SunOS5.9-sparc-CSW.pkg.gz', + 'foo-1.0,REV=2011.03.30-SunOS5.10-i386-CSW.pkg.gz', + # Intentionally missing + # 'foo-1.0,REV=2011.03.30-SunOS5.10-sparc-CSW.pkg.gz', + ] + fc = file_set_checker.FileSetChecker() + expected = [tag.CheckpkgTag(None, 'sparc-SunOS5.10-missing', 'foo')] + self.assertEqual(expected, fc.CheckFiles(files)) + + def testUncommitted(self): + fc = file_set_checker.FileSetChecker() + expected = [ + tag.CheckpkgTag(None, 'bad-vendor-tag', 'nspr_devel expected=CSW actual=UNCOMMITTED'), + tag.CheckpkgTag(None, 'bad-vendor-tag', 'nspr_devel expected=CSW actual=UNCOMMITTED'), + ] + files = ['/home/experimental/maciej/' + 'nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-sparc-UNCOMMITTED.pkg.gz', + '/home/experimental/maciej/' + 'nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-i386-UNCOMMITTED.pkg.gz'] + self.assertEqual(expected, fc.CheckFiles(files)) + + +if __name__ == '__main__': + unittest.main() Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2011-04-02 12:04:48 UTC (rev 14053) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2011-04-02 12:05:31 UTC (rev 14054) @@ -35,6 +35,7 @@ import opencsw import tag import common_constants +import file_set_checker CONFIG_INFO = """Create a file in ~/.releases.ini with the following content: @@ -103,82 +104,6 @@ raise PackageSubmissionError(msg) -class FileSetChecker(object): - - def _CheckUncommitted(self, files_with_metadata): - tags = [] - expected_vendor_tag = "CSW" - for filename, parsed_filename in files_with_metadata: - if parsed_filename["vendortag"] != expected_vendor_tag: - tags.append(tag.CheckpkgTag( - None, - "bad-vendor-tag", - "%s expected=%s actual=%s" - % (parsed_filename["catalogname"], - expected_vendor_tag, - parsed_filename["vendortag"]))) - return tags - - def _CheckMissingArchs(self, files_with_metadata): - tags = [] - catalognames_by_arch = {} - # We check all the OS releases that are included in the file set. - # We won't report a missing i386-SunOS5.8 package if there was no - # SunOS5.8 package in the set. - osrels = set(x[1]["osrel"] for x in files_with_metadata) - # Prepopulate sets, so that we have one set per each arch-osrel pair - # that is applicable to this set of files. - for arch in common_constants.PHYSICAL_ARCHITECTURES: - for osrel in osrels: - key = arch, osrel - catalognames_by_arch[key] = set() - # Assign files from the set to appropriate set. - for file_path, file_metadata in files_with_metadata: - catalogname = file_metadata["catalogname"] - if file_metadata["arch"] == "all": - archs = common_constants.PHYSICAL_ARCHITECTURES - else: - archs = [file_metadata["arch"]] - osrel = file_metadata["osrel"] - for arch in archs: - key = arch, osrel - catalognames_by_arch[key].add(catalogname) - missing = {} - for key1, set1 in catalognames_by_arch.iteritems(): - for catalogname in set1: - for key2, set2 in catalognames_by_arch.iteritems(): - if catalogname not in set2: - arch, osrel = key2 - missing_key = arch, osrel, catalogname - missing.setdefault(missing_key, set()).add( - "Because %s-%s-%s exists" % (catalogname, key1[0], key1[1])) - for arch, osrel, catalogname in missing: - error_tag_name = "%s-%s-missing" % (arch, osrel) - tags.append(tag.CheckpkgTag(None, error_tag_name, catalogname)) - return tags - - def CheckFiles(self, file_list): - """Checks a set of files. Returns error tags.""" - files_with_metadata = [] - for file_path in file_list: - pkg_path, basename = os.path.split(file_path) - parsed = opencsw.ParsePackageFileName(basename) - catalogname = parsed["catalogname"] - files_with_metadata.append((basename, parsed)) - if parsed["arch"] == "all": - archs = common_constants.PHYSICAL_ARCHITECTURES - else: - archs = [parsed["arch"]] - for arch in archs: - for osrel in common_constants.OS_RELS: - key = arch, osrel - # catalognames_by_arch.setdefault(key, set()).add(catalogname) - tags = [] - tags.extend(self._CheckMissingArchs(files_with_metadata)) - tags.extend(self._CheckUncommitted(files_with_metadata)) - return tags - - def main(): try: config = ConfigParser.SafeConfigParser() @@ -275,7 +200,7 @@ remote_package_files.append(dst_arg) package_base_file_name = os.path.split(p)[1] remote_package_references.append(dst_arg + "/" + package_base_file_name) - fc = FileSetChecker() + fc = file_set_checker.FileSetChecker() error_tags = fc.CheckFiles(files_to_rsync) if error_tags: for error_tag in error_tags: Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py 2011-04-02 12:04:48 UTC (rev 14053) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs_test.py 2011-04-02 12:05:31 UTC (rev 14054) @@ -7,50 +7,10 @@ import unittest import submit_to_newpkgs as stn -import tag -SAMPLE_FILES = [ - # This file intentionally missing. - # '/home/experimental/maciej/libnspr4-4.8.6,REV=2010.10.16-SunOS5.9-i386-CSW.pkg.gz', - '/home/experimental/maciej/libnspr4-4.8.6,REV=2010.10.16-SunOS5.9-sparc-CSW.pkg.gz', - '/home/experimental/maciej/libnspr4_devel-4.8.6,REV=2010.10.16-SunOS5.9-i386-CSW.pkg.gz', - '/home/experimental/maciej/libnspr4_devel-4.8.6,REV=2010.10.16-SunOS5.9-sparc-CSW.pkg.gz', - '/home/experimental/maciej/nspr-4.8.6,REV=2010.10.16-SunOS5.9-all-CSW.pkg.gz', - '/home/experimental/maciej/nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-i386-CSW.pkg.gz', - '/home/experimental/maciej/nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-sparc-CSW.pkg.gz', -] +# FileSetChecker class and unit tests have been moved to a separate +# file. -class FileSetCheckerUnitTest(unittest.TestCase): - def testMissingArchitecture(self): - fc = stn.FileSetChecker() - expected = [tag.CheckpkgTag(None, 'i386-SunOS5.9-missing', 'libnspr4')] - self.assertEqual(expected, fc.CheckFiles(SAMPLE_FILES)) - - def testMissingArchitectureWithOsrel(self): - files = [ - 'foo-1.0,REV=2011.03.30-SunOS5.9-i386-CSW.pkg.gz', - 'foo-1.0,REV=2011.03.30-SunOS5.9-sparc-CSW.pkg.gz', - 'foo-1.0,REV=2011.03.30-SunOS5.10-i386-CSW.pkg.gz', - # Intentionally missing - # 'foo-1.0,REV=2011.03.30-SunOS5.10-sparc-CSW.pkg.gz', - ] - fc = stn.FileSetChecker() - expected = [tag.CheckpkgTag(None, 'sparc-SunOS5.10-missing', 'foo')] - self.assertEqual(expected, fc.CheckFiles(files)) - - def testUncommitted(self): - fc = stn.FileSetChecker() - expected = [ - tag.CheckpkgTag(None, 'bad-vendor-tag', 'nspr_devel expected=CSW actual=UNCOMMITTED'), - tag.CheckpkgTag(None, 'bad-vendor-tag', 'nspr_devel expected=CSW actual=UNCOMMITTED'), - ] - files = ['/home/experimental/maciej/' - 'nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-sparc-UNCOMMITTED.pkg.gz', - '/home/experimental/maciej/' - 'nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-i386-UNCOMMITTED.pkg.gz'] - self.assertEqual(expected, fc.CheckFiles(files)) - - 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 Apr 2 14:06:04 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Apr 2011 12:06:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[14055] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 14055 http://gar.svn.sourceforge.net/gar/?rev=14055&view=rev Author: wahwah Date: 2011-04-02 12:06:04 +0000 (Sat, 02 Apr 2011) Log Message: ----------- csw-upload-pkg: Reuse FileSetChecker Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-02 12:05:31 UTC (rev 14054) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-02 12:06:04 UTC (rev 14055) @@ -19,6 +19,7 @@ import rest import struct_util import subprocess +import file_set_checker BASE_URL = "http://buildfarm.opencsw.org" @@ -493,6 +494,15 @@ os_release = options.os_release if os_release: os_release = struct_util.OsReleaseToLong(os_release) + + # Check the file set. + fc = file_set_checker.FileSetChecker() + error_tags = fc.CheckFiles(args) + if error_tags: + for error_tag in error_tags: + print error_tag + sys.exit(1) + uploader = Srv4Uploader(args, options.rest_url, os_release=os_release, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 2 15:09:19 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Apr 2011 13:09:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[14056] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: Revision: 14056 http://gar.svn.sourceforge.net/gar/?rev=14056&view=rev Author: wahwah Date: 2011-04-02 13:09:19 +0000 (Sat, 02 Apr 2011) Log Message: ----------- pkgdb: removepkg support Removes a package from the database, removing also all metadata Does not allow to remove a package which is part of one or more catalogs. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2011-04-02 12:06:04 UTC (rev 14055) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2011-04-02 13:09:19 UTC (rev 14056) @@ -31,11 +31,14 @@ USAGE = """ Preparing the database: %prog initdb - %prog importpkg [ ... ] %prog system-files-to-file [ [ [ ] ] ] %prog import-system-file + Managing individual packages: + %prog importpkg [ ... ] + %prog removepkg [ ... ] + Managing catalogs: %prog add-to-cat [ ... ] %prog del-from-cat [ ... ] @@ -449,6 +452,20 @@ stats["basic_stats"]["md5_sum"], stats["basic_stats"]["pkg_basename"]) package_stats.PackageStats.ImportPkg(stats, options.replace) + elif command == 'removepkg': + for md5_sum in md5_sums: + srv4 = GetPkg(md5_sum) + in_catalogs = list(srv4.in_catalogs) + if in_catalogs: + for in_catalog in in_catalogs: + logging.warning("%s", in_catalog) + logging.warning( + "Not removing from the database, because the package " + "in question is part of at least one catalog.") + else: + logging.info("Removing %s", srv4) + srv4.DeleteAllDependentObjects() + srv4.destroySelf() elif command == 'add-to-cat': if len(args) <= 3: raise UsageError("Not enough arguments, see usage.") 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 Apr 2 15:09:59 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Apr 2011 13:09:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[14057] csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html Message-ID: Revision: 14057 http://gar.svn.sourceforge.net/gar/?rev=14057&view=rev Author: wahwah Date: 2011-04-02 13:09:59 +0000 (Sat, 02 Apr 2011) Log Message: ----------- pkgdb-web: Display metadata data structure version Modified Paths: -------------- csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html Modified: csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2011-04-02 13:09:19 UTC (rev 14056) +++ csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2011-04-02 13:09:59 UTC (rev 14057) @@ -43,6 +43,8 @@
  • Use to generate catalogs: $pkg.use_to_generate_catalogs
    • +
  • Metadata data structure version: $pkg.stats_version
    • + $if overrides: 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 Apr 2 16:06:53 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Apr 2011 14:06:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[14058] csw/mgar/gar/v2/lib/python/inspective_package.py Message-ID: Revision: 14058 http://gar.svn.sourceforge.net/gar/?rev=14058&view=rev Author: wahwah Date: 2011-04-02 14:06:52 +0000 (Sat, 02 Apr 2011) Log Message: ----------- csw-upload-pkg: Bugfix, adding missing import 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 2011-04-02 13:09:59 UTC (rev 14057) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2011-04-02 14:06:52 UTC (rev 14058) @@ -9,6 +9,7 @@ import common_constants import subprocess import ldd_emul +import configuration as c """This file isolates code dependent on hachoir parser. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sat Apr 2 23:49:12 2011 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sat, 02 Apr 2011 21:49:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[14059] csw/mgar/pkg/munin/trunk/Makefile Message-ID: Revision: 14059 http://gar.svn.sourceforge.net/gar/?rev=14059&view=rev Author: j_arndt Date: 2011-04-02 21:49:11 +0000 (Sat, 02 Apr 2011) Log Message: ----------- munin: removed unnecessary dependency to CSWrrdtool Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2011-04-02 14:06:52 UTC (rev 14058) +++ csw/mgar/pkg/munin/trunk/Makefile 2011-04-02 21:49:11 UTC (rev 14059) @@ -49,7 +49,7 @@ ARCHALL_CSWmunincommon = 1 RUNTIME_DEP_PKGS_CSWmuninmaster = CSWperl CSWpmhtmltmpl CSWpmprmsvldt CSWpmlog4perl CSWmunincommon -RUNTIME_DEP_PKGS_CSWmuninmaster += CSWrrdtool CSWpm-rrdtool CSWapache2 +RUNTIME_DEP_PKGS_CSWmuninmaster += CSWpm-rrdtool CSWapache2 RUNTIME_DEP_PKGS_CSWmuninmaster += CSWcswclassutils RUNTIME_DEP_PKGS_CSWmuninnode = CSWperl CSWpmnetsnmp CSWpmnetserver CSWmunincommon 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 Apr 3 00:00:20 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 02 Apr 2011 22:00:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[14060] csw/mgar/pkg/spamassassin/trunk/Makefile Message-ID: Revision: 14060 http://gar.svn.sourceforge.net/gar/?rev=14060&view=rev Author: bonivart Date: 2011-04-02 22:00:20 +0000 (Sat, 02 Apr 2011) Log Message: ----------- spamassassin/trunk: Change perl deps to new names Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2011-04-02 21:49:11 UTC (rev 14059) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2011-04-02 22:00:20 UTC (rev 14060) @@ -16,11 +16,26 @@ #DISTFILES = $(SPKG_NAME)-$(VERSION)-rc3.tar.gz DISTFILES += COPYING -RUNTIME_DEP_PKGS = CSWgnupg CSWosslrt CSWperl CSWpmdbi -RUNTIME_DEP_PKGS += CSWpmiosocketinet6 CSWpmiosocketssl CSWpmiozlib -RUNTIME_DEP_PKGS += CSWpmipcountry CSWpmldap CSWpmlibwww CSWpmmaildkim -RUNTIME_DEP_PKGS += CSWpmmailspf CSWpmmailtools CSWpmmimebase64 CSWpmnetaddrip CSWpmnetdns -RUNTIME_DEP_PKGS += CSWrazor CSWpmuri CSWpmhtmlparser CSWzlib +RUNTIME_DEP_PKGS = CSWgnupg +RUNTIME_DEP_PKGS += CSWosslrt +RUNTIME_DEP_PKGS += CSWperl +RUNTIME_DEP_PKGS += CSWpm-dbi +RUNTIME_DEP_PKGS += CSWpm-html-parser +RUNTIME_DEP_PKGS += CSWpm-io-socket-inet6 +RUNTIME_DEP_PKGS += CSWpm-io-socket-ssl +RUNTIME_DEP_PKGS += CSWpmiozlib +RUNTIME_DEP_PKGS += CSWpmipcountry +RUNTIME_DEP_PKGS += CSWpm-ldap +RUNTIME_DEP_PKGS += CSWpm-libwww-perl +RUNTIME_DEP_PKGS += CSWpmmaildkim +RUNTIME_DEP_PKGS += CSWpmmailspf +RUNTIME_DEP_PKGS += CSWpmmailtools +RUNTIME_DEP_PKGS += CSWpm-mime-base64 +RUNTIME_DEP_PKGS += CSWpm-netaddr-ip +RUNTIME_DEP_PKGS += CSWpmnetdns +RUNTIME_DEP_PKGS += CSWpmuri +RUNTIME_DEP_PKGS += CSWrazor +RUNTIME_DEP_PKGS += CSWzlib UFILES_REGEX = $(SPKG_NAME)-(\d+(?:\.\d+)*).tar.gz @@ -28,7 +43,8 @@ SAMPLECONF += /etc/opt/csw/spamassassin/local\.cf\.CSW SAMPLECONF += /etc/opt/csw/spamassassin/spamd\.CSW USERGROUP = /etc/opt/csw/pkg/CSWspamassassin/cswusergroup -INITSMF = /opt/csw/etc/init.d/cswspamd +#INITSMF = /opt/csw/etc/init.d/cswspamd +INITSMF = /etc/opt/csw/init.d/cswspamd POSTMSG = /opt/csw/share/doc/spamassassin/README.upgrade MIGRATE_FILES = init.pre local.cf v310.pre v312.pre v320.pre @@ -100,8 +116,10 @@ install-custom: @echo " ==> Installing $(NAME) (custom)" @rm -rf $(DESTDIR) - @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/init.d - @ginstall -m 755 $(FILEDIR)/CSWspamassassin.cswspamd $(DESTDIR)/opt/csw/etc/init.d/cswspamd +# @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/init.d +# @ginstall -m 755 $(FILEDIR)/CSWspamassassin.cswspamd $(DESTDIR)/opt/csw/etc/init.d/cswspamd + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 $(FILEDIR)/CSWspamassassin.cswspamd $(DESTDIR)/etc/opt/csw/init.d/cswspamd @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWspamassassin @ginstall -m 644 $(FILEDIR)/CSWspamassassin.cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWspamassassin/cswusergroup @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/spamassassin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sun Apr 3 15:04:12 2011 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 03 Apr 2011 13:04:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[14061] csw/mgar/pkg/munin/trunk Message-ID: Revision: 14061 http://gar.svn.sourceforge.net/gar/?rev=14061&view=rev Author: j_arndt Date: 2011-04-03 13:04:12 +0000 (Sun, 03 Apr 2011) Log Message: ----------- munin: makefile cleanup, packages now use cswcptemplate for config files Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2011-04-02 22:00:20 UTC (rev 14060) +++ csw/mgar/pkg/munin/trunk/Makefile 2011-04-03 13:04:12 UTC (rev 14061) @@ -53,12 +53,12 @@ RUNTIME_DEP_PKGS_CSWmuninmaster += CSWcswclassutils RUNTIME_DEP_PKGS_CSWmuninnode = CSWperl CSWpmnetsnmp CSWpmnetserver CSWmunincommon -RUNTIME_DEP_PKGS_CSWmuninnode += CSWcswclassutils +RUNTIME_DEP_PKGS_CSWmuninnode += CSWcswclassutils CSWcas-cptemplates RUNTIME_DEP_PKGS_CSWmuninnode += CSWperl CSWpmnetssleay -SPKG_CLASSES_CSWmuninmaster = none cswusergroup cswpreserveconf ugfiles -SPKG_CLASSES_CSWmuninnode = none cswusergroup ugfiles cswpreserveconf cswinitsmf +SPKG_CLASSES_CSWmuninmaster = none cswusergroup cswcptemplates ugfiles +SPKG_CLASSES_CSWmuninnode = none cswusergroup ugfiles cswcptemplates cswinitsmf SPKG_CLASSES_CSWmunincommon = none CONFIGURE_ARGS = $(DIRPATHS) @@ -79,26 +79,42 @@ @$(MAKECOOKIE) install-custom: + @# + @# because the configure / installation process of munin is somewhat unusual + @# we have to do it manually + @# @cat $(WORKSRC)/Makefile | sed -e "s;DESTDIR =;& $(DESTDIR);g" > $(WORKSRC)/Makefile.tmp @( cd $(WORKSRC); gmake -f Makefile ; cp Makefile.tmp Makefile ; gmake -f Makefile install) - @mv $(DESTDIR)/etc/opt/csw/munin/munin-node.conf $(DESTDIR)/etc/opt/csw/munin/munin-node.conf.CSW - @mv $(DESTDIR)/etc/opt/csw/munin/munin.conf $(DESTDIR)/etc/opt/csw/munin/munin.conf.CSW - @mv $(DESTDIR)/var/opt/csw/munin/www/.htaccess $(DESTDIR)/var/opt/csw/munin/www/.htaccess.CSW - #@ginstall -d $(DESTDIR)/opt/csw/munin - @ginstall -d $(DESTDIR)/etc/opt/csw/munin/apache - @ginstall -m 644 $(FILEDIR)/apache-munin.conf.CSW $(DESTDIR)/etc/opt/csw/munin/apache/apache-munin.conf.CSW - @ginstall -m 644 $(FILEDIR)/apache-munin-cgi.conf.CSW $(DESTDIR)/etc/opt/csw/munin/apache/apache-munin-cgi.conf.CSW + @# + @# we are using cswclassutils -> cswcptemplate + @# + @ginstall -d $(DESTDIR)/opt/csw/etc/templates/CSWmuninnode/etc/opt/csw/munin + @ginstall -d $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin + @ginstall -d $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/apache + @ginstall -d $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/var/opt/csw/munin/www + @mv $(DESTDIR)/etc/opt/csw/munin/munin-node.conf $(DESTDIR)/opt/csw/etc/templates/CSWmuninnode/etc/opt/csw/munin/ + @mv $(DESTDIR)/etc/opt/csw/munin/munin.conf $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/ + @ginstall -m 644 $(FILEDIR)/apache-munin.conf.CSW $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/apache/apache-munin.conf + @ginstall -m 644 $(FILEDIR)/apache-munin-cgi.conf.CSW $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/apache/apache-munin-cgi.conf + @mv $(DESTDIR)/var/opt/csw/munin/www/.htaccess $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/var/opt/csw/munin/www/ + @# + @# create user munin during package deployment -> cswusergroup + @# + @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWmuninmaster/cswusergroup + @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWmuninnode/cswusergroup + @# + @# create init script / smf -> cswinitsmf + @# + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 $(FILEDIR)/cswmuninnode $(DESTDIR)/etc/opt/csw/init.d/cswmuninnode + @# + @# handle some other files + @# @ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWmuninmaster @ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWmuninnode @ginstall -d $(DESTDIR)/opt/csw/share/doc @ginstall -d $(DESTDIR)/opt/csw/share/doc/munin_master @ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)/opt/csw/share/doc/munin_master/README.CSW - @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWmuninmaster/cswusergroup - @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWmuninnode/cswusergroup - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall -m 755 $(FILEDIR)/cswmuninnode $(DESTDIR)/etc/opt/csw/init.d/cswmuninnode @ginstall -d $(DESTDIR)/opt/csw/share/munin/fonts - #@ginstall -m 644 $(DESTDIR)/opt/csw/libexec/munin/VeraMono.ttf $(DESTDIR)/opt/csw/share/munin/fonts/VeraMono.ttf @ginstall -m 644 $(WORKSRC)/master/VeraMono.ttf $(DESTDIR)/opt/csw/share/munin/fonts/VeraMono.ttf - #@rm $(DESTDIR)/opt/csw/libexec/munin/VeraMono.ttf @$(MAKECOOKIE) Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype 2011-04-02 22:00:20 UTC (rev 14060) +++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype 2011-04-03 13:04:12 UTC (rev 14061) @@ -1,9 +1,12 @@ d none /etc/opt/csw/munin 0755 root bin d none /etc/opt/csw/munin/apache 0755 root bin -f cswpreserveconf /etc/opt/csw/munin/apache/apache-munin-cgi.conf.CSW 0644 root bin -f cswpreserveconf /etc/opt/csw/munin/apache/apache-munin.conf.CSW 0644 root bin +d none /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin 0755 root bin +d none /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/apache 0755 root bin +d none /opt/csw/etc/templates/CSWmuninmaster/var/opt/csw/munin/www 0755 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/apache/apache-munin-cgi.conf 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/apache/apache-munin.conf 0644 root bin d none /etc/opt/csw/munin/munin-conf.d 0755 root bin -f cswpreserveconf /etc/opt/csw/munin/munin.conf.CSW 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/munin.conf 0644 root bin d none /etc/opt/csw/munin/plugin-conf.d 0755 root bin d ugfiles /etc/opt/csw/munin/templates 0755 munin munin f none /etc/opt/csw/munin/templates/definitions.html 0644 root bin @@ -96,4 +99,4 @@ d ugfiles /var/opt/csw/munin/log 0755 munin munin d ugfiles /var/opt/csw/munin/run 0755 munin munin d ugfiles /var/opt/csw/munin/www 0755 munin munin -f cswpreserveconf /var/opt/csw/munin/www/.htaccess.CSW 0644 munin munin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/var/opt/csw/munin/www/.htaccess 0644 munin munin Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype 2011-04-02 22:00:20 UTC (rev 14060) +++ csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype 2011-04-03 13:04:12 UTC (rev 14061) @@ -1,7 +1,8 @@ d none /etc/opt/csw/init.d 0755 root bin f cswinitsmf /etc/opt/csw/init.d/cswmuninnode 0755 root bin d none /etc/opt/csw/munin 0755 root bin -f cswpreserveconf /etc/opt/csw/munin/munin-node.conf.CSW 0644 root bin +d none /opt/csw/etc/templates/CSWmuninnode/etc/opt/csw/munin 0755 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninnode/etc/opt/csw/munin/munin-node.conf 0644 root bin d none /etc/opt/csw/munin/plugin-conf.d 0755 root bin d none /etc/opt/csw/munin/plugins 0755 root bin f none /opt/csw/bin/munindoc 0555 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sun Apr 3 17:37:37 2011 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 03 Apr 2011 15:37:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14062] csw/mgar/pkg/munin/trunk Message-ID: Revision: 14062 http://gar.svn.sourceforge.net/gar/?rev=14062&view=rev Author: j_arndt Date: 2011-04-03 15:37:36 +0000 (Sun, 03 Apr 2011) Log Message: ----------- munin: packages now use cswcrontab action script Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype csw/mgar/pkg/munin/trunk/files/cswusergroup Added Paths: ----------- csw/mgar/pkg/munin/trunk/files/crontab.munin Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2011-04-03 13:04:12 UTC (rev 14061) +++ csw/mgar/pkg/munin/trunk/Makefile 2011-04-03 15:37:36 UTC (rev 14062) @@ -50,14 +50,14 @@ RUNTIME_DEP_PKGS_CSWmuninmaster = CSWperl CSWpmhtmltmpl CSWpmprmsvldt CSWpmlog4perl CSWmunincommon RUNTIME_DEP_PKGS_CSWmuninmaster += CSWpm-rrdtool CSWapache2 -RUNTIME_DEP_PKGS_CSWmuninmaster += CSWcswclassutils +RUNTIME_DEP_PKGS_CSWmuninmaster += CSWcswclassutils CSWcas-cptemplates CSWcas-crontab RUNTIME_DEP_PKGS_CSWmuninnode = CSWperl CSWpmnetsnmp CSWpmnetserver CSWmunincommon RUNTIME_DEP_PKGS_CSWmuninnode += CSWcswclassutils CSWcas-cptemplates RUNTIME_DEP_PKGS_CSWmuninnode += CSWperl CSWpmnetssleay -SPKG_CLASSES_CSWmuninmaster = none cswusergroup cswcptemplates ugfiles +SPKG_CLASSES_CSWmuninmaster = none cswusergroup cswcrontab cswcptemplates ugfiles SPKG_CLASSES_CSWmuninnode = none cswusergroup ugfiles cswcptemplates cswinitsmf SPKG_CLASSES_CSWmunincommon = none @@ -100,6 +100,8 @@ @# @# create user munin during package deployment -> cswusergroup @# + @ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWmuninmaster + @ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWmuninnode @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWmuninmaster/cswusergroup @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWmuninnode/cswusergroup @# @@ -108,10 +110,13 @@ @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/cswmuninnode $(DESTDIR)/etc/opt/csw/init.d/cswmuninnode @# + @# create crontab for user munin -> cswcrontab + @# + @ginstall -d 755 $(DESTDIR)/etc/opt/csw/pkg/CSWmuninmaster/crontabs + @ginstall -m 644 $(FILEDIR)/crontab.munin $(DESTDIR)/etc/opt/csw/pkg/CSWmuninmaster/crontabs/munin + @# @# handle some other files @# - @ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWmuninmaster - @ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWmuninnode @ginstall -d $(DESTDIR)/opt/csw/share/doc @ginstall -d $(DESTDIR)/opt/csw/share/doc/munin_master @ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)/opt/csw/share/doc/munin_master/README.CSW Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall 2011-04-03 13:04:12 UTC (rev 14061) +++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall 2011-04-03 15:37:36 UTC (rev 14062) @@ -1,7 +1,5 @@ #!/bin/sh -passwd -N munin - cat << EOF ======================================================================= Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype 2011-04-03 13:04:12 UTC (rev 14061) +++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype 2011-04-03 15:37:36 UTC (rev 14062) @@ -100,3 +100,5 @@ d ugfiles /var/opt/csw/munin/run 0755 munin munin d ugfiles /var/opt/csw/munin/www 0755 munin munin f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/var/opt/csw/munin/www/.htaccess 0644 munin munin +d none /etc/opt/csw/pkg/CSWmuninmaster/crontabs 0755 root bin +f cswcrontab /etc/opt/csw/pkg/CSWmuninmaster/crontabs/munin 0644 root bin Added: csw/mgar/pkg/munin/trunk/files/crontab.munin =================================================================== --- csw/mgar/pkg/munin/trunk/files/crontab.munin (rev 0) +++ csw/mgar/pkg/munin/trunk/files/crontab.munin 2011-04-03 15:37:36 UTC (rev 14062) @@ -0,0 +1 @@ +0,5,10,15,20,25,30,35,40,45,50,55 * * * * /bin/test -x /opt/csw/bin/munin-cron && /opt/csw/bin/munin-cron Modified: csw/mgar/pkg/munin/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/munin/trunk/files/cswusergroup 2011-04-03 13:04:12 UTC (rev 14061) +++ csw/mgar/pkg/munin/trunk/files/cswusergroup 2011-04-03 15:37:36 UTC (rev 14062) @@ -1 +1 @@ -munin:munin:Munin user:/etc/opt/csw/munin:/bin/false:m:r +munin:munin:Munin user:/etc/opt/csw/munin::m:r:NP This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sun Apr 3 17:57:24 2011 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 03 Apr 2011 15:57:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[14063] csw/mgar/pkg/munin/trunk Message-ID: Revision: 14063 http://gar.svn.sourceforge.net/gar/?rev=14063&view=rev Author: j_arndt Date: 2011-04-03 15:57:23 +0000 (Sun, 03 Apr 2011) Log Message: ----------- munin: packages now use cswpostmsg Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype csw/mgar/pkg/munin/trunk/files/README.CSW Removed Paths: ------------- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2011-04-03 15:37:36 UTC (rev 14062) +++ csw/mgar/pkg/munin/trunk/Makefile 2011-04-03 15:57:23 UTC (rev 14063) @@ -13,8 +13,7 @@ SF_PROJ = munin MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += CSWmuninmaster.postinstall -DISTFILES += CSWmuninmaster.prototype CSWmuninmaster.postinstall +DISTFILES += CSWmuninmaster.prototype DISTFILES += CSWmuninnode.prototype cswmuninnode DISTFILES += CSWmunincommon.prototype DISTFILES += cswusergroup @@ -50,15 +49,15 @@ RUNTIME_DEP_PKGS_CSWmuninmaster = CSWperl CSWpmhtmltmpl CSWpmprmsvldt CSWpmlog4perl CSWmunincommon RUNTIME_DEP_PKGS_CSWmuninmaster += CSWpm-rrdtool CSWapache2 -RUNTIME_DEP_PKGS_CSWmuninmaster += CSWcswclassutils CSWcas-cptemplates CSWcas-crontab +RUNTIME_DEP_PKGS_CSWmuninmaster += CSWcswclassutils CSWcas-cptemplates CSWcas-crontab CSWcas-postmsg RUNTIME_DEP_PKGS_CSWmuninnode = CSWperl CSWpmnetsnmp CSWpmnetserver CSWmunincommon RUNTIME_DEP_PKGS_CSWmuninnode += CSWcswclassutils CSWcas-cptemplates RUNTIME_DEP_PKGS_CSWmuninnode += CSWperl CSWpmnetssleay -SPKG_CLASSES_CSWmuninmaster = none cswusergroup cswcrontab cswcptemplates ugfiles -SPKG_CLASSES_CSWmuninnode = none cswusergroup ugfiles cswcptemplates cswinitsmf +SPKG_CLASSES_CSWmuninmaster = none cswusergroup cswcrontab cswcptemplates ugfiles cswpostmsg +SPKG_CLASSES_CSWmuninnode = none cswusergroup ugfiles cswcptemplates cswinitsmf SPKG_CLASSES_CSWmunincommon = none CONFIGURE_ARGS = $(DIRPATHS) @@ -115,11 +114,14 @@ @ginstall -d 755 $(DESTDIR)/etc/opt/csw/pkg/CSWmuninmaster/crontabs @ginstall -m 644 $(FILEDIR)/crontab.munin $(DESTDIR)/etc/opt/csw/pkg/CSWmuninmaster/crontabs/munin @# - @# handle some other files + @# print a postmessage -> cswpostmessage @# @ginstall -d $(DESTDIR)/opt/csw/share/doc @ginstall -d $(DESTDIR)/opt/csw/share/doc/munin_master @ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)/opt/csw/share/doc/munin_master/README.CSW + @# + @# handle some other files + @# @ginstall -d $(DESTDIR)/opt/csw/share/munin/fonts @ginstall -m 644 $(WORKSRC)/master/VeraMono.ttf $(DESTDIR)/opt/csw/share/munin/fonts/VeraMono.ttf @$(MAKECOOKIE) Deleted: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall 2011-04-03 15:37:36 UTC (rev 14062) +++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall 2011-04-03 15:57:23 UTC (rev 14063) @@ -1,33 +0,0 @@ -#!/bin/sh - -cat << EOF - -======================================================================= - -To get Munin running, please follow these steps: - -(1) Append the following line to the crontab of the user 'munin': - - 0,5,10,15,20,25,30,35,40,45,50,55 * * * * /bin/test -x /opt/csw/bin/munin-cron && /opt/csw/bin/munin-cron - -(2) Edit the Apache configuration for Munin: - "Normal" mode: /etc/opt/csw/munin/apache/apache-munin.conf - CGI mode: /etc/opt/csw/munin/apache/apache-munin-cgi.conf - - (These files should work by default) - -(3) Add the following line to your Apache configuration: - - "Normal" mode: Include /etc/opt/csw/munin/apache/apache-munin.conf - CGI mode: Include /etc/opt/csw/munin/apache/apache-munin-cgi.conf - -(4) Add the user your webserver is running under (nobody for Apache) to - the group "munin" - -(5) Restart your webserver: - - svcadm restart cswapache2 - -======================================================================= - -EOF Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype 2011-04-03 15:37:36 UTC (rev 14062) +++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype 2011-04-03 15:57:23 UTC (rev 14063) @@ -43,7 +43,7 @@ f none /opt/csw/libexec/munin/munin-limits 0755 root bin f none /opt/csw/libexec/munin/munin-update 0755 root bin d none /opt/csw/share/doc/munin_master 0755 root bin -f none /opt/csw/share/doc/munin_master/README.CSW 0644 root bin +f cswpostmsg /opt/csw/share/doc/munin_master/README.CSW 0644 root bin f none /opt/csw/share/doc/munin_master/license 0644 root bin d none /opt/csw/share/man/man1 0755 root bin d none /opt/csw/share/man/man3 0755 root bin Modified: csw/mgar/pkg/munin/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/munin/trunk/files/README.CSW 2011-04-03 15:37:36 UTC (rev 14062) +++ csw/mgar/pkg/munin/trunk/files/README.CSW 2011-04-03 15:57:23 UTC (rev 14063) @@ -1,9 +1,25 @@ -To configure the Apache webserver you only need to include the file -/etc/opt/csw/munin/apache/apache-munin.conf into your Apache main -configuration: -Include /etc/opt/csw/munin/apache/apache-munin.conf +======================================================================= -If you want CGI support for Munin, include the file apache-munin-cgi.conf: +To get Munin running, please follow these steps: -Include /etc/opt/csw/munin/apache/apache-munin-cgi.conf +(1) Edit the Apache configuration for Munin: + "Normal" mode: /etc/opt/csw/munin/apache/apache-munin.conf + CGI mode: /etc/opt/csw/munin/apache/apache-munin-cgi.conf + + (These files should work by default) + +(2) Add the following line to your Apache configuration: + + "Normal" mode: Include /etc/opt/csw/munin/apache/apache-munin.conf + CGI mode: Include /etc/opt/csw/munin/apache/apache-munin-cgi.conf + +(3) Add the user your webserver is running under (nobody for Apache) to + the group "munin" + +(4) Restart your webserver: + + svcadm restart cswapache2 + +======================================================================= + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Apr 4 14:24:06 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 04 Apr 2011 12:24:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14064] csw/mgar/pkg/cpan Message-ID: Revision: 14064 http://gar.svn.sourceforge.net/gar/?rev=14064&view=rev Author: idogan23 Date: 2011-04-04 12:24:05 +0000 (Mon, 04 Apr 2011) Log Message: ----------- Net-UCP-Common: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-UCP-Common/ csw/mgar/pkg/cpan/Net-UCP-Common/branches/ csw/mgar/pkg/cpan/Net-UCP-Common/tags/ csw/mgar/pkg/cpan/Net-UCP-Common/trunk/ csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile csw/mgar/pkg/cpan/Net-UCP-Common/trunk/checksums csw/mgar/pkg/cpan/Net-UCP-Common/trunk/files/ csw/mgar/pkg/cpan/Net-UCP-Common/trunk/files/LICENSE Property changes on: csw/mgar/pkg/cpan/Net-UCP-Common/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile 2011-04-04 12:24:05 UTC (rev 14064) @@ -0,0 +1,24 @@ +NAME = Net-UCP-Common +VERSION = 0.05 +CATEGORIES = cpan +AUTHOR = NEMUX + +DESCRIPTION = Common Stuff for Net::UCP Module +define BLURB + Common Stuff for Net::UCP Module +endef + +PACKAGES = CSWpmnetucpcommon +CATALOGNAME = pm_netucpcommon + +CHECKPKG_OVERRIDES_CSWpmnetucpcommon += catalogname-does-not-match-pkgname|pkgname=CSWpmnetucpcommon|catalogname=pm_netucpcommon|expected-catalogname=pmnetucpcommon + +DISTFILES += LICENSE +ARCHALL = 1 + +post-install-modulated: + @ginstall -d $(DESTDIR)/opt/csw/share/doc/pm_netucpcommon + @ginstall -m 644 $(FILEDIR)/LICENSE $(DESTDIR)/opt/csw/share/doc/pm_netucpcommon/license + @$(MAKECOOKIE) + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-UCP-Common/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-UCP-Common/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-UCP-Common/trunk/checksums 2011-04-04 12:24:05 UTC (rev 14064) @@ -0,0 +1 @@ +fedc8f3bcf61d64bc9c3bf662b045074 Net-UCP-Common-0.05.tar.gz Added: csw/mgar/pkg/cpan/Net-UCP-Common/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/cpan/Net-UCP-Common/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/cpan/Net-UCP-Common/trunk/files/LICENSE 2011-04-04 12:24:05 UTC (rev 14064) @@ -0,0 +1,5 @@ +Copyright (C) 2008 by Marco Romano + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself, either Perl version 5.8.7 or, +at your option, any later version of Perl 5 you may have available. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Apr 4 15:19:55 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 04 Apr 2011 13:19:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[14065] csw/mgar/pkg/cpan Message-ID: Revision: 14065 http://gar.svn.sourceforge.net/gar/?rev=14065&view=rev Author: idogan23 Date: 2011-04-04 13:19:55 +0000 (Mon, 04 Apr 2011) Log Message: ----------- Net-UCP-IntTimeout: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-UCP-IntTimeout/ csw/mgar/pkg/cpan/Net-UCP-IntTimeout/branches/ csw/mgar/pkg/cpan/Net-UCP-IntTimeout/tags/ csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/ csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/Makefile csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/checksums csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/Makefile 2011-04-04 13:19:55 UTC (rev 14065) @@ -0,0 +1,23 @@ +NAME = Net-UCP-IntTimeout +VERSION = 0.05 +CATEGORIES = cpan +AUTHOR = NEMUX + +DESCRIPTION = Perl Timeout Manager for Net::UCP Module +define BLURB + Perl Timeout Manager for Net::UCP Module +endef + +PACKAGES = CSWpmnetucpinttimeout +CATALOGNAME = pm_netucpinttimeout + +CHECKPKG_OVERRIDES_CSWpmnetucpinttimeout += catalogname-does-not-match-pkgname|pkgname=CSWpmnetucpinttimeout|catalogname=pm_netucpinttimeout|expected-catalogname=pmnetucpinttimeout + +DISTFILES += LICENSE +ARCHALL = 1 + +post-install-modulated: + @ginstall -d $(DESTDIR)/opt/csw/share/doc/$(CATALOGNAME) + @ginstall -m 644 $(FILEDIR)/LICENSE $(DESTDIR)/opt/csw/share/doc/$(CATALOGNAME)/license + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/checksums 2011-04-04 13:19:55 UTC (rev 14065) @@ -0,0 +1 @@ +b73f4af7cbe18c4e8e556828a8d404f0 Net-UCP-IntTimeout-0.05.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 Mon Apr 4 15:32:22 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 04 Apr 2011 13:32:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14066] csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/files/ LICENSE Message-ID: Revision: 14066 http://gar.svn.sourceforge.net/gar/?rev=14066&view=rev Author: idogan23 Date: 2011-04-04 13:32:21 +0000 (Mon, 04 Apr 2011) Log Message: ----------- Net-UCP-IntTimeout: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/files/LICENSE Added: csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/files/LICENSE 2011-04-04 13:32:21 UTC (rev 14066) @@ -0,0 +1,5 @@ +Copyright (C) 2008 by Marco Romano + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself, either Perl version 5.8.7 or, +at your option, any later version of Perl 5 you may have available. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Apr 4 16:16:47 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 04 Apr 2011 14:16:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14067] csw/mgar/pkg/cpan Message-ID: Revision: 14067 http://gar.svn.sourceforge.net/gar/?rev=14067&view=rev Author: idogan23 Date: 2011-04-04 14:16:47 +0000 (Mon, 04 Apr 2011) Log Message: ----------- Net-UCP-TransactionManager: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-UCP-TransactionManager/ csw/mgar/pkg/cpan/Net-UCP-TransactionManager/branches/ csw/mgar/pkg/cpan/Net-UCP-TransactionManager/tags/ csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/ csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/Makefile csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/checksums csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/files/ csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/files/LICENSE Property changes on: csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/Makefile 2011-04-04 14:16:47 UTC (rev 14067) @@ -0,0 +1,23 @@ +NAME = Net-UCP-TransactionManager +VERSION = 0.02 +CATEGORIES = cpan +AUTHOR = NEMUX + +DESCRIPTION = Perl extension to manage UCP session transaction numbers +define BLURB + Perl extension to manage UCP session transaction numbers +endef + +PACKAGES = CSWpmnetucptransactionmanager +CATALOGNAME = pm_netucptransactionmanager + +CHECKPKG_OVERRIDES_CSWpmnetucptransactionmanager += catalogname-does-not-match-pkgname|pkgname=CSWpmnetucptransactionmanager|catalogname=pm_netucptransactionmanager|expected-catalogname=pmnetucptransactionmanager + +DISTFILES += LICENSE +ARCHALL = 1 + +post-install-modulated: + @ginstall -d $(DESTDIR)/opt/csw/share/doc/$(CATALOGNAME) + @ginstall -m 644 $(FILEDIR)/LICENSE $(DESTDIR)/opt/csw/share/doc/$(CATALOGNAME)/license + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/checksums 2011-04-04 14:16:47 UTC (rev 14067) @@ -0,0 +1 @@ +f5966ce505e36bbc92e28709df434b51 Net-UCP-TransactionManager-0.02.tar.gz Added: csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/files/LICENSE 2011-04-04 14:16:47 UTC (rev 14067) @@ -0,0 +1,5 @@ +Copyright (C) 2008 by Marco Romano + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself, either Perl version 5.8.7 or, +at your option, any later version of Perl 5 you may have available. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 4 17:26:33 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 04 Apr 2011 15:26:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14068] csw/mgar/pkg/cpan/Log-Log4perl/trunk Message-ID: Revision: 14068 http://gar.svn.sourceforge.net/gar/?rev=14068&view=rev Author: dmichelsen Date: 2011-04-04 15:26:32 +0000 (Mon, 04 Apr 2011) Log Message: ----------- cpan/Log-Log4perl: Update to 1.32 Modified Paths: -------------- csw/mgar/pkg/cpan/Log-Log4perl/trunk/Makefile csw/mgar/pkg/cpan/Log-Log4perl/trunk/checksums Modified: csw/mgar/pkg/cpan/Log-Log4perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Log4perl/trunk/Makefile 2011-04-04 14:16:47 UTC (rev 14067) +++ csw/mgar/pkg/cpan/Log-Log4perl/trunk/Makefile 2011-04-04 15:26:32 UTC (rev 14068) @@ -1,5 +1,5 @@ NAME = Log-Log4perl -VERSION = 1.25 +VERSION = 1.32 CATEGORIES = cpan AUTHOR = MSCHILLI @@ -10,9 +10,12 @@ Log4j logging package in pure Perl. endef -PACKAGES = CSWpmlog4perl -CATALOGNAME = pm_log4perl -ARCHALL = 1 LICENSE = LICENSE +PACKAGES += CSWpm-log-log4perl +CATALOGNAME = pm_log_log4perl +SPKG_DESC_CSWpm-log-log4perl = Log4j implementation for Perl +ARCHALL_CSWpm-log-log4perl = 1 +OBSOLETED_BY_CSWpm-log-log4perl = CSWpmlog4perl + include gar/category.mk Modified: csw/mgar/pkg/cpan/Log-Log4perl/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Log-Log4perl/trunk/checksums 2011-04-04 14:16:47 UTC (rev 14067) +++ csw/mgar/pkg/cpan/Log-Log4perl/trunk/checksums 2011-04-04 15:26:32 UTC (rev 14068) @@ -1 +1 @@ -d189f9c74b6811b2bc9d0c508041cd7a Log-Log4perl-1.25.tar.gz +a92ef7387e46923c14dc2020a00125ad Log-Log4perl-1.32.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 Mon Apr 4 17:35:42 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 04 Apr 2011 15:35:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14069] csw/mgar/pkg/findutils/trunk/Makefile Message-ID: Revision: 14069 http://gar.svn.sourceforge.net/gar/?rev=14069&view=rev Author: bdwalton Date: 2011-04-04 15:35:41 +0000 (Mon, 04 Apr 2011) Log Message: ----------- findutils/trunk: update deps for gettext library splitting Modified Paths: -------------- csw/mgar/pkg/findutils/trunk/Makefile Modified: csw/mgar/pkg/findutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/findutils/trunk/Makefile 2011-04-04 15:26:32 UTC (rev 14068) +++ csw/mgar/pkg/findutils/trunk/Makefile 2011-04-04 15:35:41 UTC (rev 14069) @@ -17,7 +17,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWfindutils.postinstall -RUNTIME_DEP_PKGS = CSWggettextrt +RUNTIME_DEP_PKGS = CSWlibintl8 # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Apr 4 17:41:03 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 04 Apr 2011 15:41:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14070] csw/mgar/pkg/findutils/trunk/Makefile Message-ID: Revision: 14070 http://gar.svn.sourceforge.net/gar/?rev=14070&view=rev Author: bdwalton Date: 2011-04-04 15:41:03 +0000 (Mon, 04 Apr 2011) Log Message: ----------- findutils/trunk: override file collisions with gnulinks. will be updated at the same time Modified Paths: -------------- csw/mgar/pkg/findutils/trunk/Makefile Modified: csw/mgar/pkg/findutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/findutils/trunk/Makefile 2011-04-04 15:35:41 UTC (rev 14069) +++ csw/mgar/pkg/findutils/trunk/Makefile 2011-04-04 15:41:03 UTC (rev 14070) @@ -13,6 +13,13 @@ arguments are lists of file names generated by `find'. endef +CHECKPKG_OVERRIDES_CSWfindutils += file-collision|/opt/csw/gnu/oldfind|CSWfindutils|CSWgnulinks +CHECKPKG_OVERRIDES_CSWfindutils += file-collision|/opt/csw/gnu/xargs|CSWfindutils|CSWgnulinks +CHECKPKG_OVERRIDES_CSWfindutils += file-collision|/opt/csw/gnu/find|CSWfindutils|CSWgnulinks +CHECKPKG_OVERRIDES_CSWfindutils += file-collision|/opt/csw/gnu/locate|CSWfindutils|CSWgnulinks +CHECKPKG_OVERRIDES_CSWfindutils += file-collision|/opt/csw/gnu/updatedb|CSWfindutils|CSWgnulinks + + MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWfindutils.postinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Mon Apr 4 17:41:16 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Mon, 04 Apr 2011 15:41:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[14071] csw/mgar/pkg/ruby-augeas/trunk/Makefile Message-ID: Revision: 14071 http://gar.svn.sourceforge.net/gar/?rev=14071&view=rev Author: phipsy Date: 2011-04-04 15:41:16 +0000 (Mon, 04 Apr 2011) Log Message: ----------- Updated for latest ruby dependencies Modified Paths: -------------- csw/mgar/pkg/ruby-augeas/trunk/Makefile Modified: csw/mgar/pkg/ruby-augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-04-04 15:41:03 UTC (rev 14070) +++ csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-04-04 15:41:16 UTC (rev 14071) @@ -13,10 +13,10 @@ PACKAGES = CSWrubyaugeas CATALOGNAME = ruby_augeas -RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWaugeas -RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWruby +RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWruby18 +RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWaugeas CHECKPKG_OVERRIDES_CSWrubyaugeas += catalogname-does-not-match-pkgname|pkgname=CSWrubyaugeas|catalogname=ruby_augeas|expected-catalogname=rubyaugeas -CHECKPKG_OVERRIDES_CSWrubyaugeas += missing-dependency|CSWlibruby1 +CHECKPKG_OVERRIDES_CSWrubyaugeas += missing-dependency|CSWruby BUILD_DEP_PKGS = CSWrake BUILD_SCRIPTS = 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 Apr 4 17:44:47 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 04 Apr 2011 15:44:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14072] csw/mgar/pkg/findutils/trunk Message-ID: Revision: 14072 http://gar.svn.sourceforge.net/gar/?rev=14072&view=rev Author: bdwalton Date: 2011-04-04 15:44:47 +0000 (Mon, 04 Apr 2011) Log Message: ----------- findutils/trunk: override usr/local reference in info file, provide release notes to that effect Modified Paths: -------------- csw/mgar/pkg/findutils/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/findutils/trunk/files/CSWfindutils.cswreleasenotes Modified: csw/mgar/pkg/findutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/findutils/trunk/Makefile 2011-04-04 15:41:16 UTC (rev 14071) +++ csw/mgar/pkg/findutils/trunk/Makefile 2011-04-04 15:44:47 UTC (rev 14072) @@ -13,6 +13,7 @@ arguments are lists of file names generated by `find'. endef +CHECKPKG_OVERRIDES_CSWfindutils += file-with-bad-content|/usr/local|root/opt/csw/share/info/find.info CHECKPKG_OVERRIDES_CSWfindutils += file-collision|/opt/csw/gnu/oldfind|CSWfindutils|CSWgnulinks CHECKPKG_OVERRIDES_CSWfindutils += file-collision|/opt/csw/gnu/xargs|CSWfindutils|CSWgnulinks CHECKPKG_OVERRIDES_CSWfindutils += file-collision|/opt/csw/gnu/find|CSWfindutils|CSWgnulinks @@ -23,6 +24,7 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWfindutils.postinstall +DISTFILES += CSWfindutils.cswreleasenotes RUNTIME_DEP_PKGS = CSWlibintl8 Added: csw/mgar/pkg/findutils/trunk/files/CSWfindutils.cswreleasenotes =================================================================== --- csw/mgar/pkg/findutils/trunk/files/CSWfindutils.cswreleasenotes (rev 0) +++ csw/mgar/pkg/findutils/trunk/files/CSWfindutils.cswreleasenotes 2011-04-04 15:44:47 UTC (rev 14072) @@ -0,0 +1 @@ +usr/local references in info file: ignore as they're just examples. \ 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 bdwalton at users.sourceforge.net Mon Apr 4 19:31:21 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 04 Apr 2011 17:31:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[14073] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 14073 http://gar.svn.sourceforge.net/gar/?rev=14073&view=rev Author: bdwalton Date: 2011-04-04 17:31:21 +0000 (Mon, 04 Apr 2011) Log Message: ----------- gnulinks/trunk: drop CSWfindutils again Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2011-04-04 15:44:47 UTC (rev 14072) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2011-04-04 17:31:21 UTC (rev 14073) @@ -4,7 +4,7 @@ VENDOR_URL = http://opencsw.org -GLINKPKGS = CSWbinutils CSWggetopt CSWgwhois CSWfindutils +GLINKPKGS = CSWbinutils CSWggetopt CSWgwhois BUILD_DEP_PKGS = $(GLINKPKGS) CSWpkgutil CSWbash DESCRIPTION = Creates native symlinks for GNU tools in /opt/csw/gnu This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Tue Apr 5 02:46:12 2011 From: bwalton at opencsw.org (Ben Walton) Date: Mon, 04 Apr 2011 20:46:12 -0400 Subject: [csw-devel] proposed GAR change for ruby-dublin Message-ID: <1301964276-sup-9917@pinkfloyd.chass.utoronto.ca> Hi All, I'm proposing the following change to the rbgems category to meet the ruby-dublin[1] proposal. An example package name is: CSWrb18-libxml-ruby-1-1-4 This represents the libxml-ruby gem at version 1.1.4 as built for ruby 1.8. Thanks -Ben Index: categories/rbgems/category.mk =================================================================== --- categories/rbgems/category.mk (revision 14039) +++ categories/rbgems/category.mk (working copy) @@ -9,15 +9,15 @@ GEMFILE ?= $(GEMNAME)-$(GEMVERSION).gem DISTFILES += $(GEMFILE) -GEMPKGNAME ?= $(GEMNAME) +GEMPKGNAME ?= $(GEMNAME)-$(subst .,-,$(GEMVERSION)) GEMCATALOGNAME ?= $(subst -,_,$(GEMPKGNAME)) # PACKAGES ?= CSWgem-$(GEMPKGNAME) CSWgem-$(GEMPKGNAME)-doc -PACKAGES ?= CSWgem-$(GEMPKGNAME) -CATALOGNAME_CSWgem-$(GEMPKGNAME) ?= gem_$(GEMCATALOGNAME) -CATALOGNAME_CSWgem-$(GEMPKGNAME)-doc ?= gem_$(GEMCATALOGNAME)_doc +PACKAGES ?= CSWrb18-$(GEMPKGNAME) +CATALOGNAME_CSWrb18-$(GEMPKGNAME) ?= gem_$(GEMCATALOGNAME) +CATALOGNAME_rb18-$(GEMPKGNAME)-doc ?= gem_$(GEMCATALOGNAME)_doc -SPKG_DESC_CSWgem-$(GEMPKGNAME)-doc ?= $(or $(SPKG_DESC_CSWgem-$(GEMPKGNAME)),$(SPKG_DESC)) documentation +SPKG_DESC_CSWrb18-$(GEMPKGNAME)-doc ?= $(or $(SPKG_DESC_CSWrb18-$(GEMPKGNAME)),$(SPKG_DESC)) documentation # RUNTIME_DEP_PKGS_CSWgem-$(GEMPKGNAME) ?= $(shell gem specification $(DOWNLOADDIR)/$(GEMFILE) | $(GARBIN)/gemdeps.rb) [1] http://wiki.opencsw.org/ruby-dublin -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bwalton at opencsw.org Tue Apr 5 02:52:33 2011 From: bwalton at opencsw.org (Ben Walton) Date: Mon, 04 Apr 2011 20:52:33 -0400 Subject: [csw-devel] proposed GAR change for ruby-dublin In-Reply-To: <1301964276-sup-9917@pinkfloyd.chass.utoronto.ca> References: <1301964276-sup-9917@pinkfloyd.chass.utoronto.ca> Message-ID: <1301964557-sup-2580@pinkfloyd.chass.utoronto.ca> Excerpts from Ben Walton's message of Mon Apr 04 20:46:12 -0400 2011: ...actually, a few more mods are required: Index: category.mk =================================================================== --- category.mk (revision 14039) +++ category.mk (working copy) @@ -9,15 +9,15 @@ GEMFILE ?= $(GEMNAME)-$(GEMVERSION).gem DISTFILES += $(GEMFILE) -GEMPKGNAME ?= $(GEMNAME) +GEMPKGNAME ?= $(GEMNAME)-$(subst .,-,$(GEMVERSION)) GEMCATALOGNAME ?= $(subst -,_,$(GEMPKGNAME)) # PACKAGES ?= CSWgem-$(GEMPKGNAME) CSWgem-$(GEMPKGNAME)-doc -PACKAGES ?= CSWgem-$(GEMPKGNAME) -CATALOGNAME_CSWgem-$(GEMPKGNAME) ?= gem_$(GEMCATALOGNAME) -CATALOGNAME_CSWgem-$(GEMPKGNAME)-doc ?= gem_$(GEMCATALOGNAME)_doc +PACKAGES ?= CSWrb18-$(GEMPKGNAME) +CATALOGNAME_CSWrb18-$(GEMPKGNAME) ?= rb18_$(GEMCATALOGNAME) +CATALOGNAME_rb18-$(GEMPKGNAME)-doc ?= rb18_$(GEMCATALOGNAME)_doc -SPKG_DESC_CSWgem-$(GEMPKGNAME)-doc ?= $(or $(SPKG_DESC_CSWgem-$(GEMPKGNAME)),$(SPKG_DESC)) documentation +SPKG_DESC_CSWrb18-$(GEMPKGNAME)-doc ?= $(or $(SPKG_DESC_CSWrb18-$(GEMPKGNAME)),$(SPKG_DESC)) documentation # RUNTIME_DEP_PKGS_CSWgem-$(GEMPKGNAME) ?= $(shell gem specification $(DOWNLOADDIR)/$(GEMFILE) | $(GARBIN)/gemdeps.rb) @@ -68,7 +68,7 @@ include gar/gar.mk # During the configure phase we check that all dependend modules are available -configure-check-gem-deps: GEM_DEPS?=$(addprefix CSWgem-,$(shell gem specification $(DOWNLOADDIR)/$(GEMFILE) | $(GARBIN)/gemdeps.rb)) +configure-check-gem-deps: GEM_DEPS?=$(addprefix CSWrb18-,$(shell gem specification $(DOWNLOADDIR)/$(GEMFILE) | $(GARBIN)/gemdeps.rb)) configure-check-gem-deps: @echo "=== Checking dependencies of GEM $(GEMFILE) ===" @$(GARBIN)/check_for_deps $(GEM_DEPS) -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From wahwah at users.sourceforge.net Tue Apr 5 11:44:29 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Apr 2011 09:44:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[14074] csw/mgar/pkg/gnome-base/gnome-keyring/trunk/ Makefile Message-ID: Revision: 14074 http://gar.svn.sourceforge.net/gar/?rev=14074&view=rev Author: wahwah Date: 2011-04-05 09:44:29 +0000 (Tue, 05 Apr 2011) Log Message: ----------- gnome-keyring: Split according to new rules. Modified Paths: -------------- csw/mgar/pkg/gnome-base/gnome-keyring/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/gnome-keyring/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/gnome-keyring/trunk/Makefile 2011-04-04 17:31:21 UTC (rev 14073) +++ csw/mgar/pkg/gnome-base/gnome-keyring/trunk/Makefile 2011-04-05 09:44:29 UTC (rev 14074) @@ -12,7 +12,6 @@ SPKG_SOURCEURL = http://live.gnome.org/GnomeKeyring MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(NAME)/$(GNOME_VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz CATALOGNAME_CSWgnomekeyring = gnomekeyring PACKAGES = CSWgnomekeyring CONFIGURE_ARGS = $(DIRPATHS) @@ -20,18 +19,75 @@ PATCHFILES += inttypes.patch PATCHFILES += inttypes-gck-rpc-module.c.patch STRIP_LIBTOOL = 1 -RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWfconfig -RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWftype2 -RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWgconf2 -RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWgcrypt -RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWggettextrt -RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWglib2 + +SPKG_DESC_CSWgnomekeyring = $(DESCRIPTION) + +PACKAGES += CSWlibgcr0 +CATALOGNAME_CSWlibgcr0 = libgcr0 +PKGFILES_CSWlibgcr0 += $(call baseisadirs,$(libdir),libgcr\.so\.0\.0\.0) +PKGFILES_CSWlibgcr0 += $(call baseisadirs,$(libdir),libgcr\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibgcr0 += Stores passwords and encryption keys in an encrypted file, libgcr.so.0 +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWlibgcr0 + +PACKAGES += CSWlibgnome-keyring0 +CATALOGNAME_CSWlibgnome-keyring0 = libgnome_keyring0 +PKGFILES_CSWlibgnome-keyring0 += $(call baseisadirs,$(libdir),libgnome-keyring\.so\.0\.1\.1) +PKGFILES_CSWlibgnome-keyring0 += $(call baseisadirs,$(libdir),libgnome-keyring\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibgnome-keyring0 += Stores passwords and encryption keys in an encrypted file, libgnome-keyring.so.0 +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWlibgnome-keyring0 +# Only needed for backward-compatibility reasons. +CHECKPKG_OVERRIDES_CSWgnomekeyring += surplus-dependency|CSWlibgnome-keyring0 + +PACKAGES += CSWlibgp11-0 +CATALOGNAME_CSWlibgp11-0 = libgp11_0 +PKGFILES_CSWlibgp11-0 += $(call baseisadirs,$(libdir),libgp11\.so\.0\.0\.0) +PKGFILES_CSWlibgp11-0 += $(call baseisadirs,$(libdir),libgp11\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibgp11-0 += Stores passwords and encryption keys in an encrypted file, libgp11.so.0 +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWlibgp11-0 + +PACKAGES += CSWgnomekeyring-dev +PKGFILES_CSWgnomekeyring-dev += $(libdir)/libgcr.so +PKGFILES_CSWgnomekeyring-dev += $(libdir)/libgnome-keyring.so +PKGFILES_CSWgnomekeyring-dev += $(libdir)/libgp11.so +PKGFILES_CSWgnomekeyring-dev += $(PKGFILES_DEVEL) +CATALOGNAME_CSWgnomekeyring-dev = gnomekeyring_dev +SPKG_DESC_CSWgnomekeyring-dev = Development files for gnome keyring + + RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWgpgerr RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWgtk2 +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWlibcairo +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWftype2 RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWlibatk -RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWlibcairo +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWpango +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWgcrypt RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWlibdbus -RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWlibtasn1 -RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWpango +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWgconf2 +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWfconfig +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWglib2 + +RUNTIME_DEP_PKGS_CSWlibgcr0 += CSWlibgp11-0 +RUNTIME_DEP_PKGS_CSWlibgcr0 += CSWgpgerr +RUNTIME_DEP_PKGS_CSWlibgcr0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgcr0 += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibgcr0 += CSWlibcairo +RUNTIME_DEP_PKGS_CSWlibgcr0 += CSWlibtasn1-3 +RUNTIME_DEP_PKGS_CSWlibgcr0 += CSWlibatk +RUNTIME_DEP_PKGS_CSWlibgcr0 += CSWpango +RUNTIME_DEP_PKGS_CSWlibgcr0 += CSWgcrypt +RUNTIME_DEP_PKGS_CSWlibgcr0 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibgcr0 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibgcr0 += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibgnome-keyring0 += CSWlibdbus +RUNTIME_DEP_PKGS_CSWlibgnome-keyring0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgnome-keyring0 += CSWglib2 +RUNTIME_DEP_PKGS_CSWgnomekeyring-dev += CSWlibgnome-keyring0 +RUNTIME_DEP_PKGS_CSWgnomekeyring-dev += CSWlibgp11-0 +RUNTIME_DEP_PKGS_CSWgnomekeyring-dev += CSWlibgcr0 +RUNTIME_DEP_PKGS_CSWlibgp11-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgp11-0 += CSWglib2 +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWlibtasn1-3 + 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 Apr 5 12:31:53 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Apr 2011 10:31:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[14075] csw/mgar/pkg/gnome-base/gnome-keyring/trunk/ Makefile Message-ID: Revision: 14075 http://gar.svn.sourceforge.net/gar/?rev=14075&view=rev Author: wahwah Date: 2011-04-05 10:31:52 +0000 (Tue, 05 Apr 2011) Log Message: ----------- pkg/gnome-base/gnome-keyring/trunk: separate Solaris 10 build Modified Paths: -------------- csw/mgar/pkg/gnome-base/gnome-keyring/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/gnome-keyring/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/gnome-keyring/trunk/Makefile 2011-04-05 09:44:29 UTC (rev 14074) +++ csw/mgar/pkg/gnome-base/gnome-keyring/trunk/Makefile 2011-04-05 10:31:52 UTC (rev 14075) @@ -90,4 +90,8 @@ RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWlibtasn1-3 +# HAVE_GETPEERUCRED is available on Solaris 10 but not on 9 +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + include gar/category.mk 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 Apr 5 16:29:07 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 05 Apr 2011 14:29:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[14076] csw/mgar/pkg/cpan Message-ID: Revision: 14076 http://gar.svn.sourceforge.net/gar/?rev=14076&view=rev Author: idogan23 Date: 2011-04-05 14:29:06 +0000 (Tue, 05 Apr 2011) Log Message: ----------- Net-UCP: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-UCP/ csw/mgar/pkg/cpan/Net-UCP/branches/ csw/mgar/pkg/cpan/Net-UCP/tags/ csw/mgar/pkg/cpan/Net-UCP/trunk/ csw/mgar/pkg/cpan/Net-UCP/trunk/Makefile csw/mgar/pkg/cpan/Net-UCP/trunk/checksums csw/mgar/pkg/cpan/Net-UCP/trunk/files/ csw/mgar/pkg/cpan/Net-UCP/trunk/files/LICENSE Property changes on: csw/mgar/pkg/cpan/Net-UCP/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-UCP/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-UCP/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-UCP/trunk/Makefile 2011-04-05 14:29:06 UTC (rev 14076) @@ -0,0 +1,27 @@ +NAME = Net-UCP +VERSION = 0.41 +CATEGORIES = cpan +AUTHOR = NEMUX + +DESCRIPTION = Perl extension for EMI UCP Protocol +define BLURB + Perl extension for EMI - UCP Protocol +endef + +MODDIST = $(NAME)-$(VERSION).tgz + +PACKAGES = CSWpmnetucp +CATALOGNAME = pm_netucp + +CHECKPKG_OVERRIDES_CSWpmnetucp += catalogname-does-not-match-pkgname|pkgname=CSWpmnetucp|catalogname=pm_netucp|expected-catalogname=pmnetucp + +DISTFILES += LICENSE +ARCHALL = 1 + +LICENSE = LICENSE + +RUNTIME_DEP_PKGS_CSWpmnetucp = CSWpmnetucpcommon +RUNTIME_DEP_PKGS_CSWpmnetucp = CSWpmnetucpinttimeout +RUNTIME_DEP_PKGS_CSWpmnetucp = CSWpmnetucptransactionmanager + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-UCP/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-UCP/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-UCP/trunk/checksums 2011-04-05 14:29:06 UTC (rev 14076) @@ -0,0 +1 @@ +9140c11d32148866c32bed2e8af0a52f Net-UCP-0.41.tgz Added: csw/mgar/pkg/cpan/Net-UCP/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/cpan/Net-UCP/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/cpan/Net-UCP/trunk/files/LICENSE 2011-04-05 14:29:06 UTC (rev 14076) @@ -0,0 +1,5 @@ +Copyright (C) 2008 by Marco Romano + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself, either Perl version 5.8.7 or, +at your option, any later version of Perl 5 you may have available. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Tue Apr 5 19:09:52 2011 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Tue, 05 Apr 2011 17:09:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[14077] csw/mgar/pkg/munin/trunk Message-ID: Revision: 14077 http://gar.svn.sourceforge.net/gar/?rev=14077&view=rev Author: j_arndt Date: 2011-04-05 17:09:52 +0000 (Tue, 05 Apr 2011) Log Message: ----------- munin: added new plugins, minor fixes Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2011-04-05 14:29:06 UTC (rev 14076) +++ csw/mgar/pkg/munin/trunk/Makefile 2011-04-05 17:09:52 UTC (rev 14077) @@ -13,9 +13,10 @@ SF_PROJ = munin MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += cswmuninnode +DISTFILES += CSWmuninnode.prototype +DISTFILES += CSWmunincommon.prototype DISTFILES += CSWmuninmaster.prototype -DISTFILES += CSWmuninnode.prototype cswmuninnode -DISTFILES += CSWmunincommon.prototype DISTFILES += cswusergroup DISTFILES += apache-munin.conf.CSW apache-munin-cgi.conf.CSW DISTFILES += README.CSW @@ -47,6 +48,8 @@ ARCHALL_CSWmuninnode = 1 ARCHALL_CSWmunincommon = 1 +RUNTIME_DEP_PKGS_CSWmuincommon = CSWperl + RUNTIME_DEP_PKGS_CSWmuninmaster = CSWperl CSWpmhtmltmpl CSWpmprmsvldt CSWpmlog4perl CSWmunincommon RUNTIME_DEP_PKGS_CSWmuninmaster += CSWpm-rrdtool CSWapache2 RUNTIME_DEP_PKGS_CSWmuninmaster += CSWcswclassutils CSWcas-cptemplates CSWcas-crontab CSWcas-postmsg @@ -56,7 +59,7 @@ RUNTIME_DEP_PKGS_CSWmuninnode += CSWperl CSWpmnetssleay -SPKG_CLASSES_CSWmuninmaster = none cswusergroup cswcrontab cswcptemplates ugfiles cswpostmsg +SPKG_CLASSES_CSWmuninmaster = none cswusergroup ugfiles cswcrontab cswcptemplates cswpostmsg SPKG_CLASSES_CSWmuninnode = none cswusergroup ugfiles cswcptemplates cswinitsmf SPKG_CLASSES_CSWmunincommon = none @@ -107,11 +110,11 @@ @# create init script / smf -> cswinitsmf @# @ginstall -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall -m 755 $(FILEDIR)/cswmuninnode $(DESTDIR)/etc/opt/csw/init.d/cswmuninnode + @ginstall -m 644 $(FILEDIR)/cswmuninnode $(DESTDIR)/etc/opt/csw/init.d/cswmuninnode @# @# create crontab for user munin -> cswcrontab @# - @ginstall -d 755 $(DESTDIR)/etc/opt/csw/pkg/CSWmuninmaster/crontabs + @ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWmuninmaster/crontabs @ginstall -m 644 $(FILEDIR)/crontab.munin $(DESTDIR)/etc/opt/csw/pkg/CSWmuninmaster/crontabs/munin @# @# print a postmessage -> cswpostmessage Modified: csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype 2011-04-05 14:29:06 UTC (rev 14076) +++ csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype 2011-04-05 17:09:52 UTC (rev 14077) @@ -5,6 +5,7 @@ f none /opt/csw/share/man/man3/Munin::Common::TLSClient.3perl 0444 root bin f none /opt/csw/share/man/man3/Munin::Common::TLSServer.3perl 0444 root bin f none /opt/csw/share/man/man3/Munin::Common::Timeout.3perl 0444 root bin +d none /opt/csw/share/perl/site_perl/Munin 0755 root bin d none /opt/csw/share/perl/site_perl/Munin/Common 0755 root bin f none /opt/csw/share/perl/site_perl/Munin/Common/Config.pm 0444 root bin f none /opt/csw/share/perl/site_perl/Munin/Common/Defaults.pm 0444 root bin Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype 2011-04-05 14:29:06 UTC (rev 14076) +++ csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype 2011-04-05 17:09:52 UTC (rev 14077) @@ -50,6 +50,10 @@ f none /opt/csw/libexec/munin/plugins/foldingathome 0755 root bin f none /opt/csw/libexec/munin/plugins/foldingathome_rank 0755 root bin f none /opt/csw/libexec/munin/plugins/foldingathome_wu 0755 root bin +f none /opt/csw/libexec/munin/plugins/freeradius_acct 0755 root bin +f none /opt/csw/libexec/munin/plugins/freeradius_auth 0755 root bin +f none /opt/csw/libexec/munin/plugins/freeradius_proxy_acct 0755 root bin +f none /opt/csw/libexec/munin/plugins/freeradius_proxy_auth 0755 root bin f none /opt/csw/libexec/munin/plugins/haproxy_ 0755 root bin f none /opt/csw/libexec/munin/plugins/hddtemp 0755 root bin f none /opt/csw/libexec/munin/plugins/hddtemp2 0755 root bin @@ -80,6 +84,7 @@ f none /opt/csw/libexec/munin/plugins/multigraph_tester 0755 root bin f none /opt/csw/libexec/munin/plugins/multiping 0755 root bin f none /opt/csw/libexec/munin/plugins/multips 0755 root bin +f none /opt/csw/libexec/munin/plugins/multips_memory 0755 root bin f none /opt/csw/libexec/munin/plugins/munin_stats 0755 root bin f none /opt/csw/libexec/munin/plugins/munin_update 0755 root bin f none /opt/csw/libexec/munin/plugins/mysql_ 0755 root bin @@ -110,8 +115,8 @@ f none /opt/csw/libexec/munin/plugins/paging_out 0755 root bin f none /opt/csw/libexec/munin/plugins/perdition 0755 root bin f none /opt/csw/libexec/munin/plugins/ping_ 0755 root bin -f none /opt/csw/libexec/munin/plugins/plugin.sh 0644 root bin -f none /opt/csw/libexec/munin/plugins/plugins.history 0644 root bin +f none /opt/csw/libexec/munin/plugins/plugin.sh 0755 root bin +f none /opt/csw/libexec/munin/plugins/plugins.history 0755 root bin f none /opt/csw/libexec/munin/plugins/pm3users_ 0755 root bin f none /opt/csw/libexec/munin/plugins/pop_stats 0755 root bin f none /opt/csw/libexec/munin/plugins/postfix_mailqueue 0755 root bin @@ -131,6 +136,7 @@ f none /opt/csw/libexec/munin/plugins/postgres_users 0755 root bin f none /opt/csw/libexec/munin/plugins/postgres_xlog 0755 root bin f none /opt/csw/libexec/munin/plugins/processes 0755 root bin +f none /opt/csw/libexec/munin/plugins/proxy_plugin 0755 root bin f none /opt/csw/libexec/munin/plugins/ps_ 0755 root bin f none /opt/csw/libexec/munin/plugins/psu_ 0755 root bin f none /opt/csw/libexec/munin/plugins/qmailqstat 0755 root bin @@ -228,8 +234,6 @@ f none /opt/csw/share/man/man3/Munin::Plugin::SNMP.3perl 0444 root bin d none /opt/csw/share/man/man5 0755 root bin f none /opt/csw/share/man/man5/munin-node.conf.5 0644 root bin -d none /opt/csw/share/man/man8 0755 root bin -f none /opt/csw/share/man/man8/munin.8 0644 root bin d none /opt/csw/share/munin 0755 root bin d none /opt/csw/share/perl 0755 root bin d none /opt/csw/share/perl/site_perl 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Tue Apr 5 21:05:13 2011 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Tue, 05 Apr 2011 19:05:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14078] csw/mgar/pkg/munin/trunk Message-ID: Revision: 14078 http://gar.svn.sourceforge.net/gar/?rev=14078&view=rev Author: j_arndt Date: 2011-04-05 19:05:13 +0000 (Tue, 05 Apr 2011) Log Message: ----------- munin: minor fixes in prototypes Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2011-04-05 17:09:52 UTC (rev 14077) +++ csw/mgar/pkg/munin/trunk/Makefile 2011-04-05 19:05:13 UTC (rev 14078) @@ -100,6 +100,8 @@ @ginstall -m 644 $(FILEDIR)/apache-munin-cgi.conf.CSW $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/apache/apache-munin-cgi.conf @mv $(DESTDIR)/var/opt/csw/munin/www/.htaccess $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/var/opt/csw/munin/www/ @# + @mv $(DESTDIR)/etc/opt/csw/munin/templates $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin + @# @# create user munin during package deployment -> cswusergroup @# @ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWmuninmaster Modified: csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype 2011-04-05 17:09:52 UTC (rev 14077) +++ csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype 2011-04-05 19:05:13 UTC (rev 14078) @@ -13,3 +13,5 @@ f none /opt/csw/share/perl/site_perl/Munin/Common/TLSClient.pm 0444 root bin f none /opt/csw/share/perl/site_perl/Munin/Common/TLSServer.pm 0444 root bin f none /opt/csw/share/perl/site_perl/Munin/Common/Timeout.pm 0444 root bin +d none /opt/csw/share/doc/munin_common 0755 root bin +f none /opt/csw/share/doc/munin_common/license 0644 root bin Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype 2011-04-05 17:09:52 UTC (rev 14077) +++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype 2011-04-05 19:05:13 UTC (rev 14078) @@ -1,5 +1,9 @@ d none /etc/opt/csw/munin 0755 root bin d none /etc/opt/csw/munin/apache 0755 root bin +d none /opt/csw/etc/templates/CSWmuninmaster 0755 root bin +d none /opt/csw/etc/templates/CSWmuninmaster/etc 0755 root bin +d none /opt/csw/etc/templates/CSWmuninmaster/etc/opt 0755 root bin +d none /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw 0755 root bin d none /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin 0755 root bin d none /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/apache 0755 root bin d none /opt/csw/etc/templates/CSWmuninmaster/var/opt/csw/munin/www 0755 root bin @@ -9,28 +13,30 @@ f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/munin.conf 0644 root bin d none /etc/opt/csw/munin/plugin-conf.d 0755 root bin d ugfiles /etc/opt/csw/munin/templates 0755 munin munin -f none /etc/opt/csw/munin/templates/definitions.html 0644 root bin -f none /etc/opt/csw/munin/templates/favicon.ico 0644 root bin -f none /etc/opt/csw/munin/templates/logo-h.png 0644 root bin -f none /etc/opt/csw/munin/templates/logo.png 0644 root bin -f none /etc/opt/csw/munin/templates/munin-comparison-day.tmpl 0644 root bin -f none /etc/opt/csw/munin/templates/munin-comparison-month.tmpl 0644 root bin -f none /etc/opt/csw/munin/templates/munin-comparison-week.tmpl 0644 root bin -f none /etc/opt/csw/munin/templates/munin-comparison-year.tmpl 0644 root bin -f none /etc/opt/csw/munin/templates/munin-domainview.tmpl 0644 root bin -f none /etc/opt/csw/munin/templates/munin-nodeview.tmpl 0644 root bin -f none /etc/opt/csw/munin/templates/munin-overview.tmpl 0644 root bin -f none /etc/opt/csw/munin/templates/munin-serviceview.tmpl 0644 root bin +d none /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates 0755 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/definitions.html 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/favicon.ico 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/logo-h.png 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/logo.png 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/munin-comparison-day.tmpl 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/munin-comparison-month.tmpl 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/munin-comparison-week.tmpl 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/munin-comparison-year.tmpl 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/munin-domainview.tmpl 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/munin-nodeview.tmpl 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/munin-overview.tmpl 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/munin-serviceview.tmpl 0644 root bin d none /etc/opt/csw/munin/templates/partial 0755 root bin -f none /etc/opt/csw/munin/templates/partial/bottom_navigation.tmpl 0644 root bin -f none /etc/opt/csw/munin/templates/partial/generated_by.tmpl 0644 root bin -f none /etc/opt/csw/munin/templates/partial/head.tmpl 0644 root bin -f none /etc/opt/csw/munin/templates/partial/logo_navigation.tmpl 0644 root bin -f none /etc/opt/csw/munin/templates/partial/logo_navigation_comparison.tmpl 0644 root bin -f none /etc/opt/csw/munin/templates/partial/logo_path.tmpl 0644 root bin -f none /etc/opt/csw/munin/templates/partial/path.tmpl 0644 root bin -f none /etc/opt/csw/munin/templates/style-1.2.css 0644 root bin -f none /etc/opt/csw/munin/templates/style.css 0644 root bin +d none /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/partial 0755 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/partial/bottom_navigation.tmpl 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/partial/generated_by.tmpl 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/partial/head.tmpl 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/partial/logo_navigation.tmpl 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/partial/logo_navigation_comparison.tmpl 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/partial/logo_path.tmpl 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/partial/path.tmpl 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/style-1.2.css 0644 root bin +f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/templates/style.css 0644 root bin f none /opt/csw/bin/munin-check 0755 root bin f none /opt/csw/bin/munin-cron 0755 root bin d none /opt/csw/etc/pkg 0755 root bin @@ -99,6 +105,11 @@ d ugfiles /var/opt/csw/munin/log 0755 munin munin d ugfiles /var/opt/csw/munin/run 0755 munin munin d ugfiles /var/opt/csw/munin/www 0755 munin munin +d none /opt/csw/etc/templates/CSWmuninmaster/var 0755 root bin +d none /opt/csw/etc/templates/CSWmuninmaster/var/opt 0755 root bin +d none /opt/csw/etc/templates/CSWmuninmaster/var/opt/csw 0755 root bin +d none /opt/csw/etc/templates/CSWmuninmaster/var/opt/csw/munin 0755 root bin +d none /opt/csw/etc/templates/CSWmuninmaster/var/opt/csw/munin/www 0755 root bin f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/var/opt/csw/munin/www/.htaccess 0644 munin munin d none /etc/opt/csw/pkg/CSWmuninmaster/crontabs 0755 root bin f cswcrontab /etc/opt/csw/pkg/CSWmuninmaster/crontabs/munin 0644 root bin Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype 2011-04-05 17:09:52 UTC (rev 14077) +++ csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype 2011-04-05 19:05:13 UTC (rev 14078) @@ -1,6 +1,10 @@ d none /etc/opt/csw/init.d 0755 root bin f cswinitsmf /etc/opt/csw/init.d/cswmuninnode 0755 root bin d none /etc/opt/csw/munin 0755 root bin +d none /opt/csw/etc/templates/CSWmuninnode 0755 root bin +d none /opt/csw/etc/templates/CSWmuninnode/etc 0755 root bin +d none /opt/csw/etc/templates/CSWmuninnode/etc/opt 0755 root bin +d none /opt/csw/etc/templates/CSWmuninnode/etc/opt/csw 0755 root bin d none /opt/csw/etc/templates/CSWmuninnode/etc/opt/csw/munin 0755 root bin f cswcptemplates /opt/csw/etc/templates/CSWmuninnode/etc/opt/csw/munin/munin-node.conf 0644 root bin d none /etc/opt/csw/munin/plugin-conf.d 0755 root bin 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 Apr 6 01:55:00 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 05 Apr 2011 23:55:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14079] csw/mgar/gar/v2/categories/rbgems/category.mk Message-ID: Revision: 14079 http://gar.svn.sourceforge.net/gar/?rev=14079&view=rev Author: bdwalton Date: 2011-04-05 23:55:00 +0000 (Tue, 05 Apr 2011) Log Message: ----------- update rbgems catageory to match ruby-dublin specs Modified Paths: -------------- csw/mgar/gar/v2/categories/rbgems/category.mk Modified: csw/mgar/gar/v2/categories/rbgems/category.mk =================================================================== --- csw/mgar/gar/v2/categories/rbgems/category.mk 2011-04-05 19:05:13 UTC (rev 14078) +++ csw/mgar/gar/v2/categories/rbgems/category.mk 2011-04-05 23:55:00 UTC (rev 14079) @@ -9,15 +9,15 @@ GEMFILE ?= $(GEMNAME)-$(GEMVERSION).gem DISTFILES += $(GEMFILE) -GEMPKGNAME ?= $(GEMNAME) +GEMPKGNAME ?= $(GEMNAME)-$(subst .,-,$(GEMVERSION)) GEMCATALOGNAME ?= $(subst -,_,$(GEMPKGNAME)) # PACKAGES ?= CSWgem-$(GEMPKGNAME) CSWgem-$(GEMPKGNAME)-doc -PACKAGES ?= CSWgem-$(GEMPKGNAME) -CATALOGNAME_CSWgem-$(GEMPKGNAME) ?= gem_$(GEMCATALOGNAME) -CATALOGNAME_CSWgem-$(GEMPKGNAME)-doc ?= gem_$(GEMCATALOGNAME)_doc +PACKAGES ?= CSWrb18-$(GEMPKGNAME) +CATALOGNAME_CSWrb18-$(GEMPKGNAME) ?= rb18_$(GEMCATALOGNAME) +CATALOGNAME_rb18-$(GEMPKGNAME)-doc ?= rb18_$(GEMCATALOGNAME)_doc -SPKG_DESC_CSWgem-$(GEMPKGNAME)-doc ?= $(or $(SPKG_DESC_CSWgem-$(GEMPKGNAME)),$(SPKG_DESC)) documentation +SPKG_DESC_CSWrb18-$(GEMPKGNAME)-doc ?= $(or $(SPKG_DESC_CSWrb18-$(GEMPKGNAME)),$(SPKG_DESC)) documentation # RUNTIME_DEP_PKGS_CSWgem-$(GEMPKGNAME) ?= $(shell gem specification $(DOWNLOADDIR)/$(GEMFILE) | $(GARBIN)/gemdeps.rb) @@ -68,7 +68,7 @@ include gar/gar.mk # During the configure phase we check that all dependend modules are available -configure-check-gem-deps: GEM_DEPS?=$(addprefix CSWgem-,$(shell gem specification $(DOWNLOADDIR)/$(GEMFILE) | $(GARBIN)/gemdeps.rb)) +configure-check-gem-deps: GEM_DEPS?=$(addprefix CSWrb18-,$(shell gem specification $(DOWNLOADDIR)/$(GEMFILE) | $(GARBIN)/gemdeps.rb)) configure-check-gem-deps: @echo "=== Checking dependencies of GEM $(GEMFILE) ===" @$(GARBIN)/check_for_deps $(GEM_DEPS) 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 Apr 6 03:27:19 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 06 Apr 2011 01:27:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[14080] csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile Message-ID: Revision: 14080 http://gar.svn.sourceforge.net/gar/?rev=14080&view=rev Author: bdwalton Date: 2011-04-06 01:27:19 +0000 (Wed, 06 Apr 2011) Log Message: ----------- rbgems/libxml-ruby/trunk: update checkpkg overrides for new naming convention Modified Paths: -------------- csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile Modified: csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile 2011-04-05 23:55:00 UTC (rev 14079) +++ csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile 2011-04-06 01:27:19 UTC (rev 14080) @@ -14,11 +14,9 @@ LICENSE = LICENSE -CHECKPKG_OVERRIDES_CSWgem-libxml-ruby += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/ext/mingw/build.rake -CHECKPKG_OVERRIDES_CSWgem-libxml-ruby += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/ext/libxml/extconf.rb -CHECKPKG_OVERRIDES_CSWgem-libxml-ruby += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/ext/libxml/libxml_ruby.so -CHECKPKG_OVERRIDES_CSWgem-libxml-ruby += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/ext/libxml/Makefile -CHECKPKG_OVERRIDES_CSWgem-libxml-ruby += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/lib/libxml_ruby.so -CHECKPKG_OVERRIDES_CSWgem-libxml-ruby += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/doc/libxml-ruby-1.1.4/rdoc/ext/libxml/Makefile.html +CHECKPKG_OVERRIDES_CSWrb18-libxml-ruby-1-1-4 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/ext/libxml/extconf.rb +CHECKPKG_OVERRIDES_CSWrb18-libxml-ruby-1-1-4 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/ext/libxml/Makefile +CHECKPKG_OVERRIDES_CSWrb18-libxml-ruby-1-1-4 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/ext/mingw/build.rake +CHECKPKG_OVERRIDES_CSWrb18-libxml-ruby-1-1-4 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/doc/libxml-ruby-1.1.4/rdoc/ext/libxml/Makefile.html 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 Wed Apr 6 03:29:35 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 06 Apr 2011 01:29:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14081] csw/mgar/gar/v2/categories/rbgems/category.mk Message-ID: Revision: 14081 http://gar.svn.sourceforge.net/gar/?rev=14081&view=rev Author: bdwalton Date: 2011-04-06 01:29:35 +0000 (Wed, 06 Apr 2011) Log Message: ----------- .buildsys/v2/categories/rbgems: ensure we strip binary objects in the gem install directory Modified Paths: -------------- csw/mgar/gar/v2/categories/rbgems/category.mk Modified: csw/mgar/gar/v2/categories/rbgems/category.mk =================================================================== --- csw/mgar/gar/v2/categories/rbgems/category.mk 2011-04-06 01:27:19 UTC (rev 14080) +++ csw/mgar/gar/v2/categories/rbgems/category.mk 2011-04-06 01:29:35 UTC (rev 14081) @@ -54,6 +54,8 @@ TEST_SCRIPTS ?= INSTALL_SCRIPTS ?= rbgem +STRIP_DIRS ?= $(shell for f in `find $(DESTDIR)$(GEMDIR) -name '*so'`; do dirname $$f; done) + # Allow splitting of documentation automatically PKGFILES_CSWgem-$(GEMPKGNAME)-doc ?= $(GEMDIR)/doc/.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Apr 6 03:31:32 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 06 Apr 2011 01:31:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[14082] csw/mgar/gar/v2/categories/rbgems/category.mk Message-ID: Revision: 14082 http://gar.svn.sourceforge.net/gar/?rev=14082&view=rev Author: bdwalton Date: 2011-04-06 01:31:32 +0000 (Wed, 06 Apr 2011) Log Message: ----------- .buildsys/v2/categories/rbgems: correct a typo in setting catalogname for the -doc subpkg in a gem and update the pkgfiles split for the -doc subpkg Modified Paths: -------------- csw/mgar/gar/v2/categories/rbgems/category.mk Modified: csw/mgar/gar/v2/categories/rbgems/category.mk =================================================================== --- csw/mgar/gar/v2/categories/rbgems/category.mk 2011-04-06 01:29:35 UTC (rev 14081) +++ csw/mgar/gar/v2/categories/rbgems/category.mk 2011-04-06 01:31:32 UTC (rev 14082) @@ -15,7 +15,7 @@ # PACKAGES ?= CSWgem-$(GEMPKGNAME) CSWgem-$(GEMPKGNAME)-doc PACKAGES ?= CSWrb18-$(GEMPKGNAME) CATALOGNAME_CSWrb18-$(GEMPKGNAME) ?= rb18_$(GEMCATALOGNAME) -CATALOGNAME_rb18-$(GEMPKGNAME)-doc ?= rb18_$(GEMCATALOGNAME)_doc +CATALOGNAME_CSWrb18-$(GEMPKGNAME)-doc ?= rb18_$(GEMCATALOGNAME)_doc SPKG_DESC_CSWrb18-$(GEMPKGNAME)-doc ?= $(or $(SPKG_DESC_CSWrb18-$(GEMPKGNAME)),$(SPKG_DESC)) documentation @@ -57,7 +57,7 @@ STRIP_DIRS ?= $(shell for f in `find $(DESTDIR)$(GEMDIR) -name '*so'`; do dirname $$f; done) # Allow splitting of documentation automatically -PKGFILES_CSWgem-$(GEMPKGNAME)-doc ?= $(GEMDIR)/doc/.* +PKGFILES_CSWrb18-$(GEMPKGNAME)-doc ?= $(GEMDIR)/doc/.* gem-extract-%: @echo " ==> Decompressing $(DOWNLOADDIR)/$*" 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 Apr 6 03:45:24 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 06 Apr 2011 01:45:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[14083] csw/mgar/pkg/rbgems/libxml-ruby/trunk Message-ID: Revision: 14083 http://gar.svn.sourceforge.net/gar/?rev=14083&view=rev Author: bdwalton Date: 2011-04-06 01:45:24 +0000 (Wed, 06 Apr 2011) Log Message: ----------- rbgems/libxml-ruby/trunk: change GEMNAME (remove -ruby); update checkpkg overrides; add release notes Modified Paths: -------------- csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/rbgems/libxml-ruby/trunk/files/CSWrb18-libxml-1-1-4.cswreleasenotes Modified: csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile 2011-04-06 01:31:32 UTC (rev 14082) +++ csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile 2011-04-06 01:45:24 UTC (rev 14083) @@ -2,21 +2,28 @@ VERSION = 1.1.4 CATEGORIES = rbgems +# we don't want -ruby in the name of the gem, so we override GEMNAME. +# doing that forces us to also override the default GEMFILE. +GEMNAME = libxml +GEMFILE = $(NAME)-$(GEMVERSION).gem + DESCRIPTION = Ruby libxml bindings define BLURB The Libxml-Ruby project provides Ruby language bindings for the GNOMELibxml2 XML tolkit. It is fre software, released under the MITLicense. Libxml-ruby's primary advantage over REXML is performance -if sped is your ned, these are god libraries to consider, asdemonstrated by the informal benchmark below. endef +DISTFILES += CSWrb18-libxml-1-1-4.cswreleasenotes + RUNTIME_DEP_PKGS = CSWiconv CSWlibruby18-1 CSWlibxml2-2 CSWzlib GEM_BUILD_FLAGS += --with-xml2-config=$(bindir)/xml2-config LICENSE = LICENSE -CHECKPKG_OVERRIDES_CSWrb18-libxml-ruby-1-1-4 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/ext/libxml/extconf.rb -CHECKPKG_OVERRIDES_CSWrb18-libxml-ruby-1-1-4 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/ext/libxml/Makefile -CHECKPKG_OVERRIDES_CSWrb18-libxml-ruby-1-1-4 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/ext/mingw/build.rake -CHECKPKG_OVERRIDES_CSWrb18-libxml-ruby-1-1-4 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/doc/libxml-ruby-1.1.4/rdoc/ext/libxml/Makefile.html +CHECKPKG_OVERRIDES_CSWrb18-libxml-1-1-4 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/ext/mingw/build.rake +CHECKPKG_OVERRIDES_CSWrb18-libxml-1-1-4 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/ext/libxml/extconf.rb +CHECKPKG_OVERRIDES_CSWrb18-libxml-1-1-4 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/libxml-ruby-1.1.4/ext/libxml/Makefile +CHECKPKG_OVERRIDES_CSWrb18-libxml-1-1-4 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/doc/libxml-ruby-1.1.4/rdoc/ext/libxml/Makefile.html include gar/category.mk Added: csw/mgar/pkg/rbgems/libxml-ruby/trunk/files/CSWrb18-libxml-1-1-4.cswreleasenotes =================================================================== --- csw/mgar/pkg/rbgems/libxml-ruby/trunk/files/CSWrb18-libxml-1-1-4.cswreleasenotes (rev 0) +++ csw/mgar/pkg/rbgems/libxml-ruby/trunk/files/CSWrb18-libxml-1-1-4.cswreleasenotes 2011-04-06 01:45:24 UTC (rev 14083) @@ -0,0 +1,2 @@ +Overridden usr/local references: + These are mostly in the build scripts, etc. 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 Apr 6 10:18:01 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Apr 2011 08:18:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14084] csw/mgar/pkg/rbgems Message-ID: Revision: 14084 http://gar.svn.sourceforge.net/gar/?rev=14084&view=rev Author: dmichelsen Date: 2011-04-06 08:18:01 +0000 (Wed, 06 Apr 2011) Log Message: ----------- rbgems/parallel-forkmanager: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/parallel-forkmanager/ csw/mgar/pkg/rbgems/parallel-forkmanager/Makefile csw/mgar/pkg/rbgems/parallel-forkmanager/branches/ csw/mgar/pkg/rbgems/parallel-forkmanager/tags/ csw/mgar/pkg/rbgems/parallel-forkmanager/trunk/ csw/mgar/pkg/rbgems/parallel-forkmanager/trunk/Makefile csw/mgar/pkg/rbgems/parallel-forkmanager/trunk/checksums csw/mgar/pkg/rbgems/parallel-forkmanager/trunk/files/ csw/mgar/pkg/rbgems/parallel-forkmanager/trunk/files/COPYING Copied: csw/mgar/pkg/rbgems/parallel-forkmanager/Makefile (from rev 14083, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/rbgems/parallel-forkmanager/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/parallel-forkmanager/Makefile 2011-04-06 08:18:01 UTC (rev 14084) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/rbgems/parallel-forkmanager/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/parallel-forkmanager/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/parallel-forkmanager/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/parallel-forkmanager/trunk/Makefile 2011-04-06 08:18:01 UTC (rev 14084) @@ -0,0 +1,17 @@ +NAME = parallel-forkmanager +VERSION = 1.5.1 +CATEGORIES = rbgems + +DESCRIPTION = A simple parallel processing fork manager +define BLURB +endef + +DISTFILES += COPYING +LICENSE = COPYING + +PACKAGES = CSWgem-parallel-forkmanager +CATALOGNAME = gem_parallel_forkmanager + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/rbgems/parallel-forkmanager/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/parallel-forkmanager/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/parallel-forkmanager/trunk/checksums 2011-04-06 08:18:01 UTC (rev 14084) @@ -0,0 +1 @@ +cd08cf500f3f0394d237b451b925c4ea parallel-forkmanager-1.5.1.gem Added: csw/mgar/pkg/rbgems/parallel-forkmanager/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/rbgems/parallel-forkmanager/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/rbgems/parallel-forkmanager/trunk/files/COPYING 2011-04-06 08:18:01 UTC (rev 14084) @@ -0,0 +1,7 @@ +# == Copyright (c) 2008 - 2011 Nathan Patwardhan +# +# All rights reserved. This program is free software; you can redistribute +# it and/or modify it under the same terms as Ruby itself. +# +# == Author: Nathan Patwardhan + 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 Apr 6 10:38:42 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 06 Apr 2011 08:38:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14085] csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf Message-ID: Revision: 14085 http://gar.svn.sourceforge.net/gar/?rev=14085&view=rev Author: wahwah Date: 2011-04-06 08:38:42 +0000 (Wed, 06 Apr 2011) Log Message: ----------- pkg/lighttpd/trunk: fixed paths to php and perl Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf Modified: csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf =================================================================== --- csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf 2011-04-06 08:18:01 UTC (rev 14084) +++ csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf 2011-04-06 08:38:42 UTC (rev 14085) @@ -222,14 +222,14 @@ # ( "localhost" => # ( # "socket" => "/tmp/php-fastcgi.socket", -# "bin-path" => "/opt/csw/bin/php" +# "bin-path" => "/opt/csw/php5/bin/php-cgi" # ) # ) # ) #### CGI module -#cgi.assign = ( ".pl" => "/usr/bin/perl", -# ".cgi" => "/usr/bin/perl" ) +#cgi.assign = ( ".pl" => "/opt/csw/bin/perl", +# ".cgi" => "/opt/csw/bin/perl" ) # #### SSL engine @@ -290,7 +290,7 @@ #ssi.extension = ( ".shtml" ) #### rrdtool -#rrdtool.binary = "/usr/bin/rrdtool" +#rrdtool.binary = "/opt/csw/bin/rrdtool" #rrdtool.db-name = "/var/www/lighttpd.rrd" #### setenv This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Wed Apr 6 16:23:23 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Wed, 06 Apr 2011 14:23:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[14086] csw/mgar/pkg/ruby-augeas/trunk/Makefile Message-ID: Revision: 14086 http://gar.svn.sourceforge.net/gar/?rev=14086&view=rev Author: phipsy Date: 2011-04-06 14:23:23 +0000 (Wed, 06 Apr 2011) Log Message: ----------- Attempting to get ruby-augeas build right Modified Paths: -------------- csw/mgar/pkg/ruby-augeas/trunk/Makefile Modified: csw/mgar/pkg/ruby-augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-04-06 08:38:42 UTC (rev 14085) +++ csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-04-06 14:23:23 UTC (rev 14086) @@ -19,6 +19,7 @@ CHECKPKG_OVERRIDES_CSWrubyaugeas += missing-dependency|CSWruby BUILD_DEP_PKGS = CSWrake +BUILD_DEP_PKGS += CSWruby18 BUILD_SCRIPTS = CONFIGURE_SCRIPTS = TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Apr 6 17:08:05 2011 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 06 Apr 2011 15:08:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[14087] csw/mgar/pkg/exiftool/trunk Message-ID: Revision: 14087 http://gar.svn.sourceforge.net/gar/?rev=14087&view=rev Author: hson Date: 2011-04-06 15:08:05 +0000 (Wed, 06 Apr 2011) Log Message: ----------- exiftool: Update to 8.54 Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile csw/mgar/pkg/exiftool/trunk/checksums Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2011-04-06 14:23:23 UTC (rev 14086) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2011-04-06 15:08:05 UTC (rev 14087) @@ -1,5 +1,5 @@ NAME = exiftool -VERSION = 8.31 +VERSION = 8.54 CATEGORIES = cpan DESCRIPTION = Read, Write and Edit Image File Meta Information Modified: csw/mgar/pkg/exiftool/trunk/checksums =================================================================== --- csw/mgar/pkg/exiftool/trunk/checksums 2011-04-06 14:23:23 UTC (rev 14086) +++ csw/mgar/pkg/exiftool/trunk/checksums 2011-04-06 15:08:05 UTC (rev 14087) @@ -1,2 +1 @@ -51daeaabab952590a76da861c78de042 COPYING -4b7cb346de54d87637fb7652d657bc5f Image-ExifTool-8.14.tar.gz +1027e84bc2f9ec51dd10c5b319930220 Image-ExifTool-8.54.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Apr 6 19:53:57 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 06 Apr 2011 17:53:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[14088] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 14088 http://gar.svn.sourceforge.net/gar/?rev=14088&view=rev Author: bonivart Date: 2011-04-06 17:53:57 +0000 (Wed, 06 Apr 2011) Log Message: ----------- dhcp/trunk: update to 4.2.1-P1 Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/checksums Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2011-04-06 15:08:05 UTC (rev 14087) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2011-04-06 17:53:57 UTC (rev 14088) @@ -1,10 +1,10 @@ NAME = dhcp VERSION = 4.2.1 -#RELEASE = P2 -#DISTVERSION = $(VERSION)-$(RELEASE) -#SPKG_VERSION = $(VERSION)$(RELEASE) -#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) -#WORKSRC = $(WORKDIR)/$(DISTNAME) +RELEASE = P1 +DISTVERSION = $(VERSION)-$(RELEASE) +SPKG_VERSION = $(VERSION)$(RELEASE) +DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +WORKSRC = $(WORKDIR)/$(DISTNAME) CATEGORIES = net DESCRIPTION = ISC DHCP reference implementation @@ -52,7 +52,6 @@ SPKG_SOURCEURL = https://www.isc.org/software/dhcp -CHECKPKG_OVERRIDES_CSWdhcp-dev += file-collision CHECKPKG_OVERRIDES_CSWdhcp += surplus-dependency|CSWosslrt include gar/category.mk Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2011-04-06 15:08:05 UTC (rev 14087) +++ csw/mgar/pkg/dhcp/trunk/checksums 2011-04-06 17:53:57 UTC (rev 14088) @@ -1 +1 @@ -bddce8a23551f009fd0ac840afc89780 dhcp-4.2.1.tar.gz +22e6f1eff6d5cfe2621a06cc62ba5b70 dhcp-4.2.1-P1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Apr 6 23:47:35 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 06 Apr 2011 21:47:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14089] csw/mgar/pkg/nano/trunk/files/changelog.CSW Message-ID: Revision: 14089 http://gar.svn.sourceforge.net/gar/?rev=14089&view=rev Author: skayser Date: 2011-04-06 21:47:34 +0000 (Wed, 06 Apr 2011) Log Message: ----------- nano/trunk: update changelog.CSW Modified Paths: -------------- csw/mgar/pkg/nano/trunk/files/changelog.CSW Modified: csw/mgar/pkg/nano/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/nano/trunk/files/changelog.CSW 2011-04-06 17:53:57 UTC (rev 14088) +++ csw/mgar/pkg/nano/trunk/files/changelog.CSW 2011-04-06 21:47:34 UTC (rev 14089) @@ -1,3 +1,9 @@ +nano (2.2.6,REV=2011.04.06) + + * Version bump to 2.2.6 + + -- Sebastian Kayser Wed, 6 Apr 2011 23:46:10 +0200 + nano (2.2.5,REV=2010.09.01) * Version bump to 2.2.5. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Apr 7 00:10:16 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 06 Apr 2011 22:10:16 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[366] gar-wrapper/mgar Message-ID: Revision: 366 http://opencsw.svn.sourceforge.net/opencsw/?rev=366&view=rev Author: skayser Date: 2011-04-06 22:10:16 +0000 (Wed, 06 Apr 2011) Log Message: ----------- mgar: add detection for obsolete gar/ directory (or symlink) Modified Paths: -------------- gar-wrapper/mgar Modified: gar-wrapper/mgar =================================================================== --- gar-wrapper/mgar 2011-03-30 16:34:58 UTC (rev 365) +++ gar-wrapper/mgar 2011-04-06 22:10:16 UTC (rev 366) @@ -161,6 +161,19 @@ in_pkg_dir || die_not_in_pkg_dir } +function die_conflicting_gar_dir_present { + cat >&2 < Revision: 14090 http://gar.svn.sourceforge.net/gar/?rev=14090&view=rev Author: skayser Date: 2011-04-06 22:20:41 +0000 (Wed, 06 Apr 2011) Log Message: ----------- nano/trunk: update checksums, changelog.CSW Modified Paths: -------------- csw/mgar/pkg/nano/trunk/checksums csw/mgar/pkg/nano/trunk/files/changelog.CSW Modified: csw/mgar/pkg/nano/trunk/checksums =================================================================== --- csw/mgar/pkg/nano/trunk/checksums 2011-04-06 21:47:34 UTC (rev 14089) +++ csw/mgar/pkg/nano/trunk/checksums 2011-04-06 22:20:41 UTC (rev 14090) @@ -1 +1 @@ -77a10a49589f975ce98350a4527a2ebf nano-2.2.5.tar.gz +03233ae480689a008eb98feb1b599807 nano-2.2.6.tar.gz Modified: csw/mgar/pkg/nano/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/nano/trunk/files/changelog.CSW 2011-04-06 21:47:34 UTC (rev 14089) +++ csw/mgar/pkg/nano/trunk/files/changelog.CSW 2011-04-06 22:20:41 UTC (rev 14090) @@ -1,8 +1,8 @@ -nano (2.2.6,REV=2011.04.06) +nano (2.2.6,REV=2011.04.07) * Version bump to 2.2.6 - -- Sebastian Kayser Wed, 6 Apr 2011 23:46:10 +0200 + -- Sebastian Kayser Thu, 7 Apr 2011 00:19:16 +0200 nano (2.2.5,REV=2010.09.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 Thu Apr 7 01:22:31 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 06 Apr 2011 23:22:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14091] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 14091 http://gar.svn.sourceforge.net/gar/?rev=14091&view=rev Author: wahwah Date: 2011-04-06 23:22:31 +0000 (Wed, 06 Apr 2011) Log Message: ----------- csw-upload-pkg: A display bugfix A variable inside a loop was not refreshed on every iteration, displaying old data. The display would show a message about a sparc package being inserted into a i386 catalog. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-06 22:20:41 UTC (rev 14090) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-06 23:22:31 UTC (rev 14091) @@ -189,6 +189,7 @@ print "All checks successful. Proceeding." for arch, osrel in checkpkg_sets: for filename, md5_sum in checkpkg_sets[(arch, osrel)]: + file_metadata = metadata_by_md5[md5_sum] self._InsertIntoCatalog(filename, arch, osrel, file_metadata) def Remove(self): 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 Apr 7 03:07:08 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 07 Apr 2011 01:07:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14092] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 14092 http://gar.svn.sourceforge.net/gar/?rev=14092&view=rev Author: bdwalton Date: 2011-04-07 01:07:08 +0000 (Thu, 07 Apr 2011) Log Message: ----------- gardev/trunk: add py_curl as a dependency Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2011-04-06 23:22:31 UTC (rev 14091) +++ csw/mgar/pkg/gardev/trunk/Makefile 2011-04-07 01:07:08 UTC (rev 14092) @@ -25,6 +25,7 @@ RUNTIME_DEP_PKGS_CSWgar-dev += CSWxz CSWgfile CSWpy-hachoir-core RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-hachoir-parser CSWpy-libmagic RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-progressbar CSWpy-sqlobject CSWpy-yaml +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-curl MASTER_SITES = 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 Apr 7 03:33:33 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 07 Apr 2011 01:33:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14093] csw/mgar/pkg/rubygems/trunk Message-ID: Revision: 14093 http://gar.svn.sourceforge.net/gar/?rev=14093&view=rev Author: bdwalton Date: 2011-04-07 01:33:33 +0000 (Thu, 07 Apr 2011) Log Message: ----------- rubygems/trunk: version bump, update dependencies Modified Paths: -------------- csw/mgar/pkg/rubygems/trunk/Makefile csw/mgar/pkg/rubygems/trunk/checksums Modified: csw/mgar/pkg/rubygems/trunk/Makefile =================================================================== --- csw/mgar/pkg/rubygems/trunk/Makefile 2011-04-07 01:07:08 UTC (rev 14092) +++ csw/mgar/pkg/rubygems/trunk/Makefile 2011-04-07 01:33:33 UTC (rev 14093) @@ -1,5 +1,5 @@ NAME = rubygems -VERSION = 1.3.7 +VERSION = 1.7.2 CATEGORIES = xtra DESCRIPTION = Ruby package manager @@ -15,8 +15,8 @@ DISTFILES = $(NAME)-$(VERSION).tgz ARCHALL = 1 -BUILD_DEP_PKGS = CSWruby -RUNTIME_DEP_PKGS_CSWrubygems = CSWruby +BUILD_DEP_PKGS = CSWruby18 +RUNTIME_DEP_PKGS_CSWrubygems = CSWruby18 LICENSE_CSWrubygems = LICENSE.txt Modified: csw/mgar/pkg/rubygems/trunk/checksums =================================================================== --- csw/mgar/pkg/rubygems/trunk/checksums 2011-04-07 01:07:08 UTC (rev 14092) +++ csw/mgar/pkg/rubygems/trunk/checksums 2011-04-07 01:33:33 UTC (rev 14093) @@ -1 +1 @@ -e85cfadd025ff6ab689375adbf344bbe rubygems-1.3.7.tgz +d41d8cd98f00b204e9800998ecf8427e rubygems-1.7.2.tgz 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 Apr 7 03:37:01 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 07 Apr 2011 01:37:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14094] csw/mgar/pkg/rubygems/trunk Message-ID: Revision: 14094 http://gar.svn.sourceforge.net/gar/?rev=14094&view=rev Author: bdwalton Date: 2011-04-07 01:37:01 +0000 (Thu, 07 Apr 2011) Log Message: ----------- rubygems/trunk: update MASTER_SITES, update makesums using non-zero byte file Modified Paths: -------------- csw/mgar/pkg/rubygems/trunk/Makefile csw/mgar/pkg/rubygems/trunk/checksums Modified: csw/mgar/pkg/rubygems/trunk/Makefile =================================================================== --- csw/mgar/pkg/rubygems/trunk/Makefile 2011-04-07 01:33:33 UTC (rev 14093) +++ csw/mgar/pkg/rubygems/trunk/Makefile 2011-04-07 01:37:01 UTC (rev 14094) @@ -10,7 +10,7 @@ SPKG_SOURCEURL = http://rubyforge.org/projects/rubygems/ -MASTER_SITES = http://rubyforge.org/frs/download.php/70696/ +MASTER_SITES = http://production.cf.rubygems.org/rubygems/ DISTFILES = $(NAME)-$(VERSION).tgz Modified: csw/mgar/pkg/rubygems/trunk/checksums =================================================================== --- csw/mgar/pkg/rubygems/trunk/checksums 2011-04-07 01:33:33 UTC (rev 14093) +++ csw/mgar/pkg/rubygems/trunk/checksums 2011-04-07 01:37:01 UTC (rev 14094) @@ -1 +1 @@ -d41d8cd98f00b204e9800998ecf8427e rubygems-1.7.2.tgz +8d67d0bc44b0317dc37e200dcf6627ea rubygems-1.7.2.tgz 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 Apr 7 03:39:43 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 07 Apr 2011 01:39:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14095] csw/mgar/pkg/rubygems/trunk/Makefile Message-ID: Revision: 14095 http://gar.svn.sourceforge.net/gar/?rev=14095&view=rev Author: bdwalton Date: 2011-04-07 01:39:43 +0000 (Thu, 07 Apr 2011) Log Message: ----------- rubygems/trunk: update README file name Modified Paths: -------------- csw/mgar/pkg/rubygems/trunk/Makefile Modified: csw/mgar/pkg/rubygems/trunk/Makefile =================================================================== --- csw/mgar/pkg/rubygems/trunk/Makefile 2011-04-07 01:37:01 UTC (rev 14094) +++ csw/mgar/pkg/rubygems/trunk/Makefile 2011-04-07 01:39:43 UTC (rev 14095) @@ -40,7 +40,7 @@ copy-contrib: @mkdir -p $(DESTDIR)$(docdir)/$(NAME) - @gcp -v $(WORKSRC)/README $(DESTDIR)$(docdir)/$(NAME) + @gcp -v $(WORKSRC)/README.rdoc $(DESTDIR)$(docdir)/$(NAME) @gcp -v $(WORKSRC)/LICENSE.txt $(DESTDIR)$(docdir)/$(NAME) @gcp -v $(WORKSRC)/GPL.txt $(DESTDIR)$(docdir)/$(NAME) @$(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 Thu Apr 7 03:44:16 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 07 Apr 2011 01:44:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[14096] csw/mgar/pkg/rubygems/trunk Message-ID: Revision: 14096 http://gar.svn.sourceforge.net/gar/?rev=14096&view=rev Author: bdwalton Date: 2011-04-07 01:44:16 +0000 (Thu, 07 Apr 2011) Log Message: ----------- rubygems/trunk: add some checkpkg overrides and a corresponding release notes file Modified Paths: -------------- csw/mgar/pkg/rubygems/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/rubygems/trunk/files/CSWrubygems.cswreleasenotes Modified: csw/mgar/pkg/rubygems/trunk/Makefile =================================================================== --- csw/mgar/pkg/rubygems/trunk/Makefile 2011-04-07 01:39:43 UTC (rev 14095) +++ csw/mgar/pkg/rubygems/trunk/Makefile 2011-04-07 01:44:16 UTC (rev 14096) @@ -13,6 +13,7 @@ MASTER_SITES = http://production.cf.rubygems.org/rubygems/ DISTFILES = $(NAME)-$(VERSION).tgz +DISTFILES += CSWrubygems.cswreleasenotes ARCHALL = 1 BUILD_DEP_PKGS = CSWruby18 @@ -29,6 +30,12 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom +# drop these after updating checkpkg +CHECKPKG_OVERRIDES_CSWrubygems += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWrubygems += surplus-dependency|CSWruby18 + +CHECKPKG_OVERRIDES_CSWrubygems += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/rubygems/gem_path_searcher.rb + include gar/category.mk install-custom: Added: csw/mgar/pkg/rubygems/trunk/files/CSWrubygems.cswreleasenotes =================================================================== --- csw/mgar/pkg/rubygems/trunk/files/CSWrubygems.cswreleasenotes (rev 0) +++ csw/mgar/pkg/rubygems/trunk/files/CSWrubygems.cswreleasenotes 2011-04-07 01:44:16 UTC (rev 14096) @@ -0,0 +1 @@ +* The usr/local reference in gem_path_searcher.rb is in a comment. 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 Apr 7 03:48:12 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 07 Apr 2011 01:48:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[14097] csw/mgar/pkg/rubygems/trunk/Makefile Message-ID: Revision: 14097 http://gar.svn.sourceforge.net/gar/?rev=14097&view=rev Author: bdwalton Date: 2011-04-07 01:48:12 +0000 (Thu, 07 Apr 2011) Log Message: ----------- rubygems/trunk: add missing makecookie call to prevent re-running the post install steps Modified Paths: -------------- csw/mgar/pkg/rubygems/trunk/Makefile Modified: csw/mgar/pkg/rubygems/trunk/Makefile =================================================================== --- csw/mgar/pkg/rubygems/trunk/Makefile 2011-04-07 01:44:16 UTC (rev 14096) +++ csw/mgar/pkg/rubygems/trunk/Makefile 2011-04-07 01:48:12 UTC (rev 14097) @@ -44,6 +44,7 @@ @$(MAKECOOKIE) post-install-modulated: copy-contrib + @$(MAKECOOKIE) copy-contrib: @mkdir -p $(DESTDIR)$(docdir)/$(NAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Thu Apr 7 03:54:24 2011 From: bwalton at opencsw.org (Ben Walton) Date: Wed, 06 Apr 2011 21:54:24 -0400 Subject: [csw-devel] proposed checkpkg change Message-ID: <1302141139-sup-9185@pinkfloyd.chass.utoronto.ca> Hi Maciej, What do you think of the following change to checkpkg: bwalton @ current9x : ~/opencsw/.buildsys/v2/lib/python $ svn diff Index: dependency_checks.py =================================================================== --- dependency_checks.py (revision 14086) +++ dependency_checks.py (working copy) @@ -32,7 +32,7 @@ (r".*\.pl$", (u"CSWperl",)), (r".*\.pm$", (u"CSWperl",)), (r".*\.py$", (u"CSWpython",)), - (r".*\.rb$", (u"CSWruby",)), + (r".*\.rb$", (u"CSWruby", u"CSWruby18")), (r".*\.elc?$", (u"CSWemacscommon",)), (r"/opt/csw/apache2/", (u"CSWapache2",)), ) This allows a package containing .rb files to depend on CSWruby or CSWruby18. I could just do a straight s/CSWruby/CSWruby18/ and that would be valid too. What are your thoughts on this? The only downside I see is if we ever make CSWruby pull in 1.9 instead of 1.8 by default, people might end up with the wrong dep. That's quite a bit in the future though. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Thu Apr 7 03:55:06 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 07 Apr 2011 01:55:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14098] csw/mgar/pkg/rubygems/trunk/Makefile Message-ID: Revision: 14098 http://gar.svn.sourceforge.net/gar/?rev=14098&view=rev Author: bdwalton Date: 2011-04-07 01:55:05 +0000 (Thu, 07 Apr 2011) Log Message: ----------- rubygems/trunk: drop dependency overrides while using a locally modified checkpkg Modified Paths: -------------- csw/mgar/pkg/rubygems/trunk/Makefile Modified: csw/mgar/pkg/rubygems/trunk/Makefile =================================================================== --- csw/mgar/pkg/rubygems/trunk/Makefile 2011-04-07 01:48:12 UTC (rev 14097) +++ csw/mgar/pkg/rubygems/trunk/Makefile 2011-04-07 01:55:05 UTC (rev 14098) @@ -30,10 +30,6 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -# drop these after updating checkpkg -CHECKPKG_OVERRIDES_CSWrubygems += missing-dependency|CSWruby -CHECKPKG_OVERRIDES_CSWrubygems += surplus-dependency|CSWruby18 - CHECKPKG_OVERRIDES_CSWrubygems += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/rubygems/gem_path_searcher.rb 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 Apr 7 04:24:10 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 07 Apr 2011 02:24:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14099] csw/mgar/pkg/rubygems/trunk/Makefile Message-ID: Revision: 14099 http://gar.svn.sourceforge.net/gar/?rev=14099&view=rev Author: bdwalton Date: 2011-04-07 02:24:10 +0000 (Thu, 07 Apr 2011) Log Message: ----------- rubygems/trunk: add alternatives support for multiple versions of gem Modified Paths: -------------- csw/mgar/pkg/rubygems/trunk/Makefile Modified: csw/mgar/pkg/rubygems/trunk/Makefile =================================================================== --- csw/mgar/pkg/rubygems/trunk/Makefile 2011-04-07 01:55:05 UTC (rev 14098) +++ csw/mgar/pkg/rubygems/trunk/Makefile 2011-04-07 02:24:10 UTC (rev 14099) @@ -32,6 +32,8 @@ CHECKPKG_OVERRIDES_CSWrubygems += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/rubygems/gem_path_searcher.rb +ALTERNATIVE = $(bindir)/gem gem $(bindir)/gem18 5 + include gar/category.mk 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 Thu Apr 7 09:59:33 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 07 Apr 2011 07:59:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14100] csw/mgar/pkg/lighttpd/trunk Message-ID: Revision: 14100 http://gar.svn.sourceforge.net/gar/?rev=14100&view=rev Author: wahwah Date: 2011-04-07 07:59:33 +0000 (Thu, 07 Apr 2011) Log Message: ----------- pkg/lighttpd/trunk: Use SIGTERM to stop the process. Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/Makefile csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd Modified: csw/mgar/pkg/lighttpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lighttpd/trunk/Makefile 2011-04-07 02:24:10 UTC (rev 14099) +++ csw/mgar/pkg/lighttpd/trunk/Makefile 2011-04-07 07:59:33 UTC (rev 14100) @@ -1,7 +1,7 @@ # $Id$ NAME = lighttpd VERSION = 1.4.28 -CATEGORIES = devel +CATEGORIES = server DESCRIPTION = HTTP server built for security, speed, compliance, and flexibility define BLURB Modified: csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd =================================================================== --- csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd 2011-04-07 02:24:10 UTC (rev 14099) +++ csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd 2011-04-07 07:59:33 UTC (rev 14100) @@ -28,7 +28,7 @@ stop_service() { if [ -f "$PIDFILE" ]; then - /usr/bin/kill -QUIT `/usr/bin/cat $PIDFILE` + /usr/bin/kill -TERM `/usr/bin/cat $PIDFILE` fi } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Thu Apr 7 10:25:25 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Thu, 7 Apr 2011 09:25:25 +0100 Subject: [csw-devel] proposed checkpkg change In-Reply-To: <1302141139-sup-9185@pinkfloyd.chass.utoronto.ca> References: <1302141139-sup-9185@pinkfloyd.chass.utoronto.ca> Message-ID: 2011/4/7 Ben Walton : > > Hi Maciej, > > What do you think of the following change to checkpkg: > > bwalton @ current9x : ~/opencsw/.buildsys/v2/lib/python > $ svn diff > Index: dependency_checks.py > =================================================================== > --- dependency_checks.py ? ? ? ?(revision 14086) > +++ dependency_checks.py ? ? ? ?(working copy) > @@ -32,7 +32,7 @@ > ? ? (r".*\.pl$", ? (u"CSWperl",)), > ? ? (r".*\.pm$", ? (u"CSWperl",)), > ? ? (r".*\.py$", ? (u"CSWpython",)), > - ? ?(r".*\.rb$", ? (u"CSWruby",)), > + ? ?(r".*\.rb$", ? (u"CSWruby", u"CSWruby18")), > ? ? (r".*\.elc?$", (u"CSWemacscommon",)), > ? ? (r"/opt/csw/apache2/", (u"CSWapache2",)), > ?) > > > This allows a package containing .rb files to depend on CSWruby or > CSWruby18. ?I could just do a straight s/CSWruby/CSWruby18/ and that > would be valid too. ?What are your thoughts on this? ?The only > downside I see is if we ever make CSWruby pull in 1.9 instead of 1.8 > by default, people might end up with the wrong dep. ?That's quite a > bit in the future though. It depends whether gems are version-specific. If not, then depending on CSWruby might be better. I hope to change this very crude dependency detection to something better: the NeedFile function in checkpkg. There would need to be a bit of code to identify the interpreter as a path, in Python's case it could be /opt/csw/bin/python2.6. Then in the checkpkg code, you can say: error_mgr.NeedFile("CSWfoo", "/opt/csw/bin/python2.6") Checkpkg then goes, looks up the file and checks if CSWfoo depends on the package containing that file. If you say NeedFile("CSWfoo", "/opt/csw/bin/ruby"), and /opt/csw/bin/ruby is a symlink provided by CSWruby, then everything will work as expected: CSWruby will be needed. If you call NeedFile("CSWfoo", "/opt/csw/bin/ruby18"), then the dependency on CSWruby18 will be required. It boils down to whether gems need bin/ruby18 or bin/ruby. If it's something that can be determined by the package maintainer, then the change is OK as presented. Maciej From bonivart at users.sourceforge.net Thu Apr 7 10:55:21 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 07 Apr 2011 08:55:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[14101] csw/mgar/pkg/dcc/trunk Message-ID: Revision: 14101 http://gar.svn.sourceforge.net/gar/?rev=14101&view=rev Author: bonivart Date: 2011-04-07 08:55:21 +0000 (Thu, 07 Apr 2011) Log Message: ----------- dcc/trunk: Update to 1.3.139 Modified Paths: -------------- csw/mgar/pkg/dcc/trunk/Makefile csw/mgar/pkg/dcc/trunk/checksums Modified: csw/mgar/pkg/dcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/dcc/trunk/Makefile 2011-04-07 07:59:33 UTC (rev 14100) +++ csw/mgar/pkg/dcc/trunk/Makefile 2011-04-07 08:55:21 UTC (rev 14101) @@ -1,5 +1,5 @@ NAME = dcc -VERSION = 1.3.127 +VERSION = 1.3.139 CATEGORIES = net DESCRIPTION = E-mail greylisting and a cooperative, distributed system to identify spam @@ -12,8 +12,7 @@ RUNTIME_DEP_PKGS += CSWperl -# Upstream watch -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.Z +CHECKPKG_OVERRIDES_CSWdcc += file-with-bad-content #CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS = @@ -34,6 +33,7 @@ # dcc has no tests TEST_SCRIPTS = + INSTALL_SCRIPTS = custom SAMPLECONF = /var/opt/csw/dcc/dcc_conf Modified: csw/mgar/pkg/dcc/trunk/checksums =================================================================== --- csw/mgar/pkg/dcc/trunk/checksums 2011-04-07 07:59:33 UTC (rev 14100) +++ csw/mgar/pkg/dcc/trunk/checksums 2011-04-07 08:55:21 UTC (rev 14101) @@ -1 +1 @@ -055fdee524f5a497588cfee448feb402 dcc-1.3.127.tar.Z +78a86b2855a20fedf5f3153de3715c0c dcc-1.3.139.tar.Z This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Thu Apr 7 16:02:26 2011 From: bwalton at opencsw.org (Ben Walton) Date: Thu, 07 Apr 2011 10:02:26 -0400 Subject: [csw-devel] proposed checkpkg change In-Reply-To: References: <1302141139-sup-9185@pinkfloyd.chass.utoronto.ca> Message-ID: <1302184787-sup-3405@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Thu Apr 07 04:25:25 -0400 2011: > It depends whether gems are version-specific. If not, then > depending on CSWruby might be better. The gems will be version specific by nature of the installation path (which is determined by the version of 'gem' used to install them). While some gems might run under both versions of ruby, this would require the gem package to deliver files to both gem installation areas. Maybe I should make the checkpkg just the direct s/CSWruby/CSWruby18/ for now then and handle extended cases when 1.9 becomes a reality? Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From maciej at opencsw.org Thu Apr 7 16:16:11 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Thu, 7 Apr 2011 15:16:11 +0100 Subject: [csw-devel] proposed checkpkg change In-Reply-To: <1302184787-sup-3405@pinkfloyd.chass.utoronto.ca> References: <1302141139-sup-9185@pinkfloyd.chass.utoronto.ca> <1302184787-sup-3405@pinkfloyd.chass.utoronto.ca> Message-ID: 2011/4/7 Ben Walton : > Excerpts from Maciej Blizi?ski's message of Thu Apr 07 04:25:25 -0400 2011: > >> It depends whether gems are version-specific. ?If not, then >> depending on CSWruby might be better. > > The gems will be version specific by nature of the installation path Sounds like something which can be easily greppable. > (which is determined by the version of 'gem' used to install them). > While some gems might run under both versions of ruby, this would > require the gem package to deliver files to both gem installation > areas. ?Maybe I should make the checkpkg just the direct > s/CSWruby/CSWruby18/ for now then and handle extended cases when 1.9 > becomes a reality? Sounds good. Let's make this change and continue talking about how to make dependency detection smarter when ruby19 comes along. Maciej From skayser at users.sourceforge.net Thu Apr 7 23:05:13 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 07 Apr 2011 21:05:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14102] csw/mgar/pkg/nano/trunk Message-ID: Revision: 14102 http://gar.svn.sourceforge.net/gar/?rev=14102&view=rev Author: skayser Date: 2011-04-07 21:05:13 +0000 (Thu, 07 Apr 2011) Log Message: ----------- nano/trunk: fixed /usr/share references in docs, adjusted runtime deps to soname pkg Modified Paths: -------------- csw/mgar/pkg/nano/trunk/Makefile csw/mgar/pkg/nano/trunk/files/changelog.CSW Modified: csw/mgar/pkg/nano/trunk/Makefile =================================================================== --- csw/mgar/pkg/nano/trunk/Makefile 2011-04-07 08:55:21 UTC (rev 14101) +++ csw/mgar/pkg/nano/trunk/Makefile 2011-04-07 21:05:13 UTC (rev 14102) @@ -13,9 +13,9 @@ VENDOR_URL = http://www.nano-editor.org/ MASTER_SITES = http://www.nano-editor.org/dist/v2.2/ DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS = CSWggettextrt CSWncurses +RUNTIME_DEP_PKGS = CSWncurses +RUNTIME_DEP_PKGS += CSWlibintl8 EXTRA_INC = /opt/csw/include/ncurses @@ -39,10 +39,8 @@ cp $(WORKSRC)/doc/nanorc.sample $(DOCDEST)/examples cp $(addprefix $(WORKSRC)/, $(DOCS)) $(DOCDEST) perl -pi -e 's|/usr/share/doc|$(docdir)|' \ - $(addprefix $(DESTDIR)$(mandir)/, \ - man1/nano.1 \ - man5/nanorc.5 \ - fr/man1/nano.1 \ - fr/man5/nanorc.5 \ - ) + `find $(DESTDIR)$(sharedir) \ + -name \*.html -o \ + -name \*.1 -o \ + -name \*.5` @$(MAKECOOKIE) Modified: csw/mgar/pkg/nano/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/nano/trunk/files/changelog.CSW 2011-04-07 08:55:21 UTC (rev 14101) +++ csw/mgar/pkg/nano/trunk/files/changelog.CSW 2011-04-07 21:05:13 UTC (rev 14102) @@ -1,8 +1,8 @@ nano (2.2.6,REV=2011.04.07) - * Version bump to 2.2.6 + * Version bump to 2.2.6. - -- Sebastian Kayser Thu, 7 Apr 2011 00:19:16 +0200 + -- Sebastian Kayser Thu, 7 Apr 2011 23:00:36 +0200 nano (2.2.5,REV=2010.09.01) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Apr 7 23:33:34 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 07 Apr 2011 21:33:34 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[367] gar-wrapper/mgar Message-ID: Revision: 367 http://opencsw.svn.sourceforge.net/opencsw/?rev=367&view=rev Author: skayser Date: 2011-04-07 21:33:33 +0000 (Thu, 07 Apr 2011) Log Message: ----------- mgar: make find-file recursively list $(WORKSRC) when no arg is given Modified Paths: -------------- gar-wrapper/mgar Modified: gar-wrapper/mgar =================================================================== --- gar-wrapper/mgar 2011-04-06 22:10:16 UTC (rev 366) +++ gar-wrapper/mgar 2011-04-07 21:33:33 UTC (rev 367) @@ -43,6 +43,7 @@ # * In commit mode, if (pwd.endswith('trunk') and svn.rev -eq 0) commit .. # * Recipes: Move from svn:externals to GARTYPE # * Improve errors messages when buildsys can't be found +# * In commit mode: verify that checksums is up to date (DISTFILES listed?) # # Bugs: # @@ -471,7 +472,8 @@ # per-pkg-cmds edit-file) $EDITOR `gfind \`get_srcdir\` -name "$2"`;; - find-file) gfind "`get_srcdir`" -name "$2";; + find-file) gfind "`get_srcdir`" \ + -name .git -prune -o -name "${2:-*}" -print;; show-buildsys) __rev=`get_rev "$BUILDSYS"` __branch=`get_repourl "$BUILDSYS" | sed -e "s,$GAR_REPO,,"` echo -e "$BUILDSYS\t(Revision: $__rev, Branch: $__branch)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Apr 7 23:40:15 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 07 Apr 2011 21:40:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[14103] csw/mgar/pkg/hexdump/trunk Message-ID: Revision: 14103 http://gar.svn.sourceforge.net/gar/?rev=14103&view=rev Author: skayser Date: 2011-04-07 21:40:14 +0000 (Thu, 07 Apr 2011) Log Message: ----------- hexdump/trunk: update to 1.7 Modified Paths: -------------- csw/mgar/pkg/hexdump/trunk/Makefile csw/mgar/pkg/hexdump/trunk/checksums csw/mgar/pkg/hexdump/trunk/files/changelog.CSW Modified: csw/mgar/pkg/hexdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/hexdump/trunk/Makefile 2011-04-07 21:05:13 UTC (rev 14102) +++ csw/mgar/pkg/hexdump/trunk/Makefile 2011-04-07 21:40:14 UTC (rev 14103) @@ -1,5 +1,5 @@ NAME = hexdump -VERSION = 1.6 +VERSION = 1.7 CATEGORIES = utils DESCRIPTION = A hex dumper that can handle EBCDIC @@ -7,11 +7,8 @@ endef MASTER_SITES = http://www.catb.org/~esr/hexdump/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(NAME)-$(VERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - CONFIGURE_SCRIPTS = BUILD_TARGETS = hexdump hexdump.1 TEST_SCRIPTS = Modified: csw/mgar/pkg/hexdump/trunk/checksums =================================================================== --- csw/mgar/pkg/hexdump/trunk/checksums 2011-04-07 21:05:13 UTC (rev 14102) +++ csw/mgar/pkg/hexdump/trunk/checksums 2011-04-07 21:40:14 UTC (rev 14103) @@ -1 +1 @@ -eece17333784d8aeed09694ca81082f4 download/hexdump-1.6.tar.gz +c9c06ff710f46a0da258426f775437f7 hexdump-1.7.tar.gz Modified: csw/mgar/pkg/hexdump/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/hexdump/trunk/files/changelog.CSW 2011-04-07 21:05:13 UTC (rev 14102) +++ csw/mgar/pkg/hexdump/trunk/files/changelog.CSW 2011-04-07 21:40:14 UTC (rev 14103) @@ -1,3 +1,9 @@ +hexdump (1.7,REV=2011.04.07) + + * Version bump to 1.7 + + -- Sebastian Kayser Thu, 7 Apr 2011 23:37:16 +0200 + hexdump (1.6,REV=2009.07.04) * Adopted and built using GAR. @@ -3,4 +9,5 @@ -- Sebastian Kayser Sat, 4 Jul 2009 02:06:57 +0200 + hexdump (1.6,REV=2009.07.04) 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 Apr 8 03:24:39 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 08 Apr 2011 01:24:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14104] csw/mgar/pkg/dejagnu/trunk/Makefile Message-ID: Revision: 14104 http://gar.svn.sourceforge.net/gar/?rev=14104&view=rev Author: bdwalton Date: 2011-04-08 01:24:39 +0000 (Fri, 08 Apr 2011) Log Message: ----------- dejagnu/trunk: version bump, small cleanups Modified Paths: -------------- csw/mgar/pkg/dejagnu/trunk/Makefile Modified: csw/mgar/pkg/dejagnu/trunk/Makefile =================================================================== --- csw/mgar/pkg/dejagnu/trunk/Makefile 2011-04-07 21:40:14 UTC (rev 14103) +++ csw/mgar/pkg/dejagnu/trunk/Makefile 2011-04-08 01:24:39 UTC (rev 14104) @@ -1,16 +1,15 @@ NAME = dejagnu -VERSION = 1.4.4 +VERSION = 1.5 CATEGORIES = apps -DESCRIPTION = GNU auto-configuration tool +DESCRIPTION = DejaGnu is a framework for testing other programs define BLURB +DejaGnu is a framework for testing other programs. Its purpose is to provide a single front end for all tests. Think of it as a custom library of Tcl procedures crafted to support writing a test harness. A test harness is the testing infrastructure that is created to support a specific program or tool. Each program can have multiple testsuites, all supported by a single test harness. DejaGnu is written in Expect, which in turn uses Tcl -- Tool command language. endef 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 @@ -20,9 +19,4 @@ TEST_TARGET = check -# Tests take a loooooonnng time. -#TEST_SCRIPTS = - -#EXTRA_MERGE_EXCLUDE_FILES = $(infodir)/standards.info - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Apr 8 03:25:30 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 08 Apr 2011 01:25:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[14105] csw/mgar/pkg/rbgems Message-ID: Revision: 14105 http://gar.svn.sourceforge.net/gar/?rev=14105&view=rev Author: bdwalton Date: 2011-04-08 01:25:30 +0000 (Fri, 08 Apr 2011) Log Message: ----------- rbgems: add rAtom gem Added Paths: ----------- csw/mgar/pkg/rbgems/ratom/ csw/mgar/pkg/rbgems/ratom/Makefile csw/mgar/pkg/rbgems/ratom/branches/ csw/mgar/pkg/rbgems/ratom/tags/ csw/mgar/pkg/rbgems/ratom/trunk/ csw/mgar/pkg/rbgems/ratom/trunk/Makefile csw/mgar/pkg/rbgems/ratom/trunk/checksums csw/mgar/pkg/rbgems/ratom/trunk/files/ Copied: csw/mgar/pkg/rbgems/ratom/Makefile (from rev 13986, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/rbgems/ratom/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/ratom/Makefile 2011-04-08 01:25:30 UTC (rev 14105) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/rbgems/ratom/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/ratom/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/ratom/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/ratom/trunk/Makefile 2011-04-08 01:25:30 UTC (rev 14105) @@ -0,0 +1,24 @@ +NAME = ratom +VERSION = 0.6.7 +CATEGORIES = rbgems + +DESCRIPTION = RAtom is a library for working with the Atom Syndication Format and the Atom Publishing Protocol + +define BLURB +rAtom was originally built to support the communication between a number of applications built by Peerworks, via the Atom Publishing protocol. However, it supports, or aims to support, all the Atom Syndication Format and Publication Protocol and can be used to access Atom feeds or to script publishing entries to a blog supporting APP. +endef + +GEM_DEPS = CSWrb18-libxml-1-1-4 +GEM_DEPS = + +LICENSE = LICENSE + +ARCHALL = 1 + +RUNTIME_DEP_PKGS_CSWrb18-ratom-0-6-7 = $(GEM_DEPS) + +include gar/category.mk + +post-merge: + @rm $(PKGROOT)$(libdir)/ruby/gems/1.8/gems/$(DISTNAME)/.gitignore + @$(MAKECOOKIE) Added: csw/mgar/pkg/rbgems/ratom/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/ratom/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/ratom/trunk/checksums 2011-04-08 01:25:30 UTC (rev 14105) @@ -0,0 +1 @@ +2975a4ebf35022623461417b15d791b4 ratom-0.6.7.gem 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 Apr 8 03:26:32 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 08 Apr 2011 01:26:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[14106] csw/mgar/pkg/dejagnu/trunk/checksums Message-ID: Revision: 14106 http://gar.svn.sourceforge.net/gar/?rev=14106&view=rev Author: bdwalton Date: 2011-04-08 01:26:32 +0000 (Fri, 08 Apr 2011) Log Message: ----------- dejagnu/trunk: update checksums Modified Paths: -------------- csw/mgar/pkg/dejagnu/trunk/checksums Modified: csw/mgar/pkg/dejagnu/trunk/checksums =================================================================== --- csw/mgar/pkg/dejagnu/trunk/checksums 2011-04-08 01:25:30 UTC (rev 14105) +++ csw/mgar/pkg/dejagnu/trunk/checksums 2011-04-08 01:26:32 UTC (rev 14106) @@ -1 +1 @@ -053f18fd5d00873de365413cab17a666 dejagnu-1.4.4.tar.gz +3df1cbca885e751e22d3ebd1ac64dc3c dejagnu-1.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Apr 8 03:59:26 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 08 Apr 2011 01:59:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[14107] csw/mgar/pkg/rubygems/trunk/Makefile Message-ID: Revision: 14107 http://gar.svn.sourceforge.net/gar/?rev=14107&view=rev Author: bdwalton Date: 2011-04-08 01:59:26 +0000 (Fri, 08 Apr 2011) Log Message: ----------- rubygems/trunk: override cswalternatives surplus dep warning Modified Paths: -------------- csw/mgar/pkg/rubygems/trunk/Makefile Modified: csw/mgar/pkg/rubygems/trunk/Makefile =================================================================== --- csw/mgar/pkg/rubygems/trunk/Makefile 2011-04-08 01:26:32 UTC (rev 14106) +++ csw/mgar/pkg/rubygems/trunk/Makefile 2011-04-08 01:59:26 UTC (rev 14107) @@ -31,6 +31,7 @@ INSTALL_SCRIPTS = custom CHECKPKG_OVERRIDES_CSWrubygems += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/rubygems/gem_path_searcher.rb +CHECKPKG_OVERRIDES_CSWrubygems += surplus-dependency|CSWalternatives ALTERNATIVE = $(bindir)/gem gem $(bindir)/gem18 5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Apr 9 00:11:26 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 08 Apr 2011 22:11:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[14108] csw/mgar/pkg/lang-python Message-ID: Revision: 14108 http://gar.svn.sourceforge.net/gar/?rev=14108&view=rev Author: skayser Date: 2011-04-08 22:11:26 +0000 (Fri, 08 Apr 2011) Log Message: ----------- lang-python/quixote: initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/quixote/ csw/mgar/pkg/lang-python/quixote/branches/ csw/mgar/pkg/lang-python/quixote/tags/ csw/mgar/pkg/lang-python/quixote/trunk/ csw/mgar/pkg/lang-python/quixote/trunk/Makefile csw/mgar/pkg/lang-python/quixote/trunk/checksums csw/mgar/pkg/lang-python/quixote/trunk/files/ csw/mgar/pkg/lang-python/quixote/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/lang-python/quixote/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/lang-python/quixote/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/quixote/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/quixote/trunk/Makefile 2011-04-08 22:11:26 UTC (rev 14108) @@ -0,0 +1,36 @@ +# $Id$ +NAME = quixote +VERSION = 2.7 +CATEGORIES = python + +DESCRIPTION = Web framework targeted at flexibility and high-performance +define BLURB + Quixote is a framework for writing Web-based applications using Python. + Its goals are flexibility and high-performance, in that order. The two + major versions of Quixote, version 1 and version 2, are simliar but + incompatible with each other. Both are actively maintained and are used + by numerous public sites. +endef + +VENDOR_URL = http://quixote.ca/ +MASTER_SITES = http://quixote.ca/releases/ +DISTNAME = $(subst q,Q,$(NAME))-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz + +PACKAGES = py_quixote + +TEST_SCRIPTS = + +include gar/category.mk + +post-install-modulated: + mkdir -p $(DESTDIR)$(docdir)/$(PACKAGES) + gcp -r $(WORKSRC)/doc/* $(DESTDIR)$(docdir)/$(PACKAGES) + @$(MAKECOOKIE) + +# Install changelog.CSW +post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) +install-changelog-%: + ginstall -D $(FILEDIR)/changelog.CSW \ + $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/lang-python/quixote/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/quixote/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/quixote/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/quixote/trunk/checksums 2011-04-08 22:11:26 UTC (rev 14108) @@ -0,0 +1 @@ +1757c1b087404eb1a84f2a09daa179e8 Quixote-2.7.tar.gz Added: csw/mgar/pkg/lang-python/quixote/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lang-python/quixote/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/lang-python/quixote/trunk/files/changelog.CSW 2011-04-08 22:11:26 UTC (rev 14108) @@ -0,0 +1,5 @@ +py_quixote (2.7,REV=2011.04.09) + + * Initial release. + + -- Sebastian Kayser Sat, 9 Apr 2011 00:05:38 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Apr 9 00:14:50 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 08 Apr 2011 22:14:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14109] csw/mgar/pkg/lang-python/quixote/trunk/Makefile Message-ID: Revision: 14109 http://gar.svn.sourceforge.net/gar/?rev=14109&view=rev Author: skayser Date: 2011-04-08 22:14:50 +0000 (Fri, 08 Apr 2011) Log Message: ----------- lang-python/quixote/trunk: fix catalog and software name Modified Paths: -------------- csw/mgar/pkg/lang-python/quixote/trunk/Makefile Modified: csw/mgar/pkg/lang-python/quixote/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/quixote/trunk/Makefile 2011-04-08 22:11:26 UTC (rev 14108) +++ csw/mgar/pkg/lang-python/quixote/trunk/Makefile 2011-04-08 22:14:50 UTC (rev 14109) @@ -17,7 +17,8 @@ DISTNAME = $(subst q,Q,$(NAME))-$(VERSION) DISTFILES = $(DISTNAME).tar.gz -PACKAGES = py_quixote +PACKAGES = CSWpy-quixote +CATALOGNAME = py_quixote TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Apr 9 00:18:33 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 08 Apr 2011 22:18:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14110] csw/mgar/pkg/lang-python/quixote/trunk/Makefile Message-ID: Revision: 14110 http://gar.svn.sourceforge.net/gar/?rev=14110&view=rev Author: skayser Date: 2011-04-08 22:18:33 +0000 (Fri, 08 Apr 2011) Log Message: ----------- lang-python/quixote/trunk: add runtime dep to python lib Modified Paths: -------------- csw/mgar/pkg/lang-python/quixote/trunk/Makefile Modified: csw/mgar/pkg/lang-python/quixote/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/quixote/trunk/Makefile 2011-04-08 22:14:50 UTC (rev 14109) +++ csw/mgar/pkg/lang-python/quixote/trunk/Makefile 2011-04-08 22:18:33 UTC (rev 14110) @@ -20,6 +20,8 @@ PACKAGES = CSWpy-quixote CATALOGNAME = py_quixote +RUNTIME_DEP_PKGS_CSWpy-quixote += CSWlibpython2-6-1-0 + TEST_SCRIPTS = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Apr 9 00:19:37 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 08 Apr 2011 22:19:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14111] csw/mgar/pkg/lang-python/quixote/trunk/Makefile Message-ID: Revision: 14111 http://gar.svn.sourceforge.net/gar/?rev=14111&view=rev Author: skayser Date: 2011-04-08 22:19:37 +0000 (Fri, 08 Apr 2011) Log Message: ----------- lang-python/quixote/trunk: fix docdir location Modified Paths: -------------- csw/mgar/pkg/lang-python/quixote/trunk/Makefile Modified: csw/mgar/pkg/lang-python/quixote/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/quixote/trunk/Makefile 2011-04-08 22:18:33 UTC (rev 14110) +++ csw/mgar/pkg/lang-python/quixote/trunk/Makefile 2011-04-08 22:19:37 UTC (rev 14111) @@ -27,8 +27,8 @@ include gar/category.mk post-install-modulated: - mkdir -p $(DESTDIR)$(docdir)/$(PACKAGES) - gcp -r $(WORKSRC)/doc/* $(DESTDIR)$(docdir)/$(PACKAGES) + mkdir -p $(DESTDIR)$(docdir)/$(CATALOGNAME) + gcp -r $(WORKSRC)/doc/* $(DESTDIR)$(docdir)/$(CATALOGNAME) @$(MAKECOOKIE) # Install changelog.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sat Apr 9 00:25:43 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Fri, 8 Apr 2011 23:25:43 +0100 Subject: [csw-devel] SF.net SVN: gar:[14109] csw/mgar/pkg/lang-python/quixote/trunk/Makefile In-Reply-To: References: Message-ID: 2011/4/8 : > Revision: 14109 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=14109&view=rev > Author: ? skayser > Date: ? ? 2011-04-08 22:14:50 +0000 (Fri, 08 Apr 2011) > > Log Message: > ----------- > lang-python/quixote/trunk: fix catalog and software name > > Modified Paths: > -------------- > ? ?csw/mgar/pkg/lang-python/quixote/trunk/Makefile > > Modified: csw/mgar/pkg/lang-python/quixote/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/lang-python/quixote/trunk/Makefile ? ? 2011-04-08 22:11:26 UTC (rev 14108) > +++ csw/mgar/pkg/lang-python/quixote/trunk/Makefile ? ? 2011-04-08 22:14:50 UTC (rev 14109) > @@ -17,7 +17,8 @@ > ?DISTNAME ? ? = $(subst q,Q,$(NAME))-$(VERSION) > ?DISTFILES ? ?= $(DISTNAME).tar.gz > > -PACKAGES ? ? = py_quixote > +PACKAGES ? ? = CSWpy-quixote > +CATALOGNAME ?= py_quixote I think that GAR gets the catalogname right these days. Substitutes the dash and removes CSW. From bwalton at opencsw.org Sat Apr 9 01:42:38 2011 From: bwalton at opencsw.org (Ben Walton) Date: Fri, 08 Apr 2011 19:42:38 -0400 Subject: [csw-devel] SF.net SVN: gar:[14109] csw/mgar/pkg/lang-python/quixote/trunk/Makefile In-Reply-To: References: Message-ID: <1302306069-sup-4348@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Fri Apr 08 18:25:43 -0400 2011: > > -PACKAGES ? ? = py_quixote > > +PACKAGES ? ? = CSWpy-quixote > > +CATALOGNAME ?= py_quixote > > I think that GAR gets the catalogname right these days. Substitutes > the dash and removes CSW. It definitely does do it right by default now. Set the PACKAGE names as required and the matching CATALOGNAME will be correct too. You shouldn't need to explicitly set these unless you need to honour old names. Being explicit doesn't hurt though. :) Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From skayser at opencsw.org Sat Apr 9 07:59:39 2011 From: skayser at opencsw.org (Sebastian Kayser) Date: Sat, 9 Apr 2011 07:59:39 +0200 Subject: [csw-devel] SF.net SVN: gar:[14109] csw/mgar/pkg/lang-python/quixote/trunk/Makefile In-Reply-To: <1302306069-sup-4348@pinkfloyd.chass.utoronto.ca> References: <1302306069-sup-4348@pinkfloyd.chass.utoronto.ca> Message-ID: <20110409055939.GJ24305@sebastiankayser.de> * Ben Walton wrote: > Excerpts from Maciej Blizi??ski's message of Fri Apr 08 18:25:43 -0400 2011: > > > > -PACKAGES ? ? = py_quixote > > > +PACKAGES ? ? = CSWpy-quixote > > > +CATALOGNAME ?= py_quixote > > > > I think that GAR gets the catalogname right these days. Substitutes > > the dash and removes CSW. > > It definitely does do it right by default now. Set the PACKAGE names > as required and the matching CATALOGNAME will be correct too. You > shouldn't need to explicitly set these unless you need to honour old > names. Being explicit doesn't hurt though. :) Thanks for letting me know. I'll keep this in mind for coming build recipes that fall prey to my editor. Sebastian From rthurner at users.sourceforge.net Sat Apr 9 12:43:10 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 09 Apr 2011 10:43:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14112] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 14112 http://gar.svn.sourceforge.net/gar/?rev=14112&view=rev Author: rthurner Date: 2011-04-09 10:43:10 +0000 (Sat, 09 Apr 2011) Log Message: ----------- mercurial, upgrade to hg-1.8.2 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2011-04-08 22:19:37 UTC (rev 14111) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2011-04-09 10:43:10 UTC (rev 14112) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 1.8.1 +VERSION = 1.8.2 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2011-04-08 22:19:37 UTC (rev 14111) +++ csw/mgar/pkg/mercurial/trunk/checksums 2011-04-09 10:43:10 UTC (rev 14112) @@ -1 +1 @@ -e0a8cfca69aa4003ea3187aed609d5e0 mercurial-1.8.1.tar.gz +a1634b9b709ecc70662f3257abece2c7 mercurial-1.8.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Apr 9 17:20:22 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 09 Apr 2011 15:20:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14113] csw/mgar/pkg/dcc/trunk Message-ID: Revision: 14113 http://gar.svn.sourceforge.net/gar/?rev=14113&view=rev Author: bonivart Date: 2011-04-09 15:20:22 +0000 (Sat, 09 Apr 2011) Log Message: ----------- dcc/trunk: Fix user creation Modified Paths: -------------- csw/mgar/pkg/dcc/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/dcc/trunk/files/cswusergroup Modified: csw/mgar/pkg/dcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/dcc/trunk/Makefile 2011-04-09 10:43:10 UTC (rev 14112) +++ csw/mgar/pkg/dcc/trunk/Makefile 2011-04-09 15:20:22 UTC (rev 14113) @@ -45,6 +45,7 @@ SAMPLECONF += /var/opt/csw/dcc/whiteclnt SAMPLECONF += /var/opt/csw/dcc/whitecommon SAMPLECONF += /var/opt/csw/dcc/whitelist +USERGROUP = /etc/opt/csw/pkg/CSWdcc/cswusergroup # Fix ownership of map file PROTOTYPE_MODIFIERS = 1 @@ -53,7 +54,7 @@ SPKG_SOURCEURL = http://www.rhyolite.com/dcc/ CONFFILES = dcc_conf flod grey_flod grey_whitelist ids map.txt whiteclnt whitecommon whitelist -DOCFILES = CHANGES FAQ.txt INSTALL.txt RESTRICTIONS misc/README misc/dcc.m4 misc/dccdnsbl.m4 misc/site.config.m4 +DOCFILES = CHANGES FAQ.html INSTALL.html RESTRICTIONS misc/README misc/dcc.m4 misc/dccdnsbl.m4 misc/site.config.m4 include gar/category.mk @@ -69,15 +70,17 @@ cd .. ; \ gmake install ) @( cd $(DESTDIR)/var/opt/csw/$(NAME) ; \ - sed 's/bonivart/dcc/' dcc_conf > tmp.sed ; \ - mv tmp.sed dcc_conf ) + sed 's/bonivart/dcc/' dcc_conf > tmp.sed ; \ + mv tmp.sed dcc_conf ) @( cd $(DESTDIR)/opt/csw/libexec/$(NAME) ; \ - sed 's/bonivart/dcc/' fix-map > tmp.sed ; \ - mv tmp.sed fix-map ) + sed 's/bonivart/dcc/' fix-map > tmp.sed ; \ + mv tmp.sed fix-map ) # @$(foreach FILE, $(CONFFILES), mv $(DESTDIR)/var/opt/csw/$(NAME)/$(FILE) $(DESTDIR)/var/opt/csw/$(NAME) ;) @ginstall -d $(DESTDIR)$(docdir)/$(NAME)/misc @$(foreach FILE, $(DOCFILES), cp $(WORKSRC)/$(FILE) $(DESTDIR)$(docdir)/$(NAME)/$(FILE) ;) @cp $(FILEDIR)/CSWdcc.INSTALL.CSW.txt $(DESTDIR)$(docdir)/$(NAME)/INSTALL.CSW.txt @cp $(FILEDIR)/CSWdcc.dcc.xml $(DESTDIR)$(docdir)/$(NAME)/dcc.xml @cp $(FILEDIR)/CSWdcc.svc-dcc $(DESTDIR)$(docdir)/$(NAME)/svc-dcc + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWdcc + @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWdcc @$(MAKECOOKIE) Added: csw/mgar/pkg/dcc/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/dcc/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/dcc/trunk/files/cswusergroup 2011-04-09 15:20:22 UTC (rev 14113) @@ -0,0 +1 @@ +dcc:dcc:CSW DCC:/false:/bin/false:::NP 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 Apr 9 18:25:36 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 09 Apr 2011 16:25:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[14114] csw/mgar/pkg/dcc/trunk/Makefile Message-ID: Revision: 14114 http://gar.svn.sourceforge.net/gar/?rev=14114&view=rev Author: bonivart Date: 2011-04-09 16:25:36 +0000 (Sat, 09 Apr 2011) Log Message: ----------- dcc/trunk: Fix ownership of file Modified Paths: -------------- csw/mgar/pkg/dcc/trunk/Makefile Modified: csw/mgar/pkg/dcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/dcc/trunk/Makefile 2011-04-09 15:20:22 UTC (rev 14113) +++ csw/mgar/pkg/dcc/trunk/Makefile 2011-04-09 16:25:36 UTC (rev 14114) @@ -49,11 +49,12 @@ # Fix ownership of map file PROTOTYPE_MODIFIERS = 1 -PROTOTYPE_FILES_1 = /var/opt/csw/dcc/map -PROTOTYPE_USER_1 = dcc +PROTOTYPE_FILES_1 = /var/opt/csw/dcc/map +PROTOTYPE_USER_1 = dcc +PROTOTYPE_CLASS_1 = ugfiles SPKG_SOURCEURL = http://www.rhyolite.com/dcc/ -CONFFILES = dcc_conf flod grey_flod grey_whitelist ids map.txt whiteclnt whitecommon whitelist +CONFFILES = dcc_conf flod grey_flod grey_whitelist ids map.txt whiteclnt whitecommon whitelist DOCFILES = CHANGES FAQ.html INSTALL.html RESTRICTIONS misc/README misc/dcc.m4 misc/dccdnsbl.m4 misc/site.config.m4 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 Apr 10 12:21:14 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Apr 2011 10:21:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14115] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 14115 http://gar.svn.sourceforge.net/gar/?rev=14115&view=rev Author: wahwah Date: 2011-04-10 10:21:13 +0000 (Sun, 10 Apr 2011) Log Message: ----------- Checkpkg: New TODO item Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2011-04-09 16:25:36 UTC (rev 14114) +++ csw/mgar/gar/v2/lib/python/README 2011-04-10 10:21:13 UTC (rev 14115) @@ -22,6 +22,8 @@ Development plan for checkpkg: Primary focus: - Add support for tiering (core/active/unsupported) + - Remeber, against which catalogs has a package been checked, and + when. - Add MySQL database garbage collection - Currently, the database is growing indefinitely, at the time of writing it's 1.5GB uncompressed. 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 Apr 10 12:22:55 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Apr 2011 10:22:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[14116] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 14116 http://gar.svn.sourceforge.net/gar/?rev=14116&view=rev Author: wahwah Date: 2011-04-10 10:22:54 +0000 (Sun, 10 Apr 2011) Log Message: ----------- lib/python/README: Added dependency information Needed: - unittest2 - pycurl Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2011-04-10 10:21:13 UTC (rev 14115) +++ csw/mgar/gar/v2/lib/python/README 2011-04-10 10:22:54 UTC (rev 14116) @@ -74,7 +74,9 @@ python-magic \ python-mox \ python-progressbar \ + python-pycurl \ python-sqlobject \ + python-unittest2 \ python-yaml Solaris package dependencies. 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 Apr 10 12:23:31 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Apr 2011 10:23:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14117] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14117 http://gar.svn.sourceforge.net/gar/?rev=14117&view=rev Author: wahwah Date: 2011-04-10 10:23:30 +0000 (Sun, 10 Apr 2011) Log Message: ----------- csw-upload-pkg: Sort filenames according to OS rel When a bulk of files is uploaded, e.g. SunOS5.9 and SunOS5.10 files are uploaded together, SunOS5.9 files are lexicographically last. In certain operation it's better to have them sorted according to the OS release. The typical usage scenario is when there are only 5.9 packages in the database, and we're uploading a mix of 5.9 and 5.10 packages. Without this sorting, only 5.9 would be in the catalog in result. The 5.10 packages would be initially inserted into the database, but then they would be overwritten by 5.9 packages. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-10 10:22:54 UTC (rev 14116) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-10 10:23:30 UTC (rev 14117) @@ -466,7 +466,28 @@ by_catalog[key].append((filename, md5_sum)) return by_catalog + def SortFilenames(self, filenames): + """Sorts filenames according to OS release. + The idea is that in lexicographic sorting, SunOS5.9 is after + SunOS5.10, while we want 5.9 to be first. + """ + by_osrel = {} + sorted_filenames = [] + for filename in filenames: + basename = os.path.basename(filename) + parsed_basename = opencsw.ParsePackageFileName(basename) + by_osrel.setdefault(parsed_basename["osrel"], []).append(filename) + for osrel in common_constants.OS_RELS: + if osrel in by_osrel: + for filename in by_osrel.pop(osrel): + sorted_filenames.append(filename) + if by_osrel: + raise DataError("Unexpected architecture found in file list: %s." + % (repr(by_osrel),)) + return sorted_filenames + + if __name__ == '__main__': parser = optparse.OptionParser(USAGE) parser.add_option("-d", "--debug", Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2011-04-10 10:22:54 UTC (rev 14116) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2011-04-10 10:23:30 UTC (rev 14117) @@ -327,6 +327,35 @@ ('bar.pkg', '84b409eb7c2faf87e22ee0423e55b888')]} self.assertEqual(expected, su._CheckpkgSets(TEST_PLANNED_MODIFICATIONS_1)) + def testSortFilenames(self): + su = csw_upload_pkg.Srv4Uploader(None, None) + wrong_order = [ + "gdb-7.2,REV=2011.01.21-SunOS5.9-i386-CSW.pkg.gz", + "gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz", + "gdb-7.2,REV=2011.01.21-SunOS5.10-i386-CSW.pkg.gz", + "gdb-7.2,REV=2011.01.21-SunOS5.10-sparc-CSW.pkg.gz", + ] + good_order = [ + "gdb-7.2,REV=2011.01.21-SunOS5.9-i386-CSW.pkg.gz", + "gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz", + "gdb-7.2,REV=2011.01.21-SunOS5.10-i386-CSW.pkg.gz", + "gdb-7.2,REV=2011.01.21-SunOS5.10-sparc-CSW.pkg.gz", + ] + self.assertEqual(good_order, su.SortFilenames(wrong_order)) + def testSortFilenamesThrowsDataError(self): + su = csw_upload_pkg.Srv4Uploader(None, None) + wrong_order = [ + "gdb-7.2,REV=2011.01.21-kittens-i386-CSW.pkg.gz", + "gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz", + "gdb-7.2,REV=2011.01.21-SunOS5.10-i386-CSW.pkg.gz", + "gdb-7.2,REV=2011.01.21-SunOS5.10-sparc-CSW.pkg.gz", + ] + self.assertRaises( + csw_upload_pkg.DataError, + su.SortFilenames, + wrong_order) + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 10 12:24:04 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Apr 2011 10:24:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[14118] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 14118 http://gar.svn.sourceforge.net/gar/?rev=14118&view=rev Author: wahwah Date: 2011-04-10 10:24:04 +0000 (Sun, 10 Apr 2011) Log Message: ----------- csw-upload-pkg: no parameters given, print usage If no arguments are given, print usage. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-10 10:23:30 UTC (rev 14117) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-10 10:24:04 UTC (rev 14118) @@ -20,6 +20,7 @@ import struct_util import subprocess import file_set_checker +import sys BASE_URL = "http://buildfarm.opencsw.org" @@ -517,6 +518,10 @@ if os_release: os_release = struct_util.OsReleaseToLong(os_release) + if not args: + parser.print_usage() + sys.exit(1) + # Check the file set. fc = file_set_checker.FileSetChecker() error_tags = fc.CheckFiles(args) 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 Apr 10 12:24:37 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Apr 2011 10:24:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14119] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 14119 http://gar.svn.sourceforge.net/gar/?rev=14119&view=rev Author: wahwah Date: 2011-04-10 10:24:36 +0000 (Sun, 10 Apr 2011) Log Message: ----------- csw-upload-pkg: move checkpkg to a function Separating the checkpkg call in a separate function which can be later stubbed out for testing. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-10 10:24:04 UTC (rev 14118) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-10 10:24:36 UTC (rev 14119) @@ -69,7 +69,8 @@ class Srv4Uploader(object): - def __init__(self, filenames, rest_url, os_release=None, debug=False): + def __init__(self, filenames, rest_url, os_release=None, debug=False, + output_to_screen=True): super(Srv4Uploader, self).__init__() self.filenames = filenames self.md5_by_filename = {} @@ -77,6 +78,7 @@ self.os_release = os_release self.rest_url = rest_url self._rest_client = rest.RestClient(self.rest_url) + self.output_to_screen = output_to_screen def _ImportMetadata(self, filename): md5_sum = self._GetFileMd5sum(filename) @@ -142,52 +144,10 @@ # - Create groups of files to be inserted into each of the catalogs # - Invoke checkpkg to check every target catalog checkpkg_sets = self._CheckpkgSets(planned_modifications) - bin_dir = os.path.dirname(__file__) - checkpkg_executable = os.path.join(bin_dir, "checkpkg") - assert os.path.exists(checkpkg_executable), ( - "Could not find %s. Make sure that the checkpkg executable is " - "available \n" - "from the same directory as csw-upload-pkg." % checkpkg_executable) - checks_failed_for_catalogs = [] - args_by_cat = {} - for arch, osrel in checkpkg_sets: - if "5.11" in osrel: - logging.debug("Skipping Solaris 11 checks") - continue - print ("Checking packages against catalog %s %s %s" - % (DEFAULT_CATREL, arch, osrel)) - md5_sums = [] - basenames = [] - for filename, md5_sum in checkpkg_sets[(arch, osrel)]: - md5_sums.append(md5_sum) - basenames.append(os.path.basename(filename)) - # Not using the checkpkg Python API. The reason is that checkpkg - # requires the process calling its API to have an established - # MySQL connection, while csw-upload-pkg does not, and it's better - # if it stays that way. - args_by_cat[(arch, osrel)] = [ - checkpkg_executable, - "--catalog-release", DEFAULT_CATREL, - "--os-release", osrel, - "--architecture", arch, - ] + md5_sums - ret = subprocess.call(args_by_cat[(arch, osrel)] + ["--quiet"]) - if ret: - checks_failed_for_catalogs.append( - (arch, osrel, basenames) - ) - if checks_failed_for_catalogs: - print "Checks failed for catalogs:" - for arch, osrel, basenames in checks_failed_for_catalogs: - print " - %s %s" % (arch, osrel) - for basename in basenames: - print " %s" % basename - print "To see errors, run:" - print " ", " ".join(args_by_cat[(arch, osrel)]) - print ("Packages have not been submitted to the %s catalog." - % DEFAULT_CATREL) - else: - print "All checks successful. Proceeding." + checks_successful = self._RunCheckpkg(checkpkg_sets) + if checks_successful: + if self.output_to_screen: + print "All checks successful. Proceeding." for arch, osrel in checkpkg_sets: for filename, md5_sum in checkpkg_sets[(arch, osrel)]: file_metadata = metadata_by_md5[md5_sum] @@ -488,7 +448,54 @@ % (repr(by_osrel),)) return sorted_filenames + def _RunCheckpkg(self, checkpkg_sets): + bin_dir = os.path.dirname(__file__) + checkpkg_executable = os.path.join(bin_dir, "checkpkg") + assert os.path.exists(checkpkg_executable), ( + "Could not find %s. Make sure that the checkpkg executable is " + "available \n" + "from the same directory as csw-upload-pkg." % checkpkg_executable) + checks_failed_for_catalogs = [] + args_by_cat = {} + for arch, osrel in checkpkg_sets: + if "5.11" in osrel: + logging.debug("Skipping Solaris 11 checks") + continue + print ("Checking packages against catalog %s %s %s" + % (DEFAULT_CATREL, arch, osrel)) + md5_sums = [] + basenames = [] + for filename, md5_sum in checkpkg_sets[(arch, osrel)]: + md5_sums.append(md5_sum) + basenames.append(os.path.basename(filename)) + # Not using the checkpkg Python API. The reason is that checkpkg + # requires the process calling its API to have an established + # MySQL connection, while csw-upload-pkg does not, and it's better + # if it stays that way. + args_by_cat[(arch, osrel)] = [ + checkpkg_executable, + "--catalog-release", DEFAULT_CATREL, + "--os-release", osrel, + "--architecture", arch, + ] + md5_sums + ret = subprocess.call(args_by_cat[(arch, osrel)] + ["--quiet"]) + if ret: + checks_failed_for_catalogs.append( + (arch, osrel, basenames) + ) + if checks_failed_for_catalogs: + print "Checks failed for catalogs:" + for arch, osrel, basenames in checks_failed_for_catalogs: + print " - %s %s" % (arch, osrel) + for basename in basenames: + print " %s" % basename + print "To see errors, run:" + print " ", " ".join(args_by_cat[(arch, osrel)]) + print ("Packages have not been submitted to the %s catalog." + % DEFAULT_CATREL) + return (not checks_failed_for_catalogs, checkpkg_sets) + if __name__ == '__main__': parser = optparse.OptionParser(USAGE) parser.add_option("-d", "--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 Apr 10 12:25:09 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Apr 2011 10:25:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[14120] csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py Message-ID: Revision: 14120 http://gar.svn.sourceforge.net/gar/?rev=14120&view=rev Author: wahwah Date: 2011-04-10 10:25:09 +0000 (Sun, 10 Apr 2011) Log Message: ----------- csw-upload-pkg: Doing 'doing it wrong' right. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2011-04-10 10:24:36 UTC (rev 14119) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2011-04-10 10:25:09 UTC (rev 14120) @@ -330,10 +330,10 @@ def testSortFilenames(self): su = csw_upload_pkg.Srv4Uploader(None, None) wrong_order = [ + "gdb-7.2,REV=2011.01.21-SunOS5.10-i386-CSW.pkg.gz", + "gdb-7.2,REV=2011.01.21-SunOS5.10-sparc-CSW.pkg.gz", "gdb-7.2,REV=2011.01.21-SunOS5.9-i386-CSW.pkg.gz", "gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz", - "gdb-7.2,REV=2011.01.21-SunOS5.10-i386-CSW.pkg.gz", - "gdb-7.2,REV=2011.01.21-SunOS5.10-sparc-CSW.pkg.gz", ] good_order = [ "gdb-7.2,REV=2011.01.21-SunOS5.9-i386-CSW.pkg.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 Apr 10 12:25:44 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 10 Apr 2011 10:25:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[14121] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14121 http://gar.svn.sourceforge.net/gar/?rev=14121&view=rev Author: wahwah Date: 2011-04-10 10:25:43 +0000 (Sun, 10 Apr 2011) Log Message: ----------- csw-upload-pkg: Using the right order of uploads 5.9 package will no longer overwrite a 5.10 package in a 5.10 catalog. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-10 10:25:09 UTC (rev 14120) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-10 10:25:43 UTC (rev 14121) @@ -72,7 +72,7 @@ def __init__(self, filenames, rest_url, os_release=None, debug=False, output_to_screen=True): super(Srv4Uploader, self).__init__() - self.filenames = filenames + self.filenames = self.SortFilenames(filenames) self.md5_by_filename = {} self.debug = debug self.os_release = os_release Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2011-04-10 10:25:09 UTC (rev 14120) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2011-04-10 10:25:43 UTC (rev 14121) @@ -356,6 +356,85 @@ su.SortFilenames, wrong_order) +class Srv4UploaderIntegrationUnitTest(mox.MoxTestBase): + def testUploadOrder(self): + wrong_order = [ + "gdb-7.2,REV=2011.01.21-SunOS5.10-sparc-CSW.pkg.gz", + "gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz", + ] + su = csw_upload_pkg.Srv4Uploader(wrong_order, "http://localhost/", + output_to_screen=False) + # Not an optimal design: a lot of methods need to be stubbed to + # test what we need to test. This is what happens if you don't + # write tests at the same time you write the code. + import_metadata_mock = self.mox.StubOutWithMock(su, '_GetFileMd5sum') + import_metadata_mock = self.mox.StubOutWithMock(su, '_ImportMetadata') + import_metadata_mock = self.mox.StubOutWithMock(su, '_InsertIntoCatalog') + import_metadata_mock = self.mox.StubOutWithMock(su, '_RemoveFromCatalog') + import_metadata_mock = self.mox.StubOutWithMock(su, '_PostFile') + import_metadata_mock = self.mox.StubOutWithMock(su, '_GetSrv4FileMetadata') + import_metadata_mock = self.mox.StubOutWithMock(su, '_MatchSrv4ToCatalogs') + import_metadata_mock = self.mox.StubOutWithMock(su, '_RunCheckpkg') + rest_mock = self.mox.CreateMock(rest.RestClient) + su._rest_client = rest_mock + + # The 5.9 package + su._ImportMetadata("gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz") + su._GetFileMd5sum(wrong_order[1]).AndReturn("md5-2") + su._GetSrv4FileMetadata("md5-2").AndReturn((True, GDB_STRUCT_9)) + + # The 5.10 package + su._ImportMetadata("gdb-7.2,REV=2011.01.21-SunOS5.10-sparc-CSW.pkg.gz") + su._GetFileMd5sum(wrong_order[0]).AndReturn("md5-1") + su._GetSrv4FileMetadata("md5-1").AndReturn((True, GDB_STRUCT_10)) + + # Matching to catalogs + su._MatchSrv4ToCatalogs('gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz', + 'unstable', 'sparc', 'SunOS5.9', + 'md5-2').AndReturn(( + ('unstable', 'sparc', 'SunOS5.9'), + ('unstable', 'sparc', 'SunOS5.10'), + )) + + su._MatchSrv4ToCatalogs('gdb-7.2,REV=2011.01.21-SunOS5.10-sparc-CSW.pkg.gz', + 'unstable', 'sparc', 'SunOS5.10', + 'md5-1').AndReturn((('unstable', 'sparc', 'SunOS5.10'),)) + + su._RunCheckpkg( + { + ('sparc', 'SunOS5.10'): + [('gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz', 'md5-2'), + ('gdb-7.2,REV=2011.01.21-SunOS5.10-sparc-CSW.pkg.gz', 'md5-1')], + ('sparc', 'SunOS5.9'): + [('gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz', 'md5-2')]}).AndReturn(True) + + + # This is the critical part of the test: The 5.9 package must not + # overwrite the 5.10 package in the 5.10 catalog. It's okay for the + # 5.10 package to overwrite the 5.9 package in the 5.10 catalog. + # + # This would be wrong: + # + # su._InsertIntoCatalog('gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz', + # 'sparc', 'SunOS5.10', GDB_STRUCT_9) + # su._InsertIntoCatalog('gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz', + # 'sparc', 'SunOS5.9', GDB_STRUCT_9) + # su._InsertIntoCatalog('gdb-7.2,REV=2011.01.21-SunOS5.10-sparc-CSW.pkg.gz', + # 'sparc', 'SunOS5.10', GDB_STRUCT_10) + + # This is right. The first insert is superfluous, but harmless. + su._InsertIntoCatalog('gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz', + 'sparc', 'SunOS5.10', GDB_STRUCT_9) + su._InsertIntoCatalog('gdb-7.2,REV=2011.01.21-SunOS5.10-sparc-CSW.pkg.gz', + 'sparc', 'SunOS5.10', GDB_STRUCT_10) + su._InsertIntoCatalog('gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz', + 'sparc', 'SunOS5.9', GDB_STRUCT_9) + + + self.mox.ReplayAll() + su.Upload() + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Apr 11 10:48:54 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Apr 2011 08:48:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14122] csw/mgar/pkg/lighttpd/trunk/Makefile Message-ID: Revision: 14122 http://gar.svn.sourceforge.net/gar/?rev=14122&view=rev Author: wahwah Date: 2011-04-11 08:48:53 +0000 (Mon, 11 Apr 2011) Log Message: ----------- pkg/lighttpd/trunk: Use the default check target. Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/Makefile Modified: csw/mgar/pkg/lighttpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lighttpd/trunk/Makefile 2011-04-10 10:25:43 UTC (rev 14121) +++ csw/mgar/pkg/lighttpd/trunk/Makefile 2011-04-11 08:48:53 UTC (rev 14122) @@ -61,9 +61,6 @@ PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -# One test is still failing. -TEST_TARGET = check - INITSMF = $(sysconfdir)/init\.d/cswlighttpd PRESERVECONF = $(sysconfdir)/lighttpd\.conf USERGROUP = $(sysconfdir)/pkg/$(NAME)/cswusergroup 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 Apr 11 11:14:07 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Apr 2011 09:14:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[14123] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 14123 http://gar.svn.sourceforge.net/gar/?rev=14123&view=rev Author: wahwah Date: 2011-04-11 09:14:07 +0000 (Mon, 11 Apr 2011) Log Message: ----------- csw-upload-pkg: Better error output Display a message that there's a problem with the file list. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-11 08:48:53 UTC (rev 14122) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-11 09:14:07 UTC (rev 14123) @@ -533,8 +533,9 @@ fc = file_set_checker.FileSetChecker() error_tags = fc.CheckFiles(args) if error_tags: + print "There is a problem with the presented file list." for error_tag in error_tags: - print error_tag + print "*", error_tag sys.exit(1) uploader = Srv4Uploader(args, 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 Apr 11 11:14:56 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Apr 2011 09:14:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[14124] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14124 http://gar.svn.sourceforge.net/gar/?rev=14124&view=rev Author: wahwah Date: 2011-04-11 09:14:55 +0000 (Mon, 11 Apr 2011) Log Message: ----------- csw-upload-pkg: Deal with badly formed filenames If a file name given is not parseable, don't fret, return an error tag instead. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/file_set_checker.py csw/mgar/gar/v2/lib/python/file_set_checker_test.py Modified: csw/mgar/gar/v2/lib/python/file_set_checker.py =================================================================== --- csw/mgar/gar/v2/lib/python/file_set_checker.py 2011-04-11 09:14:07 UTC (rev 14123) +++ csw/mgar/gar/v2/lib/python/file_set_checker.py 2011-04-11 09:14:55 UTC (rev 14124) @@ -52,7 +52,14 @@ osrel = file_metadata["osrel"] for arch in archs: key = arch, osrel - catalognames_by_arch[key].add(catalogname) + if key in catalognames_by_arch: + catalognames_by_arch[key].add(catalogname) + else: + tags.append( + tag.CheckpkgTag(None, + "bad-arch-or-os-release", + "%s arch=%s osrel=%s" % (file_path, arch, osrel)) + ) missing = {} for key1, set1 in catalognames_by_arch.iteritems(): for catalogname in set1: Modified: csw/mgar/gar/v2/lib/python/file_set_checker_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/file_set_checker_test.py 2011-04-11 09:14:07 UTC (rev 14123) +++ csw/mgar/gar/v2/lib/python/file_set_checker_test.py 2011-04-11 09:14:55 UTC (rev 14124) @@ -53,6 +53,15 @@ 'nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-i386-UNCOMMITTED.pkg.gz'] self.assertEqual(expected, fc.CheckFiles(files)) + def testBadInput(self): + fc = file_set_checker.FileSetChecker() + expected = [ + tag.CheckpkgTag(None, 'bad-arch-or-os-release', 'csw-upload-pkg arch=pkg osrel=unspecified'), + tag.CheckpkgTag(None, 'bad-vendor-tag', 'csw expected=CSW actual=UNKN'), + ] + files = ['csw-upload-pkg'] + self.assertEqual(expected, fc.CheckFiles(files)) + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Apr 11 11:15:28 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Apr 2011 09:15:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[14125] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 14125 http://gar.svn.sourceforge.net/gar/?rev=14125&view=rev Author: wahwah Date: 2011-04-11 09:15:28 +0000 (Mon, 11 Apr 2011) Log Message: ----------- csw-upload-pkg: Make catalog release a parameter Reduce the number of hardcoded 'unstable'. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-11 09:14:55 UTC (rev 14124) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-11 09:15:28 UTC (rev 14125) @@ -181,8 +181,13 @@ parsed_basename = opencsw.ParsePackageFileName(basename) # TODO: Move this bit to a separate class (RestClient) url = ( - "%s%s/catalogs/unstable/%s/%s/%s/" - % (self.rest_url, RELEASES_APP, arch, osrel, md5_sum)) + "%s%s/catalogs/%s/%s/%s/%s/" + % (self.rest_url, + RELEASES_APP, + DEFAULT_CATREL, + arch, + osrel, + md5_sum)) logging.debug("DELETE @ URL: %s %s", type(url), url) c = pycurl.Curl() d = StringIO() @@ -307,8 +312,13 @@ parsed_basename = opencsw.ParsePackageFileName(basename) logging.debug("parsed_basename: %s", parsed_basename) url = ( - "%s%s/catalogs/unstable/%s/%s/%s/" - % (self.rest_url, RELEASES_APP, arch, osrel, md5_sum)) + "%s%s/catalogs/%s/%s/%s/%s/" + % (self.rest_url, + RELEASES_APP, + DEFAULT_CATREL, + arch, + osrel, + md5_sum)) logging.debug("URL: %s %s", type(url), url) c = pycurl.Curl() d = StringIO() 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 Apr 11 11:16:01 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Apr 2011 09:16:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14126] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 14126 http://gar.svn.sourceforge.net/gar/?rev=14126&view=rev Author: wahwah Date: 2011-04-11 09:16:01 +0000 (Mon, 11 Apr 2011) Log Message: ----------- csw-upload-pkg: Communicate the catalog release When uploading packages, display the name of the catalog release, e.g. 'unstable'. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-11 09:15:28 UTC (rev 14125) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-11 09:16:01 UTC (rev 14126) @@ -171,11 +171,11 @@ self._RemoveFromCatalog(filename, cat_arch, cat_osrel, file_metadata) def _RemoveFromCatalog(self, filename, arch, osrel, file_metadata): - logging.info("Removing %s (%s %s) from catalog %s %s", + logging.info("Removing %s (%s %s) from catalog %s %s %s", file_metadata["catalogname"], file_metadata["arch"], file_metadata["osrel"], - arch, osrel) + DEFAULT_CATREL, arch, osrel) md5_sum = self._GetFileMd5sum(filename) basename = os.path.basename(filename) parsed_basename = opencsw.ParsePackageFileName(basename) @@ -302,11 +302,11 @@ logging.debug( "_InsertIntoCatalog(%s, %s, %s)", repr(arch), repr(osrel), repr(filename)) - logging.info("Inserting %s (%s %s) into catalog %s %s", + logging.info("Inserting %s (%s %s) into catalog %s %s %s", file_metadata["catalogname"], file_metadata["arch"], file_metadata["osrel"], - arch, osrel) + DEFAULT_CATREL, arch, osrel) md5_sum = self._GetFileMd5sum(filename) basename = os.path.basename(filename) parsed_basename = opencsw.ParsePackageFileName(basename) 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 Apr 11 11:16:37 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Apr 2011 09:16:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14127] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 14127 http://gar.svn.sourceforge.net/gar/?rev=14127&view=rev Author: wahwah Date: 2011-04-11 09:16:37 +0000 (Mon, 11 Apr 2011) Log Message: ----------- csw-upload-pkg: Logging messages moved to debug Moving a couple of messages from info to debug. This will reduce the noise on the screen. Messages about inserting and removing packages from catalogs need to stay on the screen, and can be converted into print statements (non-logging screen outut). Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-11 09:16:01 UTC (rev 14126) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-11 09:16:37 UTC (rev 14127) @@ -274,8 +274,8 @@ first_cat_osrel_seen = srv4_in_catalog["osrel"] else: first_cat_osrel_seen = srv4_osrel - logging.info("Considering %s the base OS to match", - first_cat_osrel_seen) + logging.debug("Considering %s the base OS to match", + first_cat_osrel_seen) if (not srv4_in_catalog or srv4_in_catalog["osrel"] == srv4_osrel or srv4_in_catalog["osrel"] == first_cat_osrel_seen): @@ -289,7 +289,7 @@ logging.debug("OS release specified and matches %s.", osrel) catalogs.append(cat_key) else: - logging.info( + logging.debug( "Not matching %s %s package with %s containing a %s package", catalogname, srv4_osrel, osrel, srv4_in_catalog["osrel"]) @@ -381,11 +381,12 @@ if successful: metadata = json.loads(d.getvalue()) else: - logging.info("Metadata for %s were not found in the database" % repr(md5_sum)) + logging.debug("Metadata for %s were not found in the database" % repr(md5_sum)) return successful, metadata def _PostFile(self, filename): - logging.info("Uploading %s", repr(filename)) + if self.output_to_screen: + print "Uploading %s" % repr(filename) md5_sum = self._GetFileMd5sum(filename) c = pycurl.Curl() d = StringIO() 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 Apr 11 11:17:10 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Apr 2011 09:17:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14128] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 14128 http://gar.svn.sourceforge.net/gar/?rev=14128&view=rev Author: wahwah Date: 2011-04-11 09:17:10 +0000 (Mon, 11 Apr 2011) Log Message: ----------- csw-upload-pkg: Improved screen output - Logging messages converted to print statements. - Initial message when starting - Displaying package counts when checking Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-11 09:16:37 UTC (rev 14127) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-11 09:17:10 UTC (rev 14128) @@ -109,6 +109,7 @@ do_upload = True planned_modifications = [] metadata_by_md5 = {} + print "Processing %s file(s). Please wait." % (len(self.filenames),) for filename in self.filenames: self._ImportMetadata(filename) md5_sum = self._GetFileMd5sum(filename) @@ -171,11 +172,11 @@ self._RemoveFromCatalog(filename, cat_arch, cat_osrel, file_metadata) def _RemoveFromCatalog(self, filename, arch, osrel, file_metadata): - logging.info("Removing %s (%s %s) from catalog %s %s %s", - file_metadata["catalogname"], - file_metadata["arch"], - file_metadata["osrel"], - DEFAULT_CATREL, arch, osrel) + print("Removing %s (%s %s) from catalog %s %s %s" + % (file_metadata["catalogname"], + file_metadata["arch"], + file_metadata["osrel"], + DEFAULT_CATREL, arch, osrel)) md5_sum = self._GetFileMd5sum(filename) basename = os.path.basename(filename) parsed_basename = opencsw.ParsePackageFileName(basename) @@ -302,11 +303,11 @@ logging.debug( "_InsertIntoCatalog(%s, %s, %s)", repr(arch), repr(osrel), repr(filename)) - logging.info("Inserting %s (%s %s) into catalog %s %s %s", - file_metadata["catalogname"], - file_metadata["arch"], - file_metadata["osrel"], - DEFAULT_CATREL, arch, osrel) + print("Inserting %s (%s %s) into catalog %s %s %s" + % (file_metadata["catalogname"], + file_metadata["arch"], + file_metadata["osrel"], + DEFAULT_CATREL, arch, osrel)) md5_sum = self._GetFileMd5sum(filename) basename = os.path.basename(filename) parsed_basename = opencsw.ParsePackageFileName(basename) @@ -472,8 +473,8 @@ if "5.11" in osrel: logging.debug("Skipping Solaris 11 checks") continue - print ("Checking packages against catalog %s %s %s" - % (DEFAULT_CATREL, arch, osrel)) + print ("Checking %s package(s) against catalog %s %s %s" + % (len(checkpkg_sets[(arch, osrel)]), DEFAULT_CATREL, arch, osrel)) md5_sums = [] basenames = [] for filename, md5_sum in checkpkg_sets[(arch, osrel)]: 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 Apr 11 11:52:40 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 11 Apr 2011 09:52:40 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[368] web/wordpresscsw/wp-content/themes/opencsw Message-ID: Revision: 368 http://opencsw.svn.sourceforge.net/opencsw/?rev=368&view=rev Author: wbonnet Date: 2011-04-11 09:52:40 +0000 (Mon, 11 Apr 2011) Log Message: ----------- Add package name in the page title Modified Paths: -------------- web/wordpresscsw/wp-content/themes/opencsw/package.php Added Paths: ----------- web/wordpresscsw/wp-content/themes/opencsw/header-package.php Added: web/wordpresscsw/wp-content/themes/opencsw/header-package.php =================================================================== --- web/wordpresscsw/wp-content/themes/opencsw/header-package.php (rev 0) +++ web/wordpresscsw/wp-content/themes/opencsw/header-package.php 2011-04-11 09:52:40 UTC (rev 368) @@ -0,0 +1,96 @@ + +> + + + + +<?php wp_title('»', true, 'right'); ?> <?php echo $wp_query->get('packageName') ; ?> - Solaris package + + + + + + + + + + + + +if (top.location != self.location) top.location = self.location; +'; +?> + + + + + + + + + + +
    Modified: web/wordpresscsw/wp-content/themes/opencsw/package.php =================================================================== --- web/wordpresscsw/wp-content/themes/opencsw/package.php 2011-04-07 21:33:33 UTC (rev 367) +++ web/wordpresscsw/wp-content/themes/opencsw/package.php 2011-04-11 09:52:40 UTC (rev 368) @@ -1,6 +1,10 @@ - +getReverseDependencyList($pkgName); $arrayDepends = $pkgDAO->getListOfPackagesDependingOnLibsOfPackageFile($packageName); + get_header("package"); + // Test if the package exist if ($pkgInfo == -1) { print "
    "; 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 Apr 11 13:06:10 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Apr 2011 11:06:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14129] csw/mgar/pkg/lighttpd/trunk/Makefile Message-ID: Revision: 14129 http://gar.svn.sourceforge.net/gar/?rev=14129&view=rev Author: dmichelsen Date: 2011-04-11 11:06:10 +0000 (Mon, 11 Apr 2011) Log Message: ----------- lighttpd: Adjust build recipe to use ISAEXEC again after update of GAR defaults Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/Makefile Modified: csw/mgar/pkg/lighttpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lighttpd/trunk/Makefile 2011-04-11 09:17:10 UTC (rev 14128) +++ csw/mgar/pkg/lighttpd/trunk/Makefile 2011-04-11 11:06:10 UTC (rev 14129) @@ -73,6 +73,7 @@ PROTOTYPE_CLASS_user = ugfiles BUILD64 = 1 +ISAEXEC = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Apr 11 13:44:03 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Apr 2011 11:44:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14130] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 14130 http://gar.svn.sourceforge.net/gar/?rev=14130&view=rev Author: wahwah Date: 2011-04-11 11:44:03 +0000 (Mon, 11 Apr 2011) Log Message: ----------- csw-upload-pkg: Sort files when inserting Dictionaries return keys in an unspecified order, so let's sort them explicitly to get nicer screen output. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-11 11:06:10 UTC (rev 14129) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-11 11:44:03 UTC (rev 14130) @@ -149,7 +149,7 @@ if checks_successful: if self.output_to_screen: print "All checks successful. Proceeding." - for arch, osrel in checkpkg_sets: + for arch, osrel in sorted(checkpkg_sets): for filename, md5_sum in checkpkg_sets[(arch, osrel)]: file_metadata = metadata_by_md5[md5_sum] self._InsertIntoCatalog(filename, arch, osrel, file_metadata) @@ -168,7 +168,7 @@ arch = file_metadata['arch'] catalogs = self._MatchSrv4ToCatalogs( filename, DEFAULT_CATREL, arch, osrel, md5_sum) - for unused_catrel, cat_arch, cat_osrel in catalogs: + for unused_catrel, cat_arch, cat_osrel in sorted(catalogs): self._RemoveFromCatalog(filename, cat_arch, cat_osrel, file_metadata) def _RemoveFromCatalog(self, filename, arch, osrel, file_metadata): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Apr 11 17:35:47 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Mon, 11 Apr 2011 16:35:47 +0100 Subject: [csw-devel] SF.net SVN: opencsw:[368] web/wordpresscsw/wp-content/themes/opencsw In-Reply-To: References: Message-ID: 2011/4/11 : > +<?php wp_title('»', true, 'right'); ?> <?php echo $wp_query->get('packageName') ; ?> - Solaris package Yey! That should help us go higher in search results for "solaris packages". From wahwah at users.sourceforge.net Tue Apr 12 01:02:33 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Apr 2011 23:02:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14131] csw/mgar/pkg/gxmessage/trunk Message-ID: Revision: 14131 http://gar.svn.sourceforge.net/gar/?rev=14131&view=rev Author: wahwah Date: 2011-04-11 23:02:33 +0000 (Mon, 11 Apr 2011) Log Message: ----------- pkg/gxmessage/trunk: Update dependencies Modified Paths: -------------- csw/mgar/pkg/gxmessage/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gxmessage/trunk/files/0001-removing-a-usr-local-reference.patch Modified: csw/mgar/pkg/gxmessage/trunk/Makefile =================================================================== --- csw/mgar/pkg/gxmessage/trunk/Makefile 2011-04-11 11:44:03 UTC (rev 14130) +++ csw/mgar/pkg/gxmessage/trunk/Makefile 2011-04-11 23:02:33 UTC (rev 14131) @@ -12,19 +12,17 @@ MASTER_SITES = http://homepages.ihug.co.nz/~trmusson/stuff/ MASTER_SITES += http://ftp.gnu.org/pub/gnu/gxmessage/ DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -TEST_TARGET = check +EXTRA_INC = $(prefix)/include/gtk-2.0 CONFIGURE_ARGS = $(DIRPATHS) RUNTIME_DEP_PKGS_CSWgxmessage += CSWfconfig RUNTIME_DEP_PKGS_CSWgxmessage += CSWftype2 -RUNTIME_DEP_PKGS_CSWgxmessage += CSWggettextrt RUNTIME_DEP_PKGS_CSWgxmessage += CSWglib2 RUNTIME_DEP_PKGS_CSWgxmessage += CSWgtk2 RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibatk RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibcairo -RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibxext +RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgxmessage += CSWpango -EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so +PATCHFILES += 0001-removing-a-usr-local-reference.patch include gar/category.mk post-install-modulated: Added: csw/mgar/pkg/gxmessage/trunk/files/0001-removing-a-usr-local-reference.patch =================================================================== --- csw/mgar/pkg/gxmessage/trunk/files/0001-removing-a-usr-local-reference.patch (rev 0) +++ csw/mgar/pkg/gxmessage/trunk/files/0001-removing-a-usr-local-reference.patch 2011-04-11 23:02:33 UTC (rev 14131) @@ -0,0 +1,25 @@ +From 3597bb5edf755ddaf87b45be0e8187a811f3acdd Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 12 Apr 2011 00:55:33 +0200 +Subject: [PATCH] removing a /usr/local reference + +--- + doc/gxmessage.info | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/doc/gxmessage.info b/doc/gxmessage.info +index a623bf7..e61b2da 100644 +--- a/doc/gxmessage.info ++++ b/doc/gxmessage.info +@@ -291,7 +291,7 @@ right-clicking on any text file, selecting `Properties', then `Open + With'. + + #! /bin/bash +- # Filename: /usr/local/bin/gxview ++ # Filename: /opt/csw/bin/gxview + + ## + ## Usage: %PROG% [OPTIONS] [FILE] +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 12 10:23:07 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 12 Apr 2011 08:23:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[14132] csw/mgar/pkg/less/trunk Message-ID: Revision: 14132 http://gar.svn.sourceforge.net/gar/?rev=14132&view=rev Author: dmichelsen Date: 2011-04-12 08:23:07 +0000 (Tue, 12 Apr 2011) Log Message: ----------- less: Update to 443 Modified Paths: -------------- csw/mgar/pkg/less/trunk/Makefile csw/mgar/pkg/less/trunk/checksums Modified: csw/mgar/pkg/less/trunk/Makefile =================================================================== --- csw/mgar/pkg/less/trunk/Makefile 2011-04-11 23:02:33 UTC (rev 14131) +++ csw/mgar/pkg/less/trunk/Makefile 2011-04-12 08:23:07 UTC (rev 14132) @@ -1,5 +1,5 @@ NAME = less -VERSION = 436 +VERSION = 443 CATEGORIES = utils DESCRIPTION = Less is a free, open-source file pager @@ -16,11 +16,21 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS = CSWncurses CSWggettextrt +RUNTIME_DEP_PKGS_CSWless += CSWncurses +RUNTIME_DEP_PKGS_CSWless += CSWlibintl8 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) +# There is no testsuite TEST_TARGET = +# We replaced the problematic occurrence of sysless in post-install, the remaining one is just +# a default. +CHECKPKG_OVERRIDES_CSWless += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/less.1 + include gar/category.mk + +post-install-modulated: + perl -pi -e 's,/usr/local/etc/sysless,$(sysconfdir)/sysless,g' \ + $(DESTDIR)$(mandir)/man1/less.1 Modified: csw/mgar/pkg/less/trunk/checksums =================================================================== --- csw/mgar/pkg/less/trunk/checksums 2011-04-11 23:02:33 UTC (rev 14131) +++ csw/mgar/pkg/less/trunk/checksums 2011-04-12 08:23:07 UTC (rev 14132) @@ -1 +1 @@ -817bf051953ad2dea825a1cdf460caa4 download/less-436.tar.gz +47db098fb3cdaf847b3c4be05ee954fc less-443.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 Apr 12 10:32:50 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Apr 2011 08:32:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14133] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 14133 http://gar.svn.sourceforge.net/gar/?rev=14133&view=rev Author: wahwah Date: 2011-04-12 08:32:50 +0000 (Tue, 12 Apr 2011) Log Message: ----------- checkpkg: Better message for bad content error 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 2011-04-12 08:23:07 UTC (rev 14132) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2011-04-12 08:32:50 UTC (rev 14133) @@ -715,13 +715,12 @@ def CheckBadContent(pkg_data, error_mgr, logger, messenger): for regex in pkg_data["bad_paths"]: for file_name in pkg_data["bad_paths"][regex]: - messenger.Message("File %s contains bad content: %s. " - "It's usually build-machine data. " - "If it's a legacy file you can't modify, " - "add an override " - "for this file. After doing so, run checkpkg " - "again, you'll need to add an override for " - "the override file too." % (file_name, regex)) + messenger.Message( + "File %s contains bad content: %s. " + "If it's a legacy file you can't modify, " + "or if you investigated the issue and the string does not pose " + "a real issue, you can override this error. " + % (file_name, repr(regex))) error_mgr.ReportError("file-with-bad-content", "%s %s" % (regex, file_name)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Apr 12 10:47:21 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Apr 2011 08:47:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[14134] csw/mgar/pkg/sharutils/trunk Message-ID: Revision: 14134 http://gar.svn.sourceforge.net/gar/?rev=14134&view=rev Author: wahwah Date: 2011-04-12 08:47:21 +0000 (Tue, 12 Apr 2011) Log Message: ----------- sharutils: 4.10 builds, 4.11 doesn't Modified Paths: -------------- csw/mgar/pkg/sharutils/trunk/Makefile csw/mgar/pkg/sharutils/trunk/checksums Modified: csw/mgar/pkg/sharutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/sharutils/trunk/Makefile 2011-04-12 08:32:50 UTC (rev 14133) +++ csw/mgar/pkg/sharutils/trunk/Makefile 2011-04-12 08:47:21 UTC (rev 14134) @@ -7,7 +7,7 @@ # at r10011. NAME = sharutils -VERSION = 4.9 +VERSION = 4.10 CATEGORIES = utils DESCRIPTION = Makes so-called shell archives out of many files define BLURB @@ -15,18 +15,28 @@ SPKG_SOURCEURL = http://www.gnu.org/software/sharutils/ MASTER_SITES = ftp://ftp.gnu.org/gnu/sharutils/ DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -TEST_TARGET = check -CONFIGURE_ARGS = $(DIRPATHS) # Apparently, 64 bit builds are frown upon: # http://lists.opencsw.org/pipermail/pkgsubmissions/2010-June/000907.html # BUILD64 = 1 # To make the test use gmd5sum MD5SUM = gmd5sum -RUNTIME_DEP_PKGS_CSWsharutils += CSWggettextrt +export MD5SUM BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWsharutils) CSWcoreutils -export MD5SUM + +RUNTIME_DEP_PKGS_CSWsharutils += CSWlibintl8 + +PACKAGES += CSWsharutils +SPKG_DESC_CSWsharutils = $(DESCRIPTION) +CHECKPKG_OVERRIDES_CSWsharutils += file-with-bad-content|/usr/share|root/opt/csw/share/locale/es/LC_MESSAGES/sharutils.mo + +PACKAGES += CSWuuencode +SPKG_DESC_CSWuuencode = Utility to encode and decode data +PKGFILES_CSWuuencode = $(bindir)/uu(en|de)code +RUNTIME_DEP_PKGS_CSWuuencode += CSWlibintl8 +# We won't be releasing CSWuuencode from this package. +CHECKPKG_OVERRIDES_CSWuuencode += file-collision + include gar/category.mk post-merge: Modified: csw/mgar/pkg/sharutils/trunk/checksums =================================================================== --- csw/mgar/pkg/sharutils/trunk/checksums 2011-04-12 08:32:50 UTC (rev 14133) +++ csw/mgar/pkg/sharutils/trunk/checksums 2011-04-12 08:47:21 UTC (rev 14134) @@ -1,2 +1 @@ -c40c7b6e2180ed57060393efc3234130 sharutils-4.9.tar.gz -528eb43a02b3208d5ff7d9ff43ed0c2f sun-sed.patch +c8bbfa89810ce9f5399b38392549207c sharutils-4.10.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 Apr 12 11:23:25 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Apr 2011 09:23:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14135] csw/mgar/pkg/sudo_ldap/trunk/Makefile Message-ID: Revision: 14135 http://gar.svn.sourceforge.net/gar/?rev=14135&view=rev Author: wahwah Date: 2011-04-12 09:23:25 +0000 (Tue, 12 Apr 2011) Log Message: ----------- pkg/sudo_ldap/trunk: pre-rupert linting of the build description Modified Paths: -------------- csw/mgar/pkg/sudo_ldap/trunk/Makefile Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/Makefile 2011-04-12 08:47:21 UTC (rev 14134) +++ csw/mgar/pkg/sudo_ldap/trunk/Makefile 2011-04-12 09:23:25 UTC (rev 14135) @@ -14,22 +14,21 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz PATCHFILES = install.diff -# We define upstream file regex so we can be notifed of new -# upstream software release -UFILES_REGEX = $(NAME)-((\d+(?:\.\d+)*)(p\d+)?).tar.gz - PACKAGES = CSWsudoldap CATALOGNAME_CSWsudoldap = sudo_ldap SPKG_DESC_CSWsudoldap = $(DESCRIPTION) SPKG_SOURCEURL_CSWsudoldap = http://www.sudo.ws -RUNTIME_DEP_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt CSWzlib +RUNTIME_DEP_PKGS_CSWsudoldap += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsudoldap += CSWoldaprt +RUNTIME_DEP_PKGS_CSWsudoldap += CSWsudo-common +RUNTIME_DEP_PKGS_CSWsudoldap += CSWzlib BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWsudoldap) CSWggettext CHECKPKG_OVERRIDES_CSWsudoldap += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWsudoldap += surplus-dependency|CSWsudo-common -LOGPATH = /var/opt/csw/log/sudo +LOGPATH = /var$(prefix)/log/sudo CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-pam @@ -64,6 +63,9 @@ ALTERNATIVE_sudoldap = $(bindir)/sudo sudo $(bindir)/sudo.ldap 60 ALTERNATIVE_sudoldap += $(bindir)/sudoedit sudoedit $(bindir)/sudoedit.ldap +# Legacy naming. +CHECKPKG_OVERRIDES_CSWsudoldap += catalogname-does-not-match-pkgname|pkgname=CSWsudoldap|catalogname=sudo_ldap|expected-catalogname=sudoldap + include gar/category.mk PKGFILES_CSWsudoldap = $(bindir)/sudo.* 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 Apr 12 16:59:13 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Apr 2011 14:59:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14136] csw/mgar/pkg Message-ID: Revision: 14136 http://gar.svn.sourceforge.net/gar/?rev=14136&view=rev Author: bdwalton Date: 2011-04-12 14:59:13 +0000 (Tue, 12 Apr 2011) Log Message: ----------- add initial (stub) recipe for bacula (not in gar currently) Added Paths: ----------- csw/mgar/pkg/bacula/ csw/mgar/pkg/bacula/Makefile csw/mgar/pkg/bacula/branches/ csw/mgar/pkg/bacula/tags/ csw/mgar/pkg/bacula/trunk/ csw/mgar/pkg/bacula/trunk/Makefile csw/mgar/pkg/bacula/trunk/checksums csw/mgar/pkg/bacula/trunk/files/ Copied: csw/mgar/pkg/bacula/Makefile (from rev 13986, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/bacula/Makefile (rev 0) +++ csw/mgar/pkg/bacula/Makefile 2011-04-12 14:59:13 UTC (rev 14136) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/bacula/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/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 14:59:13 UTC (rev 14136) @@ -0,0 +1,25 @@ +# $Id$ +NAME = bacula +VERSION = 1.0 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Property changes on: csw/mgar/pkg/bacula/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/bacula/trunk/checksums =================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Tue Apr 12 17:03:55 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Tue, 12 Apr 2011 15:03:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[14137] csw/mgar/pkg/proftpd/trunk Message-ID: Revision: 14137 http://gar.svn.sourceforge.net/gar/?rev=14137&view=rev Author: aigoshin Date: 2011-04-12 15:03:55 +0000 (Tue, 12 Apr 2011) Log Message: ----------- proftpd: release 20110412 Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile csw/mgar/pkg/proftpd/trunk/checksums Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2011-04-12 14:59:13 UTC (rev 14136) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2011-04-12 15:03:55 UTC (rev 14137) @@ -1,5 +1,5 @@ NAME = proftpd -VERSION = 1.3.3d +VERSION = 1.3.3e CATEGORIES = server DESCRIPTION = Advanced, incredibly configurable and secure FTP daemon @@ -21,13 +21,13 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 -RUNTIME_DEP_PKGS = CSWosslrt CSWggettextrt CSWiconv CSWoldaprt CSWzlib CSWmysql5rt CSWsqlite3rt +RUNTIME_DEP_PKGS = CSWosslrt CSWlibintl8 CSWiconv CSWoldaprt CSWzlib CSWmysql5rt CSWsqlite3rt EXTRA_BUILD_ISAS_i386 = amd64 EXTRA_BUILD_ISAS_sparc = sparcv9 -ISAEXEC_DIRS = $(bindir) $(sbindir) -EXTRA_ISAEXEC_EXCLUDE_FILES = $(bindir)/ftpasswd $(bindir)/ftpmail $(bindir)/ftpquota $(bindir)/prxs +ISAEXEC_DIRS = $(bindir) $(sbindir) +EXTRA_ISAEXEC_EXCLUDE_FILES = $(bindir)/ftpasswd $(bindir)/ftpmail $(bindir)/ftpquota $(bindir)/prxs EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = $(prefix)/bin/amd64/ftpasswd $(prefix)/bin/amd64/ftpmail $(prefix)/bin/amd64/ftpquota $(prefix)/bin/amd64/prxs EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = $(prefix)/bin/sparcv9/ftpasswd $(prefix)/bin/sparcv9/ftpmail $(prefix)/bin/sparcv9/ftpquota $(prefix)/bin/sparcv9/prxs @@ -57,6 +57,8 @@ CONFIGURE_ARGS += --with-modules=mod_facl CONFIGURE_ARGS += --with-shared=mod_auth_pam:mod_ban:mod_ctrls_admin:mod_dynmasq:mod_exec:mod_ident:mod_ifsession:mod_ldap:mod_load:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_radius:mod_quotatab_sql:mod_radius:mod_ratio:mod_readme:mod_rewrite:mod_sftp:mod_sftp_pam:mod_sftp_sql:mod_shaper:mod_site_misc:mod_sql:mod_sql_mysql:mod_sql_passwd:mod_sql_sqlite:mod_tls:mod_tls_shmcache:mod_unique_id:mod_wrap2:mod_wrap2_file:mod_wrap2_sql +CHECKPKG_OVERRIDES_CSWproftpd += bad-location-of-file|file=/var/run/proftpd + TEST_SCRIPTS = INITSMF = $(sysconfdir)/init.d/cswproftpd @@ -71,6 +73,32 @@ gsed -i s/\^LDFLAGS=/#LDFLAGS=/ $(WORKSRC)/contrib/mod_load/Makefile gsed -i s/\^LDFLAGS=/#LDFLAGS=/ $(WORKSRC)/contrib/mod_sftp/Makefile gsed -i s/\^LDFLAGS=/#LDFLAGS=/ $(WORKSRC)/contrib/mod_wrap2/Makefile + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/NEWS + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/RELEASE_NOTES + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/sample-configurations/anonymous.conf + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/sample-configurations/virtual.conf + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/Configuration.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/faq.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/contrib/ftpasswd.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/contrib/ftpquota.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/contrib/mod_ldap.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/contrib/mod_quotatab_file.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/contrib/mod_quotatab_ldap.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/contrib/mod_quotatab_radius.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/contrib/mod_sftp.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/contrib/mod_sql_odbc.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/contrib/mod_sql_sqlite.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/contrib/mod_tls.html + gsed -i s#/usr/local#/opt/csw#g $(WORKSRC)/doc/howto/Compiling.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/howto/ConfigFile.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/howto/ConfigurationTricks.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/howto/DNS.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/howto/DSO.html + gsed -i s#/usr/local#/opt/csw#g $(WORKSRC)/doc/howto/SQL.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/howto/Stopping.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/howto/TLS.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/modules/mod_dso.html + gsed -i s#/usr/local#/opt/csw# $(WORKSRC)/doc/modules/mod_lang.html $(MAKECOOKIE) post-install-modulated: Modified: csw/mgar/pkg/proftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/proftpd/trunk/checksums 2011-04-12 14:59:13 UTC (rev 14136) +++ csw/mgar/pkg/proftpd/trunk/checksums 2011-04-12 15:03:55 UTC (rev 14137) @@ -1 +1 @@ -69650e91e05b3a10fa3ac54ee261679b proftpd-1.3.3d.tar.bz2 +acc49b6589bc8c9fdf1dce9000bebdbd proftpd-1.3.3e.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 Apr 12 17:10:06 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Apr 2011 15:10:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14138] csw/mgar/pkg/bacula/trunk Message-ID: Revision: 14138 http://gar.svn.sourceforge.net/gar/?rev=14138&view=rev Author: bdwalton Date: 2011-04-12 15:10:06 +0000 (Tue, 12 Apr 2011) Log Message: ----------- bacula/trunk: set version, description, master sites, etc Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile csw/mgar/pkg/bacula/trunk/checksums Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 15:03:55 UTC (rev 14137) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 15:10:06 UTC (rev 14138) @@ -1,25 +1,14 @@ # $Id$ NAME = bacula -VERSION = 1.0 -CATEGORIES = category +VERSION = 5.0.3 +CATEGORIES = apps -DESCRIPTION = Brief description +DESCRIPTION = The Open Source Network Backup Solution define BLURB - Long description +Bacula is a set of Open Source, enterprise ready, computer programs that permit you (or the system administrator) to manage backup, recovery, and verification of computer data across a network of computers of different kinds. Bacula is relatively easy to use and efficient, while offering many advanced storage management features that make it easy to find and recover lost or damaged files. In technical terms, it is an Open Source, enterprise ready, network based backup program. endef -MASTER_SITES = +MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - -CONFIGURE_ARGS = $(DIRPATHS) - include gar/category.mk Modified: csw/mgar/pkg/bacula/trunk/checksums =================================================================== --- csw/mgar/pkg/bacula/trunk/checksums 2011-04-12 15:03:55 UTC (rev 14137) +++ csw/mgar/pkg/bacula/trunk/checksums 2011-04-12 15:10:06 UTC (rev 14138) @@ -0,0 +1 @@ +9de254ae39cab0587fdb2f5d8d90b03b bacula-5.0.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 Tue Apr 12 17:41:48 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Apr 2011 15:41:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14139] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14139 http://gar.svn.sourceforge.net/gar/?rev=14139&view=rev Author: bdwalton Date: 2011-04-12 15:41:48 +0000 (Tue, 12 Apr 2011) Log Message: ----------- bacula/trunk: set some basic configure options Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 15:10:06 UTC (rev 14138) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 15:41:48 UTC (rev 14139) @@ -11,4 +11,12 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) +CONFIGURE_ARGS += --with-libintl-prefix=$(prefix) +CONFIGURE_ARGS += --with-readline=$(prefix) +CONFIGURE_ARGS += --with-python=$(prefix) +CONFIGURE_ARGS += --with-tcp-wrappers=$(prefix) +CONFIGURE_ARGS += --with-openssl=$(prefix) + 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 Tue Apr 12 17:45:10 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Apr 2011 15:45:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14140] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14140 http://gar.svn.sourceforge.net/gar/?rev=14140&view=rev Author: bdwalton Date: 2011-04-12 15:45:09 +0000 (Tue, 12 Apr 2011) Log Message: ----------- bacula/trunk: use mysql5 for catalog storage Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 15:41:48 UTC (rev 14139) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 15:45:09 UTC (rev 14140) @@ -18,5 +18,6 @@ CONFIGURE_ARGS += --with-python=$(prefix) CONFIGURE_ARGS += --with-tcp-wrappers=$(prefix) CONFIGURE_ARGS += --with-openssl=$(prefix) +CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql5 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 Tue Apr 12 17:51:41 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Apr 2011 15:51:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[14141] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14141 http://gar.svn.sourceforge.net/gar/?rev=14141&view=rev Author: bdwalton Date: 2011-04-12 15:51:41 +0000 (Tue, 12 Apr 2011) Log Message: ----------- bacula/trunk: set an initial list of build deps Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 15:45:09 UTC (rev 14140) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 15:51:41 UTC (rev 14141) @@ -11,6 +11,9 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz +BUILD_DEP_PKGS = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel +BUILD_DEP_PKGS += CSWreadline CSWggettext-dev + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) CONFIGURE_ARGS += --with-libintl-prefix=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Tue Apr 12 17:57:15 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Tue, 12 Apr 2011 15:57:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[14142] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 14142 http://gar.svn.sourceforge.net/gar/?rev=14142&view=rev Author: aigoshin Date: 2011-04-12 15:57:14 +0000 (Tue, 12 Apr 2011) Log Message: ----------- nginx: release 20110412 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2011-04-12 15:51:41 UTC (rev 14141) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-04-12 15:57:14 UTC (rev 14142) @@ -1,5 +1,5 @@ NAME = nginx -VERSION = 0.8.54 +VERSION = 1.0.0 CATEGORIES = server GARCOMPILER = SOS11 @@ -60,11 +60,12 @@ CONFIGURE_ARGS += --prefix=$(localstatedir)/nginx CONFIGURE_ARGS += --http-client-body-temp-path=$(localstatedir)/nginx/client CONFIGURE_ARGS += --http-fastcgi-temp-path=$(localstatedir)/nginx/fastcgi +CONFIGURE_ARGS += --http-scgi-temp-path=$(localstatedir)/nginx/scgi +CONFIGURE_ARGS += --http-uwsgi-temp-path=$(localstatedir)/nginx/uwsgi CONFIGURE_ARGS += --http-proxy-temp-path=$(localstatedir)/nginx/proxy CONFIGURE_ARGS += --error-log-path=$(localstatedir)/nginx/logs/error.log CONFIGURE_ARGS += --http-log-path=$(localstatedir)/nginx/logs/access.log -CONFIGURE_ARGS += --with-md5=YES -CONFIGURE_ARGS += --with-sha1=YES +CONFIGURE_ARGS += --with-ipv6 CONFIGURE_ARGS += --with-http_addition_module CONFIGURE_ARGS += --with-http_dav_module CONFIGURE_ARGS += --with-http_flv_module @@ -97,7 +98,9 @@ ginstall -d $(DESTDIR)$(localstatedir)/nginx/fastcgi ginstall -d $(DESTDIR)$(localstatedir)/nginx/logs ginstall -d $(DESTDIR)$(localstatedir)/nginx/proxy + ginstall -d $(DESTDIR)$(localstatedir)/nginx/scgi ginstall -d $(DESTDIR)$(localstatedir)/nginx/sites + ginstall -d $(DESTDIR)$(localstatedir)/nginx/uwsgi cp $(WORKDIR)/cswnginx $(DESTDIR)$(sysconfdir)/init.d/ cd $(WORKSRC); \ cp -r contrib/* $(DESTDIR)$(sharedstatedir)/nginx/contrib; \ Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2011-04-12 15:51:41 UTC (rev 14141) +++ csw/mgar/pkg/nginx/trunk/checksums 2011-04-12 15:57:14 UTC (rev 14142) @@ -1 +1 @@ -44df4eb6a22d725021288c570789046f nginx-0.8.54.tar.gz +5751c920c266ea5bb5fc38af77e9c71c nginx-1.0.0.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 Tue Apr 12 18:04:37 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Apr 2011 16:04:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14143] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14143 http://gar.svn.sourceforge.net/gar/?rev=14143&view=rev Author: bdwalton Date: 2011-04-12 16:04:37 +0000 (Tue, 12 Apr 2011) Log Message: ----------- bacula/trunk: set the working directory explicitly Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 15:57:14 UTC (rev 14142) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 16:04:37 UTC (rev 14143) @@ -15,6 +15,7 @@ BUILD_DEP_PKGS += CSWreadline CSWggettext-dev CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-working-dir=$(localstatedir)/$(NAME)/working CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) CONFIGURE_ARGS += --with-libintl-prefix=$(prefix) CONFIGURE_ARGS += --with-readline=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Apr 12 19:22:22 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Apr 2011 17:22:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14144] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14144 http://gar.svn.sourceforge.net/gar/?rev=14144&view=rev Author: bdwalton Date: 2011-04-12 17:22:22 +0000 (Tue, 12 Apr 2011) Log Message: ----------- bacula/trunk: no tests to run. disable Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 16:04:37 UTC (rev 14143) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 17:22:22 UTC (rev 14144) @@ -24,4 +24,7 @@ CONFIGURE_ARGS += --with-openssl=$(prefix) CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql5 +# no tests supplied. +TEST_SCRIPTS = + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Apr 12 19:49:25 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Apr 2011 17:49:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14145] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14145 http://gar.svn.sourceforge.net/gar/?rev=14145&view=rev Author: bdwalton Date: 2011-04-12 17:49:25 +0000 (Tue, 12 Apr 2011) Log Message: ----------- bacula/trunk: set scriptdir to libexec/bacula, set logdir appropriately Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 17:22:22 UTC (rev 14144) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 17:49:25 UTC (rev 14145) @@ -23,6 +23,8 @@ CONFIGURE_ARGS += --with-tcp-wrappers=$(prefix) CONFIGURE_ARGS += --with-openssl=$(prefix) CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql5 +CONFIGURE_ARGS += --with-scriptdir=$(libexecdir_install)/$(NAME) +CONFIGURE_ARGS += --with-logdir=$(localstatedir)/log/$(NAME) # no tests supplied. TEST_SCRIPTS = 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 Apr 12 20:19:38 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Apr 2011 18:19:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[14146] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14146 http://gar.svn.sourceforge.net/gar/?rev=14146&view=rev Author: bdwalton Date: 2011-04-12 18:19:38 +0000 (Tue, 12 Apr 2011) Log Message: ----------- bacula/trunk: set pid directory to /var/opt/csw/run Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 17:49:25 UTC (rev 14145) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 18:19:38 UTC (rev 14146) @@ -25,6 +25,7 @@ CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql5 CONFIGURE_ARGS += --with-scriptdir=$(libexecdir_install)/$(NAME) CONFIGURE_ARGS += --with-logdir=$(localstatedir)/log/$(NAME) +CONFIGURE_ARGS += --with-pid-dir=$(localstatedir)/run # no tests supplied. TEST_SCRIPTS = 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 Apr 12 20:28:55 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Apr 2011 18:28:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[14147] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14147 http://gar.svn.sourceforge.net/gar/?rev=14147&view=rev Author: bdwalton Date: 2011-04-12 18:28:55 +0000 (Tue, 12 Apr 2011) Log Message: ----------- bacula/trunk: enable the tray monitor Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 18:19:38 UTC (rev 14146) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 18:28:55 UTC (rev 14147) @@ -26,6 +26,7 @@ CONFIGURE_ARGS += --with-scriptdir=$(libexecdir_install)/$(NAME) CONFIGURE_ARGS += --with-logdir=$(localstatedir)/log/$(NAME) CONFIGURE_ARGS += --with-pid-dir=$(localstatedir)/run +CONFIGURE_ARGS += --enable-tray-monitor # no tests supplied. TEST_SCRIPTS = 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 Apr 12 20:30:05 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Apr 2011 18:30:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[14148] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14148 http://gar.svn.sourceforge.net/gar/?rev=14148&view=rev Author: bdwalton Date: 2011-04-12 18:30:05 +0000 (Tue, 12 Apr 2011) Log Message: ----------- bacula/trunk: set the subsys directory too (does not piggy back on pid dir) Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 18:28:55 UTC (rev 14147) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 18:30:05 UTC (rev 14148) @@ -26,6 +26,7 @@ CONFIGURE_ARGS += --with-scriptdir=$(libexecdir_install)/$(NAME) CONFIGURE_ARGS += --with-logdir=$(localstatedir)/log/$(NAME) CONFIGURE_ARGS += --with-pid-dir=$(localstatedir)/run +CONFIGURE_ARGS += --with-subsys-dir=$(localstatedir)/run/subsys CONFIGURE_ARGS += --enable-tray-monitor # no tests supplied. 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 Apr 12 20:42:01 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 12 Apr 2011 18:42:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14149] csw/mgar/pkg Message-ID: Revision: 14149 http://gar.svn.sourceforge.net/gar/?rev=14149&view=rev Author: dmichelsen Date: 2011-04-12 18:42:00 +0000 (Tue, 12 Apr 2011) Log Message: ----------- libflac8: Initial commit, libtool issue on libgmodule.la Modified Paths: -------------- csw/mgar/pkg/libflac8/trunk/Makefile csw/mgar/pkg/libflac8/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libflac8/ Removed Paths: ------------- csw/mgar/pkg/libflac8/trunk/files/strip-nasm-1.0.4.patch csw/mgar/pkg/libflac8/trunk/files/strip-nasm-1.1.2.patch Modified: csw/mgar/pkg/libflac8/trunk/Makefile =================================================================== --- csw/mgar/pkg/flac/trunk/Makefile 2011-04-11 23:02:33 UTC (rev 14131) +++ csw/mgar/pkg/libflac8/trunk/Makefile 2011-04-12 18:42:00 UTC (rev 14149) @@ -2,17 +2,6 @@ VERSION = 1.2.1 CATEGORIES = lib -EXTRA_MODULATORS = VERSION -# Version 1.1.2 is the last to contain libflac.so.7 where most of the binaries depend on -MODULATIONS_VERSION = 1.0.4 1.1.2 1.2.1 - -# There was no 64 bit legacy version. Do not provide it as new binaries should -# link against the new version. -SKIP_MODULATIONS = isa-sparcv9-garversion-1.0.4 -SKIP_MODULATIONS += isa-amd64-garversion-1.0.4 -SKIP_MODULATIONS += isa-sparcv9-garversion-1.1.2 -SKIP_MODULATIONS += isa-amd64-garversion-1.1.2 - DESCRIPTION = Free lossless audio codec define BLURB FLAC stands for Free Lossless Audio Codec, an audio format similar @@ -27,57 +16,41 @@ SF_PROJ = flac MASTER_SITES = $(SF_MIRRORS) DISTNAME = $(SF_PROJ)-$(VERSION) -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION),$(SF_PROJ)-$(VERSION).tar.gz) -DISTFILES = $(SOURCEFILES) +DISTFILES = $(DISTNAME).tar.gz -NOEXTRACT = $(filter-out $(SF_PROJ)-$(VERSION).tar.gz,$(SOURCEFILES)) +PATCHFILES += libtool-64bit.patch +PATCHFILES += strip-nasm-1.2.1.patch +PATCHFILES += no-stdint.patch -PATCHFILES_isa-sparcv8-garversion-1.1.2 = libtool-64bit.patch -PATCHFILES_isa-sparcv9-garversion-1.1.2 = libtool-64bit.patch -PATCHFILES_isa-sparcv8-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch -PATCHFILES_isa-sparcv9-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch +BUILD_DEP_PKGS += CSWbash -PATCHFILES_isa-i386-garversion-1.0.4 = strip-nasm-1.0.4.patch -PATCHFILES_isa-i386-garversion-1.1.2 = strip-nasm-1.1.2.patch libtool-64bit.patch -PATCHFILES_isa-amd64-garversion-1.1.2 = libtool-64bit.patch -PATCHFILES_isa-i386-garversion-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch -PATCHFILES_isa-amd64-garversion-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch +PACKAGES += CSWlibflac8 +CATALOGNAME_CSWlibflac8 = libflac8 +SPKG_DESC_CSWlibflac8 = Free lossless audio codec library, libflac.so.8 +PKGFILES_CSWlibflac8 = $(call pkgfiles_lib,libFLAC.so.8) +RUNTIME_DEP_PKGS_CSWlibflac8 += CSWiconv -PACKAGES = CSWflac CSWxmmsflac -CATALOGNAME_CSWflac = libflac -CATALOGNAME_CSWxmmsflac = xmms_flac +# Override conflicts with CSWflac as the new CSWflac is built from the latest libflac +CHECKPKG_OVERRIDES_CSWlibflac7 += file-collision|/opt/csw/lib/libFLAC.so.7.0.0|CSWflac|CSWlibflac7 +CHECKPKG_OVERRIDES_CSWlibflac7 += file-collision|/opt/csw/lib/libFLAC.so.7|CSWflac|CSWlibflac7 -BUILD_DEP_PKGS = CSWbash CSWnasm +VENDOR_URL = http://flac.sourceforge.net/ -RUNTIME_DEP_PKGS_CSWflac = CSWiconv CSWlibogg -RUNTIME_DEP_PKGS_CSWxmmsflac = CSWglib CSWgtk CSWxmms CSWflac CSWiconv CSWlibogg - -SPKG_DESC_CSWflac = Free lossless audio codec -SPKG_DESC_CSWxmmsflac = FLAC plugin for XMMS - -SPKG_SOURCEURL = http://flac.sourceforge.net/ - LICENSE = $(foreach lic,FDL GPL LGPL Xiph,COPYING.$(lic)) -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=13478 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = flac-(\d+(?:\.\d+)*)-src +# EXTRA_LINKER_FLAGS = -liconv -lm -BUILD64 = 1 - -# For 1.0.4 -EXTRA_LINKER_FLAGS = -liconv - -NODIRPATHS = --includedir +# Must be defined and empty or -I$(includedir) is added too early +# EXTRA_INC = ../../include CPPFLAGS = +EXTRA_CFLAGS = $(INCLUDE_FLAGS) -D__inline= +# EXTRA_CFLAGS = -D__inline= -# Must be defined and empty or -I$(includedir) is added too early -EXTRA_CFLAGS = -D__inline= -EXTRA_BUILD_EXPORTS = AM_CFLAGS +STRIP_LIBTOOL = 1 -EXTRA_CONFIGURE_ARGS_mm-64 = --disable-xmms-plugin CONFIGURE_ARGS = $(DIRPATHS) + +EXTRA_CONFIGURE_ARGS_mm-64 = --disable-xmms-plugin CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_mm-$(MEMORYMODEL)) # XXX: Assembler optimization just doesn't work. Disable for now. @@ -85,54 +58,8 @@ TEST_TARGET = check -MERGE_SCRIPTS_isa-i386-garversion-1.0.4 = copy-only -MERGE_DIRS_isa-i386-garversion-1.0.4 = $(libdir) -MERGE_SCRIPTS_isa-amd64-garversion-1.0.4 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-1.0.4 = $(libdir) +# There is one test failing, but as this is really a long-outdated legacy library +# I don't care much for now. +# SKIPTEST ?= 1 -MERGE_SCRIPTS_isa-i386-garversion-1.1.2 = copy-only -MERGE_DIRS_isa-i386-garversion-1.1.2 = $(libdir) -MERGE_SCRIPTS_isa-amd64-garversion-1.1.2 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-1.1.2 = $(libdir) - -MERGE_SCRIPTS_isa-i386-garversion-1.2.1 = copy-all -MERGE_SCRIPTS_isa-amd64-garversion-1.2.1 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - -MERGE_SCRIPTS_isa-sparcv8-garversion-1.0.4 = copy-only -MERGE_DIRS_isa-sparcv8-garversion-1.0.4 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-garversion-1.0.4 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-1.0.4 = $(libdir) - -MERGE_SCRIPTS_isa-sparcv8-garversion-1.1.2 = copy-only -MERGE_DIRS_isa-sparcv8-garversion-1.1.2 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-garversion-1.1.2 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-1.1.2 = $(libdir) - -MERGE_SCRIPTS_isa-sparcv8-garversion-1.2.1 = copy-all -MERGE_SCRIPTS_isa-sparcv9-garversion-1.2.1 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - -PKGFILES_CSWxmmsflac = $(libdir)/xmms/.* - include gar/category.mk - -CC := $(abspath ./bin/cc) -CXX := $(abspath ./bin/CC) -PATH := ./bin:$(PATH):/usr/ccs/bin - -post-patch-isa-i386-garversion-1.0.4: - perl -pi -e "s/-O3 //g" $(WORKSRC)/configure - $(MAKECOOKIE) - -post-patch-isa-i386-garversion-1.1.2: - perl -pi -e "s/-O2 //g" $(WORKSRC)/configure - $(MAKECOOKIE) - -post-patch-isa-sparcv8-garversion-1.0.4: - perl -pi -e "s/-O3 //g" $(WORKSRC)/configure - $(MAKECOOKIE) - -post-patch-isa-sparcv8-garversion-1.1.2: - perl -pi -e "s/-O2 //g" $(WORKSRC)/configure - $(MAKECOOKIE) Modified: csw/mgar/pkg/libflac8/trunk/checksums =================================================================== --- csw/mgar/pkg/flac/trunk/checksums 2011-04-11 23:02:33 UTC (rev 14131) +++ csw/mgar/pkg/libflac8/trunk/checksums 2011-04-12 18:42:00 UTC (rev 14149) @@ -1,8 +1 @@ -b1523e6ad8ef85d1df5b18f20a8cfad6 download/flac-1.0.4.tar.gz -2bfc127cdda02834d0491ab531a20960 download/flac-1.1.2.tar.gz -153c8b15a54da428d1f0fadc756c22c7 download/flac-1.2.1.tar.gz -c9e9052e1d1238a21ac6c4ab263d2b7f download/libtool-64bit.patch -e3144fad8810ceaca718adb6f09dc8fa download/no-stdint.patch -03e0502642d568b5b004f69328485720 download/strip-nasm-1.0.4.patch -394225d96661019d32cc0ebfdad3d377 download/strip-nasm-1.1.2.patch -64e7f447c2ca09ec041e6740a209291d download/strip-nasm-1.2.1.patch +153c8b15a54da428d1f0fadc756c22c7 flac-1.2.1.tar.gz Deleted: csw/mgar/pkg/libflac8/trunk/files/strip-nasm-1.0.4.patch =================================================================== --- csw/mgar/pkg/flac/trunk/files/strip-nasm-1.0.4.patch 2011-04-11 23:02:33 UTC (rev 14131) +++ csw/mgar/pkg/libflac8/trunk/files/strip-nasm-1.0.4.patch 2011-04-12 18:42:00 UTC (rev 14149) @@ -1,32 +0,0 @@ -diff -Naur flac-1.0.4.orig/src/libFLAC/ia32/Makefile.in flac-1.0.4.patched/src/libFLAC/ia32/Makefile.in ---- flac-1.0.4.orig/src/libFLAC/ia32/Makefile.in 2002-09-25 06:53:37.000000000 +0200 -+++ flac-1.0.4.patched/src/libFLAC/ia32/Makefile.in 2009-08-03 11:12:29.197650544 +0200 -@@ -134,7 +134,7 @@ - - SUFFIXES = .nasm .lo - --STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh -+STRIP_FPIC = /opt/csw/bin/bash $(top_srcdir)/strip_fPIC.sh - - noinst_LTLIBRARIES = libFLAC-asm.la - libFLAC_asm_la_SOURCES = \ -diff -Naur flac-1.0.4.orig/strip_fPIC.sh flac-1.0.4.patched/strip_fPIC.sh ---- flac-1.0.4.orig/strip_fPIC.sh 2002-08-26 21:21:52.000000000 +0200 -+++ flac-1.0.4.patched/strip_fPIC.sh 2009-08-03 11:12:00.031237509 +0200 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/opt/csw/bin/bash - # - # libtool assumes that the compiler can handle the -fPIC flag - # This isn't always true (for example, nasm can't handle it) -@@ -6,8 +6,10 @@ - while [ $1 ]; do - if [ "$1" != "-fPIC" ]; then - if [ "$1" != "-DPIC" ]; then -+ if [ "$1" != "-KPIC" ]; then - command="$command $1" - fi -+ fi - fi - shift - done Deleted: csw/mgar/pkg/libflac8/trunk/files/strip-nasm-1.1.2.patch =================================================================== --- csw/mgar/pkg/flac/trunk/files/strip-nasm-1.1.2.patch 2011-04-11 23:02:33 UTC (rev 14131) +++ csw/mgar/pkg/libflac8/trunk/files/strip-nasm-1.1.2.patch 2011-04-12 18:42:00 UTC (rev 14149) @@ -1,34 +0,0 @@ -diff -Naur flac-1.1.2.orig/src/libFLAC/ia32/Makefile.in flac-1.1.2.patched/src/libFLAC/ia32/Makefile.in ---- flac-1.1.2.orig/src/libFLAC/ia32/Makefile.in 2005-02-05 03:23:38.000000000 +0100 -+++ flac-1.1.2.patched/src/libFLAC/ia32/Makefile.in 2009-08-04 09:37:40.159783125 +0200 -@@ -253,7 +253,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - SUFFIXES = .nasm .lo --STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh -+STRIP_NON_ASM = /opt/csw/bin/bash $(top_srcdir)/strip_non_asm_libtool_args.sh - noinst_LTLIBRARIES = libFLAC-asm.la - libFLAC_asm_la_SOURCES = \ - cpu_asm.nasm \ -diff -Naur flac-1.1.2.orig/strip_non_asm_libtool_args.sh flac-1.1.2.patched/strip_non_asm_libtool_args.sh ---- flac-1.1.2.orig/strip_non_asm_libtool_args.sh 2004-07-29 08:52:52.000000000 +0200 -+++ flac-1.1.2.patched/strip_non_asm_libtool_args.sh 2009-08-04 09:38:06.129792997 +0200 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/opt/csw/bin/bash - # - # libtool assumes that the compiler can handle the -fPIC flag. - # This isn't always true (for example, nasm can't handle it). -@@ -8,10 +8,12 @@ - while [ $1 ]; do - if [ "$1" != "-fPIC" ]; then - if [ "$1" != "-DPIC" ]; then -+ if [ "$1" != "-KPIC" ]; then - if [ "$1" != "-fno-common" ]; then - command="$command $1" - fi - fi -+ fi - fi - shift - done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Apr 12 20:42:39 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Apr 2011 18:42:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14150] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14150 http://gar.svn.sourceforge.net/gar/?rev=14150&view=rev Author: bdwalton Date: 2011-04-12 18:42:39 +0000 (Tue, 12 Apr 2011) Log Message: ----------- bacula/trunk: add first runtime (non library) dep Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 18:42:00 UTC (rev 14149) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 18:42:39 UTC (rev 14150) @@ -14,6 +14,8 @@ BUILD_DEP_PKGS = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel BUILD_DEP_PKGS += CSWreadline CSWggettext-dev +RUNTIME_DEP_PKGS += CSWmtx + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-working-dir=$(localstatedir)/$(NAME)/working CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Apr 12 21:14:42 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Apr 2011 19:14:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14151] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14151 http://gar.svn.sourceforge.net/gar/?rev=14151&view=rev Author: bdwalton Date: 2011-04-12 19:14:42 +0000 (Tue, 12 Apr 2011) Log Message: ----------- bacula/trunk: enable full readline in favour of conio (requires extra inc/lib dirs) Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 18:42:39 UTC (rev 14150) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-12 19:14:42 UTC (rev 14151) @@ -20,6 +20,8 @@ CONFIGURE_ARGS += --with-working-dir=$(localstatedir)/$(NAME)/working CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) CONFIGURE_ARGS += --with-libintl-prefix=$(prefix) +CONFIGURE_ARGS += --disable-conio +CONFIGURE_ARGS += --enable-readline CONFIGURE_ARGS += --with-readline=$(prefix) CONFIGURE_ARGS += --with-python=$(prefix) CONFIGURE_ARGS += --with-tcp-wrappers=$(prefix) @@ -31,6 +33,9 @@ CONFIGURE_ARGS += --with-subsys-dir=$(localstatedir)/run/subsys CONFIGURE_ARGS += --enable-tray-monitor +EXTRA_INC += $(includedir)/ncursesw/ +EXTRA_LIB += $(libdir)/ncursesw/ + # no tests supplied. TEST_SCRIPTS = 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 Apr 13 01:50:55 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Apr 2011 23:50:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[14152] csw/mgar/pkg/cswutils/trunk Message-ID: Revision: 14152 http://gar.svn.sourceforge.net/gar/?rev=14152&view=rev Author: bdwalton Date: 2011-04-12 23:50:54 +0000 (Tue, 12 Apr 2011) Log Message: ----------- cswutils/trunk: depend on rsync at build time; rework where we get the .py files from and how they get installed Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile csw/mgar/pkg/cswutils/trunk/checksums Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2011-04-12 19:14:42 UTC (rev 14151) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2011-04-12 23:50:54 UTC (rev 14152) @@ -9,50 +9,22 @@ endef SVNROOT = http://opencsw.svn.sourceforge.net/svnroot/opencsw/utilities/ -SVN_REV = 133 +SVN_REV = 364 SVNROOT_gar = https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2/lib/python/ SVN_REV_gar = HEAD MASTER_SITES = -# these are pulled from gar/lib/python -PYFILES += catalog.py -PYFILES += checkpkg.py -PYFILES += checkpkg2.py -PYFILES += checkpkg_lib.py -PYFILES += common_constants.py -PYFILES += compare_pkgs.py -PYFILES += configuration.py -PYFILES += database.py -PYFILES += dependency_checks.py -PYFILES += inspective_package.py -PYFILES += ldd_emul.py -PYFILES += models.py -PYFILES += mute_progressbar.py -PYFILES += opencsw.py -PYFILES += overrides.py -PYFILES += package.py -PYFILES += package_checks.py -PYFILES += package_stats.py -PYFILES += pkgdb.py -PYFILES += pkgmap.py -PYFILES += pylintrc -PYFILES += sharedlib_utils.py -PYFILES += shell.py -PYFILES += struct_util.py -PYFILES += submit_to_newpkgs.py -PYFILES += system_pkgmap.py -PYFILES += tag.py - DISTFILES = COPYING DISTFILES += checkpkg checkpkg.8 DISTFILES += cpan2pkg DISTFILES += createpkg createpkg.8 DISTFILES += stagepkg stagepkg.8 DISTFILES += stagepkg stagepkg.8 -DISTFILES += $(PYFILES) +BUILD_DEP_PKGS = CSWrsync + RUNTIME_DEP_PKGS += CSWcoreutils RUNTIME_DEP_PKGS += CSWfakeroot RUNTIME_DEP_PKGS += CSWperl @@ -81,12 +53,6 @@ include gar/category.mk -$(foreach PY,$(PYFILES),$(DOWNLOADDIR)/$(PY)): - @echo "Grabbing $@" - @svn export -r $(SVN_REV_gar) $(SVNROOT_gar)$(subst -r$(SVN_REV_gar),,$(notdir $@)) - @mv $(subst -r$(SVN_REV_gar),,$(notdir $@)) $@ - @$(MAKECOOKIE) - install-custom: @ginstall -d $(DESTDIR)$(bindir) @ginstall $(WORKSRC)/checkpkg $(DESTDIR)$(bindir) @@ -99,10 +65,10 @@ @ginstall $(WORKSRC)/createpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall -d $(DESTDIR)$(libdir)/python/csw - @for f in $(PYFILES); do \ - ginstall -m 755 $(WORKSRC)/$${f} \ - $(DESTDIR)/$(libdir)/python/csw/; \ - done - @ln -s ../lib/python/csw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg - @ln -s ../lib/python/csw/submit_to_newpkgs.py $(DESTDIR)$(bindir)/submitpkg + @rsync -av --exclude=.svn/ --exclude='*.pyc' $(GARDIR)/lib/python/ \ + $(DESTDIR)/$(libdir)/python/csw/ + @ln -s ../lib/python/csw/compare_pkgs.py \ + $(DESTDIR)$(bindir)/comparepkg + @ln -s ../lib/python/csw/submit_to_newpkgs.py \ + $(DESTDIR)$(bindir)/submitpkg @$(MAKECOOKIE) Modified: csw/mgar/pkg/cswutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswutils/trunk/checksums 2011-04-12 19:14:42 UTC (rev 14151) +++ csw/mgar/pkg/cswutils/trunk/checksums 2011-04-12 23:50:54 UTC (rev 14152) @@ -1,27 +0,0 @@ -4b5ef28c5a8fb45f60d57d5a12bc31b5 catalog.py -e2150c4ad6bbb5545a3ddc23eccea8d9 checkpkg.py -03c7384869e75284b0df6803df62b68f checkpkg2.py -7181db66ceb6929dd540ada837f1b4cf checkpkg_lib.py -b7ed7604e92d375b421f69a17fbf27cd common_constants.py -70200cc5eb2c87a1b1aaf6efa6ffd2bc compare_pkgs.py -f4789eb3717cd52ea84eb5ce53040643 configuration.py -10b999d9f9b2c5e380edba9ab2302188 database.py -d6fe04aa4349dfd980d053ce7b2210eb dependency_checks.py -7bfe4469e93caa02064ae63d65435cf9 inspective_package.py -ae8f0f606838bbc14670e145bcc7442d ldd_emul.py -1f7e98eb1b2166f89992f67d0a92f183 models.py -5ab798ae3fe3a2e10c1d2aa9e4a31594 mute_progressbar.py -283779d73a88aca3d3fa203b38d4c0d8 opencsw.py -614dca976de7a563a587e6fd5b585629 overrides.py -fa476d0cec5adbac1091192a6aefe8b3 package.py -e3737793a23b1955b1f369c9a030c117 package_checks.py -f9bde429846be3d98f9e4af11a36672e package_stats.py -ad38d99678db4d758e3e7a9265adcfdf pkgdb.py -fa5c633db8dbd1da61d12e4a858720c4 pkgmap.py -0dc3c750ee9f5c0286c2e292b2e27086 pylintrc -519169afa0be666d05cbfa94fce1a205 sharedlib_utils.py -000b4eacb602a91e02dcdcfc0858c42c shell.py -de09f38d0c145c572a4e44ab17bb02ef struct_util.py -2fb7af0c40fa5da3ee034014ae5b9855 submit_to_newpkgs.py -64d86b86a7d5a65d6685aa60aa0d5aec system_pkgmap.py -60a9a1281f9ab455c5fa90c084f05d64 tag.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Apr 13 01:56:01 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Apr 2011 23:56:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14153] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 14153 http://gar.svn.sourceforge.net/gar/?rev=14153&view=rev Author: bdwalton Date: 2011-04-12 23:56:00 +0000 (Tue, 12 Apr 2011) Log Message: ----------- cswutils/trunk: override checkpkg bad file content checks triggered by test files/data Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2011-04-12 23:50:54 UTC (rev 14152) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2011-04-12 23:56:00 UTC (rev 14153) @@ -51,6 +51,16 @@ CHECKPKG_OVERRIDES_CSWcswutils += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWcswutils += catalogname-does-not-start-with-py_ +# possibly remove these and omit the *test* files from distribution entirely +CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/export/home|root/opt/csw/lib/python/csw/testdata/rpaths.py +CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/export/home|root/opt/csw/lib/python/csw/package_checks_test.py +CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/opt/build|root/opt/csw/lib/python/csw/testdata/rpaths.py +CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/opt/build|root/opt/csw/lib/python/csw/package_checks_test.py +CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/usr/local|root/opt/csw/lib/python/csw/package_checks_test.py +CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/usr/local|root/opt/csw/lib/python/csw/testdata/rpaths.py +CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/export/medusa|root/opt/csw/lib/python/csw/package_checks_test.py +CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/export/medusa|root/opt/csw/lib/python/csw/testdata/rpaths.py + include gar/category.mk install-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 Wed Apr 13 01:59:09 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Apr 2011 23:59:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[14154] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 14154 http://gar.svn.sourceforge.net/gar/?rev=14154&view=rev Author: bdwalton Date: 2011-04-12 23:59:09 +0000 (Tue, 12 Apr 2011) Log Message: ----------- cswutils/trunk: add more python deps to match those used by GAR to run all the .py code Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2011-04-12 23:56:00 UTC (rev 14153) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2011-04-12 23:59:09 UTC (rev 14154) @@ -31,9 +31,13 @@ RUNTIME_DEP_PKGS += CSWpmhtmltree RUNTIME_DEP_PKGS += CSWpmlibwww RUNTIME_DEP_PKGS += CSWpmyaml +RUNTIME_DEP_PKGS += CSWpy-cheetah +RUNTIME_DEP_PKGS += CSWpy-hachoir-core RUNTIME_DEP_PKGS += CSWpy-hachoir-parser RUNTIME_DEP_PKGS += CSWpy-libmagic RUNTIME_DEP_PKGS += CSWpy-progressbar +RUNTIME_DEP_PKGS += CSWpy-sqlobject +RUNTIME_DEP_PKGS += CSWpy-yaml RUNTIME_DEP_PKGS += CSWpython WORKSRC = $(WORKDIR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Apr 13 12:09:04 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 13 Apr 2011 10:09:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[14155] csw/mgar/pkg/lang-python Message-ID: Revision: 14155 http://gar.svn.sourceforge.net/gar/?rev=14155&view=rev Author: skayser Date: 2011-04-13 10:09:04 +0000 (Wed, 13 Apr 2011) Log Message: ----------- lang-python/mako: initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/mako/ csw/mgar/pkg/lang-python/mako/branches/ csw/mgar/pkg/lang-python/mako/tags/ csw/mgar/pkg/lang-python/mako/trunk/ csw/mgar/pkg/lang-python/mako/trunk/Makefile csw/mgar/pkg/lang-python/mako/trunk/checksums csw/mgar/pkg/lang-python/mako/trunk/files/ csw/mgar/pkg/lang-python/mako/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/lang-python/mako/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/lang-python/mako/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mako/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/mako/trunk/Makefile 2011-04-13 10:09:04 UTC (rev 14155) @@ -0,0 +1,27 @@ +# $Id$ +NAME = mako +VERSION = 0.4.1 +CATEGORIES = python + +DESCRIPTION = Fast and lightweight templating for Python +define BLURB + Mako is a template library written in Python. It provides a familiar, + non-XML syntax which compiles into Python modules for maximum + performance. Mako's syntax and API borrows from the best ideas of many + others, including Django templates, Cheetah, Myghty, and Genshi. + Conceptually, Mako is an embedded Python (i.e. Python Server Page) + language, which refines the familiar ideas of componentized layout and + inheritance to produce one of the most straightforward and flexible + models available, while also maintaining close ties to Python calling + and scoping semantics. +endef + +VENDOR_URL = http://www.makotemplates.org/ +MASTER_SITES = http://www.makotemplates.org/downloads/ +DISTNAME = $(subst m,M,$(NAME))-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += changelog.CSW + +UPSTREAM_MASTER_SITES = http://www.makotemplates.org/download.html + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/mako/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/mako/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/mako/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/mako/trunk/checksums 2011-04-13 10:09:04 UTC (rev 14155) @@ -0,0 +1 @@ +c69bceb23c832b74075f438408fea118 Mako-0.4.1.tar.gz Added: csw/mgar/pkg/lang-python/mako/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lang-python/mako/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/lang-python/mako/trunk/files/changelog.CSW 2011-04-13 10:09:04 UTC (rev 14155) @@ -0,0 +1,5 @@ +py_mako (0.4.1,REV=2011.04.13) + + * Initial release. + + -- Sebastian Kayser Wed, 13 Apr 2011 12:03:16 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Apr 13 12:21:57 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 13 Apr 2011 10:21:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[14156] csw/mgar/pkg/lang-python/mako/trunk/Makefile Message-ID: Revision: 14156 http://gar.svn.sourceforge.net/gar/?rev=14156&view=rev Author: skayser Date: 2011-04-13 10:21:56 +0000 (Wed, 13 Apr 2011) Log Message: ----------- lang-python/mako/trunk: set archall=1 Modified Paths: -------------- csw/mgar/pkg/lang-python/mako/trunk/Makefile Modified: csw/mgar/pkg/lang-python/mako/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mako/trunk/Makefile 2011-04-13 10:09:04 UTC (rev 14155) +++ csw/mgar/pkg/lang-python/mako/trunk/Makefile 2011-04-13 10:21:56 UTC (rev 14156) @@ -24,4 +24,6 @@ UPSTREAM_MASTER_SITES = http://www.makotemplates.org/download.html +ARCHALL = 1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Apr 13 12:25:48 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 13 Apr 2011 10:25:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14157] csw/mgar/gar/v2 Message-ID: Revision: 14157 http://gar.svn.sourceforge.net/gar/?rev=14157&view=rev Author: skayser Date: 2011-04-13 10:25:48 +0000 (Wed, 13 Apr 2011) Log Message: ----------- .buildsys/v2: add changelog.CSW handling similar to README.CSW, also adjust _DBG -> _DBG_MERGE for merge related targets Modified Paths: -------------- csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2011-04-13 10:21:56 UTC (rev 14156) +++ csw/mgar/gar/v2/gar.mk 2011-04-13 10:25:48 UTC (rev 14157) @@ -806,7 +806,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) merge-README.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod) post-merge +merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) merge-distfile-README.CSW merge-distfile-changelog.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod) post-merge banner merge @$(MAKECOOKIE) @@ -890,7 +890,7 @@ .PHONY: remerge reset-merge reset-merge-modulated remerge: reset-merge merge -reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-alternatives reset-merge-README.CSW reset-merge-obsolete reset-merge-ap2mod reset-merge-src +reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-alternatives reset-merge-distfile-README.CSW reset-merge-distfile-changelog.CSW reset-merge-obsolete reset-merge-ap2mod reset-merge-src @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge @rm -rf $(PKGROOT) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-04-13 10:21:56 UTC (rev 14156) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-04-13 10:25:48 UTC (rev 14157) @@ -705,19 +705,19 @@ 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 \ +merge-distfile-%: $(DOWNLOADDIR) + $(_DBG_MERGE)if test -f $(DOWNLOADDIR)/$*; then \ $(foreach P,$(_PKG_SPECS),mkdir -p $(PKGROOT)$(docdir)/$(call catalogname,$P);) \ - $(foreach P,$(_PKG_SPECS),cp $(WORKDIR)/README.CSW $(PKGROOT)$(docdir)/$(call catalogname,$P)/README.CSW;) \ + $(foreach P,$(_PKG_SPECS),cp $(DOWNLOADDIR)/$* $(PKGROOT)$(docdir)/$(call catalogname,$P)/$*;) \ fi @$(MAKECOOKIE) -.PHONY: reset-merge-README.CSW -reset-merge-README.CSW: - $(_DBG)rm -f $(COOKIEDIR)/merge-README.CSW $(foreach SPEC,$(_PKG_SPECS),$(PKGROOT)$(docdir)/$(call catalogname,$(SPEC))/README.CSW) +.PHONY: reset-merge-distfile-% +reset-merge-distfile-%: + $(_DBG_MERGE)rm -f $(COOKIEDIR)/merge-distfile-$* $(foreach SPEC,$(_PKG_SPECS),$(PKGROOT)$(docdir)/$(call catalogname,$(SPEC))/$*) merge-obsolete: $(WORKDIR_GLOBAL) - $(_DBG)$(foreach P,$(OBSOLETED_PKGS),$(foreach Q,$(OBSOLETING_PKGS),$(if $(filter $P,$(OBSOLETED_BY_$Q)), \ + $(_DBG_MERGE)$(foreach P,$(OBSOLETED_PKGS),$(foreach Q,$(OBSOLETING_PKGS),$(if $(filter $P,$(OBSOLETED_BY_$Q)), \ ($(if $(SPKG_DESC_$Q), \ echo "$Q $(call catalogname,$Q) - $(SPKG_DESC_$Q)";, \ echo "$(shell (/usr/bin/pkginfo $Q || echo "$Q - ") | $(GAWK) '{ $$1 = "P"; print }')"; \ 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 Apr 13 13:11:44 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Apr 2011 11:11:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[14158] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14158 http://gar.svn.sourceforge.net/gar/?rev=14158&view=rev Author: wahwah Date: 2011-04-13 11:11:44 +0000 (Wed, 13 Apr 2011) Log Message: ----------- csw-upload-pkg: Display file with wrong vendor tag It will make the output easier to understand by users. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/file_set_checker.py csw/mgar/gar/v2/lib/python/file_set_checker_test.py Modified: csw/mgar/gar/v2/lib/python/file_set_checker.py =================================================================== --- csw/mgar/gar/v2/lib/python/file_set_checker.py 2011-04-13 10:25:48 UTC (rev 14157) +++ csw/mgar/gar/v2/lib/python/file_set_checker.py 2011-04-13 11:11:44 UTC (rev 14158) @@ -23,8 +23,8 @@ tags.append(tag.CheckpkgTag( None, "bad-vendor-tag", - "%s expected=%s actual=%s" - % (parsed_filename["catalogname"], + "filename=%s expected=%s actual=%s" + % (filename, expected_vendor_tag, parsed_filename["vendortag"]))) return tags Modified: csw/mgar/gar/v2/lib/python/file_set_checker_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/file_set_checker_test.py 2011-04-13 10:25:48 UTC (rev 14157) +++ csw/mgar/gar/v2/lib/python/file_set_checker_test.py 2011-04-13 11:11:44 UTC (rev 14158) @@ -44,8 +44,12 @@ def testUncommitted(self): fc = file_set_checker.FileSetChecker() expected = [ - tag.CheckpkgTag(None, 'bad-vendor-tag', 'nspr_devel expected=CSW actual=UNCOMMITTED'), - tag.CheckpkgTag(None, 'bad-vendor-tag', 'nspr_devel expected=CSW actual=UNCOMMITTED'), + tag.CheckpkgTag( + None, 'bad-vendor-tag', + 'filename=nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-sparc-UNCOMMITTED.pkg.gz expected=CSW actual=UNCOMMITTED'), + tag.CheckpkgTag( + None, 'bad-vendor-tag', + 'filename=nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-i386-UNCOMMITTED.pkg.gz expected=CSW actual=UNCOMMITTED'), ] files = ['/home/experimental/maciej/' 'nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-sparc-UNCOMMITTED.pkg.gz', @@ -57,7 +61,7 @@ fc = file_set_checker.FileSetChecker() expected = [ tag.CheckpkgTag(None, 'bad-arch-or-os-release', 'csw-upload-pkg arch=pkg osrel=unspecified'), - tag.CheckpkgTag(None, 'bad-vendor-tag', 'csw expected=CSW actual=UNKN'), + tag.CheckpkgTag(None, 'bad-vendor-tag', 'filename=csw-upload-pkg expected=CSW actual=UNKN'), ] files = ['csw-upload-pkg'] self.assertEqual(expected, fc.CheckFiles(files)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Apr 13 17:54:20 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 13 Apr 2011 15:54:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[14159] csw/mgar/pkg Message-ID: Revision: 14159 http://gar.svn.sourceforge.net/gar/?rev=14159&view=rev Author: skayser Date: 2011-04-13 15:54:20 +0000 (Wed, 13 Apr 2011) Log Message: ----------- yad: initial commit Added Paths: ----------- csw/mgar/pkg/yad/ csw/mgar/pkg/yad/branches/ csw/mgar/pkg/yad/tags/ csw/mgar/pkg/yad/trunk/ csw/mgar/pkg/yad/trunk/Makefile csw/mgar/pkg/yad/trunk/checksums csw/mgar/pkg/yad/trunk/files/ Property changes on: csw/mgar/pkg/yad/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/yad/trunk/Makefile =================================================================== --- csw/mgar/pkg/yad/trunk/Makefile (rev 0) +++ csw/mgar/pkg/yad/trunk/Makefile 2011-04-13 15:54:20 UTC (rev 14159) @@ -0,0 +1,32 @@ +# $Id$ +# +# TODO (release-critical prefixed with !, non release-critical with *) +# ! doesn't compile yet +# CC yad-about.o +# "yad.h", line 176: syntax error before or at: & +# "yad.h", line 176: warning: syntax requires ";" after last struct/union member +# "about.c", line 62: cannot recover from previous errors +# cc: acomp failed for about.c + +NAME = yad +VERSION = 0.10.1 +CATEGORIES = apps + +DESCRIPTION = Display GTK dialog boxes from shell scripts (zenity fork) +define BLURB + Yad (yet another dialog) is a fork of Zenity with many improvements, + such as custom buttons, additional dialogs, pop-up menu in notification + icon and more. +endef + +VENDOR_URL = http://code.google.com/p/yad/ +MASTER_SITES = http://yad.googlecode.com/files/ +DISTFILES = $(DISTNAME).tar.xz + +UPSTREAM_MASTER_SITES = http://code.google.com/p/yad/downloads/list + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +PATH := $(prefix)/gnu:$(PATH) Property changes on: csw/mgar/pkg/yad/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/yad/trunk/checksums =================================================================== --- csw/mgar/pkg/yad/trunk/checksums (rev 0) +++ csw/mgar/pkg/yad/trunk/checksums 2011-04-13 15:54:20 UTC (rev 14159) @@ -0,0 +1 @@ +ddde3970ce4a2ad2288011f2f1407a42 yad-0.10.1.tar.xz 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 Apr 13 19:42:04 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Apr 2011 17:42:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[14160] csw/mgar/pkg/bacula/trunk Message-ID: Revision: 14160 http://gar.svn.sourceforge.net/gar/?rev=14160&view=rev Author: bdwalton Date: 2011-04-13 17:42:04 +0000 (Wed, 13 Apr 2011) Log Message: ----------- bacula/trunk: correct the autoconf AC_INIT use and rebuild configure to make docdir work properly Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bacula/trunk/files/0001-correct-the-autoconf-initializations.patch Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-13 15:54:20 UTC (rev 14159) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-13 17:42:04 UTC (rev 14160) @@ -10,6 +10,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-correct-the-autoconf-initializations.patch BUILD_DEP_PKGS = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel BUILD_DEP_PKGS += CSWreadline CSWggettext-dev @@ -40,3 +41,10 @@ TEST_SCRIPTS = include gar/category.mk + +pre-configure-modulated: + (cd $(WORKSRC); \ + autoconf --prepend-include=$(abspath $(WORKSRC))/autoconf \ + autoconf/configure.in > configure; \ + chmod 755 configure) + @$(MAKECOOKIE) Added: csw/mgar/pkg/bacula/trunk/files/0001-correct-the-autoconf-initializations.patch =================================================================== --- csw/mgar/pkg/bacula/trunk/files/0001-correct-the-autoconf-initializations.patch (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/0001-correct-the-autoconf-initializations.patch 2011-04-13 17:42:04 UTC (rev 14160) @@ -0,0 +1,27 @@ +From 7abbac2b02f54436652774ec86107105ef220db8 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 13 Apr 2011 15:48:18 +0200 +Subject: [PATCH] correct the autoconf initializations + +Signed-off-by: Ben Walton +--- + autoconf/configure.in | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/autoconf/configure.in b/autoconf/configure.in +index 0ce9d94..45c623a 100644 +--- a/autoconf/configure.in ++++ b/autoconf/configure.in +@@ -4,7 +4,8 @@ dnl Process this file with autoconf to produce a configure script. + dnl + dnl require a recent autoconf + AC_PREREQ(2.61) +-AC_INIT(src/version.h) ++AC_INIT([bacula], [5.0.3]) ++AC_CONFIG_SRCDIR(src/version.h) + BUILD_DIR=`pwd` + cd .. + TOP_DIR=`pwd` +-- +1.7.3.2 + 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 Apr 13 21:12:59 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Apr 2011 19:12:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[14161] csw/mgar/pkg/bacula/trunk Message-ID: Revision: 14161 http://gar.svn.sourceforge.net/gar/?rev=14161&view=rev Author: bdwalton Date: 2011-04-13 19:12:58 +0000 (Wed, 13 Apr 2011) Log Message: ----------- bacula/trunk: update the autoconf patch so it can be submitted upstream (make version string dynamic) Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch Removed Paths: ------------- csw/mgar/pkg/bacula/trunk/files/0001-correct-the-autoconf-initializations.patch Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-13 17:42:04 UTC (rev 14160) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-13 19:12:58 UTC (rev 14161) @@ -10,7 +10,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz -PATCHFILES += 0001-correct-the-autoconf-initializations.patch +PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch BUILD_DEP_PKGS = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel BUILD_DEP_PKGS += CSWreadline CSWggettext-dev Added: csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch =================================================================== --- csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch 2011-04-13 19:12:58 UTC (rev 14161) @@ -0,0 +1,38 @@ +From 1530af24085deb5d6798c88147fe7090f0048c72 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 13 Apr 2011 20:54:02 +0200 +Subject: [PATCH] Update AC_INIT use to make configure handle docdir + +This patch allows AC_INIT to properly set the PACKAGE variables in the +Makefiles. In turn, this allows docdir use to work correctly. With +the new behaviour, things placed in docdir go to share/doc/bacula. +Previously the would end up in share/doc. + +We move the detection of the source directory to a separate +AC_CONFIG_SRCDIR macro call. + +Signed-off-by: Ben Walton +--- + autoconf/configure.in | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/autoconf/configure.in b/autoconf/configure.in +index 0ce9d94..dffcd5f 100644 +--- a/autoconf/configure.in ++++ b/autoconf/configure.in +@@ -3,8 +3,10 @@ dnl + dnl Process this file with autoconf to produce a configure script. + dnl + dnl require a recent autoconf +-AC_PREREQ(2.61) +-AC_INIT(src/version.h) ++AC_PREREQ(2.62) ++AC_CONFIG_SRCDIR(src/version.h) ++AC_INIT([bacula], my_esyscmd([sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h])) ++ + BUILD_DIR=`pwd` + cd .. + TOP_DIR=`pwd` +-- +1.7.3.2 + Deleted: csw/mgar/pkg/bacula/trunk/files/0001-correct-the-autoconf-initializations.patch =================================================================== --- csw/mgar/pkg/bacula/trunk/files/0001-correct-the-autoconf-initializations.patch 2011-04-13 17:42:04 UTC (rev 14160) +++ csw/mgar/pkg/bacula/trunk/files/0001-correct-the-autoconf-initializations.patch 2011-04-13 19:12:58 UTC (rev 14161) @@ -1,27 +0,0 @@ -From 7abbac2b02f54436652774ec86107105ef220db8 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Wed, 13 Apr 2011 15:48:18 +0200 -Subject: [PATCH] correct the autoconf initializations - -Signed-off-by: Ben Walton ---- - autoconf/configure.in | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/autoconf/configure.in b/autoconf/configure.in -index 0ce9d94..45c623a 100644 ---- a/autoconf/configure.in -+++ b/autoconf/configure.in -@@ -4,7 +4,8 @@ dnl Process this file with autoconf to produce a configure script. - dnl - dnl require a recent autoconf - AC_PREREQ(2.61) --AC_INIT(src/version.h) -+AC_INIT([bacula], [5.0.3]) -+AC_CONFIG_SRCDIR(src/version.h) - BUILD_DIR=`pwd` - cd .. - TOP_DIR=`pwd` --- -1.7.3.2 - 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 Apr 13 21:25:20 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Apr 2011 19:25:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[14162] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14162 http://gar.svn.sourceforge.net/gar/?rev=14162&view=rev Author: bdwalton Date: 2011-04-13 19:25:20 +0000 (Wed, 13 Apr 2011) Log Message: ----------- bacula/trunk: note dependency packages Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-13 19:12:58 UTC (rev 14161) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-13 19:25:20 UTC (rev 14162) @@ -16,6 +16,21 @@ BUILD_DEP_PKGS += CSWreadline CSWggettext-dev RUNTIME_DEP_PKGS += CSWmtx +RUNTIME_DEP_PKGS += CSWtcpwrap +RUNTIME_DEP_PKGS += CSWfconfig +RUNTIME_DEP_PKGS += CSWlibatk +RUNTIME_DEP_PKGS += CSWlibintl8 +RUNTIME_DEP_PKGS += CSWlibcairo +RUNTIME_DEP_PKGS += CSWzlib +RUNTIME_DEP_PKGS += CSWncurses +RUNTIME_DEP_PKGS += CSWreadline +RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS += CSWpango +RUNTIME_DEP_PKGS += CSWperl +RUNTIME_DEP_PKGS += CSWosslrt +RUNTIME_DEP_PKGS += CSWftype2 +RUNTIME_DEP_PKGS += CSWgtk2 +RUNTIME_DEP_PKGS += CSWglib2 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-working-dir=$(localstatedir)/$(NAME)/working 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 Apr 13 21:30:50 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Apr 2011 19:30:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14163] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14163 http://gar.svn.sourceforge.net/gar/?rev=14163&view=rev Author: bdwalton Date: 2011-04-13 19:30:49 +0000 (Wed, 13 Apr 2011) Log Message: ----------- bacula/trunk: kill /tmp from PKGROOT. it is the default archivedir Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-13 19:25:20 UTC (rev 14162) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-13 19:30:49 UTC (rev 14163) @@ -58,8 +58,13 @@ include gar/category.mk pre-configure-modulated: - (cd $(WORKSRC); \ + @echo Re-generating configure so docdir works properly... + @(cd $(WORKSRC); \ autoconf --prepend-include=$(abspath $(WORKSRC))/autoconf \ autoconf/configure.in > configure; \ chmod 755 configure) @$(MAKECOOKIE) + +post-merge: + @(cd $(PKGROOT); rmdir tmp) + @$(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 Wed Apr 13 21:31:48 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Apr 2011 19:31:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14164] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14164 http://gar.svn.sourceforge.net/gar/?rev=14164&view=rev Author: bdwalton Date: 2011-04-13 19:31:48 +0000 (Wed, 13 Apr 2011) Log Message: ----------- bacula/trunk: remove trailing slashes from ncurses lib/inc additions Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-13 19:30:49 UTC (rev 14163) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-13 19:31:48 UTC (rev 14164) @@ -49,8 +49,8 @@ CONFIGURE_ARGS += --with-subsys-dir=$(localstatedir)/run/subsys CONFIGURE_ARGS += --enable-tray-monitor -EXTRA_INC += $(includedir)/ncursesw/ -EXTRA_LIB += $(libdir)/ncursesw/ +EXTRA_INC += $(includedir)/ncursesw +EXTRA_LIB += $(libdir)/ncursesw # no tests supplied. TEST_SCRIPTS = 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 Apr 13 21:47:40 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Apr 2011 19:47:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14165] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14165 http://gar.svn.sourceforge.net/gar/?rev=14165&view=rev Author: bdwalton Date: 2011-04-13 19:47:39 +0000 (Wed, 13 Apr 2011) Log Message: ----------- bacula/trunk: add mysql lib dir so RPATH values get setup properly Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-13 19:31:48 UTC (rev 14164) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-13 19:47:39 UTC (rev 14165) @@ -50,7 +50,7 @@ CONFIGURE_ARGS += --enable-tray-monitor EXTRA_INC += $(includedir)/ncursesw -EXTRA_LIB += $(libdir)/ncursesw +EXTRA_LIB += $(libdir)/ncursesw ($prefix)/mysql5/lib # no tests supplied. TEST_SCRIPTS = 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 Apr 13 21:51:17 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Apr 2011 19:51:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14166] csw/mgar/pkg/bacula/trunk Message-ID: Revision: 14166 http://gar.svn.sourceforge.net/gar/?rev=14166&view=rev Author: bdwalton Date: 2011-04-13 19:51:17 +0000 (Wed, 13 Apr 2011) Log Message: ----------- bacula/trunk: override usr/local,usr/share refs in documentation, provide release notes to this effect Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bacula/trunk/files/CSWbacula.cswreleasenotes Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-13 19:47:39 UTC (rev 14165) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-13 19:51:17 UTC (rev 14166) @@ -10,6 +10,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz +DISTFILES += CSWbacula.cswreleasenotes PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch BUILD_DEP_PKGS = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel @@ -55,6 +56,10 @@ # no tests supplied. TEST_SCRIPTS = +# these are both original documentation files from the tarball +CHECKPKG_OVERRIDES_CSWbacula += file-with-bad-content|/usr/share|root/opt/csw/share/doc/bacula/technotes +CHECKPKG_OVERRIDES_CSWbacula += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bacula/INSTALL + include gar/category.mk pre-configure-modulated: Added: csw/mgar/pkg/bacula/trunk/files/CSWbacula.cswreleasenotes =================================================================== --- csw/mgar/pkg/bacula/trunk/files/CSWbacula.cswreleasenotes (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/CSWbacula.cswreleasenotes 2011-04-13 19:51:17 UTC (rev 14166) @@ -0,0 +1,2 @@ +usr/local, usr/share refs: + original files installed by default directly from tarball extraction 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 Apr 13 22:29:13 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Apr 2011 20:29:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14167] csw/mgar/pkg/bacula/trunk/files/ 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch Message-ID: Revision: 14167 http://gar.svn.sourceforge.net/gar/?rev=14167&view=rev Author: bdwalton Date: 2011-04-13 20:29:13 +0000 (Wed, 13 Apr 2011) Log Message: ----------- bacula/trunk: correct the AC_INIT patch wrt version detection Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch Modified: csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch =================================================================== --- csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch 2011-04-13 19:51:17 UTC (rev 14166) +++ csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch 2011-04-13 20:29:13 UTC (rev 14167) @@ -1,6 +1,6 @@ -From 1530af24085deb5d6798c88147fe7090f0048c72 Mon Sep 17 00:00:00 2001 +From b7109446f989d6b9bb449dca6cde6bc9dfddb1fe Mon Sep 17 00:00:00 2001 From: Ben Walton -Date: Wed, 13 Apr 2011 20:54:02 +0200 +Date: Wed, 13 Apr 2011 22:08:21 +0200 Subject: [PATCH] Update AC_INIT use to make configure handle docdir This patch allows AC_INIT to properly set the PACKAGE variables in the @@ -17,7 +17,7 @@ 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/autoconf/configure.in b/autoconf/configure.in -index 0ce9d94..dffcd5f 100644 +index 0ce9d94..1115e7a 100644 --- a/autoconf/configure.in +++ b/autoconf/configure.in @@ -3,8 +3,10 @@ dnl @@ -27,9 +27,9 @@ -AC_PREREQ(2.61) -AC_INIT(src/version.h) +AC_PREREQ(2.62) ++ ++AC_INIT([bacula], m4_esyscmd([sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' `pwd`/src/version.h | tr -d '\n'])) +AC_CONFIG_SRCDIR(src/version.h) -+AC_INIT([bacula], my_esyscmd([sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h])) -+ BUILD_DIR=`pwd` cd .. TOP_DIR=`pwd` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Apr 13 22:48:39 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 13 Apr 2011 20:48:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14168] csw/mgar/pkg/miltergreylist/trunk Message-ID: Revision: 14168 http://gar.svn.sourceforge.net/gar/?rev=14168&view=rev Author: bonivart Date: 2011-04-13 20:48:39 +0000 (Wed, 13 Apr 2011) Log Message: ----------- miltergreylist/trunk: update to 4.2.7 Modified Paths: -------------- csw/mgar/pkg/miltergreylist/trunk/Makefile csw/mgar/pkg/miltergreylist/trunk/checksums Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/Makefile 2011-04-13 20:29:13 UTC (rev 14167) +++ csw/mgar/pkg/miltergreylist/trunk/Makefile 2011-04-13 20:48:39 UTC (rev 14168) @@ -1,5 +1,5 @@ NAME = miltergreylist -VERSION = 4.2.6 +VERSION = 4.2.7 #RELEASE = rc1 #DISTVERSION = $(VERSION)$(RELEASE) DISTVERSION = $(VERSION) @@ -13,19 +13,19 @@ endef MASTER_SITES = http://ftp.espci.fr/pub/milter-greylist/ -DISTFILES = milter-greylist-$(DISTVERSION).tgz -DISTFILES += COPYING +DISTFILES = milter-greylist-$(DISTVERSION).tgz +DISTFILES += COPYING +RUNTIME_DEP_PKGS = CSWcurlrt CSWgeoip CSWlibspf2 + PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +CHECKPKG_OVERRIDES += surplus-dependency|CSWgeoip +CHECKPKG_OVERRIDES += file-with-bad-content + PATCHFILES += 0001-Path-and-user-changes-in-conf-file.patch -RUNTIME_DEP_PKGS = CSWcurlrt CSWgeoip CSWlibspf2 - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS = --prefix=/opt/csw CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw @@ -39,18 +39,25 @@ CONFIGURE_ARGS += --with-libspf2=/opt/csw/lib CONFIGURE_ARGS += --mandir=/opt/csw/share/man +# milter-greylist has no tests TEST_SCRIPTS = + INSTALL_SCRIPTS = custom -USERGROUP = /opt/csw/etc/pkg/CSWmiltergreylist/cswusergroup + +USERGROUP = /opt/csw/etc/pkg/CSWmiltergreylist/cswusergroup SAMPLECONF = /etc/opt/csw/greylist.conf -INITSMF = /etc/opt/csw/init.d/cswmiltergreylist -POSTMSG = /opt/csw/share/doc/miltergreylist/README.CSW +INITSMF = /etc/opt/csw/init.d/cswmiltergreylist +POSTMSG = /opt/csw/share/doc/miltergreylist/README.CSW +MIGRATE_FILES = greylist.conf +MIGRATE_SOURCE_DIR = /opt/csw/etc/mail +MIGRATE_DEST_DIR = /etc/opt/csw + PROTOTYPE_MODIFIERS = 1 -PROTOTYPE_FILES_1 = /var/opt/csw/miltergreylist -PROTOTYPE_CLASS_1 = ugfiles -PROTOTYPE_PERMS_1 = 0700 -PROTOTYPE_USER_1 = greylist +PROTOTYPE_FILES_1 = /var/opt/csw/miltergreylist +PROTOTYPE_CLASS_1 = ugfiles +PROTOTYPE_PERMS_1 = 0700 +PROTOTYPE_USER_1 = greylist include gar/category.mk Modified: csw/mgar/pkg/miltergreylist/trunk/checksums =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/checksums 2011-04-13 20:29:13 UTC (rev 14167) +++ csw/mgar/pkg/miltergreylist/trunk/checksums 2011-04-13 20:48:39 UTC (rev 14168) @@ -1,3 +1 @@ -608fd6143626c2dbdfc6dac0278e6fde 0001-Path-and-user-changes-in-conf-file.patch -e61edd088404cd2a0eacb03ce70e2d5f COPYING -2572068e2b1b5b47fe4239f0ddebbce2 milter-greylist-4.2.6.tgz +a47d70e0b8a73d341f0d511b3f693650 milter-greylist-4.2.7.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Apr 14 00:36:43 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 13 Apr 2011 22:36:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14169] csw/mgar/pkg/lang-python Message-ID: Revision: 14169 http://gar.svn.sourceforge.net/gar/?rev=14169&view=rev Author: skayser Date: 2011-04-13 22:36:43 +0000 (Wed, 13 Apr 2011) Log Message: ----------- lang-python/twill: initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/twill/ csw/mgar/pkg/lang-python/twill/branches/ csw/mgar/pkg/lang-python/twill/tags/ csw/mgar/pkg/lang-python/twill/trunk/ csw/mgar/pkg/lang-python/twill/trunk/Makefile csw/mgar/pkg/lang-python/twill/trunk/checksums csw/mgar/pkg/lang-python/twill/trunk/files/ csw/mgar/pkg/lang-python/twill/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/lang-python/twill/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/lang-python/twill/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/twill/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/twill/trunk/Makefile 2011-04-13 22:36:43 UTC (rev 14169) @@ -0,0 +1,35 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = twill +VERSION = 0.9 +CATEGORIES = python + +DESCRIPTION = An easy to use web automation kit +define BLURB + Twill is a simple scripting language intended for programmatic or + automated browsing of Web sites. It allows users to browse the Web from + a command-line interface. So, you can navigate through Web sites that + use forms, cookies, and most standard Web features. +endef + +VENDOR_URL = http://twill.idyll.org/ +MASTER_SITES = http://darcs.idyll.org/~t/projects/ +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += changelog.CSW + +UPSTREAM_MASTER_SITES = $(VENDOR_URL) +LICENSE = doc/LICENSE.txt +ARCHALL = 1 + +# The the suite is a bit b0rked WRT to our behind-proxy-setup. It needs +# to have an unset http_proxy in order to access it's own test server +# on http://localhost:8080, but then tries to access http://google.com +# for other tests. 2 out of 36 tests fail. +TEST_SCRIPTS = + +include gar/category.mk + +# Use TEST_ENV directly. EXTRA_TEST_EXPORTS would see the non-overridable +# $(http_proxy) from /etc/opt/csw/garrc (at least on the buildfarm) +TEST_ENV += http_proxy="" Property changes on: csw/mgar/pkg/lang-python/twill/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/twill/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/twill/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/twill/trunk/checksums 2011-04-13 22:36:43 UTC (rev 14169) @@ -0,0 +1 @@ +c362307616696f4838e9456c42b70fdc twill-0.9.tar.gz Added: csw/mgar/pkg/lang-python/twill/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lang-python/twill/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/lang-python/twill/trunk/files/changelog.CSW 2011-04-13 22:36:43 UTC (rev 14169) @@ -0,0 +1,5 @@ +py_twill (0.9,REV=2011.04.14) + + * Initial release. + + -- Sebastian Kayser Thu, 14 Apr 2011 00:29:32 +0200 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 Apr 14 02:26:17 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 00:26:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14170] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14170 http://gar.svn.sourceforge.net/gar/?rev=14170&view=rev Author: bdwalton Date: 2011-04-14 00:26:17 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: correct typo in mysql5 extra lib addition, extend that path to be lib/mysql Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-13 22:36:43 UTC (rev 14169) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 00:26:17 UTC (rev 14170) @@ -51,7 +51,7 @@ CONFIGURE_ARGS += --enable-tray-monitor EXTRA_INC += $(includedir)/ncursesw -EXTRA_LIB += $(libdir)/ncursesw ($prefix)/mysql5/lib +EXTRA_LIB += $(libdir)/ncursesw $(prefix)/mysql5/lib/mysql # no tests supplied. TEST_SCRIPTS = 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 Apr 14 03:02:38 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 01:02:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[14171] csw/mgar/pkg/php5/trunk Message-ID: Revision: 14171 http://gar.svn.sourceforge.net/gar/?rev=14171&view=rev Author: bdwalton Date: 2011-04-14 01:02:38 +0000 (Thu, 14 Apr 2011) Log Message: ----------- php5/trunk: override some usr/local path warnings, make approriate release notes Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/php5/trunk/files/CSWphp5.cswreleasenotes Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-14 00:26:17 UTC (rev 14170) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-14 01:02:38 UTC (rev 14171) @@ -30,6 +30,7 @@ DISTFILES += $(DISTNAME).tar.bz2 DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall +DISTFILES += CSWphp5.cswreleasenotes PATCHFILES += 0001-Strip-usr-ucblib-references.patch # this one is filed upstream: http://bugs.php.net/bug.php?id=54318 @@ -103,7 +104,21 @@ RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2 CSWiconv CSWexpat CSWzlib INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses +# embeded 'magic' information to detect file types...odd, but... +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/libtool.m4 +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4 +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4 +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/PEAR/Config.php +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1 +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php-cgi +# verify these... +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php.ini.CSW + +# end verify... + CATALOGNAME_CSWphp5-dev = php5_dev SPKG_DESC_CSWphp5-dev = Development files for php5 RUNTIME_DEP_PKGS_CSWphp5-dev = CSWphp5 Added: csw/mgar/pkg/php5/trunk/files/CSWphp5.cswreleasenotes =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.cswreleasenotes (rev 0) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.cswreleasenotes 2011-04-14 01:02:38 UTC (rev 14171) @@ -0,0 +1,6 @@ +/usr/local references: + bin/php -> embeds 'magic' filetype info in the binary + bin/php-cgi -> embeds 'magic' filetype info in the binary + php/build/* -> build stuff that doesn't matter + PEAR/Config.php -> default for gpg if not in $PATH + man1/php-config.1 -> an example path 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 Apr 14 03:16:02 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 01:16:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[14172] csw/mgar/pkg/php5/trunk Message-ID: Revision: 14172 http://gar.svn.sourceforge.net/gar/?rev=14172&view=rev Author: bdwalton Date: 2011-04-14 01:16:02 +0000 (Thu, 14 Apr 2011) Log Message: ----------- php5/trunk: no longer support apache 1.3 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/files/scripts.mk Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-14 01:02:38 UTC (rev 14171) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-14 01:16:02 UTC (rev 14172) @@ -89,21 +89,15 @@ PACKAGES += CSWphp5-xmlwriter PACKAGES += CSWphp5-xsl PACKAGES += CSWphp5-zip -PACKAGES += CSWmod-php5 BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils -CATALOGNAME_CSWmod-php5 = mod_php5 -SPKG_DESC_CSWmod-php5 = The apache 1.3.x php5 module -RUNTIME_DEP_PKGS_CSWmod-php5 = CSWphp5 CSWapache CSWlibxml2 CSWiconv -RUNTIME_DEP_PKGS_CSWmod-php5 += CSWexpat CSWzlib -OBSOLETED_BY_CSWmod-php5 = CSWmodphp5 - CATALOGNAME_CSWphp5 = php5 SPKG_DESC_CSWphp5 = A High-Level Scripting Language RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2 CSWiconv CSWexpat CSWzlib INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase -INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses +INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5 + # embeded 'magic' information to detect file types...odd, but... CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/libtool.m4 @@ -408,8 +402,6 @@ PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* -PKGFILES_CSWmod-php5 += $(prefix)/apache/.* - PKGFILES_CSWphp5-bcmath = .*/lib/php/extensions/.*/bcmath.* PKGFILES_CSWphp5-bz2 = .*/lib/php/extensions/.*/bz2.* @@ -660,8 +652,6 @@ #ENABLE_CHECK = 0 CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWmod-php5 += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWmod-php5 += surplus-dependency|CSWapache CHECKPKG_OVERRIDES_CSWphp5-pdo += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-bcmath += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWphp5 Modified: csw/mgar/pkg/php5/trunk/files/scripts.mk =================================================================== --- csw/mgar/pkg/php5/trunk/files/scripts.mk 2011-04-14 01:02:38 UTC (rev 14171) +++ csw/mgar/pkg/php5/trunk/files/scripts.mk 2011-04-14 01:16:02 UTC (rev 14172) @@ -16,7 +16,6 @@ PI_SCRIPTS = install-extras PI_SCRIPTS += install-ap2modphp5 -PI_SCRIPTS += install-modphp5 PI_SCRIPTS += install-cleanup post-install-modulated: $(PI_SCRIPTS) @@ -39,27 +38,13 @@ @$(MAKECOOKIE) install-ap2modphp5: - @echo "[====> Now Building ap2_modphp5 <====]" - if [ -f $(WORKSRC)/Makefile ]; then \ - $(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi - cd $(WORKSRC) && $(BUILD_ENV) \ - ./configure $(CONFIGURE_ARGS) --with-apxs2=$(prefix)/apache2/sbin/apxs - $(GARBIN)/fixlibtool $(WORKSRC) + @echo "[====> Now Installing ap2_modphp5 <====]" $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi strip $(DESTDIR)$(prefix)/apache2/libexec/libphp5.so ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra ginstall -m 0644 $(DOWNLOADDIR)/httpd-php5.conf.CSW $(DESTDIR)$(prefix)/apache2/etc/extra @$(MAKECOOKIE) -install-modphp5: - @echo "[====> Now Building mod_php5 <====]" - if [ -f $(WORKSRC)/Makefile ]; then $(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi - cd $(WORKSRC) && $(BUILD_ENV) ./configure $(CONFIGURE_ARGS) --with-apxs=$(prefix)/apache/bin/apxs - $(GARBIN)/fixlibtool $(WORKSRC) - $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi - strip $(DESTDIR)$(prefix)/apache/libexec/libphp5.so - @$(MAKECOOKIE) - install-cleanup: @echo "[====> Cleaning Up Extra Install Files <====]" gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr 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 Apr 14 04:35:13 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 02:35:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14173] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14173 http://gar.svn.sourceforge.net/gar/?rev=14173&view=rev Author: bdwalton Date: 2011-04-14 02:35:13 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: turn on -norunpath Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 01:16:02 UTC (rev 14172) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 02:35:13 UTC (rev 14173) @@ -52,6 +52,7 @@ EXTRA_INC += $(includedir)/ncursesw EXTRA_LIB += $(libdir)/ncursesw $(prefix)/mysql5/lib/mysql +EXTRA_LINKER_FLAGS = -norunpath # no tests supplied. TEST_SCRIPTS = 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 Apr 14 16:08:19 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 14:08:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[14174] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14174 http://gar.svn.sourceforge.net/gar/?rev=14174&view=rev Author: bdwalton Date: 2011-04-14 14:08:18 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: add first attempt at carving out subpackages (need to address legacy split still) Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 02:35:13 UTC (rev 14173) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 14:08:18 UTC (rev 14174) @@ -8,6 +8,44 @@ Bacula is a set of Open Source, enterprise ready, computer programs that permit you (or the system administrator) to manage backup, recovery, and verification of computer data across a network of computers of different kinds. Bacula is relatively easy to use and efficient, while offering many advanced storage management features that make it easy to find and recover lost or damaged files. In technical terms, it is an Open Source, enterprise ready, network based backup program. endef +PACKAGES = CSWbacula-common CSWbacula-fd CSWbacula-sd +PACKAGES += CSWbacula-director + +CATALOG_NAME_CSWbacula-common = bacula_common +SPKG_DESC_CSWbacula-common = $(DESCRIPTION) - shared files +PKGFILES_CSWbacula-common += .*libbac-$(VERSION).so .*libbac.so +PKGFILES_CSWbacula-common += .*libbaccfg-$(VERSION).so .*libbaccfg.so +PKGFILES_CSWbacula-common += .*libbacfind-$(VERSION).so .*libbacfind.so +PKGFILES_CSWbacula-common += .*libbaccpy-$(VERSION).so .*libbaccpy.so +PKGFILES_CSWbacula-common += .*libbacsql-$(VERSION).so .*libbacsql.so +PKGFILES_CSWbacula-common += .*sbin/bsmtp .*sbin/btraceback +PKGFILES_CSWbacula-common += .*man1/bsmtp.1.gz .*man1/btraceback.1.gz +PKGFILES_CSWbacula-common += .*man8/bacula.8.gz +PKGFILES_CSWbacula-common += .*libexec/btraceback.gdb + +CATALOG_NAME_CSWbacula-fd = bacula_fd +SPKG_DESC_CSWbacula-fd = $(DESCRIPTION) - File Daemon +PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd +PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz + +CATALOG_NAME_CSWbacula-sd = bacula_sd +SPKG_DESC_CSWbacula-sd = $(DESCRIPTION) - Storage Daemon +PKGFILES_CSWbacula-sd += .*libexec.*disk-changer .*libexec.*dvd-handler +PKGFILES_CSWbacula-sd += .*libexec.*mtx-changer.* +PKGFILES_CSWbacula-sd += .*sbin/bacula-sd .*sbin/bextract .*sbin/bls +PKGFILES_CSWbacula-sd += .*sbin/bcopy .*sbin/bscan .*sbin/btape +PKGFILES_CSWbacula-sd += .*man8/bacula-sd.8.gz .*man8/bextract.8.gz +PKGFILES_CSWbacula-sd += .*man8/bls.8.gz .*man8/btape.8.gz +PKGFILES_CSWbacula-sd += .*man8/bcopy.8.gz .*man8/bscan.8.gz + +CATALOG_NAME_CSWbacula-director = bacula_director +SPKG_DESC_CSWbacula-director = $(DESCRIPTION) - Director +PKGFILES_CSWbacula-director += .*sbin/bregex .*sbin/bwild .*sbin/bacula-dir +PKGFILES_CSWbacula-director += .*sbin/dbcheck +PKGFILES_CSWbacula-director += .*libexec.*catalog_backup.* .*libexec.*query.sql +PKGFILES_CSWbacula-director += .*libexec.*mysql_tables.* +PKGFILES_CSWbacula-director += .*man8/bacula-dir.8.gz .*man8/dbcheck.8.gz + MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz DISTFILES += CSWbacula.cswreleasenotes 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 Apr 14 16:27:13 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 14:27:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14175] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14175 http://gar.svn.sourceforge.net/gar/?rev=14175&view=rev Author: bdwalton Date: 2011-04-14 14:27:13 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: disable global deps, start adding subpackage deps and override the .so symlink warning for common subpackage Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 14:08:18 UTC (rev 14174) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 14:27:13 UTC (rev 14175) @@ -13,6 +13,7 @@ CATALOG_NAME_CSWbacula-common = bacula_common SPKG_DESC_CSWbacula-common = $(DESCRIPTION) - shared files +RUNTIME_DEP_PKGS_CSWbacula-common += CSWmysql5rt PKGFILES_CSWbacula-common += .*libbac-$(VERSION).so .*libbac.so PKGFILES_CSWbacula-common += .*libbaccfg-$(VERSION).so .*libbaccfg.so PKGFILES_CSWbacula-common += .*libbacfind-$(VERSION).so .*libbacfind.so @@ -22,14 +23,18 @@ PKGFILES_CSWbacula-common += .*man1/bsmtp.1.gz .*man1/btraceback.1.gz PKGFILES_CSWbacula-common += .*man8/bacula.8.gz PKGFILES_CSWbacula-common += .*libexec/btraceback.gdb +CHECKPKG_OVERRIDES_CSWbacula-common += shared-lib-package-contains-so-symlink CATALOG_NAME_CSWbacula-fd = bacula_fd SPKG_DESC_CSWbacula-fd = $(DESCRIPTION) - File Daemon +RUNTIME_DEP_PKGS_CSWbacula-fd = CSWbacula-common PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz CATALOG_NAME_CSWbacula-sd = bacula_sd SPKG_DESC_CSWbacula-sd = $(DESCRIPTION) - Storage Daemon +RUNTIME_DEP_PKGS_CSWbacula-sd = CSWbacula-common +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWmysq5rt PKGFILES_CSWbacula-sd += .*libexec.*disk-changer .*libexec.*dvd-handler PKGFILES_CSWbacula-sd += .*libexec.*mtx-changer.* PKGFILES_CSWbacula-sd += .*sbin/bacula-sd .*sbin/bextract .*sbin/bls @@ -40,6 +45,8 @@ CATALOG_NAME_CSWbacula-director = bacula_director SPKG_DESC_CSWbacula-director = $(DESCRIPTION) - Director +RUNTIME_DEP_PKGS_CSWbacula-director = CSWbacula-common +RUNTIME_DEP_PKGS_CSWbacula-director += CSWmysql5rt PKGFILES_CSWbacula-director += .*sbin/bregex .*sbin/bwild .*sbin/bacula-dir PKGFILES_CSWbacula-director += .*sbin/dbcheck PKGFILES_CSWbacula-director += .*libexec.*catalog_backup.* .*libexec.*query.sql @@ -54,22 +61,22 @@ BUILD_DEP_PKGS = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel BUILD_DEP_PKGS += CSWreadline CSWggettext-dev -RUNTIME_DEP_PKGS += CSWmtx -RUNTIME_DEP_PKGS += CSWtcpwrap -RUNTIME_DEP_PKGS += CSWfconfig -RUNTIME_DEP_PKGS += CSWlibatk -RUNTIME_DEP_PKGS += CSWlibintl8 -RUNTIME_DEP_PKGS += CSWlibcairo -RUNTIME_DEP_PKGS += CSWzlib -RUNTIME_DEP_PKGS += CSWncurses -RUNTIME_DEP_PKGS += CSWreadline -RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS += CSWpango -RUNTIME_DEP_PKGS += CSWperl -RUNTIME_DEP_PKGS += CSWosslrt -RUNTIME_DEP_PKGS += CSWftype2 -RUNTIME_DEP_PKGS += CSWgtk2 -RUNTIME_DEP_PKGS += CSWglib2 +# RUNTIME_DEP_PKGS += CSWmtx +# RUNTIME_DEP_PKGS += CSWtcpwrap +# RUNTIME_DEP_PKGS += CSWfconfig +# RUNTIME_DEP_PKGS += CSWlibatk +# RUNTIME_DEP_PKGS += CSWlibintl8 +# RUNTIME_DEP_PKGS += CSWlibcairo +# RUNTIME_DEP_PKGS += CSWzlib +# RUNTIME_DEP_PKGS += CSWncurses +# RUNTIME_DEP_PKGS += CSWreadline +# RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0 +# RUNTIME_DEP_PKGS += CSWpango +# RUNTIME_DEP_PKGS += CSWperl +# RUNTIME_DEP_PKGS += CSWosslrt +# RUNTIME_DEP_PKGS += CSWftype2 +# RUNTIME_DEP_PKGS += CSWgtk2 +# RUNTIME_DEP_PKGS += CSWglib2 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-working-dir=$(localstatedir)/$(NAME)/working 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 Apr 14 16:29:27 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 14:29:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[14176] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14176 http://gar.svn.sourceforge.net/gar/?rev=14176&view=rev Author: bdwalton Date: 2011-04-14 14:29:27 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: correct typo in dep for -sd subpackage Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 14:27:13 UTC (rev 14175) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 14:29:27 UTC (rev 14176) @@ -34,7 +34,7 @@ CATALOG_NAME_CSWbacula-sd = bacula_sd SPKG_DESC_CSWbacula-sd = $(DESCRIPTION) - Storage Daemon RUNTIME_DEP_PKGS_CSWbacula-sd = CSWbacula-common -RUNTIME_DEP_PKGS_CSWbacula-sd += CSWmysq5rt +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWmysql5rt PKGFILES_CSWbacula-sd += .*libexec.*disk-changer .*libexec.*dvd-handler PKGFILES_CSWbacula-sd += .*libexec.*mtx-changer.* PKGFILES_CSWbacula-sd += .*sbin/bacula-sd .*sbin/bextract .*sbin/bls 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 Apr 14 16:31:42 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 14:31:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14177] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14177 http://gar.svn.sourceforge.net/gar/?rev=14177&view=rev Author: bdwalton Date: 2011-04-14 14:31:42 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: add more subpackage deps Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 14:29:27 UTC (rev 14176) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 14:31:42 UTC (rev 14177) @@ -35,6 +35,11 @@ SPKG_DESC_CSWbacula-sd = $(DESCRIPTION) - Storage Daemon RUNTIME_DEP_PKGS_CSWbacula-sd = CSWbacula-common RUNTIME_DEP_PKGS_CSWbacula-sd += CSWmysql5rt +RUNTIME_DEP_PKGS_CSWbacula-director += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWbacula-director += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWbacula-director += CSWosslrt PKGFILES_CSWbacula-sd += .*libexec.*disk-changer .*libexec.*dvd-handler PKGFILES_CSWbacula-sd += .*libexec.*mtx-changer.* PKGFILES_CSWbacula-sd += .*sbin/bacula-sd .*sbin/bextract .*sbin/bls @@ -47,6 +52,11 @@ SPKG_DESC_CSWbacula-director = $(DESCRIPTION) - Director RUNTIME_DEP_PKGS_CSWbacula-director = CSWbacula-common RUNTIME_DEP_PKGS_CSWbacula-director += CSWmysql5rt +RUNTIME_DEP_PKGS_CSWbacula-director += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWbacula-director += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWbacula-director += CSWosslrt PKGFILES_CSWbacula-director += .*sbin/bregex .*sbin/bwild .*sbin/bacula-dir PKGFILES_CSWbacula-director += .*sbin/dbcheck PKGFILES_CSWbacula-director += .*libexec.*catalog_backup.* .*libexec.*query.sql 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 Apr 14 16:36:07 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 14:36:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[14178] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14178 http://gar.svn.sourceforge.net/gar/?rev=14178&view=rev Author: bdwalton Date: 2011-04-14 14:36:07 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: fix cut/paste error for deps on -sd subpackage, add deps for -fd subpackage Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 14:31:42 UTC (rev 14177) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 14:36:07 UTC (rev 14178) @@ -28,6 +28,11 @@ CATALOG_NAME_CSWbacula-fd = bacula_fd SPKG_DESC_CSWbacula-fd = $(DESCRIPTION) - File Daemon RUNTIME_DEP_PKGS_CSWbacula-fd = CSWbacula-common +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWosslrt PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz @@ -35,11 +40,11 @@ SPKG_DESC_CSWbacula-sd = $(DESCRIPTION) - Storage Daemon RUNTIME_DEP_PKGS_CSWbacula-sd = CSWbacula-common RUNTIME_DEP_PKGS_CSWbacula-sd += CSWmysql5rt -RUNTIME_DEP_PKGS_CSWbacula-director += CSWtcpwrap -RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWbacula-director += CSWzlib -RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWbacula-director += CSWosslrt +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWosslrt PKGFILES_CSWbacula-sd += .*libexec.*disk-changer .*libexec.*dvd-handler PKGFILES_CSWbacula-sd += .*libexec.*mtx-changer.* PKGFILES_CSWbacula-sd += .*sbin/bacula-sd .*sbin/bextract .*sbin/bls 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 Apr 14 16:43:40 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 14:43:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14179] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14179 http://gar.svn.sourceforge.net/gar/?rev=14179&view=rev Author: bdwalton Date: 2011-04-14 14:43:40 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: add -client subpackage to take over old client package, depending on -fd for now but will add -console, etc Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 14:36:07 UTC (rev 14178) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 14:43:40 UTC (rev 14179) @@ -9,8 +9,16 @@ endef PACKAGES = CSWbacula-common CSWbacula-fd CSWbacula-sd -PACKAGES += CSWbacula-director +PACKAGES += CSWbacula-director CSWbacula-client +CATALOG_NAME_CSWbacula-client = bacula_client +SPKG_DESC_CSWbacula-client = $(DESCRIPTION) - Client meta-package +RUNTIME_DEP_PKGS_CSWbacula-client += CSWbacula-fd +PKGFILES_CSWbacula-client = NOFILES +OBSOLETED_BY_CSWbacula-client = CSWbaculaclient +# set this explicitly to help phil's tools for now +CATALOG_NAME_CSWbaculaclient = bacula_client_stub + CATALOG_NAME_CSWbacula-common = bacula_common SPKG_DESC_CSWbacula-common = $(DESCRIPTION) - shared files RUNTIME_DEP_PKGS_CSWbacula-common += CSWmysql5rt 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 Apr 14 16:49:58 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 14:49:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[14180] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14180 http://gar.svn.sourceforge.net/gar/?rev=14180&view=rev Author: bdwalton Date: 2011-04-14 14:49:58 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: add more deps to the -common package Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 14:43:40 UTC (rev 14179) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 14:49:58 UTC (rev 14180) @@ -22,6 +22,10 @@ CATALOG_NAME_CSWbacula-common = bacula_common SPKG_DESC_CSWbacula-common = $(DESCRIPTION) - shared files RUNTIME_DEP_PKGS_CSWbacula-common += CSWmysql5rt +RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWbacula-common += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-common += CSWosslrt +RUNTIME_DEP_PKGS_CSWbacula-common += CSWzlib PKGFILES_CSWbacula-common += .*libbac-$(VERSION).so .*libbac.so PKGFILES_CSWbacula-common += .*libbaccfg-$(VERSION).so .*libbaccfg.so PKGFILES_CSWbacula-common += .*libbacfind-$(VERSION).so .*libbacfind.so 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 Apr 14 17:16:28 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 15:16:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[14181] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14181 http://gar.svn.sourceforge.net/gar/?rev=14181&view=rev Author: bdwalton Date: 2011-04-14 15:16:27 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: force libraries into lib/bacula; drop commented out global deps Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 14:49:58 UTC (rev 14180) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 15:16:27 UTC (rev 14181) @@ -88,22 +88,8 @@ BUILD_DEP_PKGS = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel BUILD_DEP_PKGS += CSWreadline CSWggettext-dev -# RUNTIME_DEP_PKGS += CSWmtx -# RUNTIME_DEP_PKGS += CSWtcpwrap -# RUNTIME_DEP_PKGS += CSWfconfig -# RUNTIME_DEP_PKGS += CSWlibatk -# RUNTIME_DEP_PKGS += CSWlibintl8 -# RUNTIME_DEP_PKGS += CSWlibcairo -# RUNTIME_DEP_PKGS += CSWzlib -# RUNTIME_DEP_PKGS += CSWncurses -# RUNTIME_DEP_PKGS += CSWreadline -# RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0 -# RUNTIME_DEP_PKGS += CSWpango -# RUNTIME_DEP_PKGS += CSWperl -# RUNTIME_DEP_PKGS += CSWosslrt -# RUNTIME_DEP_PKGS += CSWftype2 -# RUNTIME_DEP_PKGS += CSWgtk2 -# RUNTIME_DEP_PKGS += CSWglib2 +# force libraries into a separate subdirectory +libdir = $(prefix)/lib/$(NAME) CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-working-dir=$(localstatedir)/$(NAME)/working 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 Apr 14 17:42:08 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 15:42:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14182] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14182 http://gar.svn.sourceforge.net/gar/?rev=14182&view=rev Author: bdwalton Date: 2011-04-14 15:42:07 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: carve out top level package again and make it depend on sub-components Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 15:16:27 UTC (rev 14181) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 15:42:07 UTC (rev 14182) @@ -9,8 +9,16 @@ endef PACKAGES = CSWbacula-common CSWbacula-fd CSWbacula-sd -PACKAGES += CSWbacula-director CSWbacula-client +PACKAGES += CSWbacula-director CSWbacula-client CSWbacula +CATALOG_NAME_CSWbacula = bacula +SPKG_DESC_CSWbacula = $(DESCRIPTION) +RUNTIME_DEP_PKGS = CSWbacula-fd CSWbacula-sd CSWbacula-director +PKGFILES_CSWbacula = NOFILES +CHECKPKG_OVERRIDES_CSWbacula += surplus-dependency|CSWbacula-sd +CHECKPKG_OVERRIDES_CSWbacula += surplus-dependency|CSWbacula-fd +CHECKPKG_OVERRIDES_CSWbacula += surplus-dependency|CSWbacula-director + CATALOG_NAME_CSWbacula-client = bacula_client SPKG_DESC_CSWbacula-client = $(DESCRIPTION) - Client meta-package RUNTIME_DEP_PKGS_CSWbacula-client += CSWbacula-fd 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 Apr 14 18:11:14 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 16:11:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14183] csw/mgar/pkg/bacula/trunk Message-ID: Revision: 14183 http://gar.svn.sourceforge.net/gar/?rev=14183&view=rev Author: bdwalton Date: 2011-04-14 16:11:14 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: move a few overrides around due to splits Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bacula/trunk/files/CSWbacula-common.cswreleasenotes Removed Paths: ------------- csw/mgar/pkg/bacula/trunk/files/CSWbacula.cswreleasenotes Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 15:42:07 UTC (rev 14182) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 16:11:14 UTC (rev 14183) @@ -26,6 +26,7 @@ OBSOLETED_BY_CSWbacula-client = CSWbaculaclient # set this explicitly to help phil's tools for now CATALOG_NAME_CSWbaculaclient = bacula_client_stub +CHECKPKG_OVERRIDES_CSWbacula-client += surplus-dependency|CSWbacula-fd CATALOG_NAME_CSWbacula-common = bacula_common SPKG_DESC_CSWbacula-common = $(DESCRIPTION) - shared files @@ -43,7 +44,11 @@ PKGFILES_CSWbacula-common += .*man1/bsmtp.1.gz .*man1/btraceback.1.gz PKGFILES_CSWbacula-common += .*man8/bacula.8.gz PKGFILES_CSWbacula-common += .*libexec/btraceback.gdb +PKGFILES_CSWbacula-common += .*doc/$(NAME)/.* CHECKPKG_OVERRIDES_CSWbacula-common += shared-lib-package-contains-so-symlink +# these are both original documentation files from the tarball +CHECKPKG_OVERRIDES_CSWbacula += file-with-bad-content|/usr/share|root/opt/csw/share/doc/bacula/technotes +CHECKPKG_OVERRIDES_CSWbacula += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bacula/INSTALL CATALOG_NAME_CSWbacula-fd = bacula_fd SPKG_DESC_CSWbacula-fd = $(DESCRIPTION) - File Daemon @@ -90,7 +95,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz -DISTFILES += CSWbacula.cswreleasenotes +DISTFILES += CSWbacula-common.cswreleasenotes PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch BUILD_DEP_PKGS = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel @@ -123,10 +128,6 @@ # no tests supplied. TEST_SCRIPTS = -# these are both original documentation files from the tarball -CHECKPKG_OVERRIDES_CSWbacula += file-with-bad-content|/usr/share|root/opt/csw/share/doc/bacula/technotes -CHECKPKG_OVERRIDES_CSWbacula += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bacula/INSTALL - include gar/category.mk pre-configure-modulated: Added: csw/mgar/pkg/bacula/trunk/files/CSWbacula-common.cswreleasenotes =================================================================== --- csw/mgar/pkg/bacula/trunk/files/CSWbacula-common.cswreleasenotes (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/CSWbacula-common.cswreleasenotes 2011-04-14 16:11:14 UTC (rev 14183) @@ -0,0 +1,2 @@ +usr/local, usr/share refs: + original files installed by default directly from tarball extraction Deleted: csw/mgar/pkg/bacula/trunk/files/CSWbacula.cswreleasenotes =================================================================== --- csw/mgar/pkg/bacula/trunk/files/CSWbacula.cswreleasenotes 2011-04-14 15:42:07 UTC (rev 14182) +++ csw/mgar/pkg/bacula/trunk/files/CSWbacula.cswreleasenotes 2011-04-14 16:11:14 UTC (rev 14183) @@ -1,2 +0,0 @@ -usr/local, usr/share refs: - original files installed by default directly from tarball extraction 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 Apr 14 18:12:13 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 16:12:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14184] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14184 http://gar.svn.sourceforge.net/gar/?rev=14184&view=rev Author: bdwalton Date: 2011-04-14 16:12:13 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: make the meta packages archall Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 16:11:14 UTC (rev 14183) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 16:12:13 UTC (rev 14184) @@ -13,6 +13,7 @@ CATALOG_NAME_CSWbacula = bacula SPKG_DESC_CSWbacula = $(DESCRIPTION) +ARCHALL_CSWbacula = 1 RUNTIME_DEP_PKGS = CSWbacula-fd CSWbacula-sd CSWbacula-director PKGFILES_CSWbacula = NOFILES CHECKPKG_OVERRIDES_CSWbacula += surplus-dependency|CSWbacula-sd @@ -21,6 +22,7 @@ CATALOG_NAME_CSWbacula-client = bacula_client SPKG_DESC_CSWbacula-client = $(DESCRIPTION) - Client meta-package +ARCHALL_CSWbacula-client = 1 RUNTIME_DEP_PKGS_CSWbacula-client += CSWbacula-fd PKGFILES_CSWbacula-client = NOFILES OBSOLETED_BY_CSWbacula-client = CSWbaculaclient 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 Apr 14 18:13:19 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 16:13:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[14185] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14185 http://gar.svn.sourceforge.net/gar/?rev=14185&view=rev Author: bdwalton Date: 2011-04-14 16:13:18 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: director depends on perl for make_catalog_backup.pl...may relax this later Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 16:12:13 UTC (rev 14184) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 16:13:18 UTC (rev 14185) @@ -89,6 +89,7 @@ RUNTIME_DEP_PKGS_CSWbacula-director += CSWzlib RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbacula-director += CSWosslrt +RUNTIME_DEP_PKGS_CSWbacula-director += CSWperl PKGFILES_CSWbacula-director += .*sbin/bregex .*sbin/bwild .*sbin/bacula-dir PKGFILES_CSWbacula-director += .*sbin/dbcheck PKGFILES_CSWbacula-director += .*libexec.*catalog_backup.* .*libexec.*query.sql 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 Apr 14 18:18:14 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 16:18:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14186] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14186 http://gar.svn.sourceforge.net/gar/?rev=14186&view=rev Author: bdwalton Date: 2011-04-14 16:18:14 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: correct overrides for -common package Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 16:13:18 UTC (rev 14185) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 16:18:14 UTC (rev 14186) @@ -49,8 +49,8 @@ PKGFILES_CSWbacula-common += .*doc/$(NAME)/.* CHECKPKG_OVERRIDES_CSWbacula-common += shared-lib-package-contains-so-symlink # these are both original documentation files from the tarball -CHECKPKG_OVERRIDES_CSWbacula += file-with-bad-content|/usr/share|root/opt/csw/share/doc/bacula/technotes -CHECKPKG_OVERRIDES_CSWbacula += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bacula/INSTALL +CHECKPKG_OVERRIDES_CSWbacula-common += file-with-bad-content|/usr/share|root/opt/csw/share/doc/bacula/technotes +CHECKPKG_OVERRIDES_CSWbacula-common += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bacula/INSTALL CATALOG_NAME_CSWbacula-fd = bacula_fd SPKG_DESC_CSWbacula-fd = $(DESCRIPTION) - File Daemon 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 Apr 14 18:25:40 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 16:25:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14187] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14187 http://gar.svn.sourceforge.net/gar/?rev=14187&view=rev Author: bdwalton Date: 2011-04-14 16:25:39 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: carve out a tray monitor subpackage Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 16:18:14 UTC (rev 14186) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 16:25:39 UTC (rev 14187) @@ -10,6 +10,7 @@ PACKAGES = CSWbacula-common CSWbacula-fd CSWbacula-sd PACKAGES += CSWbacula-director CSWbacula-client CSWbacula +PACKAGES += CSWbacula-tray-monitor CATALOG_NAME_CSWbacula = bacula SPKG_DESC_CSWbacula = $(DESCRIPTION) @@ -30,6 +31,22 @@ CATALOG_NAME_CSWbaculaclient = bacula_client_stub CHECKPKG_OVERRIDES_CSWbacula-client += surplus-dependency|CSWbacula-fd +CATALOG_NAME_CSWbacula-tray-monitor = bacula_tray_monitor +SPKG_DESC_CSWbacula-tray-monitor = $(DESCRIPTION) - Tray monitor +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor = CSWbacula-common +CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWtcpwrap +CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWosslrt +CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWftype2 +CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWzlib +CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWgtk2 +CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWlibatk +CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWpango +CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWlibcairo +CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWfconfig +CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWglib2 +PKGFILES_CSWbacula-tray-monitor = .*tray-monitor.* + CATALOG_NAME_CSWbacula-common = bacula_common SPKG_DESC_CSWbacula-common = $(DESCRIPTION) - shared files RUNTIME_DEP_PKGS_CSWbacula-common += CSWmysql5rt 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 Apr 14 18:31:40 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 16:31:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14188] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14188 http://gar.svn.sourceforge.net/gar/?rev=14188&view=rev Author: bdwalton Date: 2011-04-14 16:31:40 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: remove checkpkg override for so-symlink on -common subpackage (not required now) Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 16:25:39 UTC (rev 14187) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 16:31:40 UTC (rev 14188) @@ -64,7 +64,6 @@ PKGFILES_CSWbacula-common += .*man8/bacula.8.gz PKGFILES_CSWbacula-common += .*libexec/btraceback.gdb PKGFILES_CSWbacula-common += .*doc/$(NAME)/.* -CHECKPKG_OVERRIDES_CSWbacula-common += shared-lib-package-contains-so-symlink # these are both original documentation files from the tarball CHECKPKG_OVERRIDES_CSWbacula-common += file-with-bad-content|/usr/share|root/opt/csw/share/doc/bacula/technotes CHECKPKG_OVERRIDES_CSWbacula-common += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bacula/INSTALL 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 Apr 14 18:36:05 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 16:36:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[14189] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14189 http://gar.svn.sourceforge.net/gar/?rev=14189&view=rev Author: bdwalton Date: 2011-04-14 16:36:04 +0000 (Thu, 14 Apr 2011) Log Message: ----------- bacula/trunk: set deps for tray monitor instead of overrides Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 16:31:40 UTC (rev 14188) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 16:36:04 UTC (rev 14189) @@ -33,18 +33,18 @@ CATALOG_NAME_CSWbacula-tray-monitor = bacula_tray_monitor SPKG_DESC_CSWbacula-tray-monitor = $(DESCRIPTION) - Tray monitor -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor = CSWbacula-common -CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWtcpwrap -CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWosslrt -CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWftype2 -CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWzlib -CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWgtk2 -CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWlibatk -CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWpango -CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWlibcairo -CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWfconfig -CHECKPKG_OVERRIDES_CSWbacula-tray-monitor += missing-dependency|CSWglib2 +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWbacula-common +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWosslrt +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWftype2 +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWgtk2 +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibatk +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWpango +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibcairo +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWfconfig +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWglib2 PKGFILES_CSWbacula-tray-monitor = .*tray-monitor.* CATALOG_NAME_CSWbacula-common = bacula_common This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Apr 14 21:52:48 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 14 Apr 2011 19:52:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14190] csw/mgar/pkg/lang-python Message-ID: Revision: 14190 http://gar.svn.sourceforge.net/gar/?rev=14190&view=rev Author: skayser Date: 2011-04-14 19:52:48 +0000 (Thu, 14 Apr 2011) Log Message: ----------- lang-python/pyxdg: initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/pyxdg/ csw/mgar/pkg/lang-python/pyxdg/branches/ csw/mgar/pkg/lang-python/pyxdg/tags/ csw/mgar/pkg/lang-python/pyxdg/trunk/ csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile csw/mgar/pkg/lang-python/pyxdg/trunk/checksums csw/mgar/pkg/lang-python/pyxdg/trunk/files/ csw/mgar/pkg/lang-python/pyxdg/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/lang-python/pyxdg/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/lang-python/pyxdg/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile 2011-04-14 19:52:48 UTC (rev 14190) @@ -0,0 +1,20 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = pyxdg +VERSION = 0.19 +CATEGORIES = python + +DESCRIPTION = Python library to access freedesktop.org standards +define BLURB +endef + +VENDOR_URL = http://www.freedesktop.org/wiki/Software/pyxdg +MASTER_SITES = http://www.freedesktop.org/~lanius/ +DISTFILES = $(DISTNAME).tar.gz + +ARCHALL = 1 + +TEST_SCRIPTS = + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/pyxdg/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pyxdg/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/pyxdg/trunk/checksums 2011-04-14 19:52:48 UTC (rev 14190) @@ -0,0 +1 @@ +9f33542e846d0fc1e0bfa992a8555b0a pyxdg-0.19.tar.gz Added: csw/mgar/pkg/lang-python/pyxdg/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lang-python/pyxdg/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/lang-python/pyxdg/trunk/files/changelog.CSW 2011-04-14 19:52:48 UTC (rev 14190) @@ -0,0 +1,5 @@ +py_xdg (0.19,REV=2011.04.14) + + * Initial release. + + -- Sebastian Kayser Thu, 14 Apr 2011 21:49:39 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Apr 14 21:54:08 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 14 Apr 2011 19:54:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14191] csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile Message-ID: Revision: 14191 http://gar.svn.sourceforge.net/gar/?rev=14191&view=rev Author: skayser Date: 2011-04-14 19:54:08 +0000 (Thu, 14 Apr 2011) Log Message: ----------- lang-python/pyxdg/trunk: add changelog.CSW Modified Paths: -------------- csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile 2011-04-14 19:52:48 UTC (rev 14190) +++ csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile 2011-04-14 19:54:08 UTC (rev 14191) @@ -12,6 +12,7 @@ VENDOR_URL = http://www.freedesktop.org/wiki/Software/pyxdg MASTER_SITES = http://www.freedesktop.org/~lanius/ DISTFILES = $(DISTNAME).tar.gz +DISTFILES = changelog.CSW ARCHALL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Apr 14 21:55:18 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 14 Apr 2011 19:55:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14192] csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile Message-ID: Revision: 14192 http://gar.svn.sourceforge.net/gar/?rev=14192&view=rev Author: skayser Date: 2011-04-14 19:55:18 +0000 (Thu, 14 Apr 2011) Log Message: ----------- lang-python/pyxdg/trunk: add changelog.CSW Modified Paths: -------------- csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile 2011-04-14 19:54:08 UTC (rev 14191) +++ csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile 2011-04-14 19:55:18 UTC (rev 14192) @@ -12,7 +12,7 @@ VENDOR_URL = http://www.freedesktop.org/wiki/Software/pyxdg MASTER_SITES = http://www.freedesktop.org/~lanius/ DISTFILES = $(DISTNAME).tar.gz -DISTFILES = changelog.CSW +DISTFILES += changelog.CSW ARCHALL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Apr 14 22:16:51 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 14 Apr 2011 20:16:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14193] csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile Message-ID: Revision: 14193 http://gar.svn.sourceforge.net/gar/?rev=14193&view=rev Author: skayser Date: 2011-04-14 20:16:51 +0000 (Thu, 14 Apr 2011) Log Message: ----------- lang-python/pyxdg/trunk: adjust xdg data/config dir Modified Paths: -------------- csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile 2011-04-14 19:55:18 UTC (rev 14192) +++ csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile 2011-04-14 20:16:51 UTC (rev 14193) @@ -19,3 +19,10 @@ TEST_SCRIPTS = include gar/category.mk + +pre-configure-modulated: + gsed -i \ + -e 's,/usr/local/share,$(sharedstatedir),' \ + -e 's,/etc,$(sysconfdir),' \ + $(WORKSRC)/xdg/BaseDirectory.py + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Apr 14 22:23:11 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 14 Apr 2011 20:23:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[14194] csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile Message-ID: Revision: 14194 http://gar.svn.sourceforge.net/gar/?rev=14194&view=rev Author: skayser Date: 2011-04-14 20:23:11 +0000 (Thu, 14 Apr 2011) Log Message: ----------- lang-python/pyxdg/trunk: add checkpkg override for /usr/share in XGD_DATADIRS Modified Paths: -------------- csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile 2011-04-14 20:16:51 UTC (rev 14193) +++ csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile 2011-04-14 20:23:11 UTC (rev 14194) @@ -18,6 +18,9 @@ TEST_SCRIPTS = +# XDG_DATADIRS contains /usr/share ... after /opt/csw/share +CHECKPKG_OVERRIDES += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/xdg/BaseDirectory.py + include gar/category.mk pre-configure-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Apr 14 22:27:18 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 14 Apr 2011 20:27:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14195] csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile Message-ID: Revision: 14195 http://gar.svn.sourceforge.net/gar/?rev=14195&view=rev Author: skayser Date: 2011-04-14 20:27:18 +0000 (Thu, 14 Apr 2011) Log Message: ----------- lang-python/pyxdg/trunk: adjust package name Modified Paths: -------------- csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile 2011-04-14 20:23:11 UTC (rev 14194) +++ csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile 2011-04-14 20:27:18 UTC (rev 14195) @@ -14,7 +14,8 @@ DISTFILES = $(DISTNAME).tar.gz DISTFILES += changelog.CSW -ARCHALL = 1 +PACKAGES = CSWpy-xdg +ARCHALL = 1 TEST_SCRIPTS = 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 Apr 15 00:15:08 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 22:15:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14196] csw/mgar/pkg/php5/trunk Message-ID: Revision: 14196 http://gar.svn.sourceforge.net/gar/?rev=14196&view=rev Author: bdwalton Date: 2011-04-14 22:15:08 +0000 (Thu, 14 Apr 2011) Log Message: ----------- php5/trunk: cleanup the way we handle apache2 install (remove legacy second build for it) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/files/scripts.mk Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-14 20:27:18 UTC (rev 14195) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-14 22:15:08 UTC (rev 14196) @@ -646,6 +646,7 @@ CONFIGURE_ARGS += --enable-zip=shared CONFIGURE_ARGS += --with-zlib-dir=$(prefix) CONFIGURE_ARGS += --with-zlib=$(prefix) +CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs # Disable Tests (report submitted to PHP QA) SKIPTEST = 1 @@ -719,16 +720,13 @@ # this allows apxs to install the module. stupid, but i couldn't make # the darn thing _not_ do try to add the httpd.conf lines, even with # patching... -pre-install-modulated: APSYSCONF=/opt/csw/apache/conf pre-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc pre-install-modulated: - @(mkdir -p $(DESTDIR)$(AP2SYSCONF) $(DESTDIR)$(APSYSCONF); \ - cp $(AP2SYSCONF)/httpd.conf $(DESTDIR)$(AP2SYSCONF); \ - cp $(APSYSCONF)/httpd.conf $(DESTDIR)$(APSYSCONF) ) + @(mkdir -p $(DESTDIR)$(AP2SYSCONF); \ + cp $(AP2SYSCONF)/httpd.conf $(DESTDIR)$(AP2SYSCONF) ) @$(MAKECOOKIE) -# post-install-modulated: APSYSCONF=/opt/csw/apache/conf/httpd.conf -# post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf -# post-install-modulated: -# @( rm $(DESTDIR)$(APSYSCONF) $(DESTDIR)$(AP2SYSCONF) ) -# @$(MAKECOOKIE) +post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf +post-install-modulated: + @rm $(DESTDIR)$(AP2SYSCONF) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/php5/trunk/files/scripts.mk =================================================================== --- csw/mgar/pkg/php5/trunk/files/scripts.mk 2011-04-14 20:27:18 UTC (rev 14195) +++ csw/mgar/pkg/php5/trunk/files/scripts.mk 2011-04-14 22:15:08 UTC (rev 14196) @@ -15,7 +15,6 @@ endef PI_SCRIPTS = install-extras -PI_SCRIPTS += install-ap2modphp5 PI_SCRIPTS += install-cleanup post-install-modulated: $(PI_SCRIPTS) @@ -37,14 +36,6 @@ gchmod 0644 $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW @$(MAKECOOKIE) -install-ap2modphp5: - @echo "[====> Now Installing ap2_modphp5 <====]" - $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi - strip $(DESTDIR)$(prefix)/apache2/libexec/libphp5.so - ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra - ginstall -m 0644 $(DOWNLOADDIR)/httpd-php5.conf.CSW $(DESTDIR)$(prefix)/apache2/etc/extra - @$(MAKECOOKIE) - install-cleanup: @echo "[====> Cleaning Up Extra Install Files <====]" gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr 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 Apr 15 00:17:15 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 22:17:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[14197] csw/mgar/pkg/php5/trunk Message-ID: Revision: 14197 http://gar.svn.sourceforge.net/gar/?rev=14197&view=rev Author: bdwalton Date: 2011-04-14 22:17:15 +0000 (Thu, 14 Apr 2011) Log Message: ----------- php5/trunk: collapse scripts.mk into main recipe (more cleanup to follow) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/php5/trunk/files/scripts.mk Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-14 22:15:08 UTC (rev 14196) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-14 22:17:15 UTC (rev 14197) @@ -714,14 +714,29 @@ CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 -include files/scripts.mk include gar/category.mk +# funcion Definitions and mGar Extra Scripts +# + +define _get_php_config +$(abspath $(shell gfind $(1) -name php-config -print)) +endef + +define _get_php_prefix +$(shell $(call _get_php_config,$(1)) --prefix) +endef + +define _get_php_ini_path +$(shell $(call _get_php_prefix,$(1))/bin/php -i | grep "Configuration File .* Path" | gawk '{print $$NF}') +endef + + # this allows apxs to install the module. stupid, but i couldn't make # the darn thing _not_ do try to add the httpd.conf lines, even with # patching... pre-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc -pre-install-modulated: +pre-install-modulated: $(PI_SCRIPTS) @(mkdir -p $(DESTDIR)$(AP2SYSCONF); \ cp $(AP2SYSCONF)/httpd.conf $(DESTDIR)$(AP2SYSCONF) ) @$(MAKECOOKIE) @@ -730,3 +745,35 @@ post-install-modulated: @rm $(DESTDIR)$(AP2SYSCONF) @$(MAKECOOKIE) + +PI_SCRIPTS = install-extras +PI_SCRIPTS += install-cleanup + +install-extras: + @echo "[====> Fixing Admin Scripts <====]" + gcp $(DOWNLOADDIR)/php.ini.CSW $(DOWNLOADDIR)/php.ini.CSW.fixed + perl -i -pne "s|x_PHPEXTDIR_x|_PHPEXTDIR_|" $(DOWNLOADDIR)/php.ini.CSW.fixed + perl -i -pne "s|_PHPINIFILE_|$(call _get_php_ini_path,$(DESTDIR))/php.ini|" `gfind $(DOWNLOADDIR) -type f -print` + perl -i -pne "s|_PHPLIBDIR_|$(call _get_php_ini_path,$(DESTDIR))|" `gfind $(DOWNLOADDIR) -type f -print` + perl -i -pne "s|_PHPBINDIR_|$(call _get_php_prefix,$(DESTDIR))/bin|" `gfind $(DOWNLOADDIR) -type f -print` + perl -i -pne "s|_PHPETCDIR_|$(call _get_php_prefix,$(DESTDIR))/etc|" `gfind $(DOWNLOADDIR) -type f -print` + perl -i -pne 's|_PHPEXTDIR_|$(shell $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)|' `gfind $(DOWNLOADDIR) -type f -print` + @echo "[====> Installing Extra Files <====]" + ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin + gcp $(DOWNLOADDIR)/php.ini.CSW.fixed $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW + gmv $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf.CSW + gchmod 0644 $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW + @$(MAKECOOKIE) + +install-cleanup: + @echo "[====> Cleaning Up Extra Install Files <====]" + gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr + gfind $(DESTDIR)$(prefix)/apache* -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr + $(GARBIN)/stripbin $(DESTDIR)$(shell $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir) + $(GARBIN)/stripbin $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin + $(MAKECOOKIE) + +EXTFILES = $(shell find extensions/*/files/* -prune -type f) +pre-fetch: + $(foreach F,$(EXTFILES),$(shell cp $(F) $(DOWNLOADDIR))) + Deleted: csw/mgar/pkg/php5/trunk/files/scripts.mk =================================================================== --- csw/mgar/pkg/php5/trunk/files/scripts.mk 2011-04-14 22:15:08 UTC (rev 14196) +++ csw/mgar/pkg/php5/trunk/files/scripts.mk 2011-04-14 22:17:15 UTC (rev 14197) @@ -1,50 +0,0 @@ -# -# funcion Definitions and mGar Extra Scripts -# - -define _get_php_config -$(abspath $(shell gfind $(1) -name php-config -print)) -endef - -define _get_php_prefix -$(shell $(call _get_php_config,$(1)) --prefix) -endef - -define _get_php_ini_path -$(shell $(call _get_php_prefix,$(1))/bin/php -i | grep "Configuration File .* Path" | gawk '{print $$NF}') -endef - -PI_SCRIPTS = install-extras -PI_SCRIPTS += install-cleanup - -post-install-modulated: $(PI_SCRIPTS) - @$(MAKECOOKIE) - -install-extras: - @echo "[====> Fixing Admin Scripts <====]" - gcp $(DOWNLOADDIR)/php.ini.CSW $(DOWNLOADDIR)/php.ini.CSW.fixed - perl -i -pne "s|x_PHPEXTDIR_x|_PHPEXTDIR_|" $(DOWNLOADDIR)/php.ini.CSW.fixed - perl -i -pne "s|_PHPINIFILE_|$(call _get_php_ini_path,$(DESTDIR))/php.ini|" `gfind $(DOWNLOADDIR) -type f -print` - perl -i -pne "s|_PHPLIBDIR_|$(call _get_php_ini_path,$(DESTDIR))|" `gfind $(DOWNLOADDIR) -type f -print` - perl -i -pne "s|_PHPBINDIR_|$(call _get_php_prefix,$(DESTDIR))/bin|" `gfind $(DOWNLOADDIR) -type f -print` - perl -i -pne "s|_PHPETCDIR_|$(call _get_php_prefix,$(DESTDIR))/etc|" `gfind $(DOWNLOADDIR) -type f -print` - perl -i -pne 's|_PHPEXTDIR_|$(shell $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)|' `gfind $(DOWNLOADDIR) -type f -print` - @echo "[====> Installing Extra Files <====]" - ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin - gcp $(DOWNLOADDIR)/php.ini.CSW.fixed $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW - gmv $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf.CSW - gchmod 0644 $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW - @$(MAKECOOKIE) - -install-cleanup: - @echo "[====> Cleaning Up Extra Install Files <====]" - gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr - gfind $(DESTDIR)$(prefix)/apache* -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr - $(GARBIN)/stripbin $(DESTDIR)$(shell $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir) - $(GARBIN)/stripbin $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin - $(MAKECOOKIE) - -EXTFILES = $(shell find extensions/*/files/* -prune -type f) -pre-fetch: - $(foreach F,$(EXTFILES),$(shell cp $(F) $(DOWNLOADDIR))) - 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 Apr 15 00:18:00 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Apr 2011 22:18:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14198] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14198 http://gar.svn.sourceforge.net/gar/?rev=14198&view=rev Author: bdwalton Date: 2011-04-14 22:18:00 +0000 (Thu, 14 Apr 2011) Log Message: ----------- php5/trunk: drop useless pre-fetch target now that extension stuff is combined in main recipe Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-14 22:17:15 UTC (rev 14197) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-14 22:18:00 UTC (rev 14198) @@ -773,7 +773,3 @@ $(GARBIN)/stripbin $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin $(MAKECOOKIE) -EXTFILES = $(shell find extensions/*/files/* -prune -type f) -pre-fetch: - $(foreach F,$(EXTFILES),$(shell cp $(F) $(DOWNLOADDIR))) - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Apr 15 01:08:15 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 14 Apr 2011 23:08:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[14199] csw/mgar/gar Message-ID: Revision: 14199 http://gar.svn.sourceforge.net/gar/?rev=14199&view=rev Author: skayser Date: 2011-04-14 23:08:15 +0000 (Thu, 14 Apr 2011) Log Message: ----------- gar/v2: branch to refactor the fetch phase and avoid a sub-GAR invocation for every download attempt Modified Paths: -------------- csw/mgar/gar/v2-speedup-fetch/gar.conf.mk csw/mgar/gar/v2-speedup-fetch/gar.lib.mk Added Paths: ----------- csw/mgar/gar/v2-speedup-fetch/ csw/mgar/gar/v2-speedup-fetch/bin/fetch_url Added: csw/mgar/gar/v2-speedup-fetch/bin/fetch_url =================================================================== --- csw/mgar/gar/v2-speedup-fetch/bin/fetch_url (rev 0) +++ csw/mgar/gar/v2-speedup-fetch/bin/fetch_url 2011-04-14 23:08:15 UTC (rev 14199) @@ -0,0 +1,47 @@ +#!/bin/bash + +set -u +set -e + +URL=$1 +TARGET_DIR=$2 + +function fetch-rsync() { + local url=$1 + rsync -azvLP $url $TARGET_DIR/ +} + +function fetch-scp() { + local url=$1 + scp -C $url $TARGET_DIR/ +} + +function fetch-wget() { + local url=$1 + wget ${WGET_OPTS:-} -T 30 -c -P $TARGET_DIR $url +} + +function fetch-file() { + local file=$1 + [ ! -f $file ] && return 1 + gln -sf /$file $TARGET_DIR/`basename $file` +} + +function fetch-svn() { + local url=$1 + svn co ${SVNHTTP_CO_ARGS:-} $url $TARGET_DIR/`basename $url` +} + +case $URL in + ftp://*) fetch-wget $URL;; + http://*) fetch-wget $URL;; + https://*) fetch-wget $URL;; + file://*) fetch-file `echo $URL | sed -e 's,file://,,'`;; + rsync://*) fetch-rsync $URL;; + svn-http://*) fetch-svn `echo $URL | sed -e 's,svn-,,'`;; + svn-https://*) fetch-svn `echo $URL | sed -e 's,svn-,,'`;; + scp://*) fetch-scp `echo $URL | sed -e 's,scp://,,'`;; + *) echo "ERROR: unsupported scheme" >&2; exit 1;; +esac + +exit $? Property changes on: csw/mgar/gar/v2-speedup-fetch/bin/fetch_url ___________________________________________________________________ Added: svn:executable + * Modified: csw/mgar/gar/v2-speedup-fetch/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2011-04-13 11:11:44 UTC (rev 14158) +++ csw/mgar/gar/v2-speedup-fetch/gar.conf.mk 2011-04-14 23:08:15 UTC (rev 14199) @@ -704,11 +704,14 @@ COMMON_EXPORTS += LD_OPTIONS endif +_FETCH_EXPORTS = WGET_OPTS SVNHTTP_CO_ARGS +FETCH_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_FETCH_EXPORTS) $(_FETCH_EXPORTS) CONFIGURE_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_CONFIGURE_EXPORTS) PKG_CONFIG_PATH DESTDIR BUILD_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_BUILD_EXPORTS) TEST_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_TEST_EXPORTS) INSTALL_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_INSTALL_EXPORTS) DESTDIR +FETCH_ENV ?= $(foreach TTT,$(FETCH_EXPORTS),$(TTT)="$($(TTT))") CONFIGURE_ENV ?= $(foreach TTT,$(CONFIGURE_EXPORTS),$(TTT)="$($(TTT))") BUILD_ENV ?= $(foreach TTT,$(BUILD_EXPORTS),$(TTT)="$($(TTT))") TEST_ENV ?= $(foreach TTT,$(TEST_EXPORTS),$(TTT)="$($(TTT))") Modified: csw/mgar/gar/v2-speedup-fetch/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2011-04-13 11:11:44 UTC (rev 14158) +++ csw/mgar/gar/v2-speedup-fetch/gar.lib.mk 2011-04-14 23:08:15 UTC (rev 14199) @@ -48,15 +48,16 @@ # 1) we have to strip the colon from the URLs # 2) the download is very costly with bigger Makefiles as they will be # re-evaluated for every URL (nested gmake invocation, room for improvement) +$(DOWNLOADDIR)/%: FILE_URLS = $(filter %/$*, $(URLS)) $(DOWNLOADDIR)/%: @if test -f $(COOKIEDIR)/checksum-$*; then : ; else \ echo " ==> Grabbing $@"; \ - ( for i in $(filter %/$*,$(URLS)); do \ - echo " ==> Trying $$i"; \ - $(MAKE) -s `echo $$i | tr -d :` || continue; \ + for i in $(FILE_URLS); do \ + echo " ==> Trying $$i"; \ + $(FETCH_ENV) $(GARBIN)/fetch_url $$i $(PARTIALDIR) || continue; \ mv $(PARTIALDIR)/$* $@; \ break; \ - done; ) 2>&1 | grep -v '^$(MAKE)'; \ + done; \ if test -r $@ ; then : ; else \ echo '(!!!) Failed to download $@!' 1>&2; \ false; \ @@ -109,53 +110,7 @@ dynscr//%: $(MAKE) --no-print-directory -n _$@ > $(PARTIALDIR)/$* -# download an http URL (colons omitted) -http//%: - @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) http://$* -https//%: - @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) https://$* - -# download an ftp URL (colons omitted) -#ftp//%: -# @wget -T 30 -c --passive-ftp -P $(PARTIALDIR) ftp://$* -ftp//%: - @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) ftp://$* - -# link to a local copy of the file -# (absolute path) -file///%: - @if test -f /$*; then \ - gln -sf /$* $(PARTIALDIR)/$(notdir $*); \ - else \ - false; \ - fi - -# link to a local copy of the file -# (relative path) -file//%: - @if test -f $*; then \ - gln -sf "$(CURDIR)/$*" $(PARTIALDIR)/$(notdir $*); \ - else \ - false; \ - fi - -# Using Jeff Waugh's rsync rule. -# DOES NOT PRESERVE SYMLINKS! -rsync//%: - @rsync -azvLP rsync://$* $(PARTIALDIR)/ - -# Using Jeff Waugh's scp rule -scp//%: - @scp -C $* $(PARTIALDIR)/ - -# Fetch a SVN repo via http -svn-http//%: - @svn co $(SVNHTTP_CO_ARGS) http://$* $(PARTIALDIR)/$(notdir $*) - -svn-https//%: - @svn co $(SVNHTTP_CO_ARGS) https://$* $(PARTIALDIR)/$(notdir $*) - #################### CHECKSUM RULES #################### # check a given file's checksum against $(CHECKSUM_FILE) and This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Apr 15 01:33:36 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 14 Apr 2011 23:33:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[14200] csw/mgar/gar/v2-speedup-fetch/bin/fetch_url Message-ID: Revision: 14200 http://gar.svn.sourceforge.net/gar/?rev=14200&view=rev Author: skayser Date: 2011-04-14 23:33:36 +0000 (Thu, 14 Apr 2011) Log Message: ----------- .buildsys/v2-speedup-fetch: fix handling of relative file URIs in bin/fetch_file Modified Paths: -------------- csw/mgar/gar/v2-speedup-fetch/bin/fetch_url Modified: csw/mgar/gar/v2-speedup-fetch/bin/fetch_url =================================================================== --- csw/mgar/gar/v2-speedup-fetch/bin/fetch_url 2011-04-14 23:08:15 UTC (rev 14199) +++ csw/mgar/gar/v2-speedup-fetch/bin/fetch_url 2011-04-14 23:33:36 UTC (rev 14200) @@ -24,7 +24,8 @@ function fetch-file() { local file=$1 [ ! -f $file ] && return 1 - gln -sf /$file $TARGET_DIR/`basename $file` + local abspath="`greadlink -m $file`" + gln -sf $abspath $TARGET_DIR/`basename $file` } function fetch-svn() { 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 Apr 15 04:36:20 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Apr 2011 02:36:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[14201] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14201 http://gar.svn.sourceforge.net/gar/?rev=14201&view=rev Author: bdwalton Date: 2011-04-15 02:36:20 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bacula/trunk: the gnome console has been deprecated so mark it obsolete Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-14 23:33:36 UTC (rev 14200) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 02:36:20 UTC (rev 14201) @@ -26,7 +26,7 @@ ARCHALL_CSWbacula-client = 1 RUNTIME_DEP_PKGS_CSWbacula-client += CSWbacula-fd PKGFILES_CSWbacula-client = NOFILES -OBSOLETED_BY_CSWbacula-client = CSWbaculaclient +OBSOLETED_BY_CSWbacula-client = CSWbaculaclient CSWbaculagnome # set this explicitly to help phil's tools for now CATALOG_NAME_CSWbaculaclient = bacula_client_stub CHECKPKG_OVERRIDES_CSWbacula-client += surplus-dependency|CSWbacula-fd 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 Apr 15 04:56:51 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Apr 2011 02:56:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14202] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14202 http://gar.svn.sourceforge.net/gar/?rev=14202&view=rev Author: bdwalton Date: 2011-04-15 02:56:50 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bacula/trunk: set desc and catalog name for obsoleted gnome console package Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 02:36:20 UTC (rev 14201) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 02:56:50 UTC (rev 14202) @@ -27,6 +27,8 @@ RUNTIME_DEP_PKGS_CSWbacula-client += CSWbacula-fd PKGFILES_CSWbacula-client = NOFILES OBSOLETED_BY_CSWbacula-client = CSWbaculaclient CSWbaculagnome +SPKG_DESC_CSWbaculagnome = Obsolete bacula gnome console +CATALOG_NAME_CSWbaculagnome = bacula_gnome_stub # set this explicitly to help phil's tools for now CATALOG_NAME_CSWbaculaclient = bacula_client_stub CHECKPKG_OVERRIDES_CSWbacula-client += surplus-dependency|CSWbacula-fd 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 Apr 15 11:42:34 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Apr 2011 09:42:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[14203] csw/mgar/pkg/bdb3/trunk/Makefile Message-ID: Revision: 14203 http://gar.svn.sourceforge.net/gar/?rev=14203&view=rev Author: dmichelsen Date: 2011-04-15 09:42:34 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bdb3: Sanitize package names, adjust to new standards Modified Paths: -------------- csw/mgar/pkg/bdb3/trunk/Makefile Modified: csw/mgar/pkg/bdb3/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb3/trunk/Makefile 2011-04-15 02:56:50 UTC (rev 14202) +++ csw/mgar/pkg/bdb3/trunk/Makefile 2011-04-15 09:42:34 UTC (rev 14203) @@ -16,20 +16,14 @@ MASTER_SITES = http://download.oracle.com/berkeley-db/ DISTFILES = $(NAME)-$(VERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PATCHDIR = $(WORKDIR)/$(DISTNAME) +WORKSRC = $(PATCHDIR)/build_unix -# GIT Patching does not work when WORKSRC is explicitly set -NOGITPATCH = 1 -WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)/build_unix - -PATCHDIR = $(WORKSRC)/.. PATCHDIRLEVEL = 0 PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) RELEASE = p$(words $(filter patch.$(VERSION).%,$(PATCHFILES))) -#BUILD64 = 1 -NOISAEXEC = 1 +BUILD64 = 1 CONFIGURE_SCRIPTS = dist @@ -49,7 +43,7 @@ FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb33/lib -# bdb tests are *very* time consuming +# There are no test scripts for bdb 3.3 TEST_SCRIPTS = LICENSE = LICENSE @@ -61,30 +55,32 @@ RUNTIME_DEP_PKGS_CSWbdb3 += CSWtcl CHECKPKG_OVERRIDES_CSWbdb3 += catalogname-does-not-match-pkgname|pkgname=CSWbdb3|catalogname=berkeleydb3|expected-catalogname=bdb3 -PACKAGES += CSWbdb3devel -CATALOGNAME_CSWbdb3devel = berkeleydb3_devel -SPKG_DESC_CSWbdb3devel = BerkeleyDB 3.3 development support +PACKAGES += CSWbdb3-dev +CATALOGNAME_CSWbdb3-dev = berkeleydb3_dev +SPKG_DESC_CSWbdb3-dev = BerkeleyDB 3.3 development support # Keep these in the main package PKGFILES_DEVEL_SHAREDLIBLINK = -PKGFILES_CSWbdb3devel = $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWbdb3devel = CSWbdb3 -CHECKPKG_OVERRIDES_CSWbdb3devel += surplus-dependency|CSWbdb3 -CHECKPKG_OVERRIDES_CSWbdb3devel += catalogname-does-not-match-pkgname|pkgname=CSWbdb3devel|catalogname=berkeleydb3_devel|expected-catalogname=bdb3devel +PKGFILES_CSWbdb3-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWbdb3-dev = CSWbdb3 +CHECKPKG_OVERRIDES_CSWbdb3-dev += surplus-dependency|CSWbdb3 +CHECKPKG_OVERRIDES_CSWbdb3-dev += catalogname-does-not-match-pkgname|pkgname=CSWbdb3-dev|catalogname=berkeleydb3_dev|expected-catalogname=bdb3_dev +OBSOLETED_BY_CSWbdb3-dev = CSWbdb3devel -PACKAGES += CSWbdb3doc -CATALOGNAME_CSWbdb3doc = berkeleydb3_doc -SPKG_DESC_CSWbdb3doc = BerkeleyDB 3.3 documentation -PKGFILES_CSWbdb3doc = $(PKGFILES_DOC) -ARCHALL_CSWbdb3doc = 1 -CHECKPKG_OVERRIDES_CSWbdb3doc += catalogname-does-not-match-pkgname|pkgname=CSWbdb3doc|catalogname=berkeleydb3_doc|expected-catalogname=bdb3doc +PACKAGES += CSWbdb3-doc +CATALOGNAME_CSWbdb3-doc = berkeleydb3_doc +SPKG_DESC_CSWbdb3-doc = BerkeleyDB 3.3 documentation +PKGFILES_CSWbdb3-doc = $(PKGFILES_DOC) +ARCHALL_CSWbdb3-doc = 1 +CHECKPKG_OVERRIDES_CSWbdb3-doc += catalogname-does-not-match-pkgname|pkgname=CSWbdb3-doc|catalogname=berkeleydb3_doc|expected-catalogname=bdb3_doc +OBSOLETED_BY_CSWbdb3-doc = CSWbdb3doc # These are all pure examples -CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/flags.html -CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/install.html -CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/conf.html -CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/notes.html -CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/sendmail/intro.html -CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/tcl/intro.html +CHECKPKG_OVERRIDES_CSWbdb3-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/flags.html +CHECKPKG_OVERRIDES_CSWbdb3-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/install.html +CHECKPKG_OVERRIDES_CSWbdb3-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/conf.html +CHECKPKG_OVERRIDES_CSWbdb3-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/notes.html +CHECKPKG_OVERRIDES_CSWbdb3-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/sendmail/intro.html +CHECKPKG_OVERRIDES_CSWbdb3-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/tcl/intro.html INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir includedir libdir @@ -92,6 +88,9 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* +# We need the binaries +EXTRA_MERGE_DIRS_isa-extra = $(bindir) + include gar/category.mk LIBS += -lnsl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Apr 15 14:59:43 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 Apr 2011 12:59:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14204] csw/mgar/pkg/newpkg-Makefile Message-ID: Revision: 14204 http://gar.svn.sourceforge.net/gar/?rev=14204&view=rev Author: skayser Date: 2011-04-15 12:59:42 +0000 (Fri, 15 Apr 2011) Log Message: ----------- pkg: add Makefile template for mgar, gmake newpkg can be converted to use this too Added Paths: ----------- csw/mgar/pkg/newpkg-Makefile Added: csw/mgar/pkg/newpkg-Makefile =================================================================== --- csw/mgar/pkg/newpkg-Makefile (rev 0) +++ csw/mgar/pkg/newpkg-Makefile 2011-04-15 12:59:42 UTC (rev 14204) @@ -0,0 +1,27 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = %NAME% +VERSION = %VERSION% +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Apr 15 15:16:46 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 Apr 2011 13:16:46 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[369] gar-wrapper/mgar Message-ID: Revision: 369 http://opencsw.svn.sourceforge.net/opencsw/?rev=369&view=rev Author: skayser Date: 2011-04-15 13:16:46 +0000 (Fri, 15 Apr 2011) Log Message: ----------- mgar: Looooots of changes (too many), mainly enable global BUILDSYS override Introduce BUILDSYS_OVERRIDE in ~/.garrc to force a buildsys branch globally. If this is in effect, users need to explicitly acknowledge commits to avoid accidental commits where the build recipe won't be buildable with it's configured externals/GARTYPE GAR branch. Changes to commands: * commit|ci: now only operates from within a package dir. This was required for the change above and could be tweaked to operate on a global level again if this is required. * commit: automatically commit .. when package has been freshly created (and the parent dir needs to be committed instead of the current dir). New commands: * newpkg: create a new package based on $BUILDTREE/newpkg-Makefile * list-categories: list categories understood by GAR * up --buildsys: update .buildsys only Deleted commands: * newpkg-*: use newpkg instead Modified Paths: -------------- gar-wrapper/mgar Modified: gar-wrapper/mgar =================================================================== --- gar-wrapper/mgar 2011-04-11 09:52:40 UTC (rev 368) +++ gar-wrapper/mgar 2011-04-15 13:16:46 UTC (rev 369) @@ -33,11 +33,6 @@ # # Todos: # * Add template for ~/.garrc (think new users) -# * Integrate the creation of a new package (with sanity check whether -# package already exists). Use per-directory Makefile.template files. -# Example: -# mgar newpkg foo (picks up Makefile.tmpl) -# mgar newpkg --documented foo (picks up Makefile.tmpl-documented) # * When packaging mgar, shield mgar up --self so that it won't override # the package binary, but place it somewhere else. # * In commit mode, if (pwd.endswith('trunk') and svn.rev -eq 0) commit .. @@ -149,7 +144,7 @@ } function die_not_in_pkg_dir { - echo "ERROR: No package build description found in the current directory" >&2 + echo "ERROR: This command needs to be run from within a package directory." >&2 exit 2 } @@ -268,21 +263,50 @@ fi } +function assert_non_overriden_buildsys() { + [ -z "$BUILDSYS_OVERRIDE" ] && return + if [ "$BUILDSYS_OVERRIDE" != "$BUILDSYS_PKG" ]; then + echo "You are currently using a buildsys override." + echo "" + echo "Buildsys (override): $BUILDSYS_OVERRIDE" + echo "Buildsys (package): $BUILDSYS_PKG" + echo "" + echo "If you really want to proceed, call commit with: -o" + exit 2 + fi +} + +function assert_no_untracked_files() { + local __untracked=`svn status | grep \? || :` + if [ -n "$__untracked" ]; then + echo "Attention: working directory contains untracked changes." + echo + echo "$__untracked" + echo + echo "If you really want to proceed, call commit with: -f" + exit 2 + fi +} + # Commit working files (prefixes pkg path and checks for untracked changes) function verify_local_status_and_commit() { - local opts __forceflag __logmsg __untracked + local opts __forceflag __logmsg __untracked __override_buildsys # Beware: getopts stops on the first non-option argument, thus # "mgar . -m foo -f" won't see any getopts handling - while getopts "fm:" opts ; do + while getopts "fm:o" opts ; do case $opts in f) __forceflag=1;; m) __logmsg="$OPTARG";; + o) __override_buildsys=1;; esac done shift $((OPTIND-1)) + [ -z "${__forceflag:-}" ] && assert_no_untracked_files + [ -z "${__override_buildsys:-}" ] && assert_non_overriden_buildsys + # prefix the commitmsg with a pkg path prefix unless a prefix is given - __prefix=$( pwd | sed "s,^$BUILDTREE/,," ) + local __prefix=$( pwd | sed "s,^$BUILDTREE/,," ) if [ -n "${__logmsg:-}" ]; then if ! echo "$__logmsg" | ggrep -qE '^\S+:'; then __logmsg="$__prefix: $__logmsg" @@ -297,18 +321,17 @@ esac fi - __untracked=`svn status | grep \? || :` - if [ -n "$__untracked" -a -z "${__forceflag:-}" ]; then - echo "Attention: working directory contains untracked changes." - echo - echo "$__untracked" - echo - echo "If you really want to proceed, call \"mgar commit -f\"" - return + # In a pkg build directory where the parent directory hasn't been + # checked in previously, we need to commit .. instead of . + local __pkg_rev=`get_rev .` + local __parent_rev=`get_rev ..` + if [ "${__pkg_rev}" == 0 -a "${__parent_rev}" == 0 ]; then + echo "Commiting package build for the first time (incl. parent dir)." + echo svn commit "${__log_args[@]:-}" .. + else + echo "Commiting changes." + echo svn commit "${__log_args[@]:-}" "$@" fi - - echo "Commiting local changes." - svn commit "${__log_args[@]:-}" "$@" } function get_rev() { @@ -379,6 +402,44 @@ done } +function newpkg() { + local __pkgname=$1 + local __version=${2:-X.Y} + + if [ -d ${__pkgname} ]; then + echo "ERROR: ${__pkgname} already exists" >&2 + exit 1 + fi + + ### Add template find mechanism (upwards from PWD, until BUILDTREE reached) + local __template=$BUILDTREE/newpkg-Makefile + if [ ! -f ${__template} ]; then + echo "ERROR: Template $__template not found" >&2 + echo "Likely fix:" >&2 + echo " (cd $BUILDTREE && svn up `basename ${__template}`)" >&2 + exit 1 + fi + + echo "Creating package skeleton for ${__pkgname} ${__version}." + svn mkdir --parents ${__pkgname}/trunk/files ${__pkgname}/{branches,tags} + touch ${__pkgname}/trunk/checksums + perl -p -e "\ + s,%NAME%,${__pkgname},; \ + s,%VERSION%,${__version},; \ + " ${__template} > ${__pkgname}/trunk/Makefile + svn add ${__pkgname}/trunk/Makefile + svn add ${__pkgname}/trunk/checksums + + svn ps svn:keywords Id ${__pkgname}/trunk/Makefile + svn ps svn:ignore \ + -F <( echo -e "cookies\ndownload\nwork\n" ) ${__pkgname}/trunk + svn ps svn:externals "gar $GAR_REPO/v2" ${__pkgname}/trunk + + echo "" + echo "Created successfully at $PWD/${__pkgname}/trunk" >&2 + echo "" +} + function usage() { cat < [options] @@ -388,6 +449,7 @@ index Build/update the package build tree index locate Search a package within the package build tree index up [--all] Update current (or all) package build descriptions + newpkg [ver] Create new package build directory Package build actions (to be called from a package build directory): fetch Download the package source @@ -437,7 +499,9 @@ if is_per_pkg_command $1; then assert_in_pkg_dir assert_no_conflicting_gar_dir_present - BUILDSYS=`get_pkg_buildsysdir` + BUILDSYS_OVERRIDE="`read_config_value OVERRIDE_BUILDSYS`" + BUILDSYS_PKG="`get_pkg_buildsysdir`" + BUILDSYS=${BUILDSYS_OVERRIDE:-$BUILDSYS_PKG} assert_buildsys_present "$BUILDSYS" create_legacy_gar_link "$BUILDSYS" fi @@ -449,18 +513,21 @@ # global-cmds index) build_index "$BUILDTREE";; locate) shift; search_index "$BUILDTREE" "${1-}";; - newpkg-*) gmake "$@";; # temporary, should be replaced, see TODO + newpkg) shift; newpkg ${1:-} ${2:-};; show-pkgtree) echo "$BUILDTREE";; - commit|ci) shift; verify_local_status_and_commit "$@";; scm) shift; svn $@;; up) if [ "${2:-}" == "--all" ]; then $0 up-all elif [ "${2:-}" == "--self" ]; then update_self ${3:-} + elif [ "${2:-}" == "--buildsys" ]; then + $0 up-buildsys else $0 up-pkg fi ;; + up-buildsys) echo "Updating $BUILDTREE/.buildsys" + svn up "$BUILDTREE/.buildsys";; up-all) echo "Updating full build tree (this will take some time)" svn up \ --set-depth infinity --ignore-externals \ @@ -471,9 +538,11 @@ # /global-cmds # per-pkg-cmds + commit|ci) shift; verify_local_status_and_commit "$@";; edit-file) $EDITOR `gfind \`get_srcdir\` -name "$2"`;; find-file) gfind "`get_srcdir`" \ -name .git -prune -o -name "${2:-*}" -print;; + list-categories) ls "$BUILDSYS/categories/";; show-buildsys) __rev=`get_rev "$BUILDSYS"` __branch=`get_repourl "$BUILDSYS" | sed -e "s,$GAR_REPO,,"` echo -e "$BUILDSYS\t(Revision: $__rev, Branch: $__branch)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Apr 15 15:17:56 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 Apr 2011 13:17:56 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[370] gar-wrapper/mgar Message-ID: Revision: 370 http://opencsw.svn.sourceforge.net/opencsw/?rev=370&view=rev Author: skayser Date: 2011-04-15 13:17:56 +0000 (Fri, 15 Apr 2011) Log Message: ----------- mgar: drop debugging echos for commit Modified Paths: -------------- gar-wrapper/mgar Modified: gar-wrapper/mgar =================================================================== --- gar-wrapper/mgar 2011-04-15 13:16:46 UTC (rev 369) +++ gar-wrapper/mgar 2011-04-15 13:17:56 UTC (rev 370) @@ -327,10 +327,10 @@ local __parent_rev=`get_rev ..` if [ "${__pkg_rev}" == 0 -a "${__parent_rev}" == 0 ]; then echo "Commiting package build for the first time (incl. parent dir)." - echo svn commit "${__log_args[@]:-}" .. + svn commit "${__log_args[@]:-}" .. else echo "Commiting changes." - echo svn commit "${__log_args[@]:-}" "$@" + svn commit "${__log_args[@]:-}" "$@" 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 Fri Apr 15 15:25:40 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Apr 2011 13:25:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14205] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14205 http://gar.svn.sourceforge.net/gar/?rev=14205&view=rev Author: bdwalton Date: 2011-04-15 13:25:40 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bacula/trunk: use prefix/lib instead if libdir for ncurses stuff now that we override libdir Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 12:59:42 UTC (rev 14204) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 13:25:40 UTC (rev 14205) @@ -143,7 +143,7 @@ CONFIGURE_ARGS += --enable-tray-monitor EXTRA_INC += $(includedir)/ncursesw -EXTRA_LIB += $(libdir)/ncursesw $(prefix)/mysql5/lib/mysql +EXTRA_LIB += $(prefix)/lib/ncursesw $(prefix)/mysql5/lib/mysql EXTRA_LINKER_FLAGS = -norunpath # no tests supplied. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Fri Apr 15 15:35:50 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Fri, 15 Apr 2011 13:35:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14206] csw/mgar/pkg/ruby-augeas/trunk/Makefile Message-ID: Revision: 14206 http://gar.svn.sourceforge.net/gar/?rev=14206&view=rev Author: phipsy Date: 2011-04-15 13:35:50 +0000 (Fri, 15 Apr 2011) Log Message: ----------- Updates to ruby_augeas makefile Modified Paths: -------------- csw/mgar/pkg/ruby-augeas/trunk/Makefile Modified: csw/mgar/pkg/ruby-augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-04-15 13:25:40 UTC (rev 14205) +++ csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-04-15 13:35:50 UTC (rev 14206) @@ -13,7 +13,8 @@ PACKAGES = CSWrubyaugeas CATALOGNAME = ruby_augeas -RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWruby18 +RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWruby +RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWlibruby18-1 RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWaugeas CHECKPKG_OVERRIDES_CSWrubyaugeas += catalogname-does-not-match-pkgname|pkgname=CSWrubyaugeas|catalogname=ruby_augeas|expected-catalogname=rubyaugeas CHECKPKG_OVERRIDES_CSWrubyaugeas += missing-dependency|CSWruby This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Apr 15 15:42:52 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 Apr 2011 13:42:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[14207] csw/mgar/pkg Message-ID: Revision: 14207 http://gar.svn.sourceforge.net/gar/?rev=14207&view=rev Author: skayser Date: 2011-04-15 13:42:52 +0000 (Fri, 15 Apr 2011) Log Message: ----------- waf/trunk: initial commit, doesn't produce a package yet Added Paths: ----------- csw/mgar/pkg/waf/ csw/mgar/pkg/waf/branches/ csw/mgar/pkg/waf/tags/ csw/mgar/pkg/waf/trunk/ csw/mgar/pkg/waf/trunk/Makefile csw/mgar/pkg/waf/trunk/checksums csw/mgar/pkg/waf/trunk/files/ Property changes on: csw/mgar/pkg/waf/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/waf/trunk/Makefile =================================================================== --- csw/mgar/pkg/waf/trunk/Makefile (rev 0) +++ csw/mgar/pkg/waf/trunk/Makefile 2011-04-15 13:42:52 UTC (rev 14207) @@ -0,0 +1,41 @@ +# $Id$ +# +# TODO (release-critical prefixed with !, non release-critical with *) +# ! write install-custom, cf. +# http://pkgs.fedoraproject.org/gitweb/?p=waf.git;a=blob_plain;f=waf.spec +# +NAME = waf +VERSION = 1.6.3 +CATEGORIES = python + +DESCRIPTION = Python-based build automation tool +define BLURB + Waf is a Python-based framework for configuring, compiling and + installing applications. It is a replacement for other tools such as + Autotools, Scons, CMake or Ant. +endef + +VENDOR_URL = http://code.google.com/p/waf/ +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = $(DISTNAME).tar.bz2 + +UPSTREAM_MASTER_SITES = http://code.google.com/p/waf/downloads/list + +CONFIGURE_SCRIPTS = custom +BUILD_SCRIPTS = custom +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +configure-custom: + cd $(WORKSRC) && $(CONFIGURE_ENV) ./waf-light configure + @$(MAKECOOKIE) + +build-custom: + cd $(WORKSRC) && $(BUILD_ENV) ./waf-light build + @$(MAKECOOKIE) + +install-custom: + $(error "waf's install-custom not yet populated") + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/waf/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/waf/trunk/checksums =================================================================== --- csw/mgar/pkg/waf/trunk/checksums (rev 0) +++ csw/mgar/pkg/waf/trunk/checksums 2011-04-15 13:42:52 UTC (rev 14207) @@ -0,0 +1 @@ +ca3e8fa8390a4d15bccd85491903f176 waf-1.6.3.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 Apr 15 16:14:52 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Apr 2011 14:14:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[14208] csw/mgar/gar/v2/categories/cpan/category.mk Message-ID: Revision: 14208 http://gar.svn.sourceforge.net/gar/?rev=14208&view=rev Author: dmichelsen Date: 2011-04-15 14:14:52 +0000 (Fri, 15 Apr 2011) Log Message: ----------- mGAR v2: cpan category fixup for 64 bit Modified Paths: -------------- csw/mgar/gar/v2/categories/cpan/category.mk Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2011-04-15 13:42:52 UTC (rev 14207) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2011-04-15 14:14:52 UTC (rev 14208) @@ -9,6 +9,7 @@ # Tests are enabled by default, unless overridden at the test level ENABLE_TEST ?= 1 +TEST_TARGET ?= test # Test target is test by default (in CPAN category) TEST_TARGET ?= test @@ -16,6 +17,9 @@ # Every CPAN module depends on Perl #DEPENDS += lang/perl +# Build also for 64 bit Perl by default +BUILD64 ?= $(if $(shell if test -f $(bindir_install)/$(ISA_DEFAULT64)/perl; then echo perl64; fi),1) + # Standard Perl module configuration script CONFIGURE_SCRIPTS ?= $(WORKSRC)/Makefile.PL @@ -66,7 +70,7 @@ configure-%/Makefile.PL: @echo " ==> Running Makefile.PL in $*" ( cd $* ; \ - $(CONFIGURE_ENV) perl Makefile.PL \ + $(CONFIGURE_ENV) $(bindir)/perl Makefile.PL \ $(CONFIGURE_ARGS) $(PERL_CONFIGURE_ARGS) ) @$(MAKECOOKIE) @@ -74,7 +78,7 @@ configure-%/Build.PL: @echo " ==> Running Build.PL in $*" ( cd $* ; \ - $(CONFIGURE_ENV) perl Build.PL \ + $(CONFIGURE_ENV) $(bindir)/perl Build.PL \ $(PERLBUILD_CONFIGURE_ARGS) $(CONFIGURE_ARGS) ) @$(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 Apr 15 17:11:00 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Apr 2011 15:11:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14209] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14209 http://gar.svn.sourceforge.net/gar/?rev=14209&view=rev Author: bdwalton Date: 2011-04-15 15:10:59 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bacula/trunk: building with gcc gets the RPATH stuff right Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 14:14:52 UTC (rev 14208) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 15:10:59 UTC (rev 14209) @@ -8,6 +8,8 @@ Bacula is a set of Open Source, enterprise ready, computer programs that permit you (or the system administrator) to manage backup, recovery, and verification of computer data across a network of computers of different kinds. Bacula is relatively easy to use and efficient, while offering many advanced storage management features that make it easy to find and recover lost or damaged files. In technical terms, it is an Open Source, enterprise ready, network based backup program. endef +GARCOMPILER = GNU + PACKAGES = CSWbacula-common CSWbacula-fd CSWbacula-sd PACKAGES += CSWbacula-director CSWbacula-client CSWbacula PACKAGES += CSWbacula-tray-monitor 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 Apr 15 17:17:59 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Apr 2011 15:17:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[14210] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14210 http://gar.svn.sourceforge.net/gar/?rev=14210&view=rev Author: bdwalton Date: 2011-04-15 15:17:59 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bacula/trunk: add gcc deps now that we have switched compilers Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 15:10:59 UTC (rev 14209) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 15:17:59 UTC (rev 14210) @@ -38,6 +38,8 @@ CATALOG_NAME_CSWbacula-tray-monitor = bacula_tray_monitor SPKG_DESC_CSWbacula-tray-monitor = $(DESCRIPTION) - Tray monitor RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWbacula-common +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWgcc4corert RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWtcpwrap RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWosslrt RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibintl8 @@ -53,6 +55,8 @@ CATALOG_NAME_CSWbacula-common = bacula_common SPKG_DESC_CSWbacula-common = $(DESCRIPTION) - shared files +RUNTIME_DEP_PKGS_CSWbacula-common += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWbacula-common += CSWgcc4corert RUNTIME_DEP_PKGS_CSWbacula-common += CSWmysql5rt RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbacula-common += CSWtcpwrap @@ -75,6 +79,8 @@ CATALOG_NAME_CSWbacula-fd = bacula_fd SPKG_DESC_CSWbacula-fd = $(DESCRIPTION) - File Daemon RUNTIME_DEP_PKGS_CSWbacula-fd = CSWbacula-common +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWgcc4corert RUNTIME_DEP_PKGS_CSWbacula-fd += CSWtcpwrap RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWzlib @@ -86,6 +92,8 @@ CATALOG_NAME_CSWbacula-sd = bacula_sd SPKG_DESC_CSWbacula-sd = $(DESCRIPTION) - Storage Daemon RUNTIME_DEP_PKGS_CSWbacula-sd = CSWbacula-common +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWgcc4corert RUNTIME_DEP_PKGS_CSWbacula-sd += CSWmysql5rt RUNTIME_DEP_PKGS_CSWbacula-sd += CSWtcpwrap RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibintl8 @@ -103,6 +111,8 @@ CATALOG_NAME_CSWbacula-director = bacula_director SPKG_DESC_CSWbacula-director = $(DESCRIPTION) - Director RUNTIME_DEP_PKGS_CSWbacula-director = CSWbacula-common +RUNTIME_DEP_PKGS_CSWbacula-director += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWbacula-director += CSWgcc4corert RUNTIME_DEP_PKGS_CSWbacula-director += CSWmysql5rt RUNTIME_DEP_PKGS_CSWbacula-director += CSWtcpwrap RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibintl8 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 Apr 15 17:22:32 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Apr 2011 15:22:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[14211] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14211 http://gar.svn.sourceforge.net/gar/?rev=14211&view=rev Author: bdwalton Date: 2011-04-15 15:22:32 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bacula/trunk: override strange lib issue for now...not sure if it is incorrect or not. testing when deployed on a system is required Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 15:17:59 UTC (rev 14210) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 15:22:32 UTC (rev 14211) @@ -88,6 +88,7 @@ RUNTIME_DEP_PKGS_CSWbacula-fd += CSWosslrt PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz +CHECKPKG_OVERRIDES_CSWbacula-fd += soname-not-found|libbacpy-5.0.3.so|is|needed|by|opt/csw/sbin/bacula-fd CATALOG_NAME_CSWbacula-sd = bacula_sd SPKG_DESC_CSWbacula-sd = $(DESCRIPTION) - Storage Daemon @@ -107,6 +108,7 @@ PKGFILES_CSWbacula-sd += .*man8/bacula-sd.8.gz .*man8/bextract.8.gz PKGFILES_CSWbacula-sd += .*man8/bls.8.gz .*man8/btape.8.gz PKGFILES_CSWbacula-sd += .*man8/bcopy.8.gz .*man8/bscan.8.gz +CHECKPKG_OVERRIDES_CSWbacula-sd += soname-not-found|libbacpy-5.0.3.so|is|needed|by|opt/csw/sbin/bacula-sd CATALOG_NAME_CSWbacula-director = bacula_director SPKG_DESC_CSWbacula-director = $(DESCRIPTION) - Director @@ -125,6 +127,7 @@ PKGFILES_CSWbacula-director += .*libexec.*catalog_backup.* .*libexec.*query.sql PKGFILES_CSWbacula-director += .*libexec.*mysql_tables.* PKGFILES_CSWbacula-director += .*man8/bacula-dir.8.gz .*man8/dbcheck.8.gz +CHECKPKG_OVERRIDES_CSWbacula-director += soname-not-found|libbacpy-5.0.3.so|is|needed|by|opt/csw/sbin/bacula-dir MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).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 Apr 15 18:34:25 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Apr 2011 16:34:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14212] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14212 http://gar.svn.sourceforge.net/gar/?rev=14212&view=rev Author: bdwalton Date: 2011-04-15 16:34:25 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bacula/trunk: split out the console package Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 15:22:32 UTC (rev 14211) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 16:34:25 UTC (rev 14212) @@ -12,17 +12,25 @@ PACKAGES = CSWbacula-common CSWbacula-fd CSWbacula-sd PACKAGES += CSWbacula-director CSWbacula-client CSWbacula -PACKAGES += CSWbacula-tray-monitor +PACKAGES += CSWbacula-tray-monitor CSWbacula-console CATALOG_NAME_CSWbacula = bacula SPKG_DESC_CSWbacula = $(DESCRIPTION) ARCHALL_CSWbacula = 1 -RUNTIME_DEP_PKGS = CSWbacula-fd CSWbacula-sd CSWbacula-director +RUNTIME_DEP_PKGS = CSWbacula-fd CSWbacula-sd CSWbacula-director +RUNTIME_DEP_PKGS += CSWbacula-console PKGFILES_CSWbacula = NOFILES CHECKPKG_OVERRIDES_CSWbacula += surplus-dependency|CSWbacula-sd CHECKPKG_OVERRIDES_CSWbacula += surplus-dependency|CSWbacula-fd CHECKPKG_OVERRIDES_CSWbacula += surplus-dependency|CSWbacula-director +CHECKPKG_OVERRIDES_CSWbacula += surplus-dependency|CSWbacula-console +CATALOG_NAME_CSWbacula-console = bacula_console +SPKG_DESC_CSWbacula-console = $(DESCRIPTION) - Console +RUNTIME_DEP_PKGS = CSWbacula-common +PKGFILES_CSWbacula-console = .*sbin/bconsole .*man8/bconsole.* .*bconsole.conf +PKGFILES_CSWbacula-console += .*libexec.*bconsole + CATALOG_NAME_CSWbacula-client = bacula_client SPKG_DESC_CSWbacula-client = $(DESCRIPTION) - Client meta-package ARCHALL_CSWbacula-client = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Apr 15 18:36:37 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Apr 2011 16:36:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14213] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14213 http://gar.svn.sourceforge.net/gar/?rev=14213&view=rev Author: bdwalton Date: 2011-04-15 16:36:37 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bacula/trunk: add conf files (no special handlers yet) to respective packages where they were missed Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 16:34:25 UTC (rev 14212) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 16:36:37 UTC (rev 14213) @@ -95,7 +95,7 @@ RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWosslrt PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd -PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz +PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz .*bacula-fd.conf CHECKPKG_OVERRIDES_CSWbacula-fd += soname-not-found|libbacpy-5.0.3.so|is|needed|by|opt/csw/sbin/bacula-fd CATALOG_NAME_CSWbacula-sd = bacula_sd @@ -110,7 +110,7 @@ RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWosslrt PKGFILES_CSWbacula-sd += .*libexec.*disk-changer .*libexec.*dvd-handler -PKGFILES_CSWbacula-sd += .*libexec.*mtx-changer.* +PKGFILES_CSWbacula-sd += .*libexec.*mtx-changer.* .*bacula-sd.conf PKGFILES_CSWbacula-sd += .*sbin/bacula-sd .*sbin/bextract .*sbin/bls PKGFILES_CSWbacula-sd += .*sbin/bcopy .*sbin/bscan .*sbin/btape PKGFILES_CSWbacula-sd += .*man8/bacula-sd.8.gz .*man8/bextract.8.gz @@ -133,7 +133,7 @@ PKGFILES_CSWbacula-director += .*sbin/bregex .*sbin/bwild .*sbin/bacula-dir PKGFILES_CSWbacula-director += .*sbin/dbcheck PKGFILES_CSWbacula-director += .*libexec.*catalog_backup.* .*libexec.*query.sql -PKGFILES_CSWbacula-director += .*libexec.*mysql_tables.* +PKGFILES_CSWbacula-director += .*libexec.*mysql_tables.* .*bacula-dir.conf PKGFILES_CSWbacula-director += .*man8/bacula-dir.8.gz .*man8/dbcheck.8.gz CHECKPKG_OVERRIDES_CSWbacula-director += soname-not-found|libbacpy-5.0.3.so|is|needed|by|opt/csw/sbin/bacula-dir 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 Apr 15 18:54:43 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Apr 2011 16:54:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14214] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14214 http://gar.svn.sourceforge.net/gar/?rev=14214&view=rev Author: bdwalton Date: 2011-04-15 16:54:43 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bacula/trunk: fix pkgfiles inclusion for bacpy lib in common package; add deps for python to common, add deps to console package Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 16:36:37 UTC (rev 14213) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 16:54:43 UTC (rev 14214) @@ -28,6 +28,14 @@ CATALOG_NAME_CSWbacula-console = bacula_console SPKG_DESC_CSWbacula-console = $(DESCRIPTION) - Console RUNTIME_DEP_PKGS = CSWbacula-common +RUNTIME_DEP_PKGS += CSWtcpwrap +RUNTIME_DEP_PKGS += CSWncurses +RUNTIME_DEP_PKGS += CSWzlib +RUNTIME_DEP_PKGS += CSWlibintl8 +RUNTIME_DEP_PKGS += CSWreadline +RUNTIME_DEP_PKGS += CSWosslrt +RUNTIME_DEP_PKGS += CSWgcc4corert +RUNTIME_DEP_PKGS += CSWgcc4g++rt PKGFILES_CSWbacula-console = .*sbin/bconsole .*man8/bconsole.* .*bconsole.conf PKGFILES_CSWbacula-console += .*libexec.*bconsole @@ -70,10 +78,11 @@ RUNTIME_DEP_PKGS_CSWbacula-common += CSWtcpwrap RUNTIME_DEP_PKGS_CSWbacula-common += CSWosslrt RUNTIME_DEP_PKGS_CSWbacula-common += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibpython2-6-1-0 PKGFILES_CSWbacula-common += .*libbac-$(VERSION).so .*libbac.so PKGFILES_CSWbacula-common += .*libbaccfg-$(VERSION).so .*libbaccfg.so PKGFILES_CSWbacula-common += .*libbacfind-$(VERSION).so .*libbacfind.so -PKGFILES_CSWbacula-common += .*libbaccpy-$(VERSION).so .*libbaccpy.so +PKGFILES_CSWbacula-common += .*libbacpy-$(VERSION).so .*libbacpy.so PKGFILES_CSWbacula-common += .*libbacsql-$(VERSION).so .*libbacsql.so PKGFILES_CSWbacula-common += .*sbin/bsmtp .*sbin/btraceback PKGFILES_CSWbacula-common += .*man1/bsmtp.1.gz .*man1/btraceback.1.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 Apr 15 18:57:33 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Apr 2011 16:57:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14215] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14215 http://gar.svn.sourceforge.net/gar/?rev=14215&view=rev Author: bdwalton Date: 2011-04-15 16:57:33 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bacula/trunk: drop override for soname-not-found not that pkgfiles splitting has been corrected Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 16:54:43 UTC (rev 14214) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 16:57:33 UTC (rev 14215) @@ -105,7 +105,6 @@ RUNTIME_DEP_PKGS_CSWbacula-fd += CSWosslrt PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz .*bacula-fd.conf -CHECKPKG_OVERRIDES_CSWbacula-fd += soname-not-found|libbacpy-5.0.3.so|is|needed|by|opt/csw/sbin/bacula-fd CATALOG_NAME_CSWbacula-sd = bacula_sd SPKG_DESC_CSWbacula-sd = $(DESCRIPTION) - Storage Daemon @@ -125,7 +124,6 @@ PKGFILES_CSWbacula-sd += .*man8/bacula-sd.8.gz .*man8/bextract.8.gz PKGFILES_CSWbacula-sd += .*man8/bls.8.gz .*man8/btape.8.gz PKGFILES_CSWbacula-sd += .*man8/bcopy.8.gz .*man8/bscan.8.gz -CHECKPKG_OVERRIDES_CSWbacula-sd += soname-not-found|libbacpy-5.0.3.so|is|needed|by|opt/csw/sbin/bacula-sd CATALOG_NAME_CSWbacula-director = bacula_director SPKG_DESC_CSWbacula-director = $(DESCRIPTION) - Director @@ -144,7 +142,6 @@ PKGFILES_CSWbacula-director += .*libexec.*catalog_backup.* .*libexec.*query.sql PKGFILES_CSWbacula-director += .*libexec.*mysql_tables.* .*bacula-dir.conf PKGFILES_CSWbacula-director += .*man8/bacula-dir.8.gz .*man8/dbcheck.8.gz -CHECKPKG_OVERRIDES_CSWbacula-director += soname-not-found|libbacpy-5.0.3.so|is|needed|by|opt/csw/sbin/bacula-dir MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).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 Apr 15 19:00:37 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Apr 2011 17:00:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14216] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14216 http://gar.svn.sourceforge.net/gar/?rev=14216&view=rev Author: bdwalton Date: 2011-04-15 17:00:36 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bacula/trunk: forgot to make deps package specific for bacula_console Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 16:57:33 UTC (rev 14215) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 17:00:36 UTC (rev 14216) @@ -27,15 +27,15 @@ CATALOG_NAME_CSWbacula-console = bacula_console SPKG_DESC_CSWbacula-console = $(DESCRIPTION) - Console -RUNTIME_DEP_PKGS = CSWbacula-common -RUNTIME_DEP_PKGS += CSWtcpwrap -RUNTIME_DEP_PKGS += CSWncurses -RUNTIME_DEP_PKGS += CSWzlib -RUNTIME_DEP_PKGS += CSWlibintl8 -RUNTIME_DEP_PKGS += CSWreadline -RUNTIME_DEP_PKGS += CSWosslrt -RUNTIME_DEP_PKGS += CSWgcc4corert -RUNTIME_DEP_PKGS += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWbacula-console = CSWbacula-common +RUNTIME_DEP_PKGS_CSWbacula-console += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-console += CSWncurses +RUNTIME_DEP_PKGS_CSWbacula-console += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWbacula-console += CSWreadline +RUNTIME_DEP_PKGS_CSWbacula-console += CSWosslrt +RUNTIME_DEP_PKGS_CSWbacula-console += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWbacula-console += CSWgcc4g++rt PKGFILES_CSWbacula-console = .*sbin/bconsole .*man8/bconsole.* .*bconsole.conf PKGFILES_CSWbacula-console += .*libexec.*bconsole 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 Apr 15 19:06:27 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Apr 2011 17:06:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[14217] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14217 http://gar.svn.sourceforge.net/gar/?rev=14217&view=rev Author: bdwalton Date: 2011-04-15 17:06:27 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bacula/trunk: force sysconfdir to a subdirectory too Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 17:00:36 UTC (rev 14216) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 17:06:27 UTC (rev 14217) @@ -153,6 +153,7 @@ # force libraries into a separate subdirectory libdir = $(prefix)/lib/$(NAME) +sysconfdir = /etc/$(prefix)/$(NAME) CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-working-dir=$(localstatedir)/$(NAME)/working 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 Apr 15 19:24:38 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Apr 2011 17:24:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[14218] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14218 http://gar.svn.sourceforge.net/gar/?rev=14218&view=rev Author: bdwalton Date: 2011-04-15 17:24:38 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bacula/trunk: the directory, fd and sd packages all need to claim /var/opt/csw/bacula/working Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 17:06:27 UTC (rev 14217) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 17:24:38 UTC (rev 14218) @@ -103,7 +103,7 @@ RUNTIME_DEP_PKGS_CSWbacula-fd += CSWzlib RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWosslrt -PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd +PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd .*bacula/working PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz .*bacula-fd.conf CATALOG_NAME_CSWbacula-sd = bacula_sd @@ -122,7 +122,7 @@ PKGFILES_CSWbacula-sd += .*sbin/bacula-sd .*sbin/bextract .*sbin/bls PKGFILES_CSWbacula-sd += .*sbin/bcopy .*sbin/bscan .*sbin/btape PKGFILES_CSWbacula-sd += .*man8/bacula-sd.8.gz .*man8/bextract.8.gz -PKGFILES_CSWbacula-sd += .*man8/bls.8.gz .*man8/btape.8.gz +PKGFILES_CSWbacula-sd += .*man8/bls.8.gz .*man8/btape.8.gz .*bacula/working PKGFILES_CSWbacula-sd += .*man8/bcopy.8.gz .*man8/bscan.8.gz CATALOG_NAME_CSWbacula-director = bacula_director @@ -138,7 +138,7 @@ RUNTIME_DEP_PKGS_CSWbacula-director += CSWosslrt RUNTIME_DEP_PKGS_CSWbacula-director += CSWperl PKGFILES_CSWbacula-director += .*sbin/bregex .*sbin/bwild .*sbin/bacula-dir -PKGFILES_CSWbacula-director += .*sbin/dbcheck +PKGFILES_CSWbacula-director += .*sbin/dbcheck .*bacula/working PKGFILES_CSWbacula-director += .*libexec.*catalog_backup.* .*libexec.*query.sql PKGFILES_CSWbacula-director += .*libexec.*mysql_tables.* .*bacula-dir.conf PKGFILES_CSWbacula-director += .*man8/bacula-dir.8.gz .*man8/dbcheck.8.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 Apr 15 20:57:22 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Apr 2011 18:57:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14219] csw/mgar/pkg/bacula/trunk Message-ID: Revision: 14219 http://gar.svn.sourceforge.net/gar/?rev=14219&view=rev Author: bdwalton Date: 2011-04-15 18:57:22 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bacula/trunk: fix the solaris init script installation routine even though we will handle it manually instead Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bacula/trunk/files/0002-Clean-up-solaris-install-autostart-targets.patch Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 17:24:38 UTC (rev 14218) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 18:57:22 UTC (rev 14219) @@ -147,6 +147,7 @@ DISTFILES = $(DISTNAME).tar.gz DISTFILES += CSWbacula-common.cswreleasenotes PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch +PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch BUILD_DEP_PKGS = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel BUILD_DEP_PKGS += CSWreadline CSWggettext-dev Added: csw/mgar/pkg/bacula/trunk/files/0002-Clean-up-solaris-install-autostart-targets.patch =================================================================== --- csw/mgar/pkg/bacula/trunk/files/0002-Clean-up-solaris-install-autostart-targets.patch (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/0002-Clean-up-solaris-install-autostart-targets.patch 2011-04-15 18:57:22 UTC (rev 14219) @@ -0,0 +1,109 @@ +From 99dbe397e04bf9aaa49d26f2e6de8317f4f79796 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 15 Apr 2011 20:12:01 +0200 +Subject: [PATCH] Clean up solaris install-autostart targets + +Use a templated rule to remove redundant targets. +Take DESTDIR into account. +Ensure we create /etc/init.d, /etc/rc{0,1,2}.d directories now that we + use DESTDIR + +Signed-off-by: Ben Walton +--- + platforms/solaris/Makefile.in | 67 ++++++++++------------------------------ + 1 files changed, 17 insertions(+), 50 deletions(-) + +diff --git a/platforms/solaris/Makefile.in b/platforms/solaris/Makefile.in +index df43101..4a8b6f7 100644 +--- a/platforms/solaris/Makefile.in ++++ b/platforms/solaris/Makefile.in +@@ -12,6 +12,7 @@ + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_DIR = $(INSTALL) -d -m 755 + + nothing: + +@@ -19,62 +20,28 @@ install: install-autostart + + install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir + +- +-install-autostart-fd: +- @rm -f /etc/rc0.d/K20bacula-fd +- @rm -f /etc/rc1.d/S99bacula-fd +- @rm -f /etc/rc2.d/S99bacula-fd +- @$(INSTALL_PROGRAM) -m 744 bacula-fd /etc/init.d/bacula-fd ++install-autostart-%: ++ @rm -f $(DESTDIR)/etc/rc0.d/K20bacula-$* ++ @rm -f $(DESTDIR)/etc/rc1.d/S99bacula-$* ++ @rm -f $(DESTDIR)/etc/rc2.d/S99bacula-$* ++ @$(INSTALL_DIR) $(DESTDIR)/etc/init.d ++ @$(INSTALL_DIR) $(DESTDIR)/etc/rc0.d $(DESTDIR)/etc/rc1.d \ ++ $(DESTDIR)/etc/rc2.d ++ @$(INSTALL_PROGRAM) -m 744 bacula-fd $(DESTDIR)/etc/init.d/bacula-$* + # set symlinks for script at startup and shutdown +- @ln -f -s /etc/init.d/bacula-fd /etc/rc0.d/K20bacula-fd +- @ln -f -s /etc/init.d/bacula-fd /etc/rc1.d/S99bacula-fd +- @ln -f -s /etc/init.d/bacula-fd /etc/rc2.d/S99bacula-fd +- +- +-install-autostart-sd: +- @rm -f /etc/rc0.d/K20bacula-sd +- @rm -f /etc/rc1.d/S99bacula-sd +- @rm -f /etc/rc2.d/S99bacula-sd +- @$(INSTALL_PROGRAM) -m 744 bacula-sd /etc/init.d/bacula-sd +- # set symlinks for script at startup and shutdown +- @ln -f -s /etc/init.d/bacula-sd /etc/rc0.d/K20bacula-sd +- @ln -f -s /etc/init.d/bacula-sd /etc/rc1.d/S99bacula-sd +- @ln -f -s /etc/init.d/bacula-sd /etc/rc2.d/S99bacula-sd +- +- +-install-autostart-dir: +- @rm -f /etc/rc0.d/K20bacula-dir +- @rm -f /etc/rc1.d/S99bacula-dir +- @rm -f /etc/rc2.d/S99bacula-dir +- @$(INSTALL_PROGRAM) -m 744 bacula-dir /etc/init.d/bacula-dir +- # set symlinks for script at startup and shutdown +- @ln -f -s /etc/init.d/bacula-dir /etc/rc0.d/K20bacula-dir +- @ln -f -s /etc/init.d/bacula-dir /etc/rc1.d/S99bacula-dir +- @ln -f -s /etc/init.d/bacula-dir /etc/rc2.d/S99bacula-dir +- ++ @ln -f -s /etc/init.d/bacula-$* $(DESTDIR)/etc/rc0.d/K20bacula-$* ++ @ln -f -s /etc/init.d/bacula-$* $(DESTDIR)/etc/rc1.d/S99bacula-$* ++ @ln -f -s /etc/init.d/bacula-$* $(DESTDIR)/etc/rc2.d/S99bacula-$* + + uninstall: uninstall-autostart + + uninstall-autostart: uninstall-autostart-fd uninstall-autostart-sd uninstall-autostart-dir + +-uninstall-autostart-fd: +- @rm -f /etc/rc0.d/K20bacula-fd +- @rm -f /etc/rc1.d/S99bacula-fd +- @rm -f /etc/rc2.d/S99bacula-fd +- @rm -f /etc/init.d/bacula-fd +- +- +-uninstall-autostart-sd: +- @rm -f /etc/rc0.d/K20bacula-sd +- @rm -f /etc/rc1.d/S99bacula-sd +- @rm -f /etc/rc2.d/S99bacula-sd +- @rm -f /etc/init.d/bacula-sd +- +-uninstall-autostart-dir: +- @rm -f /etc/rc0.d/K20bacula-dir +- @rm -f /etc/rc1.d/S99bacula-dir +- @rm -f /etc/rc2.d/S99bacula-dir +- @rm -f /etc/init.d/bacula-dir ++uninstall-autostart-%: ++ @rm -f /etc/rc0.d/K20bacula-$* ++ @rm -f /etc/rc1.d/S99bacula-$* ++ @rm -f /etc/rc2.d/S99bacula-$* ++ @rm -f /etc/init.d/bacula-$* + + clean: + @rm -f 1 2 3 +-- +1.7.3.2 + 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 Apr 15 20:58:15 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Apr 2011 18:58:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[14220] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14220 http://gar.svn.sourceforge.net/gar/?rev=14220&view=rev Author: bdwalton Date: 2011-04-15 18:58:15 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bacula/trunk: manually install the three init scripts for use with initsmf Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 18:57:22 UTC (rev 14219) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 18:58:15 UTC (rev 14220) @@ -190,6 +190,13 @@ chmod 755 configure) @$(MAKECOOKIE) +post-install-modulated: INITD=$(DESTDIR)/etc/$(prefix)/init.d +post-install-modulated: + @(cd $(WORKSRC)/platforms/solaris; \ + ginstall -d -m 0755 $(INITD); \ + ginstall -m 0755 bacula-fd bacula-sd bacula-dir $(INITD)/ ) + @$(MAKECOOKIE) + post-merge: @(cd $(PKGROOT); rmdir tmp) @$(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 Apr 15 21:05:23 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Apr 2011 19:05:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[14221] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14221 http://gar.svn.sourceforge.net/gar/?rev=14221&view=rev Author: bdwalton Date: 2011-04-15 19:05:23 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bacula/trunk: add init scripts to appropriate packages, define initsmf so they get delivered correctly to systems Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 18:58:15 UTC (rev 14220) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 19:05:23 UTC (rev 14221) @@ -103,6 +103,7 @@ RUNTIME_DEP_PKGS_CSWbacula-fd += CSWzlib RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWosslrt +PKGFILES_CSWbacula-fd += .*init.d/bacula-fd PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd .*bacula/working PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz .*bacula-fd.conf @@ -117,6 +118,7 @@ RUNTIME_DEP_PKGS_CSWbacula-sd += CSWzlib RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWosslrt +PKGFILES_CSWbacula-sd += .*init.d/bacula-sd PKGFILES_CSWbacula-sd += .*libexec.*disk-changer .*libexec.*dvd-handler PKGFILES_CSWbacula-sd += .*libexec.*mtx-changer.* .*bacula-sd.conf PKGFILES_CSWbacula-sd += .*sbin/bacula-sd .*sbin/bextract .*sbin/bls @@ -137,6 +139,7 @@ RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbacula-director += CSWosslrt RUNTIME_DEP_PKGS_CSWbacula-director += CSWperl +PKGFILES_CSWbacula-director += .*init.d/bacula-dir PKGFILES_CSWbacula-director += .*sbin/bregex .*sbin/bwild .*sbin/bacula-dir PKGFILES_CSWbacula-director += .*sbin/dbcheck .*bacula/working PKGFILES_CSWbacula-director += .*libexec.*catalog_backup.* .*libexec.*query.sql @@ -180,6 +183,9 @@ # no tests supplied. TEST_SCRIPTS = +INITSMF = /etc/opt/csw/init.d/bacula-dir /etc/opt/csw/init.d/bacula-sd +INITSMF += /etc/opt/csw/init.d/bacula-fd + include gar/category.mk pre-configure-modulated: 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 Apr 15 21:15:22 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Apr 2011 19:15:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14222] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14222 http://gar.svn.sourceforge.net/gar/?rev=14222&view=rev Author: bdwalton Date: 2011-04-15 19:15:21 +0000 (Fri, 15 Apr 2011) Log Message: ----------- bacula/trunk: ensure csw prefixes are used on the init scripts Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 19:05:23 UTC (rev 14221) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 19:15:21 UTC (rev 14222) @@ -103,7 +103,7 @@ RUNTIME_DEP_PKGS_CSWbacula-fd += CSWzlib RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWosslrt -PKGFILES_CSWbacula-fd += .*init.d/bacula-fd +PKGFILES_CSWbacula-fd += .*init.d/cswbacula-fd PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd .*bacula/working PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz .*bacula-fd.conf @@ -118,7 +118,7 @@ RUNTIME_DEP_PKGS_CSWbacula-sd += CSWzlib RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWosslrt -PKGFILES_CSWbacula-sd += .*init.d/bacula-sd +PKGFILES_CSWbacula-sd += .*init.d/cswbacula-sd PKGFILES_CSWbacula-sd += .*libexec.*disk-changer .*libexec.*dvd-handler PKGFILES_CSWbacula-sd += .*libexec.*mtx-changer.* .*bacula-sd.conf PKGFILES_CSWbacula-sd += .*sbin/bacula-sd .*sbin/bextract .*sbin/bls @@ -139,7 +139,7 @@ RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbacula-director += CSWosslrt RUNTIME_DEP_PKGS_CSWbacula-director += CSWperl -PKGFILES_CSWbacula-director += .*init.d/bacula-dir +PKGFILES_CSWbacula-director += .*init.d/cswbacula-dir PKGFILES_CSWbacula-director += .*sbin/bregex .*sbin/bwild .*sbin/bacula-dir PKGFILES_CSWbacula-director += .*sbin/dbcheck .*bacula/working PKGFILES_CSWbacula-director += .*libexec.*catalog_backup.* .*libexec.*query.sql @@ -183,8 +183,8 @@ # no tests supplied. TEST_SCRIPTS = -INITSMF = /etc/opt/csw/init.d/bacula-dir /etc/opt/csw/init.d/bacula-sd -INITSMF += /etc/opt/csw/init.d/bacula-fd +INITSMF = /etc/opt/csw/init.d/cswbacula-dir /etc/opt/csw/init.d/cswbacula-sd +INITSMF += /etc/opt/csw/init.d/cswbacula-fd include gar/category.mk @@ -200,7 +200,9 @@ post-install-modulated: @(cd $(WORKSRC)/platforms/solaris; \ ginstall -d -m 0755 $(INITD); \ - ginstall -m 0755 bacula-fd bacula-sd bacula-dir $(INITD)/ ) + for s in dir fd sd; do \ + ginstall -m 0755 bacula-$$s $(INITD)/cswbacula-$$s; \ + done ) @$(MAKECOOKIE) post-merge: 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 Apr 16 03:15:56 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Apr 2011 01:15:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[14223] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14223 http://gar.svn.sourceforge.net/gar/?rev=14223&view=rev Author: bdwalton Date: 2011-04-16 01:15:55 +0000 (Sat, 16 Apr 2011) Log Message: ----------- bacula/trunk: ensure the three daemon packages also package /var/opt/csw/run Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-15 19:15:21 UTC (rev 14222) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-16 01:15:55 UTC (rev 14223) @@ -106,6 +106,7 @@ PKGFILES_CSWbacula-fd += .*init.d/cswbacula-fd PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd .*bacula/working PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz .*bacula-fd.conf +PKGFILES_CSWbacula-fd += /var/opt/csw/run CATALOG_NAME_CSWbacula-sd = bacula_sd SPKG_DESC_CSWbacula-sd = $(DESCRIPTION) - Storage Daemon @@ -126,6 +127,7 @@ PKGFILES_CSWbacula-sd += .*man8/bacula-sd.8.gz .*man8/bextract.8.gz PKGFILES_CSWbacula-sd += .*man8/bls.8.gz .*man8/btape.8.gz .*bacula/working PKGFILES_CSWbacula-sd += .*man8/bcopy.8.gz .*man8/bscan.8.gz +PKGFILES_CSWbacula-sd += /var/opt/csw/run CATALOG_NAME_CSWbacula-director = bacula_director SPKG_DESC_CSWbacula-director = $(DESCRIPTION) - Director @@ -145,6 +147,7 @@ PKGFILES_CSWbacula-director += .*libexec.*catalog_backup.* .*libexec.*query.sql PKGFILES_CSWbacula-director += .*libexec.*mysql_tables.* .*bacula-dir.conf PKGFILES_CSWbacula-director += .*man8/bacula-dir.8.gz .*man8/dbcheck.8.gz +PKGFILES_CSWbacula-director += /var/opt/csw/run MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz @@ -203,6 +206,7 @@ for s in dir fd sd; do \ ginstall -m 0755 bacula-$$s $(INITD)/cswbacula-$$s; \ done ) + @(ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/run) @$(MAKECOOKIE) post-merge: 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 Apr 16 03:40:46 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Apr 2011 01:40:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[14224] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14224 http://gar.svn.sourceforge.net/gar/?rev=14224&view=rev Author: bdwalton Date: 2011-04-16 01:40:46 +0000 (Sat, 16 Apr 2011) Log Message: ----------- bacula/trunk: drop a slash when setting sysconfdir to prevent ugly double slashes in init scripts, etc Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-16 01:15:55 UTC (rev 14223) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-16 01:40:46 UTC (rev 14224) @@ -160,7 +160,7 @@ # force libraries into a separate subdirectory libdir = $(prefix)/lib/$(NAME) -sysconfdir = /etc/$(prefix)/$(NAME) +sysconfdir = /etc$(prefix)/$(NAME) CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-working-dir=$(localstatedir)/$(NAME)/working 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 Apr 16 04:08:58 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Apr 2011 02:08:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[14225] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14225 http://gar.svn.sourceforge.net/gar/?rev=14225&view=rev Author: bdwalton Date: 2011-04-16 02:08:58 +0000 (Sat, 16 Apr 2011) Log Message: ----------- bacula/trunk: add more example content from the source; split out -doc package Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-16 01:40:46 UTC (rev 14224) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-16 02:08:58 UTC (rev 14225) @@ -12,18 +12,19 @@ PACKAGES = CSWbacula-common CSWbacula-fd CSWbacula-sd PACKAGES += CSWbacula-director CSWbacula-client CSWbacula -PACKAGES += CSWbacula-tray-monitor CSWbacula-console +PACKAGES += CSWbacula-tray-monitor CSWbacula-console CSWbacula-doc CATALOG_NAME_CSWbacula = bacula SPKG_DESC_CSWbacula = $(DESCRIPTION) ARCHALL_CSWbacula = 1 RUNTIME_DEP_PKGS = CSWbacula-fd CSWbacula-sd CSWbacula-director -RUNTIME_DEP_PKGS += CSWbacula-console +RUNTIME_DEP_PKGS += CSWbacula-console CSWbacula-doc PKGFILES_CSWbacula = NOFILES CHECKPKG_OVERRIDES_CSWbacula += surplus-dependency|CSWbacula-sd CHECKPKG_OVERRIDES_CSWbacula += surplus-dependency|CSWbacula-fd CHECKPKG_OVERRIDES_CSWbacula += surplus-dependency|CSWbacula-director CHECKPKG_OVERRIDES_CSWbacula += surplus-dependency|CSWbacula-console +CHECKPKG_OVERRIDES_CSWbacula += surplus-dependency|CSWbacula-doc CATALOG_NAME_CSWbacula-console = bacula_console SPKG_DESC_CSWbacula-console = $(DESCRIPTION) - Console @@ -51,6 +52,10 @@ CATALOG_NAME_CSWbaculaclient = bacula_client_stub CHECKPKG_OVERRIDES_CSWbacula-client += surplus-dependency|CSWbacula-fd +CATALOG_NAME_CSWbacula-doc = bacula_doc +SPKG_DESC_CSWbacula-doc = $(DESCRIPTION) - Documentation +PKGFILES_CSWbacula-doc += .*doc/$(NAME)/.* + CATALOG_NAME_CSWbacula-tray-monitor = bacula_tray_monitor SPKG_DESC_CSWbacula-tray-monitor = $(DESCRIPTION) - Tray monitor RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWbacula-common @@ -88,10 +93,6 @@ PKGFILES_CSWbacula-common += .*man1/bsmtp.1.gz .*man1/btraceback.1.gz PKGFILES_CSWbacula-common += .*man8/bacula.8.gz PKGFILES_CSWbacula-common += .*libexec/btraceback.gdb -PKGFILES_CSWbacula-common += .*doc/$(NAME)/.* -# these are both original documentation files from the tarball -CHECKPKG_OVERRIDES_CSWbacula-common += file-with-bad-content|/usr/share|root/opt/csw/share/doc/bacula/technotes -CHECKPKG_OVERRIDES_CSWbacula-common += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bacula/INSTALL CATALOG_NAME_CSWbacula-fd = bacula_fd SPKG_DESC_CSWbacula-fd = $(DESCRIPTION) - File Daemon @@ -105,7 +106,7 @@ RUNTIME_DEP_PKGS_CSWbacula-fd += CSWosslrt PKGFILES_CSWbacula-fd += .*init.d/cswbacula-fd PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd .*bacula/working -PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz .*bacula-fd.conf +PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz .*bacula/bacula-fd.conf PKGFILES_CSWbacula-fd += /var/opt/csw/run CATALOG_NAME_CSWbacula-sd = bacula_sd @@ -121,7 +122,7 @@ RUNTIME_DEP_PKGS_CSWbacula-sd += CSWosslrt PKGFILES_CSWbacula-sd += .*init.d/cswbacula-sd PKGFILES_CSWbacula-sd += .*libexec.*disk-changer .*libexec.*dvd-handler -PKGFILES_CSWbacula-sd += .*libexec.*mtx-changer.* .*bacula-sd.conf +PKGFILES_CSWbacula-sd += .*libexec.*mtx-changer.* .*bacula/bacula-sd.conf PKGFILES_CSWbacula-sd += .*sbin/bacula-sd .*sbin/bextract .*sbin/bls PKGFILES_CSWbacula-sd += .*sbin/bcopy .*sbin/bscan .*sbin/btape PKGFILES_CSWbacula-sd += .*man8/bacula-sd.8.gz .*man8/bextract.8.gz @@ -145,7 +146,8 @@ PKGFILES_CSWbacula-director += .*sbin/bregex .*sbin/bwild .*sbin/bacula-dir PKGFILES_CSWbacula-director += .*sbin/dbcheck .*bacula/working PKGFILES_CSWbacula-director += .*libexec.*catalog_backup.* .*libexec.*query.sql -PKGFILES_CSWbacula-director += .*libexec.*mysql_tables.* .*bacula-dir.conf +PKGFILES_CSWbacula-director += .*libexec.*mysql_tables.* +PKGFILES_CSWbacula-director += .*bacula/bacula-dir.conf PKGFILES_CSWbacula-director += .*man8/bacula-dir.8.gz .*man8/dbcheck.8.gz PKGFILES_CSWbacula-director += /var/opt/csw/run @@ -199,6 +201,7 @@ chmod 755 configure) @$(MAKECOOKIE) +post-install-modulated: DOCD=$(DESTDIR)$(docdir)/$(NAME) post-install-modulated: INITD=$(DESTDIR)/etc/$(prefix)/init.d post-install-modulated: @(cd $(WORKSRC)/platforms/solaris; \ @@ -207,6 +210,7 @@ ginstall -m 0755 bacula-$$s $(INITD)/cswbacula-$$s; \ done ) @(ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/run) + @(ginstall -d -m 0755 $(DOCD); gcp -pR $(WORKSRC)/examples $(DOCD)) @$(MAKECOOKIE) post-merge: 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 Apr 16 04:16:29 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Apr 2011 02:16:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[14226] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14226 http://gar.svn.sourceforge.net/gar/?rev=14226&view=rev Author: bdwalton Date: 2011-04-16 02:16:29 +0000 (Sat, 16 Apr 2011) Log Message: ----------- php5/trunk: further clean up of the old postinstall stuff Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-16 02:08:58 UTC (rev 14225) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-16 02:16:29 UTC (rev 14226) @@ -29,7 +29,7 @@ LICENSE = LICENSE DISTFILES += $(DISTNAME).tar.bz2 -DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall +DISTFILES += phpext pear.conf.CSW CSWphp5.postinstall DISTFILES += CSWphp5.cswreleasenotes PATCHFILES += 0001-Strip-usr-ucblib-references.patch @@ -742,22 +742,16 @@ @$(MAKECOOKIE) post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf +post-install-modulated: INIDEST=$(DESTDIR)$(prefix)/php5/etc/php.ini.CSW post-install-modulated: - @rm $(DESTDIR)$(AP2SYSCONF) + @rm -f $(DESTDIR)$(AP2SYSCONF) + @cp $(WORKSRC)/php.ini-production $(INIDEST) + @perl -pi -e 's/^;extension=php_(.*).dll/;extension=$1.so/' $(INIDEST) @$(MAKECOOKIE) -PI_SCRIPTS = install-extras -PI_SCRIPTS += install-cleanup - install-extras: @echo "[====> Fixing Admin Scripts <====]" - gcp $(DOWNLOADDIR)/php.ini.CSW $(DOWNLOADDIR)/php.ini.CSW.fixed perl -i -pne "s|x_PHPEXTDIR_x|_PHPEXTDIR_|" $(DOWNLOADDIR)/php.ini.CSW.fixed - perl -i -pne "s|_PHPINIFILE_|$(call _get_php_ini_path,$(DESTDIR))/php.ini|" `gfind $(DOWNLOADDIR) -type f -print` - perl -i -pne "s|_PHPLIBDIR_|$(call _get_php_ini_path,$(DESTDIR))|" `gfind $(DOWNLOADDIR) -type f -print` - perl -i -pne "s|_PHPBINDIR_|$(call _get_php_prefix,$(DESTDIR))/bin|" `gfind $(DOWNLOADDIR) -type f -print` - perl -i -pne "s|_PHPETCDIR_|$(call _get_php_prefix,$(DESTDIR))/etc|" `gfind $(DOWNLOADDIR) -type f -print` - perl -i -pne 's|_PHPEXTDIR_|$(shell $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)|' `gfind $(DOWNLOADDIR) -type f -print` @echo "[====> Installing Extra Files <====]" ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin gcp $(DOWNLOADDIR)/php.ini.CSW.fixed $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW @@ -765,11 +759,3 @@ gchmod 0644 $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW @$(MAKECOOKIE) -install-cleanup: - @echo "[====> Cleaning Up Extra Install Files <====]" - gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr - gfind $(DESTDIR)$(prefix)/apache* -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr - $(GARBIN)/stripbin $(DESTDIR)$(shell $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir) - $(GARBIN)/stripbin $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin - $(MAKECOOKIE) - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Apr 16 05:07:39 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Apr 2011 03:07:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14227] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14227 http://gar.svn.sourceforge.net/gar/?rev=14227&view=rev Author: bdwalton Date: 2011-04-16 03:07:38 +0000 (Sat, 16 Apr 2011) Log Message: ----------- bacula/trunk: qualify the dep list for the top level meta package; override content warnings in the doc package Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-16 02:16:29 UTC (rev 14226) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-16 03:07:38 UTC (rev 14227) @@ -17,8 +17,8 @@ CATALOG_NAME_CSWbacula = bacula SPKG_DESC_CSWbacula = $(DESCRIPTION) ARCHALL_CSWbacula = 1 -RUNTIME_DEP_PKGS = CSWbacula-fd CSWbacula-sd CSWbacula-director -RUNTIME_DEP_PKGS += CSWbacula-console CSWbacula-doc +RUNTIME_DEP_PKGS_CSWbacula = CSWbacula-fd CSWbacula-sd CSWbacula-director +RUNTIME_DEP_PKGS_CSWbacula += CSWbacula-console CSWbacula-doc PKGFILES_CSWbacula = NOFILES CHECKPKG_OVERRIDES_CSWbacula += surplus-dependency|CSWbacula-sd CHECKPKG_OVERRIDES_CSWbacula += surplus-dependency|CSWbacula-fd @@ -55,6 +55,7 @@ CATALOG_NAME_CSWbacula-doc = bacula_doc SPKG_DESC_CSWbacula-doc = $(DESCRIPTION) - Documentation PKGFILES_CSWbacula-doc += .*doc/$(NAME)/.* +CHECKPKG_OVERRIDES_CSWbacula-doc += file-with-bad-content CATALOG_NAME_CSWbacula-tray-monitor = bacula_tray_monitor SPKG_DESC_CSWbacula-tray-monitor = $(DESCRIPTION) - Tray monitor 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 Apr 16 05:08:12 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Apr 2011 03:08:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[14228] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14228 http://gar.svn.sourceforge.net/gar/?rev=14228&view=rev Author: bdwalton Date: 2011-04-16 03:08:12 +0000 (Sat, 16 Apr 2011) Log Message: ----------- bacula/trunk: the doc package does not need to depend on perl or python Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-16 03:07:38 UTC (rev 14227) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-16 03:08:12 UTC (rev 14228) @@ -56,6 +56,8 @@ SPKG_DESC_CSWbacula-doc = $(DESCRIPTION) - Documentation PKGFILES_CSWbacula-doc += .*doc/$(NAME)/.* CHECKPKG_OVERRIDES_CSWbacula-doc += file-with-bad-content +CHECKPKG_OVERRIDES_CSWbacula-doc += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWbacula-doc += missing-dependency|CSWperl CATALOG_NAME_CSWbacula-tray-monitor = bacula_tray_monitor SPKG_DESC_CSWbacula-tray-monitor = $(DESCRIPTION) - Tray monitor 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 Apr 16 05:09:26 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Apr 2011 03:09:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[14229] csw/mgar/pkg/bacula/trunk Message-ID: Revision: 14229 http://gar.svn.sourceforge.net/gar/?rev=14229&view=rev Author: bdwalton Date: 2011-04-16 03:09:26 +0000 (Sat, 16 Apr 2011) Log Message: ----------- bacula/trunk: move release notes from common to doc package as all content warnings are now held there Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bacula/trunk/files/CSWbacula-doc.cswreleasenotes Removed Paths: ------------- csw/mgar/pkg/bacula/trunk/files/CSWbacula-common.cswreleasenotes Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-16 03:08:12 UTC (rev 14228) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-16 03:09:26 UTC (rev 14229) @@ -156,7 +156,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz -DISTFILES += CSWbacula-common.cswreleasenotes +DISTFILES += CSWbacula-doc.cswreleasenotes PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch Deleted: csw/mgar/pkg/bacula/trunk/files/CSWbacula-common.cswreleasenotes =================================================================== --- csw/mgar/pkg/bacula/trunk/files/CSWbacula-common.cswreleasenotes 2011-04-16 03:08:12 UTC (rev 14228) +++ csw/mgar/pkg/bacula/trunk/files/CSWbacula-common.cswreleasenotes 2011-04-16 03:09:26 UTC (rev 14229) @@ -1,2 +0,0 @@ -usr/local, usr/share refs: - original files installed by default directly from tarball extraction Copied: csw/mgar/pkg/bacula/trunk/files/CSWbacula-doc.cswreleasenotes (from rev 14183, csw/mgar/pkg/bacula/trunk/files/CSWbacula-common.cswreleasenotes) =================================================================== --- csw/mgar/pkg/bacula/trunk/files/CSWbacula-doc.cswreleasenotes (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/CSWbacula-doc.cswreleasenotes 2011-04-16 03:09:26 UTC (rev 14229) @@ -0,0 +1,2 @@ +usr/local, usr/share refs: + original files installed by default directly from tarball extraction 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 Apr 16 05:18:30 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Apr 2011 03:18:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[14230] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14230 http://gar.svn.sourceforge.net/gar/?rev=14230&view=rev Author: bdwalton Date: 2011-04-16 03:18:30 +0000 (Sat, 16 Apr 2011) Log Message: ----------- php5/trunk: correct the ini extension fixup Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-16 03:09:26 UTC (rev 14229) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-16 03:18:30 UTC (rev 14230) @@ -746,7 +746,7 @@ post-install-modulated: @rm -f $(DESTDIR)$(AP2SYSCONF) @cp $(WORKSRC)/php.ini-production $(INIDEST) - @perl -pi -e 's/^;extension=php_(.*).dll/;extension=$1.so/' $(INIDEST) + @perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST) @$(MAKECOOKIE) install-extras: 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 Apr 16 05:19:36 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Apr 2011 03:19:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[14231] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14231 http://gar.svn.sourceforge.net/gar/?rev=14231&view=rev Author: bdwalton Date: 2011-04-16 03:19:36 +0000 (Sat, 16 Apr 2011) Log Message: ----------- php5/trunk: init file needs to be in lib, not etc (for now) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-16 03:18:30 UTC (rev 14230) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-16 03:19:36 UTC (rev 14231) @@ -742,7 +742,7 @@ @$(MAKECOOKIE) post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf -post-install-modulated: INIDEST=$(DESTDIR)$(prefix)/php5/etc/php.ini.CSW +post-install-modulated: INIDEST=$(DESTDIR)$(prefix)/php5/lib/php.ini.CSW post-install-modulated: @rm -f $(DESTDIR)$(AP2SYSCONF) @cp $(WORKSRC)/php.ini-production $(INIDEST) 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 Apr 16 17:33:17 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Apr 2011 15:33:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14232] csw/mgar/pkg/php5/trunk Message-ID: Revision: 14232 http://gar.svn.sourceforge.net/gar/?rev=14232&view=rev Author: bdwalton Date: 2011-04-16 15:33:17 +0000 (Sat, 16 Apr 2011) Log Message: ----------- php5/trunk: ensure we install phpext for toggling extensions in php.ini; hardcode ini path in phpext Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/files/phpext Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-16 03:19:36 UTC (rev 14231) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-16 15:33:17 UTC (rev 14232) @@ -746,6 +746,7 @@ post-install-modulated: @rm -f $(DESTDIR)$(AP2SYSCONF) @cp $(WORKSRC)/php.ini-production $(INIDEST) + @ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(prefix)/php5/bin/ @perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST) @$(MAKECOOKIE) Modified: csw/mgar/pkg/php5/trunk/files/phpext =================================================================== --- csw/mgar/pkg/php5/trunk/files/phpext 2011-04-16 03:19:36 UTC (rev 14231) +++ csw/mgar/pkg/php5/trunk/files/phpext 2011-04-16 15:33:17 UTC (rev 14232) @@ -6,7 +6,7 @@ program=${0##*/} # Default path to php.ini -php_ini=_PHPINIFILE_ +php_ini=/opt/csw/php5/lib/php.ini # Usage printer function do_usage { 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 Apr 16 17:37:18 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Apr 2011 15:37:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14233] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14233 http://gar.svn.sourceforge.net/gar/?rev=14233&view=rev Author: bdwalton Date: 2011-04-16 15:37:17 +0000 (Sat, 16 Apr 2011) Log Message: ----------- php5/trunk: drop more legacy cruft Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-16 15:33:17 UTC (rev 14232) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-16 15:37:17 UTC (rev 14233) @@ -716,22 +716,6 @@ include gar/category.mk -# funcion Definitions and mGar Extra Scripts -# - -define _get_php_config -$(abspath $(shell gfind $(1) -name php-config -print)) -endef - -define _get_php_prefix -$(shell $(call _get_php_config,$(1)) --prefix) -endef - -define _get_php_ini_path -$(shell $(call _get_php_prefix,$(1))/bin/php -i | grep "Configuration File .* Path" | gawk '{print $$NF}') -endef - - # this allows apxs to install the module. stupid, but i couldn't make # the darn thing _not_ do try to add the httpd.conf lines, even with # patching... @@ -751,12 +735,6 @@ @$(MAKECOOKIE) install-extras: - @echo "[====> Fixing Admin Scripts <====]" - perl -i -pne "s|x_PHPEXTDIR_x|_PHPEXTDIR_|" $(DOWNLOADDIR)/php.ini.CSW.fixed - @echo "[====> Installing Extra Files <====]" - ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin - gcp $(DOWNLOADDIR)/php.ini.CSW.fixed $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW gmv $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf.CSW - gchmod 0644 $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Apr 16 22:20:14 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Apr 2011 20:20:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14234] csw/mgar/gar/v2/lib/python/dependency_checks.py Message-ID: Revision: 14234 http://gar.svn.sourceforge.net/gar/?rev=14234&view=rev Author: bdwalton Date: 2011-04-16 20:20:14 +0000 (Sat, 16 Apr 2011) Log Message: ----------- allow packages containing .rb files to depend on either CSWruby or CSWruby18 Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2011-04-16 15:37:17 UTC (rev 14233) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2011-04-16 20:20:14 UTC (rev 14234) @@ -32,7 +32,7 @@ (r".*\.pl$", (u"CSWperl",)), (r".*\.pm$", (u"CSWperl",)), (r".*\.py$", (u"CSWpython",)), - (r".*\.rb$", (u"CSWruby",)), + (r".*\.rb$", (u"CSWruby", u"CSWruby18")), (r".*\.elc?$", (u"CSWemacscommon",)), (r"/opt/csw/apache2/", (u"CSWapache2",)), ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Apr 17 01:48:26 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Apr 2011 23:48:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[14235] csw/mgar/gar/v2/bin/php5ext_build_scripts Message-ID: Revision: 14235 http://gar.svn.sourceforge.net/gar/?rev=14235&view=rev Author: bdwalton Date: 2011-04-16 23:48:25 +0000 (Sat, 16 Apr 2011) Log Message: ----------- gar/v2: add a script that builds php5 extension scripts for use by the build cas Added Paths: ----------- csw/mgar/gar/v2/bin/php5ext_build_scripts Added: csw/mgar/gar/v2/bin/php5ext_build_scripts =================================================================== --- csw/mgar/gar/v2/bin/php5ext_build_scripts (rev 0) +++ csw/mgar/gar/v2/bin/php5ext_build_scripts 2011-04-16 23:48:25 UTC (rev 14235) @@ -0,0 +1,70 @@ +#!/bin/bash + +set -x + +MERGEDIR=$1; shift +PHP5MODS=opt/csw/php5/extensions +PHP5EXTDIR=opt/csw/php5/lib/php/extensions/no-debug-non-zts-20090626 + +cd $MERGEDIR/ + +[ -d $PHP5MODS ] || mkdir -p $PHP5MODS + +for a in $*; do + for f in $(find $PHP5EXTDIR -name "*$a*"); do + modfile=$(basename $f) + modname=$(echo $modfile | sed 's/\.so$//') + php5modfile=$PHP5MODS/$modname + cat < $php5modfile + +PIR=\${PKG_INSTALL_ROOT:-'/'} +PHP5_PREFIX=/opt/csw/php5 +PHP5_BINDIR=\$PHP5_PREFIX/bin +PHPEXT=\$PHP5_BINDIR/phpext + +if [ "\$1" = install ]; then + +echo "File created by \$PKGINST during install. Please do not remove." > \$PIR/$php5modfile + +# Source csw.conf, if it exists +if [ -f \$PIR/opt/csw/etc/csw.conf ] ; then + . \$PIR/opt/csw/etc/csw.conf +fi +if [ -f \$PIR/etc/opt/csw/csw.conf ] ; then + . \$PIR/etc/opt/csw/csw.conf +fi + +# Modules will be enabled by default, but a global kill switch +# is checked, followed by a module specific value. Thus, +# either php5_enable_modules or php5_enable_mysql (for example) +# could disable activation of the suexec module. The +# +# This value is passed to phpext (-e: enable; -d: disable) +enmod=-e + +if [ "\$php5_enable_modules" = "no" ]; then + enmod=-d +fi + +if [ "\$php5_enable_$modname" = "no" ]; then + enmod=-d +elif [ "\$php5_enable_$modname" = "yes" ]; then + enmod=-e +fi + +if [ -f "\$PIR/\$PHP5_CONFIG" -a -x "\$PIR/\$PHPEXT" ]; then + # Add the module module, optionally enabling it by default + chroot \$PIR \$PHPEXT \$enmod $modname +fi + +else + +rm \$PIR/$php5modfile + +if [ -f "\$PIR/\$PHP5_CONFIG" -a -x "\$PIR/\$PHPEXT" ]; then + chroot \$PIR \$PHPEXT -d $modname +fi +fi +EOF + done +done Property changes on: csw/mgar/gar/v2/bin/php5ext_build_scripts ___________________________________________________________________ Added: svn:executable + * 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 Apr 17 01:53:28 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Apr 2011 23:53:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[14236] csw/mgar/gar/v2 Message-ID: Revision: 14236 http://gar.svn.sourceforge.net/gar/?rev=14236&view=rev Author: bdwalton Date: 2011-04-16 23:53:28 +0000 (Sat, 16 Apr 2011) Log Message: ----------- gar/v2: add support for enabling automatic (de-)registration of php extensions without postinstall/preremove scripts (similar to the ap2 mod handling) Modified Paths: -------------- csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2011-04-16 23:48:25 UTC (rev 14235) +++ csw/mgar/gar/v2/gar.mk 2011-04-16 23:53:28 UTC (rev 14236) @@ -806,7 +806,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) merge-distfile-README.CSW merge-distfile-changelog.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod) post-merge +merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) merge-distfile-README.CSW merge-distfile-changelog.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod) $(if $(PHP5_EXT),post-merge-php5ext) post-merge banner merge @$(MAKECOOKIE) @@ -843,6 +843,10 @@ $(GARBIN)/ap2mod_build_scripts $(PKGROOT) $(AP2_MODFILES) @$(MAKECOOKIE) +post-merge-php5ext: + $(GARBIN)/php5ext_build_scripts $(PKGROOT) $(PHP5_EXTFILES) + @$(MAKECOOKIE) + # This merges the merge-modulated: install-modulated pre-merge-modulated pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated @$(MAKECOOKIE) @@ -890,7 +894,7 @@ .PHONY: remerge reset-merge reset-merge-modulated remerge: reset-merge merge -reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-alternatives reset-merge-distfile-README.CSW reset-merge-distfile-changelog.CSW reset-merge-obsolete reset-merge-ap2mod reset-merge-src +reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-alternatives reset-merge-distfile-README.CSW reset-merge-distfile-changelog.CSW reset-merge-obsolete reset-merge-ap2mod reset-merge-php5ext reset-merge-src @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge @rm -rf $(PKGROOT) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-04-16 23:48:25 UTC (rev 14235) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-04-16 23:53:28 UTC (rev 14236) @@ -231,6 +231,7 @@ # if AP2_MODS is set, files matching this shell glob (passed to find) # will have 'build' set as their class AP2_MODFILES ?= opt/csw/apache2/libexec/*so $(EXTRA_AP2_MODFILES) +PHP5_EXTFILES ?= *so $(EXTRA_PHP5_EXTFILES) # - set class for all config files _CSWCLASS_FILTER = | perl -ane '\ @@ -245,6 +246,7 @@ $(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\ $(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(if $(AP2_MODS), at F = ("e", "build", $$F[2], "?", "?", "?") if ($$F[2] =~ m(^/opt/csw/apache2/ap2mod/.*));) \ + $(if $(PHP5_EXT), at F = ("e", "build", $$F[2], "?", "?", "?") if ($$F[2] =~ m(^/opt/csw/php5/extensions/.*));) \ $$F[1] = "cswcptemplates" if( $$F[2] =~ m(^/opt/csw/etc/templates/.+$$) and $$F[0] eq "f" ); \ print join(" ", at F),"\n";' @@ -736,6 +738,9 @@ reset-merge-ap2mod: @rm -f $(COOKIEDIR)/post-merge-ap2mod +reset-merge-php5ext: + @rm -f $(COOKIEDIR)/post-merge-php5ext + merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S)) @$(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 Sun Apr 17 01:56:54 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Apr 2011 23:56:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14237] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14237 http://gar.svn.sourceforge.net/gar/?rev=14237&view=rev Author: bdwalton Date: 2011-04-16 23:56:54 +0000 (Sat, 16 Apr 2011) Log Message: ----------- php5/trunk: turn on now build CAS auto-support Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-16 23:53:28 UTC (rev 14236) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-16 23:56:54 UTC (rev 14237) @@ -18,6 +18,9 @@ available. endef +# turn on the build scripts to enable/disable modules +PHP5_EXT = 1 + # at least for a decent echo used during build. PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) 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 Apr 17 02:01:51 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 00:01:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14238] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14238 http://gar.svn.sourceforge.net/gar/?rev=14238&view=rev Author: bdwalton Date: 2011-04-17 00:01:51 +0000 (Sun, 17 Apr 2011) Log Message: ----------- bacula/trunk: correct explicit use of catalogname definitions Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-16 23:56:54 UTC (rev 14237) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-17 00:01:51 UTC (rev 14238) @@ -14,7 +14,7 @@ PACKAGES += CSWbacula-director CSWbacula-client CSWbacula PACKAGES += CSWbacula-tray-monitor CSWbacula-console CSWbacula-doc -CATALOG_NAME_CSWbacula = bacula +CATALOGNAME_CSWbacula = bacula SPKG_DESC_CSWbacula = $(DESCRIPTION) ARCHALL_CSWbacula = 1 RUNTIME_DEP_PKGS_CSWbacula = CSWbacula-fd CSWbacula-sd CSWbacula-director @@ -26,7 +26,7 @@ CHECKPKG_OVERRIDES_CSWbacula += surplus-dependency|CSWbacula-console CHECKPKG_OVERRIDES_CSWbacula += surplus-dependency|CSWbacula-doc -CATALOG_NAME_CSWbacula-console = bacula_console +CATALOGNAME_CSWbacula-console = bacula_console SPKG_DESC_CSWbacula-console = $(DESCRIPTION) - Console RUNTIME_DEP_PKGS_CSWbacula-console = CSWbacula-common RUNTIME_DEP_PKGS_CSWbacula-console += CSWtcpwrap @@ -40,26 +40,26 @@ PKGFILES_CSWbacula-console = .*sbin/bconsole .*man8/bconsole.* .*bconsole.conf PKGFILES_CSWbacula-console += .*libexec.*bconsole -CATALOG_NAME_CSWbacula-client = bacula_client +CATALOGNAME_CSWbacula-client = bacula_client SPKG_DESC_CSWbacula-client = $(DESCRIPTION) - Client meta-package ARCHALL_CSWbacula-client = 1 RUNTIME_DEP_PKGS_CSWbacula-client += CSWbacula-fd PKGFILES_CSWbacula-client = NOFILES OBSOLETED_BY_CSWbacula-client = CSWbaculaclient CSWbaculagnome SPKG_DESC_CSWbaculagnome = Obsolete bacula gnome console -CATALOG_NAME_CSWbaculagnome = bacula_gnome_stub +CATALOGNAME_CSWbaculagnome = bacula_gnome_stub # set this explicitly to help phil's tools for now -CATALOG_NAME_CSWbaculaclient = bacula_client_stub +CATALOGNAME_CSWbaculaclient = bacula_client_stub CHECKPKG_OVERRIDES_CSWbacula-client += surplus-dependency|CSWbacula-fd -CATALOG_NAME_CSWbacula-doc = bacula_doc +CATALOGNAME_CSWbacula-doc = bacula_doc SPKG_DESC_CSWbacula-doc = $(DESCRIPTION) - Documentation PKGFILES_CSWbacula-doc += .*doc/$(NAME)/.* CHECKPKG_OVERRIDES_CSWbacula-doc += file-with-bad-content CHECKPKG_OVERRIDES_CSWbacula-doc += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWbacula-doc += missing-dependency|CSWperl -CATALOG_NAME_CSWbacula-tray-monitor = bacula_tray_monitor +CATALOGNAME_CSWbacula-tray-monitor = bacula_tray_monitor SPKG_DESC_CSWbacula-tray-monitor = $(DESCRIPTION) - Tray monitor RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWbacula-common RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWgcc4g++rt @@ -77,7 +77,7 @@ RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWglib2 PKGFILES_CSWbacula-tray-monitor = .*tray-monitor.* -CATALOG_NAME_CSWbacula-common = bacula_common +CATALOGNAME_CSWbacula-common = bacula_common SPKG_DESC_CSWbacula-common = $(DESCRIPTION) - shared files RUNTIME_DEP_PKGS_CSWbacula-common += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWbacula-common += CSWgcc4corert @@ -97,7 +97,7 @@ PKGFILES_CSWbacula-common += .*man8/bacula.8.gz PKGFILES_CSWbacula-common += .*libexec/btraceback.gdb -CATALOG_NAME_CSWbacula-fd = bacula_fd +CATALOGNAME_CSWbacula-fd = bacula_fd SPKG_DESC_CSWbacula-fd = $(DESCRIPTION) - File Daemon RUNTIME_DEP_PKGS_CSWbacula-fd = CSWbacula-common RUNTIME_DEP_PKGS_CSWbacula-fd += CSWgcc4g++rt @@ -112,7 +112,7 @@ PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz .*bacula/bacula-fd.conf PKGFILES_CSWbacula-fd += /var/opt/csw/run -CATALOG_NAME_CSWbacula-sd = bacula_sd +CATALOGNAME_CSWbacula-sd = bacula_sd SPKG_DESC_CSWbacula-sd = $(DESCRIPTION) - Storage Daemon RUNTIME_DEP_PKGS_CSWbacula-sd = CSWbacula-common RUNTIME_DEP_PKGS_CSWbacula-sd += CSWgcc4g++rt @@ -133,7 +133,7 @@ PKGFILES_CSWbacula-sd += .*man8/bcopy.8.gz .*man8/bscan.8.gz PKGFILES_CSWbacula-sd += /var/opt/csw/run -CATALOG_NAME_CSWbacula-director = bacula_director +CATALOGNAME_CSWbacula-director = bacula_director SPKG_DESC_CSWbacula-director = $(DESCRIPTION) - Director RUNTIME_DEP_PKGS_CSWbacula-director = CSWbacula-common RUNTIME_DEP_PKGS_CSWbacula-director += CSWgcc4g++rt 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 Apr 17 02:31:41 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 00:31:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[14239] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14239 http://gar.svn.sourceforge.net/gar/?rev=14239&view=rev Author: bdwalton Date: 2011-04-17 00:31:41 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: add a function to dynamically generate entries for subpackages Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 00:01:51 UTC (rev 14238) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 00:31:41 UTC (rev 14239) @@ -39,6 +39,16 @@ # this one is filed upstream: http://bugs.php.net/bug.php?id=54318 PATCHFILES += 0002-Correct-non-portable-use-of-grep-q-in-configure.patch +define php5_subpackage +PACKAGES += CSWphp5-$(1) +CATALOGNAME_CSWphp5-$(1) ?= php5_$(1) +SPKG_DESC_CSWphp5-$(1) ?= The $(1) extention for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-$(1) ?= CSWphp5 +OBSOLETED_BY_CSWphp5-$(1) ?= CSWphp5$(1) +PKGFILES_CSWphp5-$(1) ?= .*lib/php/extensions/.*$(1).* .*php5/extensions/$(1) +CHECKPKG_OVERRIDES_CSWphp5-$(1) += surplus-dependency|CSWphp5 +endef + PACKAGES = CSWphp5 CSWphp5-dev PACKAGES += CSWap2-modphp5 PACKAGES += CSWphp5-bcmath 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 Apr 17 04:20:47 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 02:20:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14240] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14240 http://gar.svn.sourceforge.net/gar/?rev=14240&view=rev Author: bdwalton Date: 2011-04-17 02:20:47 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut bcmath to new dynamic generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 00:31:41 UTC (rev 14239) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 02:20:47 UTC (rev 14240) @@ -51,7 +51,9 @@ PACKAGES = CSWphp5 CSWphp5-dev PACKAGES += CSWap2-modphp5 -PACKAGES += CSWphp5-bcmath + +$(eval $(call php5_subpackage,bcmath)) + PACKAGES += CSWphp5-bz2 PACKAGES += CSWphp5-calendar PACKAGES += CSWphp5-ctype @@ -137,11 +139,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-bcmath = php5_bcmath -SPKG_DESC_CSWphp5-bcmath = The bcmath extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-bcmath = CSWphp5 -OBSOLETED_BY_CSWphp5-bcmath = CSWphp5bcmath - CATALOGNAME_CSWphp5-bz2 = php5_bz2 SPKG_DESC_CSWphp5-bz2 = The bz2 extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-bz2 = CSWphp5 CSWbzip2 @@ -415,8 +412,6 @@ PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* -PKGFILES_CSWphp5-bcmath = .*/lib/php/extensions/.*/bcmath.* - PKGFILES_CSWphp5-bz2 = .*/lib/php/extensions/.*/bz2.* PKGFILES_CSWphp5-calendar = .*/lib/php/extensions/.*/calendar.* @@ -667,7 +662,6 @@ CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdo += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-bcmath += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-tidy += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5 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 Apr 17 04:21:50 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 02:21:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14241] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14241 http://gar.svn.sourceforge.net/gar/?rev=14241&view=rev Author: bdwalton Date: 2011-04-17 02:21:50 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: let php5_subpackage add addition deps via $2 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 02:20:47 UTC (rev 14240) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 02:21:50 UTC (rev 14241) @@ -43,7 +43,7 @@ PACKAGES += CSWphp5-$(1) CATALOGNAME_CSWphp5-$(1) ?= php5_$(1) SPKG_DESC_CSWphp5-$(1) ?= The $(1) extention for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-$(1) ?= CSWphp5 +RUNTIME_DEP_PKGS_CSWphp5-$(1) ?= CSWphp5 $(2) OBSOLETED_BY_CSWphp5-$(1) ?= CSWphp5$(1) PKGFILES_CSWphp5-$(1) ?= .*lib/php/extensions/.*$(1).* .*php5/extensions/$(1) CHECKPKG_OVERRIDES_CSWphp5-$(1) += surplus-dependency|CSWphp5 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 Apr 17 04:22:43 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 02:22:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14242] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14242 http://gar.svn.sourceforge.net/gar/?rev=14242&view=rev Author: bdwalton Date: 2011-04-17 02:22:43 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut bz2 to new dynamic generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 02:21:50 UTC (rev 14241) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 02:22:43 UTC (rev 14242) @@ -53,8 +53,8 @@ PACKAGES += CSWap2-modphp5 $(eval $(call php5_subpackage,bcmath)) +$(eval $(call php5_subpackage,bz2,CSWbzip2)) -PACKAGES += CSWphp5-bz2 PACKAGES += CSWphp5-calendar PACKAGES += CSWphp5-ctype PACKAGES += CSWphp5-curl @@ -139,11 +139,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-bz2 = php5_bz2 -SPKG_DESC_CSWphp5-bz2 = The bz2 extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-bz2 = CSWphp5 CSWbzip2 -OBSOLETED_BY_CSWphp5-bz2 = CSWphp5bz2 - CATALOGNAME_CSWphp5-calendar = php5_calendar SPKG_DESC_CSWphp5-calendar = The calendar extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-calendar = CSWphp5 @@ -412,8 +407,6 @@ PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* -PKGFILES_CSWphp5-bz2 = .*/lib/php/extensions/.*/bz2.* - PKGFILES_CSWphp5-calendar = .*/lib/php/extensions/.*/calendar.* PKGFILES_CSWphp5-ctype = .*/lib/php/extensions/.*/ctype.* @@ -678,7 +671,6 @@ CHECKPKG_OVERRIDES_CSWphp5-mbstring += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-exif += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-bz2 += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-dba += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvmsg += surplus-dependency|CSWphp5 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 Apr 17 04:23:41 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 02:23:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[14243] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14243 http://gar.svn.sourceforge.net/gar/?rev=14243&view=rev Author: bdwalton Date: 2011-04-17 02:23:41 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut calendar extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 02:22:43 UTC (rev 14242) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 02:23:41 UTC (rev 14243) @@ -54,8 +54,8 @@ $(eval $(call php5_subpackage,bcmath)) $(eval $(call php5_subpackage,bz2,CSWbzip2)) +$(eval $(call php5_subpackage,calendar)) -PACKAGES += CSWphp5-calendar PACKAGES += CSWphp5-ctype PACKAGES += CSWphp5-curl PACKAGES += CSWphp5-dba @@ -139,11 +139,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-calendar = php5_calendar -SPKG_DESC_CSWphp5-calendar = The calendar extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-calendar = CSWphp5 -OBSOLETED_BY_CSWphp5-calendar = CSWphp5calendar - CATALOGNAME_CSWphp5-ctype = php5_ctype SPKG_DESC_CSWphp5-ctype = The ctype extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-ctype = CSWphp5 @@ -407,8 +402,6 @@ PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* -PKGFILES_CSWphp5-calendar = .*/lib/php/extensions/.*/calendar.* - PKGFILES_CSWphp5-ctype = .*/lib/php/extensions/.*/ctype.* PKGFILES_CSWphp5-curl = .*/lib/php/extensions/.*/curl.* @@ -660,7 +653,6 @@ CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-snmp += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ctype += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-calendar += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-hash += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvshm += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlwriter += surplus-dependency|CSWphp5 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 Apr 17 04:24:25 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 02:24:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14244] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14244 http://gar.svn.sourceforge.net/gar/?rev=14244&view=rev Author: bdwalton Date: 2011-04-17 02:24:25 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut ctype extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 02:23:41 UTC (rev 14243) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 02:24:25 UTC (rev 14244) @@ -55,8 +55,8 @@ $(eval $(call php5_subpackage,bcmath)) $(eval $(call php5_subpackage,bz2,CSWbzip2)) $(eval $(call php5_subpackage,calendar)) +$(eval $(call php5_subpackage,ctype)) -PACKAGES += CSWphp5-ctype PACKAGES += CSWphp5-curl PACKAGES += CSWphp5-dba PACKAGES += CSWphp5-dom @@ -139,11 +139,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-ctype = php5_ctype -SPKG_DESC_CSWphp5-ctype = The ctype extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-ctype = CSWphp5 -OBSOLETED_BY_CSWphp5-ctype = CSWphp5ctype - CATALOGNAME_CSWphp5-curl = php5_curl SPKG_DESC_CSWphp5-curl = The curl extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-curl = CSWphp5 CSWcurlrt CSWlibidn11 @@ -402,8 +397,6 @@ PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* -PKGFILES_CSWphp5-ctype = .*/lib/php/extensions/.*/ctype.* - PKGFILES_CSWphp5-curl = .*/lib/php/extensions/.*/curl.* PKGFILES_CSWphp5-dba = .*/lib/php/extensions/.*/dba\.so @@ -652,7 +645,6 @@ CHECKPKG_OVERRIDES_CSWphp5-tidy += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-snmp += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-ctype += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-hash += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvshm += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlwriter += surplus-dependency|CSWphp5 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 Apr 17 04:25:40 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 02:25:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14245] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14245 http://gar.svn.sourceforge.net/gar/?rev=14245&view=rev Author: bdwalton Date: 2011-04-17 02:25:40 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut curl extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 02:24:25 UTC (rev 14244) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 02:25:40 UTC (rev 14245) @@ -56,8 +56,8 @@ $(eval $(call php5_subpackage,bz2,CSWbzip2)) $(eval $(call php5_subpackage,calendar)) $(eval $(call php5_subpackage,ctype)) +$(eval $(call php5_subpackage,curl,CSWcurlrt CSWlibidn11 CSWoldaprt CSWosslrt CSWzlib CSWlibcares)) -PACKAGES += CSWphp5-curl PACKAGES += CSWphp5-dba PACKAGES += CSWphp5-dom PACKAGES += CSWphp5-exif @@ -139,12 +139,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-curl = php5_curl -SPKG_DESC_CSWphp5-curl = The curl extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-curl = CSWphp5 CSWcurlrt CSWlibidn11 -RUNTIME_DEP_PKGS_CSWphp5-curl += CSWoldaprt CSWosslrt CSWzlib CSWlibcares -OBSOLETED_BY_CSWphp5-curl = CSWphp5curl - CATALOGNAME_CSWphp5-dba = php5_dba SPKG_DESC_CSWphp5-dba = The dba extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-dba = CSWphp5 CSWlibgdbm3 CSWbdb42 @@ -397,8 +391,6 @@ PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* -PKGFILES_CSWphp5-curl = .*/lib/php/extensions/.*/curl.* - PKGFILES_CSWphp5-dba = .*/lib/php/extensions/.*/dba\.so PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.* @@ -678,7 +670,6 @@ CHECKPKG_OVERRIDES_CSWphp5-pcntl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-curl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-posix += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ftp += surplus-dependency|CSWphp5 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 Apr 17 15:12:51 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 17 Apr 2011 13:12:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14246] csw/mgar/pkg/lighttpd/trunk/Makefile Message-ID: Revision: 14246 http://gar.svn.sourceforge.net/gar/?rev=14246&view=rev Author: wahwah Date: 2011-04-17 13:12:51 +0000 (Sun, 17 Apr 2011) Log Message: ----------- pkg/lighttpd/trunk: enable .conf file migration Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/Makefile Modified: csw/mgar/pkg/lighttpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lighttpd/trunk/Makefile 2011-04-17 02:25:40 UTC (rev 14245) +++ csw/mgar/pkg/lighttpd/trunk/Makefile 2011-04-17 13:12:51 UTC (rev 14246) @@ -65,6 +65,9 @@ PRESERVECONF = $(sysconfdir)/lighttpd\.conf USERGROUP = $(sysconfdir)/pkg/$(NAME)/cswusergroup +# Migrating the configuration file from /opt/csw/etc to /etc/opt/csw +MIGRATE_FILES = lighttpd.conf + # To allow lighttpd to write logs PROTOTYPE_MODIFIERS = user PROTOTYPE_FILES_user = $(localstatedir)/log/lighttpd 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 Apr 17 15:34:16 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 13:34:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[14247] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14247 http://gar.svn.sourceforge.net/gar/?rev=14247&view=rev Author: bdwalton Date: 2011-04-17 13:34:16 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: tighten up the dynamic pkgfiles generation for the subpackages Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 13:12:51 UTC (rev 14246) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 13:34:16 UTC (rev 14247) @@ -45,7 +45,7 @@ SPKG_DESC_CSWphp5-$(1) ?= The $(1) extention for PHP5 RUNTIME_DEP_PKGS_CSWphp5-$(1) ?= CSWphp5 $(2) OBSOLETED_BY_CSWphp5-$(1) ?= CSWphp5$(1) -PKGFILES_CSWphp5-$(1) ?= .*lib/php/extensions/.*$(1).* .*php5/extensions/$(1) +PKGFILES_CSWphp5-$(1) ?= .*lib/php/extensions/.*/$(1).so .*php5/extensions/$(1) CHECKPKG_OVERRIDES_CSWphp5-$(1) += surplus-dependency|CSWphp5 endef 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 Apr 17 15:36:14 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 13:36:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14248] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14248 http://gar.svn.sourceforge.net/gar/?rev=14248&view=rev Author: bdwalton Date: 2011-04-17 13:36:13 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut dba extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 13:34:16 UTC (rev 14247) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 13:36:13 UTC (rev 14248) @@ -57,8 +57,8 @@ $(eval $(call php5_subpackage,calendar)) $(eval $(call php5_subpackage,ctype)) $(eval $(call php5_subpackage,curl,CSWcurlrt CSWlibidn11 CSWoldaprt CSWosslrt CSWzlib CSWlibcares)) +$(eval $(call php5_subpackage,dba,CSWlibgdbm3 CSWbdb42)) -PACKAGES += CSWphp5-dba PACKAGES += CSWphp5-dom PACKAGES += CSWphp5-exif PACKAGES += CSWphp5-ftp @@ -139,11 +139,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-dba = php5_dba -SPKG_DESC_CSWphp5-dba = The dba extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-dba = CSWphp5 CSWlibgdbm3 CSWbdb42 -OBSOLETED_BY_CSWphp5-dba = CSWphp5dba - CATALOGNAME_CSWphp5-dom = php5_dom SPKG_DESC_CSWphp5-dom = The dom extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-dom = CSWphp5 CSWiconv CSWlibxml2 CSWzlib @@ -391,8 +386,6 @@ PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* -PKGFILES_CSWphp5-dba = .*/lib/php/extensions/.*/dba\.so - PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.* PKGFILES_CSWphp5-dom = .*/lib/php/extensions/.*/dom.* @@ -648,7 +641,6 @@ CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-exif += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-dba += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvmsg += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-imap += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-odbc += surplus-dependency|CSWphp5 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 Apr 17 16:06:34 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 14:06:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[14249] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14249 http://gar.svn.sourceforge.net/gar/?rev=14249&view=rev Author: bdwalton Date: 2011-04-17 14:06:34 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut dom extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 13:36:13 UTC (rev 14248) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:06:34 UTC (rev 14249) @@ -58,8 +58,9 @@ $(eval $(call php5_subpackage,ctype)) $(eval $(call php5_subpackage,curl,CSWcurlrt CSWlibidn11 CSWoldaprt CSWosslrt CSWzlib CSWlibcares)) $(eval $(call php5_subpackage,dba,CSWlibgdbm3 CSWbdb42)) +$(eval $(call php5_subpackage,dom,CSWiconv CSWlibxml2 CSWzlib)) +PKGFILES_CSWphp5-dom += .*include/php/ext/dom.* -PACKAGES += CSWphp5-dom PACKAGES += CSWphp5-exif PACKAGES += CSWphp5-ftp PACKAGES += CSWphp5-gd @@ -139,11 +140,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-dom = php5_dom -SPKG_DESC_CSWphp5-dom = The dom extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-dom = CSWphp5 CSWiconv CSWlibxml2 CSWzlib -OBSOLETED_BY_CSWphp5-dom = CSWphp5dom - CATALOGNAME_CSWphp5-exif = php5_exif SPKG_DESC_CSWphp5-exif = The exif extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-exif = CSWphp5 @@ -388,9 +384,6 @@ PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.* -PKGFILES_CSWphp5-dom = .*/lib/php/extensions/.*/dom.* -PKGFILES_CSWphp5-dom += .*/include/php/ext/dom.* - PKGFILES_CSWphp5-exif = .*/lib/php/extensions/.*/exif.* PKGFILES_CSWphp5-ftp = .*/lib/php/extensions/.*/ftp.* @@ -652,7 +645,6 @@ CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-json += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-tokenizer += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-dom += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-soap += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pspell += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-wddx += surplus-dependency|CSWphp5 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 Apr 17 16:07:16 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 14:07:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[14250] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14250 http://gar.svn.sourceforge.net/gar/?rev=14250&view=rev Author: bdwalton Date: 2011-04-17 14:07:16 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut exif extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:06:34 UTC (rev 14249) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:07:16 UTC (rev 14250) @@ -60,8 +60,8 @@ $(eval $(call php5_subpackage,dba,CSWlibgdbm3 CSWbdb42)) $(eval $(call php5_subpackage,dom,CSWiconv CSWlibxml2 CSWzlib)) PKGFILES_CSWphp5-dom += .*include/php/ext/dom.* +$(eval $(call php5_subpackage,exif)) -PACKAGES += CSWphp5-exif PACKAGES += CSWphp5-ftp PACKAGES += CSWphp5-gd PACKAGES += CSWphp5-gettext @@ -140,11 +140,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-exif = php5_exif -SPKG_DESC_CSWphp5-exif = The exif extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-exif = CSWphp5 -OBSOLETED_BY_CSWphp5-exif = CSWphp5exif - CATALOGNAME_CSWphp5-ftp = php5_ftp SPKG_DESC_CSWphp5-ftp = The ftp extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-ftp = CSWphp5 CSWosslrt @@ -384,8 +379,6 @@ PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.* -PKGFILES_CSWphp5-exif = .*/lib/php/extensions/.*/exif.* - PKGFILES_CSWphp5-ftp = .*/lib/php/extensions/.*/ftp.* PKGFILES_CSWphp5-gd = .*/lib/php/extensions/.*/gd.* @@ -632,7 +625,6 @@ CHECKPKG_OVERRIDES_CSWphp5-dbase += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mbstring += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-exif += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvmsg += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-imap += surplus-dependency|CSWphp5 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 Apr 17 16:08:17 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 14:08:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14251] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14251 http://gar.svn.sourceforge.net/gar/?rev=14251&view=rev Author: bdwalton Date: 2011-04-17 14:08:17 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut ftp extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:07:16 UTC (rev 14250) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:08:17 UTC (rev 14251) @@ -61,8 +61,8 @@ $(eval $(call php5_subpackage,dom,CSWiconv CSWlibxml2 CSWzlib)) PKGFILES_CSWphp5-dom += .*include/php/ext/dom.* $(eval $(call php5_subpackage,exif)) +$(eval $(call php5_subpackage,ftp,CSWosslrt)) -PACKAGES += CSWphp5-ftp PACKAGES += CSWphp5-gd PACKAGES += CSWphp5-gettext PACKAGES += CSWphp5-gmp @@ -140,11 +140,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-ftp = php5_ftp -SPKG_DESC_CSWphp5-ftp = The ftp extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-ftp = CSWphp5 CSWosslrt -OBSOLETED_BY_CSWphp5-ftp = CSWphp5ftp - CATALOGNAME_CSWphp5-gd = php5_gd SPKG_DESC_CSWphp5-gd = The gd extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-gd = CSWphp5 CSWftype2 CSWlibgd2 CSWjpeg @@ -379,8 +374,6 @@ PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.* -PKGFILES_CSWphp5-ftp = .*/lib/php/extensions/.*/ftp.* - PKGFILES_CSWphp5-gd = .*/lib/php/extensions/.*/gd.* PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.* @@ -648,7 +641,6 @@ CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-posix += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-ftp += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-gettext += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mcrypt += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sqlite += surplus-dependency|CSWphp5 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 Apr 17 16:09:53 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 14:09:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[14252] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14252 http://gar.svn.sourceforge.net/gar/?rev=14252&view=rev Author: bdwalton Date: 2011-04-17 14:09:53 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut gd extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:08:17 UTC (rev 14251) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:09:53 UTC (rev 14252) @@ -62,8 +62,9 @@ PKGFILES_CSWphp5-dom += .*include/php/ext/dom.* $(eval $(call php5_subpackage,exif)) $(eval $(call php5_subpackage,ftp,CSWosslrt)) +$(eval $(call php5_subpackage,gd,CSWftype2 CSWlibgd2 CSWjpeg CSWpng CSWt1lib CSWxpm CSWzlib)) +PKGFILES_CSWphp-gd += .*/include/php/ext/gd.* -PACKAGES += CSWphp5-gd PACKAGES += CSWphp5-gettext PACKAGES += CSWphp5-gmp PACKAGES += CSWphp5-hash @@ -140,12 +141,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-gd = php5_gd -SPKG_DESC_CSWphp5-gd = The gd extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-gd = CSWphp5 CSWftype2 CSWlibgd2 CSWjpeg -RUNTIME_DEP_PKGS_CSWphp5-gd += CSWpng CSWt1lib CSWxpm CSWzlib -OBSOLETED_BY_CSWphp5-gd = CSWphp5gd - CATALOGNAME_CSWphp5-gettext = php5_gettext SPKG_DESC_CSWphp5-gettext = The gettext extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-gettext = CSWphp5 CSWlibintl8 @@ -374,9 +369,6 @@ PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.* -PKGFILES_CSWphp5-gd = .*/lib/php/extensions/.*/gd.* -PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.* - PKGFILES_CSWphp5-gettext = .*/lib/php/extensions/.*/gettext.* PKGFILES_CSWphp5-gmp = .*/lib/php/extensions/.*/gmp.* @@ -605,7 +597,6 @@ CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdo += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-tidy += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-snmp += surplus-dependency|CSWphp5 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 Apr 17 16:13:08 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 14:13:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14253] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14253 http://gar.svn.sourceforge.net/gar/?rev=14253&view=rev Author: bdwalton Date: 2011-04-17 14:13:08 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut gettext extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:09:53 UTC (rev 14252) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:13:08 UTC (rev 14253) @@ -64,8 +64,8 @@ $(eval $(call php5_subpackage,ftp,CSWosslrt)) $(eval $(call php5_subpackage,gd,CSWftype2 CSWlibgd2 CSWjpeg CSWpng CSWt1lib CSWxpm CSWzlib)) PKGFILES_CSWphp-gd += .*/include/php/ext/gd.* +$(eval $(call php5_subpackage,gettext,CSWlibintl8)) -PACKAGES += CSWphp5-gettext PACKAGES += CSWphp5-gmp PACKAGES += CSWphp5-hash PACKAGES += CSWphp5-iconv @@ -141,11 +141,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-gettext = php5_gettext -SPKG_DESC_CSWphp5-gettext = The gettext extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-gettext = CSWphp5 CSWlibintl8 -OBSOLETED_BY_CSWphp5-gettext = CSWphp5gettext - CATALOGNAME_CSWphp5-gmp = php5_gmp SPKG_DESC_CSWphp5-gmp = The gmp extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-gmp = CSWphp5 CSWlibgmp @@ -369,8 +364,6 @@ PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.* -PKGFILES_CSWphp5-gettext = .*/lib/php/extensions/.*/gettext.* - PKGFILES_CSWphp5-gmp = .*/lib/php/extensions/.*/gmp.* PKGFILES_CSWphp5-hash = .*/lib/php/extensions/.*/hash.* @@ -632,7 +625,6 @@ CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-posix += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-gettext += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mcrypt += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sqlite += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlrpc += surplus-dependency|CSWphp5 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 Apr 17 16:14:35 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 14:14:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14254] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14254 http://gar.svn.sourceforge.net/gar/?rev=14254&view=rev Author: bdwalton Date: 2011-04-17 14:14:34 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut gmp extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:13:08 UTC (rev 14253) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:14:34 UTC (rev 14254) @@ -65,8 +65,8 @@ $(eval $(call php5_subpackage,gd,CSWftype2 CSWlibgd2 CSWjpeg CSWpng CSWt1lib CSWxpm CSWzlib)) PKGFILES_CSWphp-gd += .*/include/php/ext/gd.* $(eval $(call php5_subpackage,gettext,CSWlibintl8)) +$(eval $(call php5_subpackage,gmp,CSWlibgmp)) -PACKAGES += CSWphp5-gmp PACKAGES += CSWphp5-hash PACKAGES += CSWphp5-iconv PACKAGES += CSWphp5-imap @@ -141,11 +141,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-gmp = php5_gmp -SPKG_DESC_CSWphp5-gmp = The gmp extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-gmp = CSWphp5 CSWlibgmp -OBSOLETED_BY_CSWphp5-gmp = CSWphp5gmp - CATALOGNAME_CSWphp5-hash = php5_hash SPKG_DESC_CSWphp5-hash = The hash extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-hash = CSWphp5 @@ -364,8 +359,6 @@ PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.* -PKGFILES_CSWphp5-gmp = .*/lib/php/extensions/.*/gmp.* - PKGFILES_CSWphp5-hash = .*/lib/php/extensions/.*/hash.* PKGFILES_CSWphp5-hash += .*/include/php/ext/hash.* @@ -617,8 +610,6 @@ CHECKPKG_OVERRIDES_CSWphp5-soap += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pspell += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-wddx += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-gmp += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-gmp += surplus-dependency|CSWlibgmp CHECKPKG_OVERRIDES_CSWphp5-mssql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pcntl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 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 Apr 17 16:15:50 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 14:15:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14255] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14255 http://gar.svn.sourceforge.net/gar/?rev=14255&view=rev Author: bdwalton Date: 2011-04-17 14:15:49 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut hash extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:14:34 UTC (rev 14254) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:15:49 UTC (rev 14255) @@ -66,8 +66,9 @@ PKGFILES_CSWphp-gd += .*/include/php/ext/gd.* $(eval $(call php5_subpackage,gettext,CSWlibintl8)) $(eval $(call php5_subpackage,gmp,CSWlibgmp)) +$(eval $(call php5_subpackage,hash)) +PKGFILES_CSWphp5-hash += .*/include/php/ext/hash.* -PACKAGES += CSWphp5-hash PACKAGES += CSWphp5-iconv PACKAGES += CSWphp5-imap PACKAGES += CSWphp5-json @@ -141,11 +142,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-hash = php5_hash -SPKG_DESC_CSWphp5-hash = The hash extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-hash = CSWphp5 -OBSOLETED_BY_CSWphp5-hash = CSWphp5hash - CATALOGNAME_CSWphp5-iconv = php5_iconv SPKG_DESC_CSWphp5-iconv = The iconv extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-iconv = CSWphp5 CSWiconv @@ -359,9 +355,6 @@ PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.* -PKGFILES_CSWphp5-hash = .*/lib/php/extensions/.*/hash.* -PKGFILES_CSWphp5-hash += .*/include/php/ext/hash.* - PKGFILES_CSWphp5-iconv = .*/lib/php/extensions/.*/iconv.* PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.* @@ -586,7 +579,6 @@ CHECKPKG_OVERRIDES_CSWphp5-tidy += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-snmp += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-hash += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvshm += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlwriter += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWphp5 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 Apr 17 16:16:47 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 14:16:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14256] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14256 http://gar.svn.sourceforge.net/gar/?rev=14256&view=rev Author: bdwalton Date: 2011-04-17 14:16:47 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: correct pkg files split (additional non-dynamic entry) for gd extension Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:15:49 UTC (rev 14255) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:16:47 UTC (rev 14256) @@ -63,7 +63,7 @@ $(eval $(call php5_subpackage,exif)) $(eval $(call php5_subpackage,ftp,CSWosslrt)) $(eval $(call php5_subpackage,gd,CSWftype2 CSWlibgd2 CSWjpeg CSWpng CSWt1lib CSWxpm CSWzlib)) -PKGFILES_CSWphp-gd += .*/include/php/ext/gd.* +PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.* $(eval $(call php5_subpackage,gettext,CSWlibintl8)) $(eval $(call php5_subpackage,gmp,CSWlibgmp)) $(eval $(call php5_subpackage,hash)) 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 Apr 17 16:57:01 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 14:57:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14257] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14257 http://gar.svn.sourceforge.net/gar/?rev=14257&view=rev Author: bdwalton Date: 2011-04-17 14:57:01 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut iconv extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:16:47 UTC (rev 14256) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:57:01 UTC (rev 14257) @@ -68,8 +68,9 @@ $(eval $(call php5_subpackage,gmp,CSWlibgmp)) $(eval $(call php5_subpackage,hash)) PKGFILES_CSWphp5-hash += .*/include/php/ext/hash.* +$(eval $(call php5_subpackage,iconv,CSWiconv)) +PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.* -PACKAGES += CSWphp5-iconv PACKAGES += CSWphp5-imap PACKAGES += CSWphp5-json PACKAGES += CSWphp5-ldap @@ -142,11 +143,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-iconv = php5_iconv -SPKG_DESC_CSWphp5-iconv = The iconv extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-iconv = CSWphp5 CSWiconv -OBSOLETED_BY_CSWphp5-iconv = CSWphp5iconv - CATALOGNAME_CSWphp5-imap = php5_imap SPKG_DESC_CSWphp5-imap = The imap extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-imap = CSWphp5 CSWimaprt CSWkrb5lib CSWosslrt @@ -355,9 +351,6 @@ PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.* -PKGFILES_CSWphp5-iconv = .*/lib/php/extensions/.*/iconv.* -PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.* - PKGFILES_CSWphp5-imap = .*/lib/php/extensions/.*/imap.* PKGFILES_CSWphp5-json = .*/lib/php/extensions/.*/json.* @@ -583,7 +576,6 @@ CHECKPKG_OVERRIDES_CSWphp5-xmlwriter += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mysql += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-iconv += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-dbase += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mbstring += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 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 Apr 17 16:58:15 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 14:58:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[14258] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14258 http://gar.svn.sourceforge.net/gar/?rev=14258&view=rev Author: bdwalton Date: 2011-04-17 14:58:14 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut imap extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:57:01 UTC (rev 14257) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:58:14 UTC (rev 14258) @@ -70,8 +70,8 @@ PKGFILES_CSWphp5-hash += .*/include/php/ext/hash.* $(eval $(call php5_subpackage,iconv,CSWiconv)) PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.* +$(eval $(call php5_subpackage,imap,CSWimaprt CSWkrb5lib CSWosslrt)) -PACKAGES += CSWphp5-imap PACKAGES += CSWphp5-json PACKAGES += CSWphp5-ldap PACKAGES += CSWphp5-mbstring @@ -143,11 +143,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-imap = php5_imap -SPKG_DESC_CSWphp5-imap = The imap extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-imap = CSWphp5 CSWimaprt CSWkrb5lib CSWosslrt -OBSOLETED_BY_CSWphp5-imap = CSWphp5imap - CATALOGNAME_CSWphp5-json = php5_json SPKG_DESC_CSWphp5-json = The json extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-json = CSWphp5 @@ -351,7 +346,6 @@ PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.* -PKGFILES_CSWphp5-imap = .*/lib/php/extensions/.*/imap.* PKGFILES_CSWphp5-json = .*/lib/php/extensions/.*/json.* @@ -581,7 +575,6 @@ CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvmsg += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-imap += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-odbc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-readline += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-openssl += surplus-dependency|CSWphp5 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 Apr 17 16:58:52 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 14:58:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[14259] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14259 http://gar.svn.sourceforge.net/gar/?rev=14259&view=rev Author: bdwalton Date: 2011-04-17 14:58:51 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut json extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:58:14 UTC (rev 14258) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:58:51 UTC (rev 14259) @@ -71,8 +71,8 @@ $(eval $(call php5_subpackage,iconv,CSWiconv)) PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.* $(eval $(call php5_subpackage,imap,CSWimaprt CSWkrb5lib CSWosslrt)) +$(eval $(call php5_subpackage,json)) -PACKAGES += CSWphp5-json PACKAGES += CSWphp5-ldap PACKAGES += CSWphp5-mbstring PACKAGES += CSWphp5-mcrypt @@ -143,11 +143,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-json = php5_json -SPKG_DESC_CSWphp5-json = The json extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-json = CSWphp5 -OBSOLETED_BY_CSWphp5-json = CSWphp5json - CATALOGNAME_CSWphp5-ldap = php5_ldap SPKG_DESC_CSWphp5-ldap = The ldap extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-ldap = CSWphp5 CSWoldaprt CSWsasl @@ -346,9 +341,6 @@ PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.* - -PKGFILES_CSWphp5-json = .*/lib/php/extensions/.*/json.* - PKGFILES_CSWphp5-ldap = .*/lib/php/extensions/.*/ldap.* PKGFILES_CSWphp5-mbstring = .*/lib/php/extensions/.*/mbstring.* @@ -582,7 +574,6 @@ CHECKPKG_OVERRIDES_CSWphp5-sockets += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ldap += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-json += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-tokenizer += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-soap += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pspell += surplus-dependency|CSWphp5 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 Apr 17 16:59:46 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 14:59:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[14260] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14260 http://gar.svn.sourceforge.net/gar/?rev=14260&view=rev Author: bdwalton Date: 2011-04-17 14:59:45 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut ldap extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:58:51 UTC (rev 14259) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:59:45 UTC (rev 14260) @@ -72,8 +72,8 @@ PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.* $(eval $(call php5_subpackage,imap,CSWimaprt CSWkrb5lib CSWosslrt)) $(eval $(call php5_subpackage,json)) +$(eval $(call php5_subpackage,ldap,CSWoldaprt CSWsasl)) -PACKAGES += CSWphp5-ldap PACKAGES += CSWphp5-mbstring PACKAGES += CSWphp5-mcrypt PACKAGES += CSWphp5-mssql @@ -143,10 +143,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-ldap = php5_ldap -SPKG_DESC_CSWphp5-ldap = The ldap extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-ldap = CSWphp5 CSWoldaprt CSWsasl - CATALOGNAME_CSWphp5-mbstring = php5_mbstring SPKG_DESC_CSWphp5-mbstring = The mbstring extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-mbstring = CSWphp5 @@ -341,8 +337,6 @@ PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.* -PKGFILES_CSWphp5-ldap = .*/lib/php/extensions/.*/ldap.* - PKGFILES_CSWphp5-mbstring = .*/lib/php/extensions/.*/mbstring.* PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.* @@ -572,7 +566,6 @@ CHECKPKG_OVERRIDES_CSWphp5-openssl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sockets += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-ldap += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-tokenizer += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-soap += surplus-dependency|CSWphp5 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 Apr 17 17:00:41 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 15:00:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[14261] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14261 http://gar.svn.sourceforge.net/gar/?rev=14261&view=rev Author: bdwalton Date: 2011-04-17 15:00:41 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut mbstring extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 14:59:45 UTC (rev 14260) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 15:00:41 UTC (rev 14261) @@ -73,8 +73,9 @@ $(eval $(call php5_subpackage,imap,CSWimaprt CSWkrb5lib CSWosslrt)) $(eval $(call php5_subpackage,json)) $(eval $(call php5_subpackage,ldap,CSWoldaprt CSWsasl)) +$(eval $(call php5_subpackage,mbstring)) +PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.* -PACKAGES += CSWphp5-mbstring PACKAGES += CSWphp5-mcrypt PACKAGES += CSWphp5-mssql PACKAGES += CSWphp5-mysql @@ -143,11 +144,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-mbstring = php5_mbstring -SPKG_DESC_CSWphp5-mbstring = The mbstring extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-mbstring = CSWphp5 -OBSOLETED_BY_CSWphp5-mbstring = CSWphp5mbstring - CATALOGNAME_CSWphp5-mcrypt = php5_mcrypt SPKG_DESC_CSWphp5-mcrypt = The mcrypt extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-mcrypt = CSWphp5 CSWlibmcrypt CSWlibltdl7 @@ -337,9 +333,6 @@ PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.* -PKGFILES_CSWphp5-mbstring = .*/lib/php/extensions/.*/mbstring.* -PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.* - PKGFILES_CSWphp5-mcrypt = .*/lib/php/extensions/.*/mcrypt.* PKGFILES_CSWphp5-mimemagic = .*/lib/php/extensions/.*/mime_magic.* @@ -557,7 +550,6 @@ CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mysql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-dbase += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-mbstring += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvmsg += surplus-dependency|CSWphp5 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 Apr 17 20:22:28 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 18:22:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[14262] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14262 http://gar.svn.sourceforge.net/gar/?rev=14262&view=rev Author: bdwalton Date: 2011-04-17 18:22:27 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut mcrypt extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 15:00:41 UTC (rev 14261) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:22:27 UTC (rev 14262) @@ -75,8 +75,8 @@ $(eval $(call php5_subpackage,ldap,CSWoldaprt CSWsasl)) $(eval $(call php5_subpackage,mbstring)) PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.* +$(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt CSWlibltdl7)) -PACKAGES += CSWphp5-mcrypt PACKAGES += CSWphp5-mssql PACKAGES += CSWphp5-mysql PACKAGES += CSWphp5-mysqli @@ -144,11 +144,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-mcrypt = php5_mcrypt -SPKG_DESC_CSWphp5-mcrypt = The mcrypt extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-mcrypt = CSWphp5 CSWlibmcrypt CSWlibltdl7 -OBSOLETED_BY_CSWphp5-mcrypt = CSWphp5mcrypt - CATALOGNAME_CSWphp5-mssql = php5_mssql SPKG_DESC_CSWphp5-mssql = The mssql extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-mssql = CSWphp5 CSWfreetds @@ -333,8 +328,6 @@ PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.* -PKGFILES_CSWphp5-mcrypt = .*/lib/php/extensions/.*/mcrypt.* - PKGFILES_CSWphp5-mimemagic = .*/lib/php/extensions/.*/mime_magic.* PKGFILES_CSWphp5-mssql = .*/lib/php/extensions/.*/mssql.* @@ -569,7 +562,6 @@ CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-posix += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-mcrypt += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sqlite += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlrpc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pgsql += surplus-dependency|CSWphp5 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 Apr 17 20:24:47 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 18:24:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14263] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14263 http://gar.svn.sourceforge.net/gar/?rev=14263&view=rev Author: bdwalton Date: 2011-04-17 18:24:47 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut mssql extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:22:27 UTC (rev 14262) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:24:47 UTC (rev 14263) @@ -76,8 +76,8 @@ $(eval $(call php5_subpackage,mbstring)) PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.* $(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt CSWlibltdl7)) +$(eval $(call php5_subpackage,mssql,CSWfreetds)) -PACKAGES += CSWphp5-mssql PACKAGES += CSWphp5-mysql PACKAGES += CSWphp5-mysqli PACKAGES += CSWphp5-odbc @@ -144,11 +144,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-mssql = php5_mssql -SPKG_DESC_CSWphp5-mssql = The mssql extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-mssql = CSWphp5 CSWfreetds -OBSOLETED_BY_CSWphp5-mssql = CSWphp5mssql - CATALOGNAME_CSWphp5-mysql = php5_mysql SPKG_DESC_CSWphp5-mysql = The mysql extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-mysql = CSWphp5 CSWmysql5rt @@ -330,8 +325,6 @@ PKGFILES_CSWphp5-mimemagic = .*/lib/php/extensions/.*/mime_magic.* -PKGFILES_CSWphp5-mssql = .*/lib/php/extensions/.*/mssql.* - PKGFILES_CSWphp5-mysql = .*/lib/php/extensions/.*/mysql\.so PKGFILES_CSWphp5-mysqli = .*/lib/php/extensions/.*/mysqli.* @@ -556,7 +549,6 @@ CHECKPKG_OVERRIDES_CSWphp5-soap += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pspell += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-wddx += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-mssql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pcntl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5 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 Apr 17 20:26:20 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 18:26:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[14264] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14264 http://gar.svn.sourceforge.net/gar/?rev=14264&view=rev Author: bdwalton Date: 2011-04-17 18:26:20 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut mysql extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:24:47 UTC (rev 14263) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:26:20 UTC (rev 14264) @@ -77,8 +77,8 @@ PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.* $(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt CSWlibltdl7)) $(eval $(call php5_subpackage,mssql,CSWfreetds)) +$(eval $(call php5_subpackage,mysql,CSWmysql5rt)) -PACKAGES += CSWphp5-mysql PACKAGES += CSWphp5-mysqli PACKAGES += CSWphp5-odbc PACKAGES += CSWphp5-openssl @@ -144,11 +144,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-mysql = php5_mysql -SPKG_DESC_CSWphp5-mysql = The mysql extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-mysql = CSWphp5 CSWmysql5rt -OBSOLETED_BY_CSWphp5-mysql = CSWphp5mysql - CATALOGNAME_CSWphp5-mysqli = php5_mysqli SPKG_DESC_CSWphp5-mysqli = The mysqli extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-mysqli = CSWphp5 CSWmysql5rt CSWzlib @@ -325,8 +320,6 @@ PKGFILES_CSWphp5-mimemagic = .*/lib/php/extensions/.*/mime_magic.* -PKGFILES_CSWphp5-mysql = .*/lib/php/extensions/.*/mysql\.so - PKGFILES_CSWphp5-mysqli = .*/lib/php/extensions/.*/mysqli.* PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* @@ -534,7 +527,6 @@ CHECKPKG_OVERRIDES_CSWphp5-sysvshm += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlwriter += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-mysql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-dbase += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5 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 Apr 17 20:27:11 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 18:27:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[14265] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14265 http://gar.svn.sourceforge.net/gar/?rev=14265&view=rev Author: bdwalton Date: 2011-04-17 18:27:11 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut mysqli extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:26:20 UTC (rev 14264) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:27:11 UTC (rev 14265) @@ -78,8 +78,8 @@ $(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt CSWlibltdl7)) $(eval $(call php5_subpackage,mssql,CSWfreetds)) $(eval $(call php5_subpackage,mysql,CSWmysql5rt)) +$(eval $(call php5_subpackage,mysqli,CSWmysql5rt CSWzlib)) -PACKAGES += CSWphp5-mysqli PACKAGES += CSWphp5-odbc PACKAGES += CSWphp5-openssl PACKAGES += CSWphp5-pcntl @@ -144,11 +144,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-mysqli = php5_mysqli -SPKG_DESC_CSWphp5-mysqli = The mysqli extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-mysqli = CSWphp5 CSWmysql5rt CSWzlib -OBSOLETED_BY_CSWphp5-mysqli = CSWphp5mysqli - CATALOGNAME_CSWphp5-odbc = php5_odbc SPKG_DESC_CSWphp5-odbc = The odbc extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-odbc = CSWphp5 CSWunixodbc @@ -320,8 +315,6 @@ PKGFILES_CSWphp5-mimemagic = .*/lib/php/extensions/.*/mime_magic.* -PKGFILES_CSWphp5-mysqli = .*/lib/php/extensions/.*/mysqli.* - PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* PKGFILES_CSWphp5-odbc = .*/lib/php/extensions/.*/odbc.* @@ -555,7 +548,6 @@ CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo -CHECKPKG_OVERRIDES_CSWphp5-mysqli += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 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 Apr 17 20:28:31 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 18:28:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14266] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14266 http://gar.svn.sourceforge.net/gar/?rev=14266&view=rev Author: bdwalton Date: 2011-04-17 18:28:31 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut odbc extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:27:11 UTC (rev 14265) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:28:31 UTC (rev 14266) @@ -79,8 +79,8 @@ $(eval $(call php5_subpackage,mssql,CSWfreetds)) $(eval $(call php5_subpackage,mysql,CSWmysql5rt)) $(eval $(call php5_subpackage,mysqli,CSWmysql5rt CSWzlib)) +$(eval $(call php5_subpackage,odbc,CSWunixodbc)) -PACKAGES += CSWphp5-odbc PACKAGES += CSWphp5-openssl PACKAGES += CSWphp5-pcntl PACKAGES += CSWphp5-pdo @@ -144,11 +144,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-odbc = php5_odbc -SPKG_DESC_CSWphp5-odbc = The odbc extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-odbc = CSWphp5 CSWunixodbc -OBSOLETED_BY_CSWPhp5-odbc = CSWphp5odbc - CATALOGNAME_CSWphp5-openssl = php5_openssl SPKG_DESC_CSWphp5-openssl = The openssl extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-openssl = CSWphp5 CSWosslrt CSWkrb5lib @@ -317,8 +312,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-odbc = .*/lib/php/extensions/.*/odbc.* - PKGFILES_CSWphp5-openssl = .*/lib/php/extensions/.*/openssl.* PKGFILES_CSWphp5-pcntl = .*/lib/php/extensions/.*/pcntl.* @@ -524,7 +517,6 @@ CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvmsg += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-odbc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-readline += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-openssl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5 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 Apr 17 20:29:39 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 18:29:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14267] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14267 http://gar.svn.sourceforge.net/gar/?rev=14267&view=rev Author: bdwalton Date: 2011-04-17 18:29:39 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut openssl extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:28:31 UTC (rev 14266) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:29:39 UTC (rev 14267) @@ -80,8 +80,8 @@ $(eval $(call php5_subpackage,mysql,CSWmysql5rt)) $(eval $(call php5_subpackage,mysqli,CSWmysql5rt CSWzlib)) $(eval $(call php5_subpackage,odbc,CSWunixodbc)) +$(eval $(call php5_subpackage,openssl,CSWosslrt CSWkrb5lib)) -PACKAGES += CSWphp5-openssl PACKAGES += CSWphp5-pcntl PACKAGES += CSWphp5-pdo PACKAGES += CSWphp5-pdomysql @@ -144,11 +144,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-openssl = php5_openssl -SPKG_DESC_CSWphp5-openssl = The openssl extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-openssl = CSWphp5 CSWosslrt CSWkrb5lib -OBSOLETED_BY_CSWphp5-openssl = CSWphp5openssl - CATALOGNAME_CSWphp5-pcntl = php5_pcntl SPKG_DESC_CSWphp5-pcntl = The pcntl extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-pcntl = CSWphp5 @@ -312,8 +307,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-openssl = .*/lib/php/extensions/.*/openssl.* - PKGFILES_CSWphp5-pcntl = .*/lib/php/extensions/.*/pcntl.* PKGFILES_CSWphp5-pdo = .*/lib/php/extensions/.*/pdo\.so* @@ -518,7 +511,6 @@ CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvmsg += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-readline += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-openssl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sockets += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 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 Apr 17 20:32:13 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 18:32:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14268] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14268 http://gar.svn.sourceforge.net/gar/?rev=14268&view=rev Author: bdwalton Date: 2011-04-17 18:32:13 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut pcntl extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:29:39 UTC (rev 14267) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:32:13 UTC (rev 14268) @@ -81,8 +81,8 @@ $(eval $(call php5_subpackage,mysqli,CSWmysql5rt CSWzlib)) $(eval $(call php5_subpackage,odbc,CSWunixodbc)) $(eval $(call php5_subpackage,openssl,CSWosslrt CSWkrb5lib)) +$(eval $(call php5_subpackage,pcntl)) -PACKAGES += CSWphp5-pcntl PACKAGES += CSWphp5-pdo PACKAGES += CSWphp5-pdomysql PACKAGES += CSWphp5-pdoodbc @@ -144,11 +144,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-pcntl = php5_pcntl -SPKG_DESC_CSWphp5-pcntl = The pcntl extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-pcntl = CSWphp5 -OBSOLETED_BY_CSWphp5-pcntl = CSWphp5pcntl - CATALOGNAME_CSWphp5-pdo = php5_pdo SPKG_DESC_CSWphp5-pdo = A database access abstraction module for PHP applications RUNTIME_DEP_PKGS_CSWphp5-pdo = CSWphp5 @@ -307,8 +302,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-pcntl = .*/lib/php/extensions/.*/pcntl.* - PKGFILES_CSWphp5-pdo = .*/lib/php/extensions/.*/pdo\.so* PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.* @@ -518,7 +511,6 @@ CHECKPKG_OVERRIDES_CSWphp5-soap += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pspell += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-wddx += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-pcntl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 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 Apr 17 20:34:16 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 18:34:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[14269] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14269 http://gar.svn.sourceforge.net/gar/?rev=14269&view=rev Author: bdwalton Date: 2011-04-17 18:34:16 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut pdo extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:32:13 UTC (rev 14268) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:34:16 UTC (rev 14269) @@ -82,8 +82,9 @@ $(eval $(call php5_subpackage,odbc,CSWunixodbc)) $(eval $(call php5_subpackage,openssl,CSWosslrt CSWkrb5lib)) $(eval $(call php5_subpackage,pcntl)) +$(eval $(call php5_subpackage,pdo)) +PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.* -PACKAGES += CSWphp5-pdo PACKAGES += CSWphp5-pdomysql PACKAGES += CSWphp5-pdoodbc PACKAGES += CSWphp5-pdopgsql @@ -144,11 +145,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-pdo = php5_pdo -SPKG_DESC_CSWphp5-pdo = A database access abstraction module for PHP applications -RUNTIME_DEP_PKGS_CSWphp5-pdo = CSWphp5 -OBSOLETED_BY_CSWphp5-pdo = CSWphp5pdo - CATALOGNAME_CSWphp5-pdomysql = php5_pdomysql SPKG_DESC_CSWphp5-pdomysql = A MySQL specific database access abstraction module for PHP applications (pdo version) RUNTIME_DEP_PKGS_CSWphp5-pdomysql = CSWphp5 CSWmysql5rt CSWzlib CSWphp5-pdo @@ -302,9 +298,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-pdo = .*/lib/php/extensions/.*/pdo\.so* -PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.* - PKGFILES_CSWphp5-pdomysql = .*/lib/php/extensions/.*/pdo_mysql.* PKGFILES_CSWphp5-pdoodbc = .*/lib/php/extensions/.*/pdo_odbc.* @@ -492,7 +485,6 @@ #ENABLE_CHECK = 0 CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-pdo += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-tidy += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-snmp += surplus-dependency|CSWphp5 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 Apr 17 20:35:29 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 18:35:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[14270] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14270 http://gar.svn.sourceforge.net/gar/?rev=14270&view=rev Author: bdwalton Date: 2011-04-17 18:35:29 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut pdomysql extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:34:16 UTC (rev 14269) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:35:29 UTC (rev 14270) @@ -84,8 +84,9 @@ $(eval $(call php5_subpackage,pcntl)) $(eval $(call php5_subpackage,pdo)) PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.* +$(eval $(call php5_subpackage,pdomysql,CSWmysql5rt CSWzlib CSWphp5-pdo)) +CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo -PACKAGES += CSWphp5-pdomysql PACKAGES += CSWphp5-pdoodbc PACKAGES += CSWphp5-pdopgsql PACKAGES += CSWphp5-pdosqlite @@ -145,11 +146,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-pdomysql = php5_pdomysql -SPKG_DESC_CSWphp5-pdomysql = A MySQL specific database access abstraction module for PHP applications (pdo version) -RUNTIME_DEP_PKGS_CSWphp5-pdomysql = CSWphp5 CSWmysql5rt CSWzlib CSWphp5-pdo -OBSOLETED_BY_CSWphp5-pdomysql = CSWphp5pdomysql - CATALOGNAME_CSWphp5-pdoodbc = php5_pdoodbc SPKG_DESC_CSWphp5-pdoodbc = An ODBC specific database access abstraction module for PHP applications RUNTIME_DEP_PKGS_CSWphp5-pdoodbc = CSWphp5 CSWunixodbc CSWphp5-pdo @@ -298,8 +294,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-pdomysql = .*/lib/php/extensions/.*/pdo_mysql.* - PKGFILES_CSWphp5-pdoodbc = .*/lib/php/extensions/.*/pdo_odbc.* PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_pgsql.* @@ -504,7 +498,6 @@ CHECKPKG_OVERRIDES_CSWphp5-pspell += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-wddx += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-posix += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sqlite += surplus-dependency|CSWphp5 @@ -514,7 +507,6 @@ CHECKPKG_OVERRIDES_CSWphp5-session += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 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 Apr 17 20:36:44 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 18:36:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[14271] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14271 http://gar.svn.sourceforge.net/gar/?rev=14271&view=rev Author: bdwalton Date: 2011-04-17 18:36:43 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut pdoodbc extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:35:29 UTC (rev 14270) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:36:43 UTC (rev 14271) @@ -86,8 +86,9 @@ PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.* $(eval $(call php5_subpackage,pdomysql,CSWmysql5rt CSWzlib CSWphp5-pdo)) CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo +$(eval $(call php5_subpackage,pdoodbc,CSWunixodbc CSWphp5-pdo)) +CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo -PACKAGES += CSWphp5-pdoodbc PACKAGES += CSWphp5-pdopgsql PACKAGES += CSWphp5-pdosqlite PACKAGES += CSWphp5-pgsql @@ -146,11 +147,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-pdoodbc = php5_pdoodbc -SPKG_DESC_CSWphp5-pdoodbc = An ODBC specific database access abstraction module for PHP applications -RUNTIME_DEP_PKGS_CSWphp5-pdoodbc = CSWphp5 CSWunixodbc CSWphp5-pdo -OBSOLETED_BY_CSWphp5-pdoodbc = CSWphp5pdoodbc - CATALOGNAME_CSWphp5-pdopgsql = php5_pdopgsql SPKG_DESC_CSWphp5-pdopgsql = A PgSQL specific database access abstraction module for PHP applications (pdo version) RUNTIME_DEP_PKGS_CSWphp5-pdopgsql = CSWphp5 CSWlibpq CSWphp5-pdo @@ -294,8 +290,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-pdoodbc = .*/lib/php/extensions/.*/pdo_odbc.* - PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_pgsql.* PKGFILES_CSWphp5-pdosqlite = .*/lib/php/extensions/.*/pdo_sqlite.* @@ -487,7 +481,6 @@ CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-dbase += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvmsg += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-readline += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5 @@ -508,7 +501,6 @@ CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo -CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Apr 17 20:39:54 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 18:39:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14272] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14272 http://gar.svn.sourceforge.net/gar/?rev=14272&view=rev Author: bdwalton Date: 2011-04-17 18:39:54 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut pdopgsql extension to new dynamic subpackage generation (add a few pdo_ pkgfiles additions too) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:36:43 UTC (rev 14271) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:39:54 UTC (rev 14272) @@ -85,11 +85,15 @@ $(eval $(call php5_subpackage,pdo)) PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.* $(eval $(call php5_subpackage,pdomysql,CSWmysql5rt CSWzlib CSWphp5-pdo)) +PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_mysql.so CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo $(eval $(call php5_subpackage,pdoodbc,CSWunixodbc CSWphp5-pdo)) +PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_odbc.so CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo +$(eval $(call php5_subpackage,pdopgsql,CSWlibpq CSWphp5-pdo)) +PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_pgsql.so +CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo -PACKAGES += CSWphp5-pdopgsql PACKAGES += CSWphp5-pdosqlite PACKAGES += CSWphp5-pgsql PACKAGES += CSWphp5-posix @@ -147,11 +151,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-pdopgsql = php5_pdopgsql -SPKG_DESC_CSWphp5-pdopgsql = A PgSQL specific database access abstraction module for PHP applications (pdo version) -RUNTIME_DEP_PKGS_CSWphp5-pdopgsql = CSWphp5 CSWlibpq CSWphp5-pdo -OBSOLETED_BY_CSWphp5-pdopgsql = CSWphp5pdopgsql - CATALOGNAME_CSWphp5-pdosqlite = php5_pdosqlite SPKG_DESC_CSWphp5-pdosqlite = A Sqlite specific database access abstraction module for PHP applications (pdo version) RUNTIME_DEP_PKGS_CSWphp5-pdosqlite = CSWphp5 CSWphp5-pdo CSWsqlite3rt @@ -290,8 +289,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_pgsql.* - PKGFILES_CSWphp5-pdosqlite = .*/lib/php/extensions/.*/pdo_sqlite.* PKGFILES_CSWphp5-pgsql = .*/lib/php/extensions/.*/pgsql.* @@ -474,7 +471,6 @@ CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-tidy += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-snmp += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvshm += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlwriter += surplus-dependency|CSWphp5 @@ -500,7 +496,6 @@ CHECKPKG_OVERRIDES_CSWphp5-session += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Apr 17 20:45:26 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 18:45:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[14273] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14273 http://gar.svn.sourceforge.net/gar/?rev=14273&view=rev Author: bdwalton Date: 2011-04-17 18:45:26 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut pdosqlite extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:39:54 UTC (rev 14272) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:45:26 UTC (rev 14273) @@ -93,8 +93,10 @@ $(eval $(call php5_subpackage,pdopgsql,CSWlibpq CSWphp5-pdo)) PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_pgsql.so CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo +$(eval $(call php5_subpackage,pdosqlite,CSWsqlite3rt CSWphp5-pdo)) +PKGFILES_CSWphp5-pdosqlite = .*/lib/php/extensions/.*/pdo_sqlite.so +CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo -PACKAGES += CSWphp5-pdosqlite PACKAGES += CSWphp5-pgsql PACKAGES += CSWphp5-posix PACKAGES += CSWphp5-pspell @@ -151,11 +153,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-pdosqlite = php5_pdosqlite -SPKG_DESC_CSWphp5-pdosqlite = A Sqlite specific database access abstraction module for PHP applications (pdo version) -RUNTIME_DEP_PKGS_CSWphp5-pdosqlite = CSWphp5 CSWphp5-pdo CSWsqlite3rt -OBSOLETED_BY_CSWphp5-pdosqlite = CSWphp5pdosqlite - CATALOGNAME_CSWphp5-pgsql = php5_pgsql SPKG_DESC_CSWphp5-pgsql = The pgsql extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-pgsql = CSWphp5 CSWlibpq @@ -289,8 +286,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-pdosqlite = .*/lib/php/extensions/.*/pdo_sqlite.* - PKGFILES_CSWphp5-pgsql = .*/lib/php/extensions/.*/pgsql.* PKGFILES_CSWphp5-posix = .*/lib/php/extensions/.*/posix.* @@ -479,7 +474,6 @@ CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvmsg += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-readline += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sockets += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-tokenizer += surplus-dependency|CSWphp5 @@ -494,7 +488,6 @@ CHECKPKG_OVERRIDES_CSWphp5-pgsql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-shmop += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-session += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 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 Apr 17 20:47:56 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 18:47:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[14274] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14274 http://gar.svn.sourceforge.net/gar/?rev=14274&view=rev Author: bdwalton Date: 2011-04-17 18:47:56 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut pgsql extension to new dynamic subpackage generation (fix a split in pdoodbc too) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:45:26 UTC (rev 14273) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:47:56 UTC (rev 14274) @@ -88,7 +88,7 @@ PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_mysql.so CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo $(eval $(call php5_subpackage,pdoodbc,CSWunixodbc CSWphp5-pdo)) -PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_odbc.so +PKGFILES_CSWphp5-pdoodbc = .*/lib/php/extensions/.*/pdo_odbc.so CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo $(eval $(call php5_subpackage,pdopgsql,CSWlibpq CSWphp5-pdo)) PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_pgsql.so @@ -96,8 +96,8 @@ $(eval $(call php5_subpackage,pdosqlite,CSWsqlite3rt CSWphp5-pdo)) PKGFILES_CSWphp5-pdosqlite = .*/lib/php/extensions/.*/pdo_sqlite.so CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo +$(eval $(call php5_subpackage,pgsql,CSWlibpq)) -PACKAGES += CSWphp5-pgsql PACKAGES += CSWphp5-posix PACKAGES += CSWphp5-pspell PACKAGES += CSWphp5-readline @@ -153,11 +153,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-pgsql = php5_pgsql -SPKG_DESC_CSWphp5-pgsql = The pgsql extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-pgsql = CSWphp5 CSWlibpq -OBSOLETED_BY_CSWphp5-pgsql = CSWphp5pgsql - CATALOGNAME_CSWphp5-posix = php5_posix SPKG_DESC_CSWphp5-posix = The posix extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-posix = CSWphp5 @@ -286,8 +281,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-pgsql = .*/lib/php/extensions/.*/pgsql.* - PKGFILES_CSWphp5-posix = .*/lib/php/extensions/.*/posix.* PKGFILES_CSWphp5-pspell = .*/lib/php/extensions/.*/pspell.* @@ -485,7 +478,6 @@ CHECKPKG_OVERRIDES_CSWphp5-posix += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sqlite += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlrpc += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-pgsql += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-shmop += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-session += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWphp5 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 Apr 17 20:58:43 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 18:58:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14275] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14275 http://gar.svn.sourceforge.net/gar/?rev=14275&view=rev Author: bdwalton Date: 2011-04-17 18:58:43 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut posix extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:47:56 UTC (rev 14274) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:58:43 UTC (rev 14275) @@ -97,8 +97,8 @@ PKGFILES_CSWphp5-pdosqlite = .*/lib/php/extensions/.*/pdo_sqlite.so CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo $(eval $(call php5_subpackage,pgsql,CSWlibpq)) +$(eval $(call php5_subpackage,posix)) -PACKAGES += CSWphp5-posix PACKAGES += CSWphp5-pspell PACKAGES += CSWphp5-readline PACKAGES += CSWphp5-session @@ -153,11 +153,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-posix = php5_posix -SPKG_DESC_CSWphp5-posix = The posix extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-posix = CSWphp5 -OBSOLETED_BY_CSWphp5-posix = CSWphp5posix - CATALOGNAME_CSWphp5-pspell = php5_pspell SPKG_DESC_CSWphp5-pspell = The pspell extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-pspell = CSWphp5 CSWaspell @@ -281,8 +276,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-posix = .*/lib/php/extensions/.*/posix.* - PKGFILES_CSWphp5-pspell = .*/lib/php/extensions/.*/pspell.* PKGFILES_CSWphp5-readline = .*/lib/php/extensions/.*/readline.* 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 Apr 17 20:59:41 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 18:59:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[14276] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14276 http://gar.svn.sourceforge.net/gar/?rev=14276&view=rev Author: bdwalton Date: 2011-04-17 18:59:41 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut pspell extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:58:43 UTC (rev 14275) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:59:41 UTC (rev 14276) @@ -98,8 +98,8 @@ CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo $(eval $(call php5_subpackage,pgsql,CSWlibpq)) $(eval $(call php5_subpackage,posix)) +$(eval $(call php5_subpackage,pspell,CSWaspell)) -PACKAGES += CSWphp5-pspell PACKAGES += CSWphp5-readline PACKAGES += CSWphp5-session PACKAGES += CSWphp5-shmop @@ -153,11 +153,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-pspell = php5_pspell -SPKG_DESC_CSWphp5-pspell = The pspell extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-pspell = CSWphp5 CSWaspell -OBSOLETED_BY_CSWphp5-pspell = CSWphp5pspell - CATALOGNAME_CSWphp5-readline = php5_readline SPKG_DESC_CSWphp5-readline = The readline extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-readline = CSWphp5 CSWreadline CSWncurses @@ -276,8 +271,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-pspell = .*/lib/php/extensions/.*/pspell.* - PKGFILES_CSWphp5-readline = .*/lib/php/extensions/.*/readline.* PKGFILES_CSWphp5-session = .*/lib/php/extensions/.*/session.* @@ -464,7 +457,6 @@ CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-tokenizer += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-soap += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-pspell += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-wddx += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 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 Apr 17 21:00:43 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:00:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14277] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14277 http://gar.svn.sourceforge.net/gar/?rev=14277&view=rev Author: bdwalton Date: 2011-04-17 19:00:43 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut readline extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 18:59:41 UTC (rev 14276) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:00:43 UTC (rev 14277) @@ -99,8 +99,8 @@ $(eval $(call php5_subpackage,pgsql,CSWlibpq)) $(eval $(call php5_subpackage,posix)) $(eval $(call php5_subpackage,pspell,CSWaspell)) +$(eval $(call php5_subpackage,readline,CSWreadline CSWncurses)) -PACKAGES += CSWphp5-readline PACKAGES += CSWphp5-session PACKAGES += CSWphp5-shmop PACKAGES += CSWphp5-snmp @@ -153,11 +153,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-readline = php5_readline -SPKG_DESC_CSWphp5-readline = The readline extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-readline = CSWphp5 CSWreadline CSWncurses -OBSOLETED_BY_CSWphp5-readline = CSWphp5readline - CATALOGNAME_CSWphp5-session = php5_session SPKG_DESC_CSWphp5-session = The session extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-session = CSWphp5 CSWlibmm @@ -271,8 +266,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-readline = .*/lib/php/extensions/.*/readline.* - PKGFILES_CSWphp5-session = .*/lib/php/extensions/.*/session.* PKGFILES_CSWphp5-session += .*/include/php/ext/session.* @@ -452,7 +445,6 @@ CHECKPKG_OVERRIDES_CSWphp5-dbase += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvmsg += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-readline += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sockets += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-tokenizer += surplus-dependency|CSWphp5 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 Apr 17 21:02:08 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:02:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14278] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14278 http://gar.svn.sourceforge.net/gar/?rev=14278&view=rev Author: bdwalton Date: 2011-04-17 19:02:08 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut session extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:00:43 UTC (rev 14277) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:02:08 UTC (rev 14278) @@ -100,8 +100,9 @@ $(eval $(call php5_subpackage,posix)) $(eval $(call php5_subpackage,pspell,CSWaspell)) $(eval $(call php5_subpackage,readline,CSWreadline CSWncurses)) +$(eval $(call php5_subpackage,session,CSWlibmm)) +PKGFILES_CSWphp5-session += .*/include/php/ext/session.* -PACKAGES += CSWphp5-session PACKAGES += CSWphp5-shmop PACKAGES += CSWphp5-snmp PACKAGES += CSWphp5-soap @@ -153,11 +154,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-session = php5_session -SPKG_DESC_CSWphp5-session = The session extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-session = CSWphp5 CSWlibmm -OBSOLETED_BY_CSWphp5-session = CSWphp5session - CATALOGNAME_CSWphp5-shmop = php5_shmop SPKG_DESC_CSWphp5-shmop = The shmop extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-shmop = CSWphp5 @@ -266,9 +262,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-session = .*/lib/php/extensions/.*/session.* -PKGFILES_CSWphp5-session += .*/include/php/ext/session.* - PKGFILES_CSWphp5-shmop = .*/lib/php/extensions/.*/shmop.* PKGFILES_CSWphp5-snmp = .*/lib/php/extensions/.*/snmp.* @@ -456,7 +449,6 @@ CHECKPKG_OVERRIDES_CSWphp5-sqlite += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlrpc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-shmop += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-session += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 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 Apr 17 21:03:13 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:03:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14279] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14279 http://gar.svn.sourceforge.net/gar/?rev=14279&view=rev Author: bdwalton Date: 2011-04-17 19:03:13 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut shmop extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:02:08 UTC (rev 14278) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:03:13 UTC (rev 14279) @@ -102,8 +102,8 @@ $(eval $(call php5_subpackage,readline,CSWreadline CSWncurses)) $(eval $(call php5_subpackage,session,CSWlibmm)) PKGFILES_CSWphp5-session += .*/include/php/ext/session.* +$(eval $(call php5_subpackage,shmop)) -PACKAGES += CSWphp5-shmop PACKAGES += CSWphp5-snmp PACKAGES += CSWphp5-soap PACKAGES += CSWphp5-sockets @@ -154,11 +154,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-shmop = php5_shmop -SPKG_DESC_CSWphp5-shmop = The shmop extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-shmop = CSWphp5 -OBSOLETED_BY_CSWphp5-shmop = CSWphp5shmop - CATALOGNAME_CSWphp5-snmp = php5_snmp SPKG_DESC_CSWphp5-snmp = The snmp extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-snmp = CSWphp5 CSWnetsnmp @@ -262,8 +257,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-shmop = .*/lib/php/extensions/.*/shmop.* - PKGFILES_CSWphp5-snmp = .*/lib/php/extensions/.*/snmp.* PKGFILES_CSWphp5-soap = .*/lib/php/extensions/.*/soap.* @@ -448,7 +441,6 @@ CHECKPKG_OVERRIDES_CSWphp5-posix += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sqlite += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlrpc += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-shmop += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 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 Apr 17 21:03:51 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:03:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14280] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14280 http://gar.svn.sourceforge.net/gar/?rev=14280&view=rev Author: bdwalton Date: 2011-04-17 19:03:51 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut snmp extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:03:13 UTC (rev 14279) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:03:51 UTC (rev 14280) @@ -103,8 +103,8 @@ $(eval $(call php5_subpackage,session,CSWlibmm)) PKGFILES_CSWphp5-session += .*/include/php/ext/session.* $(eval $(call php5_subpackage,shmop)) +$(eval $(call php5_subpackage,snmp,CSWnetsnmp)) -PACKAGES += CSWphp5-snmp PACKAGES += CSWphp5-soap PACKAGES += CSWphp5-sockets PACKAGES += CSWphp5-sqlite @@ -154,11 +154,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-snmp = php5_snmp -SPKG_DESC_CSWphp5-snmp = The snmp extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-snmp = CSWphp5 CSWnetsnmp -OBSOLETED_BY_CSWphp5-snmp = CSWphp5snmp - CATALOGNAME_CSWphp5-soap = php5_soap SPKG_DESC_CSWphp5-soap = The soap extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-soap = CSWphp5 CSWiconv CSWlibxml2 CSWzlib @@ -257,8 +252,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-snmp = .*/lib/php/extensions/.*/snmp.* - PKGFILES_CSWphp5-soap = .*/lib/php/extensions/.*/soap.* PKGFILES_CSWphp5-sockets = .*/lib/php/extensions/.*/sockets.* @@ -424,7 +417,6 @@ CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-tidy += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-snmp += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvshm += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlwriter += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWphp5 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 Apr 17 21:04:48 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:04:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14281] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14281 http://gar.svn.sourceforge.net/gar/?rev=14281&view=rev Author: bdwalton Date: 2011-04-17 19:04:48 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut soap extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:03:51 UTC (rev 14280) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:04:48 UTC (rev 14281) @@ -104,8 +104,8 @@ PKGFILES_CSWphp5-session += .*/include/php/ext/session.* $(eval $(call php5_subpackage,shmop)) $(eval $(call php5_subpackage,snmp,CSWnetsnmp)) +$(eval $(call php5_subpackage,soap,CSWiconv CSWlibxml2 CSWzlib)) -PACKAGES += CSWphp5-soap PACKAGES += CSWphp5-sockets PACKAGES += CSWphp5-sqlite PACKAGES += CSWphp5-sysvmsg @@ -154,11 +154,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-soap = php5_soap -SPKG_DESC_CSWphp5-soap = The soap extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-soap = CSWphp5 CSWiconv CSWlibxml2 CSWzlib -OBSOLETED_BY_CSWphp5-soap = CSWphp5soap - CATALOGNAME_CSWphp5-sockets = php5_sockets SPKG_DESC_CSWphp5-sockets = The sockets extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-sockets = CSWphp5 @@ -252,8 +247,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-soap = .*/lib/php/extensions/.*/soap.* - PKGFILES_CSWphp5-sockets = .*/lib/php/extensions/.*/sockets.* PKGFILES_CSWphp5-sqlite = .*/lib/php/extensions/.*/sqlite.* @@ -426,7 +419,6 @@ CHECKPKG_OVERRIDES_CSWphp5-sockets += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-tokenizer += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-soap += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-wddx += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 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 Apr 17 21:06:33 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:06:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14282] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14282 http://gar.svn.sourceforge.net/gar/?rev=14282&view=rev Author: bdwalton Date: 2011-04-17 19:06:33 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut sockets extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:04:48 UTC (rev 14281) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:06:33 UTC (rev 14282) @@ -105,8 +105,8 @@ $(eval $(call php5_subpackage,shmop)) $(eval $(call php5_subpackage,snmp,CSWnetsnmp)) $(eval $(call php5_subpackage,soap,CSWiconv CSWlibxml2 CSWzlib)) +$(eval $(call php5_subpackage,sockets)) -PACKAGES += CSWphp5-sockets PACKAGES += CSWphp5-sqlite PACKAGES += CSWphp5-sysvmsg PACKAGES += CSWphp5-sysvsem @@ -154,11 +154,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-sockets = php5_sockets -SPKG_DESC_CSWphp5-sockets = The sockets extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-sockets = CSWphp5 -OBSOLETED_BY_CSWphp5-sockets = CSWphp5sockets - CATALOGNAME_CSWphp5-sqlite = php5_sqlite SPKG_DESC_CSWphp5-sqlite = The sqlite extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-sqlite = CSWphp5 CSWsqlite @@ -247,8 +242,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-sockets = .*/lib/php/extensions/.*/sockets.* - PKGFILES_CSWphp5-sqlite = .*/lib/php/extensions/.*/sqlite.* PKGFILES_CSWphp5-sqlite += .*/include/php/ext/sqlite.* @@ -416,7 +409,6 @@ CHECKPKG_OVERRIDES_CSWphp5-dbase += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvmsg += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-sockets += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-tokenizer += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-wddx += surplus-dependency|CSWphp5 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 Apr 17 21:12:19 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:12:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[14283] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14283 http://gar.svn.sourceforge.net/gar/?rev=14283&view=rev Author: bdwalton Date: 2011-04-17 19:12:19 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut sqlite extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:06:33 UTC (rev 14282) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:12:19 UTC (rev 14283) @@ -106,8 +106,9 @@ $(eval $(call php5_subpackage,snmp,CSWnetsnmp)) $(eval $(call php5_subpackage,soap,CSWiconv CSWlibxml2 CSWzlib)) $(eval $(call php5_subpackage,sockets)) +$(eval $(call php5_subpackage,sqlite,CSWsqlite)) +PKGFILES_CSWphp5-sqlite += .*/include/php/ext/sqlite.* -PACKAGES += CSWphp5-sqlite PACKAGES += CSWphp5-sysvmsg PACKAGES += CSWphp5-sysvsem PACKAGES += CSWphp5-sysvshm @@ -154,11 +155,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-sqlite = php5_sqlite -SPKG_DESC_CSWphp5-sqlite = The sqlite extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-sqlite = CSWphp5 CSWsqlite -OBSOLETED_BY_CSWphp5-sqlite = CSWphp5sqlite - CATALOGNAME_CSWphp5-sysvmsg = php5_sysvmsg SPKG_DESC_CSWphp5-sysvmsg = The sysvmsg extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-sysvmsg = CSWphp5 @@ -242,9 +238,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-sqlite = .*/lib/php/extensions/.*/sqlite.* -PKGFILES_CSWphp5-sqlite += .*/include/php/ext/sqlite.* - PKGFILES_CSWphp5-sysvmsg = .*/lib/php/extensions/.*/sysvmsg.* PKGFILES_CSWphp5-sysvsem = .*/lib/php/extensions/.*/sysvsem.* @@ -415,7 +408,6 @@ CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-posix += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-sqlite += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlrpc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 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 Apr 17 21:13:06 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:13:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14284] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14284 http://gar.svn.sourceforge.net/gar/?rev=14284&view=rev Author: bdwalton Date: 2011-04-17 19:13:06 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut sysvmsg extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:12:19 UTC (rev 14283) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:13:06 UTC (rev 14284) @@ -108,8 +108,8 @@ $(eval $(call php5_subpackage,sockets)) $(eval $(call php5_subpackage,sqlite,CSWsqlite)) PKGFILES_CSWphp5-sqlite += .*/include/php/ext/sqlite.* +$(eval $(call php5_subpackage,sysvmsg)) -PACKAGES += CSWphp5-sysvmsg PACKAGES += CSWphp5-sysvsem PACKAGES += CSWphp5-sysvshm PACKAGES += CSWphp5-tidy @@ -155,11 +155,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-sysvmsg = php5_sysvmsg -SPKG_DESC_CSWphp5-sysvmsg = The sysvmsg extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-sysvmsg = CSWphp5 -OBSOLETED_BY_CSWphp5-sysvmsg = CSWphp5sysvmsg - CATALOGNAME_CSWphp5-sysvsem = php5_sysvsem SPKG_DESC_CSWphp5-sysvsem = The sysvsem extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-sysvsem = CSWphp5 @@ -238,8 +233,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-sysvmsg = .*/lib/php/extensions/.*/sysvmsg.* - PKGFILES_CSWphp5-sysvsem = .*/lib/php/extensions/.*/sysvsem.* PKGFILES_CSWphp5-sysvshm = .*/lib/php/extensions/.*/sysvshm.* @@ -401,7 +394,6 @@ CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-dbase += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-sysvmsg += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-tokenizer += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-wddx += surplus-dependency|CSWphp5 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 Apr 17 21:13:51 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:13:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14285] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14285 http://gar.svn.sourceforge.net/gar/?rev=14285&view=rev Author: bdwalton Date: 2011-04-17 19:13:51 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut sysvsem extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:13:06 UTC (rev 14284) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:13:51 UTC (rev 14285) @@ -109,8 +109,8 @@ $(eval $(call php5_subpackage,sqlite,CSWsqlite)) PKGFILES_CSWphp5-sqlite += .*/include/php/ext/sqlite.* $(eval $(call php5_subpackage,sysvmsg)) +$(eval $(call php5_subpackage,sysvsem)) -PACKAGES += CSWphp5-sysvsem PACKAGES += CSWphp5-sysvshm PACKAGES += CSWphp5-tidy PACKAGES += CSWphp5-tokenizer @@ -155,11 +155,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-sysvsem = php5_sysvsem -SPKG_DESC_CSWphp5-sysvsem = The sysvsem extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-sysvsem = CSWphp5 -OBSOLETED_BY_CSWphp5-sysvsem = CSWphp5sysvsem - CATALOGNAME_CSWphp5-sysvshm = php5_sysvshm SPKG_DESC_CSWphp5-sysvshm = The sysvshm extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-sysvshm = CSWphp5 @@ -233,8 +228,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-sysvsem = .*/lib/php/extensions/.*/sysvsem.* - PKGFILES_CSWphp5-sysvshm = .*/lib/php/extensions/.*/sysvshm.* PKGFILES_CSWphp5-tidy = .*/lib/php/extensions/.*/tidy.* @@ -401,7 +394,6 @@ CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-posix += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlrpc += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Apr 17 21:14:49 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:14:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14286] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14286 http://gar.svn.sourceforge.net/gar/?rev=14286&view=rev Author: bdwalton Date: 2011-04-17 19:14:49 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut sysvshm extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:13:51 UTC (rev 14285) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:14:49 UTC (rev 14286) @@ -110,8 +110,8 @@ PKGFILES_CSWphp5-sqlite += .*/include/php/ext/sqlite.* $(eval $(call php5_subpackage,sysvmsg)) $(eval $(call php5_subpackage,sysvsem)) +$(eval $(call php5_subpackage,sysvshm)) -PACKAGES += CSWphp5-sysvshm PACKAGES += CSWphp5-tidy PACKAGES += CSWphp5-tokenizer PACKAGES += CSWphp5-wddx @@ -155,11 +155,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-sysvshm = php5_sysvshm -SPKG_DESC_CSWphp5-sysvshm = The sysvshm extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-sysvshm = CSWphp5 -OBSOLETED_BY_CSWphp5-sysvshm = CSWphp5sysvshm - CATALOGNAME_CSWphp5-tidy = php5_tidy SPKG_DESC_CSWphp5-tidy = The tidy extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-tidy = CSWphp5 CSWhtmltidy @@ -228,8 +223,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-sysvshm = .*/lib/php/extensions/.*/sysvshm.* - PKGFILES_CSWphp5-tidy = .*/lib/php/extensions/.*/tidy.* PKGFILES_CSWphp5-tokenizer = .*/lib/php/extensions/.*/tokenizer.* @@ -382,7 +375,6 @@ CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-tidy += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-sysvshm += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlwriter += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-dbase += surplus-dependency|CSWphp5 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 Apr 17 21:15:49 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:15:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14287] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14287 http://gar.svn.sourceforge.net/gar/?rev=14287&view=rev Author: bdwalton Date: 2011-04-17 19:15:49 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut tidy extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:14:49 UTC (rev 14286) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:15:49 UTC (rev 14287) @@ -111,8 +111,8 @@ $(eval $(call php5_subpackage,sysvmsg)) $(eval $(call php5_subpackage,sysvsem)) $(eval $(call php5_subpackage,sysvshm)) +$(eval $(call php5_subpackage,tidy,CSWhtmltidy)) -PACKAGES += CSWphp5-tidy PACKAGES += CSWphp5-tokenizer PACKAGES += CSWphp5-wddx PACKAGES += CSWphp5-xmlreader @@ -155,11 +155,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-tidy = php5_tidy -SPKG_DESC_CSWphp5-tidy = The tidy extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-tidy = CSWphp5 CSWhtmltidy -OBSOLETED_BY_CSWphp5-tidy = CSWphp5tidy - CATALOGNAME_CSWphp5-tokenizer = php5_tokenizer SPKG_DESC_CSWphp5-tokenizer = The tokenizer extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-tokenizer = CSWphp5 @@ -223,8 +218,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-tidy = .*/lib/php/extensions/.*/tidy.* - PKGFILES_CSWphp5-tokenizer = .*/lib/php/extensions/.*/tokenizer.* PKGFILES_CSWphp5-wddx = .*/lib/php/extensions/.*/wddx.* @@ -374,7 +367,6 @@ #ENABLE_CHECK = 0 CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-tidy += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlwriter += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-dbase += surplus-dependency|CSWphp5 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 Apr 17 21:16:59 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:16:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[14288] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14288 http://gar.svn.sourceforge.net/gar/?rev=14288&view=rev Author: bdwalton Date: 2011-04-17 19:16:59 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: drop leftover cruft from dbase package (now deprecated) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:15:49 UTC (rev 14287) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:16:59 UTC (rev 14288) @@ -212,8 +212,6 @@ PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* -PKGFILES_CSWphp5-dbase = .*/lib/php/extensions/.*/dbase.* - PKGFILES_CSWphp5-mimemagic = .*/lib/php/extensions/.*/mime_magic.* PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* @@ -369,7 +367,6 @@ CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlwriter += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-dbase += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-tokenizer += surplus-dependency|CSWphp5 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 Apr 17 21:17:25 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:17:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14289] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14289 http://gar.svn.sourceforge.net/gar/?rev=14289&view=rev Author: bdwalton Date: 2011-04-17 19:17:25 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: drop leftover cruft from posix package Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:16:59 UTC (rev 14288) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:17:25 UTC (rev 14289) @@ -373,7 +373,6 @@ CHECKPKG_OVERRIDES_CSWphp5-wddx += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-posix += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlrpc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 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 Apr 17 21:18:22 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:18:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14290] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14290 http://gar.svn.sourceforge.net/gar/?rev=14290&view=rev Author: bdwalton Date: 2011-04-17 19:18:21 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut tokenizer extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:17:25 UTC (rev 14289) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:18:21 UTC (rev 14290) @@ -112,8 +112,8 @@ $(eval $(call php5_subpackage,sysvsem)) $(eval $(call php5_subpackage,sysvshm)) $(eval $(call php5_subpackage,tidy,CSWhtmltidy)) +$(eval $(call php5_subpackage,tokenizer)) -PACKAGES += CSWphp5-tokenizer PACKAGES += CSWphp5-wddx PACKAGES += CSWphp5-xmlreader PACKAGES += CSWphp5-xmlrpc @@ -155,11 +155,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-tokenizer = php5_tokenizer -SPKG_DESC_CSWphp5-tokenizer = The tokenizer extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-tokenizer = CSWphp5 -OBSOLETED_BY_CSWphp5-tokenizer = CSWphp5tokenizer - CATALOGNAME_CSWphp5-wddx = php5_wddx SPKG_DESC_CSWphp5-wddx = The wddx extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-wddx = CSWphp5 @@ -216,8 +211,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-tokenizer = .*/lib/php/extensions/.*/tokenizer.* - PKGFILES_CSWphp5-wddx = .*/lib/php/extensions/.*/wddx.* PKGFILES_CSWphp5-xmlreader = .*/lib/php/extensions/.*/xmlreader.* @@ -369,7 +362,6 @@ CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-tokenizer += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-wddx += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 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 Apr 17 21:19:08 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:19:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14291] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14291 http://gar.svn.sourceforge.net/gar/?rev=14291&view=rev Author: bdwalton Date: 2011-04-17 19:19:08 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut wddx extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:18:21 UTC (rev 14290) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:19:08 UTC (rev 14291) @@ -113,8 +113,8 @@ $(eval $(call php5_subpackage,sysvshm)) $(eval $(call php5_subpackage,tidy,CSWhtmltidy)) $(eval $(call php5_subpackage,tokenizer)) +$(eval $(call php5_subpackage,wddx)) -PACKAGES += CSWphp5-wddx PACKAGES += CSWphp5-xmlreader PACKAGES += CSWphp5-xmlrpc PACKAGES += CSWphp5-xmlwriter @@ -155,11 +155,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-wddx = php5_wddx -SPKG_DESC_CSWphp5-wddx = The wddx extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-wddx = CSWphp5 -OBSOLETED_BY_CSWphp5-wddx = CSWphp5wddx - CATALOGNAME_CSWphp5-xmlreader = php5_xmlreader SPKG_DESC_CSWphp5-xmlreader = The xmlreader extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-xmlreader = CSWphp5 CSWiconv CSWlibxml2 CSWzlib @@ -211,8 +206,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-wddx = .*/lib/php/extensions/.*/wddx.* - PKGFILES_CSWphp5-xmlreader = .*/lib/php/extensions/.*/xmlreader.* PKGFILES_CSWphp5-xmlrpc = .*/lib/php/extensions/.*/xmlrpc.* @@ -362,7 +355,6 @@ CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-wddx += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlrpc += surplus-dependency|CSWphp5 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 Apr 17 21:29:00 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:29:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14292] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14292 http://gar.svn.sourceforge.net/gar/?rev=14292&view=rev Author: bdwalton Date: 2011-04-17 19:29:00 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut xmlreader extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:19:08 UTC (rev 14291) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:29:00 UTC (rev 14292) @@ -114,8 +114,8 @@ $(eval $(call php5_subpackage,tidy,CSWhtmltidy)) $(eval $(call php5_subpackage,tokenizer)) $(eval $(call php5_subpackage,wddx)) +$(eval $(call php5_subpackage,xmlreader,CSWiconv CSWlibxml2 CSWzlib)) -PACKAGES += CSWphp5-xmlreader PACKAGES += CSWphp5-xmlrpc PACKAGES += CSWphp5-xmlwriter PACKAGES += CSWphp5-xsl @@ -155,11 +155,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-xmlreader = php5_xmlreader -SPKG_DESC_CSWphp5-xmlreader = The xmlreader extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-xmlreader = CSWphp5 CSWiconv CSWlibxml2 CSWzlib -OBSOLETED_BY_CSWphp5-xmlreader = CSWphp5xmlreader - CATALOGNAME_CSWphp5-xmlrpc = php5_xmlrpc SPKG_DESC_CSWphp5-xmlrpc = The xmlrpc extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-xmlrpc = CSWphp5 CSWiconv CSWexpat @@ -206,8 +201,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-xmlreader = .*/lib/php/extensions/.*/xmlreader.* - PKGFILES_CSWphp5-xmlrpc = .*/lib/php/extensions/.*/xmlrpc.* PKGFILES_CSWphp5-xmlwriter = .*/lib/php/extensions/.*/xmlwriter.* @@ -352,7 +345,6 @@ CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xmlwriter += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 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 Apr 17 21:30:11 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:30:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[14293] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14293 http://gar.svn.sourceforge.net/gar/?rev=14293&view=rev Author: bdwalton Date: 2011-04-17 19:30:11 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut xmlrpc extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:29:00 UTC (rev 14292) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:30:11 UTC (rev 14293) @@ -115,8 +115,8 @@ $(eval $(call php5_subpackage,tokenizer)) $(eval $(call php5_subpackage,wddx)) $(eval $(call php5_subpackage,xmlreader,CSWiconv CSWlibxml2 CSWzlib)) +$(eval $(call php5_subpackage,xmlrpc,CSWiconv CSWexpat)) -PACKAGES += CSWphp5-xmlrpc PACKAGES += CSWphp5-xmlwriter PACKAGES += CSWphp5-xsl PACKAGES += CSWphp5-zip @@ -155,11 +155,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-xmlrpc = php5_xmlrpc -SPKG_DESC_CSWphp5-xmlrpc = The xmlrpc extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-xmlrpc = CSWphp5 CSWiconv CSWexpat -OBSOLETED_BY_CSWphp5-xmlrpc = CSWphp5xmlrpc - CATALOGNAME_CSWphp5-xmlwriter = php5_xmlwriter SPKG_DESC_CSWphp5-xmlwriter = The xmlwriter extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-xmlwriter = CSWphp5 CSWiconv CSWlibxml2 CSWzlib @@ -201,8 +196,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-xmlrpc = .*/lib/php/extensions/.*/xmlrpc.* - PKGFILES_CSWphp5-xmlwriter = .*/lib/php/extensions/.*/xmlwriter.* PKGFILES_CSWphp5-xsl = .*/lib/php/extensions/.*/xsl.* @@ -349,7 +342,6 @@ CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-xmlrpc += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Apr 17 21:33:11 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 19:33:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[14294] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14294 http://gar.svn.sourceforge.net/gar/?rev=14294&view=rev Author: bdwalton Date: 2011-04-17 19:33:11 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut xmlwriter extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:30:11 UTC (rev 14293) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:33:11 UTC (rev 14294) @@ -116,8 +116,8 @@ $(eval $(call php5_subpackage,wddx)) $(eval $(call php5_subpackage,xmlreader,CSWiconv CSWlibxml2 CSWzlib)) $(eval $(call php5_subpackage,xmlrpc,CSWiconv CSWexpat)) +$(eval $(call php5_subpackage,xmlwriter,CSWiconv CSWlibxml2 CSWzlib)) -PACKAGES += CSWphp5-xmlwriter PACKAGES += CSWphp5-xsl PACKAGES += CSWphp5-zip @@ -155,11 +155,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-xmlwriter = php5_xmlwriter -SPKG_DESC_CSWphp5-xmlwriter = The xmlwriter extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-xmlwriter = CSWphp5 CSWiconv CSWlibxml2 CSWzlib -OBSOLETED_BY_CSWphp5-xmlwriter = CSWphp5xmlwriter - CATALOGNAME_CSWphp5-xsl = php5_xsl SPKG_DESC_CSWphp5-xsl = The xsl extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-xsl = CSWphp5 CSWiconv CSWlibxml2 @@ -196,8 +191,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-xmlwriter = .*/lib/php/extensions/.*/xmlwriter.* - PKGFILES_CSWphp5-xsl = .*/lib/php/extensions/.*/xsl.* PKGFILES_CSWphp5-zip = .*/lib/php/extensions/.*/zip.* @@ -337,7 +330,6 @@ #ENABLE_CHECK = 0 CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-xmlwriter += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 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 Apr 17 22:51:47 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 20:51:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14295] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14295 http://gar.svn.sourceforge.net/gar/?rev=14295&view=rev Author: bdwalton Date: 2011-04-17 20:51:47 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut xsl extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 19:33:11 UTC (rev 14294) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 20:51:47 UTC (rev 14295) @@ -117,8 +117,8 @@ $(eval $(call php5_subpackage,xmlreader,CSWiconv CSWlibxml2 CSWzlib)) $(eval $(call php5_subpackage,xmlrpc,CSWiconv CSWexpat)) $(eval $(call php5_subpackage,xmlwriter,CSWiconv CSWlibxml2 CSWzlib)) +$(eval $(call php5_subpackage,xsl,CSWiconv CSWlibxml2 CSWlibxslt CSWzlib)) -PACKAGES += CSWphp5-xsl PACKAGES += CSWphp5-zip BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils @@ -155,12 +155,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-xsl = php5_xsl -SPKG_DESC_CSWphp5-xsl = The xsl extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-xsl = CSWphp5 CSWiconv CSWlibxml2 -RUNTIME_DEP_PKGS_CSWphp5-xsl += CSWlibxslt CSWzlib -OBSOLETED_BY_CSWphp5-xsl = CSWphp5xsl - CATALOGNAME_CSWphp5-zip = php5_zip SPKG_DESC_CSWphp5-zip = The zip extension for PHP5 RUNTIME_DEP_PKGS_CSWphp5-zip = CSWphp5 CSWzlib @@ -191,8 +185,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-xsl = .*/lib/php/extensions/.*/xsl.* - PKGFILES_CSWphp5-zip = .*/lib/php/extensions/.*/zip.* # PATCHFILES += configure.diff @@ -330,7 +322,6 @@ #ENABLE_CHECK = 0 CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 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 Apr 17 22:53:28 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 20:53:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[14296] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14296 http://gar.svn.sourceforge.net/gar/?rev=14296&view=rev Author: bdwalton Date: 2011-04-17 20:53:28 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: cut zip extension to new dynamic subpackage generation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 20:51:47 UTC (rev 14295) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 20:53:28 UTC (rev 14296) @@ -118,9 +118,8 @@ $(eval $(call php5_subpackage,xmlrpc,CSWiconv CSWexpat)) $(eval $(call php5_subpackage,xmlwriter,CSWiconv CSWlibxml2 CSWzlib)) $(eval $(call php5_subpackage,xsl,CSWiconv CSWlibxml2 CSWlibxslt CSWzlib)) +$(eval $(call php5_subpackage,zip,CSWzlib)) -PACKAGES += CSWphp5-zip - BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils CATALOGNAME_CSWphp5 = php5 @@ -155,11 +154,6 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 -CATALOGNAME_CSWphp5-zip = php5_zip -SPKG_DESC_CSWphp5-zip = The zip extension for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-zip = CSWphp5 CSWzlib -OBSOLETED_BY_CSWphp5-zip = CSWphp5zip - PKGFILES_CSWphp5-dev = $(bindir)/php-config PKGFILES_CSWphp5-dev += $(bindir)/phpize PKGFILES_CSWphp5-dev += $(bindir)/peardev @@ -185,8 +179,6 @@ PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* -PKGFILES_CSWphp5-zip = .*/lib/php/extensions/.*/zip.* - # PATCHFILES += configure.diff # PATCHFILES += odbc.diff # PATCHFILES += pdopgsql.diff @@ -323,7 +315,6 @@ CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-zip += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 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 Apr 17 22:54:18 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 20:54:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14297] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14297 http://gar.svn.sourceforge.net/gar/?rev=14297&view=rev Author: bdwalton Date: 2011-04-17 20:54:18 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: clean cruft from legacy ncurses and mimemagic packages Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 20:53:28 UTC (rev 14296) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 20:54:18 UTC (rev 14297) @@ -175,10 +175,6 @@ PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* -PKGFILES_CSWphp5-mimemagic = .*/lib/php/extensions/.*/mime_magic.* - -PKGFILES_CSWphp5-ncurses = .*/lib/php/extensions/.*/ncurses.* - # PATCHFILES += configure.diff # PATCHFILES += odbc.diff # PATCHFILES += pdopgsql.diff @@ -314,8 +310,6 @@ #ENABLE_CHECK = 0 CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-ncurses += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphp5-mimemagic += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Apr 17 22:55:06 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 20:55:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14298] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14298 http://gar.svn.sourceforge.net/gar/?rev=14298&view=rev Author: bdwalton Date: 2011-04-17 20:55:06 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: fix indentation of the BLURB to make it readable Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 20:54:18 UTC (rev 14297) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 20:55:06 UTC (rev 14298) @@ -6,16 +6,16 @@ DESCRIPTION = A high-level scripting language. define BLURB - PHP is a widely-used Open Source general-purpose scripting language that is - especially suited for Web development and can be embedded into HTML. Its - syntax draws upon C, Java, and Perl, and is easy to learn. PHP runs on many - different platforms and can be used as a standalone executable or as a - module under a variety of Web servers. It has excellent support for - databases, XML, LDAP, IMAP, Java, various Internet protocols, and general - data manipulation, and is extensible via its powerful API. It is actively - developed and supported by a talented and energetic international team. - Numerous Open Source and commercial PHP-based application packages are - available. +PHP is a widely-used Open Source general-purpose scripting language that is +especially suited for Web development and can be embedded into HTML. Its +syntax draws upon C, Java, and Perl, and is easy to learn. PHP runs on many +different platforms and can be used as a standalone executable or as a +module under a variety of Web servers. It has excellent support for +databases, XML, LDAP, IMAP, Java, various Internet protocols, and general +data manipulation, and is extensible via its powerful API. It is actively +developed and supported by a talented and energetic international team. +Numerous Open Source and commercial PHP-based application packages are +available. endef # turn on the build scripts to enable/disable modules 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 Apr 17 22:58:14 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 20:58:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14299] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14299 http://gar.svn.sourceforge.net/gar/?rev=14299&view=rev Author: bdwalton Date: 2011-04-17 20:58:14 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: re-org to make per-package statements proximate within the recipe Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 20:55:06 UTC (rev 14298) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 20:58:14 UTC (rev 14299) @@ -27,7 +27,6 @@ VENDOR_URL = http://www.php.net/ MASTER_SITES = http://us.php.net/distributions/ INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -#STRIP_DIRS := $(shell $(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)/*/ LICENSE = LICENSE @@ -49,8 +48,58 @@ CHECKPKG_OVERRIDES_CSWphp5-$(1) += surplus-dependency|CSWphp5 endef -PACKAGES = CSWphp5 CSWphp5-dev +PACKAGES = CSWphp5 +CATALOGNAME_CSWphp5 = php5 +SPKG_DESC_CSWphp5 = A High-Level Scripting Language +RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2 CSWiconv CSWexpat CSWzlib +INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase +INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5 +# embeded 'magic' information to detect file types...odd, but... +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/libtool.m4 +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4 +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4 +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/PEAR/Config.php +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1 +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php-cgi +# verify these... +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php.ini.CSW + + +PACKAGES += CSWphp5-dev +CATALOGNAME_CSWphp5-dev = php5_dev +SPKG_DESC_CSWphp5-dev = Development files for php5 +RUNTIME_DEP_PKGS_CSWphp5-dev = CSWphp5 +OBSOLETED_BY_CSWphp5-dev = CSWphp5devel +PKGFILES_CSWphp5-dev = $(bindir)/php-config +PKGFILES_CSWphp5-dev += $(bindir)/phpize +PKGFILES_CSWphp5-dev += $(bindir)/peardev +PKGFILES_CSWphp5-dev += $(libdir)/php/build/.* +PKGFILES_CSWphp5-dev += $(includedir)/php/TSRM.* +PKGFILES_CSWphp5-dev += $(includedir)/php/Zend.* +PKGFILES_CSWphp5-dev += $(includedir)/php/include.* +PKGFILES_CSWphp5-dev += $(includedir)/php/main.* +PKGFILES_CSWphp5-dev += $(includedir)/php/regex.* +PKGFILES_CSWphp5-dev += $(includedir)/php/ext/date.* +PKGFILES_CSWphp5-dev += $(includedir)/php/ext/filter.* +PKGFILES_CSWphp5-dev += $(includedir)/php/ext/libxml.* +PKGFILES_CSWphp5-dev += $(includedir)/php/ext/pcre.* +PKGFILES_CSWphp5-dev += $(includedir)/php/ext/spl.* +PKGFILES_CSWphp5-dev += $(includedir)/php/ext/standard.* +PKGFILES_CSWphp5-dev += $(includedir)/php/ext/xml.* +PKGFILES_CSWphp5-dev += $(mandir)/man1/php-config.1 +PKGFILES_CSWphp5-dev += $(mandir)/man1/phpize.1 +CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 + PACKAGES += CSWap2-modphp5 +CATALOGNAME_CSWap2-modphp5 = ap2_modphp5 +SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module +RUNTIME_DEP_PKGS_CSWap2-modphp5 = CSWphp5 CSWapache2 CSWlibxml2 CSWiconv +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib +OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 +PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* +CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 $(eval $(call php5_subpackage,bcmath)) $(eval $(call php5_subpackage,bz2,CSWbzip2)) @@ -122,59 +171,8 @@ BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils -CATALOGNAME_CSWphp5 = php5 -SPKG_DESC_CSWphp5 = A High-Level Scripting Language -RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2 CSWiconv CSWexpat CSWzlib -INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase -INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5 - -# embeded 'magic' information to detect file types...odd, but... -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/libtool.m4 -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4 -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4 -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/PEAR/Config.php -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1 -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php-cgi -# verify these... -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php.ini.CSW - - # end verify... -CATALOGNAME_CSWphp5-dev = php5_dev -SPKG_DESC_CSWphp5-dev = Development files for php5 -RUNTIME_DEP_PKGS_CSWphp5-dev = CSWphp5 -OBSOLETED_BY_CSWphp5-dev = CSWphp5devel - -CATALOGNAME_CSWap2-modphp5 = ap2_modphp5 -SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module -RUNTIME_DEP_PKGS_CSWap2-modphp5 = CSWphp5 CSWapache2 CSWlibxml2 CSWiconv -RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib -OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 - -PKGFILES_CSWphp5-dev = $(bindir)/php-config -PKGFILES_CSWphp5-dev += $(bindir)/phpize -PKGFILES_CSWphp5-dev += $(bindir)/peardev -PKGFILES_CSWphp5-dev += $(libdir)/php/build/.* -PKGFILES_CSWphp5-dev += $(includedir)/php/TSRM.* -PKGFILES_CSWphp5-dev += $(includedir)/php/Zend.* -PKGFILES_CSWphp5-dev += $(includedir)/php/include.* -PKGFILES_CSWphp5-dev += $(includedir)/php/main.* -PKGFILES_CSWphp5-dev += $(includedir)/php/regex.* -PKGFILES_CSWphp5-dev += $(includedir)/php/ext/date.* -PKGFILES_CSWphp5-dev += $(includedir)/php/ext/filter.* -PKGFILES_CSWphp5-dev += $(includedir)/php/ext/libxml.* -PKGFILES_CSWphp5-dev += $(includedir)/php/ext/pcre.* -PKGFILES_CSWphp5-dev += $(includedir)/php/ext/spl.* -PKGFILES_CSWphp5-dev += $(includedir)/php/ext/standard.* -PKGFILES_CSWphp5-dev += $(includedir)/php/ext/xml.* -PKGFILES_CSWphp5-dev += $(mandir)/man1/php-config.1 -PKGFILES_CSWphp5-dev += $(mandir)/man1/phpize.1 - -PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* - # PATCHFILES += configure.diff # PATCHFILES += odbc.diff # PATCHFILES += pdopgsql.diff @@ -309,9 +307,6 @@ SKIPTEST = 1 #ENABLE_CHECK = 0 -CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 - include gar/category.mk # this allows apxs to install the module. stupid, but i couldn't make 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 Apr 17 22:59:08 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 20:59:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14300] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14300 http://gar.svn.sourceforge.net/gar/?rev=14300&view=rev Author: bdwalton Date: 2011-04-17 20:59:07 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: clean up more commented legacy stuff Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 20:58:14 UTC (rev 14299) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 20:59:07 UTC (rev 14300) @@ -171,29 +171,8 @@ BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils -# end verify... - -# PATCHFILES += configure.diff -# PATCHFILES += odbc.diff -# PATCHFILES += pdopgsql.diff -# PATCHFILES += pgsql.diff - -# PHP Extensions, currently deactivated -# -# GAR needs performance enhancements to handle an integrated build with -# all the extensions otherwise the build takes ages. -# 1) File downloads are triggered via gmake invocations -> s l o w !! -# 2) Unless gmake is called -r there are heaps of implicit rule searches -# for the included Makefiles (gmake tries to remake them) -# 3) ... TBD, probably more -# -EXTENSION_MAKEFILES := $(wildcard extensions/*/Makefile) -#include $(EXTENSION_MAKEFILES) - EXTRA_CFLAGS = -I$(prefix)/include/ncursesw -#LIBS += -lrt -lintl - NOISALIST = 1 STRIP_LIBTOOL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Apr 17 23:10:47 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 17 Apr 2011 22:10:47 +0100 Subject: [csw-devel] SF.net SVN: gar:[14300] csw/mgar/pkg/php5/trunk/Makefile In-Reply-To: References: Message-ID: Reading this series of patches I'm starting to think whether it actually makes sense for every of these changes to be a separate commit. The choice of what constitutes a change that's worth having as a separate commit is to some extent arbitrary. I guess there can be two main factors to consider: - what chunks of code do you want the reviewers to read - what changes you might want to revert if necessary As far as code reviewing is concerned, syntax changes of multiple subpackages don't really constitute separate items of interest. Maciej From bdwalton at users.sourceforge.net Sun Apr 17 23:19:01 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 21:19:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14301] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14301 http://gar.svn.sourceforge.net/gar/?rev=14301&view=rev Author: bdwalton Date: 2011-04-17 21:19:01 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: give build dep list more prominence in the recipe; expand it to be (hopefully) complete Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 20:59:07 UTC (rev 14300) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 21:19:01 UTC (rev 14301) @@ -38,6 +38,19 @@ # this one is filed upstream: http://bugs.php.net/bug.php?id=54318 PATCHFILES += 0002-Correct-non-portable-use-of-grep-q-in-configure.patch +BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils +BUILD_DEP_PKGS += CSWlibxml2-dev CSWexpat CSWzlib CSWcurldevel CSWjpeg +BUILD_DEP_PKGS += CSWpng CSWt1lib CSWxpm CSWlibgdbm-dev CSWlibgmp +BUILD_DEP_PKGS += CSWggettext-dev CSWossldevel CSWlibgd2 CSWbdb42devel +BUILD_DEP_PKGS += CSWlibcares-dev CSWftype2 CSWiconv CSWimap-devel +BUILD_DEP_PKGS += CSWoldapdevel CSWkrb5libdev CSWsasl CSWlibtdl7 +BUILD_DEP_PKGS += CSWlibmcrypt CSWfreetds CSWmysql5devel CSWunixodbc +BUILD_DEP_PKGS += CSWlibpq CSWreadline CSWncurses CSWnetsnmp +BUILD_DEP_PKGS += CSWsqlite3devel CSWaspell CSWhtmltidy +# NOTE: I think this is a leftover bug. we shouldn't depend on two versions +# of sqlite... +BUILD_DEP_PKGS += CSWsqlite + define php5_subpackage PACKAGES += CSWphp5-$(1) CATALOGNAME_CSWphp5-$(1) ?= php5_$(1) @@ -169,8 +182,6 @@ $(eval $(call php5_subpackage,xsl,CSWiconv CSWlibxml2 CSWlibxslt CSWzlib)) $(eval $(call php5_subpackage,zip,CSWzlib)) -BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils - EXTRA_CFLAGS = -I$(prefix)/include/ncursesw NOISALIST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Sun Apr 17 23:21:14 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sun, 17 Apr 2011 17:21:14 -0400 Subject: [csw-devel] SF.net SVN: gar:[14300] csw/mgar/pkg/php5/trunk/Makefile In-Reply-To: References: Message-ID: <1303075188-sup-5996@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Sun Apr 17 17:10:47 -0400 2011: > Reading this series of patches I'm starting to think whether it > actually makes sense for every of these changes to be a separate > commit. The choice of what constitutes a change that's worth having > as a separate commit is to some extent arbitrary. I guess there can > be two main factors to consider: Fair enough, but I was using these incremental changes to make it easier to review myself before committing...eg: I didn't want to drop 100 lines down to 10 and realize later that I'd forgotten to include a single subpackage or something. It was big and nasty, so small manageable chunks was nicer to wrangle it. ...noisy though it may be. :) Done now. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bwalton at opencsw.org Sun Apr 17 23:26:49 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sun, 17 Apr 2011 17:26:49 -0400 Subject: [csw-devel] SF.net SVN: gar:[14300] csw/mgar/pkg/php5/trunk/Makefile In-Reply-To: <1303075188-sup-5996@pinkfloyd.chass.utoronto.ca> References: <1303075188-sup-5996@pinkfloyd.chass.utoronto.ca> Message-ID: <1303075475-sup-3882@pinkfloyd.chass.utoronto.ca> Excerpts from Ben Walton's message of Sun Apr 17 17:21:14 -0400 2011: > ...noisy though it may be. :) Done now. This would be a nice working scenario for git. I could have made the 100 changes as separate commits locally but then merged the branch as a single commit for push to master. *g* I'll have to see if I can get a git-svn checkout to handle the recipe part of the tree... -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Mon Apr 18 00:05:31 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 22:05:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14302] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14302 http://gar.svn.sourceforge.net/gar/?rev=14302&view=rev Author: bdwalton Date: 2011-04-17 22:05:30 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: update libxml2 deps to CSWlibxml2-2 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 21:19:01 UTC (rev 14301) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 22:05:30 UTC (rev 14302) @@ -64,7 +64,7 @@ PACKAGES = CSWphp5 CATALOGNAME_CSWphp5 = php5 SPKG_DESC_CSWphp5 = A High-Level Scripting Language -RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2 CSWiconv CSWexpat CSWzlib +RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2-2 CSWiconv CSWexpat CSWzlib INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5 # embeded 'magic' information to detect file types...odd, but... @@ -108,7 +108,7 @@ PACKAGES += CSWap2-modphp5 CATALOGNAME_CSWap2-modphp5 = ap2_modphp5 SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module -RUNTIME_DEP_PKGS_CSWap2-modphp5 = CSWphp5 CSWapache2 CSWlibxml2 CSWiconv +RUNTIME_DEP_PKGS_CSWap2-modphp5 = CSWphp5 CSWapache2 CSWlibxml2-2 CSWiconv RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* @@ -120,7 +120,7 @@ $(eval $(call php5_subpackage,ctype)) $(eval $(call php5_subpackage,curl,CSWcurlrt CSWlibidn11 CSWoldaprt CSWosslrt CSWzlib CSWlibcares)) $(eval $(call php5_subpackage,dba,CSWlibgdbm3 CSWbdb42)) -$(eval $(call php5_subpackage,dom,CSWiconv CSWlibxml2 CSWzlib)) +$(eval $(call php5_subpackage,dom,CSWiconv CSWlibxml2-2 CSWzlib)) PKGFILES_CSWphp5-dom += .*include/php/ext/dom.* $(eval $(call php5_subpackage,exif)) $(eval $(call php5_subpackage,ftp,CSWosslrt)) @@ -166,7 +166,7 @@ PKGFILES_CSWphp5-session += .*/include/php/ext/session.* $(eval $(call php5_subpackage,shmop)) $(eval $(call php5_subpackage,snmp,CSWnetsnmp)) -$(eval $(call php5_subpackage,soap,CSWiconv CSWlibxml2 CSWzlib)) +$(eval $(call php5_subpackage,soap,CSWiconv CSWlibxml2-2 CSWzlib)) $(eval $(call php5_subpackage,sockets)) $(eval $(call php5_subpackage,sqlite,CSWsqlite)) PKGFILES_CSWphp5-sqlite += .*/include/php/ext/sqlite.* @@ -176,10 +176,10 @@ $(eval $(call php5_subpackage,tidy,CSWhtmltidy)) $(eval $(call php5_subpackage,tokenizer)) $(eval $(call php5_subpackage,wddx)) -$(eval $(call php5_subpackage,xmlreader,CSWiconv CSWlibxml2 CSWzlib)) +$(eval $(call php5_subpackage,xmlreader,CSWiconv CSWlibxml2-2 CSWzlib)) $(eval $(call php5_subpackage,xmlrpc,CSWiconv CSWexpat)) -$(eval $(call php5_subpackage,xmlwriter,CSWiconv CSWlibxml2 CSWzlib)) -$(eval $(call php5_subpackage,xsl,CSWiconv CSWlibxml2 CSWlibxslt CSWzlib)) +$(eval $(call php5_subpackage,xmlwriter,CSWiconv CSWlibxml2-2 CSWzlib)) +$(eval $(call php5_subpackage,xsl,CSWiconv CSWlibxml2-2 CSWlibxslt CSWzlib)) $(eval $(call php5_subpackage,zip,CSWzlib)) EXTRA_CFLAGS = -I$(prefix)/include/ncursesw 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 Apr 18 00:26:23 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Apr 2011 22:26:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[14303] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14303 http://gar.svn.sourceforge.net/gar/?rev=14303&view=rev Author: bdwalton Date: 2011-04-17 22:26:23 +0000 (Sun, 17 Apr 2011) Log Message: ----------- php5/trunk: clean up some pear junk from DESTDIR Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 22:05:30 UTC (rev 14302) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 22:26:23 UTC (rev 14303) @@ -315,6 +315,7 @@ @cp $(WORKSRC)/php.ini-production $(INIDEST) @ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(prefix)/php5/bin/ @perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST) + @rm -rf $(DESTDIR)/.cha $(DESTDIR)/.dep* $(DESTDIR)/.reg* $(DESTDIR)/.l* @$(MAKECOOKIE) install-extras: 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 Apr 18 02:09:47 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 18 Apr 2011 00:09:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14304] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14304 http://gar.svn.sourceforge.net/gar/?rev=14304&view=rev Author: bdwalton Date: 2011-04-18 00:09:47 +0000 (Mon, 18 Apr 2011) Log Message: ----------- php5/trunk: correct pkgfiles for -dev package (not using standard confdirs); correct pkgfiles for pdomysql Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-17 22:26:23 UTC (rev 14303) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-18 00:09:47 UTC (rev 14304) @@ -85,24 +85,24 @@ SPKG_DESC_CSWphp5-dev = Development files for php5 RUNTIME_DEP_PKGS_CSWphp5-dev = CSWphp5 OBSOLETED_BY_CSWphp5-dev = CSWphp5devel -PKGFILES_CSWphp5-dev = $(bindir)/php-config -PKGFILES_CSWphp5-dev += $(bindir)/phpize -PKGFILES_CSWphp5-dev += $(bindir)/peardev -PKGFILES_CSWphp5-dev += $(libdir)/php/build/.* -PKGFILES_CSWphp5-dev += $(includedir)/php/TSRM.* -PKGFILES_CSWphp5-dev += $(includedir)/php/Zend.* -PKGFILES_CSWphp5-dev += $(includedir)/php/include.* -PKGFILES_CSWphp5-dev += $(includedir)/php/main.* -PKGFILES_CSWphp5-dev += $(includedir)/php/regex.* -PKGFILES_CSWphp5-dev += $(includedir)/php/ext/date.* -PKGFILES_CSWphp5-dev += $(includedir)/php/ext/filter.* -PKGFILES_CSWphp5-dev += $(includedir)/php/ext/libxml.* -PKGFILES_CSWphp5-dev += $(includedir)/php/ext/pcre.* -PKGFILES_CSWphp5-dev += $(includedir)/php/ext/spl.* -PKGFILES_CSWphp5-dev += $(includedir)/php/ext/standard.* -PKGFILES_CSWphp5-dev += $(includedir)/php/ext/xml.* -PKGFILES_CSWphp5-dev += $(mandir)/man1/php-config.1 -PKGFILES_CSWphp5-dev += $(mandir)/man1/phpize.1 +PKGFILES_CSWphp5-dev = $(prefix)/php5/bin/php-config +PKGFILES_CSWphp5-dev += $(prefix)/php5/bin/phpize +PKGFILES_CSWphp5-dev += $(prefix)/php5/bin/peardev +PKGFILES_CSWphp5-dev += $(prefix)/php5/lib/php/build/.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/TSRM.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/Zend.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/include.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/main.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/regex.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/date.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/filter.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/libxml.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/pcre.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/spl.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/standard.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/xml.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/man/man1/php-config.1 +PKGFILES_CSWphp5-dev += $(prefix)/php5/man/man1/phpize.1 CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 PACKAGES += CSWap2-modphp5 @@ -147,7 +147,7 @@ $(eval $(call php5_subpackage,pdo)) PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.* $(eval $(call php5_subpackage,pdomysql,CSWmysql5rt CSWzlib CSWphp5-pdo)) -PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_mysql.so +PKGFILES_CSWphp5-pdomysql = .*/lib/php/extensions/.*/pdo_mysql.so CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo $(eval $(call php5_subpackage,pdoodbc,CSWunixodbc CSWphp5-pdo)) PKGFILES_CSWphp5-pdoodbc = .*/lib/php/extensions/.*/pdo_odbc.so 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 Apr 18 02:11:36 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 18 Apr 2011 00:11:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[14305] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14305 http://gar.svn.sourceforge.net/gar/?rev=14305&view=rev Author: bdwalton Date: 2011-04-18 00:11:36 +0000 (Mon, 18 Apr 2011) Log Message: ----------- php5/trunk: modernize the dependency on libcares Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-18 00:09:47 UTC (rev 14304) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-18 00:11:36 UTC (rev 14305) @@ -118,7 +118,7 @@ $(eval $(call php5_subpackage,bz2,CSWbzip2)) $(eval $(call php5_subpackage,calendar)) $(eval $(call php5_subpackage,ctype)) -$(eval $(call php5_subpackage,curl,CSWcurlrt CSWlibidn11 CSWoldaprt CSWosslrt CSWzlib CSWlibcares)) +$(eval $(call php5_subpackage,curl,CSWcurlrt CSWlibidn11 CSWoldaprt CSWosslrt CSWzlib CSWlibcares2)) $(eval $(call php5_subpackage,dba,CSWlibgdbm3 CSWbdb42)) $(eval $(call php5_subpackage,dom,CSWiconv CSWlibxml2-2 CSWzlib)) PKGFILES_CSWphp5-dom += .*include/php/ext/dom.* 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 Apr 18 02:15:54 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 18 Apr 2011 00:15:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14306] csw/mgar/pkg/php5/trunk Message-ID: Revision: 14306 http://gar.svn.sourceforge.net/gar/?rev=14306&view=rev Author: bdwalton Date: 2011-04-18 00:15:54 +0000 (Mon, 18 Apr 2011) Log Message: ----------- php5/trunk: move some overrides to -dev after fixing pkgfiles; update cswreleasenotes for -dev and main Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/files/CSWphp5.cswreleasenotes Added Paths: ----------- csw/mgar/pkg/php5/trunk/files/CSWphp5-dev.cswreleasenotes Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-18 00:11:36 UTC (rev 14305) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-18 00:15:54 UTC (rev 14306) @@ -69,17 +69,12 @@ INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5 # embeded 'magic' information to detect file types...odd, but... CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/libtool.m4 -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4 -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4 CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/PEAR/Config.php CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1 CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php-cgi # verify these... CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php.ini.CSW - PACKAGES += CSWphp5-dev CATALOGNAME_CSWphp5-dev = php5_dev SPKG_DESC_CSWphp5-dev = Development files for php5 @@ -104,6 +99,10 @@ PKGFILES_CSWphp5-dev += $(prefix)/php5/man/man1/php-config.1 PKGFILES_CSWphp5-dev += $(prefix)/php5/man/man1/phpize.1 CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/libtool.m4 +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4 +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4 PACKAGES += CSWap2-modphp5 CATALOGNAME_CSWap2-modphp5 = ap2_modphp5 Added: csw/mgar/pkg/php5/trunk/files/CSWphp5-dev.cswreleasenotes =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5-dev.cswreleasenotes (rev 0) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5-dev.cswreleasenotes 2011-04-18 00:15:54 UTC (rev 14306) @@ -0,0 +1,3 @@ +/usr/local references: + php/build/* -> build stuff that doesn't matter + PEAR/Config.php -> default for gpg if not in $PATH Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.cswreleasenotes =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.cswreleasenotes 2011-04-18 00:11:36 UTC (rev 14305) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.cswreleasenotes 2011-04-18 00:15:54 UTC (rev 14306) @@ -1,6 +1,4 @@ /usr/local references: bin/php -> embeds 'magic' filetype info in the binary bin/php-cgi -> embeds 'magic' filetype info in the binary - php/build/* -> build stuff that doesn't matter PEAR/Config.php -> default for gpg if not in $PATH - man1/php-config.1 -> an example path 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 Apr 18 02:17:25 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 18 Apr 2011 00:17:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14307] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14307 http://gar.svn.sourceforge.net/gar/?rev=14307&view=rev Author: bdwalton Date: 2011-04-18 00:17:25 +0000 (Mon, 18 Apr 2011) Log Message: ----------- php5/trunk: correct and extend the pear cleanup in the post-install routine Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-18 00:15:54 UTC (rev 14306) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-18 00:17:25 UTC (rev 14307) @@ -314,7 +314,7 @@ @cp $(WORKSRC)/php.ini-production $(INIDEST) @ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(prefix)/php5/bin/ @perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST) - @rm -rf $(DESTDIR)/.cha $(DESTDIR)/.dep* $(DESTDIR)/.reg* $(DESTDIR)/.l* + @rm -rf $(DESTDIR)/.cha* $(DESTDIR)/.dep* $(DESTDIR)/.reg* $(DESTDIR)/.l* $(DESTDIR)/.f* @$(MAKECOOKIE) install-extras: 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 Apr 18 02:56:56 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 18 Apr 2011 00:56:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[14308] csw/mgar/pkg/php5/trunk Message-ID: Revision: 14308 http://gar.svn.sourceforge.net/gar/?rev=14308&view=rev Author: bdwalton Date: 2011-04-18 00:56:55 +0000 (Mon, 18 Apr 2011) Log Message: ----------- php5/trunk: move php-config.1 override of usr/local to -dev; update release notes Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/files/CSWphp5-dev.cswreleasenotes Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-18 00:17:25 UTC (rev 14307) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-18 00:56:55 UTC (rev 14308) @@ -58,7 +58,6 @@ RUNTIME_DEP_PKGS_CSWphp5-$(1) ?= CSWphp5 $(2) OBSOLETED_BY_CSWphp5-$(1) ?= CSWphp5$(1) PKGFILES_CSWphp5-$(1) ?= .*lib/php/extensions/.*/$(1).so .*php5/extensions/$(1) -CHECKPKG_OVERRIDES_CSWphp5-$(1) += surplus-dependency|CSWphp5 endef PACKAGES = CSWphp5 @@ -70,7 +69,6 @@ # embeded 'magic' information to detect file types...odd, but... CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/PEAR/Config.php -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1 CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php-cgi # verify these... CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php.ini.CSW @@ -103,6 +101,7 @@ CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4 CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4 +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1 PACKAGES += CSWap2-modphp5 CATALOGNAME_CSWap2-modphp5 = ap2_modphp5 Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5-dev.cswreleasenotes =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5-dev.cswreleasenotes 2011-04-18 00:17:25 UTC (rev 14307) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5-dev.cswreleasenotes 2011-04-18 00:56:55 UTC (rev 14308) @@ -1,3 +1,4 @@ /usr/local references: php/build/* -> build stuff that doesn't matter PEAR/Config.php -> default for gpg if not in $PATH + man1/php-config.1 -> an example directory 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 Apr 18 03:24:36 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 18 Apr 2011 01:24:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[14309] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14309 http://gar.svn.sourceforge.net/gar/?rev=14309&view=rev Author: bdwalton Date: 2011-04-18 01:24:36 +0000 (Mon, 18 Apr 2011) Log Message: ----------- php5/trunk: add more overrides for the pdo db modules Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-18 00:56:55 UTC (rev 14308) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-18 01:24:36 UTC (rev 14309) @@ -147,15 +147,19 @@ $(eval $(call php5_subpackage,pdomysql,CSWmysql5rt CSWzlib CSWphp5-pdo)) PKGFILES_CSWphp5-pdomysql = .*/lib/php/extensions/.*/pdo_mysql.so CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo +CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5 $(eval $(call php5_subpackage,pdoodbc,CSWunixodbc CSWphp5-pdo)) PKGFILES_CSWphp5-pdoodbc = .*/lib/php/extensions/.*/pdo_odbc.so CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo +CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5 $(eval $(call php5_subpackage,pdopgsql,CSWlibpq CSWphp5-pdo)) PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_pgsql.so -CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo +CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo +CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5 $(eval $(call php5_subpackage,pdosqlite,CSWsqlite3rt CSWphp5-pdo)) PKGFILES_CSWphp5-pdosqlite = .*/lib/php/extensions/.*/pdo_sqlite.so CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo +CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5 $(eval $(call php5_subpackage,pgsql,CSWlibpq)) $(eval $(call php5_subpackage,posix)) $(eval $(call php5_subpackage,pspell,CSWaspell)) 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 Apr 18 04:29:56 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 18 Apr 2011 02:29:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[14310] csw/mgar/pkg/php5/trunk Message-ID: Revision: 14310 http://gar.svn.sourceforge.net/gar/?rev=14310&view=rev Author: bdwalton Date: 2011-04-18 02:29:56 +0000 (Mon, 18 Apr 2011) Log Message: ----------- php5/trunk: override usr/local warning in ap2-modphp5; document in releasenotes Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/php5/trunk/files/CSWap2-modphp5.cswreleasenotes Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-18 01:24:36 UTC (rev 14309) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-18 02:29:56 UTC (rev 14310) @@ -33,6 +33,7 @@ DISTFILES += $(DISTNAME).tar.bz2 DISTFILES += phpext pear.conf.CSW CSWphp5.postinstall DISTFILES += CSWphp5.cswreleasenotes +DISTFILES += CSWap2-modphp5.cswreleasenotes PATCHFILES += 0001-Strip-usr-ucblib-references.patch # this one is filed upstream: http://bugs.php.net/bug.php?id=54318 @@ -111,6 +112,7 @@ OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWap2-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/apache2/libexec/libphp5.so $(eval $(call php5_subpackage,bcmath)) $(eval $(call php5_subpackage,bz2,CSWbzip2)) Added: csw/mgar/pkg/php5/trunk/files/CSWap2-modphp5.cswreleasenotes =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWap2-modphp5.cswreleasenotes (rev 0) +++ csw/mgar/pkg/php5/trunk/files/CSWap2-modphp5.cswreleasenotes 2011-04-18 02:29:56 UTC (rev 14310) @@ -0,0 +1,2 @@ +/usr/local references: + libexec/libphp5.so -> embeds 'magic' filetype info in the binary 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 Apr 18 04:49:10 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 18 Apr 2011 02:49:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14311] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14311 http://gar.svn.sourceforge.net/gar/?rev=14311&view=rev Author: bdwalton Date: 2011-04-18 02:49:10 +0000 (Mon, 18 Apr 2011) Log Message: ----------- php5/trunk: correct typo in build dep list Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-18 02:29:56 UTC (rev 14310) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-18 02:49:10 UTC (rev 14311) @@ -44,7 +44,7 @@ BUILD_DEP_PKGS += CSWpng CSWt1lib CSWxpm CSWlibgdbm-dev CSWlibgmp BUILD_DEP_PKGS += CSWggettext-dev CSWossldevel CSWlibgd2 CSWbdb42devel BUILD_DEP_PKGS += CSWlibcares-dev CSWftype2 CSWiconv CSWimap-devel -BUILD_DEP_PKGS += CSWoldapdevel CSWkrb5libdev CSWsasl CSWlibtdl7 +BUILD_DEP_PKGS += CSWoldapdevel CSWkrb5libdev CSWsasl CSWlibltdl7 BUILD_DEP_PKGS += CSWlibmcrypt CSWfreetds CSWmysql5devel CSWunixodbc BUILD_DEP_PKGS += CSWlibpq CSWreadline CSWncurses CSWnetsnmp BUILD_DEP_PKGS += CSWsqlite3devel CSWaspell CSWhtmltidy This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Apr 18 11:00:11 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 18 Apr 2011 09:00:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[14312] csw/mgar/pkg/miltergreylist/trunk Message-ID: Revision: 14312 http://gar.svn.sourceforge.net/gar/?rev=14312&view=rev Author: bonivart Date: 2011-04-18 09:00:10 +0000 (Mon, 18 Apr 2011) Log Message: ----------- miltergreylist/trunk: Fix socket path Modified Paths: -------------- csw/mgar/pkg/miltergreylist/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/miltergreylist/trunk/files/0002-change-socket-path.patch Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/Makefile 2011-04-18 02:49:10 UTC (rev 14311) +++ csw/mgar/pkg/miltergreylist/trunk/Makefile 2011-04-18 09:00:10 UTC (rev 14312) @@ -25,6 +25,7 @@ CHECKPKG_OVERRIDES += file-with-bad-content PATCHFILES += 0001-Path-and-user-changes-in-conf-file.patch +PATCHFILES += 0002-change-socket-path.patch CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS = --prefix=/opt/csw Added: csw/mgar/pkg/miltergreylist/trunk/files/0002-change-socket-path.patch =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/0002-change-socket-path.patch (rev 0) +++ csw/mgar/pkg/miltergreylist/trunk/files/0002-change-socket-path.patch 2011-04-18 09:00:10 UTC (rev 14312) @@ -0,0 +1,34 @@ +From 65288f5c0bf0b7111ba16dad73a9c33fd4a06cde Mon Sep 17 00:00:00 2001 +From: Peter Bonivart +Date: Mon, 18 Apr 2011 10:55:40 +0200 +Subject: [PATCH] change-socket-path + +--- + milter-greylist.m4 | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/milter-greylist.m4 b/milter-greylist.m4 +index 9f61507..9bbcb59 100644 +--- a/milter-greylist.m4 ++++ b/milter-greylist.m4 +@@ -18,7 +18,7 @@ dnl + dnl confGREYLIST_SOCKET + dnl socket to communicate with milter + dnl default value : +-dnl local:/var/milter-greylist/milter-greylist.sock ++dnl local:/var/opt/csw/miltergreylist/milter-greylist.sock + dnl + dnl confGREYLIST_OPTIONS + dnl extra parameters to be used in INPUT_MAIL_FILTER +@@ -34,7 +34,7 @@ dnl + ifdef(`confGREYLIST_SOCKET',`dnl + define(`confGREYLIST_ARGS',`S=confGREYLIST_SOCKET')dnl + dnl',`dnl +-define(`confGREYLIST_ARGS',`S=local:/var/milter-greylist/milter-greylist.sock')dnl ++define(`confGREYLIST_ARGS',`S=local:/var/opt/csw/miltergreylist/milter-greylist.sock')dnl + dnl')dnl + ifdef(`confGREYLIST_OPTIONS',`dnl + define(`confGREYLIST_ARGS',confGREYLIST_ARGS`, confGREYLIST_OPTIONS')dnl +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 18 11:35:18 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Apr 2011 09:35:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14313] csw/mgar/pkg/sqlite3/trunk Message-ID: Revision: 14313 http://gar.svn.sourceforge.net/gar/?rev=14313&view=rev Author: dmichelsen Date: 2011-04-18 09:35:18 +0000 (Mon, 18 Apr 2011) Log Message: ----------- sqlite3: Bump version to 3070602 and update according to new defaults Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2011-04-18 09:00:10 UTC (rev 14312) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2011-04-18 09:35:18 UTC (rev 14313) @@ -1,5 +1,5 @@ NAME = sqlite3 -VERSION = 3070500 +VERSION = 3070602 CATEGORIES = lib DESCRIPTION = An embeddable SQL engine in a C library @@ -29,35 +29,20 @@ PACKAGES += CSWlibsqlite3-0 CATALOGNAME_CSWlibsqlite3-0 = libsqlite3_0 SPKG_DESC_CSWlibsqlite3-0 = SQLite library providing libsqlite3.so.0 -PKGFILES_CSWlibsqlite3-0 = $(call baseisadirs,$(libdir),libsqlite3\.so\.0(\.\d+)*) +PKGFILES_CSWlibsqlite3-0 = $(call pkgfiles_lib,libsqlite3.so.0) +OBSOLETED_BY_CSWlibsqlite3-0 = CSWsqlite3rt PACKAGES += CSWlibsqlite3-dev CATALOGNAME_CSWlibsqlite3-dev = libsqlite3_dev SPKG_DESC_CSWlibsqlite3-dev = Development files for libsqlite3.so PKGFILES_CSWlibsqlite3-dev = $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibsqlite3-dev = CSWlibsqlite3-0 +OBSOLETED_BY_CSWlibsqlite3-dev = CSWsqlite3devel -PACKAGES += CSWsqlite3rt -CATALOGNAME_CSWsqlite3rt = sqlite3_rt -SPKG_DESC_CSWsqlite3rt = Transitional package as contents moved to CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWsqlite3rt = CSWlibsqlite3-0 -CHECKPKG_OVERRIDES_CSWsqlite3rt += surplus-dependency|CSWlibsqlite3-0 -PKGFILES_CSWsqlite3rt = NOFILES -ARCHALL_CSWsqlite3rt = 1 - -PACKAGES += CSWsqlite3devel -CATALOGNAME_CSWsqlite3devel = sqlite3_devel -SPKG_DESC_CSWsqlite3devel = Transitional package as contents moved to CSWlibsqlite3-dev -PKGFILES_CSWsqlite3devel = NOFILES - BUILD_DEP_PKGS += CSWreadline BUILD64 = 1 -NOISAEXEC = 1 +EXTRA_MERGE_DIRS_isa-extra = $(bindir) -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - include gar/category.mk Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2011-04-18 09:00:10 UTC (rev 14312) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2011-04-18 09:35:18 UTC (rev 14313) @@ -1,2 +1,2 @@ fc9432136482bcde03102bc3e06dd413 copyright-release.html -a9604a82613ade2e7f4c303f233e477f sqlite-autoconf-3070500.tar.gz +f16c08617968b4087b3d591fd575f59f sqlite-autoconf-3070602.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 18 11:36:08 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Apr 2011 09:36:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14314] csw/mgar/pkg/sqlite3/trunk/Makefile Message-ID: Revision: 14314 http://gar.svn.sourceforge.net/gar/?rev=14314&view=rev Author: dmichelsen Date: 2011-04-18 09:36:07 +0000 (Mon, 18 Apr 2011) Log Message: ----------- sqlite3: Remove superflous upstream watch regex Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2011-04-18 09:35:18 UTC (rev 14313) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2011-04-18 09:36:07 UTC (rev 14314) @@ -16,9 +16,6 @@ LICENSE = copyright-release.html -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = sqlite-(\d+(?:\.\d+)*).tar.gz - PACKAGES += CSWsqlite3 CATALOGNAME_CSWsqlite3 = sqlite3 SPKG_DESC_CSWsqlite3 = $(DESCRIPTION) 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 Apr 18 12:03:18 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Apr 2011 10:03:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14315] csw/mgar/pkg/cpan/Makefile Message-ID: Revision: 14315 http://gar.svn.sourceforge.net/gar/?rev=14315&view=rev Author: dmichelsen Date: 2011-04-18 10:03:17 +0000 (Mon, 18 Apr 2011) Log Message: ----------- mGAR v2: Update newpkg-* for new perl module naming Modified Paths: -------------- csw/mgar/pkg/cpan/Makefile Modified: csw/mgar/pkg/cpan/Makefile =================================================================== --- csw/mgar/pkg/cpan/Makefile 2011-04-18 09:36:07 UTC (rev 14314) +++ csw/mgar/pkg/cpan/Makefile 2011-04-18 10:03:17 UTC (rev 14315) @@ -32,7 +32,8 @@ # Ideally this would also figure out the AUTHOR by querying CPAN. Alternatively # we might think about dropping the AUTHOR field and determine that on the fly # during the build. Ideas? -newpkg-%: catalogname = $(shell echo $(call lcase,$*) | tr -d ':-' ) +newpkg-%: catalogname = $(call lcase,$(subst ::,_,$*)) +newpkg-%: pkgname = $(call lcase,$(subst ::,-,$*)) newpkg-%: dir = $(subst ::,-,$*) newpkg-%: @svn mkdir $(dir) $(dir)/tags $(dir)/branches $(dir)/trunk $(dir)/trunk/files @@ -46,7 +47,7 @@ echo " Long description"; \ echo "endef"; \ echo ""; \ - echo "PACKAGES = CSWpm$(catalogname)"; \ + echo "PACKAGES = CSWpm-$(pkgname)"; \ echo "CATALOGNAME = pm_$(catalogname)"; \ echo ""; \ echo "include gar/category.mk"; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Mon Apr 18 12:31:29 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Mon, 18 Apr 2011 10:31:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[14316] csw/mgar/pkg/ruby-augeas/tags/ruby-augeas-0.3.0, REV =2011.04.18/ Message-ID: Revision: 14316 http://gar.svn.sourceforge.net/gar/?rev=14316&view=rev Author: phipsy Date: 2011-04-18 10:31:28 +0000 (Mon, 18 Apr 2011) Log Message: ----------- ruby-augeas: Tag as release 0.3.0,REV=2011.04.18 Added Paths: ----------- csw/mgar/pkg/ruby-augeas/tags/ruby-augeas-0.3.0,REV=2011.04.18/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Mon Apr 18 13:55:29 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Mon, 18 Apr 2011 11:55:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[14317] csw/mgar/pkg/ruby-augeas/trunk/Makefile Message-ID: Revision: 14317 http://gar.svn.sourceforge.net/gar/?rev=14317&view=rev Author: phipsy Date: 2011-04-18 11:55:29 +0000 (Mon, 18 Apr 2011) Log Message: ----------- Updated ruby_augeas dep from ruby to ruby18 Modified Paths: -------------- csw/mgar/pkg/ruby-augeas/trunk/Makefile Modified: csw/mgar/pkg/ruby-augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-04-18 10:31:28 UTC (rev 14316) +++ csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-04-18 11:55:29 UTC (rev 14317) @@ -13,7 +13,7 @@ PACKAGES = CSWrubyaugeas CATALOGNAME = ruby_augeas -RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWruby +RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWruby18 RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWlibruby18-1 RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWaugeas CHECKPKG_OVERRIDES_CSWrubyaugeas += catalogname-does-not-match-pkgname|pkgname=CSWrubyaugeas|catalogname=ruby_augeas|expected-catalogname=rubyaugeas This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Mon Apr 18 14:07:36 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Mon, 18 Apr 2011 12:07:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[14318] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 14318 http://gar.svn.sourceforge.net/gar/?rev=14318&view=rev Author: aigoshin Date: 2011-04-18 12:07:36 +0000 (Mon, 18 Apr 2011) Log Message: ----------- nginx: release 20110418 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/nginx/trunk/files/patch.errno Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2011-04-18 11:55:29 UTC (rev 14317) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-04-18 12:07:36 UTC (rev 14318) @@ -16,6 +16,8 @@ LICENSE = LICENSE +PATCHFILES = patch.errno + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz Added: csw/mgar/pkg/nginx/trunk/files/patch.errno =================================================================== --- csw/mgar/pkg/nginx/trunk/files/patch.errno (rev 0) +++ csw/mgar/pkg/nginx/trunk/files/patch.errno 2011-04-18 12:07:36 UTC (rev 14318) @@ -0,0 +1,26 @@ +Index: nginx-1.0.0/auto/unix +=================================================================== +--- nginx-1.0.0/auto/unix (revision 3896) ++++ nginx-1.0.0/auto/unix (working copy) +@@ -141,14 +141,19 @@ + ngx_feature_name=NGX_SYS_NERR + ngx_feature_run=value + ngx_feature_incs='#include ++ #include ' + #include ' + ngx_feature_path= + ngx_feature_libs= + ngx_feature_test='int n; ++ char *p; + for (n = 1; n < 1000; n++) { + errno = 0; +- strerror(n); +- if (errno == EINVAL) { ++ p = strerror(n); ++ if (p == NULL ++ || strncmp(p, "Unknown error", 13) == 0 ++ || errno == EINVAL) ++ { + printf("%d", n); + return 0; + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Mon Apr 18 14:40:20 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Mon, 18 Apr 2011 12:40:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[14319] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 14319 http://gar.svn.sourceforge.net/gar/?rev=14319&view=rev Author: aigoshin Date: 2011-04-18 12:40:19 +0000 (Mon, 18 Apr 2011) Log Message: ----------- nginx: release 20110418 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2011-04-18 12:07:36 UTC (rev 14318) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-04-18 12:40:19 UTC (rev 14319) @@ -21,7 +21,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS = CSWosslrt CSWpcrert CSWzlib CSWperl +RUNTIME_DEP_PKGS = CSWosslrt CSWlibpcre0 CSWzlib CSWperl PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 @@ -76,6 +76,8 @@ CONFIGURE_ARGS += --with-http_ssl_module CONFIGURE_ARGS += --with-http_stub_status_module +CHECKPKG_OVERRIDES_CSWnginx += bad-location-of-file|file=/var/run/nginx + TEST_SCRIPTS = INITSMF = $(sysconfdir)/init.d/cswnginx This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Mon Apr 18 15:06:21 2011 From: bwalton at opencsw.org (Ben Walton) Date: Mon, 18 Apr 2011 09:06:21 -0400 Subject: [csw-devel] SF.net SVN: gar:[14319] csw/mgar/pkg/nginx/trunk/Makefile In-Reply-To: References: Message-ID: <1303131972-sup-2759@pinkfloyd.chass.utoronto.ca> Excerpts from aigoshin's message of Mon Apr 18 08:40:20 -0400 2011: > +CHECKPKG_OVERRIDES_CSWnginx += bad-location-of-file|file=/var/run/nginx > + I thought that /var/opt/csw/run/($foo)* was the preferred location for the pid files? (Sorry for double post Andy...) Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From dmichelsen at users.sourceforge.net Mon Apr 18 16:21:03 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Apr 2011 14:21:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14320] csw/mgar/pkg/gcal/trunk/Makefile Message-ID: Revision: 14320 http://gar.svn.sourceforge.net/gar/?rev=14320&view=rev Author: dmichelsen Date: 2011-04-18 14:21:03 +0000 (Mon, 18 Apr 2011) Log Message: ----------- gcal: Update dependency, add definition, still wrong location of gcalrc Modified Paths: -------------- csw/mgar/pkg/gcal/trunk/Makefile Modified: csw/mgar/pkg/gcal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcal/trunk/Makefile 2011-04-18 12:40:19 UTC (rev 14319) +++ csw/mgar/pkg/gcal/trunk/Makefile 2011-04-18 14:21:03 UTC (rev 14320) @@ -14,13 +14,15 @@ PACKAGES = CSWgcal CATALOGNAME_CSWgcal = gcal -RUNTIME_DEP_PKGS_CSWgcal += CSWggettextrt +RUNTIME_DEP_PKGS_CSWgcal += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgcal += CSWncurses RUNTIME_DEP_PKGS_CSWgcal += CSWperl # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +EXTRA_CPPFLAGS = -DGCAL_SYS_DATADIR=\\\"$(sharedstatedir)/gcal\\\" + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check 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 Apr 18 16:28:29 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Apr 2011 14:28:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[14321] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 14321 http://gar.svn.sourceforge.net/gar/?rev=14321&view=rev Author: dmichelsen Date: 2011-04-18 14:28:29 +0000 (Mon, 18 Apr 2011) Log Message: ----------- mGAR v2: Fix substitution so that libraries with '+' in it works Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-04-18 14:21:03 UTC (rev 14320) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-04-18 14:28:29 UTC (rev 14321) @@ -332,7 +332,7 @@ # PKGFILES_LIB selects just one library. The '.' will be escaped automatically! # Use PKGFILES_CSWlibfoo1 = $(call pkgfiles_lib,libfoo.so.1) -pkgfiles_lib += $(call baseisadirs,$(libdir),$(subst .,\.,$(1))(\.\d+)*) +pkgfiles_lib += $(call baseisadirs,$(libdir),$(subst .,\.,$(subst +,\+,$(1)))(\.\d+)*) # PKGFILES_DEVEL selects files belonging to a developer package PKGFILES_DEVEL_CONFIG ?= $(call baseisadirs,$(bindir),[^/]*-config) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 18 16:50:40 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Apr 2011 14:50:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14322] csw/mgar/pkg/libflac8/trunk Message-ID: Revision: 14322 http://gar.svn.sourceforge.net/gar/?rev=14322&view=rev Author: dmichelsen Date: 2011-04-18 14:50:40 +0000 (Mon, 18 Apr 2011) Log Message: ----------- libflac8: Further add splitting, docs, defaults Modified Paths: -------------- csw/mgar/pkg/libflac8/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libflac8/trunk/files/0004-Preserve-norunpath-in-libtool.patch Modified: csw/mgar/pkg/libflac8/trunk/Makefile =================================================================== --- csw/mgar/pkg/libflac8/trunk/Makefile 2011-04-18 14:28:29 UTC (rev 14321) +++ csw/mgar/pkg/libflac8/trunk/Makefile 2011-04-18 14:50:40 UTC (rev 14322) @@ -21,6 +21,7 @@ PATCHFILES += libtool-64bit.patch PATCHFILES += strip-nasm-1.2.1.patch PATCHFILES += no-stdint.patch +PATCHFILES += 0004-Preserve-norunpath-in-libtool.patch BUILD_DEP_PKGS += CSWbash @@ -28,17 +29,51 @@ CATALOGNAME_CSWlibflac8 = libflac8 SPKG_DESC_CSWlibflac8 = Free lossless audio codec library, libflac.so.8 PKGFILES_CSWlibflac8 = $(call pkgfiles_lib,libFLAC.so.8) -RUNTIME_DEP_PKGS_CSWlibflac8 += CSWiconv +RUNTIME_DEP_PKGS_CSWlibflac8 += CSWlibogg0 +OBSOLETED_BY_CSWlibflac8 = CSWlibflac -# Override conflicts with CSWflac as the new CSWflac is built from the latest libflac -CHECKPKG_OVERRIDES_CSWlibflac7 += file-collision|/opt/csw/lib/libFLAC.so.7.0.0|CSWflac|CSWlibflac7 -CHECKPKG_OVERRIDES_CSWlibflac7 += file-collision|/opt/csw/lib/libFLAC.so.7|CSWflac|CSWlibflac7 +PACKAGES += CSWlibflac++6 +CATALOGNAME_CSWlibflac++6 = libflac++6 +SPKG_DESC_CSWlibflac++6 = Free lossless audio codec library, libFLAC++.so.6 +PKGFILES_CSWlibflac++6 = $(call pkgfiles_lib,libFLAC++.so.6) +RUNTIME_DEP_PKGS_CSWlibflac++6 += CSWlibflac8 +OBSOLETED_BY_CSWlibflac++6 = CSWlibflac +PACKAGES += CSWlibflac-dev +CATALOGNAME_CSWlibflac-dev = libflac_dev +SPKG_DESC_CSWlibflac-dev = Development files for libflac.so.8 +PKGFILES_CSWlibflac-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibflac-dev += $(docdir)/flac/.* +RUNTIME_DEP_PKGS_CSWlibflac-dev = CSWlibflac8 +RUNTIME_DEP_PKGS_CSWlibflac-dev += CSWlibflac++6 + +PACKAGES += CSWlibflac-utils +CATALOGNAME_CSWlibflac-utils = libflac_utils +SPKG_DESC_CSWlibflac-utils = Utility programs for the Free Lossless Audio Codec (FLAC) +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibflac-utils += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWlibflac-utils += CSWiconv +RUNTIME_DEP_PKGS_CSWlibflac-utils += CSWlibflac8 +OBSOLETED_BY_CSWlibflac-utils = CSWflac + +PACKAGES += CSWxmms-flac +PKGFILES_CSWxmms-flac = $(libdir)/xmms/.* +SPKG_DESC_CSWxmms-flac = XMMS plugin for the FLAC audio file format +RUNTIME_DEP_PKGS_CSWxmms-flac += CSWglib +RUNTIME_DEP_PKGS_CSWxmms-flac += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWxmms-flac += CSWgtk +RUNTIME_DEP_PKGS_CSWxmms-flac += CSWlibflac8 +RUNTIME_DEP_PKGS_CSWxmms-flac += CSWxmms +OBSOLETED_BY_CSWxmms-flac = CSWxmmsflac + + VENDOR_URL = http://flac.sourceforge.net/ LICENSE = $(foreach lic,FDL GPL LGPL Xiph,COPYING.$(lic)) # EXTRA_LINKER_FLAGS = -liconv -lm +EXTRA_LINKER_FLAGS = -norunpath +# EXTRA_CXXFLAGS = -norunpath # Must be defined and empty or -I$(includedir) is added too early # EXTRA_INC = ../../include @@ -48,6 +83,8 @@ STRIP_LIBTOOL = 1 +BUILD64 = 1 + CONFIGURE_ARGS = $(DIRPATHS) EXTRA_CONFIGURE_ARGS_mm-64 = --disable-xmms-plugin @@ -56,10 +93,10 @@ # XXX: Assembler optimization just doesn't work. Disable for now. CONFIGURE_ARGS += --disable-asm-optimizations -TEST_TARGET = check +EXTRA_PAX_ARGS = -s ',$(docdir)/flac-$(VERSION),$(docdir)/flac,' -# There is one test failing, but as this is really a long-outdated legacy library -# I don't care much for now. -# SKIPTEST ?= 1 +include gar/category.mk -include gar/category.mk +post-install-modulated: + perl -pi -e 's,/usr/share/doc,$(docdir),' \ + $(DESTDIR)$(mandir)/man1/flac.1 Added: csw/mgar/pkg/libflac8/trunk/files/0004-Preserve-norunpath-in-libtool.patch =================================================================== --- csw/mgar/pkg/libflac8/trunk/files/0004-Preserve-norunpath-in-libtool.patch (rev 0) +++ csw/mgar/pkg/libflac8/trunk/files/0004-Preserve-norunpath-in-libtool.patch 2011-04-18 14:50:40 UTC (rev 14322) @@ -0,0 +1,25 @@ +From 4593b146f039662547960a5b72858f1e48822ffd Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 18 Apr 2011 15:56:36 +0200 +Subject: [PATCH] Preserve norunpath in libtool + +--- + ltmain.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/ltmain.sh b/ltmain.sh +index 7a320ef..e19a625 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -1533,7 +1533,7 @@ EOF + # +DA*, +DD* enable 64-bit mode on the HP compiler + # -q* pass through compiler args for the IBM compiler + # -m* pass through architecture-specific compiler args for GCC +- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*) ++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-norunpath) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 18 17:16:52 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Apr 2011 15:16:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[14323] csw/mgar/gar/v2 Message-ID: Revision: 14323 http://gar.svn.sourceforge.net/gar/?rev=14323&view=rev Author: dmichelsen Date: 2011-04-18 15:16:52 +0000 (Mon, 18 Apr 2011) Log Message: ----------- mGAR v2: Activate new pcopy merging instead of pax Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Added Paths: ----------- csw/mgar/gar/v2/bin/pcopy Added: csw/mgar/gar/v2/bin/pcopy =================================================================== --- csw/mgar/gar/v2/bin/pcopy (rev 0) +++ csw/mgar/gar/v2/bin/pcopy 2011-04-18 15:16:52 UTC (rev 14323) @@ -0,0 +1,163 @@ +#!/opt/csw/bin/perl + +use strict; +use warnings; +use DirHandle; +# use Cwd 'abs_path'; +use File::Copy; +use File::Find; +use File::Path qw(make_path); +use Pod::Usage; +use Getopt::Long; + +use Data::Dumper; + +# pcopy [-s ]* [--paxargs ]* +# Regex: -s 's,(/opt/csw/lib)/(.*\.so),\1/bdb33/\2,' +# Objectives: +# - Copy directory trees verbatim +# - exclude entries +# - rename / relocate entries on the fly +# - allow multiple renames (not just the first one as in "pax") +# - ignore existing umask and force 0755 / 0644 +# - if the target exists verify for identity or use "diff -D" if specified + +my $man = 0; +my $help = 0; +my $verbose = 0; +my $matchonly = 0; # Copy only files that match at least one regex +my @subst; + +GetOptions( + 's=s' => \@subst, + 'm|matchonly' => \$matchonly, + 'v' => \$verbose, + 'help|?' => \$help, + man => \$man) + or pod2usage(2); +pod2usage(1) if $help; +pod2usage(-exitstatus => 0, -verbose => 2) if $man; + +# Use newstyle regexps +s,\\(\d),\$$1,g foreach(@subst); + +# print Dumper( @subst ); + +pod2usage(1) if( @ARGV != 2 ); + +my ($fromdir, $todir) = @ARGV; + +if( ! -d $fromdir ) { + print STDERR "Source directory not found\n"; + exit( 1 ); +} + +if( ! -d $todir ) { + make_path( $todir, { verbose => 1, mode => 0775 } ); +} + +my %hardlinks; +sub docopy { + my $srcdir = $File::Find::dir; + my $name = $_; + my $whole = $fromdir . '/' . $File::Find::name; + + # print "D: $srcdir N: $name W: $whole\n"; + + # Apply substitutions from left to right + # multiple regexp applied in order, empty target -> exclude + + my $target = $File::Find::name; + my @matches = ($target); + my $didmatch = 0; + foreach my $s (@subst) { + my $t = $target; + $s =~ s/p$//; + $s =~ s/\\\(/(/; + $s =~ s/\\\)/)/; + # print "Regex: $s\n"; + eval( '$didmatch = 1 if( $target =~ s' . $s . ')'); + if( $t ne $target ) { + push @matches, $target; + #$didmatch = 1; + } + } + + if( !$didmatch && $matchonly ) { + return; + } + + print join( " >> ", @matches ), "\n" if( $matches[-1] ne '' ); + + if( $target eq '' ) { + return; + } + + my @path = split(/\//, $target); + my $targetdir = $todir . '/' . join( '/', @path[0..$#path-1] ); + + # Source was a directory, make target hierarchy + if( -e $targetdir && ! -d _ ) { + print "ERROR: The directory $File::Find::name is already present as file in $targetdir\n"; + } elsif( ! -d $targetdir ) { + make_path( $targetdir, {error => \my $err} ); + if (@$err) { + for my $diag (@$err) { + my ($target, $message) = %$diag; + if ($target eq '') { + print "general error: $message\n"; + } else { + print "problem unlinking $target: $message\n"; + } + } + } + } + if( -d $whole ) { + make_path( $todir . '/' . $target ); + return; + } + + # Copy with preserving hardlinks + if( -l $whole ) { + my $link = readlink( $whole ); + my $linktarget = $todir . '/' . $target; + if( -l $linktarget ) { + my $oldlink = readlink( $linktarget ); + if( $link ne $oldlink ) { + print "Could not link to $linktarget as there is already one pointing to $oldlink instead of the new $link\n"; + } + } elsif( -e $linktarget ) { + print "Could not link to $linktarget as there is some file already there\n"; + } else { + symlink( $link, $todir . '/' . $target ) or print "Could not link to $todir/$target\n"; + } + } else { + my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) + = stat($whole); + if( exists $hardlinks{$ino} ) { + link( $hardlinks{$ino}, $todir . '/' . $target ) or + print STDERR "Could not hardlink to ${target}\n"; + } else { + copy( $whole, $todir . '/' . $target ) or print "Copy failed\n"; + chmod( $mode, $todir . '/' . $target ); + $hardlinks{$ino} = $todir . '/' . $target; + } + } +} + +# Make output unbuffered +local( $| ) = 1; + +chdir( $fromdir ) or die "Cannot change to directory '$fromdir'\n"; +find({ wanted => \&docopy, no_chdir => 1 }, '.' ); + +=pod + +=head1 SYNOPSIS + + pcopy [-s ]* + -m Copy only matched files + +=cut + + Property changes on: csw/mgar/gar/v2/bin/pcopy ___________________________________________________________________ Added: svn:executable + * Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2011-04-18 14:50:40 UTC (rev 14322) +++ csw/mgar/gar/v2/gar.mk 2011-04-18 15:16:52 UTC (rev 14323) @@ -849,26 +849,27 @@ # This merges the merge-modulated: install-modulated pre-merge-modulated pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated + $(warning M: $(MERGE_DIRS)) @$(MAKECOOKIE) # Copy the whole tree verbatim merge-copy-all: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pcopy $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") \ . $(PKGROOT)) @$(MAKECOOKIE) # Copy only the merge directories merge-copy-only: $(PKGROOT) - $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pax -r -w -v $(_PAX_ARGS) \ - $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -s ",.*,," \ + $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pcopy $(_PAX_ARGS) \ + $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -m \ . $(PKGROOT) \ ) @$(MAKECOOKIE) # Copy the whole tree and relocate the directories in $(MERGE_DIRS) merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pcopy $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") \ . $(PKGROOT) \ ) @@ -876,15 +877,15 @@ # Copy only the relocated directories merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pax -r -w -v $(_PAX_ARGS) \ - $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \ + $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pcopy $(_PAX_ARGS) \ + $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -m \ . $(PKGROOT) \ ) @$(MAKECOOKIE) # Copy merge-copy-config-only: - $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pax -r -w -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pcopy $(_PAX_ARGS) \ -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \ -s ",.*,," \ . $(PKGROOT) \ @@ -895,12 +896,13 @@ remerge: reset-merge merge reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-alternatives reset-merge-distfile-README.CSW reset-merge-distfile-changelog.CSW reset-merge-obsolete reset-merge-ap2mod reset-merge-php5ext reset-merge-src - @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge - @rm -rf $(PKGROOT) + rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge + rm -rf $(PKGROOT) reset-merge-modulated: @$(call _pmod,Reset merge state) - @rm -f $(COOKIEDIR)/merge-* + echo rm -f $(COOKIEDIR)/merge-* + rm -f $(COOKIEDIR)/merge-* # The clean rule. It must be run if you want to re-download a # file after a successful checksum (or just remove the checksum This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Apr 19 00:48:33 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 18 Apr 2011 22:48:33 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[371] gar-wrapper/bash_completion.mgar Message-ID: Revision: 371 http://opencsw.svn.sourceforge.net/opencsw/?rev=371&view=rev Author: skayser Date: 2011-04-18 22:48:33 +0000 (Mon, 18 Apr 2011) Log Message: ----------- mgar: add upstream commands to bash completion Modified Paths: -------------- gar-wrapper/bash_completion.mgar Modified: gar-wrapper/bash_completion.mgar =================================================================== --- gar-wrapper/bash_completion.mgar 2011-04-15 13:17:56 UTC (rev 370) +++ gar-wrapper/bash_completion.mgar 2011-04-18 22:48:33 UTC (rev 371) @@ -21,11 +21,11 @@ done misctgts="modenv ccenv" - mgarcmds="help init index locate up commit show-srcdir show-stagedir" mgarcmds="${mgarcmds} find-file edit-file show-buildsys show-pkgtree version" + ustreamcmds="check-upstream get-uwatch-configuration" - opts="${buildtgts} ${misctgts} ${mgarcmds}" + opts="${buildtgts} ${misctgts} ${mgarcmds} ${ustreamcmds}" if [[ ${prev} == "mgar" ]] ; then COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Apr 19 21:03:43 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 19 Apr 2011 19:03:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14324] csw/mgar/pkg/pidgin_sipe/trunk/ Message-ID: Revision: 14324 http://gar.svn.sourceforge.net/gar/?rev=14324&view=rev Author: skayser Date: 2011-04-19 19:03:42 +0000 (Tue, 19 Apr 2011) Log Message: ----------- pidgin_sipe/trunk: added missing svn:externals def Property Changed: ---------------- csw/mgar/pkg/pidgin_sipe/trunk/ Property changes on: csw/mgar/pkg/pidgin_sipe/trunk ___________________________________________________________________ Added: 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 bdwalton at users.sourceforge.net Tue Apr 19 21:53:58 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 19 Apr 2011 19:53:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[14325] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 14325 http://gar.svn.sourceforge.net/gar/?rev=14325&view=rev Author: bdwalton Date: 2011-04-19 19:53:58 +0000 (Tue, 19 Apr 2011) Log Message: ----------- gardev/trunk: depend on CSWpy-mako now. Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2011-04-19 19:03:42 UTC (rev 14324) +++ csw/mgar/pkg/gardev/trunk/Makefile 2011-04-19 19:53:58 UTC (rev 14325) @@ -25,7 +25,7 @@ RUNTIME_DEP_PKGS_CSWgar-dev += CSWxz CSWgfile CSWpy-hachoir-core RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-hachoir-parser CSWpy-libmagic RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-progressbar CSWpy-sqlobject CSWpy-yaml -RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-curl +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-curl CSWpy-mako MASTER_SITES = 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 Apr 19 21:54:39 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 19 Apr 2011 19:54:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14326] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 14326 http://gar.svn.sourceforge.net/gar/?rev=14326&view=rev Author: dmichelsen Date: 2011-04-19 19:54:38 +0000 (Tue, 19 Apr 2011) Log Message: ----------- openldap: Fix #4759 (configuration file migration does not work) and update to new defaults Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2011-04-19 19:53:58 UTC (rev 14325) +++ csw/mgar/pkg/openldap/trunk/Makefile 2011-04-19 19:54:38 UTC (rev 14326) @@ -85,7 +85,7 @@ sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw -MIGRATECONF = openldap +MIGRATE_FILES = openldap # Is this causing this? # https://www.opencsw.org/mantis/view.php?id=4555 @@ -96,7 +96,6 @@ NODIRPATHS = --docdir BUILD64 = 1 -NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-crypt CONFIGURE_ARGS += --enable-lmpasswd @@ -130,7 +129,6 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL)) SKIPTEST ?= 1 -TEST_TARGET = check MERGE_SCRIPTS_isa-default-version-2.3.43 = copy-only MERGE_DIRS_isa-default-version-2.3.43 = $(libdir) @@ -142,8 +140,8 @@ MERGE_DIRS_isa-default64-version-2.4.23 = $(bindir) $(sbindir) $(libexecdir) $(libdir) # Perl backend is built, although it has been told not to. -EXTRA_PAX_ARGS = -s,.*/opt/csw/libexec/sparcv9/openldap/back_perl.*,, -EXTRA_PAX_ARGS = -s,.*/opt/csw/libexec/amd64/openldap/back_perl.*,, +EXTRA_PAX_ARGS = -s ,.*/opt/csw/libexec/sparcv9/openldap/back_perl.*,, +EXTRA_PAX_ARGS = -s ,.*/opt/csw/libexec/amd64/openldap/back_perl.*,, # Make sure we do not use the 2.3 .so-links in any case EXTRA_MERGE_EXCLUDE_FILES_isa-i386-version-2.3.43 = .*\.so 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 Apr 19 22:19:49 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 19 Apr 2011 20:19:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14327] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14327 http://gar.svn.sourceforge.net/gar/?rev=14327&view=rev Author: bdwalton Date: 2011-04-19 20:19:49 +0000 (Tue, 19 Apr 2011) Log Message: ----------- bacula/trunk: set default archive dir to be under /var/opt/csw/bacula (default was /tmp) Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-19 19:54:38 UTC (rev 14326) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-19 20:19:49 UTC (rev 14327) @@ -132,6 +132,7 @@ PKGFILES_CSWbacula-sd += .*man8/bls.8.gz .*man8/btape.8.gz .*bacula/working PKGFILES_CSWbacula-sd += .*man8/bcopy.8.gz .*man8/bscan.8.gz PKGFILES_CSWbacula-sd += /var/opt/csw/run +PKGFILES_CSWbacula-sd += $(localstatedir)/$(NAME)/archive CATALOGNAME_CSWbacula-director = bacula_director SPKG_DESC_CSWbacula-director = $(DESCRIPTION) - Director @@ -169,6 +170,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-working-dir=$(localstatedir)/$(NAME)/working +CONFIGURE_ARGS += --with-archivedir=$(localstatedir)/$(NAME)/archive CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) CONFIGURE_ARGS += --with-libintl-prefix=$(prefix) CONFIGURE_ARGS += --disable-conio This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Apr 19 22:28:49 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 19 Apr 2011 20:28:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14328] csw/mgar/pkg Message-ID: Revision: 14328 http://gar.svn.sourceforge.net/gar/?rev=14328&view=rev Author: skayser Date: 2011-04-19 20:28:48 +0000 (Tue, 19 Apr 2011) Log Message: ----------- various pkgs: add missing svn:externals ref Property Changed: ---------------- csw/mgar/pkg/djbdns/trunk/ csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/ csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/ csw/mgar/pkg/gsasl/trunk/ csw/mgar/pkg/lang-python/py_antlr/trunk/ csw/mgar/pkg/npadmin/trunk/ csw/mgar/pkg/php5/branches/re-enable-extensions/legacy/php5-apache/trunk/ csw/mgar/pkg/php5/branches/re-enable-extensions/legacy/php5-apache2/trunk/ csw/mgar/pkg/php5/trunk/legacy/php5-apache/trunk/ csw/mgar/pkg/php5/trunk/legacy/php5-apache2/trunk/ csw/mgar/pkg/rrdtool/branches/benny/ csw/mgar/pkg/rrdtool/branches/ihsan/ csw/mgar/pkg/rrdtool/trunk/ csw/mgar/pkg/scummvm/trunk/ csw/mgar/pkg/sendmail/branches/benny/ Property changes on: csw/mgar/pkg/djbdns/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/gnome-base/libgnomecanvas/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/gsasl/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/lang-python/py_antlr/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/npadmin/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/php5/branches/re-enable-extensions/legacy/php5-apache/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/php5/branches/re-enable-extensions/legacy/php5-apache2/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/php5/trunk/legacy/php5-apache/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/php5/trunk/legacy/php5-apache2/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/rrdtool/branches/benny ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/rrdtool/branches/ihsan ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/rrdtool/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/scummvm/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/sendmail/branches/benny ___________________________________________________________________ Added: 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 bdwalton at users.sourceforge.net Tue Apr 19 22:30:10 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 19 Apr 2011 20:30:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14329] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14329 http://gar.svn.sourceforge.net/gar/?rev=14329&view=rev Author: bdwalton Date: 2011-04-19 20:30:10 +0000 (Tue, 19 Apr 2011) Log Message: ----------- bacula/trunk: no need to kill the tmp dir now that we use a specific archive directory Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-19 20:28:48 UTC (rev 14328) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-19 20:30:10 UTC (rev 14329) @@ -217,7 +217,3 @@ @(ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/run) @(ginstall -d -m 0755 $(DOCD); gcp -pR $(WORKSRC)/examples $(DOCD)) @$(MAKECOOKIE) - -post-merge: - @(cd $(PKGROOT); rmdir tmp) - @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Apr 19 22:57:10 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 19 Apr 2011 20:57:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14330] csw/mgar/pkg/mono/trunk Message-ID: Revision: 14330 http://gar.svn.sourceforge.net/gar/?rev=14330&view=rev Author: rthurner Date: 2011-04-19 20:57:09 +0000 (Tue, 19 Apr 2011) Log Message: ----------- mono: upgrade to 2.6.10 Modified Paths: -------------- csw/mgar/pkg/mono/trunk/Makefile csw/mgar/pkg/mono/trunk/checksums Modified: csw/mgar/pkg/mono/trunk/Makefile =================================================================== --- csw/mgar/pkg/mono/trunk/Makefile 2011-04-19 20:30:10 UTC (rev 14329) +++ csw/mgar/pkg/mono/trunk/Makefile 2011-04-19 20:57:09 UTC (rev 14330) @@ -1,5 +1,5 @@ NAME = mono -VERSION = 1.1.10 +VERSION = 2.10.1 CATEGORIES = lang DESCRIPTION = Mono Runtime @@ -10,8 +10,8 @@ based on the ECMA standards for C# and the Common Language Infrastructure. endef -MASTER_SITES = http://go-mono.com/sources/mono-1.1/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = http://ftp.novell.com/pub/mono/sources/mono/ +DISTFILES = $(NAME)-$(VERSION).tar.bz2 DISTFILES += CSWmono.gspec CSWmono.depend CSWmono.prototype # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/mono/trunk/checksums =================================================================== --- csw/mgar/pkg/mono/trunk/checksums 2011-04-19 20:30:10 UTC (rev 14329) +++ csw/mgar/pkg/mono/trunk/checksums 2011-04-19 20:57:09 UTC (rev 14330) @@ -1,4 +1 @@ -dd04088e82b7cf69a417fd06bddd9148 download/mono-1.1.10.tar.gz -2b883f6d3317bc8f0578cc8da1b0a3e8 download/CSWmono.gspec -a24e2eff327ffa4cfdd4aef65d263aab download/CSWmono.depend -3f4e5f8917e4899c0403fa24c88ba754 download/CSWmono.prototype +ae8d1875447527599e68dd6c1d82bc11 mono-2.10.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Apr 20 00:07:46 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 19 Apr 2011 22:07:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[14331] csw/mgar/pkg Message-ID: Revision: 14331 http://gar.svn.sourceforge.net/gar/?rev=14331&view=rev Author: skayser Date: 2011-04-19 22:07:45 +0000 (Tue, 19 Apr 2011) Log Message: ----------- move newpkg-* template to separate mako templates Modified Paths: -------------- csw/mgar/pkg/Makefile csw/mgar/pkg/cpan/Makefile csw/mgar/pkg/newpkg-Makefile csw/mgar/pkg/xfce/Makefile Added Paths: ----------- csw/mgar/pkg/cpan/newpkg-Makefile csw/mgar/pkg/xfce/newpkg-Makefile Modified: csw/mgar/pkg/Makefile =================================================================== --- csw/mgar/pkg/Makefile 2011-04-19 20:57:09 UTC (rev 14330) +++ csw/mgar/pkg/Makefile 2011-04-19 22:07:45 UTC (rev 14331) @@ -69,32 +69,10 @@ newpkg-%: @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files @svn cp template/Makefile $*/Makefile - @(echo '# $$Id$$'; \ - echo "NAME = $*"; \ - echo "VERSION = 1.0"; \ - echo "CATEGORIES = category"; \ - echo ""; \ - echo "DESCRIPTION = Brief description"; \ - echo "define BLURB"; \ - echo " Long description"; \ - echo "endef"; \ - echo ""; \ - echo "MASTER_SITES = "; \ - echo "DISTFILES = $$(DISTNAME).tar.gz"; \ - echo ""; \ - echo "# File name regex to get notifications about upstream software releases"; \ - echo "# NOTE: Use this only if the automatic regex creation"; \ - echo "# does not work for your package"; \ - echo "# UFILES_REGEX = $$(NAME)-(\d+(?:\.\d+)*).tar.gz"; \ - echo ""; \ - echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ - echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ - echo "# UPSTREAM_MASTER_SITES = "; \ - echo ""; \ - echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ - echo ""; \ - echo "include gar/category.mk"; \ - ) > $*/trunk/Makefile + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile @touch $*/trunk/checksums @svn add $*/trunk/Makefile $*/trunk/checksums @svn ps svn:keywords Id $*/trunk/Makefile Modified: csw/mgar/pkg/cpan/Makefile =================================================================== --- csw/mgar/pkg/cpan/Makefile 2011-04-19 20:57:09 UTC (rev 14330) +++ csw/mgar/pkg/cpan/Makefile 2011-04-19 22:07:45 UTC (rev 14331) @@ -26,32 +26,17 @@ $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ done -lcase = $(shell echo $(1) | tr '[A-Z]' '[a-z]' ) - # You can either use "gmake newpkg-Perl-Module" or "gmake newpkg-Perl::Module". # Ideally this would also figure out the AUTHOR by querying CPAN. Alternatively # we might think about dropping the AUTHOR field and determine that on the fly # during the build. Ideas? -newpkg-%: catalogname = $(call lcase,$(subst ::,_,$*)) -newpkg-%: pkgname = $(call lcase,$(subst ::,-,$*)) newpkg-%: dir = $(subst ::,-,$*) newpkg-%: @svn mkdir $(dir) $(dir)/tags $(dir)/branches $(dir)/trunk $(dir)/trunk/files - @(echo "NAME = $(dir)"; \ - echo "VERSION = 1.0"; \ - echo "CATEGORIES = cpan"; \ - echo "AUTHOR = MYSELF"; \ - echo ""; \ - echo "DESCRIPTION = Brief description"; \ - echo "define BLURB"; \ - echo " Long description"; \ - echo "endef"; \ - echo ""; \ - echo "PACKAGES = CSWpm-$(pkgname)"; \ - echo "CATALOGNAME = pm_$(catalogname)"; \ - echo ""; \ - echo "include gar/category.mk"; \ - ) > $(dir)/trunk/Makefile + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $(dir)/trunk/Makefile @touch $(dir)/trunk/checksums @svn add $(dir)/trunk/Makefile $(dir)/trunk/checksums @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $(dir)/trunk Added: csw/mgar/pkg/cpan/newpkg-Makefile =================================================================== --- csw/mgar/pkg/cpan/newpkg-Makefile (rev 0) +++ csw/mgar/pkg/cpan/newpkg-Makefile 2011-04-19 22:07:45 UTC (rev 14331) @@ -0,0 +1,19 @@ +<% + package_name = name.replace("::","-").lower() + catalog_name = name.replace("::","_").lower() +%> +NAME = ${name} +VERSION = ${version} +GARTYPE = v2 +CATEGORIES = cpan +AUTHOR = MYSELF + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +PACKAGES = CSWpm-${package_name} +CATALOGNAME = pm_${catalog_name} + +include gar/category.mk Modified: csw/mgar/pkg/newpkg-Makefile =================================================================== --- csw/mgar/pkg/newpkg-Makefile 2011-04-19 20:57:09 UTC (rev 14330) +++ csw/mgar/pkg/newpkg-Makefile 2011-04-19 22:07:45 UTC (rev 14331) @@ -1,8 +1,9 @@ # $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ # TODO (release-critical prefixed with !, non release-critical with *) # -NAME = %NAME% -VERSION = %VERSION% +NAME = ${name} +VERSION = ${version} +GARTYPE = v2 CATEGORIES = category DESCRIPTION = Brief description Modified: csw/mgar/pkg/xfce/Makefile =================================================================== --- csw/mgar/pkg/xfce/Makefile 2011-04-19 20:57:09 UTC (rev 14330) +++ csw/mgar/pkg/xfce/Makefile 2011-04-19 22:07:45 UTC (rev 14331) @@ -28,40 +28,16 @@ newpkg-%: @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files - @(echo "NAME = $*"; \ - echo "VERSION = 1.0"; \ - echo "CATEGORIES = category"; \ - echo ""; \ - echo "DESCRIPTION = Brief description"; \ - echo "define BLURB"; \ - echo " Long description"; \ - echo "endef"; \ - echo ""; \ - echo "MASTER_SITES = "; \ - echo "DISTFILES = $$(NAME)-$$(VERSION).tar.gz"; \ - echo "DISTFILES += $$(call admfiles,CSWpackage,)"; \ - echo ""; \ - echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ - echo "UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz"; \ - echo ""; \ - echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ - echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ - echo "# UPSTREAM_MASTER_SITES = "; \ - echo ""; \ - echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ - echo ""; \ - echo "include gar/category.mk"; \ - ) > $*/trunk/Makefile + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile @svn add $*/trunk/Makefile - @(echo "%var bitname package"; \ - echo "%var pkgname CSWpackage"; \ - echo "%include url file://%{PKGLIB}/csw_dyndepend.gspec";\ - echo "%copyright url file://%{WORKSRC}/LICENSE"; \ - ) > $*/trunk/files/CSWpackage.gspec @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk @echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk - @svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar + @if [ -d ../../gar/v2 ]; then \ + ln -s ../../../../gar/v2 $*/trunk/gar; \ + else \ + svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \ + fi @echo @echo "Your package is set up for editing at $*/trunk" - @echo "Please don't forget to add the gspec-file!" - Added: csw/mgar/pkg/xfce/newpkg-Makefile =================================================================== --- csw/mgar/pkg/xfce/newpkg-Makefile (rev 0) +++ csw/mgar/pkg/xfce/newpkg-Makefile 2011-04-19 22:07:45 UTC (rev 14331) @@ -0,0 +1,23 @@ +NAME = ${name} +VERSION = ${version} +GARTYPE = v2 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases # NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +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 Apr 20 11:46:47 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Apr 2011 09:46:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14332] csw/mgar/pkg Message-ID: Revision: 14332 http://gar.svn.sourceforge.net/gar/?rev=14332&view=rev Author: dmichelsen Date: 2011-04-20 09:46:47 +0000 (Wed, 20 Apr 2011) Log Message: ----------- libsigsegv0: Initial commit, split from version modulation Modified Paths: -------------- csw/mgar/pkg/libsigsegv0/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libsigsegv0/ Modified: csw/mgar/pkg/libsigsegv0/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsigsegv/trunk/Makefile 2011-04-19 22:07:45 UTC (rev 14331) +++ csw/mgar/pkg/libsigsegv0/trunk/Makefile 2011-04-20 09:46:47 UTC (rev 14332) @@ -1,8 +1,6 @@ NAME = libsigsegv -VERSION = 2.9 +VERSION = 2.6 CATEGORIES = lib -EXTRA_MODULATORS = VERSION -MODULATIONS_VERSION = 2.6 2.9 DESCRIPTION = A library for catching and handling segmentation faults define BLURB @@ -11,59 +9,17 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(NAME)-$(VERSION).tar.gz -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION),$(NAME)-$(VERSION).tar.gz) -DISTFILES = $(SOURCEFILES) -NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz, $(SOURCEFILES)) - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - PACKAGES += CSWlibsigsegv0 -PACKAGES += CSWlibsigsegv2 -PACKAGES += CSWlibsigsegv-devel -PACKAGES += CSWlibsigsegv - CATALOGNAME_CSWlibsigsegv0 = libsigsegv0 -CATALOGNAME_CSWlibsigsegv2 = libsigsegv2 -CATALOGNAME_CSWlibsigsegv-devel = libsigsegv_devel -CATALOGNAME_CSWlibsigsegv = libsigsegv - SPKG_DESC_CSWlibsigsegv0 = A library for catching and handling segmentation faults, libsigsegv.so.0 -SPKG_DESC_CSWlibsigsegv2 = A library for catching and handling segmentation faults, libsigsegv.so.2 -SPKG_DESC_CSWlibsigsegv = Empty stub as contents has been moved to CSWlibsigsegv0 and CSWlibsigsegv2 -SPKG_DESC_CSWlibsigsegv-devel = Development files for libsigsegv +PKGFILES_CSWlibsigsegv0 += $(call pkgfiles_lib,libsigsegv.so.0) -# This is a legacy stub dependency only. Remove after last package to CSWlibsigsegv has been updated. -# Initially it depended only on CSWlibsigsegv0, but in the meantime updates from the dependent -# packages came out linking to .so.2, so we must now depend on both. -RUNTIME_DEP_PKGS_CSWlibsigsegv = CSWlibsigsegv0 CSWlibsigsegv2 -CHECKPKG_OVERRIDES_CSWlibsigsegv += surplus-dependency|CSWlibsigsegv0 -CHECKPKG_OVERRIDES_CSWlibsigsegv += surplus-dependency|CSWlibsigsegv2 +VENDOR_URL = http://www.gnu.org/software/libsigsegv/ -ARCHALL_CSWlibsigsegv = 1 - -SPKG_SOURCEURL = http://www.gnu.org/software/libsigsegv/ - BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared --disable-static -TEST_TARGET = check - -MERGE_SCRIPTS_isa-default-version-2.6 = copy-only -MERGE_DIRS_isa-default-version-2.6 = $(libdir) -MERGE_SCRIPTS_isa-default64-version-2.6 = copy-relocated-only -MERGE_DIRS_isa-default64-version-2.6 = $(libdir) - -MERGE_SCRIPTS_isa-default-version-2.9 = copy-all -MERGE_SCRIPTS_isa-default64-version-2.9 = copy-relocated-only -MERGE_DIRS_isa-default64-version-2.9 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - -PKGFILES_CSWlibsigsegv0 += $(call baseisadirs,$(libdir),[^/]*\.so\.0(\.[0-9\.]+)?) -PKGFILES_CSWlibsigsegv2 += $(call baseisadirs,$(libdir),[^/]*\.so\.2(\.[0-9\.]+)?) -PKGFILES_CSWlibsigsegv = NOFILES -# CSWlibsigsegv-devel is catch-all - 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 Apr 20 11:47:17 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Apr 2011 09:47:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14333] csw/mgar/pkg/mtools/trunk Message-ID: Revision: 14333 http://gar.svn.sourceforge.net/gar/?rev=14333&view=rev Author: dmichelsen Date: 2011-04-20 09:47:17 +0000 (Wed, 20 Apr 2011) Log Message: ----------- mtools: Update to 4.0.16 and remove defaults from new standard Modified Paths: -------------- csw/mgar/pkg/mtools/trunk/Makefile csw/mgar/pkg/mtools/trunk/checksums Modified: csw/mgar/pkg/mtools/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtools/trunk/Makefile 2011-04-20 09:46:47 UTC (rev 14332) +++ csw/mgar/pkg/mtools/trunk/Makefile 2011-04-20 09:47:17 UTC (rev 14333) @@ -1,5 +1,5 @@ NAME = mtools -VERSION = 4.0.15 +VERSION = 4.0.16 CATEGORIES = utils DESCRIPTION = Read/write/list/format DOS disks under Unix @@ -20,8 +20,4 @@ EXTRA_LINKER_FLAGS = -liconv -lnsl -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - include gar/category.mk Modified: csw/mgar/pkg/mtools/trunk/checksums =================================================================== --- csw/mgar/pkg/mtools/trunk/checksums 2011-04-20 09:46:47 UTC (rev 14332) +++ csw/mgar/pkg/mtools/trunk/checksums 2011-04-20 09:47:17 UTC (rev 14333) @@ -1 +1 @@ -59f49e8290997d6c1ae0c330e8899287 mtools-4.0.15.tar.lz +324c85788e895c628755bcbef35b1114 mtools-4.0.16.tar.lz 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 Apr 20 14:03:21 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Apr 2011 12:03:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[14334] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 14334 http://gar.svn.sourceforge.net/gar/?rev=14334&view=rev Author: dmichelsen Date: 2011-04-20 12:03:21 +0000 (Wed, 20 Apr 2011) Log Message: ----------- mGAR v2: Fix wrong parantheses in obsoletion resulting in only the last dependency dropped in obsoletion file Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-04-20 09:47:17 UTC (rev 14333) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-04-20 12:03:21 UTC (rev 14334) @@ -719,12 +719,12 @@ $(_DBG_MERGE)rm -f $(COOKIEDIR)/merge-distfile-$* $(foreach SPEC,$(_PKG_SPECS),$(PKGROOT)$(docdir)/$(call catalogname,$(SPEC))/$*) merge-obsolete: $(WORKDIR_GLOBAL) - $(_DBG_MERGE)$(foreach P,$(OBSOLETED_PKGS),$(foreach Q,$(OBSOLETING_PKGS),$(if $(filter $P,$(OBSOLETED_BY_$Q)), \ - ($(if $(SPKG_DESC_$Q), \ + $(_DBG_MERGE)$(foreach P,$(OBSOLETED_PKGS),($(foreach Q,$(OBSOLETING_PKGS),$(if $(filter $P,$(OBSOLETED_BY_$Q)), \ + $(if $(SPKG_DESC_$Q), \ echo "$Q $(call catalogname,$Q) - $(SPKG_DESC_$Q)";, \ echo "$(shell (/usr/bin/pkginfo $Q || echo "$Q - ") | $(GAWK) '{ $$1 = "P"; print }')"; \ - )) > $(WORKDIR_GLOBAL)/$P.obsolete; \ - ))) + )))) > $(WORKDIR_GLOBAL)/$P.obsolete; \ + ) @$(MAKECOOKIE) .PHONY: reset-merge-obsolete 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 Apr 20 14:13:18 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Apr 2011 12:13:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14335] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 14335 http://gar.svn.sourceforge.net/gar/?rev=14335&view=rev Author: dmichelsen Date: 2011-04-20 12:13:18 +0000 (Wed, 20 Apr 2011) Log Message: ----------- mGAR v2: Tiny formatting adjustment of obsoletions Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-04-20 12:03:21 UTC (rev 14334) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-04-20 12:13:18 UTC (rev 14335) @@ -722,7 +722,7 @@ $(_DBG_MERGE)$(foreach P,$(OBSOLETED_PKGS),($(foreach Q,$(OBSOLETING_PKGS),$(if $(filter $P,$(OBSOLETED_BY_$Q)), \ $(if $(SPKG_DESC_$Q), \ echo "$Q $(call catalogname,$Q) - $(SPKG_DESC_$Q)";, \ - echo "$(shell (/usr/bin/pkginfo $Q || echo "$Q - ") | $(GAWK) '{ $$1 = "P"; print }')"; \ + echo "$(shell (/usr/bin/pkginfo $Q || echo "$Q - ") | perl -npe 's/^\S*\s//;s/\s+/ /')"; \ )))) > $(WORKDIR_GLOBAL)/$P.obsolete; \ ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 20 14:14:30 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Apr 2011 12:14:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[14336] csw/mgar/pkg/libsigsegv/trunk Message-ID: Revision: 14336 http://gar.svn.sourceforge.net/gar/?rev=14336&view=rev Author: dmichelsen Date: 2011-04-20 12:14:29 +0000 (Wed, 20 Apr 2011) Log Message: ----------- libsigsegv: Remove version modulation, update to 2.10, adjust to new defaults Modified Paths: -------------- csw/mgar/pkg/libsigsegv/trunk/Makefile csw/mgar/pkg/libsigsegv/trunk/checksums Modified: csw/mgar/pkg/libsigsegv/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsigsegv/trunk/Makefile 2011-04-20 12:13:18 UTC (rev 14335) +++ csw/mgar/pkg/libsigsegv/trunk/Makefile 2011-04-20 12:14:29 UTC (rev 14336) @@ -1,8 +1,6 @@ NAME = libsigsegv -VERSION = 2.9 +VERSION = 2.10 CATEGORIES = lib -EXTRA_MODULATORS = VERSION -MODULATIONS_VERSION = 2.6 2.9 DESCRIPTION = A library for catching and handling segmentation faults define BLURB @@ -11,59 +9,29 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(NAME)-$(VERSION).tar.gz -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION),$(NAME)-$(VERSION).tar.gz) -DISTFILES = $(SOURCEFILES) -NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz, $(SOURCEFILES)) - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -PACKAGES += CSWlibsigsegv0 PACKAGES += CSWlibsigsegv2 -PACKAGES += CSWlibsigsegv-devel -PACKAGES += CSWlibsigsegv - -CATALOGNAME_CSWlibsigsegv0 = libsigsegv0 CATALOGNAME_CSWlibsigsegv2 = libsigsegv2 -CATALOGNAME_CSWlibsigsegv-devel = libsigsegv_devel -CATALOGNAME_CSWlibsigsegv = libsigsegv - -SPKG_DESC_CSWlibsigsegv0 = A library for catching and handling segmentation faults, libsigsegv.so.0 SPKG_DESC_CSWlibsigsegv2 = A library for catching and handling segmentation faults, libsigsegv.so.2 -SPKG_DESC_CSWlibsigsegv = Empty stub as contents has been moved to CSWlibsigsegv0 and CSWlibsigsegv2 -SPKG_DESC_CSWlibsigsegv-devel = Development files for libsigsegv +PKGFILES_CSWlibsigsegv2 += $(call pkgfiles_lib,libsigsegv.so.2) +OBSOLETED_BY_CSWlibsigsegv2 = CSWlibsigsegv -# This is a legacy stub dependency only. Remove after last package to CSWlibsigsegv has been updated. -# Initially it depended only on CSWlibsigsegv0, but in the meantime updates from the dependent -# packages came out linking to .so.2, so we must now depend on both. -RUNTIME_DEP_PKGS_CSWlibsigsegv = CSWlibsigsegv0 CSWlibsigsegv2 -CHECKPKG_OVERRIDES_CSWlibsigsegv += surplus-dependency|CSWlibsigsegv0 -CHECKPKG_OVERRIDES_CSWlibsigsegv += surplus-dependency|CSWlibsigsegv2 +FOREIGN_PACKAGES += CSWlibsigsegv0 +OBSOLETED_BY_CSWlibsigsegv0 = CSWlibsigsegv -ARCHALL_CSWlibsigsegv = 1 +PACKAGES += CSWlibsigsegv-dev +CATALOGNAME_CSWlibsigsegv-dev = libsigsegv_dev +SPKG_DESC_CSWlibsigsegv-dev = Development files for libsigsegv.so.2 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibsigsegv-dev += CSWlibsigsegv2 +OBSOLETED_BY_CSWlibsigsegv-dev = CSWlibsigsegv-devel -SPKG_SOURCEURL = http://www.gnu.org/software/libsigsegv/ +VENDOR_URL = http://www.gnu.org/software/libsigsegv/ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared --disable-static -TEST_TARGET = check -MERGE_SCRIPTS_isa-default-version-2.6 = copy-only -MERGE_DIRS_isa-default-version-2.6 = $(libdir) -MERGE_SCRIPTS_isa-default64-version-2.6 = copy-relocated-only -MERGE_DIRS_isa-default64-version-2.6 = $(libdir) - -MERGE_SCRIPTS_isa-default-version-2.9 = copy-all -MERGE_SCRIPTS_isa-default64-version-2.9 = copy-relocated-only -MERGE_DIRS_isa-default64-version-2.9 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - -PKGFILES_CSWlibsigsegv0 += $(call baseisadirs,$(libdir),[^/]*\.so\.0(\.[0-9\.]+)?) -PKGFILES_CSWlibsigsegv2 += $(call baseisadirs,$(libdir),[^/]*\.so\.2(\.[0-9\.]+)?) -PKGFILES_CSWlibsigsegv = NOFILES -# CSWlibsigsegv-devel is catch-all - include gar/category.mk Modified: csw/mgar/pkg/libsigsegv/trunk/checksums =================================================================== --- csw/mgar/pkg/libsigsegv/trunk/checksums 2011-04-20 12:13:18 UTC (rev 14335) +++ csw/mgar/pkg/libsigsegv/trunk/checksums 2011-04-20 12:14:29 UTC (rev 14336) @@ -1,2 +1 @@ -7e24993730649d13c6eabc28bd24de35 libsigsegv-2.6.tar.gz -0bef39a96abacabec6a191dc7fd42ba3 libsigsegv-2.9.tar.gz +7f96fb1f65b3b8cbc1582fb7be774f0f libsigsegv-2.10.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 Apr 20 14:15:03 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Apr 2011 12:15:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14337] csw/mgar/pkg/lzo/trunk/Makefile Message-ID: Revision: 14337 http://gar.svn.sourceforge.net/gar/?rev=14337&view=rev Author: dmichelsen Date: 2011-04-20 12:15:03 +0000 (Wed, 20 Apr 2011) Log Message: ----------- lzo: Update to new defaults Modified Paths: -------------- csw/mgar/pkg/lzo/trunk/Makefile Modified: csw/mgar/pkg/lzo/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzo/trunk/Makefile 2011-04-20 12:14:29 UTC (rev 14336) +++ csw/mgar/pkg/lzo/trunk/Makefile 2011-04-20 12:15:03 UTC (rev 14337) @@ -10,9 +10,6 @@ MASTER_SITES = http://www.oberhumer.com/opensource/lzo/download/ DISTFILES = $(NAME)-$(VERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - PACKAGES += CSWliblzo-dev CATALOGNAME_CSWliblzo-dev = liblzo_dev SPKG_DESC_CSWliblzo-dev = Development files for liblzo2.so.2 @@ -23,16 +20,16 @@ PACKAGES += CSWliblzo2-2 CATALOGNAME_CSWliblzo2-2 = liblzo2_2 SPKG_DESC_CSWliblzo2-2 = Library for LZO compression providing liblzo2.so.2 -PKGFILES_CSWliblzo2-2 = $(call baseisadirs,$(libdir),liblzo2\.so\.2(\.\d+)*) +PKGFILES_CSWliblzo2-2 = $(call pkgfiles_lib,liblzo2.so.2) OBSOLETED_BY_CSWliblzo2-2 = CSWlzo VENDOR_URL = http://www.oberhumer.com/opensource/lzo/ -CONFIGURE_ARGS_isa-amd64 = --disable-asm - BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared --disable-static + +CONFIGURE_ARGS_isa-amd64 = --disable-asm CONFIGURE_ARGS += $(CONFIGURE_ARGS_isa-$(ISA)) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Apr 20 14:56:47 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 20 Apr 2011 12:56:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14338] csw/mgar/pkg/jpegoptim/trunk Message-ID: Revision: 14338 http://gar.svn.sourceforge.net/gar/?rev=14338&view=rev Author: bonivart Date: 2011-04-20 12:56:47 +0000 (Wed, 20 Apr 2011) Log Message: ----------- jpegoptim/trunk: Update to 1.2.4 Modified Paths: -------------- csw/mgar/pkg/jpegoptim/trunk/Makefile csw/mgar/pkg/jpegoptim/trunk/checksums Added Paths: ----------- csw/mgar/pkg/jpegoptim/trunk/files/0001-Remove-Wall-reference.patch Modified: csw/mgar/pkg/jpegoptim/trunk/Makefile =================================================================== --- csw/mgar/pkg/jpegoptim/trunk/Makefile 2011-04-20 12:15:03 UTC (rev 14337) +++ csw/mgar/pkg/jpegoptim/trunk/Makefile 2011-04-20 12:56:47 UTC (rev 14338) @@ -1,5 +1,5 @@ NAME = jpegoptim -VERSION = 1.2.3 +VERSION = 1.2.4 CATEGORIES = utils DESCRIPTION = Utility to optimize jpeg files @@ -10,11 +10,10 @@ MASTER_SITES = http://www.kokkonen.net/tjko/src/ DISTFILES = $(NAME)-$(VERSION).tar.gz +PATCHFILES += 0001-Remove-Wall-reference.patch + RUNTIME_DEP_PKGS = CSWjpeg -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - TEST_TARGET = INSTALL_SCRIPTS = custom Modified: csw/mgar/pkg/jpegoptim/trunk/checksums =================================================================== --- csw/mgar/pkg/jpegoptim/trunk/checksums 2011-04-20 12:15:03 UTC (rev 14337) +++ csw/mgar/pkg/jpegoptim/trunk/checksums 2011-04-20 12:56:47 UTC (rev 14338) @@ -1 +1 @@ -36afa60f8baac825935e215eb19e41e0 jpegoptim-1.2.3.tar.gz +40e8e627181f524ad29717c5b07cd442 jpegoptim-1.2.4.tar.gz Added: csw/mgar/pkg/jpegoptim/trunk/files/0001-Remove-Wall-reference.patch =================================================================== --- csw/mgar/pkg/jpegoptim/trunk/files/0001-Remove-Wall-reference.patch (rev 0) +++ csw/mgar/pkg/jpegoptim/trunk/files/0001-Remove-Wall-reference.patch 2011-04-20 12:56:47 UTC (rev 14338) @@ -0,0 +1,25 @@ +From 662e771db49dd61d275acf9a9a696f6e0f46f081 Mon Sep 17 00:00:00 2001 +From: Peter Bonivart +Date: Wed, 20 Apr 2011 14:47:36 +0200 +Subject: [PATCH] Remove-Wall-reference + +--- + Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index da51df6..4668240 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -32,7 +32,7 @@ mandir = $(prefix)/share/man + + CC = @CC@ + XCPPFLAGS = @CPPFLAGS@ +-CFLAGS = @CFLAGS@ $(XCPPFLAGS) $(DEFS) -Wall ++CFLAGS = @CFLAGS@ $(XCPPFLAGS) $(DEFS) + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + STRIP = strip +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 20 14:58:34 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Apr 2011 12:58:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[14339] csw/mgar/pkg/libtool/branches/libtool24/Makefile Message-ID: Revision: 14339 http://gar.svn.sourceforge.net/gar/?rev=14339&view=rev Author: dmichelsen Date: 2011-04-20 12:58:34 +0000 (Wed, 20 Apr 2011) Log Message: ----------- libtool24: Adjust to new standards Modified Paths: -------------- csw/mgar/pkg/libtool/branches/libtool24/Makefile Modified: csw/mgar/pkg/libtool/branches/libtool24/Makefile =================================================================== --- csw/mgar/pkg/libtool/branches/libtool24/Makefile 2011-04-20 12:56:47 UTC (rev 14338) +++ csw/mgar/pkg/libtool/branches/libtool24/Makefile 2011-04-20 12:58:34 UTC (rev 14339) @@ -9,8 +9,6 @@ # Compile 64 bit libraries only with SOS12 SKIP_MODULATIONS += $(foreach I,sparcv9 amd64,$(foreach C,GCC3 GCC4,isa-$I-garcompiler-$C)) -# TODO: Make sure -xnorunpath / -norunpath stays in cc and CC - DESCRIPTION = A generic library support tool define BLURB GNU libtool is a generic library support script. Libtool hides the complexity @@ -46,6 +44,11 @@ CHECKPKG_OVERRIDES_CSWlibtool += surplus-dependency|CSWlibltdl3 CHECKPKG_OVERRIDES_CSWlibtool += surplus-dependency|CSWlibltdl7 +# These *may* be ok, as users could have installed stuff to /usr/local +# However, I think it is best to make linkage to /opt/csw/lib explicit and not +# auto-enable this as a simple replacement. +CHECKPKG_OVERRIDES_CSWlibtool += file-with-bad-content + # This is built from pkgs/libltdl3 FOREIGN_PACKAGES += CSWlibltdl3 OBSOLETED_BY_CSWlibltdl3 += CSWlibtoolrt @@ -56,16 +59,10 @@ PKGFILES_CSWlibltdl7 += $(PKGFILES_RT) OBSOLETED_BY_CSWlibltdl7 += CSWlibtoolrt -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - CONFIGURE_ARGS = $(DIRPATHS) BUILD64 = 1 -NOISAEXEC = 1 -TEST_TARGET = check - # Some Fortran-specific tests fail which is probably not that important SKIPTEST ?= 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 20 16:26:55 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Apr 2011 14:26:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[14340] csw/mgar/pkg/rdesktop/trunk Message-ID: Revision: 14340 http://gar.svn.sourceforge.net/gar/?rev=14340&view=rev Author: dmichelsen Date: 2011-04-20 14:26:55 +0000 (Wed, 20 Apr 2011) Log Message: ----------- rdesktop: Update to 1.7.0 Modified Paths: -------------- csw/mgar/pkg/rdesktop/trunk/Makefile csw/mgar/pkg/rdesktop/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/rdesktop/trunk/files/README.CSW csw/mgar/pkg/rdesktop/trunk/files/fix-2022945.patch Modified: csw/mgar/pkg/rdesktop/trunk/Makefile =================================================================== --- csw/mgar/pkg/rdesktop/trunk/Makefile 2011-04-20 12:58:34 UTC (rev 14339) +++ csw/mgar/pkg/rdesktop/trunk/Makefile 2011-04-20 14:26:55 UTC (rev 14340) @@ -1,5 +1,5 @@ NAME = rdesktop -VERSION = 1.6.0 +VERSION = 1.7.0 CATEGORIES = apps DESCRIPTION = RDP client for Windows NT/2000/2003/XP Terminal Server @@ -12,31 +12,24 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += README.CSW -# Apply patch from -# https://sourceforge.net/tracker/?func=detail&aid=2812158&group_id=24366&atid=381349 -# as referenced from -# http://csiuo.com/drupal/content/rdesktop-160-and-windows-server-2008-sp2 -PATCHFILES += fix-2022945.patch - -# The above is a functionality patch -VERSION_FLAG_PATCH = 1 - PACKAGES = CSWrdesktop CATALOGNAME_CSWrdesktop = rdesktop VENDOR_URL = http://www.rdesktop.org/ +BUILD_DEP_PKGS += CSWlibao-dev +BUILD_DEP_PKGS += CSWlibsamplerate-dev +BUILD_DEP_PKGS += CSWossldevel + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-openssl=/opt/csw UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz RUNTIME_DEP_PKGS_CSWrdesktop += CSWiconv -RUNTIME_DEP_PKGS_CSWrdesktop += CSWosslrt -RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibao RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibsamplerate0 +RUNTIME_DEP_PKGS_CSWrdesktop += CSWosslrt # No test/check target provided by rdesktop TEST_SCRIPTS = Modified: csw/mgar/pkg/rdesktop/trunk/checksums =================================================================== --- csw/mgar/pkg/rdesktop/trunk/checksums 2011-04-20 12:58:34 UTC (rev 14339) +++ csw/mgar/pkg/rdesktop/trunk/checksums 2011-04-20 14:26:55 UTC (rev 14340) @@ -1 +1 @@ -c6fcbed7f0ad7e60ac5fcb2d324d8b16 download/rdesktop-1.6.0.tar.gz +77fa93b21aa38837a85e81c00e757228 rdesktop-1.7.0.tar.gz Deleted: csw/mgar/pkg/rdesktop/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/rdesktop/trunk/files/README.CSW 2011-04-20 12:58:34 UTC (rev 14339) +++ csw/mgar/pkg/rdesktop/trunk/files/README.CSW 2011-04-20 14:26:55 UTC (rev 14340) @@ -1,12 +0,0 @@ -README.CSW for rdesktop ------------------------ - -The following functionality patches have been applied: - -* Fix IRP Query Volume Information class: 0x07 problem - - The patch was taken from - http://sourceforge.net/tracker/?func=detail&aid=2812158&group_id=24366&atid=381349 - as referenced from - http://csiuo.com/drupal/content/rdesktop-160-and-windows-server-2008-sp2 - Deleted: csw/mgar/pkg/rdesktop/trunk/files/fix-2022945.patch =================================================================== --- csw/mgar/pkg/rdesktop/trunk/files/fix-2022945.patch 2011-04-20 12:58:34 UTC (rev 14339) +++ csw/mgar/pkg/rdesktop/trunk/files/fix-2022945.patch 2011-04-20 14:26:55 UTC (rev 14340) @@ -1,28 +0,0 @@ ---- rdesktop-1.6.0.orig/disk.c 2009-06-19 09:06:27.000000000 -0400 -+++ rdesktop-1.6.0/disk.c 2009-06-25 09:40:44.000000000 -0400 -@@ -1096,10 +1101,24 @@ - rdp_out_unistr(out, fsinfo->type, 2 * strlen(fsinfo->type) - 2); - break; - -+ /* JMD 20090623: Needed for Windows 2008 support -+ http://msdn.microsoft.com/en-us/library/cc232104(PROT.13).aspx -+ IRP Query Volume Information class: 0x07 */ -+ case FileFsFullSizeInformation: -+ printf("Called FileFsFullSizeInformation\n"); -+ out_uint32_le(out, stat_fs.f_blocks); /* TotalAllocationUnits */ -+ out_uint32_le(out, 0); -+ out_uint32_le(out, stat_fs.f_bavail); /* CallerAvailableAllocationUnits */ -+ out_uint32_le(out, 0); -+ out_uint32_le(out, stat_fs.f_bfree); /* ActualAvailableAllocationUnits */ -+ out_uint32_le(out, 0); -+ out_uint32_le(out, stat_fs.f_bsize / 0x200); /* SectorsPerAllocationUnit */ -+ out_uint32_le(out, 0x200); /* Bytes per sector */ -+ break; -+ - case FileFsLabelInformation: - case FileFsDeviceInformation: - case FileFsControlInformation: -- case FileFsFullSizeInformation: - case FileFsObjectIdInformation: - case FileFsMaximumInformation: - 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 Apr 20 16:32:43 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Apr 2011 14:32:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14341] csw/mgar/pkg/xmlstarlet/trunk Message-ID: Revision: 14341 http://gar.svn.sourceforge.net/gar/?rev=14341&view=rev Author: dmichelsen Date: 2011-04-20 14:32:43 +0000 (Wed, 20 Apr 2011) Log Message: ----------- xmlstarlet: Update to 1.1.0 Modified Paths: -------------- csw/mgar/pkg/xmlstarlet/trunk/Makefile csw/mgar/pkg/xmlstarlet/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xmlstarlet/trunk/files/0001-Do-not-use-Wall.patch Modified: csw/mgar/pkg/xmlstarlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/Makefile 2011-04-20 14:26:55 UTC (rev 14340) +++ csw/mgar/pkg/xmlstarlet/trunk/Makefile 2011-04-20 14:32:43 UTC (rev 14341) @@ -1,5 +1,5 @@ NAME = xmlstarlet -VERSION = 1.0.2 +VERSION = 1.1.0 CATEGORIES = utils DESCRIPTION = XML transformation utility @@ -16,31 +16,27 @@ MASTER_SITES += http://xmlstar.sourceforge.net/downloads/ DISTFILES = $(NAME)-$(VERSION).tar.gz -RUNTIME_DEP_PKGS = CSWiconv CSWlibxml2 CSWlibxslt CSWzlib +VENDOR_URL = http://xmlstar.sourceforge.net/ -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=66612 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) +RUNTIME_DEP_PKGS_CSWxmlstarlet += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWxmlstarlet += CSWlibxslt BUILD64 = 1 +ISAEXEC = 1 -CONFIGURE_ENV += LIBXML_PREFIX=$(prefix) -CONFIGURE_ENV += LIBXML_CFLAGS="$(shell $(bindir)/xml2-config --cflags)" -CONFIGURE_ENV += LIBXML_LIBS="$(shell $(bindir)/xml2-config --libs)" -CONFIGURE_ENV += LIBXSLT_PREFIX=$(prefix) -CONFIGURE_ENV += LIBXSLT_CFLAGS="$(shell $(bindir)/xslt-config --cflags)" -CONFIGURE_ENV += LIBXSLT_LIBS="$(shell $(bindir)/xslt-config --libs) -lexslt" +CONFIGURE_ENV += LIBXML_CONFIG=$(bindir)/xml2-config +CONFIGURE_ENV += LIBXSLT_CONFIG=$(bindir)/xslt-config CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-static-libs +CONFIGURE_ARGS += --with-libxml-include-prefix=$(includedir)/libxml2 +CONFIGURE_ARGS += --with-libxml-libs-prefix=$(libdir) -TEST_TARGET = check +BUILD_OVERRIDE_VARS = CFLAGS CPPFLAGS LDFLAGS +BUILD_OVERRIDE_VAR_CFLAGS = $(CFLAGS) +BUILD_OVERRIDE_VAR_CPPFLAGS = $(CPPFLAGS) +BUILD_OVERRIDE_VAR_LDFLAGS = $(LDFLAGS) -CHECKPKG_OVERRIDES_CSWxmlstarlet += soname-not-found|libm.so.2 +EXTRA_PAX_ARGS = -s ,$(bindir)/xml,$(bindir)/xmlstarlet, include gar/category.mk - -post-install-modulated: - @echo " ==> Renaming program to xmlstarlet" - @mv $(DESTDIR)$(bindir)/xml $(DESTDIR)$(bindir)/xmlstarlet - @$(MAKECOOKIE) Modified: csw/mgar/pkg/xmlstarlet/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/checksums 2011-04-20 14:26:55 UTC (rev 14340) +++ csw/mgar/pkg/xmlstarlet/trunk/checksums 2011-04-20 14:32:43 UTC (rev 14341) @@ -1 +1 @@ -cc6031201cb263ab364ee5bfbe503cb5 xmlstarlet-1.0.2.tar.gz +1b864b16c1dc78ce87ffc8528f021ab0 xmlstarlet-1.1.0.tar.gz Added: csw/mgar/pkg/xmlstarlet/trunk/files/0001-Do-not-use-Wall.patch =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/files/0001-Do-not-use-Wall.patch (rev 0) +++ csw/mgar/pkg/xmlstarlet/trunk/files/0001-Do-not-use-Wall.patch 2011-04-20 14:32:43 UTC (rev 14341) @@ -0,0 +1,25 @@ +From 722db871d1a24c3ceb7cc6a297dc2a3278534699 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 17 Jan 2011 20:32:12 +0100 +Subject: [PATCH] Do not use -Wall + +--- + Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 33bdd06..272a5b1 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -232,7 +232,7 @@ top_srcdir = @top_srcdir@ + EXTRA_DIST = README TODO Copyright COPYING doc/xmlstarlet.txt + WIN32_DIST = $(EXTRA_DIST) AUTHORS ChangeLog INSTALL NEWS xml.exe doc + ACLOCAL_AMFLAGS = -I m4 +-AM_CFLAGS = -Wall ++AM_CFLAGS = + + # testing + egdir = $(srcdir)/examples +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Apr 20 16:52:59 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 20 Apr 2011 14:52:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[14342] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 14342 http://gar.svn.sourceforge.net/gar/?rev=14342&view=rev Author: wahwah Date: 2011-04-20 14:52:59 +0000 (Wed, 20 Apr 2011) Log Message: ----------- csw-upload-pkg: Throw an exception on 401 Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-20 14:32:43 UTC (rev 14341) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-20 14:52:59 UTC (rev 14342) @@ -377,7 +377,10 @@ http_code, c.getinfo(pycurl.EFFECTIVE_URL)) c.close() - successful = http_code >= 200 and http_code <= 299 + logging.debug("HTTP code: %s", http_code) + if http_code == 401: + raise RestCommunicationError("Received HTTP code {0}".format(http_code)) + successful = (http_code >= 200 and http_code <= 299) metadata = None if successful: metadata = json.loads(d.getvalue()) 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 Apr 20 16:54:31 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 20 Apr 2011 14:54:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14343] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 14343 http://gar.svn.sourceforge.net/gar/?rev=14343&view=rev Author: wahwah Date: 2011-04-20 14:54:31 +0000 (Wed, 20 Apr 2011) Log Message: ----------- csw-upload-pkg: Support for basic HTTP auth Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-20 14:52:59 UTC (rev 14342) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-20 14:54:31 UTC (rev 14343) @@ -21,6 +21,7 @@ import subprocess import file_set_checker import sys +import getpass BASE_URL = "http://buildfarm.opencsw.org" @@ -70,7 +71,8 @@ class Srv4Uploader(object): def __init__(self, filenames, rest_url, os_release=None, debug=False, - output_to_screen=True): + output_to_screen=True, + username=None, password=None): super(Srv4Uploader, self).__init__() self.filenames = self.SortFilenames(filenames) self.md5_by_filename = {} @@ -79,7 +81,19 @@ self.rest_url = rest_url self._rest_client = rest.RestClient(self.rest_url) self.output_to_screen = output_to_screen + self.username = username + self.password = password + def _SetAuth(self, c): + """Set basic HTTP auth options on given Curl object.""" + if self.username: + logging.debug("Using basic AUTH for user %s", self.username) + c.setopt(pycurl.HTTPAUTH, pycurl.HTTPAUTH_ANY) + c.setopt(pycurl.USERPWD, "%s:%s" % (self.username, self.password)) + else: + logging.debug("User and password not set, not using HTTP AUTH") + return c + def _ImportMetadata(self, filename): md5_sum = self._GetFileMd5sum(filename) metadata = self._rest_client.GetPkgByMd5(md5_sum) @@ -198,6 +212,7 @@ c.setopt(pycurl.WRITEFUNCTION, d.write) c.setopt(pycurl.HEADERFUNCTION, h.write) c.setopt(pycurl.HTTPHEADER, ["Expect:"]) # Fixes the HTTP 417 error + c = self._SetAuth(c) if self.debug: c.setopt(c.VERBOSE, 1) c.perform() @@ -334,6 +349,7 @@ c.setopt(pycurl.WRITEFUNCTION, d.write) c.setopt(pycurl.HEADERFUNCTION, h.write) c.setopt(pycurl.HTTPHEADER, ["Expect:"]) # Fixes the HTTP 417 error + c = self._SetAuth(c) if self.debug: c.setopt(c.VERBOSE, 1) c.perform() @@ -367,6 +383,7 @@ c.setopt(pycurl.URL, url) c.setopt(pycurl.WRITEFUNCTION, d.write) c.setopt(pycurl.HEADERFUNCTION, h.write) + c = self._SetAuth(c) if self.debug: c.setopt(c.VERBOSE, 1) c.perform() @@ -398,6 +415,7 @@ url = self.rest_url + RELEASES_APP + "/srv4/" c.setopt(pycurl.URL, url) c.setopt(pycurl.POST, 1) + c = self._SetAuth(c) post_data = [ ('srv4_file', (pycurl.FORM_FILE, filename)), ('submit', 'Upload'), @@ -552,11 +570,14 @@ for error_tag in error_tags: print "*", error_tag sys.exit(1) - + username = os.environ["LOGNAME"] + password = getpass.getpass("{0}'s pkg release password> ".format(username)) uploader = Srv4Uploader(args, options.rest_url, os_release=os_release, - debug=options.debug) + debug=options.debug, + username=username, + password=password) if options.remove: uploader.Remove() 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 Wed Apr 20 16:55:10 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 20 Apr 2011 14:55:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14344] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 14344 http://gar.svn.sourceforge.net/gar/?rev=14344&view=rev Author: wahwah Date: 2011-04-20 14:55:10 +0000 (Wed, 20 Apr 2011) Log Message: ----------- csw-upload-pkg: Bugfix, packages with errors Packages with errors were still inserted into the database, because a tuple was not unpacked and always translated to boolean True. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-20 14:54:31 UTC (rev 14343) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-20 14:55:10 UTC (rev 14344) @@ -526,7 +526,7 @@ print " ", " ".join(args_by_cat[(arch, osrel)]) print ("Packages have not been submitted to the %s catalog." % DEFAULT_CATREL) - return (not checks_failed_for_catalogs, checkpkg_sets) + return not checks_failed_for_catalogs if __name__ == '__main__': This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Wed Apr 20 17:02:18 2011 From: bwalton at opencsw.org (Ben Walton) Date: Wed, 20 Apr 2011 11:02:18 -0400 Subject: [csw-devel] SF.net SVN: gar:[14343] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py In-Reply-To: References: Message-ID: <1303311647-sup-8564@pinkfloyd.chass.utoronto.ca> Excerpts from wahwah's message of Wed Apr 20 10:54:31 -0400 2011: Hi Maciej, > + def _SetAuth(self, c): > + """Set basic HTTP auth options on given Curl object.""" > + if self.username: > + logging.debug("Using basic AUTH for user %s", self.username) > + c.setopt(pycurl.HTTPAUTH, pycurl.HTTPAUTH_ANY) > + c.setopt(pycurl.USERPWD, "%s:%s" % (self.username, self.password)) > + else: > + logging.debug("User and password not set, not using HTTP AUTH") > + return c > + This is what I planned to tackle last night but I forgot about a parent council meeting for my daughter's school. It looks as though the file read bit still needs to happen though, right? (eg: ~/.csw-upload-pkg storing u/p) Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From wahwah at users.sourceforge.net Wed Apr 20 17:07:13 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 20 Apr 2011 15:07:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14345] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 14345 http://gar.svn.sourceforge.net/gar/?rev=14345&view=rev Author: wahwah Date: 2011-04-20 15:07:13 +0000 (Wed, 20 Apr 2011) Log Message: ----------- csw-upload-pkg: Disabling the password prompt Before the backend is implemented, disabling the password prompt. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-20 14:55:10 UTC (rev 14344) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-20 15:07:13 UTC (rev 14345) @@ -571,7 +571,9 @@ print "*", error_tag sys.exit(1) username = os.environ["LOGNAME"] - password = getpass.getpass("{0}'s pkg release password> ".format(username)) + # password = getpass.getpass("{0}'s pkg release password> ".format(username)) + # Disabling for the time being. + password = False uploader = Srv4Uploader(args, options.rest_url, os_release=os_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 Wed Apr 20 17:17:22 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 15:17:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14346] csw/mgar/pkg/bacula/trunk/files/README.CSW Message-ID: Revision: 14346 http://gar.svn.sourceforge.net/gar/?rev=14346&view=rev Author: bdwalton Date: 2011-04-20 15:17:21 +0000 (Wed, 20 Apr 2011) Log Message: ----------- bacula/trunk: add README.CSW from old packages Added Paths: ----------- csw/mgar/pkg/bacula/trunk/files/README.CSW Added: csw/mgar/pkg/bacula/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/bacula/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/README.CSW 2011-04-20 15:17:21 UTC (rev 14346) @@ -0,0 +1,183 @@ +01Jan2008 +With the 2.2.7 release, the mysql database libraries are changed from mysql4 + to mysql5. You may have been using previous releases of bacula with + mysql5; which, of course, is fine. The MySQL developers have not + released an update to MySQL 4.1 in a long while. If you are still using + mysql4, please update to mysql5. Basic bacula functions worked fine + with the mysql5 libraries connecting to a mysql4 database. But, + you need to update as soon as possible. + +If you need some help with CSWmysql5 upgrade, here are the backup and restore + procedures that have been sucessful for me. Using CSWmysql4, disable the + bacula services and backup the bacula database with the following command. + Adjust the output directory as needed. This short set of procedures does + assume some basic MySQL admin skills, such as creating databases and users. + + Please refer to the MySQL documentation at http://www.mysql.com for details + and/or tips for the MySQL version upgrade. + +Backup command: +/opt/csw/mysql4/bin/mysqldump --opt bacula |gzip > /export/nfs/backup/mysql4/mcsrv5-bacula-dump-`date '+%Y%m%d%H%M'`.tar.gz + +Be sure to dump any other databases to separate backup files. I have not + been doing the backup/restore for the mysql database; but this is + recommended. I have so few entries, that I find it simpler to create the + necessary entries manually. + +After completing the backups, disable cswmysql4. + +Install the mysql5 package with `pkg-get -Uu mysql5`. I recommend using a new + database directory and leaving the mysql4 installation alone until you are + confident that the migration has been successfully completed. Run the + quick-start script at /opt/csw/mysql5/share/mysql, if you like, to setup + the new installation. Leave CSWmysql4 shutdown and start CSWmysql5. + +Create the necessary databases and users. For the users, you should be able to + restore the mysql database dump, if you did that one. gunzip the backup + files and restore bacula, along with any other databases, using the + following command to redirect the backup file to the mysql command. +Restore command: +/opt/csw/mysql5/bin/mysql --password=secret bacula ' and + 'DB Port = ' in the Catalog section. This is not + complete documentation and you should read the product manuals. + +04Feb2005 +A few notes and/or observations. + +1) Read the pdf file in /opt/csw/share/doc/bacula/bacula.pdf! + +2) Unlike ufsdump, bacula expects a tape device to have + 'the original BSD behavior', hence the 'b' in the device + attributes. + bacula also expects the no-rewind device for tape. + For example, use /dev/rmt/0bn and NOT /dev/rmt/0n. + +3) The startup script is created by bacula. I moved it to + /etc/init.d/cswbacula and created some symlinks. + There are a few variables that can be overriden in the + startup script. This is done by copying + /opt/csw/share/doc/bacula/cswbacularc to either /etc/opt/csw/ + or /opt/csw/etc/bacula/ and making the desired changes. + Read the docs before doing this. + +4) When creating the mysql database, tables, etc., you can + use the '-p' option to have the script prompt for a password. + Note that none of the scripts are modified by me and come + straight from the bacula developer(s). + +5) You may want to add the services entries noted in bacula.pdf. + +6) Again, get familiar with the product and do some testing and + please read bacula.pdf before putting the software into + whatever is 'production' mode for you. + +Alex 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 Apr 20 17:20:13 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Apr 2011 15:20:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14347] csw/mgar/pkg/rdesktop/trunk/Makefile Message-ID: Revision: 14347 http://gar.svn.sourceforge.net/gar/?rev=14347&view=rev Author: dmichelsen Date: 2011-04-20 15:20:12 +0000 (Wed, 20 Apr 2011) Log Message: ----------- rdesktop: Add missing dependency Modified Paths: -------------- csw/mgar/pkg/rdesktop/trunk/Makefile Modified: csw/mgar/pkg/rdesktop/trunk/Makefile =================================================================== --- csw/mgar/pkg/rdesktop/trunk/Makefile 2011-04-20 15:17:21 UTC (rev 14346) +++ csw/mgar/pkg/rdesktop/trunk/Makefile 2011-04-20 15:20:12 UTC (rev 14347) @@ -28,6 +28,7 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz RUNTIME_DEP_PKGS_CSWrdesktop += CSWiconv +RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibao4 RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibsamplerate0 RUNTIME_DEP_PKGS_CSWrdesktop += CSWosslrt 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 Apr 20 17:23:09 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 15:23:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[14348] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14348 http://gar.svn.sourceforge.net/gar/?rev=14348&view=rev Author: bdwalton Date: 2011-04-20 15:23:09 +0000 (Wed, 20 Apr 2011) Log Message: ----------- bacula/trunk: re-org the recipe to put statements in a more logical order Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 15:20:12 UTC (rev 14347) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 15:23:09 UTC (rev 14348) @@ -10,6 +10,15 @@ GARCOMPILER = GNU +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += CSWbacula-doc.cswreleasenotes +PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch +PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch + +BUILD_DEP_PKGS = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel +BUILD_DEP_PKGS += CSWreadline CSWggettext-dev + PACKAGES = CSWbacula-common CSWbacula-fd CSWbacula-sd PACKAGES += CSWbacula-director CSWbacula-client CSWbacula PACKAGES += CSWbacula-tray-monitor CSWbacula-console CSWbacula-doc @@ -155,15 +164,6 @@ PKGFILES_CSWbacula-director += .*man8/bacula-dir.8.gz .*man8/dbcheck.8.gz PKGFILES_CSWbacula-director += /var/opt/csw/run -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(DISTNAME).tar.gz -DISTFILES += CSWbacula-doc.cswreleasenotes -PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch -PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch - -BUILD_DEP_PKGS = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel -BUILD_DEP_PKGS += CSWreadline CSWggettext-dev - # force libraries into a separate subdirectory libdir = $(prefix)/lib/$(NAME) sysconfdir = /etc$(prefix)/$(NAME) 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 Apr 20 17:30:27 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 15:30:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[14349] csw/mgar/pkg/bacula/trunk/files Message-ID: Revision: 14349 http://gar.svn.sourceforge.net/gar/?rev=14349&view=rev Author: bdwalton Date: 2011-04-20 15:30:26 +0000 (Wed, 20 Apr 2011) Log Message: ----------- bacula/trunk: add original package scripts Added Paths: ----------- csw/mgar/pkg/bacula/trunk/files/postinstall csw/mgar/pkg/bacula/trunk/files/postremove csw/mgar/pkg/bacula/trunk/files/preremove Added: csw/mgar/pkg/bacula/trunk/files/postinstall =================================================================== --- csw/mgar/pkg/bacula/trunk/files/postinstall (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/postinstall 2011-04-20 15:30:26 UTC (rev 14349) @@ -0,0 +1,79 @@ +# Postinstall script for bacula +# 2006-01-09 Add SMF capability +# 2007-01-19 Add csw.conf support +# 2007-09-11 Fix PKG_INSTALL_ROOT usage. BASEDIR is not used for non +# relocatable packages. +# +# Copy configuration files if they do not exist +# +host=`hostname` +if [ ! -f ${PKG_INSTALL_ROOT}/opt/csw/etc/bacula/bacula-dir.conf ]; then + echo "Creating initial copy of /opt/csw/etc/bacula/bacula-dir.conf" + sed -e "s/Name = ra/Name = $host/g" -e "s/Name = thor/Name = $host/g" -e "s/Address = ra/Address = $host/g" -e "s/Address = thor/Address = $host/g" -e "s/Client = ra/Client = $host/g" -e "s/Client = thor/Client = $host/g" -e "s/Client=ra/Client=$host/g" -e "s/Client=thor/Client=$host/g" ${PKG_INSTALL_ROOT}/opt/csw/etc/bacula/bacula-dir.conf.CSW >${PKG_INSTALL_ROOT}/opt/csw/etc/bacula/bacula-dir.conf + chown root:bin ${PKG_INSTALL_ROOT}/opt/csw/etc/bacula/bacula-dir.conf +fi + +if [ ! -f ${PKG_INSTALL_ROOT}/opt/csw/etc/bacula/bacula-sd.conf ]; then + echo "Creating initial copy of /opt/csw/etc/bacula/bacula-sd.conf" + sed -e "s/Name = ra/Name = $host/g" -e "s/Name = thor/Name = $host/g" -e "s/director = ra/director = $host/g" -e "s/director = thor/director = $host/g" ${PKG_INSTALL_ROOT}/opt/csw/etc/bacula/bacula-sd.conf.CSW >${PKG_INSTALL_ROOT}/opt/csw/etc/bacula/bacula-sd.conf + chown root:bin ${PKG_INSTALL_ROOT}/opt/csw/etc/bacula/bacula-sd.conf +fi + +# daemons are started by default +enable_daemon=yes + +# Source csw.conf, if it exists +if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then + . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +fi +if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then + . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +fi + +# If defined, autoenable for the specific daemon name takes precedence +if [ "$autoenable_bacula" = "no" ] ; then + enable_daemon=no +elif [ "$autoenable_daemons" = "no" -a ! -n "$autoenable_bacula" ] ; then + enable_daemon=no +fi + +# Set variable for the availability of SMF +smf=no +if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] + then + smf=yes +fi + +# Stop bacula if it is running. +if [ "$enable_daemon" = "yes" -a x"$PKG_INSTALL_ROOT" = x"" ] ; then + echo " " + echo "Stopping bacula" + if [ $smf = no ] + then + /etc/init.d/cswbacula stop + else + /usr/sbin/svcadm disable svc:application/cswbacula + fi + sleep 3 +fi + +# Start bacula +if [ "$enable_daemon" = "yes" -a x"$PKG_INSTALL_ROOT" = x"" ] ; then + echo "Starting bacula" + if [ $smf = no ] + then + /etc/init.d/cswbacula start + else + /usr/sbin/svcadm enable svc:application/cswbacula + fi +fi + +echo +echo "*** START OF IMPORTANT NOTICE ***" +echo " With bacula 2.2.7 and later, the MySQL version is changed" +echo " from 4.1 to 5.0. See /opt/csw/share/doc/bacula/README.CSW" +echo " for notes on the database upgrade." +echo "*** END OF IMPORTANT NOTICE ***" +echo + +exit 0 Added: csw/mgar/pkg/bacula/trunk/files/postremove =================================================================== --- csw/mgar/pkg/bacula/trunk/files/postremove (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/postremove 2011-04-20 15:30:26 UTC (rev 14349) @@ -0,0 +1,43 @@ +# bacula - postremove script +# 2007-01-19 Initial version +# +# Since bacula_client is still installed; restart the init script. +# +# Start bacula if it is running. + +if [ ! x"$PKG_INSTALL_ROOT" = x"" -a ! x"$PKG_INSTALL_ROOT" = x"/" ] ; then exit 0 ; fi + +# daemons are started by default +enable_daemon=yes + +# Source csw.conf, if it exists +if [ -f /opt/csw/etc/csw.conf ] ; then + . /opt/csw/etc/csw.conf +fi +if [ -f /etc/opt/csw/csw.conf ] ; then + . /etc/opt/csw/csw.conf +fi + +# If defined, autoenable for the specific daemon name takes precedence +if [ "$autoenable_bacula" = "no" ] ; then + enable_daemon=no +elif [ "$autoenable_daemons" = "no" -a ! -n "$autoenable_bacula" ] ; then + enable_daemon=no +fi + +smf=no +if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi + +if [ "$enable_daemon" = "yes" ] ; then + echo "Starting bacula client" + if [ $smf = yes ] + then + # Enable service + /usr/sbin/svcadm enable svc:application/cswbacula:default >/dev/null 2>&1 + else + /etc/init.d/cswbacula start >/dev/null 2>&1 + fi + sleep 3 +fi + +exit 0 Added: csw/mgar/pkg/bacula/trunk/files/preremove =================================================================== --- csw/mgar/pkg/bacula/trunk/files/preremove (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/preremove 2011-04-20 15:30:26 UTC (rev 14349) @@ -0,0 +1,24 @@ +# bacula - preremove script +# 2007-08-18 Fix usage of $BASEDIR and $PKG_INSTALL_ROOT. This package is +# not relocatable; so $BASEDIR is not used +# 2006-01-09 Add SMF capability +# + +# If removing package from a filesystem tree not running the OS; then exit. +if [ ! x"$PKG_INSTALL_ROOT" = x"" ] ; then exit 0 ; fi + +# Stop bacula if it is running. +smf=no +if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi + + echo "Stopping bacula" + if [ $smf = yes ] + then + # Disable service + /usr/sbin/svcadm disable svc:application/cswbacula:default + else + /etc/init.d/cswbacula stop + fi + sleep 3 + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Wed Apr 20 18:24:17 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Wed, 20 Apr 2011 17:24:17 +0100 Subject: [csw-devel] SF.net SVN: gar:[14343] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py In-Reply-To: <1303311647-sup-8564@pinkfloyd.chass.utoronto.ca> References: <1303311647-sup-8564@pinkfloyd.chass.utoronto.ca> Message-ID: 2011/4/20 Ben Walton : > Excerpts from wahwah's message of Wed Apr 20 10:54:31 -0400 2011: > > > Hi Maciej, > >> + ?def _SetAuth(self, c): >> + ? ?"""Set basic HTTP auth options on given Curl object.""" >> + ? ?if self.username: >> + ? ? ?logging.debug("Using basic AUTH for user %s", self.username) >> + ? ? ?c.setopt(pycurl.HTTPAUTH, pycurl.HTTPAUTH_ANY) >> + ? ? ?c.setopt(pycurl.USERPWD, "%s:%s" % (self.username, self.password)) >> + ? ?else: >> + ? ? ?logging.debug("User and password not set, not using HTTP AUTH") >> + ? ?return c >> + > > This is what I planned to tackle last night but I forgot about a > parent council meeting for my daughter's school. ?It looks as though > the file read bit still needs to happen though, right? ?(eg: > ~/.csw-upload-pkg storing u/p) Yes. The above bit was from the http-auth branch I mentioned earlier. What's left to do is reading users' passwords, and falling back to getpass if unavailable. Passwords will be stored in /etc/opt/csw/releases/auth/.secrets (or similar of your choice, under /etc/opt/csw). Maciej From bwalton at opencsw.org Wed Apr 20 18:28:42 2011 From: bwalton at opencsw.org (Ben Walton) Date: Wed, 20 Apr 2011 12:28:42 -0400 Subject: [csw-devel] SF.net SVN: gar:[14343] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py In-Reply-To: References: <1303311647-sup-8564@pinkfloyd.chass.utoronto.ca> Message-ID: <1303316892-sup-1271@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Wed Apr 20 12:24:17 -0400 2011: > getpass if unavailable. Passwords will be stored in > /etc/opt/csw/releases/auth/.secrets (or similar of your > choice, under /etc/opt/csw). Is that so the backend can leverage the same file? Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Wed Apr 20 19:29:45 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 17:29:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[14350] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14350 http://gar.svn.sourceforge.net/gar/?rev=14350&view=rev Author: bdwalton Date: 2011-04-20 17:29:45 +0000 (Wed, 20 Apr 2011) Log Message: ----------- bacula/trunk: add a README.CSW file (from legacy package; updates pending) Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 15:30:26 UTC (rev 14349) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 17:29:45 UTC (rev 14350) @@ -13,6 +13,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz DISTFILES += CSWbacula-doc.cswreleasenotes +DISTFILES += README.CSW PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch @@ -163,6 +164,7 @@ PKGFILES_CSWbacula-director += .*bacula/bacula-dir.conf PKGFILES_CSWbacula-director += .*man8/bacula-dir.8.gz .*man8/dbcheck.8.gz PKGFILES_CSWbacula-director += /var/opt/csw/run +PKGFILES_CSWbacula-director += .*share/doc/bacula/README.CSW # force libraries into a separate subdirectory libdir = $(prefix)/lib/$(NAME) @@ -216,4 +218,5 @@ done ) @(ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/run) @(ginstall -d -m 0755 $(DOCD); gcp -pR $(WORKSRC)/examples $(DOCD)) + @(ginstall -m 0644 $(WORKDIR)/README.CSW $(DOCD)) @$(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 Wed Apr 20 19:37:40 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 17:37:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14351] csw/mgar/pkg/bacula/trunk Message-ID: Revision: 14351 http://gar.svn.sourceforge.net/gar/?rev=14351&view=rev Author: bdwalton Date: 2011-04-20 17:37:40 +0000 (Wed, 20 Apr 2011) Log Message: ----------- bacula/trunk: place a new director specific postinstall script in the package Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bacula/trunk/files/CSWbacula-director.postinstall Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 17:29:45 UTC (rev 14350) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 17:37:40 UTC (rev 14351) @@ -14,6 +14,7 @@ DISTFILES = $(DISTNAME).tar.gz DISTFILES += CSWbacula-doc.cswreleasenotes DISTFILES += README.CSW +DISTFILES += CSWbacula-directory.postinstall PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch Added: csw/mgar/pkg/bacula/trunk/files/CSWbacula-director.postinstall =================================================================== --- csw/mgar/pkg/bacula/trunk/files/CSWbacula-director.postinstall (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/CSWbacula-director.postinstall 2011-04-20 17:37:40 UTC (rev 14351) @@ -0,0 +1,10 @@ +#!/bin/sh + +host=`hostname` +conf=${PKG_INSTALL_ROOT}/etc/opt/csw/bacula/bacula-dir.conf +template=${conf}.CSW + +if cmp -s ${conf} ${template}; then + echo "Massaging templated config files for first use..." + perl -pi -e "s/current9[sx]/$host/g" ${conf} +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 Wed Apr 20 19:39:14 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 17:39:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14352] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14352 http://gar.svn.sourceforge.net/gar/?rev=14352&view=rev Author: bdwalton Date: 2011-04-20 17:39:14 +0000 (Wed, 20 Apr 2011) Log Message: ----------- bacula/trunk: move the live config sample files to the template location Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 17:37:40 UTC (rev 14351) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 17:39:14 UTC (rev 14352) @@ -220,4 +220,5 @@ @(ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/run) @(ginstall -d -m 0755 $(DOCD); gcp -pR $(WORKSRC)/examples $(DOCD)) @(ginstall -m 0644 $(WORKDIR)/README.CSW $(DOCD)) + @(cd $(DESTDIR)$(sysconfdir); for f in *conf; do mv $$f $$f.CSW; done) @$(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 Wed Apr 20 19:39:51 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 17:39:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14353] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14353 http://gar.svn.sourceforge.net/gar/?rev=14353&view=rev Author: bdwalton Date: 2011-04-20 17:39:51 +0000 (Wed, 20 Apr 2011) Log Message: ----------- bacula/trunk: correct a muscle reflex typo Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 17:39:14 UTC (rev 14352) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 17:39:51 UTC (rev 14353) @@ -14,7 +14,7 @@ DISTFILES = $(DISTNAME).tar.gz DISTFILES += CSWbacula-doc.cswreleasenotes DISTFILES += README.CSW -DISTFILES += CSWbacula-directory.postinstall +DISTFILES += CSWbacula-director.postinstall PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch 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 Apr 20 19:43:42 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 17:43:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14354] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14354 http://gar.svn.sourceforge.net/gar/?rev=14354&view=rev Author: bdwalton Date: 2011-04-20 17:43:42 +0000 (Wed, 20 Apr 2011) Log Message: ----------- bacula/trunk: set AUTOENABLE no for the director init script (cswinitsmf helper command) Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 17:39:51 UTC (rev 14353) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 17:43:42 UTC (rev 14354) @@ -214,8 +214,10 @@ post-install-modulated: @(cd $(WORKSRC)/platforms/solaris; \ ginstall -d -m 0755 $(INITD); \ - for s in dir fd sd; do \ - ginstall -m 0755 bacula-$$s $(INITD)/cswbacula-$$s; \ + (echo '#AUTOENABLE no'; cat bacula-dir) > bacula-dir.csw; \ + ginstall -m 0755 bacula-dir.csw $(INITD)/cswbacula-dir + for s in fd sd; do \ + ginstall -m 0755 bacula-$$s. $(INITD)/cswbacula-$$s; \ done ) @(ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/run) @(ginstall -d -m 0755 $(DOCD); gcp -pR $(WORKSRC)/examples $(DOCD)) 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 Apr 20 19:46:45 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 17:46:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[14355] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14355 http://gar.svn.sourceforge.net/gar/?rev=14355&view=rev Author: bdwalton Date: 2011-04-20 17:46:45 +0000 (Wed, 20 Apr 2011) Log Message: ----------- bacula/trunk: update package split statements for templated config files Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 17:43:42 UTC (rev 14354) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 17:46:45 UTC (rev 14355) @@ -48,7 +48,7 @@ RUNTIME_DEP_PKGS_CSWbacula-console += CSWosslrt RUNTIME_DEP_PKGS_CSWbacula-console += CSWgcc4corert RUNTIME_DEP_PKGS_CSWbacula-console += CSWgcc4g++rt -PKGFILES_CSWbacula-console = .*sbin/bconsole .*man8/bconsole.* .*bconsole.conf +PKGFILES_CSWbacula-console = .*sbin/bconsole .*man8/bconsole.* .*bconsole.conf.CSW PKGFILES_CSWbacula-console += .*libexec.*bconsole CATALOGNAME_CSWbacula-client = bacula_client @@ -120,7 +120,7 @@ RUNTIME_DEP_PKGS_CSWbacula-fd += CSWosslrt PKGFILES_CSWbacula-fd += .*init.d/cswbacula-fd PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd .*bacula/working -PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz .*bacula/bacula-fd.conf +PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz .*bacula/bacula-fd.conf.CSW PKGFILES_CSWbacula-fd += /var/opt/csw/run CATALOGNAME_CSWbacula-sd = bacula_sd @@ -136,7 +136,7 @@ RUNTIME_DEP_PKGS_CSWbacula-sd += CSWosslrt PKGFILES_CSWbacula-sd += .*init.d/cswbacula-sd PKGFILES_CSWbacula-sd += .*libexec.*disk-changer .*libexec.*dvd-handler -PKGFILES_CSWbacula-sd += .*libexec.*mtx-changer.* .*bacula/bacula-sd.conf +PKGFILES_CSWbacula-sd += .*libexec.*mtx-changer.* .*bacula/bacula-sd.conf.CSW PKGFILES_CSWbacula-sd += .*sbin/bacula-sd .*sbin/bextract .*sbin/bls PKGFILES_CSWbacula-sd += .*sbin/bcopy .*sbin/bscan .*sbin/btape PKGFILES_CSWbacula-sd += .*man8/bacula-sd.8.gz .*man8/bextract.8.gz @@ -162,7 +162,7 @@ PKGFILES_CSWbacula-director += .*sbin/dbcheck .*bacula/working PKGFILES_CSWbacula-director += .*libexec.*catalog_backup.* .*libexec.*query.sql PKGFILES_CSWbacula-director += .*libexec.*mysql_tables.* -PKGFILES_CSWbacula-director += .*bacula/bacula-dir.conf +PKGFILES_CSWbacula-director += .*bacula/bacula-dir.conf.CSW PKGFILES_CSWbacula-director += .*man8/bacula-dir.8.gz .*man8/dbcheck.8.gz PKGFILES_CSWbacula-director += /var/opt/csw/run PKGFILES_CSWbacula-director += .*share/doc/bacula/README.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Wed Apr 20 19:56:03 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Wed, 20 Apr 2011 18:56:03 +0100 Subject: [csw-devel] SF.net SVN: gar:[14343] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py In-Reply-To: <1303316892-sup-1271@pinkfloyd.chass.utoronto.ca> References: <1303311647-sup-8564@pinkfloyd.chass.utoronto.ca> <1303316892-sup-1271@pinkfloyd.chass.utoronto.ca> Message-ID: 2011/4/20 Ben Walton : > Excerpts from Maciej Blizi?ski's message of Wed Apr 20 12:24:17 -0400 2011: > >> getpass if unavailable. ?Passwords will be stored in >> /etc/opt/csw/releases/auth/.secrets (or similar of your >> choice, under /etc/opt/csw). > > Is that so the backend can leverage the same file? It cannot. But both can be populated from the same source, e.g. using a script. From bdwalton at users.sourceforge.net Wed Apr 20 20:03:13 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 18:03:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14356] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14356 http://gar.svn.sourceforge.net/gar/?rev=14356&view=rev Author: bdwalton Date: 2011-04-20 18:03:12 +0000 (Wed, 20 Apr 2011) Log Message: ----------- bacula/trunk: let PRESERVECONF do the config file renaming; add missing continuation in post-install script Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 17:46:45 UTC (rev 14355) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 18:03:12 UTC (rev 14356) @@ -199,6 +199,9 @@ INITSMF = /etc/opt/csw/init.d/cswbacula-dir /etc/opt/csw/init.d/cswbacula-sd INITSMF += /etc/opt/csw/init.d/cswbacula-fd +PRESERVECONF = $(sysconfdir)/bacula-dir.conf $(sysconfdir)/bacula-sd.conf +PRESERVECONF += $(sysconfdir)/bacula-fd.conf $(sysconfdir)/bconsole.conf + include gar/category.mk pre-configure-modulated: @@ -215,12 +218,11 @@ @(cd $(WORKSRC)/platforms/solaris; \ ginstall -d -m 0755 $(INITD); \ (echo '#AUTOENABLE no'; cat bacula-dir) > bacula-dir.csw; \ - ginstall -m 0755 bacula-dir.csw $(INITD)/cswbacula-dir + ginstall -m 0755 bacula-dir.csw $(INITD)/cswbacula-dir; \ for s in fd sd; do \ ginstall -m 0755 bacula-$$s. $(INITD)/cswbacula-$$s; \ done ) @(ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/run) @(ginstall -d -m 0755 $(DOCD); gcp -pR $(WORKSRC)/examples $(DOCD)) @(ginstall -m 0644 $(WORKDIR)/README.CSW $(DOCD)) - @(cd $(DESTDIR)$(sysconfdir); for f in *conf; do mv $$f $$f.CSW; done) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Wed Apr 20 20:04:02 2011 From: bwalton at opencsw.org (Ben Walton) Date: Wed, 20 Apr 2011 14:04:02 -0400 Subject: [csw-devel] SF.net SVN: gar:[14343] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py In-Reply-To: References: <1303311647-sup-8564@pinkfloyd.chass.utoronto.ca> <1303316892-sup-1271@pinkfloyd.chass.utoronto.ca> Message-ID: <1303322612-sup-7734@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Wed Apr 20 13:56:03 -0400 2011: > It cannot. But both can be populated from the same source, > e.g. using a script. Ok then wouldn't this data file be better placed in $HOME? Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Wed Apr 20 20:08:32 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 18:08:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[14357] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14357 http://gar.svn.sourceforge.net/gar/?rev=14357&view=rev Author: bdwalton Date: 2011-04-20 18:08:31 +0000 (Wed, 20 Apr 2011) Log Message: ----------- bacula/trunk: remove leftover . from manual config file renaming Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 18:03:12 UTC (rev 14356) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 18:08:31 UTC (rev 14357) @@ -165,7 +165,7 @@ PKGFILES_CSWbacula-director += .*bacula/bacula-dir.conf.CSW PKGFILES_CSWbacula-director += .*man8/bacula-dir.8.gz .*man8/dbcheck.8.gz PKGFILES_CSWbacula-director += /var/opt/csw/run -PKGFILES_CSWbacula-director += .*share/doc/bacula/README.CSW +PKGFILES_CSWbacula-director += .*share/doc/bacula_director/README.CSW # force libraries into a separate subdirectory libdir = $(prefix)/lib/$(NAME) @@ -220,7 +220,7 @@ (echo '#AUTOENABLE no'; cat bacula-dir) > bacula-dir.csw; \ ginstall -m 0755 bacula-dir.csw $(INITD)/cswbacula-dir; \ for s in fd sd; do \ - ginstall -m 0755 bacula-$$s. $(INITD)/cswbacula-$$s; \ + ginstall -m 0755 bacula-$$s $(INITD)/cswbacula-$$s; \ done ) @(ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/run) @(ginstall -d -m 0755 $(DOCD); gcp -pR $(WORKSRC)/examples $(DOCD)) 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 Apr 20 20:30:13 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 18:30:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14358] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14358 http://gar.svn.sourceforge.net/gar/?rev=14358&view=rev Author: bdwalton Date: 2011-04-20 18:30:13 +0000 (Wed, 20 Apr 2011) Log Message: ----------- bacula/trunk: put README.CSW in the directory document directory Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 18:08:31 UTC (rev 14357) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 18:30:13 UTC (rev 14358) @@ -223,6 +223,7 @@ ginstall -m 0755 bacula-$$s $(INITD)/cswbacula-$$s; \ done ) @(ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/run) - @(ginstall -d -m 0755 $(DOCD); gcp -pR $(WORKSRC)/examples $(DOCD)) - @(ginstall -m 0644 $(WORKDIR)/README.CSW $(DOCD)) + @(ginstall -d -m 0755 $(DOCD) $(DOCD)_director; \ + gcp -pR $(WORKSRC)/examples $(DOCD); \ + ginstall -m 0644 $(WORKDIR)/README.CSW $(DESTDIR)/$(docdir)/$(NAME)_director/) @$(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 Wed Apr 20 20:54:42 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 18:54:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14359] csw/mgar/pkg/bacula/trunk Message-ID: Revision: 14359 http://gar.svn.sourceforge.net/gar/?rev=14359&view=rev Author: bdwalton Date: 2011-04-20 18:54:42 +0000 (Wed, 20 Apr 2011) Log Message: ----------- bacula/trunk: add postinstall scripts for storage and file daemon packages Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bacula/trunk/files/CSWbacula-fd.postinstall csw/mgar/pkg/bacula/trunk/files/CSWbacula-sd.postinstall Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 18:30:13 UTC (rev 14358) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 18:54:42 UTC (rev 14359) @@ -15,6 +15,8 @@ DISTFILES += CSWbacula-doc.cswreleasenotes DISTFILES += README.CSW DISTFILES += CSWbacula-director.postinstall +DISTFILES += CSWbacula-sd.postinstall +DISTFILES += CSWbacula-fd.postinstall PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch Added: csw/mgar/pkg/bacula/trunk/files/CSWbacula-fd.postinstall =================================================================== --- csw/mgar/pkg/bacula/trunk/files/CSWbacula-fd.postinstall (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/CSWbacula-fd.postinstall 2011-04-20 18:54:42 UTC (rev 14359) @@ -0,0 +1,10 @@ +#!/bin/sh + +host=`hostname` +conf=${PKG_INSTALL_ROOT}/etc/opt/csw/bacula/bacula-fd.conf +template=${conf}.CSW + +if cmp -s ${conf} ${template}; then + echo "Massaging templated config files for first use..." + perl -pi -e "s/current9[sx]/$host/g" ${conf} +fi Added: csw/mgar/pkg/bacula/trunk/files/CSWbacula-sd.postinstall =================================================================== --- csw/mgar/pkg/bacula/trunk/files/CSWbacula-sd.postinstall (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/CSWbacula-sd.postinstall 2011-04-20 18:54:42 UTC (rev 14359) @@ -0,0 +1,10 @@ +#!/bin/sh + +host=`hostname` +conf=${PKG_INSTALL_ROOT}/etc/opt/csw/bacula/bacula-fd.conf +template=${conf}.CSW + +if cmp -s ${conf} ${template}; then + echo "Massaging templated config files for first use..." + perl -pi -e "s/current9[sx]/$host/g" ${conf} +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 Wed Apr 20 21:14:23 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 19:14:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[14360] csw/mgar/pkg/bacula/trunk Message-ID: Revision: 14360 http://gar.svn.sourceforge.net/gar/?rev=14360&view=rev Author: bdwalton Date: 2011-04-20 19:14:23 +0000 (Wed, 20 Apr 2011) Log Message: ----------- bacula/trunk: add postinstall for console package too Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bacula/trunk/files/CSWbacula-console.postinstall Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 18:54:42 UTC (rev 14359) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 19:14:23 UTC (rev 14360) @@ -17,6 +17,7 @@ DISTFILES += CSWbacula-director.postinstall DISTFILES += CSWbacula-sd.postinstall DISTFILES += CSWbacula-fd.postinstall +DISTFILES += CSWbacula-console.postinstall PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch Added: csw/mgar/pkg/bacula/trunk/files/CSWbacula-console.postinstall =================================================================== --- csw/mgar/pkg/bacula/trunk/files/CSWbacula-console.postinstall (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/CSWbacula-console.postinstall 2011-04-20 19:14:23 UTC (rev 14360) @@ -0,0 +1,10 @@ +#!/bin/sh + +host=`hostname` +conf=${PKG_INSTALL_ROOT}/etc/opt/csw/bacula/bconsole.conf +template=${conf}.CSW + +if cmp -s ${conf} ${template}; then + echo "Massaging templated config files for first use..." + perl -pi -e "s/current9[sx]/$host/g" ${conf} +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 Wed Apr 20 21:47:32 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 19:47:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[14361] csw/mgar/pkg/bacula/trunk Message-ID: Revision: 14361 http://gar.svn.sourceforge.net/gar/?rev=14361&view=rev Author: bdwalton Date: 2011-04-20 19:47:32 +0000 (Wed, 20 Apr 2011) Log Message: ----------- bacula/trunk: add a generic postmsg file to each of the packages requiring password synchronization Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bacula/trunk/files/postmsg Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 19:14:23 UTC (rev 14360) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 19:47:32 UTC (rev 14361) @@ -18,6 +18,7 @@ DISTFILES += CSWbacula-sd.postinstall DISTFILES += CSWbacula-fd.postinstall DISTFILES += CSWbacula-console.postinstall +DISTFILES += postmsg PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch @@ -125,6 +126,7 @@ PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd .*bacula/working PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz .*bacula/bacula-fd.conf.CSW PKGFILES_CSWbacula-fd += /var/opt/csw/run +PKGFILES_CSWbacula-fd += .*bacula_fd/.*postmsg CATALOGNAME_CSWbacula-sd = bacula_sd SPKG_DESC_CSWbacula-sd = $(DESCRIPTION) - Storage Daemon @@ -147,6 +149,7 @@ PKGFILES_CSWbacula-sd += .*man8/bcopy.8.gz .*man8/bscan.8.gz PKGFILES_CSWbacula-sd += /var/opt/csw/run PKGFILES_CSWbacula-sd += $(localstatedir)/$(NAME)/archive +PKGFILES_CSWbacula-sd += .*bacula_sd/.*postmsg CATALOGNAME_CSWbacula-director = bacula_director SPKG_DESC_CSWbacula-director = $(DESCRIPTION) - Director @@ -169,6 +172,7 @@ PKGFILES_CSWbacula-director += .*man8/bacula-dir.8.gz .*man8/dbcheck.8.gz PKGFILES_CSWbacula-director += /var/opt/csw/run PKGFILES_CSWbacula-director += .*share/doc/bacula_director/README.CSW +PKGFILES_CSWbacula-director += .*bacula_director/.*postmsg # force libraries into a separate subdirectory libdir = $(prefix)/lib/$(NAME) @@ -205,6 +209,11 @@ PRESERVECONF = $(sysconfdir)/bacula-dir.conf $(sysconfdir)/bacula-sd.conf PRESERVECONF += $(sysconfdir)/bacula-fd.conf $(sysconfdir)/bconsole.conf +POSTMSG = /opt/csw/share/doc/bacula_director/README.postmsg +POSTMSG += /opt/csw/share/doc/bacula_console/README.postmsg +POSTMSG += /opt/csw/share/doc/bacula_sd/README.postmsg +POSTMSG += /opt/csw/share/doc/bacula_fd/README.postmsg + include gar/category.mk pre-configure-modulated: @@ -226,6 +235,10 @@ ginstall -m 0755 bacula-$$s $(INITD)/cswbacula-$$s; \ done ) @(ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/run) + @(for p in console director sd fd; do \ + ginstall -d -m 0755 $(DOCD)_$$p; \ + ginstall -m 0644 $(WORKDIR)/postmsg $(DOCD)_$$p/README.postmsg; \ + done) @(ginstall -d -m 0755 $(DOCD) $(DOCD)_director; \ gcp -pR $(WORKSRC)/examples $(DOCD); \ ginstall -m 0644 $(WORKDIR)/README.CSW $(DESTDIR)/$(docdir)/$(NAME)_director/) Added: csw/mgar/pkg/bacula/trunk/files/postmsg =================================================================== --- csw/mgar/pkg/bacula/trunk/files/postmsg (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/postmsg 2011-04-20 19:47:32 UTC (rev 14361) @@ -0,0 +1,20 @@ +This package relies on several components sharing several password +values. As the components will be installed on multiple machines, +there is no point in changing the default values as we could not make +the same change on all systems without using a similarly well-known +default value. + +You are urged to change all Password values in the files: +/etc/opt/csw/bacula/bacula-dir.conf +/etc/opt/csw/bacula/bacula-fd.conf +/etc/opt/csw/bacula/bacula-sd.conf +/etc/opt/csw/bacula/bconsole.conf + +This should be done on all nodes running any or all of: +CSWbacula-director +CSWbacula-sd +CSWbacula-fd +CSWbacula-console + +For details, please see: +http://www.bacula.org/5.0.x-manuals/en/main/main/Customizing_Configuration_F.html#SECTION001740000000000000000 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 Apr 20 22:15:16 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 20:15:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[14362] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14362 http://gar.svn.sourceforge.net/gar/?rev=14362&view=rev Author: bdwalton Date: 2011-04-20 20:15:16 +0000 (Wed, 20 Apr 2011) Log Message: ----------- bacula/trunk: move configurable things out of libexecdir to sysconfdir leaving symlinks instead, mark as preserveconf Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 19:47:32 UTC (rev 14361) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 20:15:16 UTC (rev 14362) @@ -142,6 +142,7 @@ PKGFILES_CSWbacula-sd += .*init.d/cswbacula-sd PKGFILES_CSWbacula-sd += .*libexec.*disk-changer .*libexec.*dvd-handler PKGFILES_CSWbacula-sd += .*libexec.*mtx-changer.* .*bacula/bacula-sd.conf.CSW +PKGFILES_CSWbacula-sd += /etc/opt/csw/bacula/mtx-changer.conf.CSW PKGFILES_CSWbacula-sd += .*sbin/bacula-sd .*sbin/bextract .*sbin/bls PKGFILES_CSWbacula-sd += .*sbin/bcopy .*sbin/bscan .*sbin/btape PKGFILES_CSWbacula-sd += .*man8/bacula-sd.8.gz .*man8/bextract.8.gz @@ -167,6 +168,7 @@ PKGFILES_CSWbacula-director += .*sbin/bregex .*sbin/bwild .*sbin/bacula-dir PKGFILES_CSWbacula-director += .*sbin/dbcheck .*bacula/working PKGFILES_CSWbacula-director += .*libexec.*catalog_backup.* .*libexec.*query.sql +PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/query.sql.CSW PKGFILES_CSWbacula-director += .*libexec.*mysql_tables.* PKGFILES_CSWbacula-director += .*bacula/bacula-dir.conf.CSW PKGFILES_CSWbacula-director += .*man8/bacula-dir.8.gz .*man8/dbcheck.8.gz @@ -208,6 +210,7 @@ PRESERVECONF = $(sysconfdir)/bacula-dir.conf $(sysconfdir)/bacula-sd.conf PRESERVECONF += $(sysconfdir)/bacula-fd.conf $(sysconfdir)/bconsole.conf +PRESERVECONF += $(sysconfdir)/mtx-changer.conf $(sysconfdir)/query.sql POSTMSG = /opt/csw/share/doc/bacula_director/README.postmsg POSTMSG += /opt/csw/share/doc/bacula_console/README.postmsg @@ -242,4 +245,9 @@ @(ginstall -d -m 0755 $(DOCD) $(DOCD)_director; \ gcp -pR $(WORKSRC)/examples $(DOCD); \ ginstall -m 0644 $(WORKDIR)/README.CSW $(DESTDIR)/$(docdir)/$(NAME)_director/) + @( cd $(DESTDIR)/opt/csw/libexec/bacula/; \ + for f in mtx-changer.conf query.sql; do \ + mv $$f $(DESTDIR)/etc/opt/csw/bacula/$$f; \ + ln -s /etc/opt/csw/bacula/$$f $$f; \ + done) @$(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 Wed Apr 20 22:29:43 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 20:29:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14363] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14363 http://gar.svn.sourceforge.net/gar/?rev=14363&view=rev Author: bdwalton Date: 2011-04-20 20:29:43 +0000 (Wed, 20 Apr 2011) Log Message: ----------- bacula/trunk: insert AUTOENABLE no in the director init script differently so we do not clobber the hashbang Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 20:15:16 UTC (rev 14362) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 20:29:43 UTC (rev 14363) @@ -232,7 +232,7 @@ post-install-modulated: @(cd $(WORKSRC)/platforms/solaris; \ ginstall -d -m 0755 $(INITD); \ - (echo '#AUTOENABLE no'; cat bacula-dir) > bacula-dir.csw; \ + (ggrep '^#' bacula-dir; echo '#AUTOENABLE no'; ggrep -v '^#' bacula-dir) > bacula-dir.csw; \ ginstall -m 0755 bacula-dir.csw $(INITD)/cswbacula-dir; \ for s in fd sd; do \ ginstall -m 0755 bacula-$$s $(INITD)/cswbacula-$$s; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at opencsw.org Wed Apr 20 22:16:59 2011 From: skayser at opencsw.org (Sebastian Kayser) Date: Wed, 20 Apr 2011 22:16:59 +0200 Subject: [csw-devel] SF.net SVN: gar:[14350] csw/mgar/pkg/bacula/trunk/Makefile In-Reply-To: References: Message-ID: <20110420201659.GD30250@sebastiankayser.de> Hi Ben, * bdwalton at users.sourceforge.net wrote: > Log Message: > ----------- > bacula/trunk: add a README.CSW file (from legacy package; updates pending) > > Modified Paths: > -------------- > csw/mgar/pkg/bacula/trunk/Makefile > > Modified: csw/mgar/pkg/bacula/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 15:30:26 UTC (rev 14349) > +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 17:29:45 UTC (rev 14350) > @@ -13,6 +13,7 @@ > MASTER_SITES = $(SF_MIRRORS) > DISTFILES = $(DISTNAME).tar.gz > DISTFILES += CSWbacula-doc.cswreleasenotes > +DISTFILES += README.CSW > PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch > PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch > > @@ -216,4 +218,5 @@ > done ) > @(ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/run) > @(ginstall -d -m 0755 $(DOCD); gcp -pR $(WORKSRC)/examples $(DOCD)) > + @(ginstall -m 0644 $(WORKDIR)/README.CSW $(DOCD)) > @$(MAKECOOKIE) you shouldn't need to explicitly install README.CSW. As long as it's listed in DISTFILES, GAR will merge it automatically. Same goes for changelog.CSW. Sebastian From bdwalton at users.sourceforge.net Wed Apr 20 22:40:35 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 20 Apr 2011 20:40:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14364] csw/mgar/pkg/bacula/trunk/files/CSWbacula-sd. postinstall Message-ID: Revision: 14364 http://gar.svn.sourceforge.net/gar/?rev=14364&view=rev Author: bdwalton Date: 2011-04-20 20:40:35 +0000 (Wed, 20 Apr 2011) Log Message: ----------- correct typo in sd subpackage postinstall script Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/files/CSWbacula-sd.postinstall Modified: csw/mgar/pkg/bacula/trunk/files/CSWbacula-sd.postinstall =================================================================== --- csw/mgar/pkg/bacula/trunk/files/CSWbacula-sd.postinstall 2011-04-20 20:29:43 UTC (rev 14363) +++ csw/mgar/pkg/bacula/trunk/files/CSWbacula-sd.postinstall 2011-04-20 20:40:35 UTC (rev 14364) @@ -1,7 +1,7 @@ #!/bin/sh host=`hostname` -conf=${PKG_INSTALL_ROOT}/etc/opt/csw/bacula/bacula-fd.conf +conf=${PKG_INSTALL_ROOT}/etc/opt/csw/bacula/bacula-sd.conf template=${conf}.CSW if cmp -s ${conf} ${template}; then 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 Apr 21 03:34:24 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 21 Apr 2011 01:34:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[14365] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14365 http://gar.svn.sourceforge.net/gar/?rev=14365&view=rev Author: bdwalton Date: 2011-04-21 01:34:24 +0000 (Thu, 21 Apr 2011) Log Message: ----------- bacula/trunk: install an additional mysql table update script since we have not updated in many years Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-20 20:40:35 UTC (rev 14364) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-21 01:34:24 UTC (rev 14365) @@ -250,4 +250,6 @@ mv $$f $(DESTDIR)/etc/opt/csw/bacula/$$f; \ ln -s /etc/opt/csw/bacula/$$f $$f; \ done) + @(cd $(WORKSRC)/updatedb; \ + ginstall -m 0755 update_mysql_tables_10_to_11 $(DESTDIR)$(prefix)/libexec/bacula ) @$(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 Thu Apr 21 04:01:11 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 21 Apr 2011 02:01:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[14366] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14366 http://gar.svn.sourceforge.net/gar/?rev=14366&view=rev Author: bdwalton Date: 2011-04-21 02:01:10 +0000 (Thu, 21 Apr 2011) Log Message: ----------- bacula/trunk: simplify post install routine, let GAR handle README.CSW Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-21 01:34:24 UTC (rev 14365) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-21 02:01:10 UTC (rev 14366) @@ -236,20 +236,18 @@ ginstall -m 0755 bacula-dir.csw $(INITD)/cswbacula-dir; \ for s in fd sd; do \ ginstall -m 0755 bacula-$$s $(INITD)/cswbacula-$$s; \ - done ) - @(ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/run) + done; \ + cd ../..; \ + ginstall -m 0755 updatedb/update_mysql_tables_10_to_11 $(DESTDIR)$(prefix)/libexec/bacula; \ + gcp -pR examples $(DOCD); \ + ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/run;) @(for p in console director sd fd; do \ ginstall -d -m 0755 $(DOCD)_$$p; \ ginstall -m 0644 $(WORKDIR)/postmsg $(DOCD)_$$p/README.postmsg; \ done) - @(ginstall -d -m 0755 $(DOCD) $(DOCD)_director; \ - gcp -pR $(WORKSRC)/examples $(DOCD); \ - ginstall -m 0644 $(WORKDIR)/README.CSW $(DESTDIR)/$(docdir)/$(NAME)_director/) @( cd $(DESTDIR)/opt/csw/libexec/bacula/; \ for f in mtx-changer.conf query.sql; do \ mv $$f $(DESTDIR)/etc/opt/csw/bacula/$$f; \ ln -s /etc/opt/csw/bacula/$$f $$f; \ done) - @(cd $(WORKSRC)/updatedb; \ - ginstall -m 0755 update_mysql_tables_10_to_11 $(DESTDIR)$(prefix)/libexec/bacula ) @$(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 Thu Apr 21 04:03:19 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 21 Apr 2011 02:03:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[14367] csw/mgar/pkg/bacula/trunk/files/README.CSW Message-ID: Revision: 14367 http://gar.svn.sourceforge.net/gar/?rev=14367&view=rev Author: bdwalton Date: 2011-04-21 02:03:19 +0000 (Thu, 21 Apr 2011) Log Message: ----------- bacula/trunk: add note about additional database update step for previous installations Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/files/README.CSW Modified: csw/mgar/pkg/bacula/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/bacula/trunk/files/README.CSW 2011-04-21 02:01:10 UTC (rev 14366) +++ csw/mgar/pkg/bacula/trunk/files/README.CSW 2011-04-21 02:03:19 UTC (rev 14367) @@ -1,3 +1,11 @@ +2011-04-21 + +It's been a long time since the last bacula release. If this is not a +fresh installation, you'll need to use the +libexec/bacula/update_mysql_tables_10_to_11 before running the current +update_mysql_tables script. + + 01Jan2008 With the 2.2.7 release, the mysql database libraries are changed from mysql4 to mysql5. You may have been using previous releases of bacula with This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Thu Apr 21 04:05:13 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Thu, 21 Apr 2011 03:05:13 +0100 Subject: [csw-devel] SF.net SVN: gar:[14343] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py In-Reply-To: <1303322612-sup-7734@pinkfloyd.chass.utoronto.ca> References: <1303311647-sup-8564@pinkfloyd.chass.utoronto.ca> <1303316892-sup-1271@pinkfloyd.chass.utoronto.ca> <1303322612-sup-7734@pinkfloyd.chass.utoronto.ca> Message-ID: 2011/4/20 Ben Walton : > Excerpts from Maciej Blizi?ski's message of Wed Apr 20 13:56:03 -0400 2011: > >> It cannot. ?But both can be populated from the same source, >> e.g. using a script. > > Ok then wouldn't this data file be better placed in $HOME? I discussed this with Dago recently, and the answer is that $HOME is not an acceptable place for these files in the current configuration. I suspect that if we had kerberized NFS mounts it could be, but at this moment it isn't. Maciej From bdwalton at users.sourceforge.net Thu Apr 21 04:14:24 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 21 Apr 2011 02:14:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[14368] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14368 http://gar.svn.sourceforge.net/gar/?rev=14368&view=rev Author: bdwalton Date: 2011-04-21 02:14:24 +0000 (Thu, 21 Apr 2011) Log Message: ----------- php5/trunk: enable apache2 module activation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-21 02:03:19 UTC (rev 14367) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-21 02:14:24 UTC (rev 14368) @@ -20,6 +20,8 @@ # turn on the build scripts to enable/disable modules PHP5_EXT = 1 +AP2_MODS = 1 +AP2_MODFILES = *libphp5.so # at least for a decent echo used during build. PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) 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 Apr 21 04:19:02 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 21 Apr 2011 02:19:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[14369] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14369 http://gar.svn.sourceforge.net/gar/?rev=14369&view=rev Author: bdwalton Date: 2011-04-21 02:19:02 +0000 (Thu, 21 Apr 2011) Log Message: ----------- php5/trunk: sort the configure lines and de-dup the list Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-21 02:14:24 UTC (rev 14368) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-21 02:19:02 UTC (rev 14369) @@ -193,111 +193,100 @@ NOISALIST = 1 STRIP_LIBTOOL = 1 -CONFIGURE_ARGS += --prefix=$(prefix)/php5 + + CONFIGURE_ARGS += --disable-static -CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin -CONFIGURE_ARGS += --enable-cli -CONFIGURE_ARGS += --with-mm=$(prefix) -CONFIGURE_ARGS += --enable-magic-quotes -CONFIGURE_ARGS += --with-pcre-regex -CONFIGURE_ARGS += --with-pear=shared -CONFIGURE_ARGS += --with-pear=shared -CONFIGURE_ARGS += --with-libxml-dir=$(prefix) CONFIGURE_ARGS += --enable-bcmath=shared -CONFIGURE_ARGS += --with-bz2=shared,$(prefix) CONFIGURE_ARGS += --enable-calendar=shared +CONFIGURE_ARGS += --enable-cli CONFIGURE_ARGS += --enable-ctype=shared -CONFIGURE_ARGS += --with-curl=shared,$(prefix) -CONFIGURE_ARGS += --with-curlwrappers CONFIGURE_ARGS += --enable-dba=shared -CONFIGURE_ARGS += --with-ndbm -CONFIGURE_ARGS += --with-gdbm=$(prefix) -CONFIGURE_ARGS += --with-db4=$(prefix)/bdb4 CONFIGURE_ARGS += --enable-dom=shared -CONFIGURE_ARGS += --with-libxml-dir=$(prefix) CONFIGURE_ARGS += --enable-exif=shared CONFIGURE_ARGS += --enable-filter=shared -CONFIGURE_ARGS += --with-pcre-dir=$(prefix) CONFIGURE_ARGS += --enable-ftp=shared -CONFIGURE_ARGS += --with-gd=shared,$(prefix) -CONFIGURE_ARGS += --with-jpeg-dir=$(prefix) -CONFIGURE_ARGS += --with-png-dir=$(prefix) -CONFIGURE_ARGS += --with-zlib-dir=$(prefix) -CONFIGURE_ARGS += --with-xpm-dir=$(prefix) -CONFIGURE_ARGS += --with-freetype-dir=$(prefix) -CONFIGURE_ARGS += --with-t1lib=$(prefix) -CONFIGURE_ARGS += --enable-gd-native-ttf CONFIGURE_ARGS += --enable-gd-jis-conv +CONFIGURE_ARGS += --enable-gd-native-ttf +CONFIGURE_ARGS += --enable-hash=shared +CONFIGURE_ARGS += --enable-json=shared +CONFIGURE_ARGS += --enable-magic-quotes +CONFIGURE_ARGS += --enable-mbregex=shared +CONFIGURE_ARGS += --enable-mbstring=shared +CONFIGURE_ARGS += --enable-pcntl=shared +CONFIGURE_ARGS += --enable-pdo=shared +CONFIGURE_ARGS += --enable-phar=shared +CONFIGURE_ARGS += --enable-posix=shared +CONFIGURE_ARGS += --enable-session=shared +CONFIGURE_ARGS += --enable-shmop=shared +## build this static, php can not run without it. +## it is more efficient to have this built into the php binary +CONFIGURE_ARGS += --enable-simplexml +CONFIGURE_ARGS += --enable-soap=shared +CONFIGURE_ARGS += --enable-sockets=shared +CONFIGURE_ARGS += --enable-sqlite-utf8 +CONFIGURE_ARGS += --enable-sysvmsg=shared +CONFIGURE_ARGS += --enable-sysvsem=shared +CONFIGURE_ARGS += --enable-sysvshm=shared +CONFIGURE_ARGS += --enable-tokenizer=shared +CONFIGURE_ARGS += --enable-wddx=shared +CONFIGURE_ARGS += --enable-xml +CONFIGURE_ARGS += --enable-xmlreader=shared +CONFIGURE_ARGS += --enable-xmlwriter=shared +CONFIGURE_ARGS += --enable-zip=shared +CONFIGURE_ARGS += --prefix=$(prefix)/php5 +CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs +CONFIGURE_ARGS += --with-bz2=shared,$(prefix) +CONFIGURE_ARGS += --with-curl=shared,$(prefix) +CONFIGURE_ARGS += --with-curlwrappers +CONFIGURE_ARGS += --with-db4=$(prefix)/bdb4 +CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin +CONFIGURE_ARGS += --with-freetype-dir=$(prefix) +CONFIGURE_ARGS += --with-gd=shared,$(prefix) +CONFIGURE_ARGS += --with-gdbm=$(prefix) CONFIGURE_ARGS += --with-gettext=shared,$(prefix) CONFIGURE_ARGS += --with-gmp=shared,$(prefix) -CONFIGURE_ARGS += --enable-hash=shared CONFIGURE_ARGS += --with-iconv=shared,$(prefix) +CONFIGURE_ARGS += --with-imap-ssl=$(prefix) CONFIGURE_ARGS += --with-imap=shared,$(prefix) +CONFIGURE_ARGS += --with-jpeg-dir=$(prefix) CONFIGURE_ARGS += --with-kerberos=$(prefix) -CONFIGURE_ARGS += --with-imap-ssl=$(prefix) -CONFIGURE_ARGS += --enable-json=shared -CONFIGURE_ARGS += --with-ldap=shared,$(prefix) CONFIGURE_ARGS += --with-ldap-sasl=$(prefix) -CONFIGURE_ARGS += --enable-mbstring=shared -CONFIGURE_ARGS += --enable-mbregex=shared +CONFIGURE_ARGS += --with-ldap=shared,$(prefix) +CONFIGURE_ARGS += --with-libedit=no +CONFIGURE_ARGS += --with-libexpat-dir=$(prefix) +CONFIGURE_ARGS += --with-libxml-dir=$(prefix) CONFIGURE_ARGS += --with-mcrypt=shared,$(prefix) CONFIGURE_ARGS += --with-mhash=shared,$(prefix) -CONFIGURE_ARGS += --enable-phar=shared +CONFIGURE_ARGS += --with-mm=$(prefix) CONFIGURE_ARGS += --with-mssql=shared,$(prefix) CONFIGURE_ARGS += --with-mysql=shared,$(prefix)/mysql5 CONFIGURE_ARGS += --with-mysqli=shared,$(prefix)/mysql5/bin/$(ISA_DEFAULT)/mysql_config -CONFIGURE_ARGS += --with-unixODBC=shared,$(prefix) +CONFIGURE_ARGS += --with-ndbm CONFIGURE_ARGS += --with-openssl=shared,$(prefix) -CONFIGURE_ARGS += --enable-pcntl=shared -CONFIGURE_ARGS += --enable-pdo=shared +CONFIGURE_ARGS += --with-pcre-dir=$(prefix) +CONFIGURE_ARGS += --with-pcre-regex # not documented, but you can pass the path to mysql_config directly # we need the 32-bit version, so we have to force this CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix)/mysql5/bin/$(ISA_DEFAULT)/mysql_config -CONFIGURE_ARGS += --with-zlib-dir=$(prefix) CONFIGURE_ARGS += --with-pdo-odbc=shared,unixODBC,$(prefix) CONFIGURE_ARGS += --with-pdo-pgsql=shared,$(prefix)/postgresql CONFIGURE_ARGS += --with-pdo-sqlite=shared,$(prefix) +CONFIGURE_ARGS += --with-pear=shared +CONFIGURE_ARGS += --with-pear=shared CONFIGURE_ARGS += --with-pgsql=shared,$(prefix)/postgresql -CONFIGURE_ARGS += --enable-posix=shared +CONFIGURE_ARGS += --with-png-dir=$(prefix) CONFIGURE_ARGS += --with-pspell=shared,$(prefix) -CONFIGURE_ARGS += --with-libedit=no CONFIGURE_ARGS += --with-readline=shared,/opt/csw -CONFIGURE_ARGS += --enable-session=shared -CONFIGURE_ARGS += --enable-shmop=shared -## build this static, php can not run without it. -## it is more efficient to have this built into the php binary -CONFIGURE_ARGS += --enable-simplexml -CONFIGURE_ARGS += --with-libxml-dir=$(prefix) -## CONFIGURE_ARGS += --with-snmp=shared,$(prefix) -CONFIGURE_ARGS += --enable-soap=shared -CONFIGURE_ARGS += --with-libxml-dir=$(prefix) -CONFIGURE_ARGS += --enable-sockets=shared CONFIGURE_ARGS += --with-sqlite=shared,$(prefix) -CONFIGURE_ARGS += --enable-sqlite-utf8 -CONFIGURE_ARGS += --enable-sysvmsg=shared -CONFIGURE_ARGS += --enable-sysvsem=shared -CONFIGURE_ARGS += --enable-sysvshm=shared +CONFIGURE_ARGS += --with-t1lib=$(prefix) CONFIGURE_ARGS += --with-tidy=shared,$(prefix) -CONFIGURE_ARGS += --enable-tokenizer=shared -CONFIGURE_ARGS += --enable-wddx=shared -CONFIGURE_ARGS += --with-libxml-dir=$(prefix) -CONFIGURE_ARGS += --with-libexpat-dir=$(prefix) -CONFIGURE_ARGS += --enable-xml -CONFIGURE_ARGS += --with-libxml-dir=$(prefix) -CONFIGURE_ARGS += --with-libexpat-dir=$(prefix) -CONFIGURE_ARGS += --enable-xmlreader=shared -CONFIGURE_ARGS += --with-libxml-dir=$(prefix) +CONFIGURE_ARGS += --with-unixODBC=shared,$(prefix) CONFIGURE_ARGS += --with-xmlrpc=shared -CONFIGURE_ARGS += --with-libxml-dir=$(prefix) -CONFIGURE_ARGS += --with-libexpat-dir=$(prefix) -CONFIGURE_ARGS += --enable-xmlwriter=shared -CONFIGURE_ARGS += --with-libxml-dir=$(prefix) +CONFIGURE_ARGS += --with-xpm-dir=$(prefix) CONFIGURE_ARGS += --with-xsl=shared,$(prefix) -CONFIGURE_ARGS += --enable-zip=shared CONFIGURE_ARGS += --with-zlib-dir=$(prefix) CONFIGURE_ARGS += --with-zlib=$(prefix) -CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs # Disable Tests (report submitted to PHP QA) SKIPTEST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Apr 21 04:22:29 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 21 Apr 2011 02:22:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[14370] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14370 http://gar.svn.sourceforge.net/gar/?rev=14370&view=rev Author: bdwalton Date: 2011-04-21 02:22:29 +0000 (Thu, 21 Apr 2011) Log Message: ----------- php5/trunk: add modulations so we can get our cgi binary back, segment configure args Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-21 02:19:02 UTC (rev 14369) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-21 02:22:29 UTC (rev 14370) @@ -18,6 +18,9 @@ available. endef +EXTRA_MODULATORS = SAPI +MODULATIONS_SAPI = cgi ap2 + # turn on the build scripts to enable/disable modules PHP5_EXT = 1 AP2_MODS = 1 @@ -195,7 +198,13 @@ +CONFIGURE_ARGS += --prefix=$(prefix)/php5 +## build this static, php can not run without it. +## it is more efficient to have this built into the php binary +CONFIGURE_ARGS += --enable-simplexml CONFIGURE_ARGS += --disable-static + +ifeq ($(SAPI),ap2) CONFIGURE_ARGS += --enable-bcmath=shared CONFIGURE_ARGS += --enable-calendar=shared CONFIGURE_ARGS += --enable-cli @@ -218,9 +227,6 @@ CONFIGURE_ARGS += --enable-posix=shared CONFIGURE_ARGS += --enable-session=shared CONFIGURE_ARGS += --enable-shmop=shared -## build this static, php can not run without it. -## it is more efficient to have this built into the php binary -CONFIGURE_ARGS += --enable-simplexml CONFIGURE_ARGS += --enable-soap=shared CONFIGURE_ARGS += --enable-sockets=shared CONFIGURE_ARGS += --enable-sqlite-utf8 @@ -233,7 +239,6 @@ CONFIGURE_ARGS += --enable-xmlreader=shared CONFIGURE_ARGS += --enable-xmlwriter=shared CONFIGURE_ARGS += --enable-zip=shared -CONFIGURE_ARGS += --prefix=$(prefix)/php5 CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs CONFIGURE_ARGS += --with-bz2=shared,$(prefix) CONFIGURE_ARGS += --with-curl=shared,$(prefix) @@ -287,6 +292,7 @@ CONFIGURE_ARGS += --with-xsl=shared,$(prefix) CONFIGURE_ARGS += --with-zlib-dir=$(prefix) CONFIGURE_ARGS += --with-zlib=$(prefix) +endif # Disable Tests (report submitted to PHP QA) SKIPTEST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Apr 21 04:27:37 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 21 Apr 2011 02:27:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14371] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14371 http://gar.svn.sourceforge.net/gar/?rev=14371&view=rev Author: bdwalton Date: 2011-04-21 02:27:37 +0000 (Thu, 21 Apr 2011) Log Message: ----------- php5/trunk: drop a missed dup configure arg Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-21 02:22:29 UTC (rev 14370) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-21 02:27:37 UTC (rev 14371) @@ -277,7 +277,6 @@ CONFIGURE_ARGS += --with-pdo-pgsql=shared,$(prefix)/postgresql CONFIGURE_ARGS += --with-pdo-sqlite=shared,$(prefix) CONFIGURE_ARGS += --with-pear=shared -CONFIGURE_ARGS += --with-pear=shared CONFIGURE_ARGS += --with-pgsql=shared,$(prefix)/postgresql CONFIGURE_ARGS += --with-png-dir=$(prefix) CONFIGURE_ARGS += --with-pspell=shared,$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 21 09:38:14 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 21 Apr 2011 07:38:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14372] csw/mgar/pkg/sqlite3/trunk/Makefile Message-ID: Revision: 14372 http://gar.svn.sourceforge.net/gar/?rev=14372&view=rev Author: dmichelsen Date: 2011-04-21 07:38:14 +0000 (Thu, 21 Apr 2011) Log Message: ----------- sqlite3: Match catalogname sqlite3_rt_stub to conform to existing prefix of package Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2011-04-21 02:27:37 UTC (rev 14371) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2011-04-21 07:38:14 UTC (rev 14372) @@ -29,6 +29,8 @@ PKGFILES_CSWlibsqlite3-0 = $(call pkgfiles_lib,libsqlite3.so.0) OBSOLETED_BY_CSWlibsqlite3-0 = CSWsqlite3rt +CATALOGNAME_CSWsqlite3rt = sqlite3_rt_stub + PACKAGES += CSWlibsqlite3-dev CATALOGNAME_CSWlibsqlite3-dev = libsqlite3_dev SPKG_DESC_CSWlibsqlite3-dev = Development files for libsqlite3.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Thu Apr 21 15:08:07 2011 From: bwalton at opencsw.org (Ben Walton) Date: Thu, 21 Apr 2011 09:08:07 -0400 Subject: [csw-devel] SF.net SVN: gar:[14350] csw/mgar/pkg/bacula/trunk/Makefile In-Reply-To: <20110420201659.GD30250@sebastiankayser.de> References: <20110420201659.GD30250@sebastiankayser.de> Message-ID: <1303391267-sup-6679@pinkfloyd.chass.utoronto.ca> Excerpts from Sebastian Kayser's message of Wed Apr 20 16:16:59 -0400 2011: Hi Sebastian, > you shouldn't need to explicitly install README.CSW. As long as it's > listed in DISTFILES, GAR will merge it automatically. Same goes for > changelog.CSW. Yes, I forgot about this. Thanks! -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From skayser at opencsw.org Thu Apr 21 18:52:49 2011 From: skayser at opencsw.org (Sebastian Kayser) Date: Thu, 21 Apr 2011 18:52:49 +0200 Subject: [csw-devel] SF.net SVN: gar:[14350] csw/mgar/pkg/bacula/trunk/Makefile In-Reply-To: <1303391267-sup-6679@pinkfloyd.chass.utoronto.ca> References: <20110420201659.GD30250@sebastiankayser.de> <1303391267-sup-6679@pinkfloyd.chass.utoronto.ca> Message-ID: <20110421165248.GA11519@sebastiankayser.de> * Ben Walton wrote: > Excerpts from Sebastian Kayser's message of Wed Apr 20 16:16:59 -0400 2011: > > you shouldn't need to explicitly install README.CSW. As long as it's > > listed in DISTFILES, GAR will merge it automatically. Same goes for > > changelog.CSW. > > Yes, I forgot about this. I wasn't even aware of it until about 10 days ago. :) Easy to forget with all those nifty features and tools flowing in. Sebastian From bonivart at users.sourceforge.net Thu Apr 21 19:15:46 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 21 Apr 2011 17:15:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[14373] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 14373 http://gar.svn.sourceforge.net/gar/?rev=14373&view=rev Author: bonivart Date: 2011-04-21 17:15:46 +0000 (Thu, 21 Apr 2011) Log Message: ----------- cswclassutils/trunk: Update initsmf Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/files/CSWcas-initsmf.cswreleasenotes csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-04-21 07:38:14 UTC (rev 14372) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-04-21 17:15:46 UTC (rev 14373) @@ -1,7 +1,7 @@ # $HeadURL$ NAME = cswclassutils -VERSION = 1.43 +VERSION = 1.44 CATEGORIES = utils # a few handy functions for defining 'generic' things dynamically Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcas-initsmf.cswreleasenotes =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcas-initsmf.cswreleasenotes 2011-04-21 07:38:14 UTC (rev 14372) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcas-initsmf.cswreleasenotes 2011-04-21 17:15:46 UTC (rev 14373) @@ -1,3 +1,4 @@ +* Read absolute state value instead of defaulting to enabled * Creating /etc/opt/csw/init.d so other packages relying on it aren't borked - mantis 4635 * Override /usr/share warning as it's part of the doctype string Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf 2011-04-21 07:38:14 UTC (rev 14372) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf 2011-04-21 17:15:46 UTC (rev 14373) @@ -22,6 +22,7 @@ # 2009-08-05 Set new timeout values for manifest (Bug ID 0003764) # 2009-08-10 Fix autoenable bug (Bug ID 0003785) # 2010-10-25 Fix grep bug in FMRI 'dot in name' detection (Bug ID 0004588) +# 2011-04-21 Read absolute state value instead of defaulting to enabled DEBUG= # clear to disable debug, set to anything to enable SVCDIR=/var/opt/csw/svc @@ -32,14 +33,17 @@ # retrieve the previous state of a service identified by the given FRMI load_smf_service_state () { - SMF_STATE="enabled" + SMF_STATE="" - if [ -f "$SMF_STATE_FILE" ]; then - set -- `/usr/bin/awk " \\\$1 == \"$1\" { print \\\$2 } " "$SMF_STATE_FILE"` - if [ "$1" = "disabled" ]; then - SMF_STATE="disabled" - fi + if [ -f "$SMF_STATE_FILE" ]; then + set -- `/usr/bin/awk " \\\$1 == \"$1\" { print \\\$2 } " "$SMF_STATE_FILE"` + if [ "$1" = "disabled" ]; then + SMF_STATE="disabled" fi + if [ "$1" = "enabled" ]; then + SMF_STATE="enabled" + fi + fi } # Source csw.conf, if it exists This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Apr 21 20:49:19 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 21 Apr 2011 18:49:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[14374] csw/mgar/pkg Message-ID: Revision: 14374 http://gar.svn.sourceforge.net/gar/?rev=14374&view=rev Author: idogan23 Date: 2011-04-21 18:49:18 +0000 (Thu, 21 Apr 2011) Log Message: ----------- cherokee: initial commit Added Paths: ----------- csw/mgar/pkg/cherokee/ csw/mgar/pkg/cherokee/Makefile csw/mgar/pkg/cherokee/branches/ csw/mgar/pkg/cherokee/tags/ csw/mgar/pkg/cherokee/trunk/ csw/mgar/pkg/cherokee/trunk/Makefile csw/mgar/pkg/cherokee/trunk/checksums csw/mgar/pkg/cherokee/trunk/files/ Copied: csw/mgar/pkg/cherokee/Makefile (from rev 13407, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/cherokee/Makefile (rev 0) +++ csw/mgar/pkg/cherokee/Makefile 2011-04-21 18:49:18 UTC (rev 14374) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/cherokee/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/cherokee/trunk/Makefile =================================================================== --- csw/mgar/pkg/cherokee/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cherokee/trunk/Makefile 2011-04-21 18:49:18 UTC (rev 14374) @@ -0,0 +1,40 @@ +# $Id$ +NAME = cherokee +VERSION = 1.2.2 +CATEGORIES = server + +DESCRIPTION = Extremely fast and flexible web server +define BLURB + Cherokee is a very fast, flexible and easy to configure Web Server. It + supports the widespread technologies nowadays: FastCGI, SCGI, PHP, CGI, TLS + and SSL encrypted connections, Virtual hosts, Authentication, on the fly + encoding, Load balancing, Apache compatible log files, and much more. A user + friendly interface called cherokee-admin is provided for a no-hassle + configuration of the server. +endef + +VENDOR_URL = http://www.cherokee-project.com/ +MASTER_SITES = http://www.cherokee-project.com/download/1.2/$(VERSION)/ +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +# Does not build on Solaris 9 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + +GARCOMPILER = GCC4 + +CONFIGURE_ARGS = $(DIRPATHS) + +# Does not build +CONFIGURE_ARGS += --with-geoip=no + +# Does not run at the moment +SKIPTEST = 1 + +include gar/category.mk Property changes on: csw/mgar/pkg/cherokee/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/cherokee/trunk/checksums =================================================================== --- csw/mgar/pkg/cherokee/trunk/checksums (rev 0) +++ csw/mgar/pkg/cherokee/trunk/checksums 2011-04-21 18:49:18 UTC (rev 14374) @@ -0,0 +1 @@ +6450f0aa116966227c477a1930292e53 cherokee-1.2.2.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 Thu Apr 21 20:53:07 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 21 Apr 2011 18:53:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[14375] csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile Message-ID: Revision: 14375 http://gar.svn.sourceforge.net/gar/?rev=14375&view=rev Author: idogan23 Date: 2011-04-21 18:53:06 +0000 (Thu, 21 Apr 2011) Log Message: ----------- pm_netucpcommon: fixed package name Modified Paths: -------------- csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile Modified: csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile 2011-04-21 18:49:18 UTC (rev 14374) +++ csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile 2011-04-21 18:53:06 UTC (rev 14375) @@ -8,7 +8,7 @@ Common Stuff for Net::UCP Module endef -PACKAGES = CSWpmnetucpcommon +PACKAGES = CSWpm-netucpcommon CATALOGNAME = pm_netucpcommon CHECKPKG_OVERRIDES_CSWpmnetucpcommon += catalogname-does-not-match-pkgname|pkgname=CSWpmnetucpcommon|catalogname=pm_netucpcommon|expected-catalogname=pmnetucpcommon @@ -16,6 +16,8 @@ DISTFILES += LICENSE ARCHALL = 1 +INCOMPATIBLE_PKGS_CSWpm-netucpcommon = CSWpmnetucpcommon + post-install-modulated: @ginstall -d $(DESTDIR)/opt/csw/share/doc/pm_netucpcommon @ginstall -m 644 $(FILEDIR)/LICENSE $(DESTDIR)/opt/csw/share/doc/pm_netucpcommon/license This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at opencsw.org Thu Apr 21 20:38:09 2011 From: skayser at opencsw.org (Sebastian Kayser) Date: Thu, 21 Apr 2011 20:38:09 +0200 Subject: [csw-devel] SF.net SVN: gar:[14374] csw/mgar/pkg In-Reply-To: References: Message-ID: <20110421183809.GC11519@sebastiankayser.de> Hey Ihsan, * idogan23 at users.sourceforge.net wrote: > cherokee: initial commit yes! Another entry to the bunch of alternative web servers. Do you intend to use this in production or for fooling around purposes? Lemme know how it goes, I'd be interested in what makes it special to you. Sebastian From bonivart at opencsw.org Thu Apr 21 21:07:10 2011 From: bonivart at opencsw.org (Peter Bonivart) Date: Thu, 21 Apr 2011 21:07:10 +0200 Subject: [csw-devel] SF.net SVN: gar:[14375] csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile In-Reply-To: References: Message-ID: On Thu, Apr 21, 2011 at 8:53 PM, wrote: > Log Message: > ----------- > pm_netucpcommon: fixed package name > > Modified: csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile > =================================================================== > > -PACKAGES = CSWpmnetucpcommon > +PACKAGES = CSWpm-netucpcommon > CATALOGNAME = pm_netucpcommon This should be: PACKAGES = CSWpm-net-ucp-common CATALOGNAME = pm_net_ucp_common From bdwalton at users.sourceforge.net Thu Apr 21 21:25:10 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 21 Apr 2011 19:25:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14376] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14376 http://gar.svn.sourceforge.net/gar/?rev=14376&view=rev Author: bdwalton Date: 2011-04-21 19:25:10 +0000 (Thu, 21 Apr 2011) Log Message: ----------- bacula/trunk: make the storage daemon disabled by default too Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-21 18:53:06 UTC (rev 14375) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-21 19:25:10 UTC (rev 14376) @@ -232,11 +232,11 @@ post-install-modulated: @(cd $(WORKSRC)/platforms/solaris; \ ginstall -d -m 0755 $(INITD); \ - (ggrep '^#' bacula-dir; echo '#AUTOENABLE no'; ggrep -v '^#' bacula-dir) > bacula-dir.csw; \ - ginstall -m 0755 bacula-dir.csw $(INITD)/cswbacula-dir; \ - for s in fd sd; do \ - ginstall -m 0755 bacula-$$s $(INITD)/cswbacula-$$s; \ + for s in dir sd; do \ + (ggrep '^#' bacula-$$s; echo '#AUTOENABLE no'; ggrep -v '^#' bacula-$$s) > bacula-$$s.csw; \ + ginstall -m 0755 bacula-$$s.csw $(INITD)/cswbacula-$$s; \ done; \ + ginstall -m 0755 bacula-fd $(INITD)/cswbacula-fd; \ cd ../..; \ ginstall -m 0755 updatedb/update_mysql_tables_10_to_11 $(DESTDIR)$(prefix)/libexec/bacula; \ gcp -pR examples $(DOCD); \ 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 Apr 22 02:56:37 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 22 Apr 2011 00:56:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14377] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14377 http://gar.svn.sourceforge.net/gar/?rev=14377&view=rev Author: bdwalton Date: 2011-04-22 00:56:37 +0000 (Fri, 22 Apr 2011) Log Message: ----------- php5/trunk: make a few more xml options global for the cgi modulation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-21 19:25:10 UTC (rev 14376) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-22 00:56:37 UTC (rev 14377) @@ -203,6 +203,8 @@ ## it is more efficient to have this built into the php binary CONFIGURE_ARGS += --enable-simplexml CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --enable-xml +CONFIGURE_ARGS += --with-libxml-dir=$(prefix) ifeq ($(SAPI),ap2) CONFIGURE_ARGS += --enable-bcmath=shared @@ -235,7 +237,6 @@ CONFIGURE_ARGS += --enable-sysvshm=shared CONFIGURE_ARGS += --enable-tokenizer=shared CONFIGURE_ARGS += --enable-wddx=shared -CONFIGURE_ARGS += --enable-xml CONFIGURE_ARGS += --enable-xmlreader=shared CONFIGURE_ARGS += --enable-xmlwriter=shared CONFIGURE_ARGS += --enable-zip=shared @@ -259,7 +260,6 @@ CONFIGURE_ARGS += --with-ldap=shared,$(prefix) CONFIGURE_ARGS += --with-libedit=no CONFIGURE_ARGS += --with-libexpat-dir=$(prefix) -CONFIGURE_ARGS += --with-libxml-dir=$(prefix) CONFIGURE_ARGS += --with-mcrypt=shared,$(prefix) CONFIGURE_ARGS += --with-mhash=shared,$(prefix) CONFIGURE_ARGS += --with-mm=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Fri Apr 22 03:42:49 2011 From: bwalton at opencsw.org (Ben Walton) Date: Fri, 22 Apr 2011 03:42:49 +0200 Subject: [csw-devel] [PATCH] Add support for reading password from a file by default In-Reply-To: References: Message-ID: <1303436569-27260-1-git-send-email-bwalton@opencsw.org> Before asking the user for a password to submit their package, look for it in /etc/opt/csw/releases/auth/$username. Fall back to getpass on any exception. Signed-off-by: Ben Walton --- gar/v2/lib/python/csw_upload_pkg.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/gar/v2/lib/python/csw_upload_pkg.py b/gar/v2/lib/python/csw_upload_pkg.py index 822d69f..79f4a00 100755 --- a/gar/v2/lib/python/csw_upload_pkg.py +++ b/gar/v2/lib/python/csw_upload_pkg.py @@ -570,8 +570,16 @@ if __name__ == '__main__': for error_tag in error_tags: print "*", error_tag sys.exit(1) + username = os.environ["LOGNAME"] - password = getpass.getpass("{0}'s pkg release password> ".format(username)) + authfile = os.path.join('/etc/opt/csw/releases/auth', username) + + try: + af = open(authfile, 'r') + password = af.readline().rstrip() + except: + password = getpass.getpass("{0}'s pkg release password> ".format(username)) + uploader = Srv4Uploader(args, options.rest_url, os_release=os_release, -- 1.7.3.2 From maciej at opencsw.org Fri Apr 22 08:03:34 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Fri, 22 Apr 2011 07:03:34 +0100 Subject: [csw-devel] [PATCH] Add support for reading password from a file by default In-Reply-To: <1303436569-27260-1-git-send-email-bwalton@opencsw.org> References: <1303436569-27260-1-git-send-email-bwalton@opencsw.org> Message-ID: 2011/4/22 Ben Walton : > + ?try: > + ? ?af = open(authfile, 'r') > + ? ?password = af.readline().rstrip() Try using the 'with' syntax: try: with open(authfile, 'r') as af: password = af... To get the password, you can: password = af.read() # reads the whole file and with stripping: password = af.read().strip() (strips ws from both sides) > + ?except: Add an exception class, I suppose it'll be an IOError; let other exceptions propagate. Add a warning that the file couldn't be found (logging.warning(...)). > + ? ?password = getpass.getpass("{0}'s pkg release password> ".format(username)) > + > ? uploader = Srv4Uploader(args, > ? ? ? ? ? ? ? ? ? ? ? ? ? options.rest_url, > ? ? ? ? ? ? ? ? ? ? ? ? ? os_release=os_release, From bwalton at opencsw.org Fri Apr 22 13:47:32 2011 From: bwalton at opencsw.org (Ben Walton) Date: Fri, 22 Apr 2011 07:47:32 -0400 Subject: [csw-devel] [PATCH] Add support for reading password from a file by default In-Reply-To: References: <1303436569-27260-1-git-send-email-bwalton@opencsw.org> Message-ID: <1303472731-sup-2296@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Fri Apr 22 02:03:34 -0400 2011: > 2011/4/22 Ben Walton : > > + ?try: > > + ? ?af = open(authfile, 'r') > > + ? ?password = af.readline().rstrip() > > Try using the 'with' syntax: > > try: > with open(authfile, 'r') as af: > password = af... Ah, ok. This forces the close() which is only implicit with the end of the script as it stands. WIll do. > To get the password, you can: > > password = af.read() # reads the whole file > > and with stripping: > > password = af.read().strip() > > (strips ws from both sides) Do we want that though? It shouldn't hurt, but it also shouldn't be necessary. I'm only looking for strip()-like functionality to mimick chomp() from perl/ruby. > > + ?except: > > Add an exception class, I suppose it'll be an IOError; let other > exceptions propagate. Add a warning that the file couldn't be found > (logging.warning(...)). Ok, I wasn't sure what the best thing to catch was. I thought that catching everything around this small block was the way to go. Update pending. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bwalton at opencsw.org Fri Apr 22 14:10:23 2011 From: bwalton at opencsw.org (Ben Walton) Date: Fri, 22 Apr 2011 14:10:23 +0200 Subject: [csw-devel] [PATCH] Add support for reading password from a file by default In-Reply-To: References: Message-ID: <1303474223-9460-1-git-send-email-bwalton@opencsw.org> Before asking the user for a password to submit their package, look for it in /etc/opt/csw/releases/auth/$username. Fall back to getpass on any exception. Signed-off-by: Ben Walton --- gar/v2/lib/python/csw_upload_pkg.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/gar/v2/lib/python/csw_upload_pkg.py b/gar/v2/lib/python/csw_upload_pkg.py index 822d69f..bfb4ece 100755 --- a/gar/v2/lib/python/csw_upload_pkg.py +++ b/gar/v2/lib/python/csw_upload_pkg.py @@ -570,8 +570,17 @@ if __name__ == '__main__': for error_tag in error_tags: print "*", error_tag sys.exit(1) + username = os.environ["LOGNAME"] - password = getpass.getpass("{0}'s pkg release password> ".format(username)) + authfile = os.path.join('/etc/opt/csw/releases/auth', username) + + try: + with open(authfile, 'r') as af: + password = af.read().strip() + except IOError: + logging.warning("IOError while attempting to read password from {0}".format(authfile)) + password = getpass.getpass("{0}'s pkg release password> ".format(username)) + uploader = Srv4Uploader(args, options.rest_url, os_release=os_release, -- 1.7.3.2 From maciej at opencsw.org Fri Apr 22 14:10:56 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Fri, 22 Apr 2011 13:10:56 +0100 Subject: [csw-devel] [PATCH] Add support for reading password from a file by default In-Reply-To: <1303472731-sup-2296@pinkfloyd.chass.utoronto.ca> References: <1303436569-27260-1-git-send-email-bwalton@opencsw.org> <1303472731-sup-2296@pinkfloyd.chass.utoronto.ca> Message-ID: 2011/4/22 Ben Walton : >> To get the password, you can: >> >> password = af.read() # reads the whole file >> >> and with stripping: >> >> password = af.read().strip() >> >> (strips ws from both sides) > > Do we want that though? ?It shouldn't hurt, but it also shouldn't be > necessary. ?I'm only looking for strip()-like functionality to mimick > chomp() from perl/ruby. Right, we only need to strip the newline character if it's there. I personally use strip() as default, unless there's a reason do to otherwise. As far as reading from files, I usually stick to two idioms: file_descriptor.read() # to read the whole file for line in file_descriptor: do_stuff_with(line) # for line-by-line processing >> > + ?except: >> >> Add an exception class, I suppose it'll be an IOError; let other >> exceptions propagate. ?Add a warning that the file couldn't be found >> (logging.warning(...)). > > Ok, I wasn't sure what the best thing to catch was. ?I thought that > catching everything around this small block was the way to go. I almost never catch everything. In an unexpected scenario, that block might be catching a surprising and revealing exception, which should propagate rather than being caught and not handled. The handling code - using getpass - only handles the case of a missing file, which manifests itself only by IOError. When logging a warning, include the exception message as well: except IOError, e: logging.warning("Could not read %s: %s", authfile, e) ... Maciej From bwalton at opencsw.org Fri Apr 22 14:19:22 2011 From: bwalton at opencsw.org (Ben Walton) Date: Fri, 22 Apr 2011 08:19:22 -0400 Subject: [csw-devel] [PATCH] Add support for reading password from a file by default In-Reply-To: <1303474223-9460-1-git-send-email-bwalton@opencsw.org> References: <1303474223-9460-1-git-send-email-bwalton@opencsw.org> Message-ID: <1303474760-sup-5792@pinkfloyd.chass.utoronto.ca> Excerpts from Ben Walton's message of Fri Apr 22 08:10:23 -0400 2011: > + password = getpass.getpass("{0}'s pkg release password> ".format(username)) FYI, this bug in python is annoying. :( http://bugs.python.org/issue11236 Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Fri Apr 22 14:47:38 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 22 Apr 2011 12:47:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[14378] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14378 http://gar.svn.sourceforge.net/gar/?rev=14378&view=rev Author: bdwalton Date: 2011-04-22 12:47:38 +0000 (Fri, 22 Apr 2011) Log Message: ----------- php5/trunk: set merge rules for the modulated build Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-22 00:56:37 UTC (rev 14377) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-22 12:47:38 UTC (rev 14378) @@ -20,6 +20,8 @@ EXTRA_MODULATORS = SAPI MODULATIONS_SAPI = cgi ap2 +MERGE_SCRIPTS_isa-default-sapi-cgi = copy-all +MERGE_SCRIPTS_isa-default-sapi-ap2 = copy-all # turn on the build scripts to enable/disable modules PHP5_EXT = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Apr 22 14:50:12 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 22 Apr 2011 12:50:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[14379] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14379 http://gar.svn.sourceforge.net/gar/?rev=14379&view=rev Author: bdwalton Date: 2011-04-22 12:50:12 +0000 (Fri, 22 Apr 2011) Log Message: ----------- php5/trunk: update sqlite library dep Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-22 12:47:38 UTC (rev 14378) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-22 12:50:12 UTC (rev 14379) @@ -165,7 +165,7 @@ PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_pgsql.so CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5 -$(eval $(call php5_subpackage,pdosqlite,CSWsqlite3rt CSWphp5-pdo)) +$(eval $(call php5_subpackage,pdosqlite,CSWlibsqlite3-0 CSWphp5-pdo)) PKGFILES_CSWphp5-pdosqlite = .*/lib/php/extensions/.*/pdo_sqlite.so CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5 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 Apr 22 14:57:48 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 22 Apr 2011 12:57:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14380] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14380 http://gar.svn.sourceforge.net/gar/?rev=14380&view=rev Author: bdwalton Date: 2011-04-22 12:57:48 +0000 (Fri, 22 Apr 2011) Log Message: ----------- php5/trunk: update ini file handling to use preserveconf (still need to migrate this) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-22 12:50:12 UTC (rev 14379) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-22 12:57:48 UTC (rev 14380) @@ -59,6 +59,8 @@ # of sqlite... BUILD_DEP_PKGS += CSWsqlite +PRESERVECONF = $(prefix)/php5/lib/php.ini + define php5_subpackage PACKAGES += CSWphp5-$(1) CATALOGNAME_CSWphp5-$(1) ?= php5_$(1) @@ -311,7 +313,7 @@ @$(MAKECOOKIE) post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf -post-install-modulated: INIDEST=$(DESTDIR)$(prefix)/php5/lib/php.ini.CSW +post-install-modulated: INIDEST=$(DESTDIR)$(prefix)/php5/lib/php.ini post-install-modulated: @rm -f $(DESTDIR)$(AP2SYSCONF) @cp $(WORKSRC)/php.ini-production $(INIDEST) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Fri Apr 22 15:08:56 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Fri, 22 Apr 2011 14:08:56 +0100 Subject: [csw-devel] [PATCH] Add support for reading password from a file by default In-Reply-To: <1303474760-sup-5792@pinkfloyd.chass.utoronto.ca> References: <1303474223-9460-1-git-send-email-bwalton@opencsw.org> <1303474760-sup-5792@pinkfloyd.chass.utoronto.ca> Message-ID: 2011/4/22 Ben Walton : > Excerpts from Ben Walton's message of Fri Apr 22 08:10:23 -0400 2011: > >> + ? ?password = getpass.getpass("{0}'s pkg release password> ".format(username)) > > FYI, this bug in python is annoying. :( > > http://bugs.python.org/issue11236 Yes, annoying indeed. There were other bugs in getpass in the past, e.g. it would display the password on screen on return. From bwalton at opencsw.org Fri Apr 22 18:31:48 2011 From: bwalton at opencsw.org (Ben Walton) Date: Fri, 22 Apr 2011 18:31:48 +0200 Subject: [csw-devel] [PATCH] Add support for reading password from a file by default In-Reply-To: References: Message-ID: <1303489908-20924-1-git-send-email-bwalton@opencsw.org> Before asking the user for a password to submit their package, look for it in /etc/opt/csw/releases/auth/$username. Fall back to getpass on if there is any IOError while reading from the file. Signed-off-by: Ben Walton --- gar/v2/lib/python/csw_upload_pkg.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/gar/v2/lib/python/csw_upload_pkg.py b/gar/v2/lib/python/csw_upload_pkg.py index 822d69f..6396182 100755 --- a/gar/v2/lib/python/csw_upload_pkg.py +++ b/gar/v2/lib/python/csw_upload_pkg.py @@ -570,8 +570,17 @@ if __name__ == '__main__': for error_tag in error_tags: print "*", error_tag sys.exit(1) + username = os.environ["LOGNAME"] - password = getpass.getpass("{0}'s pkg release password> ".format(username)) + authfile = os.path.join('/etc/opt/csw/releases/auth', username) + + try: + with open(authfile, 'r') as af: + password = af.read().strip() + except IOError, e: + logging.warning("Error reading %s: %s", authfile, e) + password = getpass.getpass("{0}'s pkg release password> ".format(username)) + uploader = Srv4Uploader(args, options.rest_url, os_release=os_release, -- 1.7.3.2 From bdwalton at users.sourceforge.net Fri Apr 22 20:07:12 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 22 Apr 2011 18:07:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[14381] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14381 http://gar.svn.sourceforge.net/gar/?rev=14381&view=rev Author: bdwalton Date: 2011-04-22 18:07:11 +0000 (Fri, 22 Apr 2011) Log Message: ----------- php5/trunk: CSWpostgresql is a required build dep Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-22 12:57:48 UTC (rev 14380) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-22 18:07:11 UTC (rev 14381) @@ -54,7 +54,7 @@ BUILD_DEP_PKGS += CSWoldapdevel CSWkrb5libdev CSWsasl CSWlibltdl7 BUILD_DEP_PKGS += CSWlibmcrypt CSWfreetds CSWmysql5devel CSWunixodbc BUILD_DEP_PKGS += CSWlibpq CSWreadline CSWncurses CSWnetsnmp -BUILD_DEP_PKGS += CSWsqlite3devel CSWaspell CSWhtmltidy +BUILD_DEP_PKGS += CSWsqlite3devel CSWaspell CSWhtmltidy CSWpostgresql # NOTE: I think this is a leftover bug. we shouldn't depend on two versions # of sqlite... BUILD_DEP_PKGS += CSWsqlite 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 Apr 22 21:02:28 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 22 Apr 2011 19:02:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[14382] csw/mgar/pkg/bacula/trunk/files Message-ID: Revision: 14382 http://gar.svn.sourceforge.net/gar/?rev=14382&view=rev Author: bdwalton Date: 2011-04-22 19:02:28 +0000 (Fri, 22 Apr 2011) Log Message: ----------- bacula/trunk: drop the legacy pre/post scripts as the functionality is wholly moved to CAS now Removed Paths: ------------- csw/mgar/pkg/bacula/trunk/files/postinstall csw/mgar/pkg/bacula/trunk/files/postremove csw/mgar/pkg/bacula/trunk/files/preremove Deleted: csw/mgar/pkg/bacula/trunk/files/postinstall =================================================================== --- csw/mgar/pkg/bacula/trunk/files/postinstall 2011-04-22 18:07:11 UTC (rev 14381) +++ csw/mgar/pkg/bacula/trunk/files/postinstall 2011-04-22 19:02:28 UTC (rev 14382) @@ -1,79 +0,0 @@ -# Postinstall script for bacula -# 2006-01-09 Add SMF capability -# 2007-01-19 Add csw.conf support -# 2007-09-11 Fix PKG_INSTALL_ROOT usage. BASEDIR is not used for non -# relocatable packages. -# -# Copy configuration files if they do not exist -# -host=`hostname` -if [ ! -f ${PKG_INSTALL_ROOT}/opt/csw/etc/bacula/bacula-dir.conf ]; then - echo "Creating initial copy of /opt/csw/etc/bacula/bacula-dir.conf" - sed -e "s/Name = ra/Name = $host/g" -e "s/Name = thor/Name = $host/g" -e "s/Address = ra/Address = $host/g" -e "s/Address = thor/Address = $host/g" -e "s/Client = ra/Client = $host/g" -e "s/Client = thor/Client = $host/g" -e "s/Client=ra/Client=$host/g" -e "s/Client=thor/Client=$host/g" ${PKG_INSTALL_ROOT}/opt/csw/etc/bacula/bacula-dir.conf.CSW >${PKG_INSTALL_ROOT}/opt/csw/etc/bacula/bacula-dir.conf - chown root:bin ${PKG_INSTALL_ROOT}/opt/csw/etc/bacula/bacula-dir.conf -fi - -if [ ! -f ${PKG_INSTALL_ROOT}/opt/csw/etc/bacula/bacula-sd.conf ]; then - echo "Creating initial copy of /opt/csw/etc/bacula/bacula-sd.conf" - sed -e "s/Name = ra/Name = $host/g" -e "s/Name = thor/Name = $host/g" -e "s/director = ra/director = $host/g" -e "s/director = thor/director = $host/g" ${PKG_INSTALL_ROOT}/opt/csw/etc/bacula/bacula-sd.conf.CSW >${PKG_INSTALL_ROOT}/opt/csw/etc/bacula/bacula-sd.conf - chown root:bin ${PKG_INSTALL_ROOT}/opt/csw/etc/bacula/bacula-sd.conf -fi - -# daemons are started by default -enable_daemon=yes - -# Source csw.conf, if it exists -if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then - . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf -fi -if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then - . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf -fi - -# If defined, autoenable for the specific daemon name takes precedence -if [ "$autoenable_bacula" = "no" ] ; then - enable_daemon=no -elif [ "$autoenable_daemons" = "no" -a ! -n "$autoenable_bacula" ] ; then - enable_daemon=no -fi - -# Set variable for the availability of SMF -smf=no -if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] - then - smf=yes -fi - -# Stop bacula if it is running. -if [ "$enable_daemon" = "yes" -a x"$PKG_INSTALL_ROOT" = x"" ] ; then - echo " " - echo "Stopping bacula" - if [ $smf = no ] - then - /etc/init.d/cswbacula stop - else - /usr/sbin/svcadm disable svc:application/cswbacula - fi - sleep 3 -fi - -# Start bacula -if [ "$enable_daemon" = "yes" -a x"$PKG_INSTALL_ROOT" = x"" ] ; then - echo "Starting bacula" - if [ $smf = no ] - then - /etc/init.d/cswbacula start - else - /usr/sbin/svcadm enable svc:application/cswbacula - fi -fi - -echo -echo "*** START OF IMPORTANT NOTICE ***" -echo " With bacula 2.2.7 and later, the MySQL version is changed" -echo " from 4.1 to 5.0. See /opt/csw/share/doc/bacula/README.CSW" -echo " for notes on the database upgrade." -echo "*** END OF IMPORTANT NOTICE ***" -echo - -exit 0 Deleted: csw/mgar/pkg/bacula/trunk/files/postremove =================================================================== --- csw/mgar/pkg/bacula/trunk/files/postremove 2011-04-22 18:07:11 UTC (rev 14381) +++ csw/mgar/pkg/bacula/trunk/files/postremove 2011-04-22 19:02:28 UTC (rev 14382) @@ -1,43 +0,0 @@ -# bacula - postremove script -# 2007-01-19 Initial version -# -# Since bacula_client is still installed; restart the init script. -# -# Start bacula if it is running. - -if [ ! x"$PKG_INSTALL_ROOT" = x"" -a ! x"$PKG_INSTALL_ROOT" = x"/" ] ; then exit 0 ; fi - -# daemons are started by default -enable_daemon=yes - -# Source csw.conf, if it exists -if [ -f /opt/csw/etc/csw.conf ] ; then - . /opt/csw/etc/csw.conf -fi -if [ -f /etc/opt/csw/csw.conf ] ; then - . /etc/opt/csw/csw.conf -fi - -# If defined, autoenable for the specific daemon name takes precedence -if [ "$autoenable_bacula" = "no" ] ; then - enable_daemon=no -elif [ "$autoenable_daemons" = "no" -a ! -n "$autoenable_bacula" ] ; then - enable_daemon=no -fi - -smf=no -if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi - -if [ "$enable_daemon" = "yes" ] ; then - echo "Starting bacula client" - if [ $smf = yes ] - then - # Enable service - /usr/sbin/svcadm enable svc:application/cswbacula:default >/dev/null 2>&1 - else - /etc/init.d/cswbacula start >/dev/null 2>&1 - fi - sleep 3 -fi - -exit 0 Deleted: csw/mgar/pkg/bacula/trunk/files/preremove =================================================================== --- csw/mgar/pkg/bacula/trunk/files/preremove 2011-04-22 18:07:11 UTC (rev 14381) +++ csw/mgar/pkg/bacula/trunk/files/preremove 2011-04-22 19:02:28 UTC (rev 14382) @@ -1,24 +0,0 @@ -# bacula - preremove script -# 2007-08-18 Fix usage of $BASEDIR and $PKG_INSTALL_ROOT. This package is -# not relocatable; so $BASEDIR is not used -# 2006-01-09 Add SMF capability -# - -# If removing package from a filesystem tree not running the OS; then exit. -if [ ! x"$PKG_INSTALL_ROOT" = x"" ] ; then exit 0 ; fi - -# Stop bacula if it is running. -smf=no -if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi - - echo "Stopping bacula" - if [ $smf = yes ] - then - # Disable service - /usr/sbin/svcadm disable svc:application/cswbacula:default - else - /etc/init.d/cswbacula stop - fi - sleep 3 - -exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Apr 22 21:46:50 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 22 Apr 2011 19:46:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14383] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 14383 http://gar.svn.sourceforge.net/gar/?rev=14383&view=rev Author: bdwalton Date: 2011-04-22 19:46:49 +0000 (Fri, 22 Apr 2011) Log Message: ----------- gar/v2: hide echo for the banner merge command Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2011-04-22 19:02:28 UTC (rev 14382) +++ csw/mgar/gar/v2/gar.mk 2011-04-22 19:46:49 UTC (rev 14383) @@ -807,7 +807,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) merge-distfile-README.CSW merge-distfile-changelog.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod) $(if $(PHP5_EXT),post-merge-php5ext) post-merge - banner merge + @banner merge @$(MAKECOOKIE) .PHONY: merge-do 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 Apr 22 22:03:44 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 22 Apr 2011 20:03:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[14384] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14384 http://gar.svn.sourceforge.net/gar/?rev=14384&view=rev Author: bdwalton Date: 2011-04-22 20:03:44 +0000 (Fri, 22 Apr 2011) Log Message: ----------- bacula/trunk: add legacy config migrations Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-22 19:46:49 UTC (rev 14383) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-22 20:03:44 UTC (rev 14384) @@ -208,6 +208,14 @@ INITSMF = /etc/opt/csw/init.d/cswbacula-dir /etc/opt/csw/init.d/cswbacula-sd INITSMF += /etc/opt/csw/init.d/cswbacula-fd +MIGRATE_FILES_CSWbacula-director = "query.sql bacula-dir.conf" +MIGRATE_FILES_CSWbacula-sd = "mtx-changer.conf bacula-sd.conf" +MIGRATE_FILES_CSWbacula-sd = "bacula-fd.conf" +MIGRATE_FILES_CSWbacula-console = "bconsole.conf" +MIGRATE_FILES_CSWbacula-tray-monitor = "tray-monitor.conf" +MIGRATE_SOURCE_DIR = /opt/csw/etc/bacula +MIGRATE_DEST_DIR = $(sysconfdir) + PRESERVECONF = $(sysconfdir)/bacula-dir.conf $(sysconfdir)/bacula-sd.conf PRESERVECONF += $(sysconfdir)/bacula-fd.conf $(sysconfdir)/bconsole.conf PRESERVECONF += $(sysconfdir)/mtx-changer.conf $(sysconfdir)/query.sql This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sat Apr 23 01:02:36 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sat, 23 Apr 2011 00:02:36 +0100 Subject: [csw-devel] [PATCH] Add support for reading password from a file by default In-Reply-To: <1303489908-20924-1-git-send-email-bwalton@opencsw.org> References: <1303489908-20924-1-git-send-email-bwalton@opencsw.org> Message-ID: 2011/4/22 Ben Walton : > Before asking the user for a password to submit their package, look > for it in /etc/opt/csw/releases/auth/$username. ?Fall back to getpass > on if there is any IOError while reading from the file. > > Signed-off-by: Ben Walton > --- > ?gar/v2/lib/python/csw_upload_pkg.py | ? 11 ++++++++++- > ?1 files changed, 10 insertions(+), 1 deletions(-) > > diff --git a/gar/v2/lib/python/csw_upload_pkg.py b/gar/v2/lib/python/csw_upload_pkg.py > index 822d69f..6396182 100755 > --- a/gar/v2/lib/python/csw_upload_pkg.py > +++ b/gar/v2/lib/python/csw_upload_pkg.py > @@ -570,8 +570,17 @@ if __name__ == '__main__': > ? ? for error_tag in error_tags: > ? ? ? print "*", error_tag > ? ? sys.exit(1) > + > ? username = os.environ["LOGNAME"] > - ?password = getpass.getpass("{0}'s pkg release password> ".format(username)) > + ?authfile = os.path.join('/etc/opt/csw/releases/auth', username) > + > + ?try: > + ? ?with open(authfile, 'r') as af: > + ? ? ?password = af.read().strip() > + ?except IOError, e: > + ? ?logging.warning("Error reading %s: %s", authfile, e) > + ? ?password = getpass.getpass("{0}'s pkg release password> ".format(username)) > + > ? uploader = Srv4Uploader(args, > ? ? ? ? ? ? ? ? ? ? ? ? ? options.rest_url, > ? ? ? ? ? ? ? ? ? ? ? ? ? os_release=os_release, > -- > 1.7.3.2 > > LGTM From bwalton at opencsw.org Sat Apr 23 01:43:46 2011 From: bwalton at opencsw.org (Ben Walton) Date: Fri, 22 Apr 2011 19:43:46 -0400 Subject: [csw-devel] [PATCH] Add support for reading password from a file by default In-Reply-To: References: <1303489908-20924-1-git-send-email-bwalton@opencsw.org> Message-ID: <1303515754-sup-8153@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Fri Apr 22 19:02:36 -0400 2011: > LGTM Ok, here's a pull request then since this branch isn't yet public. The http-auth branch in ~bwalton/opencsw-git contains the commit. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bwalton at opencsw.org Sun Apr 24 02:28:38 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sat, 23 Apr 2011 20:28:38 -0400 Subject: [csw-devel] gar issue with modulation specific patches Message-ID: <1303604916-sup-9307@pinkfloyd.chass.utoronto.ca> Hi All, I hit a funny problem tonight when trying to add a modulation specific patch to php5 (I need to call pg_config32 on sparc, but pg_config on i386). At fetch time, the patch wasn't getting pulled down. The fetch-list target displayed the patch properly though, under the expected modulations. Tracing the issue, I found: 1. ALLFILES_PATCHFILES is defined in gar.mk line 34. It is set with ?= and uses the value of MODULATIONS 2. gar.mk includes gar.lib.mk at line 76. 3. MODULATIONS is defined in gar.mk line 93. 4. URLS is set in gar.lib.mk line 34. It is set with := (simple expansion) So, when URLS is set, MODULATIONS as used by ALLFILES_PATCHFILES has no value. This prevents modulation specific patches from being fetchable. The following patch seems to resolve the problem for me. Does anyone see possible side effects to this that might be undesirable? --snip-- Index: gar.mk =================================================================== --- gar.mk (revision 14383) +++ gar.mk (working copy) @@ -73,7 +73,6 @@ # include the configuration file to override any of these variables include $(GARDIR)/gar.conf.mk -include $(GARDIR)/gar.lib.mk # ========================= MODULATIONS ======================== @@ -92,6 +91,8 @@ MODULATIONS ?= $(filter-out $(SKIP_MODULATIONS),$(strip $(call modulations,$(strip $(MODULATORS))))) +include $(GARDIR)/gar.lib.mk + # _modulate(ISA STATIC,,,) # -> _modulate2(STATIC,isa-i386,ISA,ISA=i386) # -> _modulate2(,,isa-i386-static-yes,ISA STATIC,ISA=i386 STATIC=yes) --snip-- Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Sun Apr 24 02:46:06 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 24 Apr 2011 00:46:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14385] csw/mgar/pkg/php5/trunk Message-ID: Revision: 14385 http://gar.svn.sourceforge.net/gar/?rev=14385&view=rev Author: bdwalton Date: 2011-04-24 00:46:05 +0000 (Sun, 24 Apr 2011) Log Message: ----------- php5/trunk: add a modulation specific patch to force 32-bit postgres pg_config on sparc Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/php5/trunk/files/0003-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-22 20:03:44 UTC (rev 14384) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-24 00:46:05 UTC (rev 14385) @@ -45,7 +45,12 @@ PATCHFILES += 0001-Strip-usr-ucblib-references.patch # this one is filed upstream: http://bugs.php.net/bug.php?id=54318 PATCHFILES += 0002-Correct-non-portable-use-of-grep-q-in-configure.patch +# technically this is only required in the ap2 modulation where we build the +# postgres stuff, but protect the cgi modulation too +PATCHFILES_isa-sparcv8-sapi-cgi += 0003-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch +PATCHFILES_isa-sparcv8-sapi-ap2 += 0003-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch + BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils BUILD_DEP_PKGS += CSWlibxml2-dev CSWexpat CSWzlib CSWcurldevel CSWjpeg BUILD_DEP_PKGS += CSWpng CSWt1lib CSWxpm CSWlibgdbm-dev CSWlibgmp Added: csw/mgar/pkg/php5/trunk/files/0003-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch =================================================================== --- csw/mgar/pkg/php5/trunk/files/0003-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch (rev 0) +++ csw/mgar/pkg/php5/trunk/files/0003-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch 2011-04-24 00:46:05 UTC (rev 14385) @@ -0,0 +1,35 @@ +From f90347108abfe42140e3a87c5a5e6c364bc34625 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 23 Apr 2011 23:52:16 +0200 +Subject: [PATCH] Force the PDO pgsql checks to use 32-bit pg_config + +On sparc, we have 32 and 64-bit pg_config binaries. On i386, we only +have 32-bit. We need to force the use of 32-bit for sparc so it uses +the correct path when linking the test binaries, etc. + +This patch should not be applied on i386 as it will break pg_config +detection there. + +Signed-off-by: Ben Walton +--- + configure | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 503369a..753536e 100755 +--- a/configure ++++ b/configure +@@ -73005,8 +73005,8 @@ if test "$PHP_PDO_PGSQL" != "no"; then + echo $ac_n "checking for pg_config""... $ac_c" 1>&6 + echo "configure:73044: checking for pg_config" >&5 + for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do +- if test -x $i/pg_config; then +- PG_CONFIG="$i/pg_config" ++ if test -x $i/pg_config32; then ++ PG_CONFIG="$i/pg_config32" + break; + fi + done +-- +1.7.3.2 + 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 Apr 24 04:35:39 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 24 Apr 2011 02:35:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14386] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14386 http://gar.svn.sourceforge.net/gar/?rev=14386&view=rev Author: bdwalton Date: 2011-04-24 02:35:39 +0000 (Sun, 24 Apr 2011) Log Message: ----------- php5/trunk: most postgres handling to work around 32/64 bit package difference in libpg Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-24 00:46:05 UTC (rev 14385) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-24 02:35:39 UTC (rev 14386) @@ -201,6 +201,7 @@ $(eval $(call php5_subpackage,zip,CSWzlib)) EXTRA_CFLAGS = -I$(prefix)/include/ncursesw +EXTRA_LIB = /opt/csw/postgresql/lib NOISALIST = 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 Sun Apr 24 10:21:59 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 24 Apr 2011 08:21:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[14387] csw/mgar/gar/v2/lib/python/README Message-ID: Revision: 14387 http://gar.svn.sourceforge.net/gar/?rev=14387&view=rev Author: wahwah Date: 2011-04-24 08:21:59 +0000 (Sun, 24 Apr 2011) Log Message: ----------- checkpkg: README update, idea for a new check Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2011-04-24 02:35:39 UTC (rev 14386) +++ csw/mgar/gar/v2/lib/python/README 2011-04-24 08:21:59 UTC (rev 14387) @@ -14,6 +14,8 @@ - A package must not be incompatible with itself - If a pkgmap entry has username or group outside the default list of users, the file's class needs to be 'ugfiles' + - If there is bin/*-config and there is lib/(sparcv9|amd64)/.*, there must + also be bin/(sparcv9|amd64)/*(-|_)config Checks implemented: - foo_bar != CSWfoo-bar -> error 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 Apr 24 10:23:47 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 24 Apr 2011 08:23:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14388] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 14388 http://gar.svn.sourceforge.net/gar/?rev=14388&view=rev Author: wahwah Date: 2011-04-24 08:23:47 +0000 (Sun, 24 Apr 2011) Log Message: ----------- Add support for reading password from a file by default Before asking the user for a password to submit their package, look for it in /etc/opt/csw/releases/auth/$username. Fall back to getpass on if there is any IOError while reading from the file. Signed-off-by: Ben Walton Signed-off-by: Maciej Blizinski Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-24 08:21:59 UTC (rev 14387) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-04-24 08:23:47 UTC (rev 14388) @@ -570,10 +570,17 @@ for error_tag in error_tags: print "*", error_tag sys.exit(1) + username = os.environ["LOGNAME"] - # password = getpass.getpass("{0}'s pkg release password> ".format(username)) - # Disabling for the time being. - password = False + authfile = os.path.join('/etc/opt/csw/releases/auth', username) + + try: + with open(authfile, 'r') as af: + password = af.read().strip() + except IOError, e: + logging.warning("Error reading %s: %s", authfile, e) + password = getpass.getpass("{0}'s pkg release password> ".format(username)) + uploader = Srv4Uploader(args, options.rest_url, os_release=os_release, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 24 11:13:29 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 24 Apr 2011 09:13:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[14389] csw/mgar/pkg/cswclassutils/trunk/files/ cswmigrateconf_test.sh Message-ID: Revision: 14389 http://gar.svn.sourceforge.net/gar/?rev=14389&view=rev Author: wahwah Date: 2011-04-24 09:13:29 +0000 (Sun, 24 Apr 2011) Log Message: ----------- cswclassutils: Adding a unit test for cswmigrateconf Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/cswmigrateconf_test.sh Added: csw/mgar/pkg/cswclassutils/trunk/files/cswmigrateconf_test.sh =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/cswmigrateconf_test.sh (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/cswmigrateconf_test.sh 2011-04-24 09:13:29 UTC (rev 14389) @@ -0,0 +1,55 @@ +#!/opt/csw/bin/bash + +set -x +set -u +set -e + +readonly CAS_DIR="files" +readonly CAS_UNDER_TEST="CSWcswclassutils.i.cswmigrateconf" +readonly TMP_DIR="$(gmktemp -d castest.XXXXXXXXXX)" +readonly SRC_DIR="${TMP_DIR}/src" +PKG_INSTALL_ROOT="${TMP_DIR}/root" +readonly OLD_CONFDIR_ABS="${PKG_INSTALL_ROOT}/opt/csw/etc" +readonly NEW_CONFDIR_ABS="${PKG_INSTALL_ROOT}/etc/opt/csw" + +cleanup() { +tree "${TMP_DIR}" +echo "To clean up:" +echo "rm -rf \"${TMP_DIR}\"" +read -p "Clean? [y/n] > " ANSWER +if [[ "${ANSWER}" == y ]] +then + rm -rf "${TMP_DIR}" +else + echo "Not removing." +fi +} + +trap cleanup EXIT + +echo "Working in '${TMP_DIR}'" +mkdir -p "${PKG_INSTALL_ROOT}" +mkdir -p "${SRC_DIR}" + +# Place files +echo "MIGRATE_FILES=\"foo.conf bar.d\"" > "${SRC_DIR}/foo" +echo "MIGRATE_FILES=\"bar.d\"" > "${SRC_DIR}/foo" +mkdir -p "${OLD_CONFDIR_ABS}" +echo "foo: bar" > "${OLD_CONFDIR_ABS}/foo.conf" + +mkdir -p "${OLD_CONFDIR_ABS}/bar.d" +echo "I am the bar daemon." > "${OLD_CONFDIR_ABS}/bar.d/bar.conf" + +# And a directory + +# Running the script + +echo "${SRC_DIR}/foo bar" | PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT} /bin/sh -x "${CAS_DIR}/${CAS_UNDER_TEST}" + +if [[ $? -ne 0 ]]; then + echo "Test failed." +fi + +# Verification +# What? + Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/cswmigrateconf_test.sh ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 24 12:01:48 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 24 Apr 2011 10:01:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14390] csw/mgar/pkg/cswclassutils/trunk/files Message-ID: Revision: 14390 http://gar.svn.sourceforge.net/gar/?rev=14390&view=rev Author: wahwah Date: 2011-04-24 10:01:48 +0000 (Sun, 24 Apr 2011) Log Message: ----------- pkg/cswclassutils/trunk: Potentially fixed a bug with tar invocations Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf csw/mgar/pkg/cswclassutils/trunk/files/cswmigrateconf_test.sh Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2011-04-24 09:13:29 UTC (rev 14389) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2011-04-24 10:01:48 UTC (rev 14390) @@ -168,8 +168,8 @@ exit 1 fi - if [ -z "${MIGRATE_FILES}" ]; then - echo "ERROR! \$MIGRATE_FILES variable is empty." + if [ -z "${MIGRATE_FILES:-}" ]; then + echo "ERROR! The \$MIGRATE_FILES variable is empty." exit 1 fi @@ -228,13 +228,17 @@ # moved already. if [ -r "${srcpath}" ] then + debug "'${srcpath}' exists, moving to '${archpath}'" give_a_chance_to_stop place_signpost_for "${srcpath}" debug "Moving '${srcpath}' to '${archpath}'" + mkdir -p "${PKG_INSTALL_ROOT}/${archdir}" mv "${srcpath}" "${archpath}" if [ -r "${srcpath}" ]; then echo "WARNING: '${srcpath}' still exists" fi + else + debug "'${srcpath}' does not exist" fi # If the destination file is not there and the archived file is, copy it over. @@ -249,13 +253,15 @@ # Directories are copied in whole if [ -d "${archpath}" ]; then - debug "(cd ${archpath}/..; tar cf - `basename ${archpath}` \ -| ( mkdir ${dstpath}; cd ${dstpath}; cd ..; tar xf -))" - (cd ${archpath}/..; tar cf - `basename ${archpath}` \ - | ( mkdir ${dstpath}; cd ${dstpath}; cd ..; tar xf -) \ + debug "(tar cf - -C "${archpath}/.." `basename "${archpath}"` \ + | ( mkdir -p "${dstpath}"; cd "${dstpath}"; cd ..; tar xfp -) \ + )" + (tar cf - -C "${archpath}/.." `basename "${archpath}"` \ + | ( mkdir -p "${dstpath}"; cd "${dstpath}"; cd ..; tar xfp -) \ ) elif [ -f "${archpath}" ]; then debug cp "${archpath}" "${dstpath}" + mkdir -p "${PKG_INSTALL_ROOT}${dstdir}" cp "${archpath}" "${dstpath}" else echo "WARNING: ${archpath} is neither a file or directory." Modified: csw/mgar/pkg/cswclassutils/trunk/files/cswmigrateconf_test.sh =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/cswmigrateconf_test.sh 2011-04-24 09:13:29 UTC (rev 14389) +++ csw/mgar/pkg/cswclassutils/trunk/files/cswmigrateconf_test.sh 2011-04-24 10:01:48 UTC (rev 14390) @@ -6,20 +6,21 @@ readonly CAS_DIR="files" readonly CAS_UNDER_TEST="CSWcswclassutils.i.cswmigrateconf" -readonly TMP_DIR="$(gmktemp -d castest.XXXXXXXXXX)" -readonly SRC_DIR="${TMP_DIR}/src" -PKG_INSTALL_ROOT="${TMP_DIR}/root" +# readonly WORK_DIR="$(gmktemp -d /tmp/castest.XXXXXXXXXX)" +readonly WORK_DIR="$(gmktemp -d castest.XXXXXXXXXX)" +readonly SRC_DIR="${WORK_DIR}/src" +PKG_INSTALL_ROOT="${WORK_DIR}/root" readonly OLD_CONFDIR_ABS="${PKG_INSTALL_ROOT}/opt/csw/etc" readonly NEW_CONFDIR_ABS="${PKG_INSTALL_ROOT}/etc/opt/csw" cleanup() { -tree "${TMP_DIR}" +tree "${WORK_DIR}" echo "To clean up:" -echo "rm -rf \"${TMP_DIR}\"" +echo "rm -rf \"${WORK_DIR}\"" read -p "Clean? [y/n] > " ANSWER if [[ "${ANSWER}" == y ]] then - rm -rf "${TMP_DIR}" + rm -rf "${WORK_DIR}" else echo "Not removing." fi @@ -27,18 +28,18 @@ trap cleanup EXIT -echo "Working in '${TMP_DIR}'" +echo "Working in '${WORK_DIR}'" mkdir -p "${PKG_INSTALL_ROOT}" mkdir -p "${SRC_DIR}" # Place files echo "MIGRATE_FILES=\"foo.conf bar.d\"" > "${SRC_DIR}/foo" -echo "MIGRATE_FILES=\"bar.d\"" > "${SRC_DIR}/foo" mkdir -p "${OLD_CONFDIR_ABS}" echo "foo: bar" > "${OLD_CONFDIR_ABS}/foo.conf" mkdir -p "${OLD_CONFDIR_ABS}/bar.d" echo "I am the bar daemon." > "${OLD_CONFDIR_ABS}/bar.d/bar.conf" +echo "I have two configuration files." > "${OLD_CONFDIR_ABS}/bar.d/baz.conf" # And a directory This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Sun Apr 24 21:30:49 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Sun, 24 Apr 2011 21:30:49 +0200 Subject: [csw-devel] gar issue with modulation specific patches In-Reply-To: <1303604916-sup-9307@pinkfloyd.chass.utoronto.ca> References: <1303604916-sup-9307@pinkfloyd.chass.utoronto.ca> Message-ID: <31D88A8D-DC7F-482A-866F-6F84B1082E6A@opencsw.org> Hi Ben, Am 24.04.2011 um 02:28 schrieb Ben Walton: > I hit a funny problem tonight when trying to add a modulation specific > patch to php5 (I need to call pg_config32 on sparc, but pg_config on > i386). At fetch time, the patch wasn't getting pulled down. The > fetch-list target displayed the patch properly though, under the > expected modulations. > > Tracing the issue, I found: > > 1. ALLFILES_PATCHFILES is defined in gar.mk line 34. It is set with > ?= and uses the value of MODULATIONS > 2. gar.mk includes gar.lib.mk at line 76. > 3. MODULATIONS is defined in gar.mk line 93. > 4. URLS is set in gar.lib.mk line 34. It is set with := (simple > expansion) > > So, when URLS is set, MODULATIONS as used by ALLFILES_PATCHFILES has > no value. This prevents modulation specific patches from being > fetchable. > > The following patch seems to resolve the problem for me. Does anyone > see possible side effects to this that might be undesirable? I see no problem with that, please proceed. Best regards -- Dago > > --snip-- > Index: gar.mk > =================================================================== > --- gar.mk (revision 14383) > +++ gar.mk (working copy) > @@ -73,7 +73,6 @@ > > # include the configuration file to override any of these variables > include $(GARDIR)/gar.conf.mk > -include $(GARDIR)/gar.lib.mk > > # ========================= MODULATIONS ======================== > > @@ -92,6 +91,8 @@ > > MODULATIONS ?= $(filter-out $(SKIP_MODULATIONS),$(strip $(call > modulations,$(strip $(MODULATORS))))) > > +include $(GARDIR)/gar.lib.mk > + > # _modulate(ISA STATIC,,,) > # -> _modulate2(STATIC,isa-i386,ISA,ISA=i386) > # -> _modulate2(,,isa-i386-static-yes,ISA STATIC,ISA=i386 > STATIC=yes) > > --snip-- > > Thanks > -Ben > -- > Ben Walton > Systems Programmer - CHASS > University of Toronto > C:416.407.5610 | W:416.978.4302 > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel From dmichelsen at users.sourceforge.net Sun Apr 24 21:52:53 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 24 Apr 2011 19:52:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[14391] csw/mgar/pkg/parallel/trunk Message-ID: Revision: 14391 http://gar.svn.sourceforge.net/gar/?rev=14391&view=rev Author: dmichelsen Date: 2011-04-24 19:52:53 +0000 (Sun, 24 Apr 2011) Log Message: ----------- parallel: Update to 20110422 and adjust defaults Modified Paths: -------------- csw/mgar/pkg/parallel/trunk/Makefile csw/mgar/pkg/parallel/trunk/checksums Modified: csw/mgar/pkg/parallel/trunk/Makefile =================================================================== --- csw/mgar/pkg/parallel/trunk/Makefile 2011-04-24 10:01:48 UTC (rev 14390) +++ csw/mgar/pkg/parallel/trunk/Makefile 2011-04-24 19:52:53 UTC (rev 14391) @@ -1,6 +1,6 @@ # $Id$ NAME = parallel -VERSION = 20110322 +VERSION = 20110422 CATEGORIES = utils DESCRIPTION = Shell tool for executing jobs in parallel @@ -18,15 +18,8 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.bz2 -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - VENDOR_URL = http://www.gnu.org/software/parallel/ -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - ARCHALL = 1 # Some idioms are used that the system Perl doesn't have Modified: csw/mgar/pkg/parallel/trunk/checksums =================================================================== --- csw/mgar/pkg/parallel/trunk/checksums 2011-04-24 10:01:48 UTC (rev 14390) +++ csw/mgar/pkg/parallel/trunk/checksums 2011-04-24 19:52:53 UTC (rev 14391) @@ -1 +1 @@ -2e8eafdc2fa21d99bfc22aac01e245ef parallel-20110322.tar.bz2 +3102c91feb24dba2b225e81a209af91a parallel-20110422.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 Sun Apr 24 22:07:16 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 24 Apr 2011 20:07:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[14392] csw/mgar/pkg/bdb3/trunk/Makefile Message-ID: Revision: 14392 http://gar.svn.sourceforge.net/gar/?rev=14392&view=rev Author: dmichelsen Date: 2011-04-24 20:07:15 +0000 (Sun, 24 Apr 2011) Log Message: ----------- bdb3: Adjust catalog name for obsoleted packages Modified Paths: -------------- csw/mgar/pkg/bdb3/trunk/Makefile Modified: csw/mgar/pkg/bdb3/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb3/trunk/Makefile 2011-04-24 19:52:53 UTC (rev 14391) +++ csw/mgar/pkg/bdb3/trunk/Makefile 2011-04-24 20:07:15 UTC (rev 14392) @@ -65,6 +65,7 @@ CHECKPKG_OVERRIDES_CSWbdb3-dev += surplus-dependency|CSWbdb3 CHECKPKG_OVERRIDES_CSWbdb3-dev += catalogname-does-not-match-pkgname|pkgname=CSWbdb3-dev|catalogname=berkeleydb3_dev|expected-catalogname=bdb3_dev OBSOLETED_BY_CSWbdb3-dev = CSWbdb3devel +CATALOGNAME_CSWbdb3devel = berkeleydb3_devel_stub PACKAGES += CSWbdb3-doc CATALOGNAME_CSWbdb3-doc = berkeleydb3_doc @@ -73,6 +74,7 @@ ARCHALL_CSWbdb3-doc = 1 CHECKPKG_OVERRIDES_CSWbdb3-doc += catalogname-does-not-match-pkgname|pkgname=CSWbdb3-doc|catalogname=berkeleydb3_doc|expected-catalogname=bdb3_doc OBSOLETED_BY_CSWbdb3-doc = CSWbdb3doc +CATALOGNAME_CSWbdb3doc = berkeleydb3_doc_stub # These are all pure examples CHECKPKG_OVERRIDES_CSWbdb3-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/flags.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Apr 24 22:46:28 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 24 Apr 2011 20:46:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[14393] csw/mgar/pkg/libserf/trunk Message-ID: Revision: 14393 http://gar.svn.sourceforge.net/gar/?rev=14393&view=rev Author: rthurner Date: 2011-04-24 20:46:28 +0000 (Sun, 24 Apr 2011) Log Message: ----------- libserf, upgrade to serf-0.7.2 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 2011-04-24 20:07:15 UTC (rev 14392) +++ csw/mgar/pkg/libserf/trunk/Makefile 2011-04-24 20:46:28 UTC (rev 14393) @@ -1,5 +1,5 @@ NAME = libserf -VERSION = 0.7.0 +VERSION = 0.7.2 DISTNAME = serf-$(VERSION) CATEGORIES = lib Modified: csw/mgar/pkg/libserf/trunk/checksums =================================================================== --- csw/mgar/pkg/libserf/trunk/checksums 2011-04-24 20:07:15 UTC (rev 14392) +++ csw/mgar/pkg/libserf/trunk/checksums 2011-04-24 20:46:28 UTC (rev 14393) @@ -1 +1 @@ -5c4b6d8b44135abbde289b49122bb7af serf-0.7.0.tar.bz2 +66ed12163b14b704888e628ee38e9581 serf-0.7.2.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 Apr 25 04:02:45 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 25 Apr 2011 02:02:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[14394] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 14394 http://gar.svn.sourceforge.net/gar/?rev=14394&view=rev Author: bdwalton Date: 2011-04-25 02:02:45 +0000 (Mon, 25 Apr 2011) Log Message: ----------- Move the inclusion of gar.lib.mk within gar.mk to ensure MODULATIONS setup Before this change, URLS was set using ALLFILES_PATCHFILES, which in turn relied on MODULATIONS. As URLS is set with := and MODULATIONS had not been declared, ALLFILES_PATCHFILES didn't include modulation-specific patches. By moving the inclusion, we ensure that MODULATIONS is available before first use. Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2011-04-24 20:46:28 UTC (rev 14393) +++ csw/mgar/gar/v2/gar.mk 2011-04-25 02:02:45 UTC (rev 14394) @@ -73,7 +73,6 @@ # include the configuration file to override any of these variables include $(GARDIR)/gar.conf.mk -include $(GARDIR)/gar.lib.mk # ========================= MODULATIONS ======================== @@ -92,6 +91,8 @@ MODULATIONS ?= $(filter-out $(SKIP_MODULATIONS),$(strip $(call modulations,$(strip $(MODULATORS))))) +include $(GARDIR)/gar.lib.mk + # _modulate(ISA STATIC,,,) # -> _modulate2(STATIC,isa-i386,ISA,ISA=i386) # -> _modulate2(,,isa-i386-static-yes,ISA STATIC,ISA=i386 STATIC=yes) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Mon Apr 25 04:03:58 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sun, 24 Apr 2011 22:03:58 -0400 Subject: [csw-devel] gar issue with modulation specific patches In-Reply-To: <31D88A8D-DC7F-482A-866F-6F84B1082E6A@opencsw.org> References: <1303604916-sup-9307@pinkfloyd.chass.utoronto.ca> <31D88A8D-DC7F-482A-866F-6F84B1082E6A@opencsw.org> Message-ID: <1303696969-sup-4582@pinkfloyd.chass.utoronto.ca> Excerpts from Dagobert Michelsen's message of Sun Apr 24 15:30:49 -0400 2011: Hi Dago, > I see no problem with that, please proceed. I just commited this change as r14394. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From dmichelsen at users.sourceforge.net Mon Apr 25 13:38:17 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 25 Apr 2011 11:38:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14395] csw/mgar/pkg/libidn/trunk Message-ID: Revision: 14395 http://gar.svn.sourceforge.net/gar/?rev=14395&view=rev Author: dmichelsen Date: 2011-04-25 11:38:16 +0000 (Mon, 25 Apr 2011) Log Message: ----------- libidn: Update to 1.21 and new defaults Modified Paths: -------------- csw/mgar/pkg/libidn/trunk/Makefile csw/mgar/pkg/libidn/trunk/checksums Modified: csw/mgar/pkg/libidn/trunk/Makefile =================================================================== --- csw/mgar/pkg/libidn/trunk/Makefile 2011-04-25 02:02:45 UTC (rev 14394) +++ csw/mgar/pkg/libidn/trunk/Makefile 2011-04-25 11:38:16 UTC (rev 14395) @@ -1,5 +1,5 @@ NAME = libidn -VERSION = 1.20 +VERSION = 1.21 CATEGORIES = lib DESCRIPTION = GNU IDN Library @@ -20,7 +20,7 @@ CATALOGNAME_CSWlibidn11 = libidn11 SPKG_DESC_CSWlibidn11 = GNU IDN library, libidn.so.11 PKGFILES_CSWlibidn11 += $(call baseisadirs,$(libdir),libidn\.so\.11(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibidn11 += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibidn11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibidn11 += CSWiconv PACKAGES += CSWlibidn-dev @@ -37,29 +37,19 @@ SPKG_DESC_CSWlibidn-utils = GNU IDN utilities # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWlibidn-utils += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWlibidn-utils += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibidn-utils += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibidn-utils += CSWiconv OBSOLETED_BY_CSWlibidn-utils = CSWlibidn BUILD64 = 1 -NOISAEXEC = 1 # We don't need it and if defined the test breaks LD_OPTIONS = EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - -# One test for GNULib in 32 bit is failing, disable for now -SKIPTEST ?= 1 - # What's this? Windows DLLs? How do they end up in the Solaris build? EXTRA_MERGE_EXCLUDE_FILES = .*\.dll -MERGE_DIRS_isa-extra = $(libdir) - CHECKPKG_OVERRIDES_CSWlibidn += missing-dependency|CSWemacscommon include gar/category.mk Modified: csw/mgar/pkg/libidn/trunk/checksums =================================================================== --- csw/mgar/pkg/libidn/trunk/checksums 2011-04-25 02:02:45 UTC (rev 14394) +++ csw/mgar/pkg/libidn/trunk/checksums 2011-04-25 11:38:16 UTC (rev 14395) @@ -1 +1 @@ -03996d474a696e59fdddbee87fc9519c libidn-1.20.tar.gz +80aba4e9503cd3ba6725cdbf265550f8 libidn-1.21.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 Mon Apr 25 15:28:40 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 25 Apr 2011 13:28:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14396] csw/mgar/gar/v2/bin/php5ext_build_scripts Message-ID: Revision: 14396 http://gar.svn.sourceforge.net/gar/?rev=14396&view=rev Author: bdwalton Date: 2011-04-25 13:28:40 +0000 (Mon, 25 Apr 2011) Log Message: ----------- add a missing variable to the php5 module install/uninstall build script Modified Paths: -------------- csw/mgar/gar/v2/bin/php5ext_build_scripts Modified: csw/mgar/gar/v2/bin/php5ext_build_scripts =================================================================== --- csw/mgar/gar/v2/bin/php5ext_build_scripts 2011-04-25 11:38:16 UTC (rev 14395) +++ csw/mgar/gar/v2/bin/php5ext_build_scripts 2011-04-25 13:28:40 UTC (rev 14396) @@ -20,6 +20,7 @@ PIR=\${PKG_INSTALL_ROOT:-'/'} PHP5_PREFIX=/opt/csw/php5 PHP5_BINDIR=\$PHP5_PREFIX/bin +PHP5_CONFIG=\$PHP5_PREFIX/lib/php.ini PHPEXT=\$PHP5_BINDIR/phpext if [ "\$1" = install ]; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Apr 25 16:18:42 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 25 Apr 2011 14:18:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14397] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 14397 http://gar.svn.sourceforge.net/gar/?rev=14397&view=rev Author: rthurner Date: 2011-04-25 14:18:42 +0000 (Mon, 25 Apr 2011) Log Message: ----------- subversion, revert back to old makefile, to do security update Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-04-25 13:28:40 UTC (rev 14396) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-04-25 14:18:42 UTC (rev 14397) @@ -21,7 +21,7 @@ # ...and send the patch to the subversion dev mailing list. # http://subversion.apache.org/mailing-lists.html -NAME = svn +NAME = subversion VERSION = 1.6.16 CATEGORIES = utils @@ -42,9 +42,10 @@ PACKAGES += CSWsvn-contrib CSWsvn-tools SPKG_DESC_CSWsvn = Version control rethought +CATALOGNAME_CSWsvn = subversion RUNTIME_DEP_PKGS_CSWsvn = CSWbdb48 RUNTIME_DEP_PKGS_CSWsvn += CSWexpat -RUNTIME_DEP_PKGS_CSWsvn += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsvn += CSWggettextrt RUNTIME_DEP_PKGS_CSWsvn += CSWiconv RUNTIME_DEP_PKGS_CSWsvn += CSWneon RUNTIME_DEP_PKGS_CSWsvn += CSWlibserf0-0 @@ -57,6 +58,7 @@ SPKG_DESC_CSWsvn-devel = Subversion Development Support +CATALOGNAME_CSWsvn-devel = subversion_devel ARCHALL_CSWsvn-devel = 1 PKGFILES_CSWsvn-devel = $(PKGFILES_DEVEL) PKGFILES_CSWsvn-devel += $(docdir)/$(CATALOGNAME_CSWsvn-devel)/changelog.CSW @@ -69,20 +71,7 @@ CHECKPKG_OVERRIDES_CSWsvn-contrib += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWsvn-contrib += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWsvn-contrib += missing-dependency|CSWemacscommon -CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/cgi/tweak-log.cgi -CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/hook-scripts/commit-block-joke.py -CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/hook-scripts/case-insensitive.py -CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/server-side/backup-recipe.sh -CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/server-side/svnstsw/README -CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/server-side/svnstsw/INSTALL -CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/server-side/svnstsw/conf/find_apr.m4 -CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/client-side/svnmerge/svnmerge-migrate-test.sh -CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/client-side/svncopy/svncopy.README -CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/contrib/client-side/svn2cl/README -CHECKPKG_OVERRIDES_CSWsvn-contrib += file-with-bad-content|/export/home|root/opt/csw/share/doc/subversion/contrib/cgi/mirror_dir_through_svn.cgi -CHECKPKG_OVERRIDES_CSWsvn-contrib += catalogname-does-not-match-pkgname|pkgname=CSWsvn-contrib|catalogname=subversion_contrib|expected-catalogname=svn_contrib - SPKG_DESC_CSWsvn-tools = Additional subversion tools CATALOGNAME_CSWsvn-tools = subversion_tools PKGFILES_CSWsvn-tools = $(docdir)/subversion/tools.* @@ -91,30 +80,16 @@ CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWruby CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWemacscommon -CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/examples/testwrite.c -CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/examples/svnput.c -CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/examples/headrev.c -CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/examples/minimal_client.c -CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/examples/getlocks_test.c -CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/dev/prebuild-cleanup.sh -CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/buildbot/slaves/i686-debian-sarge1/svnbuild.sh -CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnbuild.sh -CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/local|root/opt/csw/share/doc/subversion/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh -CHECKPKG_OVERRIDES_CSWsvn-tools += file-with-bad-content|/usr/share|root/opt/csw/share/doc/subversion/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh -CHECKPKG_OVERRIDES_CSWsvn-tools += catalogname-does-not-match-pkgname|pkgname=CSWsvn-tools|catalogname=subversion_tools|expected-catalogname=svn_tools - SPKG_DESC_CSWap2svn = Subversion Modules for Apache 2.2 CATALOGNAME_CSWap2svn = ap2_subversion RUNTIME_DEP_PKGS_CSWap2svn = CSWsvn RUNTIME_DEP_PKGS_CSWap2svn += CSWapache2 -RUNTIME_DEP_PKGS_CSWap2svn += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWap2svn += CSWggettextrt RUNTIME_DEP_PKGS_CSWap2svn += CSWiconv PKGFILES_CSWap2svn = $(prefix)/apache2.* PKGFILES_CSWap2svn += $(docdir)/$(CATALOGNAME_CSWap2svn)/changelog.CSW -CHECKPKG_OVERRIDES_CSWap2svn += catalogname-does-not-match-pkgname|pkgname=CSWap2svn|catalogname=ap2_subversion|expected-catalogname=ap2svn - SPKG_DESC_CSWjavasvn = Subversion Java Language Binding CATALOGNAME_CSWjavasvn = javasvn PKGFILES_CSWjavasvn = $(SVNLIB)/.*java.* @@ -122,7 +97,7 @@ RUNTIME_DEP_PKGS_CSWjavasvn += CSWexpat RUNTIME_DEP_PKGS_CSWjavasvn += CSWsvn RUNTIME_DEP_PKGS_CSWjavasvn += CSWiconv -RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWjavasvn += CSWggettextrt RUNTIME_DEP_PKGS_CSWjavasvn += CSWneon RUNTIME_DEP_PKGS_CSWjavasvn += CSWoldaprt RUNTIME_DEP_PKGS_CSWjavasvn += CSWapr-util @@ -134,6 +109,7 @@ CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding +CATALOGNAME_CSWpmsvn = pm_subversion PKGFILES_CSWpmsvn = $(libdir)/perl.* PKGFILES_CSWpmsvn += $(SVNLIB)/.*perl.* PKGFILES_CSWpmsvn += $(mandir)/.*swig_perl.* @@ -142,7 +118,7 @@ RUNTIME_DEP_PKGS_CSWpmsvn += CSWexpat RUNTIME_DEP_PKGS_CSWpmsvn += CSWsvn RUNTIME_DEP_PKGS_CSWpmsvn += CSWiconv -RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpmsvn += CSWggettextrt RUNTIME_DEP_PKGS_CSWpmsvn += CSWoldaprt RUNTIME_DEP_PKGS_CSWpmsvn += CSWapr-util RUNTIME_DEP_PKGS_CSWpmsvn += CSWbdb48 @@ -153,7 +129,7 @@ PKGFILES_CSWrbsvn = $(libdir)/ruby.* PKGFILES_CSWrbsvn += $(SVNLIB)/.*swig_ruby.* PKGFILES_CSWrbsvn += $(docdir)/$(CATALOGNAME_CSWrbsvn)/changelog.CSW -RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWrbsvn += CSWggettextrt RUNTIME_DEP_PKGS_CSWrbsvn += CSWsvn RUNTIME_DEP_PKGS_CSWrbsvn += CSWiconv RUNTIME_DEP_PKGS_CSWrbsvn += CSWruby @@ -174,7 +150,7 @@ RUNTIME_DEP_PKGS_CSWpythonsvn += CSWpython RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsvn RUNTIME_DEP_PKGS_CSWpythonsvn += CSWiconv -RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpythonsvn += CSWggettextrt RUNTIME_DEP_PKGS_CSWpythonsvn += CSWoldaprt RUNTIME_DEP_PKGS_CSWpythonsvn += CSWapr-util RUNTIME_DEP_PKGS_CSWpythonsvn += CSWbdb48 @@ -226,8 +202,7 @@ NODIRPATHS = --libdir --libexecdir CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) CONFIGURE_ARGS += --disable-mod-activation -CONFIGURE_ARGS += --disable-static -CONFIGURE_ARGS += --with-berkeley-db=db.h:/opt/csw/bdb48/include:/opt/csw/bdb48/lib:db +CONFIGURE_ARGS += --with-jdk=/usr/jdk/j2sdk1.4.2_02/j2se CONFIGURE_ARGS += --enable-javahl CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config CONFIGURE_ARGS += --with-apr-util=$(bindir)/apu-1-config @@ -235,7 +210,7 @@ CONFIGURE_ARGS += --with-jdk=$(JAVA_HOME) CONFIGURE_ARGS += --with-sasl=$(prefix) CONFIGURE_ARGS += --with-ssl=$(prefix) -CONFIGURE_ARGS += --with-zlib=$(prefix) +CONFIGURE_ARGS += --with-zlib CONFIGURE_ARGS += --with-serf=$(prefix) # Once you have verified that a new upstream release passes the tests, you can use @@ -295,15 +270,11 @@ fi ) @$(MAKECOOKIE) -copy-apache-templates: - ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra - ginstall -m 0644 \ - $(WORKDIR)/httpd-svn.conf.CSW \ - $(DESTDIR)$(prefix)/apache2/etc/extra - ginstall -m 0644 \ - $(WORKDIR)/svn_access.conf.CSW \ - $(DESTDIR)$(prefix)/apache2/etc - @$(MAKECOOKIE) +PI_DEPENDS = $(BINDING_TARGETS) +PI_DEPENDS += contrib +PI_DEPENDS += rbsvn-prototype +PI_DEPENDS += copy-templates +PI_DEPENDS += install-man # libsvn_ra_dav-1* has been renamed to libsvn_ra_neon-1* in the new versions # of subversion (starting with?), we need to link for backward compatability @@ -333,8 +304,11 @@ touch \ $(WORKSRC)/subversion/bindings/swig/python/*.c \ $(WORKSRC)/subversion/bindings/swig/python/*.py - $(BUILD_ENV) gmake -C $(WORKSRC) swig-py - $(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py + @$(BUILD_ENV) gmake -C $(WORKSRC) swig-py + @$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py \ + swig_pydir=$(libdir)/python2.3/libsvn \ + swig_pydir_extra=$(libdir)/python2.3/svn + #@$(TEST_ENV) gmake -C $(WORKSRC) check-swig-py @$(MAKECOOKIE) svn-perl: @@ -362,6 +336,34 @@ post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) -install-changelog-%: - ginstall -D $(FILEDIR)/changelog.CSW \ - $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW +$(DESTDIR)$(docdir): + mkdir -p $@ + +svnbook: $(DESTDIR)$(docdir) + @echo " ==> Installing svn book" + ( cd $(WORKSRC)/doc/book ; \ + ginstall svn-book.html $(DESTDIR)$(docdir) ; \ + ginstall svn-book.pdf $(DESTDIR)$(docdir) ) + @$(MAKECOOKIE) + +contrib: $(DESTDIR)$(docdir) + @echo " ==> Installing contrib scripts" + @gcp -vr $(WORKSRC)/contrib $(DESTDIR)$(docdir) + @$(MAKECOOKIE) + +copy-templates: + ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra + ginstall -m 0644 \ + $(WORKDIR)/httpd-svn.conf.CSW \ + $(DESTDIR)$(prefix)/apache2/etc/extra + ginstall -m 0644 \ + $(WORKDIR)/svn_access.conf.CSW \ + $(DESTDIR)$(prefix)/apache2/etc + @$(MAKECOOKIE) + +install-man: + ginstall -m 0644 \ + $(WORKSRC)/subversion/svnsync/svnsync.1 \ + $(DESTDIR)$(mandir)/man1 + @$(MAKECOOKIE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Apr 25 16:29:40 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 25 Apr 2011 14:29:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14398] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 14398 http://gar.svn.sourceforge.net/gar/?rev=14398&view=rev Author: rthurner Date: 2011-04-25 14:29:40 +0000 (Mon, 25 Apr 2011) Log Message: ----------- subversion: zlib requires an argument .. Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-04-25 14:18:42 UTC (rev 14397) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-04-25 14:29:40 UTC (rev 14398) @@ -210,7 +210,7 @@ CONFIGURE_ARGS += --with-jdk=$(JAVA_HOME) CONFIGURE_ARGS += --with-sasl=$(prefix) CONFIGURE_ARGS += --with-ssl=$(prefix) -CONFIGURE_ARGS += --with-zlib +CONFIGURE_ARGS += --with-zlib=$(prefix) CONFIGURE_ARGS += --with-serf=$(prefix) # Once you have verified that a new upstream release passes the tests, you can use This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Apr 25 17:08:12 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 25 Apr 2011 15:08:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[14399] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 14399 http://gar.svn.sourceforge.net/gar/?rev=14399&view=rev Author: rthurner Date: 2011-04-25 15:08:12 +0000 (Mon, 25 Apr 2011) Log Message: ----------- subversion, targets do not fit together??? Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-04-25 14:29:40 UTC (rev 14398) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-04-25 15:08:12 UTC (rev 14399) @@ -231,7 +231,7 @@ BINDING_LANGS = java perl python ruby BINDING_TARGETS = $(addprefix svn-,$(BINDING_LANGS)) -PI_DEPENDS += copy-apache-templates +PI_DEPENDS += copy-templates PI_DEPENDS += create-ra_dav-symlinks PI_DEPENDS += install-extras PI_DEPENDS += $(BINDING_TARGETS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Apr 25 17:58:42 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 25 Apr 2011 15:58:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14400] csw/mgar/pkg/neon/trunk/Makefile Message-ID: Revision: 14400 http://gar.svn.sourceforge.net/gar/?rev=14400&view=rev Author: rthurner Date: 2011-04-25 15:58:41 +0000 (Mon, 25 Apr 2011) Log Message: ----------- adjust to same checkpkg used for subversion-1.6.16 Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2011-04-25 15:08:12 UTC (rev 14399) +++ csw/mgar/pkg/neon/trunk/Makefile 2011-04-25 15:58:41 UTC (rev 14400) @@ -93,19 +93,6 @@ PKGFILES_CSWneon-devel += $(docdir)/.* -# ALTERNATIVES_CSWneon = minimal -# ALTERNATIVES_CSWneonfull = full - -# ALTERNATIVE_minimal = $(libdir)/libneon.so.27.2.3 neon $(libdir)/libneon-minimal.so.27.2.3 100 -# ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libneon.so.27.2.3 neon64 $(libdir)/$(ISA_DEFAULT64)/libneon-minimal.so.27.2.3 -# ALTERNATIVE_minimal += $(libdir)/libneon.so.26.0.4 neon.26 $(libdir)/libneon-minimal.so.26.0.4 -# ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libneon.so.26.0.4 neon64.26 $(libdir)/$(ISA_DEFAULT64)/libneon-minimal.so.26.0.4 - -# ALTERNATIVE_full = $(libdir)/libneon.so.27.2.3 neon $(libdir)/libneon-full.so.27.2.3 200 -# ALTERNATIVE_full += $(libdir)/$(ISA_DEFAULT64)/libneon.so.27.2.3 neon64 $(libdir)/$(ISA_DEFAULT64)/libneon-full.so.27.2.3 -# ALTERNATIVE_full += $(libdir)/libneon.so.26.0.4 neon.26 $(libdir)/libneon-full.so.26.0.4 -# ALTERNATIVE_full += $(libdir)/$(ISA_DEFAULT64)/libneon.so.26.0.4 neon64.26 $(libdir)/$(ISA_DEFAULT64)/libneon-full.so.26.0.4 - FEATURE_LIBRARIES = libneon.26 libneon64.26 FEATURE_LIBRARIES += libneon.27 libneon64.27 FEATURES_libneon.26 = $(libdir)/libneon.so.26.0.4 @@ -126,7 +113,19 @@ CHECKPKG_OVERRIDES_CSWneonfull += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libneon-full.so.27.2.3 CHECKPKG_OVERRIDES_CSWneon-devel += surplus-dependency|CSWneon +CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWpakchois +CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWosslrt +CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWggettextrt +CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWzlib +CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWexpat +CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWkrb5lib +CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWlibproxy +CHECKPKG_OVERRIDES_CSWneon += surplus-dependency|CSWexpat +CHECKPKG_OVERRIDES_CSWneon += surplus-dependency|CSWosslrt +CHECKPKG_OVERRIDES_CSWneon += surplus-dependency|CSWggettextrt +CHECKPKG_OVERRIDES_CSWneon += surplus-dependency|CSWzlib + include gar/category.mk #post-install-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Apr 25 19:24:44 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 25 Apr 2011 17:24:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[14401] csw/mgar/gar/v2/bin/ap2mod_build_scripts Message-ID: Revision: 14401 http://gar.svn.sourceforge.net/gar/?rev=14401&view=rev Author: bdwalton Date: 2011-04-25 17:24:44 +0000 (Mon, 25 Apr 2011) Log Message: ----------- tweak apache2 build script helper to work with modules not following the apache file naming convention Modified Paths: -------------- csw/mgar/gar/v2/bin/ap2mod_build_scripts Modified: csw/mgar/gar/v2/bin/ap2mod_build_scripts =================================================================== --- csw/mgar/gar/v2/bin/ap2mod_build_scripts 2011-04-25 15:58:41 UTC (rev 14400) +++ csw/mgar/gar/v2/bin/ap2mod_build_scripts 2011-04-25 17:24:44 UTC (rev 14401) @@ -10,7 +10,7 @@ for a in $*; do for f in $(find . -name "*$a*"); do modfile=$(basename $f) - modname=$(echo $modfile | sed 's/mod_//; s/\.so$//') + modname=$(echo $modfile | sed 's/^mod_//; s/^lib//; s/\.so$//') ap2modfile=$AP2MODS/$modname cat < $ap2modfile 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 Apr 25 19:35:14 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 25 Apr 2011 17:35:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14402] csw/mgar/pkg/php5/trunk/files Message-ID: Revision: 14402 http://gar.svn.sourceforge.net/gar/?rev=14402&view=rev Author: bdwalton Date: 2011-04-25 17:35:14 +0000 (Mon, 25 Apr 2011) Log Message: ----------- php5/trunk: drop legacy files, patches Removed Paths: ------------- csw/mgar/pkg/php5/trunk/files/CSWphp5.space csw/mgar/pkg/php5/trunk/files/configure.diff csw/mgar/pkg/php5/trunk/files/odbc.diff csw/mgar/pkg/php5/trunk/files/pdopgsql.diff csw/mgar/pkg/php5/trunk/files/pgsql.diff Deleted: csw/mgar/pkg/php5/trunk/files/CSWphp5.space =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.space 2011-04-25 17:24:44 UTC (rev 14401) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.space 2011-04-25 17:35:14 UTC (rev 14402) @@ -1 +0,0 @@ -php 32 2 Deleted: csw/mgar/pkg/php5/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/php5/trunk/files/configure.diff 2011-04-25 17:24:44 UTC (rev 14401) +++ csw/mgar/pkg/php5/trunk/files/configure.diff 2011-04-25 17:35:14 UTC (rev 14402) @@ -1,114 +0,0 @@ ---- php-5.2.10/configure.o 2009-06-23 13:56:57.118204433 -0500 -+++ php-5.2.10/configure 2009-06-23 14:01:59.104988013 -0500 -@@ -4776,7 +4776,7 @@ - $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1 - - if test "$?" != "0"; then -- APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option -+ APACHE_INSTALL="$APXS -i -n php5 $SAPI_SHARED" # Old apxs does not have -S option - else - APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` - if test -z `$APXS -q SYSCONFDIR`; then -@@ -4789,7 +4789,7 @@ - \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -S SYSCONFDIR='$APXS_SYSCONFDIR' \ -- -i -a -n php5 $SAPI_SHARED" -+ -i -n php5 $SAPI_SHARED" - fi - fi - -@@ -5937,7 +5937,7 @@ - \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -S SYSCONFDIR='$APXS_SYSCONFDIR' \ -- -i -a -n php5" -+ -i -n php5" - fi - - case $host_alias in -@@ -6785,7 +6785,7 @@ - \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -S SYSCONFDIR='$APXS_SYSCONFDIR' \ -- -i -a -n php5" -+ -i -n php5" - fi - - case $host_alias in -@@ -7802,7 +7802,7 @@ - $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1 - - if test "$?" != "0"; then -- APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option -+ APACHE_HOOKS_INSTALL="$APXS -i -n php5 $SAPI_SHARED" # Old apxs does not have -S option - else - APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` - if test -z `$APXS -q SYSCONFDIR`; then -@@ -7815,7 +7815,7 @@ - \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -S SYSCONFDIR='$APXS_SYSCONFDIR' \ -- -i -a -n php5 $SAPI_SHARED" -+ -i -n php5 $SAPI_SHARED" - fi - fi - -@@ -46657,7 +46657,7 @@ - - if test "$iconv_avail" != "no"; then - if test -z "$ICONV_DIR"; then -- for i in /usr/local /usr; do -+ for i in /opt/csw /usr/local /usr; do - if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then - PHP_ICONV_PREFIX="$i" - break -@@ -68725,7 +68725,7 @@ - echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6 - echo "configure:68727: checking for unixODBC support" >&5 - if test "$PHP_UNIXODBC" = "yes"; then -- PHP_UNIXODBC=/usr/local -+ PHP_UNIXODBC=/opt/csw - fi - ODBC_INCDIR=$PHP_UNIXODBC/include - ODBC_LIBDIR=$PHP_UNIXODBC/$PHP_LIBDIR -@@ -77388,8 +77388,8 @@ - echo $ac_n "checking for pg_config""... $ac_c" 1>&6 - echo "configure:77390: checking for pg_config" >&5 - for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do -- if test -x $i/pg_config; then -- PG_CONFIG="$i/pg_config" -+ if test -x $i/pg_config32; then -+ PG_CONFIG="$i/pg_config32" - break; - fi - done -@@ -80202,8 +80202,8 @@ - echo $ac_n "checking for pg_config""... $ac_c" 1>&6 - echo "configure:80204: checking for pg_config" >&5 - for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do -- if test -x $i/pg_config; then -- PG_CONFIG="$i/pg_config" -+ if test -x $i/pg_config32; then -+ PG_CONFIG="$i/pg_config32" - break; - fi - done -@@ -83426,7 +83426,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lreadline $LIBS" -+LIBS="-lreadline -lcurses $LIBS" - cat > conftest.$ac_ext <&6 - echo "configure:103478: checking for XMLRPC-EPI in default path" >&5 -- for i in /usr/local /usr; do -+ for i in /opt/csw /usr/local /usr; do - if test -r $i/include/xmlrpc.h; then - XMLRPC_DIR=$i/include - echo "$ac_t""found in $i" 1>&6 Deleted: csw/mgar/pkg/php5/trunk/files/odbc.diff =================================================================== --- csw/mgar/pkg/php5/trunk/files/odbc.diff 2011-04-25 17:24:44 UTC (rev 14401) +++ csw/mgar/pkg/php5/trunk/files/odbc.diff 2011-04-25 17:35:14 UTC (rev 14402) @@ -1,462 +0,0 @@ ---- php-5.2.6/ext/odbc/config.m4.orig 2009-02-25 12:04:48.140914150 -0600 -+++ php-5.2.6/ext/odbc/config.m4 2009-02-25 12:15:55.740367734 -0600 -@@ -8,402 +8,6 @@ - fi - ]) - --dnl --dnl Figure out which library file to link with for the Solid support. --dnl --AC_DEFUN([PHP_ODBC_FIND_SOLID_LIBS],[ -- AC_MSG_CHECKING([Solid library file]) -- ac_solid_uname_r=`uname -r 2>/dev/null` -- ac_solid_uname_s=`uname -s 2>/dev/null` -- case $ac_solid_uname_s in -- AIX) ac_solid_os=a3x;; # a4x for AIX4/ Solid 2.3/3.0 only -- HP-UX) ac_solid_os=h9x;; # h1x for hpux11, h0x for hpux10 -- IRIX) ac_solid_os=irx;; # Solid 2.3(?)/ 3.0 only -- Linux) -- if ldd -v /bin/sh | grep GLIBC > /dev/null; then -- AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ]) -- ac_solid_os=l2x -- else -- AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ]) -- ac_solid_os=lux -- fi;; -- SunOS) -- ac_solid_os=ssx;; # should we deal with SunOS 4? -- FreeBSD) -- if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then -- AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ]) -- ac_solid_os=fex -- else -- AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ]) -- ac_solid_os=fbx -- fi;; -- esac -- -- if test -f $1/soc${ac_solid_os}35.a; then -- ac_solid_version=35 -- ac_solid_prefix=soc -- elif test -f $1/scl${ac_solid_os}30.a; then -- ac_solid_version=30 -- ac_solid_prefix=scl -- elif test -f $1/scl${ac_solid_os}23.a; then -- ac_solid_version=23 -- ac_solid_prefix=scl -- fi -- --# --# Check for the library files, and setup the ODBC_LIBS path... --# --if test ! -f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -a \ -- ! -f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a; then -- # -- # we have an error and should bail out, as we can't find the libs! -- # -- echo "" -- echo "*********************************************************************" -- echo "* Unable to locate $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so or $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a" -- echo "* Please correct this by creating the following links and reconfiguring:" -- echo "* $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a -> $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a" -- echo "* $1/${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -> $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so" -- echo "*********************************************************************" --else -- ODBC_LFLAGS=-L$1 -- ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version} --fi -- -- AC_MSG_RESULT(`echo $ODBC_LIBS | sed -e 's!.*/!!'`) --]) -- -- --dnl --dnl Figure out which library file to link with for the Empress support. --dnl -- --AC_DEFUN([PHP_ODBC_FIND_EMPRESS_LIBS],[ -- AC_MSG_CHECKING([Empress library file]) -- ODBC_LIBS=`echo $1/libempodbccl.so | cut -d' ' -f1` -- if test ! -f $ODBC_LIBS; then -- ODBC_LIBS=`echo $1/libempodbccl.so | cut -d' ' -f1` -- fi -- AC_MSG_RESULT(`echo $ODBC_LIBS | sed -e 's!.*/!!'`) --]) -- --AC_DEFUN([PHP_ODBC_FIND_EMPRESS_BCS_LIBS],[ -- AC_MSG_CHECKING([Empress local access library file]) -- ODBCBCS_LIBS=`echo $1/libempodbcbcs.a | cut -d' ' -f1` -- if test ! -f $ODBCBCS_LIBS; then -- ODBCBCS_LIBS=`echo $1/libempodbcbcs.a | cut -d' ' -f1` -- fi -- AC_MSG_RESULT(`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'`) --]) -- --dnl --dnl configure options --dnl --if test -z "$ODBC_TYPE"; then --PHP_ARG_WITH(adabas,, --[ --with-adabas[=DIR] Include Adabas D support [/usr/local]]) -- -- if test "$PHP_ADABAS" != "no"; then -- AC_MSG_CHECKING([for Adabas support]) -- if test "$PHP_ADABAS" = "yes"; then -- PHP_ADABAS=/usr/local -- fi -- PHP_ADD_INCLUDE($PHP_ADABAS/incl) -- PHP_ADD_LIBPATH($PHP_ADABAS/$PHP_LIBDIR) -- ODBC_OBJS="$PHP_ADABAS/$PHP_LIBDIR/odbclib.a" -- ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a" -- $srcdir/build/shtool mkdir -f -p ext/odbc -- rm -f "$ODBC_LIB" -- cp "$ODBC_OBJS" "$ODBC_LIB" -- PHP_ADD_LIBRARY(sqlptc) -- PHP_ADD_LIBRARY(sqlrte) -- PHP_ADD_LIBRARY_WITH_PATH(odbc_adabas, $abs_builddir/ext/odbc) -- ODBC_TYPE=adabas -- ODBC_INCDIR=$PHP_ADABAS/incl -- PHP_ODBC_CHECK_HEADER(sqlext.h) -- AC_DEFINE(HAVE_ADABAS,1,[ ]) -- AC_MSG_RESULT([$ext_output]) -- fi --fi -- --if test -z "$ODBC_TYPE"; then --PHP_ARG_WITH(sapdb,, --[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]]) -- -- if test "$PHP_SAPDB" != "no"; then -- AC_MSG_CHECKING([for SAP DB support]) -- if test "$PHP_SAPDB" = "yes"; then -- PHP_SAPDB=/usr/local -- fi -- PHP_ADD_INCLUDE($PHP_SAPDB/incl) -- PHP_ADD_LIBPATH($PHP_SAPDB/$PHP_LIBDIR) -- PHP_ADD_LIBRARY(sqlod) -- ODBC_TYPE=sapdb -- AC_DEFINE(HAVE_SAPDB,1,[ ]) -- AC_MSG_RESULT([$ext_output]) -- fi --fi -- --if test -z "$ODBC_TYPE"; then --PHP_ARG_WITH(solid,, --[ --with-solid[=DIR] Include Solid support [/usr/local/solid]]) -- -- if test "$PHP_SOLID" != "no"; then -- AC_MSG_CHECKING(for Solid support) -- if test "$PHP_SOLID" = "yes"; then -- PHP_SOLID=/usr/local/solid -- fi -- ODBC_INCDIR=$PHP_SOLID/include -- ODBC_LIBDIR=$PHP_SOLID/$PHP_LIBDIR -- ODBC_INCLUDE=-I$ODBC_INCDIR -- ODBC_TYPE=solid -- if test -f $ODBC_LIBDIR/soc*35.a; then -- AC_DEFINE(HAVE_SOLID_35,1,[ ]) -- elif test -f $ODBC_LIBDIR/scl*30.a; then -- AC_DEFINE(HAVE_SOLID_30,1,[ ]) -- elif test -f $ODBC_LIBDIR/scl*23.a; then -- AC_DEFINE(HAVE_SOLID,1,[ ]) -- fi -- AC_MSG_RESULT([$ext_output]) -- PHP_ODBC_FIND_SOLID_LIBS($ODBC_LIBDIR) -- fi --fi -- --if test -z "$ODBC_TYPE"; then --PHP_ARG_WITH(ibm-db2,, --[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]]) -- -- if test "$PHP_IBM_DB2" != "no"; then -- AC_MSG_CHECKING(for IBM DB2 support) -- if test "$PHP_IBM_DB2" = "yes"; then -- ODBC_INCDIR=/home/db2inst1/sqllib/include -- ODBC_LIBDIR=/home/db2inst1/sqllib/lib -- else -- ODBC_INCDIR=$PHP_IBM_DB2/include -- ODBC_LIBDIR=$PHP_IBM_DB2/$PHP_LIBDIR -- fi -- -- PHP_ODBC_CHECK_HEADER(sqlcli1.h) -- -- ODBC_INCLUDE=-I$ODBC_INCDIR -- ODBC_LFLAGS=-L$ODBC_LIBDIR -- ODBC_TYPE=ibm-db2 -- ODBC_LIBS=-ldb2 -- -- PHP_TEST_BUILD(SQLExecute, [ -- AC_DEFINE(HAVE_IBMDB2,1,[ ]) -- AC_MSG_RESULT([$ext_output]) -- ], [ -- AC_MSG_RESULT(no) -- AC_MSG_ERROR([ --build test failed. Please check the config.log for details. --You need to source your DB2 environment before running PHP configure: --# . \$IBM_DB2/db2profile --]) -- ], [ -- $ODBC_LFLAGS $ODBC_LIBS -- ]) -- fi --fi -- --if test -z "$ODBC_TYPE"; then --PHP_ARG_WITH(ODBCRouter,, --[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]]) -- -- if test "$PHP_ODBCROUTER" != "no"; then -- AC_MSG_CHECKING(for ODBCRouter.com support) -- if test "$PHP_ODBCROUTER" = "yes"; then -- PHP_ODBCROUTER=/usr -- fi -- ODBC_INCDIR=$PHP_ODBCROUTER/include -- ODBC_LIBDIR=$PHP_ODBCROUTER/lib -- ODBC_LFLAGS=-L$ODBC_LIBDIR -- ODBC_INCLUDE=-I$ODBC_INCDIR -- ODBC_LIBS=-lodbcsdk -- ODBC_TYPE=ODBCRouter -- AC_DEFINE(HAVE_ODBC_ROUTER,1,[ ]) -- AC_MSG_RESULT([$ext_output]) -- fi --fi -- --if test -z "$ODBC_TYPE"; then --PHP_ARG_WITH(empress,, --[ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH] -- (Empress Version >= 8.60 required)]) -- -- if test "$PHP_EMPRESS" != "no"; then -- AC_MSG_CHECKING(for Empress support) -- if test "$PHP_EMPRESS" = "yes"; then -- ODBC_INCDIR=$EMPRESSPATH/include/odbc -- ODBC_LIBDIR=$EMPRESSPATH/shlib -- else -- ODBC_INCDIR=$PHP_EMPRESS/include/odbc -- ODBC_LIBDIR=$PHP_EMPRESS/shlib -- fi -- ODBC_INCLUDE=-I$ODBC_INCDIR -- ODBC_LFLAGS=-L$ODBC_LIBDIR -- ODBC_TYPE=empress -- AC_DEFINE(HAVE_EMPRESS,1,[ ]) -- AC_MSG_RESULT([$ext_output]) -- PHP_ODBC_FIND_EMPRESS_LIBS($ODBC_LIBDIR) -- fi --fi -- --if test -z "$ODBC_TYPE"; then --PHP_ARG_WITH(empress-bcs,, --[ --with-empress-bcs[=DIR] -- Include Empress Local Access support [\$EMPRESSPATH] -- (Empress Version >= 8.60 required)]) -- -- if test "$PHP_EMPRESS_BCS" != "no"; then -- AC_MSG_CHECKING(for Empress local access support) -- if test "$PHP_EMPRESS_BCS" = "yes"; then -- ODBC_INCDIR=$EMPRESSPATH/include/odbc -- ODBC_LIBDIR=$EMPRESSPATH/shlib -- else -- ODBC_INCDIR=$PHP_EMPRESS_BCS/include/odbc -- ODBC_LIBDIR=$PHP_EMPRESS_BCS/shlib -- fi -- CC="empocc -bcs";export CC; -- LD="empocc -bcs";export LD; -- ODBC_INCLUDE=-I$ODBC_INCDIR -- ODBC_LFLAGS=-L$ODBC_LIBDIR -- LIST=`empocc -listlines -bcs -o a a.c` -- -- NEWLIST= -- for I in $LIST -- do -- case $I in -- $EMPRESSPATH/odbccl/lib/* | \ -- $EMPRESSPATH/rdbms/lib/* | \ -- $EMPRESSPATH/common/lib/*) -- NEWLIST="$NEWLIST $I" -- ;; -- esac -- done -- ODBC_LIBS="-lempphpbcs -lms -lmscfg -lbasic -lbasic_os -lnlscstab -lnlsmsgtab -lm -ldl -lcrypt" -- ODBC_TYPE=empress-bcs -- AC_DEFINE(HAVE_EMPRESS,1,[ ]) -- AC_MSG_RESULT([$ext_output]) -- PHP_ODBC_FIND_EMPRESS_BCS_LIBS($ODBC_LIBDIR) -- fi --fi -- --if test -z "$ODBC_TYPE"; then --PHP_ARG_WITH(birdstep,, --[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]]) -- -- if test "$PHP_BIRDSTEP" != "no"; then -- AC_MSG_CHECKING(for Birdstep support) -- if test "$PHP_BIRDSTEP" = "yes"; then -- ODBC_INCDIR=/usr/local/birdstep/include -- ODBC_LIBDIR=/usr/local/birdstep/lib -- else -- ODBC_INCDIR=$PHP_BIRDSTEP/include -- ODBC_LIBDIR=$PHP_BIRDSTEP/$PHP_LIBDIR -- fi -- -- case $host_alias in -- *aix*[)] -- AC_DEFINE(AIX,1,[ ]);; -- *hpux*[)] -- AC_DEFINE(HPUX,1,[ ]);; -- *linux*[)] -- AC_DEFINE(LINUX,1,[ ]);; -- *qnx*[)] -- AC_DEFINE(NEUTRINO,1,[ ]);; -- i?86-*-solaris*[)] -- AC_DEFINE(ISOLARIS,1,[ ]);; -- sparc-*-solaris*[)] -- AC_DEFINE(SOLARIS,1,[ ]);; -- *unixware*[)] -- AC_DEFINE(UNIXWARE,1,[ ]);; -- esac -- -- ODBC_INCLUDE=-I$ODBC_INCDIR -- ODBC_TYPE=birdstep -- ODBC_LFLAGS=-L$ODBC_LIBDIR -- ODBC_LIBS="-lCadm -lCdict -lCenc -lCrdm -lCrpc -lCrdbc -lCrm -lCuapi -lutil" -- -- if test -f "$ODBC_LIBDIR/libCrdbc32.$SHLIB_SUFFIX_NAME"; then -- ODBC_LIBS="-lCrdbc32 -lCadm32 -lCncp32 -lCrm32 -lCsql32 -lCdict32 -lCrdm32 -lCrpc32 -lutil" -- elif test -f "$ODBC_LIBDIR/libCrdbc.$SHLIB_SUFFIX_NAME"; then -- ODBC_LIBS="-lCrdbc -lCadm -lCncp -lCrm -lCsql -lCdict -lCrdm -lCrpc -lutil" -- fi -- -- AC_DEFINE(HAVE_BIRDSTEP,1,[ ]) -- AC_MSG_RESULT([$ext_output]) -- fi --fi -- --if test -z "$ODBC_TYPE"; then --PHP_ARG_WITH(custom-odbc,, --[ --with-custom-odbc[=DIR] -- Include user defined ODBC support. DIR is ODBC install base -- directory [/usr/local]. Make sure to define CUSTOM_ODBC_LIBS and -- have some odbc.h in your include dirs. f.e. you should define -- following for Sybase SQL Anywhere 5.5.00 on QNX, prior to -- running this configure script: -- CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" -- LDFLAGS=-lunix -- CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"]) -- -- if test "$PHP_CUSTOM_ODBC" != "no"; then -- AC_MSG_CHECKING(for a custom ODBC support) -- if test "$PHP_CUSTOM_ODBC" = "yes"; then -- PHP_CUSTOM_ODBC=/usr/local -- fi -- ODBC_INCDIR=$PHP_CUSTOM_ODBC/include -- ODBC_LIBDIR=$PHP_CUSTOM_ODBC/$PHP_LIBDIR -- ODBC_LFLAGS=-L$ODBC_LIBDIR -- ODBC_INCLUDE=-I$ODBC_INCDIR -- ODBC_LIBS=$CUSTOM_ODBC_LIBS -- ODBC_TYPE=custom-odbc -- AC_DEFINE(HAVE_CODBC,1,[ ]) -- AC_MSG_RESULT([$ext_ouput]) -- fi --fi -- --if test -z "$ODBC_TYPE"; then --PHP_ARG_WITH(iodbc,, --[ --with-iodbc[=DIR] Include iODBC support [/usr/local]]) -- -- if test "$PHP_IODBC" != "no"; then -- AC_MSG_CHECKING(for iODBC support) -- if test "$PHP_IODBC" = "yes"; then -- PHP_IODBC=/usr/local -- fi -- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR) -- PHP_ADD_INCLUDE($PHP_IODBC/include, 1) -- ODBC_TYPE=iodbc -- ODBC_INCLUDE=-I$PHP_IODBC/include -- ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR -- ODBC_LIBS=-liodbc -- AC_DEFINE(HAVE_IODBC,1,[ ]) -- AC_DEFINE(HAVE_ODBC2,1,[ ]) -- AC_MSG_RESULT([$ext_output]) -- fi --fi -- --if test -z "$ODBC_TYPE"; then --PHP_ARG_WITH(esoob,, --[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]]) -- -- if test "$PHP_ESOOB" != "no"; then -- AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support) -- if test "$PHP_ESOOB" = "yes"; then -- PHP_ESOOB=/usr/local/easysoft/oob/client -- fi -- ODBC_INCDIR=$PHP_ESOOB/include -- ODBC_LIBDIR=$PHP_ESOOB/$PHP_LIBDIR -- ODBC_LFLAGS=-L$ODBC_LIBDIR -- ODBC_INCLUDE=-I$ODBC_INCDIR -- ODBC_LIBS=-lesoobclient -- ODBC_TYPE=esoob -- AC_DEFINE(HAVE_ESOOB,1,[ ]) -- AC_MSG_RESULT([$ext_output]) -- fi --fi - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(unixODBC,, -@@ -426,56 +30,6 @@ - fi - fi - --if test -z "$ODBC_TYPE"; then --PHP_ARG_WITH(dbmaker,, --[ --with-dbmaker[=DIR] Include DBMaker support]) -- -- if test "$PHP_DBMAKER" != "no"; then -- AC_MSG_CHECKING(for DBMaker support) -- if test "$PHP_DBMAKER" = "yes"; then -- # find dbmaker's home directory -- DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'` -- -- # check DBMaker version (from 5.0 to 2.0) -- DBMAKER_VERSION=5.0 -- -- while test ! -d $DBMAKER_HOME/$DBMAKER_VERSION -a "$DBMAKER_VERSION" != "2.9"; do -- DM_VER=`echo $DBMAKER_VERSION | sed -e 's/\.//' | $AWK '{ print $1-1;}'` -- MAJOR_V=`echo $DM_VER | $AWK '{ print $1/10; }' | $AWK -F. '{ print $1; }'` -- MINOR_V=`echo $DM_VER | $AWK '{ print $1%10; }'` -- DBMAKER_VERSION=$MAJOR_V.$MINOR_V -- done -- -- if test "$DBMAKER_VERSION" = "2.9"; then -- PHP_DBMAKER=$DBMAKER_HOME -- else -- PHP_DBMAKER=$DBMAKER_HOME/$DBMAKER_VERSION -- fi -- fi -- -- ODBC_INCDIR=$PHP_DBMAKER/include -- ODBC_LIBDIR=$PHP_DBMAKER/$PHP_LIBDIR -- ODBC_INCLUDE=-I$ODBC_INCDIR -- ODBC_LFLAGS=-L$ODBC_LIBDIR -- ODBC_INCLUDE=-I$ODBC_INCDIR -- ODBC_LIBS="-ldmapic -lc" -- ODBC_TYPE=dbmaker -- -- AC_DEFINE(HAVE_DBMAKER,1,[Whether you want DBMaker]) -- -- if test "$ext_shared" = "yes"; then -- AC_MSG_RESULT([yes (shared)]) -- ODBC_LIBS="-ldmapic -lc -lm" -- ODBC_SHARED="odbc.la" -- else -- AC_MSG_RESULT([yes (static)]) -- PHP_ADD_LIBRARY_WITH_PATH(dmapic, $ODBC_LIBDIR) -- PHP_ADD_INCLUDE($ODBC_INCDIR) -- ODBC_STATIC="libphpext_odbc.la" -- fi -- fi --fi -- - dnl - dnl Extension setup - dnl Deleted: csw/mgar/pkg/php5/trunk/files/pdopgsql.diff =================================================================== --- csw/mgar/pkg/php5/trunk/files/pdopgsql.diff 2011-04-25 17:24:44 UTC (rev 14401) +++ csw/mgar/pkg/php5/trunk/files/pdopgsql.diff 2011-04-25 17:35:14 UTC (rev 14402) @@ -1,13 +0,0 @@ ---- php-5.2.6/ext/pdo_pgsql/config.m4.orig 2009-02-19 15:57:33.757262166 -0600 -+++ php-5.2.6/ext/pdo_pgsql/config.m4 2009-02-19 15:58:15.092308743 -0600 -@@ -13,8 +13,8 @@ - - AC_MSG_CHECKING(for pg_config) - for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do -- if test -x $i/pg_config; then -- PG_CONFIG="$i/pg_config" -+ if test -x $i/pg_config32; then -+ PG_CONFIG="$i/pg_config32" - break; - fi - done Deleted: csw/mgar/pkg/php5/trunk/files/pgsql.diff =================================================================== --- csw/mgar/pkg/php5/trunk/files/pgsql.diff 2011-04-25 17:24:44 UTC (rev 14401) +++ csw/mgar/pkg/php5/trunk/files/pgsql.diff 2011-04-25 17:35:14 UTC (rev 14402) @@ -1,13 +0,0 @@ ---- php-5.2.6/ext/pgsql/config.m4.orig 2009-02-25 11:46:48.919725515 -0600 -+++ php-5.2.6/ext/pgsql/config.m4 2009-02-25 11:48:01.054898559 -0600 -@@ -11,8 +11,8 @@ - - AC_MSG_CHECKING(for pg_config) - for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do -- if test -x $i/pg_config; then -- PG_CONFIG="$i/pg_config" -+ if test -x $i/pg_config32; then -+ PG_CONFIG="$i/pg_config32" - break; - fi - done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Apr 26 04:01:12 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 26 Apr 2011 02:01:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[14403] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14403 http://gar.svn.sourceforge.net/gar/?rev=14403&view=rev Author: bdwalton Date: 2011-04-26 02:01:12 +0000 (Tue, 26 Apr 2011) Log Message: ----------- php5/trunk: move php.ini to proper location, add migration handler Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-25 17:35:14 UTC (rev 14402) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-26 02:01:12 UTC (rev 14403) @@ -64,7 +64,10 @@ # of sqlite... BUILD_DEP_PKGS += CSWsqlite -PRESERVECONF = $(prefix)/php5/lib/php.ini +PRESERVECONF = /etc/$(prefix)/php5/php.ini +MIGRATE_FILES_CSWphp5 = "php.ini" +MIGRATE_SOURCE_DIR = /opt/csw/php5/lib +MIGRATE_DEST_DIR = $(sysconfdir) define php5_subpackage PACKAGES += CSWphp5-$(1) @@ -86,7 +89,7 @@ CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/PEAR/Config.php CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php-cgi # verify these... -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php.ini.CSW +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/etc/opt/csw/php5/php.ini.CSW PACKAGES += CSWphp5-dev CATALOGNAME_CSWphp5-dev = php5_dev @@ -206,8 +209,8 @@ NOISALIST = 1 STRIP_LIBTOOL = 1 +sysconfdir = /etc/$(prefix)/php5 - CONFIGURE_ARGS += --prefix=$(prefix)/php5 ## build this static, php can not run without it. ## it is more efficient to have this built into the php binary @@ -215,6 +218,7 @@ CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-xml CONFIGURE_ARGS += --with-libxml-dir=$(prefix) +CONFIGURE_ARGS += --with-config-file-path=$(sysconfdir) ifeq ($(SAPI),ap2) CONFIGURE_ARGS += --enable-bcmath=shared @@ -319,7 +323,7 @@ @$(MAKECOOKIE) post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf -post-install-modulated: INIDEST=$(DESTDIR)$(prefix)/php5/lib/php.ini +post-install-modulated: INIDEST=$(DESTDIR)/etc$(prefix)/php5/php.ini post-install-modulated: @rm -f $(DESTDIR)$(AP2SYSCONF) @cp $(WORKSRC)/php.ini-production $(INIDEST) 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 Apr 26 04:02:02 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 26 Apr 2011 02:02:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[14404] csw/mgar/pkg/php5/trunk/files/phpext Message-ID: Revision: 14404 http://gar.svn.sourceforge.net/gar/?rev=14404&view=rev Author: bdwalton Date: 2011-04-26 02:02:02 +0000 (Tue, 26 Apr 2011) Log Message: ----------- php5/trunk: update phpext tool for proper ini file location Modified Paths: -------------- csw/mgar/pkg/php5/trunk/files/phpext Modified: csw/mgar/pkg/php5/trunk/files/phpext =================================================================== --- csw/mgar/pkg/php5/trunk/files/phpext 2011-04-26 02:01:12 UTC (rev 14403) +++ csw/mgar/pkg/php5/trunk/files/phpext 2011-04-26 02:02:02 UTC (rev 14404) @@ -6,7 +6,7 @@ program=${0##*/} # Default path to php.ini -php_ini=/opt/csw/php5/lib/php.ini +php_ini=/etc/opt/csw/php5/php.ini # Usage printer function do_usage { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Apr 26 04:47:58 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 26 Apr 2011 02:47:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[14405] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 14405 http://gar.svn.sourceforge.net/gar/?rev=14405&view=rev Author: rthurner Date: 2011-04-26 02:47:57 +0000 (Tue, 26 Apr 2011) Log Message: ----------- libserf: adjust to current gar Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2011-04-26 02:02:02 UTC (rev 14404) +++ csw/mgar/pkg/libserf/trunk/Makefile 2011-04-26 02:47:57 UTC (rev 14405) @@ -20,25 +20,19 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(DISTNAME)-(\d+(?:\.\d+)*).tar.bz2 -PACKAGES += CSWlibserf -CATALOGNAME_CSWlibserf = libserf -SPKG_DESC_CSWlibserf = Stub as contents moved to CSWlibserf0-0 and CSWlibserf-devel -PKGFILES_CSWlibserf = NOFILES -RUNTIME_DEP_PKGS_CSWlibserf = CSWlibserf0-0 CSWlibserf-devel -ARCHALL_CSWlibserf = 1 -CHECKPKG_OVERRIDES_CSWlibserf += surplus-dependency|CSWlibserf0-0 -CHECKPKG_OVERRIDES_CSWlibserf += surplus-dependency|CSWlibserf-devel +OBSOLETED_BY_CSWlibserf0-0 = CSWlibserf +OBSOLETED_BY_CSWlibserf-dev = CSWlibserf PACKAGES += CSWlibserf0-0 CATALOGNAME_CSWlibserf0-0 = libserf0_0 SPKG_DESC_CSWlibserf0-0 += HTTP client library built on APR, multiplexes connections, provides libserf-0.so.0 PKGFILES_CSWlibserf0-0 += $(call baseisadirs,$(libdir),libserf-0\.so\.0(\.\d+)*) -PACKAGES += CSWlibserf-devel -CATALOGNAME_CSWlibserf-devel = libserf_devel -SPKG_DESC_CSWlibserf-devel = Development files for libserf -PKGFILES_CSWlibserf-devel += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibserf-devel = CSWlibserf0-0 +PACKAGES += CSWlibserf-dev +CATALOGNAME_CSWlibserf-dev = libserf_dev +SPKG_DESC_CSWlibserf-dev = Development files for libserf +PKGFILES_CSWlibserf-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibserf-dev = CSWlibserf0-0 LICENSE = LICENSE 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 Apr 26 13:08:42 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 26 Apr 2011 11:08:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14406] csw/mgar/pkg/asciidoc/trunk Message-ID: Revision: 14406 http://gar.svn.sourceforge.net/gar/?rev=14406&view=rev Author: dmichelsen Date: 2011-04-26 11:08:42 +0000 (Tue, 26 Apr 2011) Log Message: ----------- asciidoc: Update to 8.6.4 and new standards Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/Makefile csw/mgar/pkg/asciidoc/trunk/checksums Modified: csw/mgar/pkg/asciidoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/asciidoc/trunk/Makefile 2011-04-26 02:47:57 UTC (rev 14405) +++ csw/mgar/pkg/asciidoc/trunk/Makefile 2011-04-26 11:08:42 UTC (rev 14406) @@ -1,5 +1,5 @@ NAME = asciidoc -VERSION = 8.6.1 +VERSION = 8.6.4 CATEGORIES = utils DESCRIPTION = A Documentation Generator @@ -27,15 +27,8 @@ PATCHFILES = handle-csw-etc-paths.patch PATCHFILES += 0002-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=67797 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) +TEST_TARGET = test -sysconfdir = /etc/opt/csw - -CONFIGURE_ARGS = $(DIRPATHS) - INSTALL_ARGS = vimdir=/opt/csw/etc/vim CHECKPKG_OVERRIDES_CSWasciidoc += surplus-dependency|CSWggetopt Modified: csw/mgar/pkg/asciidoc/trunk/checksums =================================================================== --- csw/mgar/pkg/asciidoc/trunk/checksums 2011-04-26 02:47:57 UTC (rev 14405) +++ csw/mgar/pkg/asciidoc/trunk/checksums 2011-04-26 11:08:42 UTC (rev 14406) @@ -1 +1 @@ -3d16b16a953c0c2d00b6a6d089882d0e asciidoc-8.6.1.tar.gz +180512ef2b07b52ef351088f54e5803e asciidoc-8.6.4.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 Wed Apr 27 02:40:12 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 27 Apr 2011 00:40:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[14407] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 14407 http://gar.svn.sourceforge.net/gar/?rev=14407&view=rev Author: bdwalton Date: 2011-04-27 00:40:12 +0000 (Wed, 27 Apr 2011) Log Message: ----------- git/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-04-26 11:08:42 UTC (rev 14406) +++ csw/mgar/pkg/git/trunk/Makefile 2011-04-27 00:40:12 UTC (rev 14407) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.7.4.2 +VERSION = 1.7.5 #PATCHLEVEL = rc1 CATEGORIES = devel 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 Apr 27 03:57:03 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 27 Apr 2011 01:57:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14408] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 14408 http://gar.svn.sourceforge.net/gar/?rev=14408&view=rev Author: bdwalton Date: 2011-04-27 01:57:03 +0000 (Wed, 27 Apr 2011) Log Message: ----------- git/trunk: enable tests; set target now that GAR defaults have changed Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-04-27 00:40:12 UTC (rev 14407) +++ csw/mgar/pkg/git/trunk/Makefile 2011-04-27 01:57:03 UTC (rev 14408) @@ -9,7 +9,8 @@ # 1.7.2.1 and 1.7.3 have a failure on current9s when fr.UFT-8 is # detected as the first available utf8 locale. the failure is # harmless though. -TEST_SCRIPTS = +# TEST_SCRIPTS = +TEST_TARGET = test PACKAGES = CSWgit CSWgitk CSWgit-gui CSWgit-svn CSWgit-cvs PACKAGES += CSWgit-emacs CSWgit-doc CSWgit-completion CSWgit-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 Wed Apr 27 04:40:47 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 27 Apr 2011 02:40:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14409] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14409 http://gar.svn.sourceforge.net/gar/?rev=14409&view=rev Author: bdwalton Date: 2011-04-27 02:40:46 +0000 (Wed, 27 Apr 2011) Log Message: ----------- php5/trunk: set sysconfdir in configure args Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-27 01:57:03 UTC (rev 14408) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-27 02:40:46 UTC (rev 14409) @@ -212,6 +212,7 @@ sysconfdir = /etc/$(prefix)/php5 CONFIGURE_ARGS += --prefix=$(prefix)/php5 +CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) ## build this static, php can not run without it. ## it is more efficient to have this built into the php binary CONFIGURE_ARGS += --enable-simplexml 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 Apr 27 13:10:40 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 27 Apr 2011 11:10:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14410] csw/mgar/pkg/neon/trunk/Makefile Message-ID: Revision: 14410 http://gar.svn.sourceforge.net/gar/?rev=14410&view=rev Author: dmichelsen Date: 2011-04-27 11:10:40 +0000 (Wed, 27 Apr 2011) Log Message: ----------- neon: Some adjustments, does not produce package! Work continues on libneon26 and libneon29 Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2011-04-27 02:40:46 UTC (rev 14409) +++ csw/mgar/pkg/neon/trunk/Makefile 2011-04-27 11:10:40 UTC (rev 14410) @@ -50,13 +50,12 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_features-$(FEATURES)) BUILD64 = 1 -NOISAEXEC = 1 # Omit version number suffix on docdir INSTALL_OVERRIDE_VARS = docdir INSTALL_OVERRIDE_VAR_docdir = $(datadir)/doc/neon -# isa-sparcv8-garversion-0.26.4-features-minimal isa-sparcv8-garversion-0.26.4-features-full isa-sparcv8-garversion-0.29.5-features-minimal isa-sparcv8-garversion-0.29.5-features-full isa-sparcv9-garversion-0.26.4-features-minimal isa-sparcv9-garversion-0.26.4-features-full isa-sparcv9-garversion-0.29.5-features-minimal isa-sparcv9-garversion-0.29.5-features-full +# isa-sparcv8-version-0.26.4-features-minimal isa-sparcv8-version-0.26.4-features-full isa-sparcv8-version-0.29.5-features-minimal isa-sparcv8-version-0.29.5-features-full isa-sparcv9-version-0.26.4-features-minimal isa-sparcv9-version-0.26.4-features-full isa-sparcv9-version-0.29.5-features-minimal isa-sparcv9-version-0.29.5-features-full # We select pkgconfig for minimal library bindings. As libneon is self-contained (links # to all necessary libs directly) the full version can simly be linked in. @@ -64,27 +63,27 @@ EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES)) EXTRA_PAX_ARGS-32 += -s ",\(\.$(libdir)/libneon\)\(\.so\.26\.0\.4\),\1-$(FEATURES)\2,p" -EXTRA_PAX_ARGS-32 += -s ",\(\.$(libdir)/libneon\)\(\.so\.27\.2\.3\),\1-$(FEATURES)\2,p" +EXTRA_PAX_ARGS-32 += -s ",\(\.$(libdir)/libneon\)\(\.so\.27\.2\.4\),\1-$(FEATURES)\2,p" EXTRA_PAX_ARGS-64 += -s ",\.$(libdir)/libneon\(\.so\.26\.0\.4\),.$(libdir_install)/$(ISA)/libneon-$(FEATURES)\1,p" -EXTRA_PAX_ARGS-64 += -s ",\.$(libdir)/libneon\(\.so\.27\.2\.3\),.$(libdir_install)/$(ISA)/libneon-$(FEATURES)\1,p" +EXTRA_PAX_ARGS-64 += -s ",\.$(libdir)/libneon\(\.so\.27\.2\.4\),.$(libdir_install)/$(ISA)/libneon-$(FEATURES)\1,p" EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS-$(MEMORYMODEL)) -MERGE_SCRIPTS_isa-default-garversion-0.26.4-features-minimal = copy-only -MERGE_DIRS_isa-default-garversion-0.26.4-features-minimal = $(libdir) -MERGE_SCRIPTS_isa-default64-garversion-0.26.4-features-minimal = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-0.26.4-features-minimal = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-0.26.4-features-full = copy-only -MERGE_DIRS_isa-default-garversion-0.26.4-features-full = $(libdir) -MERGE_SCRIPTS_isa-default64-garversion-0.26.4-features-full = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-0.26.4-features-full = $(libdir) +MERGE_SCRIPTS_isa-default-version-0.26.4-features-minimal = copy-only +MERGE_DIRS_isa-default-version-0.26.4-features-minimal = $(libdir) +MERGE_SCRIPTS_isa-default64-version-0.26.4-features-minimal = copy-relocated-only +MERGE_DIRS_isa-default64-version-0.26.4-features-minimal = $(libdir) +MERGE_SCRIPTS_isa-default-version-0.26.4-features-full = copy-only +MERGE_DIRS_isa-default-version-0.26.4-features-full = $(libdir) +MERGE_SCRIPTS_isa-default64-version-0.26.4-features-full = copy-relocated-only +MERGE_DIRS_isa-default64-version-0.26.4-features-full = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-0.29.5-features-minimal = copy-all -MERGE_SCRIPTS_isa-default64-garversion-0.29.5-features-minimal = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-0.29.5-features-minimal = $(bindir) $(sbindir) $(libexecdir) $(libdir) -MERGE_SCRIPTS_isa-default-garversion-0.29.5-features-full = copy-only -MERGE_DIRS_isa-default-garversion-0.29.5-features-full = $(libdir) -MERGE_SCRIPTS_isa-default64-garversion-0.29.5-features-full = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-0.29.5-features-full = $(libdir) +MERGE_SCRIPTS_isa-default-version-0.29.5-features-minimal = copy-all +MERGE_SCRIPTS_isa-default64-version-0.29.5-features-minimal = copy-relocated-only +MERGE_DIRS_isa-default64-version-0.29.5-features-minimal = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-version-0.29.5-features-full = copy-only +MERGE_DIRS_isa-default-version-0.29.5-features-full = $(libdir) +MERGE_SCRIPTS_isa-default64-version-0.29.5-features-full = copy-relocated-only +MERGE_DIRS_isa-default64-version-0.29.5-features-full = $(libdir) EXTRA_LINKER_FLAGS = -lintl @@ -101,16 +100,16 @@ FEATURES_libneon64.26 = $(libdir)/$(ISA_DEFAULT64)/libneon.so.26.0.4 FEATURES_libneon64.26 += libneon-minimal.so.26.0.4 FEATURES_libneon64.26 += libneon-full.so.26.0.4 -FEATURES_libneon.27 = $(libdir)/libneon.so.27.2.3 -FEATURES_libneon.27 += libneon-minimal.so.27.2.3 -FEATURES_libneon.27 += libneon-full.so.27.2.3 -FEATURES_libneon64.27 = $(libdir)/$(ISA_DEFAULT64)/libneon.so.27.2.3 -FEATURES_libneon64.27 += libneon-minimal.so.27.2.3 -FEATURES_libneon64.27 += libneon-full.so.27.2.3 +FEATURES_libneon.27 = $(libdir)/libneon.so.27.2.5 +FEATURES_libneon.27 += libneon-minimal.so.27.2.5 +FEATURES_libneon.27 += libneon-full.so.27.2.5 +FEATURES_libneon64.27 = $(libdir)/$(ISA_DEFAULT64)/libneon.so.27.2.5 +FEATURES_libneon64.27 += libneon-minimal.so.27.2.5 +FEATURES_libneon64.27 += libneon-full.so.27.2.5 # This comes from krb5-config --libs CHECKPKG_OVERRIDES_CSWneonfull += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libneon-full.so.26.0.4 -CHECKPKG_OVERRIDES_CSWneonfull += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libneon-full.so.27.2.3 +CHECKPKG_OVERRIDES_CSWneonfull += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libneon-full.so.27.2.5 CHECKPKG_OVERRIDES_CSWneon-devel += surplus-dependency|CSWneon CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWpakchois 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 Apr 27 13:13:30 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 27 Apr 2011 11:13:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[14411] csw/mgar/pkg/neon Message-ID: Revision: 14411 http://gar.svn.sourceforge.net/gar/?rev=14411&view=rev Author: dmichelsen Date: 2011-04-27 11:13:29 +0000 (Wed, 27 Apr 2011) Log Message: ----------- neon: Move trunk to tag, discontinue here, continue on libneon26 and libneon29 Added Paths: ----------- csw/mgar/pkg/neon/tags/neon-0.29.5-unfinished/ Removed Paths: ------------- csw/mgar/pkg/neon/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 27 13:33:16 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 27 Apr 2011 11:33:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[14412] csw/mgar/pkg Message-ID: Revision: 14412 http://gar.svn.sourceforge.net/gar/?rev=14412&view=rev Author: dmichelsen Date: 2011-04-27 11:33:16 +0000 (Wed, 27 Apr 2011) Log Message: ----------- libneon26: Make functional package Modified Paths: -------------- csw/mgar/pkg/libneon26/trunk/Makefile csw/mgar/pkg/libneon26/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libneon26/ csw/mgar/pkg/libneon26/Makefile csw/mgar/pkg/libneon26/branches/ csw/mgar/pkg/libneon26/tags/ Removed Paths: ------------- csw/mgar/pkg/libneon26/Makefile csw/mgar/pkg/libneon26/branches/ csw/mgar/pkg/libneon26/tags/ csw/mgar/pkg/libneon26/tags/neon-0.29.1,REV=2009.12.17/ csw/mgar/pkg/libneon26/tags/neon-0.29.3,REV=2010.02.25/ Deleted: csw/mgar/pkg/libneon26/Makefile =================================================================== --- csw/mgar/pkg/neon/Makefile 2011-04-26 02:47:57 UTC (rev 14405) +++ csw/mgar/pkg/libneon26/Makefile 2011-04-27 11:33:16 UTC (rev 14412) @@ -1,15 +0,0 @@ -# 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/libneon26/Makefile (from rev 14394, csw/mgar/pkg/neon/Makefile) =================================================================== --- csw/mgar/pkg/libneon26/Makefile (rev 0) +++ csw/mgar/pkg/libneon26/Makefile 2011-04-27 11:33:16 UTC (rev 14412) @@ -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) Modified: csw/mgar/pkg/libneon26/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2011-04-26 02:47:57 UTC (rev 14405) +++ csw/mgar/pkg/libneon26/trunk/Makefile 2011-04-27 11:33:16 UTC (rev 14412) @@ -1,9 +1,8 @@ NAME = neon -VERSION = 0.29.5 +VERSION = 0.26.4 CATEGORIES = lib -EXTRA_MODULATORS = VERSION FEATURES -MODULATIONS_VERSION = 0.26.4 0.29.5 +EXTRA_MODULATORS = FEATURES MODULATIONS_FEATURES = minimal full DESCRIPTION = Neon HTTP and WebDAV client library @@ -15,31 +14,44 @@ endef MASTER_SITES = http://www.webdav.org/$(NAME)/ -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION), $(NAME)-$(VERSION).tar.gz) -DISTFILES = $(SOURCEFILES) +DISTFILES = $(DISTNAME).tar.gz DISTFILES += COPYING -NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz,$(SOURCEFILES)) +PACKAGES += CSWlibneon26 +CATALOGNAME_CSWlibneon26 = libneon26 +SPKG_DESC_CSWlibneon26 = Neon HTTP and WebDAV client library, libneon.so.26 +PKGFILES_CSWlibneon26 += $(call pkgfiles_lib,libneon.so.26) +RUNTIME_DEP_PKGS_CSWlibneon26 += CSWexpat +RUNTIME_DEP_PKGS_CSWlibneon26 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibneon26 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibneon26 += CSWlibintl8 -PACKAGES = CSWneon CSWneonfull CSWneon-devel +PACKAGES += CSWlibneon26-feature +CATALOGNAME_CSWlibneon26_feature = libneon26_feature +SPKG_DESC_CSWlibneon26-feature = Neon HTTP and WebDAV client library with all features enabled, supersedes libneon.so.26 +PKGFILES_CSWlibneon26-feature = $(call pkgfiles_lib,libneon-feature.so.26) +RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWexpat +RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWzlib +RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWkrb5lib -CATALOGNAME_CSWneon = neon -CATALOGNAME_CSWneonfull = neon_full -CATALOGNAME_CSWneon-devel = neon_devel +# This comes from krb5-config --libs +CHECKPKG_OVERRIDES_CSWlibneon26-feature += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libneon-feature.so.26.0.4 -RUNTIME_DEP_PKGS_CSWneon = CSWexpat CSWosslrt CSWzlib CSWggettextrt -RUNTIME_DEP_PKGS_CSWneonfull = CSWexpat CSWosslrt CSWzlib CSWggettextrt CSWpakchois CSWlibproxy CSWkrb5lib -RUNTIME_DEP_PKGS_CSWneon-devel = CSWneon +# These are artifacts of the feature lib being a regular one. +# As it is never linked against the soname doesn't matter here and the package name +# is obviously different from the soname in this case. +CHECKPKG_OVERRIDES_CSWlibneon26-feature += soname-not-part-of-filename|soname=libneon.so.26|filename=libneon-feature.so.26.0.4 +CHECKPKG_OVERRIDES_CSWlibneon26-feature += soname-not-part-of-filename|soname=libneon.so.26|filename=libneon-feature.so.26.0.4 +CHECKPKG_OVERRIDES_CSWlibneon26-feature += shared-lib-pkgname-mismatch|sonames=libneon.so.26|pkgname=CSWlibneon26-feature|expected=CSWlibneon26| -BUILD_DEP_PKGS = $(sort $(RUNTIME_DEP_PKGS_CSWneon) $(RUNTIME_DEP_PKGS_CSWneonfull)) +# These will go away after release +CHECKPKG_OVERRIDES_CSWlibneon26 += file-collision|/opt/csw/lib/libneon.so.26|CSWlibneon26|CSWneon +CHECKPKG_OVERRIDES_CSWlibneon26 += file-collision|/opt/csw/lib/sparcv9/libneon.so.26|CSWlibneon26|CSWneon -SPKG_DESC_CSWneon = Neon HTTP and WebDAV client library (minimal dependencies) -SPKG_DESC_CSWneonfull = Neon HTTP and WebDAV client library (full featured) -SPKG_DESC_CSWneon-devel = Neon HTTP and WebDAV development support +BUILD_DEP_PKGS = CSWossldevel -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - CONFIGURE_ARGS_features-minimal = --without-libproxy --without-pakchois --without-gssapi CONFIGURE_ARGS_features-full = --with-libproxy --with-packchois @@ -50,113 +62,46 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_features-$(FEATURES)) BUILD64 = 1 -NOISAEXEC = 1 +# Tests fail, investigate later +SKIPTEST ?= 1 + +# Make sure to use a defined timezone or tests may fail +TEST_OVERRIDE_VARS = TZ +TEST_OVERRIDE_VAR_TZ = GMT + # Omit version number suffix on docdir INSTALL_OVERRIDE_VARS = docdir INSTALL_OVERRIDE_VAR_docdir = $(datadir)/doc/neon -# isa-sparcv8-garversion-0.26.4-features-minimal isa-sparcv8-garversion-0.26.4-features-full isa-sparcv8-garversion-0.29.5-features-minimal isa-sparcv8-garversion-0.29.5-features-full isa-sparcv9-garversion-0.26.4-features-minimal isa-sparcv9-garversion-0.26.4-features-full isa-sparcv9-garversion-0.29.5-features-minimal isa-sparcv9-garversion-0.29.5-features-full +EXTRA_PAX_ARGS_isa-sparcv8-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libneon\)\(\.so\.\d+\..*\),\1-feature\2,p" +EXTRA_PAX_ARGS_isa-i386-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libneon\)\(\.so\.\d+\..*\),\1-feature\2,p" +EXTRA_PAX_ARGS_isa-sparcv9-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\.$(libdir)/libneon\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libneon-feature\1,p" +EXTRA_PAX_ARGS_isa-amd64-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\.$(libdir)/libneon\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libneon-feature\1,p" -# We select pkgconfig for minimal library bindings. As libneon is self-contained (links -# to all necessary libs directly) the full version can simly be linked in. -EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,," -EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES)) +MERGE_SCRIPTS_isa-default-features-minimal = copy-only +MERGE_DIRS_isa-default-features-minimal = $(libdir) +MERGE_SCRIPTS_isa-default64-features-minimal = copy-relocated-only +MERGE_DIRS_isa-default64-features-minimal = $(libdir) +MERGE_SCRIPTS_isa-default-features-full = copy-only +MERGE_DIRS_isa-default-features-full = $(libdir) +MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only +MERGE_DIRS_isa-default64-features-full = $(libdir) -EXTRA_PAX_ARGS-32 += -s ",\(\.$(libdir)/libneon\)\(\.so\.26\.0\.4\),\1-$(FEATURES)\2,p" -EXTRA_PAX_ARGS-32 += -s ",\(\.$(libdir)/libneon\)\(\.so\.27\.2\.3\),\1-$(FEATURES)\2,p" -EXTRA_PAX_ARGS-64 += -s ",\.$(libdir)/libneon\(\.so\.26\.0\.4\),.$(libdir_install)/$(ISA)/libneon-$(FEATURES)\1,p" -EXTRA_PAX_ARGS-64 += -s ",\.$(libdir)/libneon\(\.so\.27\.2\.3\),.$(libdir_install)/$(ISA)/libneon-$(FEATURES)\1,p" -EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS-$(MEMORYMODEL)) - -MERGE_SCRIPTS_isa-default-garversion-0.26.4-features-minimal = copy-only -MERGE_DIRS_isa-default-garversion-0.26.4-features-minimal = $(libdir) -MERGE_SCRIPTS_isa-default64-garversion-0.26.4-features-minimal = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-0.26.4-features-minimal = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-0.26.4-features-full = copy-only -MERGE_DIRS_isa-default-garversion-0.26.4-features-full = $(libdir) -MERGE_SCRIPTS_isa-default64-garversion-0.26.4-features-full = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-0.26.4-features-full = $(libdir) - -MERGE_SCRIPTS_isa-default-garversion-0.29.5-features-minimal = copy-all -MERGE_SCRIPTS_isa-default64-garversion-0.29.5-features-minimal = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-0.29.5-features-minimal = $(bindir) $(sbindir) $(libexecdir) $(libdir) -MERGE_SCRIPTS_isa-default-garversion-0.29.5-features-full = copy-only -MERGE_DIRS_isa-default-garversion-0.29.5-features-full = $(libdir) -MERGE_SCRIPTS_isa-default64-garversion-0.29.5-features-full = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-0.29.5-features-full = $(libdir) - EXTRA_LINKER_FLAGS = -lintl -PKGFILES_CSWneonfull = .*-full.* -PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWneon-devel += $(docdir)/.* - - -FEATURE_LIBRARIES = libneon.26 libneon64.26 -FEATURE_LIBRARIES += libneon.27 libneon64.27 -FEATURES_libneon.26 = $(libdir)/libneon.so.26.0.4 -FEATURES_libneon.26 += libneon-minimal.so.26.0.4 -FEATURES_libneon.26 += libneon-full.so.26.0.4 -FEATURES_libneon64.26 = $(libdir)/$(ISA_DEFAULT64)/libneon.so.26.0.4 -FEATURES_libneon64.26 += libneon-minimal.so.26.0.4 -FEATURES_libneon64.26 += libneon-full.so.26.0.4 -FEATURES_libneon.27 = $(libdir)/libneon.so.27.2.3 -FEATURES_libneon.27 += libneon-minimal.so.27.2.3 -FEATURES_libneon.27 += libneon-full.so.27.2.3 -FEATURES_libneon64.27 = $(libdir)/$(ISA_DEFAULT64)/libneon.so.27.2.3 -FEATURES_libneon64.27 += libneon-minimal.so.27.2.3 -FEATURES_libneon64.27 += libneon-full.so.27.2.3 - -# This comes from krb5-config --libs -CHECKPKG_OVERRIDES_CSWneonfull += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libneon-full.so.26.0.4 -CHECKPKG_OVERRIDES_CSWneonfull += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libneon-full.so.27.2.3 - -CHECKPKG_OVERRIDES_CSWneon-devel += surplus-dependency|CSWneon -CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWpakchois -CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWosslrt -CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWggettextrt -CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWzlib -CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWexpat -CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWkrb5lib -CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWlibproxy -CHECKPKG_OVERRIDES_CSWneon += surplus-dependency|CSWexpat -CHECKPKG_OVERRIDES_CSWneon += surplus-dependency|CSWosslrt -CHECKPKG_OVERRIDES_CSWneon += surplus-dependency|CSWggettextrt -CHECKPKG_OVERRIDES_CSWneon += surplus-dependency|CSWzlib - - include gar/category.mk -#post-install-modulated: -# rm -f $(DESTDIR)$(libdir)/libneon.so -# gln -s libneon.so.27 $(DESTDIR)$(libdir)/libneon.so -# @$(MAKECOOKIE) +post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: EXTRA_LD_OPTIONS = -f libneon-feature.so.26 +post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: + rm -f $(WORKSRC)/src/libneon.la + $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(WORKSRC) $(BUILD_ARGS) + @$(MAKECOOKIE) -# cc -G -c empty.c -# ld -G -h libneon-minimal.so.26 -o stub-libneon.so.26 empty.o -# ld -R /opt/csw/lib -G -h libneon.so.26 -o libneon.so.26 -f libneon-full.so.26 -f libneon-max.so.26 stub-libneon.so.26 - -# 32/64 bit detection is done by looking at the last directory component and -# guessing by ISA if it is 32 or 64 bit - -#post-merge: _LDFLAGS-32= -#post-merge: _LDFLAGS-64=-64 -#post-merge: -#post-merge: -# cd $(WORKDIR); touch empty.c; $(CC) -G -c empty.c -# cd $(WORKDIR); touch empty64.c; $(CC) -m64 -G -c empty64.c -# $(foreach L,$(FEATURE_LIBRARIES),\ -# ld $(_LDFLAGS-$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L))))))) \ -# -G -h $(word 2,$(FEATURES_$L)) -o $(WORKDIR)/stub-$(notdir $(firstword $(FEATURES_$L))) $(WORKDIR)/empty$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L)))))).o;\ -# ld $(_LDFLAGS-$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L))))))) \ -# -R $(patsubst %/,%,$(dir $(firstword $(FEATURES_$L)))) \ -# -G -h `/usr/ccs/bin/dump -Lv $(dir $(firstword $(FEATURES_$L)))/$(word 2,$(FEATURES_$L)) | awk '$$2 == "SONAME" { print $$3 }'` \ -# -o $(PKGROOT)$(firstword $(FEATURES_$L)) \ -# $(foreach F,$(wordlist 3,$(words $(FEATURES_$L)),$(FEATURES_$L)),-F $F) \ -# $(WORKDIR)/stub-$(notdir $(firstword $(FEATURES_$L))); \ -# ) -# @$(MAKECOOKIE) - -# ld -G -o ~/libtidy-minimal.so -z allextract -h libtidy.so.26 -F libtidy-full.so.26 /opt/csw/lib/libtidy.a - +post-merge: + @# This is needed because the substitutions from pax args do not change the + @# contents of the symlink + rm -f $(PKGROOT)$(libdir)/libneon-feature.so.26 + ln -s libneon-feature.so.26.0.4 $(PKGROOT)$(libdir)/libneon-feature.so.26 + rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.26 + ln -s libneon-feature.so.26.0.4 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.26 Modified: csw/mgar/pkg/libneon26/trunk/checksums =================================================================== --- csw/mgar/pkg/neon/trunk/checksums 2011-04-26 02:47:57 UTC (rev 14405) +++ csw/mgar/pkg/libneon26/trunk/checksums 2011-04-27 11:33:16 UTC (rev 14412) @@ -1,2 +1 @@ 2d11fff51ffa856fc6b5d4bd801d6cc4 neon-0.26.4.tar.gz -ff369e69ef0f0143beb5626164e87ae2 neon-0.29.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 27 14:41:47 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 27 Apr 2011 12:41:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14413] csw/mgar/pkg/msmtp/trunk Message-ID: Revision: 14413 http://gar.svn.sourceforge.net/gar/?rev=14413&view=rev Author: dmichelsen Date: 2011-04-27 12:41:47 +0000 (Wed, 27 Apr 2011) Log Message: ----------- msmtp: Update to 1.4.24, new defaults and updated libraries Modified Paths: -------------- csw/mgar/pkg/msmtp/trunk/Makefile csw/mgar/pkg/msmtp/trunk/checksums Modified: csw/mgar/pkg/msmtp/trunk/Makefile =================================================================== --- csw/mgar/pkg/msmtp/trunk/Makefile 2011-04-27 11:33:16 UTC (rev 14412) +++ csw/mgar/pkg/msmtp/trunk/Makefile 2011-04-27 12:41:47 UTC (rev 14413) @@ -1,5 +1,5 @@ NAME = msmtp -VERSION = 1.4.23 +VERSION = 1.4.24 CATEGORIES = net DESCRIPTION = SMTP client @@ -28,28 +28,27 @@ PACKAGES += CSWmsmtp CATALOGNAME_CSWmsmtp = msmtp SPKG_DESC_CSWmsmtp = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibgsasl7 +RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibgnome-keyring0 +RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibgnutls26 +RUNTIME_DEP_PKGS_CSWmsmtp += CSWglib2 -VENDOR_URL = http://msmtp.sourceforge.net/ +RUNTIME_DEP_PKGS_5.9 = CSWlibgnugetopt +RUNTIME_DEP_PKGS_CSWmsmtp += $(RUNTIME_DEP_PKGS_$(GAROSREL)) -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +EXTRA_LINKER_FLAGS_5.9 = -lgnugetopt +EXTRA_LINKER_FLAGS = $(EXTRA_LINKER_FLAGS_$(GAROSREL)) +VENDOR_URL = http://msmtp.sourceforge.net/ + BUILD_DEP_PKGS += CSWgnutlsdevel BUILD_DEP_PKGS += CSWlibgsasldevel BUILD_DEP_PKGS += CSWggettext -RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibidn -RUNTIME_DEP_PKGS_CSWmsmtp += CSWgnutls -RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibgsasl7 -RUNTIME_DEP_PKGS_CSWmsmtp += CSWggettextrt - -sysconfdir = /etc/opt/csw -CONFIGURE_ARGS = $(DIRPATHS) - PRESERVECONF = $(sysconfdir)/msmtprc -TEST_TARGET = check - include gar/category.mk # The path in CA_CERTIFICATES is taken from CSWcacertificates Modified: csw/mgar/pkg/msmtp/trunk/checksums =================================================================== --- csw/mgar/pkg/msmtp/trunk/checksums 2011-04-27 11:33:16 UTC (rev 14412) +++ csw/mgar/pkg/msmtp/trunk/checksums 2011-04-27 12:41:47 UTC (rev 14413) @@ -1 +1 @@ -5fb7ae88186624cdb125d3efad3fdc16 msmtp-1.4.23.tar.bz2 +3ed704fbd3e7419cab5c65bb7928d9ba msmtp-1.4.24.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 27 14:53:38 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 27 Apr 2011 12:53:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[14414] csw/mgar/pkg/libneon26/trunk/Makefile Message-ID: Revision: 14414 http://gar.svn.sourceforge.net/gar/?rev=14414&view=rev Author: dmichelsen Date: 2011-04-27 12:53:37 +0000 (Wed, 27 Apr 2011) Log Message: ----------- libneon26: Add dependency from feature to base Modified Paths: -------------- csw/mgar/pkg/libneon26/trunk/Makefile Modified: csw/mgar/pkg/libneon26/trunk/Makefile =================================================================== --- csw/mgar/pkg/libneon26/trunk/Makefile 2011-04-27 12:41:47 UTC (rev 14413) +++ csw/mgar/pkg/libneon26/trunk/Makefile 2011-04-27 12:53:37 UTC (rev 14414) @@ -30,6 +30,7 @@ CATALOGNAME_CSWlibneon26_feature = libneon26_feature SPKG_DESC_CSWlibneon26-feature = Neon HTTP and WebDAV client library with all features enabled, supersedes libneon.so.26 PKGFILES_CSWlibneon26-feature = $(call pkgfiles_lib,libneon-feature.so.26) +RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWlibneon26 RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWexpat RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWosslrt RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWzlib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 27 14:55:52 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 27 Apr 2011 12:55:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[14415] csw/mgar/pkg/libneon26/trunk/Makefile Message-ID: Revision: 14415 http://gar.svn.sourceforge.net/gar/?rev=14415&view=rev Author: dmichelsen Date: 2011-04-27 12:55:51 +0000 (Wed, 27 Apr 2011) Log Message: ----------- libneon26: Add dependency from feature to base, override for that Modified Paths: -------------- csw/mgar/pkg/libneon26/trunk/Makefile Modified: csw/mgar/pkg/libneon26/trunk/Makefile =================================================================== --- csw/mgar/pkg/libneon26/trunk/Makefile 2011-04-27 12:53:37 UTC (rev 14414) +++ csw/mgar/pkg/libneon26/trunk/Makefile 2011-04-27 12:55:51 UTC (rev 14415) @@ -31,6 +31,7 @@ SPKG_DESC_CSWlibneon26-feature = Neon HTTP and WebDAV client library with all features enabled, supersedes libneon.so.26 PKGFILES_CSWlibneon26-feature = $(call pkgfiles_lib,libneon-feature.so.26) RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWlibneon26 +CHECKPKG_OVERRIDES_CSWlibneon26-feature += surplus-dependency|CSWlibneon26 RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWexpat RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWosslrt RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWzlib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 27 14:59:08 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 27 Apr 2011 12:59:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14416] csw/mgar/pkg/libneon26/trunk/Makefile Message-ID: Revision: 14416 http://gar.svn.sourceforge.net/gar/?rev=14416&view=rev Author: dmichelsen Date: 2011-04-27 12:59:07 +0000 (Wed, 27 Apr 2011) Log Message: ----------- libneon26: Add dependency to newer package for locale message files Modified Paths: -------------- csw/mgar/pkg/libneon26/trunk/Makefile Modified: csw/mgar/pkg/libneon26/trunk/Makefile =================================================================== --- csw/mgar/pkg/libneon26/trunk/Makefile 2011-04-27 12:55:51 UTC (rev 14415) +++ csw/mgar/pkg/libneon26/trunk/Makefile 2011-04-27 12:59:07 UTC (rev 14416) @@ -21,6 +21,8 @@ CATALOGNAME_CSWlibneon26 = libneon26 SPKG_DESC_CSWlibneon26 = Neon HTTP and WebDAV client library, libneon.so.26 PKGFILES_CSWlibneon26 += $(call pkgfiles_lib,libneon.so.26) +# Depend on the newer package as it contains the locale message files +RUNTIME_DEP_PKGS_CSWlibneon26 += CSWlibneon27 RUNTIME_DEP_PKGS_CSWlibneon26 += CSWexpat RUNTIME_DEP_PKGS_CSWlibneon26 += CSWosslrt RUNTIME_DEP_PKGS_CSWlibneon26 += CSWzlib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 27 15:02:42 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 27 Apr 2011 13:02:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14417] csw/mgar/pkg/libneon26/trunk/Makefile Message-ID: Revision: 14417 http://gar.svn.sourceforge.net/gar/?rev=14417&view=rev Author: dmichelsen Date: 2011-04-27 13:02:42 +0000 (Wed, 27 Apr 2011) Log Message: ----------- libneon26: Add dependency to newer package for locale message files, override for that Modified Paths: -------------- csw/mgar/pkg/libneon26/trunk/Makefile Modified: csw/mgar/pkg/libneon26/trunk/Makefile =================================================================== --- csw/mgar/pkg/libneon26/trunk/Makefile 2011-04-27 12:59:07 UTC (rev 14416) +++ csw/mgar/pkg/libneon26/trunk/Makefile 2011-04-27 13:02:42 UTC (rev 14417) @@ -23,6 +23,7 @@ PKGFILES_CSWlibneon26 += $(call pkgfiles_lib,libneon.so.26) # Depend on the newer package as it contains the locale message files RUNTIME_DEP_PKGS_CSWlibneon26 += CSWlibneon27 +CHECKPKG_OVERRIDES_CSWlibneon26 += surplus-dependency|CSWlibneon27 RUNTIME_DEP_PKGS_CSWlibneon26 += CSWexpat RUNTIME_DEP_PKGS_CSWlibneon26 += CSWosslrt RUNTIME_DEP_PKGS_CSWlibneon26 += CSWzlib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 27 15:09:09 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 27 Apr 2011 13:09:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[14418] csw/mgar/pkg/libneon29/trunk Message-ID: Revision: 14418 http://gar.svn.sourceforge.net/gar/?rev=14418&view=rev Author: dmichelsen Date: 2011-04-27 13:09:09 +0000 (Wed, 27 Apr 2011) Log Message: ----------- libneon27: Major rework Modified Paths: -------------- csw/mgar/pkg/libneon29/trunk/Makefile csw/mgar/pkg/libneon29/trunk/checksums Modified: csw/mgar/pkg/libneon29/trunk/Makefile =================================================================== --- csw/mgar/pkg/libneon29/trunk/Makefile 2011-04-27 13:02:42 UTC (rev 14417) +++ csw/mgar/pkg/libneon29/trunk/Makefile 2011-04-27 13:09:09 UTC (rev 14418) @@ -1,8 +1,10 @@ -NAME = neon29 +NAME = neon VERSION = 0.29.5 -DISTNAME = neon-$(VERSION) CATEGORIES = lib +EXTRA_MODULATORS = FEATURES +MODULATIONS_FEATURES = minimal full + DESCRIPTION = Neon HTTP and WebDAV client library define BLURB neon is an HTTP and WebDAV client library for Unix systems, with a C language @@ -11,20 +13,122 @@ be easily implemented. endef -MASTER_SITES = http://www.webdav.org/neon/ +MASTER_SITES = http://www.webdav.org/$(NAME)/ DISTFILES = $(DISTNAME).tar.gz +DISTFILES += COPYING -DEP_PKGS = CSWexpat CSWosslrt CSWzlib CSWggettextrt CSWpakchois CSWlibproxy CSWkrb5lib +FOREIGN_PACKAGES += CSWlibneon26 +OBSOLETED_BY_CSWlibneon26 = CSWneon -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(DISTNAME)-(\d+(?:\.\d+)*).tar.gz +FOREIGN_PACKAGES += CSWlibneon26-feature +OBSOLETED_BY_CSWlibneon26-feature = CSWneonfull -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-shared --disable-static +PACKAGES += CSWlibneon27 +CATALOGNAME_CSWlibneon27 = libneon27 +SPKG_DESC_CSWlibneon27 = Neon HTTP and WebDAV client library, libneon.so.27 +PKGFILES_CSWlibneon27 += $(call pkgfiles_lib,libneon.so.27) +PKGFILES_CSWlibneon27 += $(sharedstatedir)/locale/.* +RUNTIME_DEP_PKGS_CSWlibneon27 += CSWexpat +RUNTIME_DEP_PKGS_CSWlibneon27 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibneon27 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibneon27 += CSWlibintl8 +OBSOLETED_BY_CSWlibneon27 = CSWneon + +PACKAGES += CSWlibneon27-feature +CATALOGNAME_CSWlibneon27_feature = libneon27_feature +SPKG_DESC_CSWlibneon27-feature = Neon HTTP and WebDAV client library with all features enabled, supersedes libneon.so.27 +PKGFILES_CSWlibneon27-feature += $(call pkgfiles_lib,libneon-feature.so.27) +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibneon27 +CHECKPKG_OVERRIDES_CSWlibneon27-feature += surplus-dependency|CSWlibneon27 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWexpat +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWzlib +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWkrb5lib +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWpakchois +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibproxy +OBSOLETED_BY_CSWlibneon27-feature = CSWneonfull + +PACKAGES += CSWlibneon-dev +CATALOGNAME_CSWlibneon-dev = libneon_dev +SPKG_DESC_CSWlibneon-dev = Development files for libneon.so.27 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibneon-dev += CSWlibneon27 +OBSOLETED_BY_CSWlibneon-dev = CSWneon-devel + +# This describes the defaults during configure +CHECKPKG_OVERRIDES_CSWlibneon-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/neon/html/using.html + +# This comes from krb5-config --libs +CHECKPKG_OVERRIDES_CSWlibneon27-feature += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libneon-feature.so.27.2.5 + +# These are artifacts of the feature lib being a regular one. +# As it is never linked against the soname doesn't matter here and the package name +# is obviously different from the soname in this case. +CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.2.5 +CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.2.5 +CHECKPKG_OVERRIDES_CSWlibneon27-feature += shared-lib-pkgname-mismatch|sonames=libneon.so.27|pkgname=CSWlibneon27-feature|expected=CSWlibneon27| + +# These will go away after release +CHECKPKG_OVERRIDES_CSWlibneon27 += file-collision|/opt/csw/lib/libneon.so.27|CSWlibneon27|CSWneon +CHECKPKG_OVERRIDES_CSWlibneon27 += file-collision|/opt/csw/lib/sparcv9/libneon.so.27|CSWlibneon27|CSWneon + +BUILD_DEP_PKGS = CSWossldevel + +CONFIGURE_ARGS_features-minimal = --without-libproxy --without-pakchois --without-gssapi +CONFIGURE_ARGS_features-full = --with-libproxy --with-packchois + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared --enable-static CONFIGURE_ARGS += --with-ssl=openssl CONFIGURE_ARGS += --with-expat -CONFIGURE_ARGS = --with-libproxy --with-packchois +CONFIGURE_ARGS += $(CONFIGURE_ARGS_features-$(FEATURES)) -TEST_TARGET = check +BUILD64 = 1 +# Tests fail, investigate later +SKIPTEST ?= 1 + +# Make sure to use a defined timezone or tests may fail +# TEST_OVERRIDE_VARS = TZ +# TEST_OVERRIDE_VAR_TZ = GMT + +# Omit version number suffix on docdir +INSTALL_OVERRIDE_VARS = docdir +INSTALL_OVERRIDE_VAR_docdir = $(datadir)/doc/neon + +# We select pkgconfig for minimal library bindings. As libneon is self-contained (links +# to all necessary libs directly) the full version can simly be linked in. +EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,," +EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES)) + +EXTRA_PAX_ARGS_isa-sparcv8-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libneon\)\(\.so\.\d+\..*\),\1-feature\2,p" +EXTRA_PAX_ARGS_isa-i386-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libneon\)\(\.so\.\d+\..*\),\1-feature\2,p" +EXTRA_PAX_ARGS_isa-sparcv9-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\.$(libdir)/libneon\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libneon-feature\1,p" +EXTRA_PAX_ARGS_isa-amd64-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\.$(libdir)/libneon\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libneon-feature\1,p" + +MERGE_SCRIPTS_isa-default-features-minimal = copy-all +MERGE_SCRIPTS_isa-default64-features-minimal = copy-relocated-only +MERGE_DIRS_isa-default64-features-minimal = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-features-full = copy-only +MERGE_DIRS_isa-default-features-full = $(libdir) +MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only +MERGE_DIRS_isa-default64-features-full = $(libdir) + +EXTRA_LINKER_FLAGS = -lintl + include gar/category.mk + +post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: EXTRA_LD_OPTIONS = -f libneon-feature.so.27 +post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: + rm -f $(WORKSRC)/src/libneon.la + $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(WORKSRC) $(BUILD_ARGS) + @$(MAKECOOKIE) + +post-merge: + @# This is needed because the substitutions from pax args do not change the + @# contents of the symlink + rm -f $(PKGROOT)$(libdir)/libneon-feature.so.27 + ln -s libneon-feature.so.27.2.5 $(PKGROOT)$(libdir)/libneon-feature.so.27 + rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27 + ln -s libneon-feature.so.27.2.5 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27 Modified: csw/mgar/pkg/libneon29/trunk/checksums =================================================================== --- csw/mgar/pkg/libneon29/trunk/checksums 2011-04-27 13:02:42 UTC (rev 14417) +++ csw/mgar/pkg/libneon29/trunk/checksums 2011-04-27 13:09:09 UTC (rev 14418) @@ -1 +1,2 @@ +608826974d5644ee7967a713fa72cf36 COPYING ff369e69ef0f0143beb5626164e87ae2 neon-0.29.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 27 15:23:14 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 27 Apr 2011 13:23:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14419] csw/mgar/pkg Message-ID: Revision: 14419 http://gar.svn.sourceforge.net/gar/?rev=14419&view=rev Author: dmichelsen Date: 2011-04-27 13:23:13 +0000 (Wed, 27 Apr 2011) Log Message: ----------- libneon27: Adjust directory name from wrong libneon29 Added Paths: ----------- csw/mgar/pkg/libneon27/ csw/mgar/pkg/libneon27/trunk/Makefile csw/mgar/pkg/libneon27/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libneon27/trunk/Makefile csw/mgar/pkg/libneon27/trunk/checksums csw/mgar/pkg/libneon29/ Deleted: csw/mgar/pkg/libneon27/trunk/Makefile =================================================================== --- csw/mgar/pkg/libneon29/trunk/Makefile 2011-04-27 02:40:46 UTC (rev 14409) +++ csw/mgar/pkg/libneon27/trunk/Makefile 2011-04-27 13:23:13 UTC (rev 14419) @@ -1,30 +0,0 @@ -NAME = neon29 -VERSION = 0.29.5 -DISTNAME = neon-$(VERSION) -CATEGORIES = lib - -DESCRIPTION = Neon HTTP and WebDAV client library -define BLURB - neon is an HTTP and WebDAV client library for Unix systems, with a C language - API. It provides high-level interfaces to HTTP/1.1 and WebDAV methods, and a - low-level interface to HTTP request/response handling, allowing new methods to - be easily implemented. -endef - -MASTER_SITES = http://www.webdav.org/neon/ -DISTFILES = $(DISTNAME).tar.gz - -DEP_PKGS = CSWexpat CSWosslrt CSWzlib CSWggettextrt CSWpakchois CSWlibproxy CSWkrb5lib - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(DISTNAME)-(\d+(?:\.\d+)*).tar.gz - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-shared --disable-static -CONFIGURE_ARGS += --with-ssl=openssl -CONFIGURE_ARGS += --with-expat -CONFIGURE_ARGS = --with-libproxy --with-packchois - -TEST_TARGET = check - -include gar/category.mk Copied: csw/mgar/pkg/libneon27/trunk/Makefile (from rev 14418, csw/mgar/pkg/libneon29/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libneon27/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libneon27/trunk/Makefile 2011-04-27 13:23:13 UTC (rev 14419) @@ -0,0 +1,134 @@ +NAME = neon +VERSION = 0.29.5 +CATEGORIES = lib + +EXTRA_MODULATORS = FEATURES +MODULATIONS_FEATURES = minimal full + +DESCRIPTION = Neon HTTP and WebDAV client library +define BLURB + neon is an HTTP and WebDAV client library for Unix systems, with a C language + API. It provides high-level interfaces to HTTP/1.1 and WebDAV methods, and a + low-level interface to HTTP request/response handling, allowing new methods to + be easily implemented. +endef + +MASTER_SITES = http://www.webdav.org/$(NAME)/ +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += COPYING + +FOREIGN_PACKAGES += CSWlibneon26 +OBSOLETED_BY_CSWlibneon26 = CSWneon + +FOREIGN_PACKAGES += CSWlibneon26-feature +OBSOLETED_BY_CSWlibneon26-feature = CSWneonfull + +PACKAGES += CSWlibneon27 +CATALOGNAME_CSWlibneon27 = libneon27 +SPKG_DESC_CSWlibneon27 = Neon HTTP and WebDAV client library, libneon.so.27 +PKGFILES_CSWlibneon27 += $(call pkgfiles_lib,libneon.so.27) +PKGFILES_CSWlibneon27 += $(sharedstatedir)/locale/.* +RUNTIME_DEP_PKGS_CSWlibneon27 += CSWexpat +RUNTIME_DEP_PKGS_CSWlibneon27 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibneon27 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibneon27 += CSWlibintl8 +OBSOLETED_BY_CSWlibneon27 = CSWneon + +PACKAGES += CSWlibneon27-feature +CATALOGNAME_CSWlibneon27_feature = libneon27_feature +SPKG_DESC_CSWlibneon27-feature = Neon HTTP and WebDAV client library with all features enabled, supersedes libneon.so.27 +PKGFILES_CSWlibneon27-feature += $(call pkgfiles_lib,libneon-feature.so.27) +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibneon27 +CHECKPKG_OVERRIDES_CSWlibneon27-feature += surplus-dependency|CSWlibneon27 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWexpat +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWzlib +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWkrb5lib +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWpakchois +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibproxy +OBSOLETED_BY_CSWlibneon27-feature = CSWneonfull + +PACKAGES += CSWlibneon-dev +CATALOGNAME_CSWlibneon-dev = libneon_dev +SPKG_DESC_CSWlibneon-dev = Development files for libneon.so.27 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibneon-dev += CSWlibneon27 +OBSOLETED_BY_CSWlibneon-dev = CSWneon-devel + +# This describes the defaults during configure +CHECKPKG_OVERRIDES_CSWlibneon-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/neon/html/using.html + +# This comes from krb5-config --libs +CHECKPKG_OVERRIDES_CSWlibneon27-feature += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libneon-feature.so.27.2.5 + +# These are artifacts of the feature lib being a regular one. +# As it is never linked against the soname doesn't matter here and the package name +# is obviously different from the soname in this case. +CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.2.5 +CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.2.5 +CHECKPKG_OVERRIDES_CSWlibneon27-feature += shared-lib-pkgname-mismatch|sonames=libneon.so.27|pkgname=CSWlibneon27-feature|expected=CSWlibneon27| + +# These will go away after release +CHECKPKG_OVERRIDES_CSWlibneon27 += file-collision|/opt/csw/lib/libneon.so.27|CSWlibneon27|CSWneon +CHECKPKG_OVERRIDES_CSWlibneon27 += file-collision|/opt/csw/lib/sparcv9/libneon.so.27|CSWlibneon27|CSWneon + +BUILD_DEP_PKGS = CSWossldevel + +CONFIGURE_ARGS_features-minimal = --without-libproxy --without-pakchois --without-gssapi +CONFIGURE_ARGS_features-full = --with-libproxy --with-packchois + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared --enable-static +CONFIGURE_ARGS += --with-ssl=openssl +CONFIGURE_ARGS += --with-expat +CONFIGURE_ARGS += $(CONFIGURE_ARGS_features-$(FEATURES)) + +BUILD64 = 1 + +# Tests fail, investigate later +SKIPTEST ?= 1 + +# Make sure to use a defined timezone or tests may fail +# TEST_OVERRIDE_VARS = TZ +# TEST_OVERRIDE_VAR_TZ = GMT + +# Omit version number suffix on docdir +INSTALL_OVERRIDE_VARS = docdir +INSTALL_OVERRIDE_VAR_docdir = $(datadir)/doc/neon + +# We select pkgconfig for minimal library bindings. As libneon is self-contained (links +# to all necessary libs directly) the full version can simly be linked in. +EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,," +EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES)) + +EXTRA_PAX_ARGS_isa-sparcv8-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libneon\)\(\.so\.\d+\..*\),\1-feature\2,p" +EXTRA_PAX_ARGS_isa-i386-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libneon\)\(\.so\.\d+\..*\),\1-feature\2,p" +EXTRA_PAX_ARGS_isa-sparcv9-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\.$(libdir)/libneon\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libneon-feature\1,p" +EXTRA_PAX_ARGS_isa-amd64-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\.$(libdir)/libneon\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libneon-feature\1,p" + +MERGE_SCRIPTS_isa-default-features-minimal = copy-all +MERGE_SCRIPTS_isa-default64-features-minimal = copy-relocated-only +MERGE_DIRS_isa-default64-features-minimal = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-features-full = copy-only +MERGE_DIRS_isa-default-features-full = $(libdir) +MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only +MERGE_DIRS_isa-default64-features-full = $(libdir) + +EXTRA_LINKER_FLAGS = -lintl + +include gar/category.mk + +post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: EXTRA_LD_OPTIONS = -f libneon-feature.so.27 +post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: + rm -f $(WORKSRC)/src/libneon.la + $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(WORKSRC) $(BUILD_ARGS) + @$(MAKECOOKIE) + +post-merge: + @# This is needed because the substitutions from pax args do not change the + @# contents of the symlink + rm -f $(PKGROOT)$(libdir)/libneon-feature.so.27 + ln -s libneon-feature.so.27.2.5 $(PKGROOT)$(libdir)/libneon-feature.so.27 + rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27 + ln -s libneon-feature.so.27.2.5 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27 Deleted: csw/mgar/pkg/libneon27/trunk/checksums =================================================================== --- csw/mgar/pkg/libneon29/trunk/checksums 2011-04-27 02:40:46 UTC (rev 14409) +++ csw/mgar/pkg/libneon27/trunk/checksums 2011-04-27 13:23:13 UTC (rev 14419) @@ -1 +0,0 @@ -ff369e69ef0f0143beb5626164e87ae2 neon-0.29.5.tar.gz Copied: csw/mgar/pkg/libneon27/trunk/checksums (from rev 14418, csw/mgar/pkg/libneon29/trunk/checksums) =================================================================== --- csw/mgar/pkg/libneon27/trunk/checksums (rev 0) +++ csw/mgar/pkg/libneon27/trunk/checksums 2011-04-27 13:23:13 UTC (rev 14419) @@ -0,0 +1,2 @@ +608826974d5644ee7967a713fa72cf36 COPYING +ff369e69ef0f0143beb5626164e87ae2 neon-0.29.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 27 17:28:31 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 27 Apr 2011 15:28:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14420] csw/mgar/pkg/libneon27/trunk/Makefile Message-ID: Revision: 14420 http://gar.svn.sourceforge.net/gar/?rev=14420&view=rev Author: dmichelsen Date: 2011-04-27 15:28:31 +0000 (Wed, 27 Apr 2011) Log Message: ----------- libneon27: Fix problematic override Modified Paths: -------------- csw/mgar/pkg/libneon27/trunk/Makefile Modified: csw/mgar/pkg/libneon27/trunk/Makefile =================================================================== --- csw/mgar/pkg/libneon27/trunk/Makefile 2011-04-27 13:23:13 UTC (rev 14419) +++ csw/mgar/pkg/libneon27/trunk/Makefile 2011-04-27 15:28:31 UTC (rev 14420) @@ -67,7 +67,7 @@ # is obviously different from the soname in this case. CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.2.5 CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.2.5 -CHECKPKG_OVERRIDES_CSWlibneon27-feature += shared-lib-pkgname-mismatch|sonames=libneon.so.27|pkgname=CSWlibneon27-feature|expected=CSWlibneon27| +CHECKPKG_OVERRIDES_CSWlibneon27-feature += shared-lib-pkgname-mismatch # These will go away after release CHECKPKG_OVERRIDES_CSWlibneon27 += file-collision|/opt/csw/lib/libneon.so.27|CSWlibneon27|CSWneon 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 Apr 27 17:29:04 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 27 Apr 2011 15:29:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[14421] csw/mgar/pkg/libneon26/trunk/Makefile Message-ID: Revision: 14421 http://gar.svn.sourceforge.net/gar/?rev=14421&view=rev Author: dmichelsen Date: 2011-04-27 15:29:03 +0000 (Wed, 27 Apr 2011) Log Message: ----------- libneon26: Fix problematic overrides Modified Paths: -------------- csw/mgar/pkg/libneon26/trunk/Makefile Modified: csw/mgar/pkg/libneon26/trunk/Makefile =================================================================== --- csw/mgar/pkg/libneon26/trunk/Makefile 2011-04-27 15:28:31 UTC (rev 14420) +++ csw/mgar/pkg/libneon26/trunk/Makefile 2011-04-27 15:29:03 UTC (rev 14421) @@ -29,6 +29,10 @@ RUNTIME_DEP_PKGS_CSWlibneon26 += CSWzlib RUNTIME_DEP_PKGS_CSWlibneon26 += CSWlibintl8 +# These will go away later +CHECKPKG_OVERRIDES_CSWlibneon26 += unidentified-dependency|CSWlibneon27 +CHECKPKG_OVERRIDES_CSWlibneon26 += file-collision|/opt/csw/lib/amd64/libneon.so.26|CSWlibneon26|CSWneon + PACKAGES += CSWlibneon26-feature CATALOGNAME_CSWlibneon26_feature = libneon26_feature SPKG_DESC_CSWlibneon26-feature = Neon HTTP and WebDAV client library with all features enabled, supersedes libneon.so.26 @@ -49,7 +53,7 @@ # is obviously different from the soname in this case. CHECKPKG_OVERRIDES_CSWlibneon26-feature += soname-not-part-of-filename|soname=libneon.so.26|filename=libneon-feature.so.26.0.4 CHECKPKG_OVERRIDES_CSWlibneon26-feature += soname-not-part-of-filename|soname=libneon.so.26|filename=libneon-feature.so.26.0.4 -CHECKPKG_OVERRIDES_CSWlibneon26-feature += shared-lib-pkgname-mismatch|sonames=libneon.so.26|pkgname=CSWlibneon26-feature|expected=CSWlibneon26| +CHECKPKG_OVERRIDES_CSWlibneon26-feature += shared-lib-pkgname-mismatch # These will go away after release CHECKPKG_OVERRIDES_CSWlibneon26 += file-collision|/opt/csw/lib/libneon.so.26|CSWlibneon26|CSWneon 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 Apr 27 21:25:11 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 27 Apr 2011 19:25:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[14422] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14422 http://gar.svn.sourceforge.net/gar/?rev=14422&view=rev Author: bdwalton Date: 2011-04-27 19:25:11 +0000 (Wed, 27 Apr 2011) Log Message: ----------- bacula/trunk: hardcode default passwords so that template configs remain more static across upgrades Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-27 15:29:03 UTC (rev 14421) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-27 19:25:11 UTC (rev 14422) @@ -197,6 +197,13 @@ CONFIGURE_ARGS += --with-pid-dir=$(localstatedir)/run CONFIGURE_ARGS += --with-subsys-dir=$(localstatedir)/run/subsys CONFIGURE_ARGS += --enable-tray-monitor +# we add these so that our template configs change less over time +CONFIGURE_ARGS += --with-dir-password=S4B2ZIN1kBli3AtC0yPR7Iaw7EiIVCOsI9IOSF7HucND +CONFIGURE_ARGS += --with-fd-password=iUXtIn91oqxXhUHw9UmmdePGRaKn8aRXX8oX2e02BwCL +CONFIGURE_ARGS += --with-sd-password=h6F8l+Vkp8eiJpZclqqA/bpLD71bP8S+vMG01qxXzlrX +CONFIGURE_ARGS += --with-mon-dir-password=QhTqgNyq8s6l7RJc/+3NmVqQkyxkqlnaJLPwsZF7fXUp +CONFIGURE_ARGS += --with-mon-fd-password=IEKXaPXrRO8BzJYBJueDJgkVsXzR/1cVvPNGJhZPrsHB +CONFIGURE_ARGS += --with-mon-sd-password=e5fbjZnW+1hohTYFBfTXFe1KP7BIgCrAvY4fA4fg39TN EXTRA_INC += $(includedir)/ncursesw EXTRA_LIB += $(prefix)/lib/ncursesw $(prefix)/mysql5/lib/mysql 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 Apr 27 22:02:32 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 27 Apr 2011 20:02:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[14423] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14423 http://gar.svn.sourceforge.net/gar/?rev=14423&view=rev Author: bdwalton Date: 2011-04-27 20:02:31 +0000 (Wed, 27 Apr 2011) Log Message: ----------- fix typo in migrate_files setup Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-27 19:25:11 UTC (rev 14422) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-27 20:02:31 UTC (rev 14423) @@ -217,7 +217,7 @@ MIGRATE_FILES_CSWbacula-director = "query.sql bacula-dir.conf" MIGRATE_FILES_CSWbacula-sd = "mtx-changer.conf bacula-sd.conf" -MIGRATE_FILES_CSWbacula-sd = "bacula-fd.conf" +MIGRATE_FILES_CSWbacula-sd = "bacula-sd.conf" MIGRATE_FILES_CSWbacula-console = "bconsole.conf" MIGRATE_FILES_CSWbacula-tray-monitor = "tray-monitor.conf" MIGRATE_SOURCE_DIR = /opt/csw/etc/bacula 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 Apr 28 01:11:43 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 27 Apr 2011 23:11:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14424] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14424 http://gar.svn.sourceforge.net/gar/?rev=14424&view=rev Author: bdwalton Date: 2011-04-27 23:11:42 +0000 (Wed, 27 Apr 2011) Log Message: ----------- php5/trunk: drop extra slash from PRESERVECONF that was breaking the php.ini templating Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-27 20:02:31 UTC (rev 14423) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-27 23:11:42 UTC (rev 14424) @@ -64,7 +64,7 @@ # of sqlite... BUILD_DEP_PKGS += CSWsqlite -PRESERVECONF = /etc/$(prefix)/php5/php.ini +PRESERVECONF = /etc$(prefix)/php5/php.ini MIGRATE_FILES_CSWphp5 = "php.ini" MIGRATE_SOURCE_DIR = /opt/csw/php5/lib MIGRATE_DEST_DIR = $(sysconfdir) 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 Apr 28 02:14:08 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Apr 2011 00:14:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14425] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14425 http://gar.svn.sourceforge.net/gar/?rev=14425&view=rev Author: bdwalton Date: 2011-04-28 00:14:08 +0000 (Thu, 28 Apr 2011) Log Message: ----------- php5/trunk: drop legacy pear.conf install; add preserveconf and migrate files support for pear.conf Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-27 23:11:42 UTC (rev 14424) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-28 00:14:08 UTC (rev 14425) @@ -64,9 +64,10 @@ # of sqlite... BUILD_DEP_PKGS += CSWsqlite -PRESERVECONF = /etc$(prefix)/php5/php.ini -MIGRATE_FILES_CSWphp5 = "php.ini" -MIGRATE_SOURCE_DIR = /opt/csw/php5/lib +PRESERVECONF = /etc$(prefix)/php5/php.ini /etc$(prefix)/php5/pear.conf +MIGRATE_FILES_CSWphp5 = "php.ini pear.conf" +MIGRATE_SOURCE_DIR_php_ini = /opt/csw/php5/lib +MIGRATE_SOURCE_DIR_pear_conf = /opt/csw/php5/etc MIGRATE_DEST_DIR = $(sysconfdir) define php5_subpackage @@ -333,7 +334,3 @@ @rm -rf $(DESTDIR)/.cha* $(DESTDIR)/.dep* $(DESTDIR)/.reg* $(DESTDIR)/.l* $(DESTDIR)/.f* @$(MAKECOOKIE) -install-extras: - gmv $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf.CSW - @$(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 Thu Apr 28 02:39:23 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Apr 2011 00:39:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[14426] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14426 http://gar.svn.sourceforge.net/gar/?rev=14426&view=rev Author: bdwalton Date: 2011-04-28 00:39:23 +0000 (Thu, 28 Apr 2011) Log Message: ----------- php5/trunk: strip proxy info out of default pear.conf Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-28 00:14:08 UTC (rev 14425) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-28 00:39:23 UTC (rev 14426) @@ -332,5 +332,6 @@ @ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(prefix)/php5/bin/ @perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST) @rm -rf $(DESTDIR)/.cha* $(DESTDIR)/.dep* $(DESTDIR)/.reg* $(DESTDIR)/.l* $(DESTDIR)/.f* + @perl -pi -e 's!s:17:"http://proxy:3128!s:0:"!' $(DESTDIR)$(sysconfdir)/pear.conf* @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 28 09:39:26 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Apr 2011 07:39:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[14427] csw/mgar/pkg/pbzip2/trunk Message-ID: Revision: 14427 http://gar.svn.sourceforge.net/gar/?rev=14427&view=rev Author: dmichelsen Date: 2011-04-28 07:39:25 +0000 (Thu, 28 Apr 2011) Log Message: ----------- pbzip2: Update to 1.1.4 Modified Paths: -------------- csw/mgar/pkg/pbzip2/trunk/Makefile csw/mgar/pkg/pbzip2/trunk/checksums Modified: csw/mgar/pkg/pbzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pbzip2/trunk/Makefile 2011-04-28 00:39:23 UTC (rev 14426) +++ csw/mgar/pkg/pbzip2/trunk/Makefile 2011-04-28 07:39:25 UTC (rev 14427) @@ -1,5 +1,5 @@ NAME = pbzip2 -VERSION = 1.1.3 +VERSION = 1.1.4 CATEGORIES = utils DESCRIPTION = Parallel BZIP2 Data Compression Software Modified: csw/mgar/pkg/pbzip2/trunk/checksums =================================================================== --- csw/mgar/pkg/pbzip2/trunk/checksums 2011-04-28 00:39:23 UTC (rev 14426) +++ csw/mgar/pkg/pbzip2/trunk/checksums 2011-04-28 07:39:25 UTC (rev 14427) @@ -1 +1 @@ -beb27a8055723f5f84364182d137ed1a pbzip2-1.1.3.tar.gz +797e3ae5c6293a55e3e97fefb11cf494 pbzip2-1.1.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 Thu Apr 28 10:26:26 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Apr 2011 08:26:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[14428] csw/mgar/pkg/awstats/trunk Message-ID: Revision: 14428 http://gar.svn.sourceforge.net/gar/?rev=14428&view=rev Author: dmichelsen Date: 2011-04-28 08:26:25 +0000 (Thu, 28 Apr 2011) Log Message: ----------- awstats: Update to 7.0, general rework Modified Paths: -------------- csw/mgar/pkg/awstats/trunk/Makefile csw/mgar/pkg/awstats/trunk/checksums Added Paths: ----------- csw/mgar/pkg/awstats/trunk/files/0001-Adjust-pathes-for-OpenCSW.patch csw/mgar/pkg/awstats/trunk/files/CSWawstats.postmsg Removed Paths: ------------- csw/mgar/pkg/awstats/trunk/files/CSWawstats.postinstall csw/mgar/pkg/awstats/trunk/files/patch-configdir.diff Modified: csw/mgar/pkg/awstats/trunk/Makefile =================================================================== --- csw/mgar/pkg/awstats/trunk/Makefile 2011-04-28 07:39:25 UTC (rev 14427) +++ csw/mgar/pkg/awstats/trunk/Makefile 2011-04-28 08:26:25 UTC (rev 14428) @@ -1,5 +1,5 @@ NAME = awstats -VERSION = 6.9 +VERSION = 7.0 CATEGORIES = apps DESCRIPTION = Featureful tool for web, ftp and mail server statistics @@ -15,22 +15,43 @@ endef MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += CSWawstats.postinstall +DISTFILES += $(DISTNAME).tar.gz +DISTFILES += CSWawstats.postmsg +PATCHFILES += 0001-Adjust-pathes-for-OpenCSW.patch -PATCHFILES = patch-configdir.diff +PACKAGES += CSWawstats +CATALOGNAME_CSWawstats = awstats +SPKG_DESC_CSWawstats = Featureful tool for web, ftp and mail server statistics +RUNTIME_DEP_PKGS_CSWawstats += CSWperl +ARCHALL_CSWawstats = 1 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +# These are documentation files, ignore for now +CHECKPKG_OVERRIDES_CSWawstats += file-with-bad-content|/usr/local|root/opt/csw/share/doc/awstats/awstats_setup.html +CHECKPKG_OVERRIDES_CSWawstats += file-with-bad-content|/usr/local|root/opt/csw/share/doc/awstats/awstats_faq.html +CHECKPKG_OVERRIDES_CSWawstats += file-with-bad-content|/usr/local|root/opt/csw/share/doc/awstats/awstats_contrib.html +CHECKPKG_OVERRIDES_CSWawstats += file-with-bad-content|/usr/local|root/opt/csw/share/doc/awstats/awstats_webmin.html +CHECKPKG_OVERRIDES_CSWawstats += file-with-bad-content|/usr/local|root/opt/csw/share/doc/awstats/awstats_changelog.txt -# 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 = +# Only in comments, patches by 0001 +CHECKPKG_OVERRIDES_CSWawstats += file-with-bad-content|/usr/local|root/opt/csw/share/www/awstats/cgi-bin/awstats.pl -SPKG_SOURCEURL = http://awstats.sourceforge.net +# These are all comments, I patched all important occurrences +CHECKPKG_OVERRIDES_CSWawstats += file-with-bad-content|/usr/local|root/etc/opt/csw/awstats.conf.CSW +CHECKPKG_OVERRIDES_CSWawstats += file-with-bad-content|/usr/local|root/opt/csw/share/awstats/awstats_buildstaticpages.pl +CHECKPKG_OVERRIDES_CSWawstats += file-with-bad-content|/usr/local|root/opt/csw/share/awstats/awstats_configure.pl +CHECKPKG_OVERRIDES_CSWawstats += file-with-bad-content|/usr/local|root/opt/csw/share/awstats/geoip_generator.pl +CHECKPKG_OVERRIDES_CSWawstats += file-with-bad-content|/usr/local|root/opt/csw/share/awstats/webmin/awstats-1.9.wbm +CHECKPKG_OVERRIDES_CSWawstats += file-with-bad-content|/usr/share|root/etc/opt/csw/awstats.conf.CSW +CHECKPKG_OVERRIDES_CSWawstats += file-with-bad-content|/usr/share|root/opt/csw/share/www/awstats/cgi-bin/awstats.pl +CHECKPKG_OVERRIDES_CSWawstats += file-with-bad-content|/usr/share|root/opt/csw/share/www/awstats/cgi-bin/plugins/tooltips.pm +CHECKPKG_OVERRIDES_CSWawstats += file-with-bad-content|/usr/share|root/opt/csw/share/awstats/awstats_exportlib.pl +CHECKPKG_OVERRIDES_CSWawstats += file-with-bad-content|/usr/share|root/opt/csw/share/doc/awstats/awstats_config.html -RUNTIME_DEP_PKGS = CSWapache2 CSWperl +# awstats is pretty generic, do not directly depend +CHECKPKG_OVERRIDES_CSWawstats += missing-dependency|CSWapache2 +VENDOR_URL = http://awstats.sourceforge.net + LICENSE = docs/LICENSE.TXT CONFIGURE_SCRIPTS = @@ -38,11 +59,9 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -PRESERVECONF = $(prefix)/apache2/etc/extra/httpd-awstats.conf.CSW -PRESERVECONF += $(sysconfdir)/awstats.conf.CSW +PRESERVECONF = $(prefix)/apache2/etc/extra/httpd-awstats.conf +PRESERVECONF += $(sysconfdir)/awstats.conf -ARCHALL = 1 - include gar/category.mk install-custom: @@ -61,20 +80,20 @@ $(DESTDIR)$(sharedstatedir)/www/awstats/cgi-bin/ ginstall -d $(DESTDIR)$(sysconfdir)/awstats/ - cat $(WORKSRC)/tools/wwwroot/cgi-bin/awstats.model.conf | perl -p -e '\ - s!/var/log/httpd/mylog.log!/var/opt/csw/awstats!; - '> $(DESTDIR)$(sysconfdir)/awstats.conf.CSW + cat $(WORKSRC)/wwwroot/cgi-bin/awstats.model.conf | perl -p \ + -e 's!/var/log/httpd/mylog.log!/var/opt/csw/awstats/awstats.log!;' \ + > $(DESTDIR)$(sysconfdir)/awstats.conf rm -f $(DESTDIR)$(sharedstatedir)/www/awstats/cgi-bin/awstats.model.conf ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra/ - cat $(WORKSRC)/tools/httpd_conf | perl -p -e '\ - s!/usr/local/awstats/wwwroot/cgi-bin/!$(sharedstatedir)/www/awstats/cgi-bin/!; \ - s!/usr/local/awstats/wwwroot/!$(sharedstatedir)/www/awstats/htdocs/!; \ - s!/usr/local/awstats/wwwroot!$(sharedstatedir)/www/awstats/htdocs!; \ - '> $(DESTDIR)$(prefix)/apache2/etc/extra/httpd-awstats.conf.CSW + cat $(WORKSRC)/tools/httpd_conf | perl -p \ + -e 's!/usr/local/awstats/wwwroot/cgi-bin/!$(sharedstatedir)/www/awstats/cgi-bin/!;' \ + -e 's!/usr/local/awstats/wwwroot/!$(sharedstatedir)/www/awstats/htdocs/!;' \ + -e 's!/usr/local/awstats/wwwroot!$(sharedstatedir)/www/awstats/htdocs!;' \ + -e 's!/usr/local/awstats/!$(sharedstatedir)/www/awstats/!;' \ + > $(DESTDIR)$(prefix)/apache2/etc/extra/httpd-awstats.conf rm -f $(DESTDIR)$(sharedstatedir)/awstats/httpd_conf - @$(MAKECOOKIE) -# ./awstats_updateall.pl now -awstatsprog=/opt/csw/share/www/awstats/cgi-bin/awstats.pl -configdir=/opt/csw/etc +# ./awstats_updateall.pl now -awstatsprog=/opt/csw/share/www/awstats/cgi-bin/awstats.pl -configdir=/etc/opt/csw Modified: csw/mgar/pkg/awstats/trunk/checksums =================================================================== --- csw/mgar/pkg/awstats/trunk/checksums 2011-04-28 07:39:25 UTC (rev 14427) +++ csw/mgar/pkg/awstats/trunk/checksums 2011-04-28 08:26:25 UTC (rev 14428) @@ -1,3 +1 @@ -a6ae0f8a42dd10e41957c29ac78bbc18 download/CSWawstats.postinstall -fc19dbb8449eccf3300efb30ca3376cb download/awstats-6.9.tar.gz -068ec2e8ef85b3fe8182b656ca4d8e6c download/patch-configdir.diff +3e8e09b9ebe74513bb34290dbcd37b45 awstats-7.0.tar.gz Added: csw/mgar/pkg/awstats/trunk/files/0001-Adjust-pathes-for-OpenCSW.patch =================================================================== --- csw/mgar/pkg/awstats/trunk/files/0001-Adjust-pathes-for-OpenCSW.patch (rev 0) +++ csw/mgar/pkg/awstats/trunk/files/0001-Adjust-pathes-for-OpenCSW.patch 2011-04-28 08:26:25 UTC (rev 14428) @@ -0,0 +1,176 @@ +From 1f539c2b1c30e35f63bfa05b4962b64536554195 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 28 Apr 2011 10:16:33 +0200 +Subject: [PATCH] Adjust pathes for OpenCSW + +--- + tools/awstats_buildstaticpages.pl | 10 +++++----- + tools/awstats_exportlib.pl | 3 ++- + tools/awstats_updateall.pl | 4 ++-- + tools/geoip_generator.pl | 2 +- + wwwroot/cgi-bin/awstats.pl | 19 +++++++++---------- + wwwroot/cgi-bin/plugins/tooltips.pm | 3 ++- + 6 files changed, 21 insertions(+), 20 deletions(-) + +diff --git a/tools/awstats_buildstaticpages.pl b/tools/awstats_buildstaticpages.pl +index 2c9d115..e12ca58 100755 +--- a/tools/awstats_buildstaticpages.pl ++++ b/tools/awstats_buildstaticpages.pl +@@ -138,7 +138,7 @@ sub Read_Config { + my @PossibleConfigDir=(); + + if ($configdir) { @PossibleConfigDir=("$configdir"); } +- else { @PossibleConfigDir=("$AwstatsDir","$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); } ++ else { @PossibleConfigDir=("$AwstatsDir","$DIR","/etc/opt/csw","/opt/csw/etc"); } + + # Open config file + $FileConfig=$FileSuffix=''; +@@ -307,8 +307,8 @@ my $retour; + # Check if AWSTATS prog is found + my $AwstatsFound=0; + if (-s "$Awstats") { $AwstatsFound=1; } +-elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") { +- $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl"; ++elsif (-s "/opt/csw/share/www/awstats/cgi-bin/awstats.pl") { ++ $Awstats="/opt/csw/share/www/awstats/cgi-bin/awstats.pl"; + $AwstatsFound=1; + } + if (! $AwstatsFound) { +@@ -322,8 +322,8 @@ debug("AwstatsDir=$AwstatsDir"); + if ($BuildPDF) { + my $HtmlDocFound=0; + if (-x "$HtmlDoc") { $HtmlDocFound=1; } +- elsif (-x "/usr/bin/htmldoc") { +- $HtmlDoc='/usr/bin/htmldoc'; ++ elsif (-x "/opt/csw/bin/htmldoc") { ++ $HtmlDoc='/opt/csw/bin/htmldoc'; + $HtmlDocFound=1; + } + if (! $HtmlDocFound) { +diff --git a/tools/awstats_exportlib.pl b/tools/awstats_exportlib.pl +index 426cf55..49183a4 100755 +--- a/tools/awstats_exportlib.pl ++++ b/tools/awstats_exportlib.pl +@@ -133,12 +133,13 @@ sub Read_Ref_Data { + # Windows : "${DIR}lib" (lib in same dir than awstats.pl) + # Debian package : "/usr/share/awstats/lib" + # Other possible directories : "./lib" ++ # OpenCSW package: "/opt/csw/share/www/awstats/cgi-bin/lib" + my $lib=shift; + my $dir=$lib; + $lib=~ s/^.*[\\\/]//; + $dir =~ s/[^\\\/]+$//; $dir =~ s/[\\\/]+$//; + debug("Lib: $lib, Dir: $dir"); +- my @PossibleLibDir=("$dir","{DIR}lib","/usr/share/awstats/lib","./lib"); ++ my @PossibleLibDir=("$dir","/opt/csw/share/www/awstats/cgi-bin/lib"); + + my %FilePath=(); + my @FileListToLoad=(); +diff --git a/tools/awstats_updateall.pl b/tools/awstats_updateall.pl +index 569b03e..7fdcd81 100755 +--- a/tools/awstats_updateall.pl ++++ b/tools/awstats_updateall.pl +@@ -130,8 +130,8 @@ if (@files) { + # Check if AWSTATS prog is found + my $AwstatsFound=0; + if (-s "$Awstats") { $AwstatsFound=1; } +- elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") { +- $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl"; ++ elsif (-s "/opt/csw/share/www/awstats/cgi-bin/awstats.pl") { ++ $Awstats="/opt/csw/share/www/awstats/cgi-bin/awstats.pl"; + $AwstatsFound=1; + } + if (! $AwstatsFound) { +diff --git a/tools/geoip_generator.pl b/tools/geoip_generator.pl +index 4b9c02d..7f7847b 100755 +--- a/tools/geoip_generator.pl ++++ b/tools/geoip_generator.pl +@@ -136,7 +136,7 @@ sub Read_Config { + # if an output was specified, then skip this + if (!($Output eq '')){return;} + if ($configdir) { @PossibleConfigDir=("$configdir"); } +- else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); } ++ else { @PossibleConfigDir=("$DIR","/etc/opt/csw","/opt/csw/etc"); } + + # Open config file + $FileConfig=$FileSuffix=''; +diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl +index bae9db6..2d243a2 100755 +--- a/wwwroot/cgi-bin/awstats.pl ++++ b/wwwroot/cgi-bin/awstats.pl +@@ -1709,12 +1709,11 @@ sub Read_Config { + # Standard, Mandrake and Debian package : "/etc/awstats" + # Other possible directories : "/usr/local/etc/awstats", "/etc" + # FHS standard, Suse package : "/etc/opt/awstats" ++ # OpenCSW package: "/etc/opt/csw", "/opt/csw/etc" + my $configdir = shift; + my @PossibleConfigDir = ( + "$DIR", +- "/etc/awstats", +- "/usr/local/etc/awstats", "/etc", +- "/etc/opt/awstats" ++ "/etc/opt/csw", "/opt/csw/etc", + ); + + if ($configdir) { +@@ -2160,7 +2159,8 @@ sub Read_Ref_Data { + # Check lib files in common possible directories : + # Windows and standard package: "$DIR/lib" (lib in same dir than awstats.pl) + # Debian package: "/usr/share/awstats/lib" +- my @PossibleLibDir = ( "$DIR/lib", "/usr/share/awstats/lib" ); ++# OpenCSW package: "/opt/csw/share/www/awstats/cgi-bin/lib" ++ my @PossibleLibDir = ( "/opt/csw/share/www/awstats/cgi-bin/lib" ); + my %FilePath = (); + my %DirAddedInINC = (); + my @FileListToLoad = (); +@@ -2296,8 +2296,9 @@ sub Read_Language_Data { + # Check lang files in common possible directories : + # Windows and standard package: "$DIR/lang" (lang in same dir than awstats.pl) + # Debian package : "/usr/share/awstats/lang" ++# OpenCSW package: "/opt/csw/share/www/awstats/cgi-bin/lang" + my @PossibleLangDir = +- ( "$DirLang", "$DIR/lang", "/usr/share/awstats/lang" ); ++ ( "$DirLang", "/opt/csw/share/www/awstats/cgi-bin/lang" ); + + my $FileLang = ''; + foreach (@PossibleLangDir) { +@@ -3047,10 +3048,9 @@ sub Read_Plugins { + # Windows and standard package: "$DIR/plugins" (plugins in same dir than awstats.pl) + # Redhat : "/usr/local/awstats/wwwroot/cgi-bin/plugins" + # Debian package : "/usr/share/awstats/plugins" ++# OpenCSW package: "/opt/csw/share/www/awstats/cgi-bin/plugins" + my @PossiblePluginsDir = ( +- "$DIR/plugins", +- "/usr/local/awstats/wwwroot/cgi-bin/plugins", +- "/usr/share/awstats/plugins" ++ "/opt/csw/share/www/awstats/cgi-bin/plugins", + ); + my %DirAddedInINC = (); + +@@ -8476,8 +8476,7 @@ sub PrintCLIHelp{ + print + " Note 1: Config files ($PROG.virtualhostname.conf or $PROG.conf) must be\n"; + print +-" in /etc/awstats, /usr/local/etc/awstats, /etc or same directory than\n"; +- print " awstats.pl script file.\n"; ++" in /etc/opt/csw or /opt/csw/etc\n"; + print + " Note 2: If AWSTATS_FORCE_CONFIG environment variable is defined, AWStats will\n"; + print +diff --git a/wwwroot/cgi-bin/plugins/tooltips.pm b/wwwroot/cgi-bin/plugins/tooltips.pm +index 70215f6..cf6aff6 100755 +--- a/wwwroot/cgi-bin/plugins/tooltips.pm ++++ b/wwwroot/cgi-bin/plugins/tooltips.pm +@@ -166,7 +166,8 @@ sub _ReadAndOutputTooltipFile { + # Windows and standard package: "$DIR/lang" (lang in same dir than awstats.pl) + # Debian package : "/usr/share/awstats/lang" + # Other possible directories : "./lang" +- my @PossibleLangDir=("$DirLang","${DIR}/lang","/usr/share/awstats/lang","./lang"); ++ # OpenCSW package: "/opt/csw/share/www/awstats/cgi-bin/lang" ++ my @PossibleLangDir=("$DirLang","/opt/csw/share/www/awstats/cgi-bin/lang"); + + my $FileLang=''; + my $logtype=lc($LogType ne 'S'?$LogType:'W'); +-- +1.7.3.2 + Deleted: csw/mgar/pkg/awstats/trunk/files/CSWawstats.postinstall =================================================================== --- csw/mgar/pkg/awstats/trunk/files/CSWawstats.postinstall 2011-04-28 07:39:25 UTC (rev 14427) +++ csw/mgar/pkg/awstats/trunk/files/CSWawstats.postinstall 2011-04-28 08:26:25 UTC (rev 14428) @@ -1,21 +0,0 @@ -#!/bin/sh - -cat <.conf in /opt/csw/awstats/etc/. An example -configuration file exists in -/opt/csw/awstats/wwwroot/cgi-bin/awstats.model.conf. - -Additionally if you wamt Awstats accessible from your Apache webserver. Run -awstats_configure.pl. This will create a configuration file for you and added -the correct lines to your apache conf. It should be smart enough to pick up -on the correct version of apache. - -cd /opt/csw/awstats -./awstats_configure.pl - -NOTE: If you only plan on running awstats on the command line you do not need -to run awstats_configure.pl. -___________________________________________________________________________ -EOF Copied: csw/mgar/pkg/awstats/trunk/files/CSWawstats.postmsg (from rev 14409, csw/mgar/pkg/awstats/trunk/files/CSWawstats.postinstall) =================================================================== --- csw/mgar/pkg/awstats/trunk/files/CSWawstats.postmsg (rev 0) +++ csw/mgar/pkg/awstats/trunk/files/CSWawstats.postmsg 2011-04-28 08:26:25 UTC (rev 14428) @@ -0,0 +1,21 @@ +#!/bin/sh + +cat <.conf in /opt/csw/awstats/etc/. An example +configuration file exists in +/opt/csw/awstats/wwwroot/cgi-bin/awstats.model.conf. + +Additionally if you wamt Awstats accessible from your Apache webserver. Run +awstats_configure.pl. This will create a configuration file for you and added +the correct lines to your apache conf. It should be smart enough to pick up +on the correct version of apache. + +cd /opt/csw/awstats +./awstats_configure.pl + +NOTE: If you only plan on running awstats on the command line you do not need +to run awstats_configure.pl. +___________________________________________________________________________ +EOF Deleted: csw/mgar/pkg/awstats/trunk/files/patch-configdir.diff =================================================================== --- csw/mgar/pkg/awstats/trunk/files/patch-configdir.diff 2011-04-28 07:39:25 UTC (rev 14427) +++ csw/mgar/pkg/awstats/trunk/files/patch-configdir.diff 2011-04-28 08:26:25 UTC (rev 14428) @@ -1,15 +0,0 @@ -diff -Naur awstats-6.9.orig/wwwroot/cgi-bin/awstats.pl awstats-6.9.patched/wwwroot/cgi-bin/awstats.pl ---- awstats-6.9.orig/wwwroot/cgi-bin/awstats.pl 2008-11-30 16:42:46.000000000 +0100 -+++ awstats-6.9.patched/wwwroot/cgi-bin/awstats.pl 2009-07-29 19:21:45.456796688 +0200 -@@ -1642,9 +1642,8 @@ - } - else { - @PossibleConfigDir = ( -- "$DIR", "/etc/awstats", -- "/usr/local/etc/awstats", "/etc", -- "/etc/opt/awstats" -+ "$DIR", -+ "/etc/opt/csw/", "/opt/csw/etc/" - ); - } - 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 Apr 28 15:43:57 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Apr 2011 13:43:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[14429] csw/mgar/pkg/clpbar/trunk Message-ID: Revision: 14429 http://gar.svn.sourceforge.net/gar/?rev=14429&view=rev Author: dmichelsen Date: 2011-04-28 13:43:57 +0000 (Thu, 28 Apr 2011) Log Message: ----------- clpbar: Update to 1.11.1, new defaults, change clpbarrc location from /etc to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/clpbar/trunk/Makefile csw/mgar/pkg/clpbar/trunk/checksums Added Paths: ----------- csw/mgar/pkg/clpbar/trunk/files/clpbarrc Removed Paths: ------------- csw/mgar/pkg/clpbar/trunk/files/0001-Allowing-to-modify-CFLAGS.patch Modified: csw/mgar/pkg/clpbar/trunk/Makefile =================================================================== --- csw/mgar/pkg/clpbar/trunk/Makefile 2011-04-28 08:26:25 UTC (rev 14428) +++ csw/mgar/pkg/clpbar/trunk/Makefile 2011-04-28 13:43:57 UTC (rev 14429) @@ -3,18 +3,40 @@ # $Id$ NAME = bar -VERSION = 1.10.9 +VERSION = 1.11.1 CATEGORIES = apps DESCRIPTION = A command line tool to display information about a data transfer stream + define BLURB +Bar is a simple tool to copy a stream of data and print a display for the user on stderr showing (a) the amount of data passed, (b) the throughput of the data transfer, and (c) the transfer time, or, if the total size of the data stream is known, the estimated time remaining, what percentage of the data transfer has been completed, and a progress bar. +Bar was originally written for the purpose of estimating the amount of time needed to transfer large amounts (many, many gigabytes) of data across a network. (Usually in an SSH/tar pipe.) endef -SPKG_SOURCEURL = http://clpbar.sourceforge.net/ + +SF_PROJ = clpbar MASTER_SITES = $(SF_MIRRORS) -SF_PROJ = clpbar -PATCHFILES += 0001-Allowing-to-modify-CFLAGS.patch +DISTFILES += $(NAME)_$(VERSION).tar.gz +DISTFILES += clpbarrc -DISTFILES = $(NAME)_$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -TEST_TARGET = check -CONFIGURE_ARGS = $(DIRPATHS) +CLPBARRC = $(sysconfdir)/clpbarrc + +VENDOR_URL = http://clpbar.sourceforge.net/ + +CONFIGURE_ARGS += $(DIRPATHS) +# It is 64 bit when *I* say so +CONFIGURE_ARGS += --disable-use-m64 + +PRESERVECONF = $(CLPBARRC) + include gar/category.mk + +post-extract-modulated: + perl -pi \ + -e 's,/etc/clpbarrc,$(CLPBARRC),g;' \ + $(WORKSRC)/args.c \ + $(WORKSRC)/bar.1.in + @$(MAKECOOKIE) + +post-install-modulated: + ginstall -d $(DESTDIR)$(dir $(CLPBARRC)) + ginstall $(WORKDIR)/clpbarrc $(DESTDIR)$(CLPBARRC) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/clpbar/trunk/checksums =================================================================== --- csw/mgar/pkg/clpbar/trunk/checksums 2011-04-28 08:26:25 UTC (rev 14428) +++ csw/mgar/pkg/clpbar/trunk/checksums 2011-04-28 13:43:57 UTC (rev 14429) @@ -1,2 +1 @@ -0fc824259a4b259263856af54f76b605 0001-Allowing-to-modify-CFLAGS.patch -d824415b391a3f826b410c86223e54a5 bar_1.10.9.tar.gz +4836a9767cbfb9c0b16020d23b4b5e91 bar_1.11.1.tar.gz Deleted: csw/mgar/pkg/clpbar/trunk/files/0001-Allowing-to-modify-CFLAGS.patch =================================================================== --- csw/mgar/pkg/clpbar/trunk/files/0001-Allowing-to-modify-CFLAGS.patch 2011-04-28 08:26:25 UTC (rev 14428) +++ csw/mgar/pkg/clpbar/trunk/files/0001-Allowing-to-modify-CFLAGS.patch 2011-04-28 13:43:57 UTC (rev 14429) @@ -1,52 +0,0 @@ -From c0f3d3cfdff8a4838b903eb80bd63c2966f511a2 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Sat, 3 Jul 2010 22:37:03 +0200 -Subject: [PATCH] Allowing to modify CFLAGS - ---- - Makefile.am | 4 ++-- - Makefile.in | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index e6fcc76..b667595 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -12,10 +12,10 @@ - # - - # CFLAGS = --CFLAGS = -O2 -+CFLAGS ?= -O2 - # CFLAGS = -g -Wall - --LDFLAGS = -s -+LDFLAGS ?= -s - # LDFLAGS = - - bin_PROGRAMS = -diff --git a/Makefile.in b/Makefile.in -index 9166e52..6f72858 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -128,7 +128,7 @@ CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - - # CFLAGS = --CFLAGS = -O2 -+CFLAGS ?= -O2 - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CYGPATH_W = @CYGPATH_W@ -@@ -150,7 +150,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - # CFLAGS = -g -Wall --LDFLAGS = -s -+LDFLAGS ?= -s - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LN_S = @LN_S@ --- -1.7.1 - Added: csw/mgar/pkg/clpbar/trunk/files/clpbarrc =================================================================== --- csw/mgar/pkg/clpbar/trunk/files/clpbarrc (rev 0) +++ csw/mgar/pkg/clpbar/trunk/files/clpbarrc 2011-04-28 13:43:57 UTC (rev 14429) @@ -0,0 +1,35 @@ +# +# This is an example of what a ~/.clpbarrc file +# might look like. Note that lines beginning +# with a # are ignored. +# +# display-twiddle: no +# display-ansi: yes +# space-background: black +# twiddle-foreground: green +# twiddle-background: normal +# twiddle-bold: no +# count-foreground: green +# count-background: magenta +# count-bold: yes +# throughput-label-foreground: normal +# throughput-label-background: red +# throughput-label-bold: no +# throughput-foreground: green +# throughput-background: black +# throughput-bold: yes +# time-label-foreground: normal +# time-label-background: red +# time-label-bold: no +# time-foreground: green +# time-background: black +# time-bold: yes +# percent-foreground: green +# percent-background: green +# percent-bold: yes +# bar-brace-foreground: red +# bar-brace-background: blue +# bar-brace-bold: no +# bar-foreground: yellow +# bar-background: blue +# bar-bold: yes This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Apr 28 16:30:51 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 28 Apr 2011 14:30:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14430] csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile Message-ID: Revision: 14430 http://gar.svn.sourceforge.net/gar/?rev=14430&view=rev Author: idogan23 Date: 2011-04-28 14:30:51 +0000 (Thu, 28 Apr 2011) Log Message: ----------- pm_netucpcommon: fixed package name Modified Paths: -------------- csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile Modified: csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile 2011-04-28 13:43:57 UTC (rev 14429) +++ csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile 2011-04-28 14:30:51 UTC (rev 14430) @@ -8,19 +8,22 @@ Common Stuff for Net::UCP Module endef -PACKAGES = CSWpm-netucpcommon -CATALOGNAME = pm_netucpcommon +PACKAGES = CSWpm-net-ucp-common +CATALOGNAME = pm_net_ucp_common -CHECKPKG_OVERRIDES_CSWpmnetucpcommon += catalogname-does-not-match-pkgname|pkgname=CSWpmnetucpcommon|catalogname=pm_netucpcommon|expected-catalogname=pmnetucpcommon +#CHECKPKG_OVERRIDES_CSWpmnetucpcommon += catalogname-does-not-match-pkgname|pkgname=CSWpmnetucpcommon|catalogname=pm_netucpcommon|expected-catalogname=pmnetucpcommon DISTFILES += LICENSE ARCHALL = 1 +# temporary entries fo the package renaming INCOMPATIBLE_PKGS_CSWpm-netucpcommon = CSWpmnetucpcommon +CHECKPKG_OVERRIDES_CSWpm-net-ucp-common += file-collision|/opt/csw/share/man/man3/Net::UCP::Common.3perl|CSWpm-net-ucp-common|CSWpmnetucpcommon +CHECKPKG_OVERRIDES_CSWpm-net-ucp-common += file-collision|/opt/csw/share/perl/csw/Net/UCP/Common.pm|CSWpm-net-ucp-common|CSWpmnetucpcommon post-install-modulated: - @ginstall -d $(DESTDIR)/opt/csw/share/doc/pm_netucpcommon - @ginstall -m 644 $(FILEDIR)/LICENSE $(DESTDIR)/opt/csw/share/doc/pm_netucpcommon/license + @ginstall -d $(DESTDIR)/opt/csw/share/doc/pm_net_ucp_common + @ginstall -m 644 $(FILEDIR)/LICENSE $(DESTDIR)/opt/csw/share/doc/pm_net_ucp_common/license @$(MAKECOOKIE) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ihsan at opencsw.org Thu Apr 28 16:31:01 2011 From: ihsan at opencsw.org (=?UTF-8?B?xLBoc2FuIERvxJ9hbg==?=) Date: Thu, 28 Apr 2011 16:31:01 +0200 Subject: [csw-devel] SF.net SVN: gar:[14375] csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile In-Reply-To: References: Message-ID: <4DB97A25.1090302@opencsw.org> On 04/21/11 09:07 PM, Peter Bonivart wrote: >> Log Message: >> ----------- >> pm_netucpcommon: fixed package name >> >> Modified: csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile >> =================================================================== >> >> -PACKAGES = CSWpmnetucpcommon >> +PACKAGES = CSWpm-netucpcommon >> CATALOGNAME = pm_netucpcommon > > This should be: > > PACKAGES = CSWpm-net-ucp-common > CATALOGNAME = pm_net_ucp_common Thanks. Just fixed it. Ihsan -- ihsan at dogan.ch http://blog.dogan.ch/ From idogan23 at users.sourceforge.net Thu Apr 28 16:47:04 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 28 Apr 2011 14:47:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[14431] csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/Makefile Message-ID: Revision: 14431 http://gar.svn.sourceforge.net/gar/?rev=14431&view=rev Author: idogan23 Date: 2011-04-28 14:47:04 +0000 (Thu, 28 Apr 2011) Log Message: ----------- pm_net_ucp_inttimeout: package rename Modified Paths: -------------- csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/Makefile Modified: csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/Makefile 2011-04-28 14:30:51 UTC (rev 14430) +++ csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/Makefile 2011-04-28 14:47:04 UTC (rev 14431) @@ -8,14 +8,17 @@ Perl Timeout Manager for Net::UCP Module endef -PACKAGES = CSWpmnetucpinttimeout -CATALOGNAME = pm_netucpinttimeout +PACKAGES = CSWpm-net-ucp-inttimeout +CATALOGNAME = pm_net_ucp_inttimeout -CHECKPKG_OVERRIDES_CSWpmnetucpinttimeout += catalogname-does-not-match-pkgname|pkgname=CSWpmnetucpinttimeout|catalogname=pm_netucpinttimeout|expected-catalogname=pmnetucpinttimeout - DISTFILES += LICENSE ARCHALL = 1 +# temporary entries for the package renaming +INCOMPATIBLE_PKGS_CSWpm-net-ucp-inttimeout = CSWpmnetucpinttimeout +CHECKPKG_OVERRIDES_CSWpm-net-ucp-inttimeout += file-collision|/opt/csw/share/man/man3/Net::UCP::IntTimeout.3perl|CSWpm-net-ucp-inttimeout|CSWpmnetucpinttimeout +CHECKPKG_OVERRIDES_CSWpm-net-ucp-inttimeout += file-collision|/opt/csw/share/perl/csw/Net/UCP/IntTimeout.pm|CSWpm-net-ucp-inttimeout|CSWpmnetucpinttimeout + post-install-modulated: @ginstall -d $(DESTDIR)/opt/csw/share/doc/$(CATALOGNAME) @ginstall -m 644 $(FILEDIR)/LICENSE $(DESTDIR)/opt/csw/share/doc/$(CATALOGNAME)/license This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Apr 28 16:55:37 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 28 Apr 2011 14:55:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14432] csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile Message-ID: Revision: 14432 http://gar.svn.sourceforge.net/gar/?rev=14432&view=rev Author: idogan23 Date: 2011-04-28 14:55:37 +0000 (Thu, 28 Apr 2011) Log Message: ----------- pm_netucpcommon: fixed INCOMPATIBLE_PKGS, cleanup Modified Paths: -------------- csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile Modified: csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile 2011-04-28 14:47:04 UTC (rev 14431) +++ csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile 2011-04-28 14:55:37 UTC (rev 14432) @@ -11,19 +11,17 @@ PACKAGES = CSWpm-net-ucp-common CATALOGNAME = pm_net_ucp_common -#CHECKPKG_OVERRIDES_CSWpmnetucpcommon += catalogname-does-not-match-pkgname|pkgname=CSWpmnetucpcommon|catalogname=pm_netucpcommon|expected-catalogname=pmnetucpcommon - DISTFILES += LICENSE ARCHALL = 1 # temporary entries fo the package renaming -INCOMPATIBLE_PKGS_CSWpm-netucpcommon = CSWpmnetucpcommon +INCOMPATIBLE_PKGS_CSWpm-net-ucp-common = CSWpmnetucpcommon CHECKPKG_OVERRIDES_CSWpm-net-ucp-common += file-collision|/opt/csw/share/man/man3/Net::UCP::Common.3perl|CSWpm-net-ucp-common|CSWpmnetucpcommon CHECKPKG_OVERRIDES_CSWpm-net-ucp-common += file-collision|/opt/csw/share/perl/csw/Net/UCP/Common.pm|CSWpm-net-ucp-common|CSWpmnetucpcommon post-install-modulated: - @ginstall -d $(DESTDIR)/opt/csw/share/doc/pm_net_ucp_common - @ginstall -m 644 $(FILEDIR)/LICENSE $(DESTDIR)/opt/csw/share/doc/pm_net_ucp_common/license + @ginstall -d $(DESTDIR)/opt/csw/share/doc/$(CATALOGNAME) + @ginstall -m 644 $(FILEDIR)/LICENSE $(DESTDIR)/opt/csw/share/doc/$(CATALOGNAME)/license @$(MAKECOOKIE) 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 Apr 28 16:58:56 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Apr 2011 14:58:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[14433] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14433 http://gar.svn.sourceforge.net/gar/?rev=14433&view=rev Author: bdwalton Date: 2011-04-28 14:58:55 +0000 (Thu, 28 Apr 2011) Log Message: ----------- bacula/trunk: ensure the default query.sql info notes correct location of example file Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 14:55:37 UTC (rev 14432) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 14:58:55 UTC (rev 14433) @@ -265,4 +265,6 @@ mv $$f $(DESTDIR)/etc/opt/csw/bacula/$$f; \ ln -s /etc/opt/csw/bacula/$$f $$f; \ done) + @( cd $(DESTDIR)/etc/opt/csw/bacula; \ + perl -pi -e "s!!$(docdir)/$(NAME)!" query.sql ) @$(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 Thu Apr 28 17:01:36 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Apr 2011 15:01:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[14434] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14434 http://gar.svn.sourceforge.net/gar/?rev=14434&view=rev Author: bdwalton Date: 2011-04-28 15:01:36 +0000 (Thu, 28 Apr 2011) Log Message: ----------- bacula/trunk: migrate bacula-fd.conf for the -fd package instead of duplicating and breaking the -sd migrations Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 14:58:55 UTC (rev 14433) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 15:01:36 UTC (rev 14434) @@ -217,7 +217,7 @@ MIGRATE_FILES_CSWbacula-director = "query.sql bacula-dir.conf" MIGRATE_FILES_CSWbacula-sd = "mtx-changer.conf bacula-sd.conf" -MIGRATE_FILES_CSWbacula-sd = "bacula-sd.conf" +MIGRATE_FILES_CSWbacula-fd = "bacula-fd.conf" MIGRATE_FILES_CSWbacula-console = "bconsole.conf" MIGRATE_FILES_CSWbacula-tray-monitor = "tray-monitor.conf" MIGRATE_SOURCE_DIR = /opt/csw/etc/bacula This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Apr 28 17:17:56 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 28 Apr 2011 15:17:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[14435] csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/ Makefile Message-ID: Revision: 14435 http://gar.svn.sourceforge.net/gar/?rev=14435&view=rev Author: idogan23 Date: 2011-04-28 15:17:56 +0000 (Thu, 28 Apr 2011) Log Message: ----------- pm_net_ucp_transactionmanager: renamed package Modified Paths: -------------- csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/Makefile Modified: csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/Makefile 2011-04-28 15:01:36 UTC (rev 14434) +++ csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/Makefile 2011-04-28 15:17:56 UTC (rev 14435) @@ -8,11 +8,16 @@ Perl extension to manage UCP session transaction numbers endef -PACKAGES = CSWpmnetucptransactionmanager -CATALOGNAME = pm_netucptransactionmanager +PACKAGES = CSWpm-net-ucp-transactionmanager +CATALOGNAME = pm_net_ucp_transactionmanager -CHECKPKG_OVERRIDES_CSWpmnetucptransactionmanager += catalogname-does-not-match-pkgname|pkgname=CSWpmnetucptransactionmanager|catalogname=pm_netucptransactionmanager|expected-catalogname=pmnetucptransactionmanager +#CHECKPKG_OVERRIDES_CSWpmnetucptransactionmanager += catalogname-does-not-match-pkgname|pkgname=CSWpmnetucptransactionmanager|catalogname=pm_netucptransactionmanager|expected-catalogname=pmnetucptransactionmanager +# temporary entries for the package renaming +INCOMPATIBLE_PKGS_CSWpm-net-ucp-transactionmanager = CSWpmnetucptransactionmanager +CHECKPKG_OVERRIDES_CSWpm-net-ucp-transactionmanager += file-collision|/opt/csw/share/man/man3/Net::UCP::TransactionManager.3perl|CSWpm-net-ucp-transactionmanager|CSWpmnetucptransactionmanager +CHECKPKG_OVERRIDES_CSWpm-net-ucp-transactionmanager += file-collision|/opt/csw/share/perl/csw/Net/UCP/TransactionManager.pm|CSWpm-net-ucp-transactionmanager|CSWpmnetucptransactionmanager + DISTFILES += LICENSE ARCHALL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Apr 28 17:24:54 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 28 Apr 2011 15:24:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14436] csw/mgar/pkg/cpan/Net-UCP/trunk/Makefile Message-ID: Revision: 14436 http://gar.svn.sourceforge.net/gar/?rev=14436&view=rev Author: idogan23 Date: 2011-04-28 15:24:54 +0000 (Thu, 28 Apr 2011) Log Message: ----------- pm_net_ucp: package renamed Modified Paths: -------------- csw/mgar/pkg/cpan/Net-UCP/trunk/Makefile Modified: csw/mgar/pkg/cpan/Net-UCP/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-UCP/trunk/Makefile 2011-04-28 15:17:56 UTC (rev 14435) +++ csw/mgar/pkg/cpan/Net-UCP/trunk/Makefile 2011-04-28 15:24:54 UTC (rev 14436) @@ -10,18 +10,16 @@ MODDIST = $(NAME)-$(VERSION).tgz -PACKAGES = CSWpmnetucp -CATALOGNAME = pm_netucp +PACKAGES = CSWpm-net-ucp +CATALOGNAME = pm_net_ucp -CHECKPKG_OVERRIDES_CSWpmnetucp += catalogname-does-not-match-pkgname|pkgname=CSWpmnetucp|catalogname=pm_netucp|expected-catalogname=pmnetucp - DISTFILES += LICENSE ARCHALL = 1 LICENSE = LICENSE -RUNTIME_DEP_PKGS_CSWpmnetucp = CSWpmnetucpcommon -RUNTIME_DEP_PKGS_CSWpmnetucp = CSWpmnetucpinttimeout -RUNTIME_DEP_PKGS_CSWpmnetucp = CSWpmnetucptransactionmanager +RUNTIME_DEP_PKGS_CSWpmnetucp = CSWpm-net-ucp-common +RUNTIME_DEP_PKGS_CSWpmnetucp = CSWpm-net-ucp-inttimeout +RUNTIME_DEP_PKGS_CSWpmnetucp = CSWpm-net-ucp-transactionmanager 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 Apr 28 18:06:54 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Apr 2011 16:06:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14437] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14437 http://gar.svn.sourceforge.net/gar/?rev=14437&view=rev Author: bdwalton Date: 2011-04-28 16:06:53 +0000 (Thu, 28 Apr 2011) Log Message: ----------- bacula/trunk: install a user and group named bacula; we will run director and sd under this username Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 15:24:54 UTC (rev 14436) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 16:06:53 UTC (rev 14437) @@ -151,6 +151,7 @@ PKGFILES_CSWbacula-sd += /var/opt/csw/run PKGFILES_CSWbacula-sd += $(localstatedir)/$(NAME)/archive PKGFILES_CSWbacula-sd += .*bacula_sd/.*postmsg +PKGFILES_CSWbacula-sd += /etc/opt/csw/pkg/CSWbacula-sd/cswusergroup CATALOGNAME_CSWbacula-director = bacula_director SPKG_DESC_CSWbacula-director = $(DESCRIPTION) - Director @@ -175,6 +176,7 @@ PKGFILES_CSWbacula-director += /var/opt/csw/run PKGFILES_CSWbacula-director += .*share/doc/bacula_director/README.CSW PKGFILES_CSWbacula-director += .*bacula_director/.*postmsg +PKGFILES_CSWbacula-director += /etc/opt/csw/pkg/CSWbacula-director/cswusergroup # force libraries into a separate subdirectory libdir = $(prefix)/lib/$(NAME) @@ -227,6 +229,9 @@ PRESERVECONF += $(sysconfdir)/bacula-fd.conf $(sysconfdir)/bconsole.conf PRESERVECONF += $(sysconfdir)/mtx-changer.conf $(sysconfdir)/query.sql +USERGROUP += /etc/opt/csw/pkg/CSWbacula-director/cswusergroup +USERGROUP += /etc/opt/csw/pkg/CSWbacula-sd/cswusergroup + POSTMSG = /opt/csw/share/doc/bacula_director/README.postmsg POSTMSG += /opt/csw/share/doc/bacula_console/README.postmsg POSTMSG += /opt/csw/share/doc/bacula_sd/README.postmsg @@ -268,3 +273,12 @@ @( cd $(DESTDIR)/etc/opt/csw/bacula; \ perl -pi -e "s!!$(docdir)/$(NAME)!" query.sql ) @$(MAKECOOKIE) + +post-merge: + @echo Adding user/group creation info... + @(cd $(PKGROOT)/etc/opt/csw; \ + for p in director sd; do \ + mkdir -p pkg/CSWbacula-$$p; \ + echo "bacula:bacula:Bacula:/var/opt/csw/bacula/:/bin/false:::NP" > pkg/CSWbacula-$$p/cswusergroup; \ + done) + 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 Apr 28 18:07:06 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Apr 2011 16:07:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14438] csw/mgar/pkg Message-ID: Revision: 14438 http://gar.svn.sourceforge.net/gar/?rev=14438&view=rev Author: dmichelsen Date: 2011-04-28 16:07:05 +0000 (Thu, 28 Apr 2011) Log Message: ----------- libcurl2: Split off soname specific library Modified Paths: -------------- csw/mgar/pkg/libcurl2/branches/curl-7.21.2/Makefile csw/mgar/pkg/libcurl2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libcurl2/ csw/mgar/pkg/libcurl2/branches/curl-7.21.2/ Removed Paths: ------------- csw/mgar/pkg/libcurl2/trunk/files/curlbuild.h csw/mgar/pkg/libcurl2/trunk/files/libcurl.so.3.0.0.i csw/mgar/pkg/libcurl2/trunk/files/libcurl.so.3.0.0.s Modified: csw/mgar/pkg/libcurl2/branches/curl-7.21.2/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2010-12-08 03:48:13 UTC (rev 11840) +++ csw/mgar/pkg/libcurl2/branches/curl-7.21.2/Makefile 2011-04-28 16:07:05 UTC (rev 14438) @@ -15,10 +15,6 @@ MASTER_SITES = http://curl.haxx.se/download/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += libcurl.so.3.0.0.s -DISTFILES += libcurl.so.2.0.2.s -DISTFILES += libcurl.so.3.0.0.i -DISTFILES += libcurl.so.2.0.2.i DISTFILES += curlbuild.h UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -43,7 +39,12 @@ EXTRA_CONFIGURE_ARGS_features-full = --enable-ares --with-spnego=$(libdir) EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap --enable-ldaps +EXTRA_LDFLAGS = -L$(libdir)/libnet-new + +EXTRA_LD_OPTIONS = -f libcurl-full.so.4.2.0 + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-static --enable-shared CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl CONFIGURE_ARGS += --with-ca-path=/opt/csw/ssl/certs CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_features-$(FEATURES)) @@ -127,22 +128,10 @@ # end checkpkg happiness section +#build-modulated: EXTRA_LD_OPTIONS=$(EXTRA_LD_OPTIONS_features-$(FEATURES)) + include gar/category.mk -post-install-isa-sparcv8-features-minimal: - ginstall $(FILEDIR)/libcurl.so.3.0.0.s $(DESTDIR)$(libdir)/libcurl.so.3.0.0 - ginstall $(FILEDIR)/libcurl.so.2.0.2.s $(DESTDIR)$(libdir)/libcurl.so.2.0.2 - ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3 - ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2 - @$(MAKECOOKIE) - -post-install-isa-i386-features-minimal: - cp $(FILEDIR)/libcurl.so.3.0.0.i $(DESTDIR)$(libdir)/libcurl.so.3.0.0 - cp $(FILEDIR)/libcurl.so.2.0.2.i $(DESTDIR)$(libdir)/libcurl.so.2.0.2 - ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3 - ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2 - @$(MAKECOOKIE) - post-merge: ginstall $(FILEDIR)/curlbuild.h $(PKGROOT)$(includedir)/curl/curlbuild.h @$(MAKECOOKIE) Modified: csw/mgar/pkg/libcurl2/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2011-04-28 00:39:23 UTC (rev 14426) +++ csw/mgar/pkg/libcurl2/trunk/Makefile 2011-04-28 16:07:05 UTC (rev 14438) @@ -2,7 +2,7 @@ VERSION = 7.21.2 CATEGORIES = net -DESCRIPTION = Command line tool and library for client-side URL transfers. +DESCRIPTION = Command line tool and library for client-side URL transfers define BLURB curl and libcurl is a tool for transferring files using URL syntax. It supports HTTP, HTTPS, FTP, FTPS, DICT, TELNET, LDAP, FILE, and GOPHER, as @@ -14,135 +14,36 @@ endef MASTER_SITES = http://curl.haxx.se/download/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += libcurl.so.3.0.0.s DISTFILES += libcurl.so.2.0.2.s -DISTFILES += libcurl.so.3.0.0.i DISTFILES += libcurl.so.2.0.2.i -DISTFILES += curlbuild.h -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +PACKAGES += CSWlibcurl2 +CATALOGNAME_CSWlibcurl2 = libcurl2 +SPKG_DESC_CSWlibcurl2 = Library for client-side URL transfers, libcurl.so.2 +RUNTIME_DEP_PKGS_CSWlibcurl2 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibcurl2 += CSWzlib -PACKAGES = CSWcurl CSWcurlrt CSWcurlrtfull CSWcurldevel -CATALOGNAME_CSWcurl = curl -CATALOGNAME_CSWcurlrt = curl_rt -CATALOGNAME_CSWcurlrtfull = curl_rt_full -CATALOGNAME_CSWcurldevel = curl_devel +# Yes, the license *is* missing +CHECKPKG_OVERRIDES_CSWlibcurl2 += license-missing|/opt/csw/share/doc/libcurl2/license -SPKG_DESC_CSWcurl = A command line tool and library for client-side URL transfers -SPKG_DESC_CSWcurlrt = Curl Runtime Libraries (minimal dependencies) -SPKG_DESC_CSWcurlrtfull = Curl Runtime Libraries (full featured) -SPKG_DESC_CSWcurldevel = Curl Developer Files +VENDOR_URL = http://curl.haxx.se -SPKG_SOURCEURL = http://curl.haxx.se +# We just put the existing old libs in place for now +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = -EXTRA_MODULATORS = FEATURES -MODULATIONS_FEATURES = minimal full - -EXTRA_CONFIGURE_ARGS_features-minimal = --disable-ldap --without-libssh2 --disable-ares -EXTRA_CONFIGURE_ARGS_features-full = --enable-ares --with-spnego=$(libdir) -EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap --enable-ldaps - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl -CONFIGURE_ARGS += --with-ca-path=/opt/csw/ssl/certs -CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_features-$(FEATURES)) - -BUILD64 = 1 - -# We are doing 64 bit only for the libs -NOISAEXEC = 1 - -RUNTIME_DEP_PKGS_CSWcurl = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl CSWcurlrt CSWlibcares CSWlibssh2 -RUNTIME_DEP_PKGS_CSWcurlrt = CSWlibidn CSWosslrt CSWzlib -RUNTIME_DEP_PKGS_CSWcurlrtfull = CSWlibidn CSWoldaprt CSWosslrt CSWzlib CSWlibcares CSWlibssh2 CSWlibfbopenssl -RUNTIME_DEP_PKGS_CSWcurldevel = CSWcurl - -BUILD_DEP_PKGS = $(filter-out CSWcurl CSWcurlrt,$(RUNTIME_DEP_PKGS_CSWcurl) $(RUNTIME_DEP_PKGS_CSWcurlrt) $(RUNTIME_DEP_PKGS_CSWcurlrtfull) $(RUNTIME_DEP_PKGS_CSWcurldevel)) -BUILD_DEP_PKGS += CSWoldapdevel CSWossldevel CSWlibcaresdevel CSWlibssh2devel - -SKIPTEST = 1 - -# isa-sparcv8-features-minimal isa-sparcv8-features-full isa-sparcv9-features-minimal isa-sparcv9-features-full - -# TBD: Unify curlbuild.h with something like diff -D (sparcv9|amd64) curlbuild-32.h curlbuild-64.h > curlbuild.h -# Inspired from http://cvs.opensolaris.org/source/xref/sfw/usr/src/cmd/apr/apr-1.3/Makefile.sfw -EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-32.h,p" -EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-64.h,p" -EXTRA_PAX_ARGS_32 += -s ",$(libdir)/libcurl\.so\.4\.2\.0$$,$(libdir_install)/libcurl-$(FEATURES).so.4.2.0,p" -EXTRA_PAX_ARGS_64 += -s ",$(libdir)/libcurl\.so\.4\.2\.0$$,$(libdir_install)/$(ISA)/libcurl-$(FEATURES).so.4.2.0,p" -EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) - -# We select pkgconfig for minimal library bindings. As libneon is self-contained (links -# to all necessary libs directly) the full version can simly be linked in. -EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,," -EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES)) - -MERGE_SCRIPTS_isa-default-features-minimal = copy-all -MERGE_SCRIPTS_isa-default64-features-minimal = copy-relocated-only -MERGE_DIRS_isa-default64-features-minimal = $(libdir) -MERGE_SCRIPTS_isa-default-features-full = copy-only -MERGE_DIRS_isa-default-features-full = $(libdir) -MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only -MERGE_DIRS_isa-default64-features-full = $(libdir) - -ALTERNATIVES_CSWcurlrt = minimal -ALTERNATIVES_CSWcurlrtfull = full -ALTERNATIVE_minimal = $(libdir)/libcurl.so.4.2.0 curl $(libdir)/libcurl-minimal.so.4.2.0 100 -ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libcurl.so.4.2.0 curl64 $(libdir)/$(ISA_DEFAULT64)/libcurl-minimal.so.4.2.0 -ALTERNATIVE_full = $(libdir)/libcurl.so.4.2.0 curl $(libdir)/libcurl-full.so.4.2.0 200 -ALTERNATIVE_full += $(libdir)/$(ISA_DEFAULT64)/libcurl.so.4.2.0 curl64 $(libdir)/$(ISA_DEFAULT64)/libcurl-full.so.4.2.0 - -PKGFILES_CSWcurldevel = $(PKGFILES_DEVEL) -PKGFILES_CSWcurlrt = $(PKGFILES_RT) -PKGFILES_CSWcurlrtfull = .*-full.* - -# recompile curl to link to new ldap, and temporarily include -# the following block to make checkpkg happy. nothing in the curl -# package changed, so it should be ok, no? -CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibssh2 -CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWoldaprt -CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWsasl -CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibcares -CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibnet -CHECKPKG_OVERRIDES_CSWcurldevel += surplus-dependency|CSWcurl -CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-minimal.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-minimal.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrt += non-uniform-lib-versions-in-package|sonames=['libcurl.so.2',|'libcurl.so.3',|'libcurl.so.4'] -CHECKPKG_OVERRIDES_CSWcurlrt += file-conflict|/opt/csw/lib/sparcv9/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull -CHECKPKG_OVERRIDES_CSWcurlrt += file-conflict|/opt/csw/lib/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull -CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibcares -CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibssh2 -CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibfbopenssl -CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWoldaprt -CHECKPKG_OVERRIDES_CSWcurlrt += surplus-dependency|CSWalternatives -CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/sparcv9/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull -CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull -CHECKPKG_OVERRIDES_CSWcurlrtfull += surplus-dependency|CSWalternatives -CHECKPKG_OVERRIDES_CSWcurlrtfull += shared-lib-pkgname-mismatch|sonames=['libcurl.so.4']|pkgname=CSWcurlrtfull|expected=['CSWlibcurl4']| - -# end checkpkg happiness section - include gar/category.mk -post-install-isa-sparcv8-features-minimal: - ginstall $(FILEDIR)/libcurl.so.3.0.0.s $(DESTDIR)$(libdir)/libcurl.so.3.0.0 - ginstall $(FILEDIR)/libcurl.so.2.0.2.s $(DESTDIR)$(libdir)/libcurl.so.2.0.2 - ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3 +post-install-isa-sparcv8: + ginstall -d $(DESTDIR)$(libdir) + ginstall $(WORKDIR)/libcurl.so.2.0.2.s $(DESTDIR)$(libdir)/libcurl.so.2.0.2 ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2 @$(MAKECOOKIE) post-install-isa-i386-features-minimal: - cp $(FILEDIR)/libcurl.so.3.0.0.i $(DESTDIR)$(libdir)/libcurl.so.3.0.0 - cp $(FILEDIR)/libcurl.so.2.0.2.i $(DESTDIR)$(libdir)/libcurl.so.2.0.2 - ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3 + ginstall -d $(DESTDIR)$(libdir) + cp $(WORKDIR)/libcurl.so.2.0.2.i $(DESTDIR)$(libdir)/libcurl.so.2.0.2 ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2 @$(MAKECOOKIE) - -post-merge: - ginstall $(FILEDIR)/curlbuild.h $(PKGROOT)$(includedir)/curl/curlbuild.h - @$(MAKECOOKIE) Deleted: csw/mgar/pkg/libcurl2/trunk/files/curlbuild.h =================================================================== --- csw/mgar/pkg/curl/trunk/files/curlbuild.h 2011-04-28 00:39:23 UTC (rev 14426) +++ csw/mgar/pkg/libcurl2/trunk/files/curlbuild.h 2011-04-28 16:07:05 UTC (rev 14438) @@ -1,6 +0,0 @@ -/* Allow 32 and 64 bit headers to coexist */ -#if defined __amd64 || defined __x86_64 || defined __sparcv9 -#include "curlbuild-64.h" -#else -#include "curlbuild-32.h" -#endif Deleted: csw/mgar/pkg/libcurl2/trunk/files/libcurl.so.3.0.0.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/libcurl2/trunk/files/libcurl.so.3.0.0.s =================================================================== (Binary files differ) 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 Apr 28 18:09:03 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Apr 2011 16:09:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14439] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14439 http://gar.svn.sourceforge.net/gar/?rev=14439&view=rev Author: bdwalton Date: 2011-04-28 16:09:03 +0000 (Thu, 28 Apr 2011) Log Message: ----------- bacula/trunk: add configure args so director and storage daemon use non-root credentials Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 16:07:05 UTC (rev 14438) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 16:09:03 UTC (rev 14439) @@ -206,6 +206,11 @@ CONFIGURE_ARGS += --with-mon-dir-password=QhTqgNyq8s6l7RJc/+3NmVqQkyxkqlnaJLPwsZF7fXUp CONFIGURE_ARGS += --with-mon-fd-password=IEKXaPXrRO8BzJYBJueDJgkVsXzR/1cVvPNGJhZPrsHB CONFIGURE_ARGS += --with-mon-sd-password=e5fbjZnW+1hohTYFBfTXFe1KP7BIgCrAvY4fA4fg39TN +# don't run as root except for the file daemon which will need those privs +CONFIGURE_ARGS += --with-dir-user=bacula +CONFIGURE_ARGS += --with-dir-group=bacula +CONFIGURE_ARGS += --with-sd-user=bacula +CONFIGURE_ARGS += --with-sd-group=bacula EXTRA_INC += $(includedir)/ncursesw EXTRA_LIB += $(prefix)/lib/ncursesw $(prefix)/mysql5/lib/mysql This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 28 18:17:33 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Apr 2011 16:17:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14440] csw/mgar/pkg/libcurl2/trunk/Makefile Message-ID: Revision: 14440 http://gar.svn.sourceforge.net/gar/?rev=14440&view=rev Author: dmichelsen Date: 2011-04-28 16:17:33 +0000 (Thu, 28 Apr 2011) Log Message: ----------- libcurl2: Fix typo Modified Paths: -------------- csw/mgar/pkg/libcurl2/trunk/Makefile Modified: csw/mgar/pkg/libcurl2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl2/trunk/Makefile 2011-04-28 16:09:03 UTC (rev 14439) +++ csw/mgar/pkg/libcurl2/trunk/Makefile 2011-04-28 16:17:33 UTC (rev 14440) @@ -42,7 +42,7 @@ ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2 @$(MAKECOOKIE) -post-install-isa-i386-features-minimal: +post-install-isa-i386: ginstall -d $(DESTDIR)$(libdir) cp $(WORKDIR)/libcurl.so.2.0.2.i $(DESTDIR)$(libdir)/libcurl.so.2.0.2 ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 28 18:27:49 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Apr 2011 16:27:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14441] csw/mgar/pkg/libcurl2/trunk Message-ID: Revision: 14441 http://gar.svn.sourceforge.net/gar/?rev=14441&view=rev Author: dmichelsen Date: 2011-04-28 16:27:48 +0000 (Thu, 28 Apr 2011) Log Message: ----------- libcurl2: Correct version number, add license Modified Paths: -------------- csw/mgar/pkg/libcurl2/trunk/Makefile csw/mgar/pkg/libcurl2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libcurl2/trunk/files/COPYING Modified: csw/mgar/pkg/libcurl2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl2/trunk/Makefile 2011-04-28 16:17:33 UTC (rev 14440) +++ csw/mgar/pkg/libcurl2/trunk/Makefile 2011-04-28 16:27:48 UTC (rev 14441) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.21.2 +VERSION = 7.11.2 CATEGORIES = net DESCRIPTION = Command line tool and library for client-side URL transfers @@ -16,6 +16,7 @@ MASTER_SITES = http://curl.haxx.se/download/ DISTFILES += libcurl.so.2.0.2.s DISTFILES += libcurl.so.2.0.2.i +DISTFILES += COPYING PACKAGES += CSWlibcurl2 CATALOGNAME_CSWlibcurl2 = libcurl2 @@ -23,9 +24,6 @@ RUNTIME_DEP_PKGS_CSWlibcurl2 += CSWosslrt RUNTIME_DEP_PKGS_CSWlibcurl2 += CSWzlib -# Yes, the license *is* missing -CHECKPKG_OVERRIDES_CSWlibcurl2 += license-missing|/opt/csw/share/doc/libcurl2/license - VENDOR_URL = http://curl.haxx.se # We just put the existing old libs in place for now Modified: csw/mgar/pkg/libcurl2/trunk/checksums =================================================================== --- csw/mgar/pkg/libcurl2/trunk/checksums 2011-04-28 16:17:33 UTC (rev 14440) +++ csw/mgar/pkg/libcurl2/trunk/checksums 2011-04-28 16:27:48 UTC (rev 14441) @@ -1 +0,0 @@ -ca96df88e044c7c25d19692ec8b250b2 curl-7.21.2.tar.bz2 Added: csw/mgar/pkg/libcurl2/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/libcurl2/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/libcurl2/trunk/files/COPYING 2011-04-28 16:27:48 UTC (rev 14441) @@ -0,0 +1,21 @@ +COPYRIGHT AND PERMISSION NOTICE + +Copyright (c) 1996 - 2010, Daniel Stenberg, . + +All rights reserved. + +Permission to use, copy, modify, and distribute this software for any purpose +with or without fee is hereby granted, provided that the above copyright +notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN +NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE +OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of a copyright holder shall not +be used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization of the copyright holder. 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 Apr 28 18:31:39 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Apr 2011 16:31:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14442] csw/mgar/pkg Message-ID: Revision: 14442 http://gar.svn.sourceforge.net/gar/?rev=14442&view=rev Author: dmichelsen Date: 2011-04-28 16:31:39 +0000 (Thu, 28 Apr 2011) Log Message: ----------- libcurl3: Split off soname package Modified Paths: -------------- csw/mgar/pkg/libcurl3/branches/curl-7.21.2/Makefile csw/mgar/pkg/libcurl3/trunk/Makefile csw/mgar/pkg/libcurl3/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libcurl3/ csw/mgar/pkg/libcurl3/branches/curl-7.21.2/ csw/mgar/pkg/libcurl3/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/libcurl3/trunk/files/curlbuild.h csw/mgar/pkg/libcurl3/trunk/files/libcurl.so.2.0.2.i csw/mgar/pkg/libcurl3/trunk/files/libcurl.so.2.0.2.s Modified: csw/mgar/pkg/libcurl3/branches/curl-7.21.2/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2010-12-08 03:48:13 UTC (rev 11840) +++ csw/mgar/pkg/libcurl3/branches/curl-7.21.2/Makefile 2011-04-28 16:31:39 UTC (rev 14442) @@ -15,10 +15,6 @@ MASTER_SITES = http://curl.haxx.se/download/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += libcurl.so.3.0.0.s -DISTFILES += libcurl.so.2.0.2.s -DISTFILES += libcurl.so.3.0.0.i -DISTFILES += libcurl.so.2.0.2.i DISTFILES += curlbuild.h UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -43,7 +39,12 @@ EXTRA_CONFIGURE_ARGS_features-full = --enable-ares --with-spnego=$(libdir) EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap --enable-ldaps +EXTRA_LDFLAGS = -L$(libdir)/libnet-new + +EXTRA_LD_OPTIONS = -f libcurl-full.so.4.2.0 + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-static --enable-shared CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl CONFIGURE_ARGS += --with-ca-path=/opt/csw/ssl/certs CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_features-$(FEATURES)) @@ -127,22 +128,10 @@ # end checkpkg happiness section +#build-modulated: EXTRA_LD_OPTIONS=$(EXTRA_LD_OPTIONS_features-$(FEATURES)) + include gar/category.mk -post-install-isa-sparcv8-features-minimal: - ginstall $(FILEDIR)/libcurl.so.3.0.0.s $(DESTDIR)$(libdir)/libcurl.so.3.0.0 - ginstall $(FILEDIR)/libcurl.so.2.0.2.s $(DESTDIR)$(libdir)/libcurl.so.2.0.2 - ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3 - ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2 - @$(MAKECOOKIE) - -post-install-isa-i386-features-minimal: - cp $(FILEDIR)/libcurl.so.3.0.0.i $(DESTDIR)$(libdir)/libcurl.so.3.0.0 - cp $(FILEDIR)/libcurl.so.2.0.2.i $(DESTDIR)$(libdir)/libcurl.so.2.0.2 - ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3 - ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2 - @$(MAKECOOKIE) - post-merge: ginstall $(FILEDIR)/curlbuild.h $(PKGROOT)$(includedir)/curl/curlbuild.h @$(MAKECOOKIE) Modified: csw/mgar/pkg/libcurl3/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2011-04-28 00:39:23 UTC (rev 14426) +++ csw/mgar/pkg/libcurl3/trunk/Makefile 2011-04-28 16:31:39 UTC (rev 14442) @@ -1,8 +1,8 @@ NAME = curl -VERSION = 7.21.2 +VERSION = 7.15.5 CATEGORIES = net -DESCRIPTION = Command line tool and library for client-side URL transfers. +DESCRIPTION = Command line tool and library for client-side URL transfers define BLURB curl and libcurl is a tool for transferring files using URL syntax. It supports HTTP, HTTPS, FTP, FTPS, DICT, TELNET, LDAP, FILE, and GOPHER, as @@ -14,135 +14,35 @@ endef MASTER_SITES = http://curl.haxx.se/download/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 DISTFILES += libcurl.so.3.0.0.s -DISTFILES += libcurl.so.2.0.2.s DISTFILES += libcurl.so.3.0.0.i -DISTFILES += libcurl.so.2.0.2.i -DISTFILES += curlbuild.h +DISTFILES += COPYING -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +PACKAGES += CSWlibcurl3 +CATALOGNAME_CSWlibcurl3 = libcurl3 +SPKG_DESC_CSWlibcurl3 = Library for client-side URL transfers, libcurl.so.3 +RUNTIME_DEP_PKGS_CSWlibcurl3 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibcurl3 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibcurl3 += CSWlibidn11 -PACKAGES = CSWcurl CSWcurlrt CSWcurlrtfull CSWcurldevel -CATALOGNAME_CSWcurl = curl -CATALOGNAME_CSWcurlrt = curl_rt -CATALOGNAME_CSWcurlrtfull = curl_rt_full -CATALOGNAME_CSWcurldevel = curl_devel +VENDOR_URL = http://curl.haxx.se -SPKG_DESC_CSWcurl = A command line tool and library for client-side URL transfers -SPKG_DESC_CSWcurlrt = Curl Runtime Libraries (minimal dependencies) -SPKG_DESC_CSWcurlrtfull = Curl Runtime Libraries (full featured) -SPKG_DESC_CSWcurldevel = Curl Developer Files +# We just put the existing old libs in place for now +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = -SPKG_SOURCEURL = http://curl.haxx.se - -EXTRA_MODULATORS = FEATURES -MODULATIONS_FEATURES = minimal full - -EXTRA_CONFIGURE_ARGS_features-minimal = --disable-ldap --without-libssh2 --disable-ares -EXTRA_CONFIGURE_ARGS_features-full = --enable-ares --with-spnego=$(libdir) -EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap --enable-ldaps - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl -CONFIGURE_ARGS += --with-ca-path=/opt/csw/ssl/certs -CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_features-$(FEATURES)) - -BUILD64 = 1 - -# We are doing 64 bit only for the libs -NOISAEXEC = 1 - -RUNTIME_DEP_PKGS_CSWcurl = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl CSWcurlrt CSWlibcares CSWlibssh2 -RUNTIME_DEP_PKGS_CSWcurlrt = CSWlibidn CSWosslrt CSWzlib -RUNTIME_DEP_PKGS_CSWcurlrtfull = CSWlibidn CSWoldaprt CSWosslrt CSWzlib CSWlibcares CSWlibssh2 CSWlibfbopenssl -RUNTIME_DEP_PKGS_CSWcurldevel = CSWcurl - -BUILD_DEP_PKGS = $(filter-out CSWcurl CSWcurlrt,$(RUNTIME_DEP_PKGS_CSWcurl) $(RUNTIME_DEP_PKGS_CSWcurlrt) $(RUNTIME_DEP_PKGS_CSWcurlrtfull) $(RUNTIME_DEP_PKGS_CSWcurldevel)) -BUILD_DEP_PKGS += CSWoldapdevel CSWossldevel CSWlibcaresdevel CSWlibssh2devel - -SKIPTEST = 1 - -# isa-sparcv8-features-minimal isa-sparcv8-features-full isa-sparcv9-features-minimal isa-sparcv9-features-full - -# TBD: Unify curlbuild.h with something like diff -D (sparcv9|amd64) curlbuild-32.h curlbuild-64.h > curlbuild.h -# Inspired from http://cvs.opensolaris.org/source/xref/sfw/usr/src/cmd/apr/apr-1.3/Makefile.sfw -EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-32.h,p" -EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-64.h,p" -EXTRA_PAX_ARGS_32 += -s ",$(libdir)/libcurl\.so\.4\.2\.0$$,$(libdir_install)/libcurl-$(FEATURES).so.4.2.0,p" -EXTRA_PAX_ARGS_64 += -s ",$(libdir)/libcurl\.so\.4\.2\.0$$,$(libdir_install)/$(ISA)/libcurl-$(FEATURES).so.4.2.0,p" -EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) - -# We select pkgconfig for minimal library bindings. As libneon is self-contained (links -# to all necessary libs directly) the full version can simly be linked in. -EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,," -EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES)) - -MERGE_SCRIPTS_isa-default-features-minimal = copy-all -MERGE_SCRIPTS_isa-default64-features-minimal = copy-relocated-only -MERGE_DIRS_isa-default64-features-minimal = $(libdir) -MERGE_SCRIPTS_isa-default-features-full = copy-only -MERGE_DIRS_isa-default-features-full = $(libdir) -MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only -MERGE_DIRS_isa-default64-features-full = $(libdir) - -ALTERNATIVES_CSWcurlrt = minimal -ALTERNATIVES_CSWcurlrtfull = full -ALTERNATIVE_minimal = $(libdir)/libcurl.so.4.2.0 curl $(libdir)/libcurl-minimal.so.4.2.0 100 -ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libcurl.so.4.2.0 curl64 $(libdir)/$(ISA_DEFAULT64)/libcurl-minimal.so.4.2.0 -ALTERNATIVE_full = $(libdir)/libcurl.so.4.2.0 curl $(libdir)/libcurl-full.so.4.2.0 200 -ALTERNATIVE_full += $(libdir)/$(ISA_DEFAULT64)/libcurl.so.4.2.0 curl64 $(libdir)/$(ISA_DEFAULT64)/libcurl-full.so.4.2.0 - -PKGFILES_CSWcurldevel = $(PKGFILES_DEVEL) -PKGFILES_CSWcurlrt = $(PKGFILES_RT) -PKGFILES_CSWcurlrtfull = .*-full.* - -# recompile curl to link to new ldap, and temporarily include -# the following block to make checkpkg happy. nothing in the curl -# package changed, so it should be ok, no? -CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibssh2 -CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWoldaprt -CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWsasl -CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibcares -CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibnet -CHECKPKG_OVERRIDES_CSWcurldevel += surplus-dependency|CSWcurl -CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-minimal.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-minimal.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrt += non-uniform-lib-versions-in-package|sonames=['libcurl.so.2',|'libcurl.so.3',|'libcurl.so.4'] -CHECKPKG_OVERRIDES_CSWcurlrt += file-conflict|/opt/csw/lib/sparcv9/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull -CHECKPKG_OVERRIDES_CSWcurlrt += file-conflict|/opt/csw/lib/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull -CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibcares -CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibssh2 -CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibfbopenssl -CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWoldaprt -CHECKPKG_OVERRIDES_CSWcurlrt += surplus-dependency|CSWalternatives -CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/sparcv9/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull -CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull -CHECKPKG_OVERRIDES_CSWcurlrtfull += surplus-dependency|CSWalternatives -CHECKPKG_OVERRIDES_CSWcurlrtfull += shared-lib-pkgname-mismatch|sonames=['libcurl.so.4']|pkgname=CSWcurlrtfull|expected=['CSWlibcurl4']| - -# end checkpkg happiness section - include gar/category.mk -post-install-isa-sparcv8-features-minimal: - ginstall $(FILEDIR)/libcurl.so.3.0.0.s $(DESTDIR)$(libdir)/libcurl.so.3.0.0 - ginstall $(FILEDIR)/libcurl.so.2.0.2.s $(DESTDIR)$(libdir)/libcurl.so.2.0.2 +post-install-isa-sparcv8: + ginstall -d $(DESTDIR)$(libdir) + ginstall $(WORKDIR)/libcurl.so.3.0.0.s $(DESTDIR)$(libdir)/libcurl.so.3.0.0 ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3 - ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2 @$(MAKECOOKIE) -post-install-isa-i386-features-minimal: - cp $(FILEDIR)/libcurl.so.3.0.0.i $(DESTDIR)$(libdir)/libcurl.so.3.0.0 - cp $(FILEDIR)/libcurl.so.2.0.2.i $(DESTDIR)$(libdir)/libcurl.so.2.0.2 +post-install-isa-i386: + ginstall -d $(DESTDIR)$(libdir) + cp $(WORKDIR)/libcurl.so.3.0.0.i $(DESTDIR)$(libdir)/libcurl.so.3.0.0 ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3 - ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2 @$(MAKECOOKIE) - -post-merge: - ginstall $(FILEDIR)/curlbuild.h $(PKGROOT)$(includedir)/curl/curlbuild.h - @$(MAKECOOKIE) Modified: csw/mgar/pkg/libcurl3/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2011-04-28 00:39:23 UTC (rev 14426) +++ csw/mgar/pkg/libcurl3/trunk/checksums 2011-04-28 16:31:39 UTC (rev 14442) @@ -1 +0,0 @@ -ca96df88e044c7c25d19692ec8b250b2 curl-7.21.2.tar.bz2 Added: csw/mgar/pkg/libcurl3/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/libcurl3/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/libcurl3/trunk/files/COPYING 2011-04-28 16:31:39 UTC (rev 14442) @@ -0,0 +1,21 @@ +COPYRIGHT AND PERMISSION NOTICE + +Copyright (c) 1996 - 2010, Daniel Stenberg, . + +All rights reserved. + +Permission to use, copy, modify, and distribute this software for any purpose +with or without fee is hereby granted, provided that the above copyright +notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN +NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE +OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of a copyright holder shall not +be used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization of the copyright holder. Deleted: csw/mgar/pkg/libcurl3/trunk/files/curlbuild.h =================================================================== --- csw/mgar/pkg/curl/trunk/files/curlbuild.h 2011-04-28 00:39:23 UTC (rev 14426) +++ csw/mgar/pkg/libcurl3/trunk/files/curlbuild.h 2011-04-28 16:31:39 UTC (rev 14442) @@ -1,6 +0,0 @@ -/* Allow 32 and 64 bit headers to coexist */ -#if defined __amd64 || defined __x86_64 || defined __sparcv9 -#include "curlbuild-64.h" -#else -#include "curlbuild-32.h" -#endif Deleted: csw/mgar/pkg/libcurl3/trunk/files/libcurl.so.2.0.2.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/libcurl3/trunk/files/libcurl.so.2.0.2.s =================================================================== (Binary files differ) 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 Apr 28 18:34:20 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Apr 2011 16:34:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[14443] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14443 http://gar.svn.sourceforge.net/gar/?rev=14443&view=rev Author: bdwalton Date: 2011-04-28 16:34:19 +0000 (Thu, 28 Apr 2011) Log Message: ----------- bacula/trunk: add prototype modifiers to handle user/group changes Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 16:31:39 UTC (rev 14442) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 16:34:19 UTC (rev 14443) @@ -242,6 +242,16 @@ POSTMSG += /opt/csw/share/doc/bacula_sd/README.postmsg POSTMSG += /opt/csw/share/doc/bacula_fd/README.postmsg +PROTOTYPE_MODIFIERS = usergroupfiles confgroup +PROTOTYPE_FILES_usergroupfiles = /var/opt/csw/bacula.* +PROTOTYPE_CLASS_usergroupfiles = ugfiles +PROTOTYPE_USER_usergroupfiles = bacula +PROTOTYPE_GROUP_usergroupfiles = bacula +PROTOTYPE_PERMS_usergroupfiles = 0770 +PROTOTYPE_FILES_confgroup = /etc/opt/csw/bacula/.*conf.* +PROTOTYPE_CLASS_confgroup = ugfiles +PROTOTYPE_GROUP_confgroup = bacula + include gar/category.mk pre-configure-modulated: 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 Apr 28 18:36:20 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Apr 2011 16:36:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[14444] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14444 http://gar.svn.sourceforge.net/gar/?rev=14444&view=rev Author: bdwalton Date: 2011-04-28 16:36:20 +0000 (Thu, 28 Apr 2011) Log Message: ----------- bacula/trunk: turn the tray-monitor config into a preservable file Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 16:34:19 UTC (rev 14443) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 16:36:20 UTC (rev 14444) @@ -233,6 +233,7 @@ PRESERVECONF = $(sysconfdir)/bacula-dir.conf $(sysconfdir)/bacula-sd.conf PRESERVECONF += $(sysconfdir)/bacula-fd.conf $(sysconfdir)/bconsole.conf PRESERVECONF += $(sysconfdir)/mtx-changer.conf $(sysconfdir)/query.sql +PRESERVECONF += $(sysconfdir)/tray-monitor.conf USERGROUP += /etc/opt/csw/pkg/CSWbacula-director/cswusergroup USERGROUP += /etc/opt/csw/pkg/CSWbacula-sd/cswusergroup 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 Apr 28 18:37:48 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Apr 2011 16:37:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14445] csw/mgar/pkg/curl Message-ID: Revision: 14445 http://gar.svn.sourceforge.net/gar/?rev=14445&view=rev Author: dmichelsen Date: 2011-04-28 16:37:48 +0000 (Thu, 28 Apr 2011) Log Message: ----------- curl: Make tag of last build recipe, move stuff away as new recipes are in libcurl2/3/4 Modified Paths: -------------- csw/mgar/pkg/curl/tags/curl-7.21.2-last-unified-soname-build/Makefile Added Paths: ----------- csw/mgar/pkg/curl/tags/curl-7.21.2-last-unified-soname-build/ Removed Paths: ------------- csw/mgar/pkg/curl/trunk/ Modified: csw/mgar/pkg/curl/tags/curl-7.21.2-last-unified-soname-build/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2011-04-28 00:39:23 UTC (rev 14426) +++ csw/mgar/pkg/curl/tags/curl-7.21.2-last-unified-soname-build/Makefile 2011-04-28 16:37:48 UTC (rev 14445) @@ -43,6 +43,8 @@ EXTRA_CONFIGURE_ARGS_features-full = --enable-ares --with-spnego=$(libdir) EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap --enable-ldaps +EXTRA_LDFLAGS = -L$(libdir)/libnet-new + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl CONFIGURE_ARGS += --with-ca-path=/opt/csw/ssl/certs @@ -51,7 +53,6 @@ BUILD64 = 1 # We are doing 64 bit only for the libs -NOISAEXEC = 1 RUNTIME_DEP_PKGS_CSWcurl = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl CSWcurlrt CSWlibcares CSWlibssh2 RUNTIME_DEP_PKGS_CSWcurlrt = CSWlibidn CSWosslrt CSWzlib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Apr 28 20:32:56 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Apr 2011 18:32:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[14446] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14446 http://gar.svn.sourceforge.net/gar/?rev=14446&view=rev Author: bdwalton Date: 2011-04-28 18:32:56 +0000 (Thu, 28 Apr 2011) Log Message: ----------- bacula/trunk: relax the prototype files modifier for the confgroup stuff so in includes query.sql too Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 16:37:48 UTC (rev 14445) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 18:32:56 UTC (rev 14446) @@ -249,7 +249,7 @@ PROTOTYPE_USER_usergroupfiles = bacula PROTOTYPE_GROUP_usergroupfiles = bacula PROTOTYPE_PERMS_usergroupfiles = 0770 -PROTOTYPE_FILES_confgroup = /etc/opt/csw/bacula/.*conf.* +PROTOTYPE_FILES_confgroup = /etc/opt/csw/bacula/.* PROTOTYPE_CLASS_confgroup = ugfiles PROTOTYPE_GROUP_confgroup = bacula 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 Apr 28 21:05:57 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Apr 2011 19:05:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[14447] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14447 http://gar.svn.sourceforge.net/gar/?rev=14447&view=rev Author: bdwalton Date: 2011-04-28 19:05:57 +0000 (Thu, 28 Apr 2011) Log Message: ----------- bacula/trunk: make the doc package archall Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 18:32:56 UTC (rev 14446) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 19:05:57 UTC (rev 14447) @@ -70,6 +70,7 @@ CATALOGNAME_CSWbacula-doc = bacula_doc SPKG_DESC_CSWbacula-doc = $(DESCRIPTION) - Documentation PKGFILES_CSWbacula-doc += .*doc/$(NAME)/.* +ARCHALL_CSWbacula-doc = 1 CHECKPKG_OVERRIDES_CSWbacula-doc += file-with-bad-content CHECKPKG_OVERRIDES_CSWbacula-doc += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWbacula-doc += missing-dependency|CSWperl 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 Apr 28 21:39:54 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Apr 2011 19:39:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14448] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14448 http://gar.svn.sourceforge.net/gar/?rev=14448&view=rev Author: bdwalton Date: 2011-04-28 19:39:54 +0000 (Thu, 28 Apr 2011) Log Message: ----------- bacula/trunk: ensure we properly include the btraceback files in the common package Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 19:05:57 UTC (rev 14447) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 19:39:54 UTC (rev 14448) @@ -111,7 +111,7 @@ PKGFILES_CSWbacula-common += .*sbin/bsmtp .*sbin/btraceback PKGFILES_CSWbacula-common += .*man1/bsmtp.1.gz .*man1/btraceback.1.gz PKGFILES_CSWbacula-common += .*man8/bacula.8.gz -PKGFILES_CSWbacula-common += .*libexec/btraceback.gdb +PKGFILES_CSWbacula-common += .*libexec/bacula/btraceback.* CATALOGNAME_CSWbacula-fd = bacula_fd SPKG_DESC_CSWbacula-fd = $(DESCRIPTION) - File Daemon 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 Apr 28 21:45:19 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Apr 2011 19:45:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[14449] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14449 http://gar.svn.sourceforge.net/gar/?rev=14449&view=rev Author: bdwalton Date: 2011-04-28 19:45:19 +0000 (Thu, 28 Apr 2011) Log Message: ----------- bacula/trunk: expand the files included in director package to gobble up extra database utility helpers Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 19:39:54 UTC (rev 14448) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 19:45:19 UTC (rev 14449) @@ -171,7 +171,11 @@ PKGFILES_CSWbacula-director += .*sbin/dbcheck .*bacula/working PKGFILES_CSWbacula-director += .*libexec.*catalog_backup.* .*libexec.*query.sql PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/query.sql.CSW -PKGFILES_CSWbacula-director += .*libexec.*mysql_tables.* +PKGFILES_CSWbacula-director += .*libexec/bacula/.*_tables +PKGFILES_CSWbacula-director += .*libexec/bacula/.*_database +PKGFILES_CSWbacula-director += .*libexec/bacula/.*_privileges +PKGFILES_CSWbacula-director += .*libexec/bacula/.*_catalog.* +PKGFILES_CSWbacula-director += .*libexec/bacula/update.*tables.* PKGFILES_CSWbacula-director += .*bacula/bacula-dir.conf.CSW PKGFILES_CSWbacula-director += .*man8/bacula-dir.8.gz .*man8/dbcheck.8.gz PKGFILES_CSWbacula-director += /var/opt/csw/run 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 Apr 28 22:10:31 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Apr 2011 20:10:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14450] csw/mgar/pkg/libneon27/trunk/Makefile Message-ID: Revision: 14450 http://gar.svn.sourceforge.net/gar/?rev=14450&view=rev Author: dmichelsen Date: 2011-04-28 20:10:30 +0000 (Thu, 28 Apr 2011) Log Message: ----------- libneon27: Adjust name from neonfull_stub to neon_full_stub Modified Paths: -------------- csw/mgar/pkg/libneon27/trunk/Makefile Modified: csw/mgar/pkg/libneon27/trunk/Makefile =================================================================== --- csw/mgar/pkg/libneon27/trunk/Makefile 2011-04-28 19:45:19 UTC (rev 14449) +++ csw/mgar/pkg/libneon27/trunk/Makefile 2011-04-28 20:10:30 UTC (rev 14450) @@ -23,6 +23,8 @@ FOREIGN_PACKAGES += CSWlibneon26-feature OBSOLETED_BY_CSWlibneon26-feature = CSWneonfull +CATALOGNAME_CSWneonfull = neon_full_stub + PACKAGES += CSWlibneon27 CATALOGNAME_CSWlibneon27 = libneon27 SPKG_DESC_CSWlibneon27 = Neon HTTP and WebDAV client library, libneon.so.27 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 Apr 28 22:31:40 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Apr 2011 20:31:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14451] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14451 http://gar.svn.sourceforge.net/gar/?rev=14451&view=rev Author: bdwalton Date: 2011-04-28 20:31:40 +0000 (Thu, 28 Apr 2011) Log Message: ----------- bacula/trunk: set perms on sbin and libexec files to be 0755 instead of 0750 (following debians lead here) Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 20:10:30 UTC (rev 14450) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-28 20:31:40 UTC (rev 14451) @@ -248,7 +248,7 @@ POSTMSG += /opt/csw/share/doc/bacula_sd/README.postmsg POSTMSG += /opt/csw/share/doc/bacula_fd/README.postmsg -PROTOTYPE_MODIFIERS = usergroupfiles confgroup +PROTOTYPE_MODIFIERS = usergroupfiles confgroup generalperms PROTOTYPE_FILES_usergroupfiles = /var/opt/csw/bacula.* PROTOTYPE_CLASS_usergroupfiles = ugfiles PROTOTYPE_USER_usergroupfiles = bacula @@ -257,6 +257,8 @@ PROTOTYPE_FILES_confgroup = /etc/opt/csw/bacula/.* PROTOTYPE_CLASS_confgroup = ugfiles PROTOTYPE_GROUP_confgroup = bacula +PROTOTYPE_FILES_generalperms = /opt/csw/sbin/.* /opt/csw/libexec/bacula/.* +PROTOTYPE_PERMS_generalperms = 0755 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 Apr 28 22:56:31 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Apr 2011 20:56:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14452] csw/mgar/pkg Message-ID: Revision: 14452 http://gar.svn.sourceforge.net/gar/?rev=14452&view=rev Author: dmichelsen Date: 2011-04-28 20:56:30 +0000 (Thu, 28 Apr 2011) Log Message: ----------- libcurl4: Split off soname specific library, massive move ahead Modified Paths: -------------- csw/mgar/pkg/libcurl4/branches/curl-7.21.2/Makefile csw/mgar/pkg/libcurl4/trunk/Makefile csw/mgar/pkg/libcurl4/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libcurl4/ csw/mgar/pkg/libcurl4/branches/curl-7.21.2/ csw/mgar/pkg/libcurl4/trunk/files/0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch Removed Paths: ------------- csw/mgar/pkg/libcurl4/trunk/files/libcurl.so.2.0.2.i csw/mgar/pkg/libcurl4/trunk/files/libcurl.so.2.0.2.s csw/mgar/pkg/libcurl4/trunk/files/libcurl.so.3.0.0.i csw/mgar/pkg/libcurl4/trunk/files/libcurl.so.3.0.0.s Modified: csw/mgar/pkg/libcurl4/branches/curl-7.21.2/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2010-12-08 03:48:13 UTC (rev 11840) +++ csw/mgar/pkg/libcurl4/branches/curl-7.21.2/Makefile 2011-04-28 20:56:30 UTC (rev 14452) @@ -15,10 +15,6 @@ MASTER_SITES = http://curl.haxx.se/download/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += libcurl.so.3.0.0.s -DISTFILES += libcurl.so.2.0.2.s -DISTFILES += libcurl.so.3.0.0.i -DISTFILES += libcurl.so.2.0.2.i DISTFILES += curlbuild.h UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -43,7 +39,12 @@ EXTRA_CONFIGURE_ARGS_features-full = --enable-ares --with-spnego=$(libdir) EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap --enable-ldaps +EXTRA_LDFLAGS = -L$(libdir)/libnet-new + +EXTRA_LD_OPTIONS = -f libcurl-full.so.4.2.0 + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-static --enable-shared CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl CONFIGURE_ARGS += --with-ca-path=/opt/csw/ssl/certs CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_features-$(FEATURES)) @@ -127,22 +128,10 @@ # end checkpkg happiness section +#build-modulated: EXTRA_LD_OPTIONS=$(EXTRA_LD_OPTIONS_features-$(FEATURES)) + include gar/category.mk -post-install-isa-sparcv8-features-minimal: - ginstall $(FILEDIR)/libcurl.so.3.0.0.s $(DESTDIR)$(libdir)/libcurl.so.3.0.0 - ginstall $(FILEDIR)/libcurl.so.2.0.2.s $(DESTDIR)$(libdir)/libcurl.so.2.0.2 - ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3 - ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2 - @$(MAKECOOKIE) - -post-install-isa-i386-features-minimal: - cp $(FILEDIR)/libcurl.so.3.0.0.i $(DESTDIR)$(libdir)/libcurl.so.3.0.0 - cp $(FILEDIR)/libcurl.so.2.0.2.i $(DESTDIR)$(libdir)/libcurl.so.2.0.2 - ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3 - ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2 - @$(MAKECOOKIE) - post-merge: ginstall $(FILEDIR)/curlbuild.h $(PKGROOT)$(includedir)/curl/curlbuild.h @$(MAKECOOKIE) Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2011-04-28 00:39:23 UTC (rev 14426) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2011-04-28 20:56:30 UTC (rev 14452) @@ -1,8 +1,8 @@ NAME = curl -VERSION = 7.21.2 +VERSION = 7.21.6 CATEGORIES = net -DESCRIPTION = Command line tool and library for client-side URL transfers. +DESCRIPTION = Command line tool and library for client-side URL transfers define BLURB curl and libcurl is a tool for transferring files using URL syntax. It supports HTTP, HTTPS, FTP, FTPS, DICT, TELNET, LDAP, FILE, and GOPHER, as @@ -15,34 +15,87 @@ MASTER_SITES = http://curl.haxx.se/download/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += libcurl.so.3.0.0.s -DISTFILES += libcurl.so.2.0.2.s -DISTFILES += libcurl.so.3.0.0.i -DISTFILES += libcurl.so.2.0.2.i DISTFILES += curlbuild.h -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +# Use patch until this is fixed: +# https://sourceforge.net/tracker/?func=detail&aid=3294509&group_id=976&atid=100976 +PATCHFILES += 0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch -PACKAGES = CSWcurl CSWcurlrt CSWcurlrtfull CSWcurldevel -CATALOGNAME_CSWcurl = curl -CATALOGNAME_CSWcurlrt = curl_rt -CATALOGNAME_CSWcurlrtfull = curl_rt_full -CATALOGNAME_CSWcurldevel = curl_devel +FOREIGN_PACKAGES += CSWlibcurl2 +OBSOLETED_BY_CSWlibcurl2 += CSWcurlrt +CATALOGNAME_CSWcurlrt = curl_rt_stub -SPKG_DESC_CSWcurl = A command line tool and library for client-side URL transfers -SPKG_DESC_CSWcurlrt = Curl Runtime Libraries (minimal dependencies) -SPKG_DESC_CSWcurlrtfull = Curl Runtime Libraries (full featured) -SPKG_DESC_CSWcurldevel = Curl Developer Files +FOREIGN_PACKAGES += CSWlibcurl3 +OBSOLETED_BY_CSWlibcurl3 += CSWcurlrt -SPKG_SOURCEURL = http://curl.haxx.se +PACKAGES += CSWlibcurl4 +CATALOGNAME_CSWlibcurl4 = libcurl4 +SPKG_DESC_CSWlibcurl4 = Library for client-side URL transfers, libcurl.so.4 +PKGFILES_CSWlibcurl4 = $(call pkgfiles_lib,libcurl.so.4) +OBSOLETED_BY_CSWlibcurl4 = CSWcurlrt +RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibidn +RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWzlib +PACKAGES += CSWlibcurl4-feature +CATALOGNAME_CSWlibcurl4-feature = libcurl4_feature +SPKG_DESC_CSWlibcurl4-feature = Full-features library for client-side URL transfers superseding libcurl.so.4 +PKGFILES_CSWlibcurl4-feature = $(call pkgfiles_lib,libcurl-feature.so.4) +OBSOLETED_BY_CSWlibcurl4-feature = CSWcurlrtfull +CATALOGNAME_CSWcurlrtfull = curl_rt_full_stub +RUNTIME_DEP_PKGS_CSWcurl-feature += CSWlibidn +RUNTIME_DEP_PKGS_CSWcurl-feature += CSWoldaprt +RUNTIME_DEP_PKGS_CSWcurl-feature += CSWosslrt +RUNTIME_DEP_PKGS_CSWcurl-feature += CSWzlib +RUNTIME_DEP_PKGS_CSWcurl-feature += CSWlibcares +RUNTIME_DEP_PKGS_CSWcurl-feature += CSWlibssh2 +RUNTIME_DEP_PKGS_CSWcurl-feature += CSWlibfbopenssl + +PACKAGES += CSWlibcurl-dev +CATALOGNAME_CSWlibcurl-dev = libcurl_dev +SPKG_DESC_CSWlibcurl-dev = Development files for libcurl.so.4 +PKGFILES_CSWlibcurl-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibcurl-dev = CSWlibcurl4 +OBSOLETED_BY_CSWlibcurl-dev = CSWcurldevel +CATALOGNAME_CSWcurldevel = curl_devel_stub + +PACKAGES += CSWcurl +CATALOGNAME_CSWcurl = curl +SPKG_DESC_CSWcurl = A command line tool and library for client-side URL transfers +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWcurl += CSWlibnet +RUNTIME_DEP_PKGS_CSWcurl += CSWoldaprt +RUNTIME_DEP_PKGS_CSWcurl += CSWzlib +RUNTIME_DEP_PKGS_CSWcurl += CSWsasl +RUNTIME_DEP_PKGS_CSWcurl += CSWcurlrt +RUNTIME_DEP_PKGS_CSWcurl += CSWlibcares +RUNTIME_DEP_PKGS_CSWcurl += CSWlibssh2 +RUNTIME_DEP_PKGS_CSWcurl += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWcurl += CSWlibfbopenssl +RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl4 + +BUILD_DEP_PKGS += CSWoldapdevel +BUILD_DEP_PKGS += CSWossldevel +BUILD_DEP_PKGS += CSWlibcaresdevel +BUILD_DEP_PKGS += CSWlibssh2devel + +VENDOR_URL = http://curl.haxx.se + EXTRA_MODULATORS = FEATURES MODULATIONS_FEATURES = minimal full -EXTRA_CONFIGURE_ARGS_features-minimal = --disable-ldap --without-libssh2 --disable-ares -EXTRA_CONFIGURE_ARGS_features-full = --enable-ares --with-spnego=$(libdir) -EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap --enable-ldaps +EXTRA_CONFIGURE_ARGS_features-minimal += --disable-ldap +EXTRA_CONFIGURE_ARGS_features-minimal += --without-libssh2 +EXTRA_CONFIGURE_ARGS_features-minimal += --disable-ares +EXTRA_CONFIGURE_ARGS_features-full += --enable-ares +EXTRA_CONFIGURE_ARGS_features-full += --with-spnego=$(libdir) +EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap +EXTRA_CONFIGURE_ARGS_features-full += --enable-ldaps + +# Make sure to link to the new libnet. See for details http://wiki.opencsw.org/project-libnet +EXTRA_LDFLAGS = -L$(libdir)/libnet-new + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl CONFIGURE_ARGS += --with-ca-path=/opt/csw/ssl/certs @@ -50,17 +103,7 @@ BUILD64 = 1 -# We are doing 64 bit only for the libs -NOISAEXEC = 1 -RUNTIME_DEP_PKGS_CSWcurl = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl CSWcurlrt CSWlibcares CSWlibssh2 -RUNTIME_DEP_PKGS_CSWcurlrt = CSWlibidn CSWosslrt CSWzlib -RUNTIME_DEP_PKGS_CSWcurlrtfull = CSWlibidn CSWoldaprt CSWosslrt CSWzlib CSWlibcares CSWlibssh2 CSWlibfbopenssl -RUNTIME_DEP_PKGS_CSWcurldevel = CSWcurl - -BUILD_DEP_PKGS = $(filter-out CSWcurl CSWcurlrt,$(RUNTIME_DEP_PKGS_CSWcurl) $(RUNTIME_DEP_PKGS_CSWcurlrt) $(RUNTIME_DEP_PKGS_CSWcurlrtfull) $(RUNTIME_DEP_PKGS_CSWcurldevel)) -BUILD_DEP_PKGS += CSWoldapdevel CSWossldevel CSWlibcaresdevel CSWlibssh2devel - SKIPTEST = 1 # isa-sparcv8-features-minimal isa-sparcv8-features-full isa-sparcv9-features-minimal isa-sparcv9-features-full @@ -69,10 +112,16 @@ # Inspired from http://cvs.opensolaris.org/source/xref/sfw/usr/src/cmd/apr/apr-1.3/Makefile.sfw EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-32.h,p" EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-64.h,p" -EXTRA_PAX_ARGS_32 += -s ",$(libdir)/libcurl\.so\.4\.2\.0$$,$(libdir_install)/libcurl-$(FEATURES).so.4.2.0,p" -EXTRA_PAX_ARGS_64 += -s ",$(libdir)/libcurl\.so\.4\.2\.0$$,$(libdir_install)/$(ISA)/libcurl-$(FEATURES).so.4.2.0,p" EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) +# EXTRA_PAX_ARGS_32 += -s ",.*/libcurl\.so(\.\d+)?$$,$(libdir)/libcurl-$(FEATURES).so.4.2.0,p" +# EXTRA_PAX_ARGS_64 += -s ",$(libdir)/libcurl\.so\.4\.2\.0$$,$(libdir_install)/$(ISA)/libcurl-$(FEATURES).so.4.2.0,p" + +EXTRA_PAX_ARGS_isa-sparcv8-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libcurl\)\(\.so\.\d+\..*\),\1-feature\2,p" +EXTRA_PAX_ARGS_isa-i386-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libcurl\)\(\.so\.\d+\..*\),\1-feature\2,p" +EXTRA_PAX_ARGS_isa-sparcv9-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\.$(libdir)/libcurl\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libcurl-feature\1,p" +EXTRA_PAX_ARGS_isa-amd64-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\.$(libdir)/libcurl\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libcurl-feature\1,p" + # We select pkgconfig for minimal library bindings. As libneon is self-contained (links # to all necessary libs directly) the full version can simly be linked in. EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,," @@ -86,62 +135,21 @@ MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only MERGE_DIRS_isa-default64-features-full = $(libdir) -ALTERNATIVES_CSWcurlrt = minimal -ALTERNATIVES_CSWcurlrtfull = full -ALTERNATIVE_minimal = $(libdir)/libcurl.so.4.2.0 curl $(libdir)/libcurl-minimal.so.4.2.0 100 -ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libcurl.so.4.2.0 curl64 $(libdir)/$(ISA_DEFAULT64)/libcurl-minimal.so.4.2.0 -ALTERNATIVE_full = $(libdir)/libcurl.so.4.2.0 curl $(libdir)/libcurl-full.so.4.2.0 200 -ALTERNATIVE_full += $(libdir)/$(ISA_DEFAULT64)/libcurl.so.4.2.0 curl64 $(libdir)/$(ISA_DEFAULT64)/libcurl-full.so.4.2.0 - -PKGFILES_CSWcurldevel = $(PKGFILES_DEVEL) -PKGFILES_CSWcurlrt = $(PKGFILES_RT) -PKGFILES_CSWcurlrtfull = .*-full.* - -# recompile curl to link to new ldap, and temporarily include -# the following block to make checkpkg happy. nothing in the curl -# package changed, so it should be ok, no? -CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibssh2 -CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWoldaprt -CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWsasl -CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibcares -CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibnet -CHECKPKG_OVERRIDES_CSWcurldevel += surplus-dependency|CSWcurl -CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-minimal.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-minimal.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrt += non-uniform-lib-versions-in-package|sonames=['libcurl.so.2',|'libcurl.so.3',|'libcurl.so.4'] -CHECKPKG_OVERRIDES_CSWcurlrt += file-conflict|/opt/csw/lib/sparcv9/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull -CHECKPKG_OVERRIDES_CSWcurlrt += file-conflict|/opt/csw/lib/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull -CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibcares -CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibssh2 -CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibfbopenssl -CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWoldaprt -CHECKPKG_OVERRIDES_CSWcurlrt += surplus-dependency|CSWalternatives -CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0 -CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/sparcv9/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull -CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull -CHECKPKG_OVERRIDES_CSWcurlrtfull += surplus-dependency|CSWalternatives -CHECKPKG_OVERRIDES_CSWcurlrtfull += shared-lib-pkgname-mismatch|sonames=['libcurl.so.4']|pkgname=CSWcurlrtfull|expected=['CSWlibcurl4']| - -# end checkpkg happiness section - include gar/category.mk -post-install-isa-sparcv8-features-minimal: - ginstall $(FILEDIR)/libcurl.so.3.0.0.s $(DESTDIR)$(libdir)/libcurl.so.3.0.0 - ginstall $(FILEDIR)/libcurl.so.2.0.2.s $(DESTDIR)$(libdir)/libcurl.so.2.0.2 - ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3 - ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2 +post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: EXTRA_LD_OPTIONS = -f libcurl-feature.so.4 +post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: + rm -f $(WORKSRC)/lib/libcurl.la + $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(WORKSRC) $(BUILD_ARGS) @$(MAKECOOKIE) -post-install-isa-i386-features-minimal: - cp $(FILEDIR)/libcurl.so.3.0.0.i $(DESTDIR)$(libdir)/libcurl.so.3.0.0 - cp $(FILEDIR)/libcurl.so.2.0.2.i $(DESTDIR)$(libdir)/libcurl.so.2.0.2 - ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3 - ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2 - @$(MAKECOOKIE) +post-merge: + @# This is needed because the substitutions from pax args do not change the + @# contents of the symlink + rm -f $(PKGROOT)$(libdir)/libcurl-feature.so.4 + ln -s libcurl-feature.so.4.2.0 $(PKGROOT)$(libdir)/libcurl-feature.so.4 + rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libcurl-feature.so.4 + ln -s libcurl-feature.so.4.2.0 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libcurl-feature.so.4 post-merge: ginstall $(FILEDIR)/curlbuild.h $(PKGROOT)$(includedir)/curl/curlbuild.h Modified: csw/mgar/pkg/libcurl4/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2011-04-28 00:39:23 UTC (rev 14426) +++ csw/mgar/pkg/libcurl4/trunk/checksums 2011-04-28 20:56:30 UTC (rev 14452) @@ -1 +1 @@ -ca96df88e044c7c25d19692ec8b250b2 curl-7.21.2.tar.bz2 +6611989a81ebd7b03a35adc3001ddee0 curl-7.21.6.tar.bz2 Added: csw/mgar/pkg/libcurl4/trunk/files/0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch =================================================================== --- csw/mgar/pkg/libcurl4/trunk/files/0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch (rev 0) +++ csw/mgar/pkg/libcurl4/trunk/files/0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch 2011-04-28 20:56:30 UTC (rev 14452) @@ -0,0 +1,30 @@ +From d3924ea3a11fe747edf84bd4e907ce17f61beaad Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 28 Apr 2011 19:34:10 +0200 +Subject: [PATCH] Use stdint.h only when it is available, fall back to inttypes.h + +--- + docs/examples/anyauthput.c | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/docs/examples/anyauthput.c b/docs/examples/anyauthput.c +index 6b3d74a..679b0f3 100644 +--- a/docs/examples/anyauthput.c ++++ b/docs/examples/anyauthput.c +@@ -27,7 +27,12 @@ + # ifdef __VMS + typedef int intptr_t; + # else +-# include ++# ifdef CURL_PULL_STDINT_H ++# include ++# endif ++# ifdef CURL_PULL_INTTYPES_H ++# include ++# endif + # endif + # include + #endif +-- +1.7.3.2 + Deleted: csw/mgar/pkg/libcurl4/trunk/files/libcurl.so.2.0.2.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/libcurl4/trunk/files/libcurl.so.2.0.2.s =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/libcurl4/trunk/files/libcurl.so.3.0.0.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/libcurl4/trunk/files/libcurl.so.3.0.0.s =================================================================== (Binary files differ) 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 Apr 28 23:33:41 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Apr 2011 21:33:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[14453] csw/mgar/pkg/libcurl4/trunk/Makefile Message-ID: Revision: 14453 http://gar.svn.sourceforge.net/gar/?rev=14453&view=rev Author: dmichelsen Date: 2011-04-28 21:33:41 +0000 (Thu, 28 Apr 2011) Log Message: ----------- libcurl4: Update deps Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2011-04-28 20:56:30 UTC (rev 14452) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2011-04-28 21:33:41 UTC (rev 14453) @@ -33,9 +33,9 @@ SPKG_DESC_CSWlibcurl4 = Library for client-side URL transfers, libcurl.so.4 PKGFILES_CSWlibcurl4 = $(call pkgfiles_lib,libcurl.so.4) OBSOLETED_BY_CSWlibcurl4 = CSWcurlrt -RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibidn RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWosslrt RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibidn11 PACKAGES += CSWlibcurl4-feature CATALOGNAME_CSWlibcurl4-feature = libcurl4_feature @@ -43,14 +43,20 @@ PKGFILES_CSWlibcurl4-feature = $(call pkgfiles_lib,libcurl-feature.so.4) OBSOLETED_BY_CSWlibcurl4-feature = CSWcurlrtfull CATALOGNAME_CSWcurlrtfull = curl_rt_full_stub -RUNTIME_DEP_PKGS_CSWcurl-feature += CSWlibidn -RUNTIME_DEP_PKGS_CSWcurl-feature += CSWoldaprt -RUNTIME_DEP_PKGS_CSWcurl-feature += CSWosslrt -RUNTIME_DEP_PKGS_CSWcurl-feature += CSWzlib -RUNTIME_DEP_PKGS_CSWcurl-feature += CSWlibcares -RUNTIME_DEP_PKGS_CSWcurl-feature += CSWlibssh2 -RUNTIME_DEP_PKGS_CSWcurl-feature += CSWlibfbopenssl +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWzlib +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibfbopenssl +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWoldaprt +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibssh2 +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibcares2 +# These are artifacts of the feature lib being a regular one. +# As it is never linked against the soname doesn't matter here and the package name +# is obviously different from the soname in this case. +CHECKPKG_OVERRIDES_CSWlibcurl4-feature += shared-lib-pkgname-mismatch +CHECKPKG_OVERRIDES_CSWlibcurl4-feature += soname-not-part-of-filename + PACKAGES += CSWlibcurl-dev CATALOGNAME_CSWlibcurl-dev = libcurl_dev SPKG_DESC_CSWlibcurl-dev = Development files for libcurl.so.4 @@ -63,16 +69,10 @@ CATALOGNAME_CSWcurl = curl SPKG_DESC_CSWcurl = A command line tool and library for client-side URL transfers # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWcurl += CSWlibnet -RUNTIME_DEP_PKGS_CSWcurl += CSWoldaprt RUNTIME_DEP_PKGS_CSWcurl += CSWzlib -RUNTIME_DEP_PKGS_CSWcurl += CSWsasl -RUNTIME_DEP_PKGS_CSWcurl += CSWcurlrt -RUNTIME_DEP_PKGS_CSWcurl += CSWlibcares -RUNTIME_DEP_PKGS_CSWcurl += CSWlibssh2 RUNTIME_DEP_PKGS_CSWcurl += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWcurl += CSWlibfbopenssl RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWcurl += CSWosslrt BUILD_DEP_PKGS += CSWoldapdevel BUILD_DEP_PKGS += CSWossldevel @@ -128,7 +128,7 @@ EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES)) MERGE_SCRIPTS_isa-default-features-minimal = copy-all -MERGE_SCRIPTS_isa-default64-features-minimal = copy-relocated-only +MERGE_SCRIPTS_isa-default64-features-minimal = copy-relocated-only copy-config-only MERGE_DIRS_isa-default64-features-minimal = $(libdir) MERGE_SCRIPTS_isa-default-features-full = copy-only MERGE_DIRS_isa-default-features-full = $(libdir) @@ -140,7 +140,7 @@ post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: EXTRA_LD_OPTIONS = -f libcurl-feature.so.4 post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: rm -f $(WORKSRC)/lib/libcurl.la - $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(WORKSRC) $(BUILD_ARGS) + $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(WORKSRC)/lib $(BUILD_ARGS) @$(MAKECOOKIE) post-merge: @@ -150,7 +150,5 @@ ln -s libcurl-feature.so.4.2.0 $(PKGROOT)$(libdir)/libcurl-feature.so.4 rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libcurl-feature.so.4 ln -s libcurl-feature.so.4.2.0 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libcurl-feature.so.4 - -post-merge: ginstall $(FILEDIR)/curlbuild.h $(PKGROOT)$(includedir)/curl/curlbuild.h @$(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 Apr 29 03:29:08 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 29 Apr 2011 01:29:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14454] csw/mgar/pkg/php5/trunk Message-ID: Revision: 14454 http://gar.svn.sourceforge.net/gar/?rev=14454&view=rev Author: bdwalton Date: 2011-04-29 01:29:07 +0000 (Fri, 29 Apr 2011) Log Message: ----------- php5/trunk: add the httpd-php5.conf file to the ap2_modphp5 package Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/php5/trunk/files/httpd-php5.conf Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-28 21:33:41 UTC (rev 14453) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-29 01:29:07 UTC (rev 14454) @@ -41,6 +41,7 @@ DISTFILES += phpext pear.conf.CSW CSWphp5.postinstall DISTFILES += CSWphp5.cswreleasenotes DISTFILES += CSWap2-modphp5.cswreleasenotes +DISTFILES += httpd-php5.conf PATCHFILES += 0001-Strip-usr-ucblib-references.patch # this one is filed upstream: http://bugs.php.net/bug.php?id=54318 @@ -65,6 +66,7 @@ BUILD_DEP_PKGS += CSWsqlite PRESERVECONF = /etc$(prefix)/php5/php.ini /etc$(prefix)/php5/pear.conf +PRESERVECONF += /opt/csw/apache2/etc/extra/httpd-php5.conf MIGRATE_FILES_CSWphp5 = "php.ini pear.conf" MIGRATE_SOURCE_DIR_php_ini = /opt/csw/php5/lib MIGRATE_SOURCE_DIR_pear_conf = /opt/csw/php5/etc @@ -325,9 +327,12 @@ @$(MAKECOOKIE) post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf +post-install-modulated: AP2EXTCONF=/opt/csw/apache2/etc/extra post-install-modulated: INIDEST=$(DESTDIR)/etc$(prefix)/php5/php.ini post-install-modulated: @rm -f $(DESTDIR)$(AP2SYSCONF) + @mkdir -p $(DESTDIR)$(AP2EXTCONF) + @cp $(WORKSRC)/httpd-php5.conf $(AP2EXTCONF) @cp $(WORKSRC)/php.ini-production $(INIDEST) @ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(prefix)/php5/bin/ @perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST) Added: csw/mgar/pkg/php5/trunk/files/httpd-php5.conf =================================================================== --- csw/mgar/pkg/php5/trunk/files/httpd-php5.conf (rev 0) +++ csw/mgar/pkg/php5/trunk/files/httpd-php5.conf 2011-04-29 01:29:07 UTC (rev 14454) @@ -0,0 +1,6 @@ + + + AddType application/x-httpd-php .php + AddType application/x-httpd-php-source .phps + + 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 Apr 29 04:51:35 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 29 Apr 2011 02:51:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14455] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14455 http://gar.svn.sourceforge.net/gar/?rev=14455&view=rev Author: bdwalton Date: 2011-04-29 02:51:34 +0000 (Fri, 29 Apr 2011) Log Message: ----------- php5/trunk: use workdir, not worksrc, when installing the httpd-php5.conf addon Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-29 01:29:07 UTC (rev 14454) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-29 02:51:34 UTC (rev 14455) @@ -332,7 +332,7 @@ post-install-modulated: @rm -f $(DESTDIR)$(AP2SYSCONF) @mkdir -p $(DESTDIR)$(AP2EXTCONF) - @cp $(WORKSRC)/httpd-php5.conf $(AP2EXTCONF) + @cp $(WORKDIR)/httpd-php5.conf $(AP2EXTCONF) @cp $(WORKSRC)/php.ini-production $(INIDEST) @ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(prefix)/php5/bin/ @perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST) 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 Apr 29 11:41:42 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 29 Apr 2011 09:41:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14456] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 14456 http://gar.svn.sourceforge.net/gar/?rev=14456&view=rev Author: dmichelsen Date: 2011-04-29 09:41:42 +0000 (Fri, 29 Apr 2011) Log Message: ----------- mGAR v2: Bugfix after pcopy transition for copy-config-only Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2011-04-29 02:51:34 UTC (rev 14455) +++ csw/mgar/gar/v2/gar.mk 2011-04-29 09:41:42 UTC (rev 14456) @@ -887,8 +887,7 @@ # Copy merge-copy-config-only: $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pcopy $(_PAX_ARGS) \ - -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \ - -s ",.*,," \ + -m -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \ . $(PKGROOT) \ ) @$(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 Apr 29 12:01:30 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 29 Apr 2011 10:01:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[14457] csw/mgar/pkg/libcurl4/trunk Message-ID: Revision: 14457 http://gar.svn.sourceforge.net/gar/?rev=14457&view=rev Author: dmichelsen Date: 2011-04-29 10:01:30 +0000 (Fri, 29 Apr 2011) Log Message: ----------- libcurl4: Dynamically generate curlbuild.h Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libcurl4/trunk/files/curlbuild.h Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2011-04-29 09:41:42 UTC (rev 14456) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2011-04-29 10:01:30 UTC (rev 14457) @@ -15,7 +15,6 @@ MASTER_SITES = http://curl.haxx.se/download/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += curlbuild.h # Use patch until this is fixed: # https://sourceforge.net/tracker/?func=detail&aid=3294509&group_id=976&atid=100976 @@ -103,20 +102,12 @@ BUILD64 = 1 +# There are some failing tests, ignore for now +SKIPTEST ?= 1 -SKIPTEST = 1 +# We do special 32/64 merging for this one, see post-merge +EXTRA_MERGE_EXCLUDE_FILES += $(includedir)/curl/curlbuild.h -# isa-sparcv8-features-minimal isa-sparcv8-features-full isa-sparcv9-features-minimal isa-sparcv9-features-full - -# TBD: Unify curlbuild.h with something like diff -D (sparcv9|amd64) curlbuild-32.h curlbuild-64.h > curlbuild.h -# Inspired from http://cvs.opensolaris.org/source/xref/sfw/usr/src/cmd/apr/apr-1.3/Makefile.sfw -EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-32.h,p" -EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-64.h,p" -EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) - -# EXTRA_PAX_ARGS_32 += -s ",.*/libcurl\.so(\.\d+)?$$,$(libdir)/libcurl-$(FEATURES).so.4.2.0,p" -# EXTRA_PAX_ARGS_64 += -s ",$(libdir)/libcurl\.so\.4\.2\.0$$,$(libdir_install)/$(ISA)/libcurl-$(FEATURES).so.4.2.0,p" - EXTRA_PAX_ARGS_isa-sparcv8-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libcurl\)\(\.so\.\d+\..*\),\1-feature\2,p" EXTRA_PAX_ARGS_isa-i386-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libcurl\)\(\.so\.\d+\..*\),\1-feature\2,p" EXTRA_PAX_ARGS_isa-sparcv9-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\.$(libdir)/libcurl\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libcurl-feature\1,p" @@ -150,5 +141,10 @@ ln -s libcurl-feature.so.4.2.0 $(PKGROOT)$(libdir)/libcurl-feature.so.4 rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libcurl-feature.so.4 ln -s libcurl-feature.so.4.2.0 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libcurl-feature.so.4 - ginstall $(FILEDIR)/curlbuild.h $(PKGROOT)$(includedir)/curl/curlbuild.h + pwd + gdiff -D 64bit \ + $(WORKROOTDIR)/install-isa-$(ISA_DEFAULT64)-features-minimal$(includedir)/curl/curlbuild.h \ + $(WORKROOTDIR)/install-isa-$(ISA_DEFAULT)-features-minimal$(includedir)/curl/curlbuild.h \ + | sed -e 's/ifndef 64bit/if defined __amd64 || defined __x86_64 || defined __sparcv9/' \ + > $(PKGROOT)$(includedir)/curl/curlbuild.h @$(MAKECOOKIE) Deleted: csw/mgar/pkg/libcurl4/trunk/files/curlbuild.h =================================================================== --- csw/mgar/pkg/libcurl4/trunk/files/curlbuild.h 2011-04-29 09:41:42 UTC (rev 14456) +++ csw/mgar/pkg/libcurl4/trunk/files/curlbuild.h 2011-04-29 10:01:30 UTC (rev 14457) @@ -1,6 +0,0 @@ -/* Allow 32 and 64 bit headers to coexist */ -#if defined __amd64 || defined __x86_64 || defined __sparcv9 -#include "curlbuild-64.h" -#else -#include "curlbuild-32.h" -#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 29 14:34:38 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 29 Apr 2011 12:34:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[14458] csw/mgar/pkg/libcurl4/trunk/Makefile Message-ID: Revision: 14458 http://gar.svn.sourceforge.net/gar/?rev=14458&view=rev Author: dmichelsen Date: 2011-04-29 12:34:38 +0000 (Fri, 29 Apr 2011) Log Message: ----------- libcurl4: Add missing dependencies, disable static libs Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2011-04-29 10:01:30 UTC (rev 14457) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2011-04-29 12:34:38 UTC (rev 14458) @@ -72,6 +72,12 @@ RUNTIME_DEP_PKGS_CSWcurl += CSWlibidn11 RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWcurl += CSWosslrt +# Double-legacy packages may not even depend on CSWcurlrt, so we must +# also directly depend on CSWlibcurl2 and CSWlibcurl3 +RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl2 +RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl3 +CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibcurl2 +CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibcurl3 BUILD_DEP_PKGS += CSWoldapdevel BUILD_DEP_PKGS += CSWossldevel @@ -96,6 +102,7 @@ EXTRA_LDFLAGS = -L$(libdir)/libnet-new CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl CONFIGURE_ARGS += --with-ca-path=/opt/csw/ssl/certs CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_features-$(FEATURES)) @@ -126,6 +133,9 @@ MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only MERGE_DIRS_isa-default64-features-full = $(libdir) +# TBD: Use alternatives on curl-config between minimal and feature as it is possible to +# use options to find out about installed features and protocols by calling it. + include gar/category.mk post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: EXTRA_LD_OPTIONS = -f libcurl-feature.so.4 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 Apr 29 15:12:23 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 29 Apr 2011 13:12:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[14459] csw/mgar/pkg/libffi/trunk/Makefile Message-ID: Revision: 14459 http://gar.svn.sourceforge.net/gar/?rev=14459&view=rev Author: wahwah Date: 2011-04-29 13:12:22 +0000 (Fri, 29 Apr 2011) Log Message: ----------- pkg/libffi/trunk: Use OBSOLETED_BY_ syntax for -dev rename Modified Paths: -------------- csw/mgar/pkg/libffi/trunk/Makefile Modified: csw/mgar/pkg/libffi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libffi/trunk/Makefile 2011-04-29 12:34:38 UTC (rev 14458) +++ csw/mgar/pkg/libffi/trunk/Makefile 2011-04-29 13:12:22 UTC (rev 14459) @@ -47,9 +47,7 @@ PKGFILES_CSWlibffi-dev += $(datadir)/.* # An empty stub to let checkpkg know about the rename -PACKAGES += CSWlibffidevel -SPKG_DESC_CSWlibffidevel = A stub package, do not release -PKGFILES_CSWlibffidevel = NOFILES +OBSOLETED_BY_CSWlibffi-dev = CSWlibffidevel PACKAGES += CSWlibffi5 SPKG_DESC_CSWlibffi5 = $(DESCRIPTION) - libffi.so.5 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 Apr 29 15:15:29 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 29 Apr 2011 13:15:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[14460] csw/mgar/pkg/libcurl4/trunk/Makefile Message-ID: Revision: 14460 http://gar.svn.sourceforge.net/gar/?rev=14460&view=rev Author: dmichelsen Date: 2011-04-29 13:15:29 +0000 (Fri, 29 Apr 2011) Log Message: ----------- libcurl4: Strip -m32 / -m64 from LDFLAGS as it disturbs 'curl-config --libs' as reported in #4550 Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2011-04-29 13:12:22 UTC (rev 14459) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2011-04-29 13:15:29 UTC (rev 14460) @@ -138,6 +138,9 @@ include gar/category.mk +# These are not really necessary and they confuse the linker as described in #4550 +$(GARCOMPILER)_LD_FLAGS := + post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: EXTRA_LD_OPTIONS = -f libcurl-feature.so.4 post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: rm -f $(WORKSRC)/lib/libcurl.la 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 Apr 29 15:17:27 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 29 Apr 2011 13:17:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[14461] csw/mgar/pkg/libffi/trunk/Makefile Message-ID: Revision: 14461 http://gar.svn.sourceforge.net/gar/?rev=14461&view=rev Author: wahwah Date: 2011-04-29 13:17:26 +0000 (Fri, 29 Apr 2011) Log Message: ----------- pkg/libffi/trunk: Removing the now unnecessary stub. Modified Paths: -------------- csw/mgar/pkg/libffi/trunk/Makefile Modified: csw/mgar/pkg/libffi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libffi/trunk/Makefile 2011-04-29 13:15:29 UTC (rev 14460) +++ csw/mgar/pkg/libffi/trunk/Makefile 2011-04-29 13:17:26 UTC (rev 14461) @@ -46,9 +46,6 @@ PKGFILES_CSWlibffi-dev += $(libdir)/.*/include/.* PKGFILES_CSWlibffi-dev += $(datadir)/.* -# An empty stub to let checkpkg know about the rename -OBSOLETED_BY_CSWlibffi-dev = CSWlibffidevel - PACKAGES += CSWlibffi5 SPKG_DESC_CSWlibffi5 = $(DESCRIPTION) - libffi.so.5 PKGFILES_CSWlibffi5 += .*/libffi\.so\.5.* 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 Apr 29 16:28:36 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 29 Apr 2011 14:28:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[14462] csw/mgar/pkg/libffi/trunk/Makefile Message-ID: Revision: 14462 http://gar.svn.sourceforge.net/gar/?rev=14462&view=rev Author: wahwah Date: 2011-04-29 14:28:35 +0000 (Fri, 29 Apr 2011) Log Message: ----------- using the obsoletes mechanism for libffi Modified Paths: -------------- csw/mgar/pkg/libffi/trunk/Makefile Modified: csw/mgar/pkg/libffi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libffi/trunk/Makefile 2011-04-29 13:17:26 UTC (rev 14461) +++ csw/mgar/pkg/libffi/trunk/Makefile 2011-04-29 14:28:35 UTC (rev 14462) @@ -29,13 +29,8 @@ PATCHFILES += ffi64.c.patch PATCHFILES += 0005-libffi.pc-should-point-at-opt-csw-include.patch -PACKAGES += CSWlibffi -CATALOGNAME_CSWlibffi = libffi -SPKG_DESC_CSWlibffi = Empty transitional package -ARCHALL_CSWlibffi = 1 -# Backward compatibility ensured via a dependency -RUNTIME_DEP_PKGS_CSWlibffi += CSWlibffi5 -CHECKPKG_OVERRIDES_CSWlibffi += surplus-dependency|CSWlibffi5 +OBSOLETED_BY_CSWlibffi5 = CSWlibffi +OBSOLETED_BY_CSWlibffi5-dev = CSWlibffi PACKAGES += CSWlibffi-dev CATALOGNAME_CSWlibffi-dev = libffi_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 Apr 29 16:28:48 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 29 Apr 2011 14:28:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14463] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 14463 http://gar.svn.sourceforge.net/gar/?rev=14463&view=rev Author: bdwalton Date: 2011-04-29 14:28:48 +0000 (Fri, 29 Apr 2011) Log Message: ----------- gar/v2: change the priority of cswusergroup and ugfiles so we can deliver preserveconf, etc classed files with non-standard user/group settings Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-04-29 14:28:35 UTC (rev 14462) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-04-29 14:28:48 UTC (rev 14463) @@ -259,9 +259,15 @@ # you need to ensure any binaries and config files are already on disk # and able to be consumed by a service that might be started. -_CSWCLASSES = cswmigrateconf cswcpsampleconf cswpreserveconf cswcptemplates +# NOTE: cswusergroup and ugfiles were moved to have higher priority +# than the conf handling classes. this allows one to manually set the +# user/group on conf files with prototype modifiers while still +# leveraging the conf handler classes. this is a priority issue as +# per the above note. + +_CSWCLASSES = cswusergroup ugfiles +_CSWCLASSES += cswmigrateconf cswcpsampleconf cswpreserveconf cswcptemplates _CSWCLASSES += cswetcservices -_CSWCLASSES += cswusergroup ugfiles _CSWCLASSES += cswcrontab _CSWCLASSES += cswpycompile _CSWCLASSES += cswinetd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Apr 29 16:31:01 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 29 Apr 2011 14:31:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14464] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 14464 http://gar.svn.sourceforge.net/gar/?rev=14464&view=rev Author: bdwalton Date: 2011-04-29 14:31:01 +0000 (Fri, 29 Apr 2011) Log Message: ----------- gar/v2: update note on class ordering change to provide concrete example of where this is necessary Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-04-29 14:28:48 UTC (rev 14463) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-04-29 14:31:01 UTC (rev 14464) @@ -263,7 +263,8 @@ # than the conf handling classes. this allows one to manually set the # user/group on conf files with prototype modifiers while still # leveraging the conf handler classes. this is a priority issue as -# per the above note. +# per the above note. (See bacula for an example of where this is +# required.) _CSWCLASSES = cswusergroup ugfiles _CSWCLASSES += cswmigrateconf cswcpsampleconf cswpreserveconf cswcptemplates 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 Apr 29 16:34:38 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 29 Apr 2011 14:34:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[14465] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14465 http://gar.svn.sourceforge.net/gar/?rev=14465&view=rev Author: bdwalton Date: 2011-04-29 14:34:38 +0000 (Fri, 29 Apr 2011) Log Message: ----------- bacula/trunk: update prototype modifiers to ensure we still use preserveconf with bacula group setting Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 14:31:01 UTC (rev 14464) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 14:34:38 UTC (rev 14465) @@ -255,8 +255,9 @@ PROTOTYPE_GROUP_usergroupfiles = bacula PROTOTYPE_PERMS_usergroupfiles = 0770 PROTOTYPE_FILES_confgroup = /etc/opt/csw/bacula/.* -PROTOTYPE_CLASS_confgroup = ugfiles +PROTOTYPE_CLASS_confgroup = cswpreserveconf PROTOTYPE_GROUP_confgroup = bacula +PROTOTYPE_PERMS_confgroup = 0640 PROTOTYPE_FILES_generalperms = /opt/csw/sbin/.* /opt/csw/libexec/bacula/.* PROTOTYPE_PERMS_generalperms = 0755 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 Apr 29 16:59:23 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 29 Apr 2011 14:59:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[14466] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14466 http://gar.svn.sourceforge.net/gar/?rev=14466&view=rev Author: bdwalton Date: 2011-04-29 14:59:22 +0000 (Fri, 29 Apr 2011) Log Message: ----------- bacula/trunk: the file director needs a user/group file too as it has configs owned by group bacula too Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 14:34:38 UTC (rev 14465) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 14:59:22 UTC (rev 14466) @@ -128,6 +128,7 @@ PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz .*bacula/bacula-fd.conf.CSW PKGFILES_CSWbacula-fd += /var/opt/csw/run PKGFILES_CSWbacula-fd += .*bacula_fd/.*postmsg +PKGFILES_CSWbacula-fd += /etc/opt/csw/pkg/CSWbacula-fd/cswusergroup CATALOGNAME_CSWbacula-sd = bacula_sd SPKG_DESC_CSWbacula-sd = $(DESCRIPTION) - Storage Daemon @@ -242,6 +243,7 @@ USERGROUP += /etc/opt/csw/pkg/CSWbacula-director/cswusergroup USERGROUP += /etc/opt/csw/pkg/CSWbacula-sd/cswusergroup +USERGROUP += /etc/opt/csw/pkg/CSWbacula-fd/cswusergroup POSTMSG = /opt/csw/share/doc/bacula_director/README.postmsg POSTMSG += /opt/csw/share/doc/bacula_console/README.postmsg @@ -301,7 +303,7 @@ post-merge: @echo Adding user/group creation info... @(cd $(PKGROOT)/etc/opt/csw; \ - for p in director sd; do \ + for p in director sd fd; do \ mkdir -p pkg/CSWbacula-$$p; \ echo "bacula:bacula:Bacula:/var/opt/csw/bacula/:/bin/false:::NP" > pkg/CSWbacula-$$p/cswusergroup; \ done) 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 Apr 29 17:04:22 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 29 Apr 2011 15:04:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14467] csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Message-ID: Revision: 14467 http://gar.svn.sourceforge.net/gar/?rev=14467&view=rev Author: wahwah Date: 2011-04-29 15:04:22 +0000 (Fri, 29 Apr 2011) Log Message: ----------- submitpkg: Allow to specify an alternate directory A new flag allows to specify a directory from which packages should be read. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2011-04-29 14:59:22 UTC (rev 14466) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2011-04-29 15:04:22 UTC (rev 14467) @@ -124,10 +124,13 @@ dest="catalognames", help="A comma-separated list of catalog names: " "cups,cupsdevel,libcups") - parser.add_option("-d", "--debug", + parser.add_option("--debug", dest="debug", default=False, action="store_true", help="Print debugging messages") + parser.add_option("-d", "--package-dir", + dest="package_dir", + help="Specify the directory with packages") parser.add_option("--no-clean", dest="clean", default=True, action="store_false", @@ -164,8 +167,11 @@ print CONFIG_INFO print e sys.exit(1) - staging_dir = opencsw.StagingDir(config.get(CONFIG_RELEASE_SECTION, - "package dir")) + + package_dir = config.get(CONFIG_RELEASE_SECTION, "package dir") + if options.package_dir: + package_dir = options.package_dir + staging_dir = opencsw.StagingDir(package_dir) if options.catalognames: catalognames = options.catalognames.split(",") else: 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 Apr 29 17:04:45 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 29 Apr 2011 15:04:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[14468] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14468 http://gar.svn.sourceforge.net/gar/?rev=14468&view=rev Author: bdwalton Date: 2011-04-29 15:04:45 +0000 (Fri, 29 Apr 2011) Log Message: ----------- bacula/trunk: add /etc/services handling for each of the daemons Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:04:22 UTC (rev 14467) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:04:45 UTC (rev 14468) @@ -129,6 +129,7 @@ PKGFILES_CSWbacula-fd += /var/opt/csw/run PKGFILES_CSWbacula-fd += .*bacula_fd/.*postmsg PKGFILES_CSWbacula-fd += /etc/opt/csw/pkg/CSWbacula-fd/cswusergroup +PKGFILES_CSWbacula-fd += /etc/opt/csw/pkg/CSWbacula-fd/services CATALOGNAME_CSWbacula-sd = bacula_sd SPKG_DESC_CSWbacula-sd = $(DESCRIPTION) - Storage Daemon @@ -154,6 +155,7 @@ PKGFILES_CSWbacula-sd += $(localstatedir)/$(NAME)/archive PKGFILES_CSWbacula-sd += .*bacula_sd/.*postmsg PKGFILES_CSWbacula-sd += /etc/opt/csw/pkg/CSWbacula-sd/cswusergroup +PKGFILES_CSWbacula-sd += /etc/opt/csw/pkg/CSWbacula-sd/services CATALOGNAME_CSWbacula-director = bacula_director SPKG_DESC_CSWbacula-director = $(DESCRIPTION) - Director @@ -183,6 +185,7 @@ PKGFILES_CSWbacula-director += .*share/doc/bacula_director/README.CSW PKGFILES_CSWbacula-director += .*bacula_director/.*postmsg PKGFILES_CSWbacula-director += /etc/opt/csw/pkg/CSWbacula-director/cswusergroup +PKGFILES_CSWbacula-director += /etc/opt/csw/pkg/CSWbacula-director/services # force libraries into a separate subdirectory libdir = $(prefix)/lib/$(NAME) @@ -250,6 +253,10 @@ POSTMSG += /opt/csw/share/doc/bacula_sd/README.postmsg POSTMSG += /opt/csw/share/doc/bacula_fd/README.postmsg +ETCSERVICES = /etc/opt/csw/pkg/CSWbacula-dir/services +ETCSERVICES += /etc/opt/csw/pkg/CSWbacula-fd/services +ETCSERVICES += /etc/opt/csw/pkg/CSWbacula-sd/services + PROTOTYPE_MODIFIERS = usergroupfiles confgroup generalperms PROTOTYPE_FILES_usergroupfiles = /var/opt/csw/bacula.* PROTOTYPE_CLASS_usergroupfiles = ugfiles @@ -306,5 +313,8 @@ for p in director sd fd; do \ mkdir -p pkg/CSWbacula-$$p; \ echo "bacula:bacula:Bacula:/var/opt/csw/bacula/:/bin/false:::NP" > pkg/CSWbacula-$$p/cswusergroup; \ + echo "bacula-dir 9101/tcp" > pkg/CSWbacula-dir/services; \ + echo "bacula-fd 9102/tcp" > pkg/CSWbacula-fd/services; \ + echo "bacula-sd 9103/tcp" > pkg/CSWbacula-sd/services; \ done) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Apr 29 17:07:10 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 29 Apr 2011 15:07:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14469] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14469 http://gar.svn.sourceforge.net/gar/?rev=14469&view=rev Author: bdwalton Date: 2011-04-29 15:07:10 +0000 (Fri, 29 Apr 2011) Log Message: ----------- bacula/trunk: correct the shell code that inserts the services definitions Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:04:45 UTC (rev 14468) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:07:10 UTC (rev 14469) @@ -313,8 +313,7 @@ for p in director sd fd; do \ mkdir -p pkg/CSWbacula-$$p; \ echo "bacula:bacula:Bacula:/var/opt/csw/bacula/:/bin/false:::NP" > pkg/CSWbacula-$$p/cswusergroup; \ + done; \ echo "bacula-dir 9101/tcp" > pkg/CSWbacula-dir/services; \ echo "bacula-fd 9102/tcp" > pkg/CSWbacula-fd/services; \ - echo "bacula-sd 9103/tcp" > pkg/CSWbacula-sd/services; \ - done) - + echo "bacula-sd 9103/tcp" > pkg/CSWbacula-sd/services ) 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 Apr 29 17:15:05 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 29 Apr 2011 15:15:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[14470] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14470 http://gar.svn.sourceforge.net/gar/?rev=14470&view=rev Author: bdwalton Date: 2011-04-29 15:15:05 +0000 (Fri, 29 Apr 2011) Log Message: ----------- bacula/trunk: bacula-director, not bacula-dir... Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:07:10 UTC (rev 14469) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:15:05 UTC (rev 14470) @@ -314,6 +314,6 @@ mkdir -p pkg/CSWbacula-$$p; \ echo "bacula:bacula:Bacula:/var/opt/csw/bacula/:/bin/false:::NP" > pkg/CSWbacula-$$p/cswusergroup; \ done; \ - echo "bacula-dir 9101/tcp" > pkg/CSWbacula-dir/services; \ + echo "bacula-dir 9101/tcp" > pkg/CSWbacula-director/services; \ echo "bacula-fd 9102/tcp" > pkg/CSWbacula-fd/services; \ echo "bacula-sd 9103/tcp" > pkg/CSWbacula-sd/services ) 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 Apr 29 17:25:33 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 29 Apr 2011 15:25:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14471] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14471 http://gar.svn.sourceforge.net/gar/?rev=14471&view=rev Author: bdwalton Date: 2011-04-29 15:25:33 +0000 (Fri, 29 Apr 2011) Log Message: ----------- bacula/trunk: set proper value for directors ETCSERVICES Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:15:05 UTC (rev 14470) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:25:33 UTC (rev 14471) @@ -253,7 +253,7 @@ POSTMSG += /opt/csw/share/doc/bacula_sd/README.postmsg POSTMSG += /opt/csw/share/doc/bacula_fd/README.postmsg -ETCSERVICES = /etc/opt/csw/pkg/CSWbacula-dir/services +ETCSERVICES = /etc/opt/csw/pkg/CSWbacula-director/services ETCSERVICES += /etc/opt/csw/pkg/CSWbacula-fd/services ETCSERVICES += /etc/opt/csw/pkg/CSWbacula-sd/services 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 Apr 29 18:43:12 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 29 Apr 2011 16:43:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[14472] csw/mgar/pkg/bacula/trunk Message-ID: Revision: 14472 http://gar.svn.sourceforge.net/gar/?rev=14472&view=rev Author: bdwalton Date: 2011-04-29 16:43:12 +0000 (Fri, 29 Apr 2011) Log Message: ----------- bacula/trunk: patch the init scripts so that user/group settings are taken into account Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bacula/trunk/files/0003-Make-the-solaris-init-scripts-user-group-aware.patch Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 15:25:33 UTC (rev 14471) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-04-29 16:43:12 UTC (rev 14472) @@ -21,6 +21,7 @@ DISTFILES += postmsg PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch +PATCHFILES += 0003-Make-the-solaris-init-scripts-user-group-aware.patch BUILD_DEP_PKGS = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel BUILD_DEP_PKGS += CSWreadline CSWggettext-dev Added: csw/mgar/pkg/bacula/trunk/files/0003-Make-the-solaris-init-scripts-user-group-aware.patch =================================================================== --- csw/mgar/pkg/bacula/trunk/files/0003-Make-the-solaris-init-scripts-user-group-aware.patch (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/0003-Make-the-solaris-init-scripts-user-group-aware.patch 2011-04-29 16:43:12 UTC (rev 14472) @@ -0,0 +1,101 @@ +From eb01ec6ad7a7ff754cf03302d522f379b1392610 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 29 Apr 2011 11:53:45 -0400 +Subject: [PATCH] Make the solaris init scripts user/group aware + +Import the values for the user and group settings specified by +configure when generating the solaris init scripts. Use these values +for the -u and -g parameters when starting the daemons. + +Signed-off-by: Ben Walton +--- + platforms/solaris/bacula-dir.in | 13 ++++++++++++- + platforms/solaris/bacula-fd.in | 13 ++++++++++++- + platforms/solaris/bacula-sd.in | 13 ++++++++++++- + 3 files changed, 36 insertions(+), 3 deletions(-) + +diff --git a/platforms/solaris/bacula-dir.in b/platforms/solaris/bacula-dir.in +index f34e672..c5a3a93 100755 +--- a/platforms/solaris/bacula-dir.in ++++ b/platforms/solaris/bacula-dir.in +@@ -9,11 +9,22 @@ + # For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ + # + ++DIR_USER=@dir_user@ ++DIR_GROUP=@dir_group@ ++DIR_OPTIONS='' ++ + RETVAL=0 + case "$1" in + start) ++ if [ "${DIR_USER}" != '' ]; then ++ DIR_OPTIONS="${DIR_OPTIONS} -u ${DIR_USER}" ++ fi ++ if [ "${DIR_GROUP}" != '' ]; then ++ DIR_OPTIONS="${DIR_OPTIONS} -g ${DIR_GROUP}" ++ fi ++ + echo "Starting the Bacula Director: " +- @sbindir@/bacula-dir $2 -c @sysconfdir@/bacula-dir.conf ++ @sbindir@/bacula-dir $2 ${DIR_OPTIONS} -c @sysconfdir@/bacula-dir.conf + ;; + stop) + echo "Stopping the Director daemon: " +diff --git a/platforms/solaris/bacula-fd.in b/platforms/solaris/bacula-fd.in +index cd3bef1..eeca38d 100755 +--- a/platforms/solaris/bacula-fd.in ++++ b/platforms/solaris/bacula-fd.in +@@ -9,10 +9,21 @@ + # For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ + # + ++FD_USER=@fd_user@ ++FD_GROUP=@fd_group@ ++FD_OPTIONS='' ++ + case "$1" in + start) ++ if [ "${FD_USER}" != '' ]; then ++ FD_OPTIONS="${FD_OPTIONS} -u ${FD_USER}" ++ fi ++ if [ "${FD_GROUP}" != '' ]; then ++ FD_OPTIONS="${FD_OPTIONS} -g ${FD_GROUP}" ++ fi ++ + echo "Starting the Bacula File daemon: " +- @sbindir@/bacula-fd $2 -c @sysconfdir@/bacula-fd.conf ++ @sbindir@/bacula-fd $2 ${FD_OPTIONS} -c @sysconfdir@/bacula-fd.conf + ;; + stop) + echo "Stopping the Bacula File daemon: " +diff --git a/platforms/solaris/bacula-sd.in b/platforms/solaris/bacula-sd.in +index 6a0adb8..c547697 100755 +--- a/platforms/solaris/bacula-sd.in ++++ b/platforms/solaris/bacula-sd.in +@@ -9,10 +9,21 @@ + # For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ + # + ++SD_USER=@sd_user@ ++SD_GROUP=@sd_group@ ++SD_OPTIONS='' ++ + case "$1" in + start) ++ if [ "${SD_USER}" != '' ]; then ++ SD_OPTIONS="${SD_OPTIONS} -u ${SD_USER}" ++ fi ++ if [ "${SD_GROUP}" != '' ]; then ++ SD_OPTIONS="${SD_OPTIONS} -g ${SD_GROUP}" ++ fi ++ + echo "Starting the Bacula Storage daemon: " +- @sbindir@/bacula-sd $2 -c @sysconfdir@/bacula-sd.conf ++ @sbindir@/bacula-sd $2 ${SD_OPTIONS} -c @sysconfdir@/bacula-sd.conf + ;; + stop) + echo "Stopping the Bacula Storage daemon: " +-- +1.7.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Apr 29 20:52:18 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 29 Apr 2011 18:52:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14473] csw/mgar/pkg/sharutils/trunk Message-ID: Revision: 14473 http://gar.svn.sourceforge.net/gar/?rev=14473&view=rev Author: wahwah Date: 2011-04-29 18:52:18 +0000 (Fri, 29 Apr 2011) Log Message: ----------- pkg/sharutils/trunk: Version bump to 4.11.1, tests are failing. Modified Paths: -------------- csw/mgar/pkg/sharutils/trunk/Makefile csw/mgar/pkg/sharutils/trunk/checksums Modified: csw/mgar/pkg/sharutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/sharutils/trunk/Makefile 2011-04-29 16:43:12 UTC (rev 14472) +++ csw/mgar/pkg/sharutils/trunk/Makefile 2011-04-29 18:52:18 UTC (rev 14473) @@ -7,7 +7,7 @@ # at r10011. NAME = sharutils -VERSION = 4.10 +VERSION = 4.11.1 CATEGORIES = utils DESCRIPTION = Makes so-called shell archives out of many files define BLURB @@ -37,6 +37,8 @@ # We won't be releasing CSWuuencode from this package. CHECKPKG_OVERRIDES_CSWuuencode += file-collision +SKIPTEST ?= 1 + include gar/category.mk post-merge: Modified: csw/mgar/pkg/sharutils/trunk/checksums =================================================================== --- csw/mgar/pkg/sharutils/trunk/checksums 2011-04-29 16:43:12 UTC (rev 14472) +++ csw/mgar/pkg/sharutils/trunk/checksums 2011-04-29 18:52:18 UTC (rev 14473) @@ -1 +1 @@ -c8bbfa89810ce9f5399b38392549207c sharutils-4.10.tar.gz +733706803a19cf2dc91ee6ba9397d206 sharutils-4.11.1.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 Apr 30 01:53:22 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 29 Apr 2011 23:53:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14474] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14474 http://gar.svn.sourceforge.net/gar/?rev=14474&view=rev Author: bdwalton Date: 2011-04-29 23:53:22 +0000 (Fri, 29 Apr 2011) Log Message: ----------- php5/trunk: httpd-php5.conf must be installed into DESTDIR Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-29 18:52:18 UTC (rev 14473) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-29 23:53:22 UTC (rev 14474) @@ -332,7 +332,7 @@ post-install-modulated: @rm -f $(DESTDIR)$(AP2SYSCONF) @mkdir -p $(DESTDIR)$(AP2EXTCONF) - @cp $(WORKDIR)/httpd-php5.conf $(AP2EXTCONF) + @cp $(WORKDIR)/httpd-php5.conf $(DESTDIR)$(AP2EXTCONF) @cp $(WORKSRC)/php.ini-production $(INIDEST) @ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(prefix)/php5/bin/ @perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST) 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 Apr 30 03:05:36 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 30 Apr 2011 01:05:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[14475] csw/mgar/pkg/php5/trunk Message-ID: Revision: 14475 http://gar.svn.sourceforge.net/gar/?rev=14475&view=rev Author: bdwalton Date: 2011-04-30 01:05:35 +0000 (Sat, 30 Apr 2011) Log Message: ----------- php5/trunk: add preremove and postinstall scripts for modphp5 to manage httpd-php5.conf Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/php5/trunk/files/CSWap2-modphp5.postinstall csw/mgar/pkg/php5/trunk/files/CSWap2-modphp5.preremove Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-04-29 23:53:22 UTC (rev 14474) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-04-30 01:05:35 UTC (rev 14475) @@ -41,6 +41,8 @@ DISTFILES += phpext pear.conf.CSW CSWphp5.postinstall DISTFILES += CSWphp5.cswreleasenotes DISTFILES += CSWap2-modphp5.cswreleasenotes +DISTFILES += CSWap2-modphp5.postinstall +DISTFILES += CSWap2-modphp5.preremove DISTFILES += httpd-php5.conf PATCHFILES += 0001-Strip-usr-ucblib-references.patch Added: csw/mgar/pkg/php5/trunk/files/CSWap2-modphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWap2-modphp5.postinstall (rev 0) +++ csw/mgar/pkg/php5/trunk/files/CSWap2-modphp5.postinstall 2011-04-30 01:05:35 UTC (rev 14475) @@ -0,0 +1,29 @@ +#!/bin/sh + +CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw +AP2_CONFIG=$CSW_PREFIX/apache2/etc/httpd.conf + +# Configure mod_php5 in httpd.conf +if [ -n "`egrep 'IfModule (mod_php|php_module)' $AP2_CONFIG`" ] +then + echo "Existing mod_php5 configuration detected" +elif [ -n "`egrep '#Include etc/extra/httpd-php5.conf' $AP2_CONFIG`" ]; then + echo "Re-enabling existing config" + perl -i -plne 's,^#(Include etc/extra/httpd-php5.conf),$1,' $AP2_CONFIG +else + echo "Adding Include for extra/http-php5.conf to httpd.conf" + cat << END >> $AP2_CONFIG + +Include etc/extra/httpd-php5.conf +END +fi + +# Finito +cat < Hi All, The following patch to i.cswusergroup allows for a 9th field which is a comma separated list of auxiliary groups (passed as -G to useradd) in the cswusergroup file. The validation of the field is done by useradd although we could run it through a loop on getent group $g... I've tested it (lightly) and it seems to work. Does anyone else want to give it a whirl and provide feedback before I commit it? Thanks -Ben Index: files/CSWcswclassutils.i.cswusergroup =================================================================== --- files/CSWcswclassutils.i.cswusergroup (revision 14394) +++ files/CSWcswclassutils.i.cswusergroup (working copy) @@ -5,8 +5,10 @@ # $Id$ # # Written by Peter Bonivart +# Modified by Ben Walton # # 2009-02-10 First release +# 2011-04-29 Add support for auxgroups # # Documentation: http://wiki.opencsw.org/cswclassutils-package # @@ -171,6 +173,7 @@ shell="$5" create="$6" nopass="$7" + auxgroups="$8" if getent passwd $user > /dev/null; then echo User $user already exists @@ -186,10 +189,11 @@ [ -n "$dir" ] && dir="-d $dir" [ -n "$shell" ] && shell="-s $shell" [ -n "$create" ] && create="-m" + [ -n "$auxgroups" ] && auxgroups="-G $auxgroups" - debug_echo "/usr/sbin/useradd -g $uid $gcos $group $create $dir $shell $user" + debug_echo "/usr/sbin/useradd -g $uid $gcos $group $auxgroups $create $dir $shell $user" if /usr/sbin/useradd \ - -u $uid $gcos $group $create $dir $shell $user > /dev/null + -u $uid $gcos $group $auxgroups $create $dir $shell $user > /dev/null then echo User $user has been added else @@ -253,6 +257,7 @@ shell=`echo $i | awk -F':' '{print $5}'` create=`echo $i | awk -F':' '{print $6}'` nopass=`echo $i | awk -F':' '{print $8}'` + auxgroups=`echo $i | awk -F':' '{print $9}'` if [ -n "$group" ]; then create_group $group @@ -262,7 +267,7 @@ if [ -n "$user" ]; then create_user \ - "$user" "$group" "$gcos" "$dir" "$shell" "$create" "$nopass" + "$user" "$group" "$gcos" "$dir" "$shell" "$create" "$nopass" "$auxgroups" else echo No user to create fi -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Sat Apr 30 04:16:23 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 30 Apr 2011 02:16:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[14476] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswcptemplates Message-ID: Revision: 14476 http://gar.svn.sourceforge.net/gar/?rev=14476&view=rev Author: bdwalton Date: 2011-04-30 02:16:23 +0000 (Sat, 30 Apr 2011) Log Message: ----------- cswclassutils/trunk: use proper file name to determine owner, group and mode when installing default template config files; mantis id 4762 Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates 2011-04-30 01:05:35 UTC (rev 14475) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates 2011-04-30 02:16:23 UTC (rev 14476) @@ -122,7 +122,7 @@ else file=$template fi - contents=`grep "^${file} " $PKG_INSTALL_ROOT/var/sadm/install/contents` + contents=`grep "^${TEMPLATEDIR}/${PKG}/${file} " $PKG_INSTALL_ROOT/var/sadm/install/contents` if [ "$contents" ]; then mode=`echo $contents | awk '{print $4}'` user=`echo $contents | awk '{print $5}'` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.