From owner-svn-ports-head@FreeBSD.ORG Mon Sep 23 12:17:46 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 7138498A; Mon, 23 Sep 2013 12:17:46 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wg0-x234.google.com (mail-wg0-x234.google.com [IPv6:2a00:1450:400c:c00::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8DE2327D8; Mon, 23 Sep 2013 12:17:45 +0000 (UTC) Received: by mail-wg0-f52.google.com with SMTP id m15so3100406wgh.7 for ; Mon, 23 Sep 2013 05:17:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=37Ix9yhL9yvWPix2PSbgPuSlZVbCFWxNiOwajBxrDvo=; b=dpPu3JbQZ0qPhMhelLLBSR89p+6vq02sRh3QXMk4c2UhaZz2stqL0ZT+67X7cx12pF MaR6USc4PyHXeExzGgsleE88JUu7jXEi6E6mcpcS4ZveeYq4Y7rANKMWE4i7Sse5RQxQ n1TlcbcgTJhyf6esU+C5ay5EramfxNGVORtngYFHDqQ8owO+TpU4Os9qytwuQkgYoDFi niUH64oJjZpCp+h2XM3akRdeAuqYJrr8AaJxMFNJJtmvZ+VLOB1rtG2R0JTJ+DbPbTib PfRH0LT8q/PwWWNeSoOX4LSZCigXNFJAwOqxIlP1jyZsMATR77PYumwb7cSQQnjY6kqy rIcw== X-Received: by 10.194.19.5 with SMTP id a5mr1285911wje.48.1379938662519; Mon, 23 Sep 2013 05:17:42 -0700 (PDT) Received: from ithaqua.etoilebsd.net (ithaqua.etoilebsd.net. [37.59.37.188]) by mx.google.com with ESMTPSA id b13sm24902856wic.9.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 23 Sep 2013 05:17:41 -0700 (PDT) Sender: Baptiste Daroussin Date: Mon, 23 Sep 2013 14:17:36 +0200 From: Baptiste Daroussin To: Guido Falsi Subject: Re: svn commit: r327935 - head/sysutils/fusefs-libs Message-ID: <20130923121736.GX73535@ithaqua.etoilebsd.net> References: <201309230618.r8N6Ibw0075834@svn.freebsd.org> <52402F42.1000105@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="QVzQgM+zdZ3YWXqn" Content-Disposition: inline In-Reply-To: <52402F42.1000105@FreeBSD.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org 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:17:46 -0000 --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 > 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 > =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--