7 files changed, 89 insertions, 66 deletions

diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index 978acd76133a..27614fc7567d 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -6,25 +6,20 @@
 #
 
 PORTNAME=	libapreq2
-PORTVERSION=	2.04r03
+PORTVERSION=	2.05
 CATEGORIES=	www perl5 devel
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 MASTER_SITE_SUBDIR=libapreq
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/r/_/}-dev
+DISTNAME=	${PORTNAME}-${PORTVERSION}-dev
 
 MAINTAINER=	autrijus@autrijus.org
 COMMENT=	Generic Apache2 Request Library
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Apache2.pm:${PORTSDIR}/www/mod_perl2 \
-		${SITE_PERL}/ExtUtils/XSBuilder:${PORTSDIR}/devel/p5-ExtUtils-XSBuilder \
-		${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 \
+		${SITE_PERL}/ExtUtils/XSBuilder:${PORTSDIR}/devel/p5-ExtUtils-XSBuilder
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-BROKEN=		Broken due the new mod_perl2 API
-
-CONFLICTS=	p5-libapreq-[0-9]*
-
 WITH_APACHE2=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=15
diff --git a/www/libapreq2/distinfo b/www/libapreq2/distinfo
index 09d9274a63d5..89510c1727a3 100644
--- a/www/libapreq2/distinfo
+++ b/www/libapreq2/distinfo
@@ -1,2 +1,2 @@
-MD5 (libapreq2-2.04_03-dev.tar.gz) = 1f5dd762c877b716f3774d502f575196
-SIZE (libapreq2-2.04_03-dev.tar.gz) = 592748
+MD5 (libapreq2-2.05-dev.tar.gz) = 0985e102b6d2bc9c747a56b04a85cba6
+SIZE (libapreq2-2.05-dev.tar.gz) = 702625
diff --git a/www/libapreq2/files/patch-build-xsbuilder.pl b/www/libapreq2/files/patch-build-xsbuilder.pl
deleted file mode 100644
index 3ea80734a3d3..000000000000
--- a/www/libapreq2/files/patch-build-xsbuilder.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/xsbuilder.pl.orig    Thu Sep 23 17:15:43 2004
-+++ build/xsbuilder.pl Thu Sep 23 17:15:26 2004
-@@ -309,7 +309,7 @@
-     'NAME'      => '$class',
-     'VERSION'   => '$version',
-     'TYPEMAPS'  => [qw(@$mp2_typemaps $typemap)],
--    'INC'       => "-I$base_dir/glue/perl/xs -I$src_dir -I$xs_dir $apache_includes",
-+    'INC'       => "-I$base_dir/glue/perl/xs -I$src_dir -I$xs_dir -I\\\$(PREFIX)/include/apache2/modules/perl $apache_includes",
-     'LIBS'      => "$apreq_libs $apr_libs",
- } ;
- $txt .= "'depend'  => $deps,\n" if ($deps) ;
diff --git a/www/libapreq2/files/patch-glue-perl-Makefile.PL b/www/libapreq2/files/patch-glue-perl-Makefile.PL
new file mode 100644
index 000000000000..452b081b44a9
--- /dev/null
+++ b/www/libapreq2/files/patch-glue-perl-Makefile.PL
@@ -0,0 +1,13 @@
+--- glue/perl/Makefile.PL	Mon May  2 20:24:29 2005
++++ glue/perl/Makefile.PL	Sat May 21 17:57:39 2005
+@@ -443,8 +443,8 @@
+     'NAME'      => '$class',
+     'VERSION'   => '$version',
+     'TYPEMAPS'  => [qw(@$mp2_typemaps $typemap)],
+-    'INC'       => "-I$base_dir/glue/perl/xs -I$inc_dir -I$xs_dir $apache_includes",
+-    'LIBS'      => "$apreq_libs $apr_libs",
++    'INC'       => "-I$base_dir/glue/perl/xs -I$inc_dir -I$xs_dir $apache_includes -I\\\$(PREFIX)/include/apache2/modules/perl",
++    'LIBS'      => "$apreq_libs $apr_libs -L\\\$(PREFIX)/lib",
+ } ;
+ $txt .= "'depend'  => $deps,\n" if ($deps) ;
+ $txt .= qq{    
diff --git a/www/libapreq2/files/patch-library-Makefile.in b/www/libapreq2/files/patch-library-Makefile.in
new file mode 100644
index 000000000000..f6efd93c0d77
--- /dev/null
+++ b/www/libapreq2/files/patch-library-Makefile.in
@@ -0,0 +1,15 @@
+--- library/Makefile.in.orig	Sat May 21 17:21:51 2005
++++ library/Makefile.in	Sat May 21 17:22:18 2005
+@@ -137,10 +137,10 @@
+ libapreq2_la_OBJECTS = $(am_libapreq2_la_OBJECTS)
+ 
+ DEFS = @DEFS@
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(prefix)/include/apache2/modules/perl
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -L$(prefix)/lib
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cookie.Plo ./$(DEPDIR)/error.Plo \
diff --git a/www/libapreq2/files/patch-src-Makefile.in b/www/libapreq2/files/patch-src-Makefile.in
deleted file mode 100644
index c2adfdbccde1..000000000000
--- a/www/libapreq2/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Makefile.in.orig       Thu Sep 23 17:02:24 2004
-+++ src/Makefile.in    Thu Sep 23 17:02:55 2004
-@@ -106,8 +106,8 @@
- STRIP = @STRIP@
- VERSION = @VERSION@
- 
--INCLUDES = @APR_INCLUDES@ @APU_INCLUDES@
--LIBS = @APR_LTLIBS@ @APU_LTLIBS@
-+INCLUDES = @APR_INCLUDES@ @APU_INCLUDES@ -I$(prefix)/include/apache2/modules/perl
-+LIBS = @APR_LTLIBS@ @APU_LTLIBS@ -L$(prefix)/lib
- LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@
- EXTRA_DIST = groups.dox.in
- BUILT_SOURCES = @APR_LA@ @APU_LA@
diff --git a/www/libapreq2/pkg-plist b/www/libapreq2/pkg-plist
index d6c137630975..22430f2bf42c 100644
--- a/www/libapreq2/pkg-plist
+++ b/www/libapreq2/pkg-plist
@@ -1,39 +1,63 @@
 bin/apreq2-config
+include/apache2/apreq2/apreq_module_apache2.h
 include/apreq2/apreq.h
 include/apreq2/apreq_cookie.h
-include/apreq2/apreq_env.h
-include/apreq2/apreq_params.h
+include/apreq2/apreq_error.h
+include/apreq2/apreq_module.h
+include/apreq2/apreq_param.h
+include/apreq2/apreq_parser.h
+include/apreq2/apreq_util.h
 include/apreq2/apreq_version.h
-lib/libapreq2.a
+lib/libapreq2.so.3
 lib/libapreq2.so
-lib/libapreq2.so.2
-libexec/apache2/mod_apreq.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie/Error.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie/Jar/Error.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie/Table.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request/Error.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request/Table.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Upload.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Upload.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Upload/Error.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Upload/Table.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Cookie/Cookie.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Cookie/Cookie.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Request/Request.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Request/Request.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Upload/Upload.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Upload/Upload.so
+lib/libapreq2.a
+libexec/apache2/mod_apreq2.so
+%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Apache2.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Apache2.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/CGI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/CGI.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Cookie.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Cookie.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Error.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Error.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Param.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Param.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Cookie.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Request.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Upload.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2/Apache2.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2/Apache2.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/CGI.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/CGI.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/Cookie.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/Cookie.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/Error.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/Error.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/Param.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/Param.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Request.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Request.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Upload
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Request
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Cookie
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Upload
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie/Jar
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie
+lib/perl5/%%PERL_VER%%/man/man3/APR::Request::Apache2.3
+lib/perl5/%%PERL_VER%%/man/man3/APR::Request::CGI.3
+lib/perl5/%%PERL_VER%%/man/man3/APR::Request::Cookie.3
+lib/perl5/%%PERL_VER%%/man/man3/APR::Request::Error.3
+lib/perl5/%%PERL_VER%%/man/man3/APR::Request::Param.3
+lib/perl5/%%PERL_VER%%/man/man3/APR::Request.3
+lib/perl5/%%PERL_VER%%/man/man3/Apache2::Cookie.3
+lib/perl5/%%PERL_VER%%/man/man3/Apache2::Upload.3
+lib/perl5/%%PERL_VER%%/man/man3/Apache2::Request.3
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/ 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/APR/ 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/ 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2/ 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/ 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/ 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/ 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/ 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/ 2>/dev/null || true
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2
+@dirrm include/apache2/apreq2
 @dirrm include/apreq2