* clean port's style

* unbreak build with apache22+mod_perl2
* take maintainership

5 files changed, 30 insertions, 24 deletions

diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index e40ab17dd0aa..3713a9e65fa4 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -7,20 +7,19 @@
 
 PORTNAME=	libapreq2
 PORTVERSION=	2.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 MASTER_SITE_SUBDIR=libapreq
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Generic Apache2 Request Library
 
-WITH_APACHE2=	yes
+USE_APACHE=	2.0+
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-apache2-apxs=${APXS}
-USE_APACHE=	yes
 
 .if defined (WITH_MODPERL2)
 PKGNAMEPREFIX+=	p5-
@@ -31,7 +30,7 @@ BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 USE_PERL5=	yes
-CONFIGURE_ARGS+=	--enable-perl-glue
+CONFIGURE_ARGS+=	--enable-perl-glue --with-perl=${PERL5}
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		APR::Request.3 \
@@ -48,10 +47,9 @@ MAN3=		APR::Request.3 \
 
 PLIST_SUB+=	WITH_MODPERL2=""
 
-post-configure:
-	cd ${WRKSRC}/glue/perl && \
-		${PERL5} Makefile.PL -apxs ${APXS} && \
-		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
+post-patch:
+	@${PERL5} -pi -e "s!%%APACHEINCLUDEDIR%%!${APACHEINCLUDEDIR}!" \
+		${WRKSRC}/glue/perl/Makefile.PL
 .else
 PLIST_SUB+=	WITH_MODPERL2="@comment "
 .endif
diff --git a/www/libapreq2/files/patch-glue-Makefile.in b/www/libapreq2/files/patch-glue-Makefile.in
new file mode 100644
index 000000000000..c70dab377129
--- /dev/null
+++ b/www/libapreq2/files/patch-glue-Makefile.in
@@ -0,0 +1,11 @@
+--- glue/Makefile.in.orig	Mon May 29 19:31:01 2006
++++ glue/Makefile.in	Mon May 29 19:31:12 2006
+@@ -262,7 +262,7 @@
+ 	cd perl; $(MAKE) test
+ 
+ perl_install:
+-	cd perl; $(MAKE) install
++	cd perl; $(MAKE) pure_install
+ 
+ perl_clean:
+ 	-cd perl; $(MAKE) clean
diff --git a/www/libapreq2/files/patch-glue-perl-Makefile.PL b/www/libapreq2/files/patch-glue-perl-Makefile.PL
index 452b081b44a9..f8515fd7ec69 100644
--- a/www/libapreq2/files/patch-glue-perl-Makefile.PL
+++ b/www/libapreq2/files/patch-glue-perl-Makefile.PL
@@ -6,7 +6,7 @@
      '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",
++    'INC'       => "-I$base_dir/glue/perl/xs -I$inc_dir -I$xs_dir $apache_includes -I\\\$(PREFIX)/%%APACHEINCLUDEDIR%%/modules/perl",
 +    'LIBS'      => "$apreq_libs $apr_libs -L\\\$(PREFIX)/lib",
  } ;
  $txt .= "'depend'  => $deps,\n" if ($deps) ;
diff --git a/www/libapreq2/files/patch-library-Makefile.in b/www/libapreq2/files/patch-library-Makefile.in
index f6efd93c0d77..f4a38fc16897 100644
--- a/www/libapreq2/files/patch-library-Makefile.in
+++ b/www/libapreq2/files/patch-library-Makefile.in
@@ -1,11 +1,7 @@
---- 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
+--- library/Makefile.in.orig	Sat Feb 11 18:57:28 2006
++++ library/Makefile.in	Mon May 29 19:13:23 2006
+@@ -141,7 +141,7 @@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@
diff --git a/www/libapreq2/pkg-plist b/www/libapreq2/pkg-plist
index 47b2bcc5fc2f..8181060f459e 100644
--- a/www/libapreq2/pkg-plist
+++ b/www/libapreq2/pkg-plist
@@ -1,5 +1,5 @@
 bin/apreq2-config
-include/apache2/apreq2/apreq_module_apache2.h
+%%APACHEINCLUDEDIR%%/apreq2/apreq_module_apache2.h
 include/apreq2/apreq.h
 include/apreq2/apreq_cookie.h
 include/apreq2/apreq_error.h
@@ -11,10 +11,10 @@ include/apreq2/apreq_version.h
 lib/libapreq2.a
 lib/libapreq2.la
 lib/libapreq2.so
-lib/libapreq2.so.7
-libexec/apache2/mod_apreq2.a
-libexec/apache2/mod_apreq2.la
-libexec/apache2/mod_apreq2.so
+lib/libapreq2.so.8
+%%APACHEMODDIR%%/mod_apreq2.a
+%%APACHEMODDIR%%/mod_apreq2.la
+%%APACHEMODDIR%%/mod_apreq2.so
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/DummyVersions.pm
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request.pm
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request.pod
@@ -64,5 +64,6 @@ libexec/apache2/mod_apreq2.so
 %%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/
 %%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/
 %%WITH_MODPERL2%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2
-@dirrm include/apache2/apreq2
+@dirrm %%APACHEINCLUDEDIR%%/apreq2
+@dirrmtry %%APACHEINCLUDEDIR%%
 @dirrm include/apreq2