www/p5-libapreq2: libtool fix, strip libs, pkg-plist followup, p5-fix

[Kurt Jaeger]

Hi!

> Well, I was a bit premature in announcing a working slave port.
> There's this issue with make install:
> 
> Installing p5-libapreq2-2.13_3...pkg-static: p5-libapreq2-2.13_3 conflicts with libapreq2-2.13_3 (installs files into the same place).  Problematic file: /usr/local/bin/apreq2-config
> 
> Ups. I'll investigate how to fix this.

Now, new diff. poudriere build logs updated.

Fix is ugly, basically pkg-plist is two seperate plists, with a flag
about which files are installed.

Would it be more useful to make the slave port (p5-libapreq2) a seperate port
depending on the other ?

Here's the svn diff:

---------
Index: Makefile
===================================================================
--- Makefile	(revision 356987)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libapreq2
 PORTVERSION=	2.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www devel
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 MASTER_SITE_SUBDIR=libapreq
@@ -14,9 +14,9 @@
 LICENSE=	APACHE20
 
 USE_APACHE=	22+
-USES=		gmake
+USES=		gmake libtool
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	autoconf libtool
+USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS+=	--with-apache2-apxs=${APXS} --with-expat=${LOCALBASE}
 
 MAKE_ENV+=     MAKE=${GMAKE} ## MakeMaker blows it without this
@@ -26,9 +26,10 @@
 
 # www/p5-libapreq2
 .if defined (WITH_MODPERL2)
-PLIST_SUB+=	WITH_MODPERL2=""
+PLIST_SUB+=	WITH_MODPERL2="" NO_APREG2="@comment "
 PKGNAMEPREFIX=	p5-
 USES+=		perl5
+USE_PERL5=	fixpacklist
 
 P5_APREQ_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
 		p5-ExtUtils-XSBuilder>=0:${PORTSDIR}/devel/p5-ExtUtils-XSBuilder \
@@ -43,7 +44,19 @@
 	@${REINPLACE_CMD} -i '' -e "s!%%APACHEINCLUDEDIR%%!${APACHEINCLUDEDIR}!" \
 		${WRKSRC}/glue/perl/Makefile.PL
 .else
-PLIST_SUB+=	WITH_MODPERL2="@comment "
+PLIST_SUB+=	WITH_MODPERL2="@comment " NO_APREG2=""
 .endif
 
+post-stage:
+	${STRIP_CMD} ${STAGEDIR}/usr/local/lib/libapreq2.so.3.8.0
+	${STRIP_CMD} ${STAGEDIR}/usr/local/libexec/apache22/mod_apreq2.so
+.if defined (WITH_MODPERL2)
+	${FIND} ${STAGEDIR} -name '*.bs' -size 0c -exec ${RM} {} \;
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/perl5/site_perl/${PERL_VER}/mach/auto/APR/Request/Request.so
+.for i in Apache2 CGI Cookie Error Hook Param Parser
+	${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/lib/perl5/site_perl/${PERL_VER}/mach/auto/APR/Request/${i}/${i}.so
+.endfor
+.endif
+
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 356987)
+++ pkg-plist	(working copy)
@@ -1,17 +1,17 @@
-bin/apreq2-config
-%%APACHEINCLUDEDIR%%/apreq2/apreq_module_apache2.h
-include/apreq2/apreq.h
-include/apreq2/apreq_cookie.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.la
-lib/libapreq2.so
-lib/libapreq2.so.%%SHLIB_MAJOR%%
+%%NO_APREG2%%bin/apreq2-config
+%%NO_APREG2%%%%APACHEINCLUDEDIR%%/apreq2/apreq_module_apache2.h
+%%NO_APREG2%%include/apreq2/apreq.h
+%%NO_APREG2%%include/apreq2/apreq_cookie.h
+%%NO_APREG2%%include/apreq2/apreq_error.h
+%%NO_APREG2%%include/apreq2/apreq_module.h
+%%NO_APREG2%%include/apreq2/apreq_param.h
+%%NO_APREG2%%include/apreq2/apreq_parser.h
+%%NO_APREG2%%include/apreq2/apreq_util.h
+%%NO_APREG2%%include/apreq2/apreq_version.h
+%%NO_APREG2%%lib/libapreq2.a
+%%NO_APREG2%%lib/libapreq2.so
+%%NO_APREG2%%lib/libapreq2.so.3
+%%NO_APREG2%%lib/libapreq2.so.3.8.0
 %%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request.3.gz
 %%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request::Apache2.3.gz
 %%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request::CGI.3.gz
@@ -42,25 +42,17 @@
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Cookie.pm
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Request.pm
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Upload.pm
-%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2/Apache2.bs
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/%%AP_NAME%%/.packlist
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2/Apache2.so
-%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/CGI.bs
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/CGI.so
-%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/Cookie.bs
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/Cookie.so
-%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/Error.bs
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/Error.so
-%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook/Hook.bs
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook/Hook.so
-%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/Param.bs
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/Param.so
-%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/Parser.bs
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/Parser.so
-%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Request.bs
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Request.so
-%%APACHEMODDIR%%/mod_apreq2.a
-%%APACHEMODDIR%%/mod_apreq2.la
-%%APACHEMODDIR%%/mod_apreq2.so
+%%NO_APREG2%%%%APACHEMODDIR%%/mod_apreq2.a
+%%NO_APREG2%%%%APACHEMODDIR%%/mod_apreq2.so
 %%WITH_MODPERL2%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2
 %%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser
 %%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param
---------


-- 
pi at FreeBSD.org         +49 171 3101372                          6 years to go !