4 files changed, 25 insertions, 24 deletions

diff --git a/www/p5-libapreq/Makefile b/www/p5-libapreq/Makefile
index b48b71f98ce2..5314ec2e01a5 100644
--- a/www/p5-libapreq/Makefile
+++ b/www/p5-libapreq/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libapreq
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	www perl5 devel
 MASTER_SITES=   ${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=     ../../authors/id/J/JI/JIMW/
@@ -15,16 +15,17 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Generic Apache Request Library
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Apache::Cookie.3 Apache::Request.3 Apache::libapreq.3 \
 		libapreq.3
 
+post-patch:
+	@${PERL} -pi~ -e '$$_="" if $$. >8 && $$. <27' ${WRKSRC}/Makefile.PL
+
 post-install:
 .ifndef(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
diff --git a/www/p5-libapreq/distinfo b/www/p5-libapreq/distinfo
index 47a6e6adfcd6..1573a4e0cfb3 100644
--- a/www/p5-libapreq/distinfo
+++ b/www/p5-libapreq/distinfo
@@ -1 +1 @@
-MD5 (libapreq-1.0.tar.gz) = 26b9c4c6667ce367cd28c46805bee2dd
+MD5 (libapreq-1.1.tar.gz) = 99471b32f72c43dfd5d2e3078d44c1fc
diff --git a/www/p5-libapreq/pkg-descr b/www/p5-libapreq/pkg-descr
index d972e21d7673..db3f62cdc415 100644
--- a/www/p5-libapreq/pkg-descr
+++ b/www/p5-libapreq/pkg-descr
@@ -8,7 +8,7 @@ the Apache API with Perl and C.  Functionality includes:
  - parsing of HTTP Cookies
 
 WWW: http://httpd.apache.org/apreq/
-WWW: http://search.cpan.org/search?dist=libapreq
+WWW: http://search.cpan.org/dist/libapreq/
 
 -- Sergey Skvortsov
 skv@FreeBSD.org
diff --git a/www/p5-libapreq/pkg-plist b/www/p5-libapreq/pkg-plist
index ea94539c55ca..5f1de0d3db72 100644
--- a/www/p5-libapreq/pkg-plist
+++ b/www/p5-libapreq/pkg-plist
@@ -1,21 +1,21 @@
-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/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
-@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
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Cookie.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Request.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/libapreq.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Cookie/Cookie.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Cookie/Cookie.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Request/Request.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Request/Request.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq/extralibs.ld
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq/include/apache_cookie.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq/include/apache_multipart_buffer.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq/include/apache_request.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq/libapreq.a
+%%SITE_PERL%%/%%PERL_ARCH%%/libapreq.pod
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Cookie
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Request
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq/include
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq
 %%PORTDOCS%%%%EXAMPLESDIR%%/c/testapreq/Makefile.apxs
 %%PORTDOCS%%%%EXAMPLESDIR%%/c/testapreq/Makefile.tmpl
 %%PORTDOCS%%%%EXAMPLESDIR%%/c/testapreq/mod_testapreq.c