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

[olli hauer]

On 2014-06-08 10:58, Kurt Jaeger wrote:
> 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
> +
...


Hi Kurt,

even it SITE_PERL do not resolve in www/libapreq2 it should from www/p5-libapreq, so I suspect the short form will work (not tested)

-+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/perl5/site_perl/${PERL_VER}/...
++	${STRIP_CMD} ${STAGEDIR}${PREFIX}${SITE_PERL_REL}/...


Please specify also '-type f' here.

-+	${FIND} ${STAGEDIR} -name '*.bs' -size 0c -exec ${RM} {} \;
++	${FIND} ${STAGEDIR} -type f -name '*.bs' -size 0c -exec ${RM} {} \;


After reading the pkg-plist changes I'm not sure if www/p5-libapreq2 now requires www/libapreq2 as run time dependency


-- 
Regards,
olli