Upgrade to 0.33.

No Responsed by:	maintainer

6 files changed, 24 insertions, 128 deletions

diff --git a/www/p5-libapreq/Makefile b/www/p5-libapreq/Makefile
index a45480807c34..446aba7e4218 100644
--- a/www/p5-libapreq/Makefile
+++ b/www/p5-libapreq/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libapreq
-PORTVERSION=	0.31_03
+PORTVERSION=	0.33
 CATEGORIES=	www perl5 devel
 MASTER_SITES=	http://www.cpan.org/authors/id/J/JI/JIMW/
 PKGNAMEPREFIX=	p5-
@@ -19,17 +19,16 @@ BUILD_DEPENDS=	${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/www/apache13 \
 PERL_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
-MAN3=		Apache::Request.3 Apache::Cookie.3 libapreq.3 Apache::libapreq.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
-post-configure:
-	@${PERL} -i -p \
-		-e 's/^(CC = ).*/$$1 ${CC}/;' \
-		-e 's/^(CCFLAGS = ).*/$$1 ${CFLAGS}/' \
-		`find ${WRKSRC} -name Makefile`
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/blib/arch/auto/libapreq/libapreq.so \
-		${PREFIX}/lib
+MAN3=		Apache::Cookie.3 \
+		Apache::Request.3 \
+		Apache::libapreq.3 \
+		libapreq.3
+
+#post-configure:
+#	@${PERL} -i -p \
+#		-e 's/^(CC = ).*/$$1 ${CC}/;' \
+#		-e 's/^(CCFLAGS = ).*/$$1 ${CFLAGS}/' \
+#		`find ${WRKSRC} -name Makefile`
 
 .include <bsd.port.mk>
diff --git a/www/p5-libapreq/distinfo b/www/p5-libapreq/distinfo
index 5d4956382973..7955d5e74c60 100644
--- a/www/p5-libapreq/distinfo
+++ b/www/p5-libapreq/distinfo
@@ -1 +1 @@
-MD5 (libapreq-0.31_03.tar.gz) = c23cb069e42643e505d4043f0eef4b9f
+MD5 (libapreq-0.33.tar.gz) = 48c4c244db77c1855c6e4a6185e6ccdf
diff --git a/www/p5-libapreq/files/patch-aa b/www/p5-libapreq/files/patch-aa
deleted file mode 100644
index 52473df0ee91..000000000000
--- a/www/p5-libapreq/files/patch-aa
+++ /dev/null
@@ -1,55 +0,0 @@
---- c/Makefile.PL.orig	Wed Mar 29 22:22:28 2000
-+++ c/Makefile.PL	Wed Mar 14 11:21:17 2001
-@@ -7,49 +7,23 @@
-     win32_setup();
- }
- else {
--    require Apache::src;
--    my $src = Apache::src->new;
-+    my $inc1 = `apxs -q INCLUDEDIR`;
-+    my $inc2 = $inc1 ."/modules/perl";
- 
-     use Cwd;
-     my $pwd = fastcwd;
-     my @objs = qw(apache_request.o apache_cookie.o apache_multipart_buffer.o);
--    $MY_LD_RUN_PATH = "$Config{installsitearch}/auto/libapreq:$pwd"; 
- 
-     WriteMakefile(
--       #grr, problems with things finding libapreq.so, sort out later.
-        'LINKTYPE' => 'static',
--#       'SKIP' => [qw(dynamic_lib dynamic_bs)],
-        'NAME'	 => 'libapreq',
--       'INC' 	 => $src->inc,
--       'TYPEMAPS'   => $src->typemaps,
-+       'INC' 	 => "-I$inc1 -I$inc2",
-        'OBJECT' => "@objs",
-     );
- }
- 
- use Cwd;
- my $pwd = fastcwd;
--$ENV{LD_RUN_PATH} = 
--    "$ENV{LD_RUN_PATH}:$Config{installsitearch}/auto/libapr:$pwd";
--
--sub MY::dynamic {
--    my $self = shift;
--    my $string = $self->MM::dynamic;
--    $string =~ s/(Makefile\s+).*/$1/g;
--    $string;
--}
--
--sub MY::top_targets { 
--    my $self = shift; 
--    my $string = $self->MM::top_targets; 
--    my $libapreq = <<"EOF";
--LD_RUN_PATH = $ENV{LD_RUN_PATH}
--EOF
--
--    my $so = "\n".'$(DLBASE).$(DLEXT): $(INST_DYNAMIC)'."\n";
--
--    $string =~ s/(pure_all\s+::\s+)(.*)/$1 static $2/; 
--    return $libapreq . $so . $string;
--}
- 
- sub MY::post_initialize { 
-     my $self = shift; 
diff --git a/www/p5-libapreq/files/patch-ab b/www/p5-libapreq/files/patch-ab
deleted file mode 100644
index c0ce751e9b8e..000000000000
--- a/www/p5-libapreq/files/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
---- Cookie/Makefile.PL.orig	Sat May  1 14:44:28 1999
-+++ Cookie/Makefile.PL	Sun Apr 23 21:43:43 2000
-@@ -15,9 +15,9 @@
-     xsubpp("Cookie");
- }
- else {
--    require Apache::src;
--    my $src = Apache::src->new;
-     use File::Path 'mkpath';
-+    my $inc1 = `apxs -q INCLUDEDIR`;
-+    my $inc2 = $inc1."/modules/perl";
-     my $root = "../blib/arch/auto/libapreq";
-     mkpath $root, 1, 0755 unless -d $root;
- 
-@@ -25,8 +25,7 @@
-     system "touch $root/libapreq.a";
-     WriteMakefile(
-         @mm_args,
--        'INC'	=> "-I../c ". $src->inc,
--        'TYPEMAPS'  => $src->typemaps,
-+        'INC'	=> "-I../c -I$inc1 -I$inc2",
-         'LIBS' => "-L$root -lapreq",
-     );
-     unlink "$root/libapreq.a";
diff --git a/www/p5-libapreq/files/patch-ac b/www/p5-libapreq/files/patch-ac
deleted file mode 100644
index 076020576177..000000000000
--- a/www/p5-libapreq/files/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
---- Request/Makefile.PL.orig	Sat May  1 14:44:28 1999
-+++ Request/Makefile.PL	Sun Apr 23 21:43:43 2000
-@@ -15,8 +15,8 @@
-     xsubpp("Request");
- }
- else {
--    require Apache::src;
--    my $src = Apache::src->new;
-+    my $inc1 = `apxs -q INCLUDEDIR`;
-+    my $inc2 = $inc1 ."/modules/perl";
-     use File::Path 'mkpath';
-     my $root = "../blib/arch/auto/libapreq";
-     mkpath $root, 1, 0755 unless -d $root;
-@@ -25,8 +25,7 @@
-     system "touch $root/libapreq.a";
-     WriteMakefile(
- 	  @mm_args,
--	  'INC'	=> "-I../c ". $src->inc,
--	  'TYPEMAPS'  => $src->typemaps,
-+	  'INC'	=> "-I../c -I$inc1 -I$inc2",
-           'LIBS' => "-L$root -lapreq",
-     );
-     unlink "$root/libapreq.a";
diff --git a/www/p5-libapreq/pkg-plist b/www/p5-libapreq/pkg-plist
index 158517b502ac..8942394ae1d6 100644
--- a/www/p5-libapreq/pkg-plist
+++ b/www/p5-libapreq/pkg-plist
@@ -1,19 +1,18 @@
-lib/libapreq.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/include/apache_request.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Cookie.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Request.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/libapreq.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Cookie/Cookie.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Cookie/Cookie.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Request/Request.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Request/Request.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/extralibs.ld
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/include/apache_cookie.h
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/include/apache_multipart_buffer.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/libapreq.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/libapreq.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Request/Request.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Request/Request.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Cookie/Cookie.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Cookie/Cookie.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/include/apache_request.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/libapreq.a
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/libapreq.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/libapreq.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Request.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Cookie.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Request
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Cookie
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Request
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/include
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq