On Thu, Apr 9, 2009 at 4:38 PM, Stuart Henderson <s...@spacehopper.org> wrote: > On 2009/04/09 22:26, Simon Bertrang wrote: >> On Thu, Apr 09, 2009 at 01:03:51PM -0400, Jason Crawford wrote: >> > On Thu, Apr 9, 2009 at 8:04 AM, Mikolaj Kucharski >> > <miko...@kucharski.name> wrote: >> > > On Thu, Apr 09, 2009 at 12:50:38PM +0100, Stuart Henderson wrote: >> > >> On 2009/04/09 12:34, Mikolaj Kucharski wrote: >> > >> > First, I didn't apply this patch, I've briefly looked in to current >> > >> > www/p5-CGI-Session and your diff. >> > >> > >> > >> > Second, I don't like flavours, and I don't mind big build >> > >> > dependencies. >> > >> > >> > >> > Could you create subpackages with each `heavy' driver separetly? >> > >> > Please >> > >> > remember about coflict markers with older version of your package. >> > >> > >> > >> > Does that sound okay for you and others? Thanks. >> > >> >> > >> these are only run/regress dependencies, I would rather just remove >> ^^^^^^^ >> Please keep them as REGRESS_DEPENDS, i'd like to get everything tested >> together and just still won't need it at build time. > > good point, I agree. > >
Yes that sounds like a good idea. So here goes again, attempt number 3. Index: Makefile =================================================================== RCS file: /cvs/ports/www/p5-CGI-Session/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile 15 Sep 2007 20:38:23 -0000 1.2 +++ Makefile 9 Apr 2009 21:52:45 -0000 @@ -3,10 +3,10 @@ COMMENT= persistent session data in CGI applications MODULES= cpan -DISTNAME= CGI-Session-4.20 +DISTNAME= CGI-Session-4.41 CATEGORIES= www -MAINTAINER= Jason Crawford <jasonrcrawf...@gmail.com> +MAINTAINER= Jason Crawford <ja...@purebsd.net> # Perl PERMIT_PACKAGE_CDROM= Yes @@ -14,15 +14,14 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::converters/p5-JSON \ - ::databases/p5-DBI \ - ::databases/p5-DBD-SQLite \ - ::databases/p5-DBD-mysql \ - ::databases/p5-DBD-Pg \ - ::devel/p5-FreezeThaw \ +RUN_DEPENDS= ::devel/p5-FreezeThaw \ ::devel/p5-YAML-Syck \ ::www/p5-CGI-Simple -REGRESS_DEPENDS=${RUN_DEPENDS} +# Add in the databases so we can test everything together +REGRESS_DEPENDS=${RUN_DEPENDS} \ + ::databases/p5-DBD-Pg \ + ::databases/p5-DBD-SQLite \ + ::databases/p5-DBD-mysql .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/www/p5-CGI-Session/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 1 Jun 2007 22:00:35 -0000 1.1.1.1 +++ distinfo 9 Apr 2009 21:52:45 -0000 @@ -1,5 +1,5 @@ -MD5 (CGI-Session-4.20.tar.gz) = NHQPW5RNQnYIFiiPcn+Y+w== -RMD160 (CGI-Session-4.20.tar.gz) = dfamIoPIhEQqBAiVQhWjLx8MQeY= -SHA1 (CGI-Session-4.20.tar.gz) = qL3MY7iXzlPJZaXyCwcJfIzQhb8= -SHA256 (CGI-Session-4.20.tar.gz) = bN2Bu1LW685UQ5qtFc+QjqbW3Oa6LVeUTMpUd8oO0Oo= -SIZE (CGI-Session-4.20.tar.gz) = 70995 +MD5 (CGI-Session-4.41.tar.gz) = 5hvt+ZxyEWfj8wKXELO3/A== +RMD160 (CGI-Session-4.41.tar.gz) = 6igH8WqF/8Sbj8yjaTAuj2OPvWw= +SHA1 (CGI-Session-4.41.tar.gz) = n4amK3WYAdmFlZy3CrP1h0UR4D8= +SHA256 (CGI-Session-4.41.tar.gz) = +Eiv72kAnCAq0NqhxpZhj8N8epMneu9hGfpb/wju7SM= +SIZE (CGI-Session-4.41.tar.gz) = 69645 Index: patches/patch-t_g4_dbfile_json_t =================================================================== RCS file: patches/patch-t_g4_dbfile_json_t diff -N patches/patch-t_g4_dbfile_json_t --- patches/patch-t_g4_dbfile_json_t 1 Jun 2007 22:00:35 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-t_g4_dbfile_json_t,v 1.1.1.1 2007/06/01 22:00:35 aanriot Exp $ ---- t/g4_dbfile_json.t.orig Wed Apr 12 07:42:14 2006 -+++ t/g4_dbfile_json.t Fri Jun 1 10:37:31 2007 -@@ -14,7 +14,8 @@ our %options = ( - 'JSON::Syck' => { skip => [85 .. 89, 91 .. 101] }, - ); - --plan skip_all => 'DB_File is NOT available' unless eval { require DB_File }; -+# broken on OpenBSD with perl 5.8.8 (also reported by p5p) -+plan skip_all => 'DB_File is NOT available'; - - foreach my $i (keys(%options)) { - $serializers{$i}++ if eval "use $i (); 1"; Index: pkg/MESSAGE =================================================================== RCS file: pkg/MESSAGE diff -N pkg/MESSAGE --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/MESSAGE 9 Apr 2009 21:52:45 -0000 @@ -0,0 +1,7 @@ + +If you need a database backend, CGI::Session can use any of the following three: + + p5-DBD-Pg - postgresql + p5-DBD-SQLite - sqlite + p5-DBD-mysql - mysql + Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/p5-CGI-Session/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 1 Jun 2007 22:00:35 -0000 1.1.1.1 +++ pkg/PLIST 9 Apr 2009 21:52:45 -0000 @@ -17,9 +17,7 @@ ${P5SITE}/CGI/Session/ID/static.pm ${P5SITE}/CGI/Session/Serialize/ ${P5SITE}/CGI/Session/Serialize/default.pm ${P5SITE}/CGI/Session/Serialize/freezethaw.pm -${P5SITE}/CGI/Session/Serialize/json.pm ${P5SITE}/CGI/Session/Serialize/storable.pm -${P5SITE}/CGI/Session/Serialize/yaml.pm ${P5SITE}/CGI/Session/Test/ ${P5SITE}/CGI/Session/Test/Default.pm ${P5SITE}/CGI/Session/Tutorial.pm @@ -37,8 +35,6 @@ ${P5SITE}/CGI/Session/Tutorial.pm @man man/man3p/CGI::Session::ID::static.3p @man man/man3p/CGI::Session::Serialize::default.3p @man man/man3p/CGI::Session::Serialize::freezethaw.3p -...@man man/man3p/CGI::Session::Serialize::json.3p @man man/man3p/CGI::Session::Serialize::storable.3p -...@man man/man3p/CGI::Session::Serialize::yaml.3p @man man/man3p/CGI::Session::Test::Default.3p @man man/man3p/CGI::Session::Tutorial.3p