From 6e05e64e55afb2c4f47a522edc8178465f2221e5 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Mon, 13 Dec 2010 13:15:06 +0000
Subject: [PATCH] - update p5-CGI-Session to 4.42 and move some optional
 dependencies from RUN_DEPENDS to REGRESS_DEPENDS.

- remove former MAINTAINER at his request.
---
 www/p5-CGI-Session/Makefile                       | 15 ++++-----------
 www/p5-CGI-Session/distinfo                       | 10 +++++-----
 .../patches/patch-t_g4_dbfile_json_t              | 13 -------------
 www/p5-CGI-Session/pkg/PLIST                      |  7 ++-----
 4 files changed, 11 insertions(+), 34 deletions(-)
 delete mode 100644 www/p5-CGI-Session/patches/patch-t_g4_dbfile_json_t

diff --git a/www/p5-CGI-Session/Makefile b/www/p5-CGI-Session/Makefile
index b06a70aa4b6..c2833895835 100644
--- a/www/p5-CGI-Session/Makefile
+++ b/www/p5-CGI-Session/Makefile
@@ -1,14 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2010/12/03 11:46:51 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2010/12/13 13:15:06 sthen Exp $
 
 COMMENT=	persistent session data in CGI applications
 
 MODULES=	cpan
-DISTNAME=	CGI-Session-4.20
-REVISION=	0
+DISTNAME=	CGI-Session-4.42
 CATEGORIES=	www
-USE_GROFF =	Yes
-
-MAINTAINER=	Jason Crawford <jasonrcrawford@gmail.com>
+USE_GROFF=	Yes
 
 # Perl
 PERMIT_PACKAGE_CDROM=	Yes
@@ -16,15 +13,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-RUN_DEPENDS=	converters/p5-JSON \
-		databases/p5-DBI \
+REGRESS_DEPENDS= databases/p5-DBI \
 		databases/p5-DBD-SQLite \
 		databases/p5-DBD-mysql \
 		databases/p5-DBD-Pg \
 		devel/p5-FreezeThaw \
-		devel/p5-YAML-Syck \
 		www/p5-CGI-Simple
 
-REGRESS_DEPENDS=${RUN_DEPENDS}
-
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Session/distinfo b/www/p5-CGI-Session/distinfo
index e2c6e25759b..7c4cbf17955 100644
--- a/www/p5-CGI-Session/distinfo
+++ b/www/p5-CGI-Session/distinfo
@@ -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.42.tar.gz) = ZUQmGmquZkEBiFILJ+EGmQ==
+RMD160 (CGI-Session-4.42.tar.gz) = 5eHkjDBqVrAWBS1rzZ3rcC9kqGg=
+SHA1 (CGI-Session-4.42.tar.gz) = w0iAvTz1JOEzb/+mwc5sAweJhGM=
+SHA256 (CGI-Session-4.42.tar.gz) = /BFoCrSMVhDtbU9T6Png3NxFsdJ2W0VOHFzH7SrG1KA=
+SIZE (CGI-Session-4.42.tar.gz) = 74895
diff --git a/www/p5-CGI-Session/patches/patch-t_g4_dbfile_json_t b/www/p5-CGI-Session/patches/patch-t_g4_dbfile_json_t
deleted file mode 100644
index 7180b00038b..00000000000
--- a/www/p5-CGI-Session/patches/patch-t_g4_dbfile_json_t
+++ /dev/null
@@ -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";
diff --git a/www/p5-CGI-Session/pkg/PLIST b/www/p5-CGI-Session/pkg/PLIST
index 29eafe34dd0..8efbdf12432 100644
--- a/www/p5-CGI-Session/pkg/PLIST
+++ b/www/p5-CGI-Session/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/06/01 22:00:35 aanriot Exp $
+@comment $OpenBSD: PLIST,v 1.2 2010/12/13 13:15:06 sthen Exp $
+${P5SITE}/CGI/
 ${P5SITE}/CGI/Session/
 ${P5SITE}/CGI/Session.pm
 ${P5SITE}/CGI/Session/Driver/
@@ -17,9 +18,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 +36,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