www/p5-libapreq2: libtool fix, strip libs, pkg-plist followup, p5-fix
Kurt Jaeger
pi at FreeBSD.org
Sun Jun 8 08:34:11 UTC 2014
Hi!
> In my perl5.20 list of ports to check, I found libapreq2 with
> small issues, here's a fix:
>
> 0) poudriere:
> http://people.freebsd.org/~pi/misc/libapreq2-2.13_3.log
Well, as it turns out, www/p5-libapreq2 is a slave port which inherits
all the juicy details from www/libapreq2, so here's an updated
www/libapreq2 which allows p5-libapreq2 to build as well:
http://people.freebsd.org/~pi/misc/p5-libapreq2-2.13_3.log
that shows that now even the slave port is working.
skv@, would you also approve as the p5-libapreq2 maintainer ?
1) commit log:
--------------
www/libapreq2: libtool fix, strip libs, pkg-plist adapted, fix p5-libapreq2
Approved-By: TODO (maintainer), TODO (mentors)
--------------
2) Updated 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
@@ -29,6 +29,7 @@
PLIST_SUB+= WITH_MODPERL2=""
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 \
@@ -46,4 +47,16 @@
PLIST_SUB+= WITH_MODPERL2="@comment "
.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)
@@ -9,9 +9,9 @@
include/apreq2/apreq_util.h
include/apreq2/apreq_version.h
lib/libapreq2.a
-lib/libapreq2.la
lib/libapreq2.so
-lib/libapreq2.so.%%SHLIB_MAJOR%%
+lib/libapreq2.so.3
+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,24 +42,16 @@
%%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
%%WITH_MODPERL2%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2
%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser
---------------
--
pi at FreeBSD.org +49 171 3101372 6 years to go !
More information about the freebsd-apache
mailing list