Date: Mon, 23 Sep 2013 14:08:34 +0200 From: Guido Falsi <madpilot@FreeBSD.org> To: Baptiste Daroussin <bapt@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r327935 - head/sysutils/fusefs-libs Message-ID: <52402F42.1000105@FreeBSD.org> In-Reply-To: <201309230618.r8N6Ibw0075834@svn.freebsd.org> References: <201309230618.r8N6Ibw0075834@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------060103090408060505010002 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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 > ============================================================================== > --- head/sysutils/fusefs-libs/Makefile Mon Sep 23 06:17:32 2013 (r327934) > +++ head/sysutils/fusefs-libs/Makefile Mon Sep 23 06:18:37 2013 (r327935) > @@ -19,24 +19,16 @@ USE_LDCONFIG= yes > USES= iconv > CONFIGURE_ARGS= --prefix=${PREFIX} \ > --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig > -TXT_DOCS= how-fuse-works \ > +PORTDOCS= how-fuse-works \ > kernel.txt [...] > > 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}${DOCSDIR}/libs > .endif [...] > -%%PORTDOCS%%%%DOCSDIR%%/libs/how-fuse-works > -%%PORTDOCS%%%%DOCSDIR%%/libs/kernel.txt This part is creating a problem. the pkg tools look for these two files in DOCSDIR, not in DOCSDIR/libs, packaging fails on head. Attached patch fixes it. -- Guido Falsi <madpilot@FreeBSD.org> --------------060103090408060505010002 Content-Type: text/x-diff; name="fusefs-libs.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="fusefs-libs.diff" Index: Makefile =================================================================== --- Makefile (revision 327982) +++ Makefile (working copy) @@ -19,8 +19,8 @@ USES= iconv CONFIGURE_ARGS= --prefix=${PREFIX} \ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig -PORTDOCS= how-fuse-works \ - kernel.txt +PORTDOCS= libs/how-fuse-works \ + libs/kernel.txt .include <bsd.port.options.mk> @@ -28,7 +28,7 @@ ${INSTALL_DATA} ${WRKSRC}/include/fuse_kernel.h ${STAGEDIR}${PREFIX}/include/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 --------------060103090408060505010002--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?52402F42.1000105>