Date: Mon, 23 Sep 2013 14:17:36 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Guido Falsi <madpilot@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r327935 - head/sysutils/fusefs-libs Message-ID: <20130923121736.GX73535@ithaqua.etoilebsd.net> In-Reply-To: <52402F42.1000105@FreeBSD.org> References: <201309230618.r8N6Ibw0075834@svn.freebsd.org> <52402F42.1000105@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--QVzQgM+zdZ3YWXqn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Sep 23, 2013 at 02:08:34PM +0200, Guido Falsi wrote: > On 09/23/13 08:18, Baptiste Daroussin wrote: > > Author: bapt > > Date: Mon Sep 23 06:18:37 2013 > > New Revision: 327935 > > URL: http://svnweb.freebsd.org/changeset/ports/327935 > > > > Log: > > Use stage, convert TEXT_DOCS to PORTDOCS > > > > Modified: > > head/sysutils/fusefs-libs/Makefile > > head/sysutils/fusefs-libs/pkg-plist > > > > Modified: head/sysutils/fusefs-libs/Makefile > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/sysutils/fusefs-libs/Makefile Mon Sep 23 06:17:32 2013 (r32793= 4) > > +++ head/sysutils/fusefs-libs/Makefile Mon Sep 23 06:18:37 2013 (r32793= 5) > > @@ -19,24 +19,16 @@ USE_LDCONFIG=3D yes > > USES=3D iconv > > CONFIGURE_ARGS=3D --prefix=3D${PREFIX} \ > > --with-pkgconfigdir=3D${PREFIX}/libdata/pkgconfig > > -TXT_DOCS=3D how-fuse-works \ > > +PORTDOCS=3D how-fuse-works \ > > kernel.txt >=20 > [...] >=20 > > > > post-install: > > - ${INSTALL_DATA} ${WRKSRC}/include/fuse_kernel.h ${PREFIX}/include/fuse > > + ${INSTALL_DATA} ${WRKSRC}/include/fuse_kernel.h ${STAGEDIR}${PREFIX}/= include/fuse > > .if ${PORT_OPTIONS:MDOCS} > > - @${MKDIR} ${DOCSDIR}/libs > > -.for i in ${TXT_DOCS} > > - @${INSTALL_DATA} ${WRKSRC}/doc/$i ${DOCSDIR}/libs > > -.endfor > > + @${MKDIR} ${STAGEDIR}${DOCSDIR}/libs > > + @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDI= R}/libs > > .endif >=20 > [...] >=20 > > -%%PORTDOCS%%%%DOCSDIR%%/libs/how-fuse-works > > -%%PORTDOCS%%%%DOCSDIR%%/libs/kernel.txt >=20 > This part is creating a problem. the pkg tools look for these two files= =20 > in DOCSDIR, not in DOCSDIR/libs, packaging fails on head. >=20 > Attached patch fixes it. >=20 > --=20 > Guido Falsi <madpilot@FreeBSD.org> > Index: Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- Makefile (revision 327982) > +++ Makefile (working copy) > @@ -19,8 +19,8 @@ > USES=3D iconv > CONFIGURE_ARGS=3D --prefix=3D${PREFIX} \ > --with-pkgconfigdir=3D${PREFIX}/libdata/pkgconfig > -PORTDOCS=3D how-fuse-works \ > - kernel.txt > +PORTDOCS=3D libs/how-fuse-works \ > + libs/kernel.txt > =20 > .include <bsd.port.options.mk> > =20 > @@ -28,7 +28,7 @@ > ${INSTALL_DATA} ${WRKSRC}/include/fuse_kernel.h ${STAGEDIR}${PREFIX}/in= clude/fuse > .if ${PORT_OPTIONS:MDOCS} > @${MKDIR} ${STAGEDIR}${DOCSDIR}/libs > - @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}= /libs > + @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} ${PORTDOCS:S/libs\///} ${STAGEDIR= }${DOCSDIR}/libs > .endif > =20 > =20 Approved thanks regards, Bapt --QVzQgM+zdZ3YWXqn Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlJAMWAACgkQ8kTtMUmk6Ew7hwCfUASulGHlzeUeFWN9nJixG+vl AFQAoKkV7kyykDACN/RjegkE0uNUyDwD =P0KV -----END PGP SIGNATURE----- --QVzQgM+zdZ3YWXqn--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130923121736.GX73535>