From owner-svn-ports-head@FreeBSD.ORG Mon Sep 23 12:08:42 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTP id 53F817B0; Mon, 23 Sep 2013 12:08:42 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from winston.madpilot.net (winston.madpilot.net [78.47.75.155]) by mx1.freebsd.org (Postfix) with ESMTP id D122C273A; Mon, 23 Sep 2013 12:08:41 +0000 (UTC) Received: from winston.madpilot.net (localhost [127.0.0.1]) by winston.madpilot.net (Postfix) with ESMTP id 3ck47X3NWFzFTMM; Mon, 23 Sep 2013 14:08:40 +0200 (CEST) X-Virus-Scanned: amavisd-new at madpilot.net Received: from winston.madpilot.net ([127.0.0.1]) by winston.madpilot.net (winston.madpilot.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id g-_HCkeEuA2d; Mon, 23 Sep 2013 14:08:38 +0200 (CEST) Received: from vwg82.hq.ignesti.it (unknown [77.246.14.163]) by winston.madpilot.net (Postfix) with ESMTPSA; Mon, 23 Sep 2013 14:08:38 +0200 (CEST) Message-ID: <52402F42.1000105@FreeBSD.org> Date: Mon, 23 Sep 2013 14:08:34 +0200 From: Guido Falsi User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: Baptiste Daroussin , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r327935 - head/sysutils/fusefs-libs References: <201309230618.r8N6Ibw0075834@svn.freebsd.org> In-Reply-To: <201309230618.r8N6Ibw0075834@svn.freebsd.org> Content-Type: multipart/mixed; boundary="------------060103090408060505010002" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Sep 2013 12:08:42 -0000 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 --------------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 @@ -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--