From owner-freebsd-apache@FreeBSD.ORG Sun Jun 8 13:01:08 2014 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 35F47D6C for ; Sun, 8 Jun 2014 13:01:08 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B90F9230C for ; Sun, 8 Jun 2014 13:01:07 +0000 (UTC) Received: from [192.168.0.100] ([87.139.233.65]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0Lck9X-1WT7H51mC7-00k7e8; Sun, 08 Jun 2014 15:01:04 +0200 Message-ID: <53945E98.3080408@gmx.de> Date: Sun, 08 Jun 2014 15:01:12 +0200 From: olli hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Kurt Jaeger Subject: Re: www/p5-libapreq2: libtool fix, strip libs, pkg-plist followup, p5-fix References: <20140608081334.GK1427@f10.opsec.eu> <20140608083407.GL1427@f10.opsec.eu> <20140608083636.GM1427@f10.opsec.eu> <20140608085842.GO1427@f10.opsec.eu> In-Reply-To: <20140608085842.GO1427@f10.opsec.eu> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:q5XAotKtfTxkRQlxvCI36Hqf3D1CL9k+wlxmFRFqZoCsP4FXmzG NPncVm93PdXUz5tAJKJhCX9MQVi7XLGjUr+fGmYHqV3nFRTGmLkt1pkKyiXTdDHjlPh28nM qWuv2MMDQVnHJonfDqcl5PKyv/pC/EasFxOEcUS85R4eN14D3OwOt3jFakq6YUpbxH8Inwz IM/iA8k0g3xFxOmuiXAKg== Cc: Frederic Culot , apache@freebsd.org, skv@FreeBSD.org X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jun 2014 13:01:08 -0000 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