Updated to 1.0, changed maintainer, fixed MASTER_SITES, added examples.

5 files changed, 34 insertions, 19 deletions

diff --git a/www/p5-libapreq/Makefile b/www/p5-libapreq/Makefile
index 446aba7e4218..d2e3dc43b2a2 100644
--- a/www/p5-libapreq/Makefile
+++ b/www/p5-libapreq/Makefile
@@ -6,29 +6,31 @@
 #
 
 PORTNAME=	libapreq
-PORTVERSION=	0.33
+PORTVERSION=	1.0
 CATEGORIES=	www perl5 devel
-MASTER_SITES=	http://www.cpan.org/authors/id/J/JI/JIMW/
+MASTER_SITES=   ${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=     ../../authors/id/J/JI/JIMW/
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	frank@exit.com
+MAINTAINER=	skv@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/www/apache13 \
-		${LOCALBASE}/include/apache/modules/perl/mod_perl.h:${PORTSDIR}/www/mod_perl
+#BUILD_DEPENDS=	${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/www/apache13 \
+#		${LOCALBASE}/include/apache/modules/perl/mod_perl.h:${PORTSDIR}/www/mod_perl
 
 PERL_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=		Apache::Cookie.3 \
-		Apache::Request.3 \
-		Apache::libapreq.3 \
+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`
+post-install:
+.ifndef(NOPORTDOCS)
+	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
+	@${MKDIR} ${EXAMPLESDIR}/c/testapreq
+	@${MKDIR} ${EXAMPLESDIR}/perl
+	${INSTALL_DATA} ${WRKSRC}/eg/c/testapreq/* ${EXAMPLESDIR}/c/testapreq
+	${INSTALL_SCRIPT} ${WRKSRC}/eg/perl/* ${EXAMPLESDIR}/perl
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/p5-libapreq/distinfo b/www/p5-libapreq/distinfo
index 7955d5e74c60..47a6e6adfcd6 100644
--- a/www/p5-libapreq/distinfo
+++ b/www/p5-libapreq/distinfo
@@ -1 +1 @@
-MD5 (libapreq-0.33.tar.gz) = 48c4c244db77c1855c6e4a6185e6ccdf
+MD5 (libapreq-1.0.tar.gz) = 26b9c4c6667ce367cd28c46805bee2dd
diff --git a/www/p5-libapreq/pkg-comment b/www/p5-libapreq/pkg-comment
index 89b848464ba4..46cf1657a755 100644
--- a/www/p5-libapreq/pkg-comment
+++ b/www/p5-libapreq/pkg-comment
@@ -1 +1 @@
-Install libraries/include files into Perl architecture dependent locations
+Generic Apache Request Library
diff --git a/www/p5-libapreq/pkg-descr b/www/p5-libapreq/pkg-descr
index 22c7c9afd087..d972e21d7673 100644
--- a/www/p5-libapreq/pkg-descr
+++ b/www/p5-libapreq/pkg-descr
@@ -4,8 +4,11 @@ This package contains modules for manipulating client request data via
 the Apache API with Perl and C.  Functionality includes:
 
  - parsing of application/x-www-form-urlencoded data
- - parsing of multipart/form-data 
+ - parsing of multipart/form-data
  - parsing of HTTP Cookies
 
-See libapreq.pod for the C API documentation and
-eg/c/ for examples.
+WWW: http://httpd.apache.org/apreq/
+WWW: http://search.cpan.org/search?dist=libapreq
+
+-- Sergey Skvortsov
+skv@FreeBSD.org
diff --git a/www/p5-libapreq/pkg-plist b/www/p5-libapreq/pkg-plist
index 8942394ae1d6..ea94539c55ca 100644
--- a/www/p5-libapreq/pkg-plist
+++ b/www/p5-libapreq/pkg-plist
@@ -16,3 +16,13 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/libapreq.pod
 @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
+%%PORTDOCS%%%%EXAMPLESDIR%%/c/testapreq/Makefile.apxs
+%%PORTDOCS%%%%EXAMPLESDIR%%/c/testapreq/Makefile.tmpl
+%%PORTDOCS%%%%EXAMPLESDIR%%/c/testapreq/mod_testapreq.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/c/testapreq/mod_testapreq.module
+%%PORTDOCS%%%%EXAMPLESDIR%%/perl/cookie.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/perl/file_upload.pl
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/c/testapreq
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/c
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/perl
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%