From owner-freebsd-ports@FreeBSD.ORG Mon Jun 11 15:36:17 2012 Return-Path: Delivered-To: ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6CBBC1065672 for ; Mon, 11 Jun 2012 15:36:17 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4D0158FC14; Mon, 11 Jun 2012 15:36:17 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q5BFaH1o015423; Mon, 11 Jun 2012 15:36:17 GMT (envelope-from bapt@freebsd.org) Received: (from bapt@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5BFaGTs015421; Mon, 11 Jun 2012 15:36:16 GMT (envelope-from bapt@freebsd.org) X-Authentication-Warning: freefall.freebsd.org: bapt set sender to bapt@freebsd.org using -f Date: Mon, 11 Jun 2012 17:36:14 +0200 From: Baptiste Daroussin To: Matthew Seaman Message-ID: <20120611153614.GA60433@ithaqua.etoilebsd.net> References: <20120611043001.GO60433@ithaqua.etoilebsd.net> <4FD591DF.3060808@infracaninophile.co.uk> <20120611103221.GU60433@ithaqua.etoilebsd.net> <4FD5D7B8.9080504@infracaninophile.co.uk> <20120611115529.GV60433@ithaqua.etoilebsd.net> <4FD5EFE1.30200@infracaninophile.co.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="azskX66S5GHWoEK7" Content-Disposition: inline In-Reply-To: <4FD5EFE1.30200@infracaninophile.co.uk> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: ports@freebsd.org Subject: Re: ports need a uniq identifier, do you have any suggestion? X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jun 2012 15:36:17 -0000 --azskX66S5GHWoEK7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jun 11, 2012 at 02:17:21PM +0100, Matthew Seaman wrote: > On 11/06/2012 12:55, Baptiste Daroussin wrote: > > why because they recommand their user to set PKGNAMEPREFIX to > > ${BLA_PKGNAMEPREFIX} so that their prefix can be set from bsd.port.mk > > Which mean that until the said bsd.$guilty.mk is included UNIQUENAME na= me is set > > to ${PKGNAMEPREFIX}${PORTNAME} with PKGNAMEPREFIX being expanded to not= hing > > and once bsd.$guilty.mk is included ${PKGNAMEPREFIX} expands to somethi= ng and so > > UNIQUENAME is changed. (btw also break the options framework (old and n= ew) with > > the ports because OPTIONSFILE is created using the ${UNIQUENAME} >=20 > A light dawns. Yes. The value of $OPTIONSFILE cannot depend on > anything that happens in the port after bsd.port.options.mk is .include'd. >=20 > How about this (untested): >=20 > % cvs diff > cvs diff: Diffing . > Index: bsd.options.mk > =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 > RCS file: /home/ncvs/ports/Mk/bsd.options.mk,v > retrieving revision 1.13 > diff -u -r1.13 bsd.options.mk > --- bsd.options.mk 6 Jun 2012 11:47:29 -0000 1.13 > +++ bsd.options.mk 11 Jun 2012 13:03:47 -0000 > @@ -8,8 +8,6 @@ > # global ones and ending with the ones decided by the maintainer. > # Options global to the entire ports tree >=20 > -OPTIONSFILE?=3D ${PORT_DBDIR}/${UNIQUENAME}/options > - > #ALL_OPTIONS=3D DOCS \ > # NLS >=20 > Index: bsd.port.mk > =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 > RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v > retrieving revision 1.727 > diff -u -r1.727 bsd.port.mk > --- bsd.port.mk 8 Jun 2012 19:52:39 -0000 1.727 > +++ bsd.port.mk 11 Jun 2012 13:06:35 -0000 > @@ -1268,6 +1268,10 @@ > UNIQUENAME?=3D ${PKGNAMEPREFIX}${PORTNAME} > .endif >=20 > +.if !defined(OPTIONSFILE) > +OPTIONSFILE:=3D ${PORT_DBDIR}/${UNIQUENAME}/options > +.endif > + > .endif >=20 > DOS2UNIX_REGEX?=3D .* >=20 > So OPTIONSFILE is at least independent of any changes to PKGNAMEPREFIX > made by bsd.$guilty.mk? >=20 > Port maintainers wishing to override the default OPTIONSFILE setting > should obviously do that before the inclusion of bsd.port.options.mk >=20 > Cheers, >=20 > Matthew >=20 > --=20 > Dr Matthew J Seaman MA, D.Phil. 7 Priory Courtyard > Flat 3 > PGP: http://www.infracaninophile.co.uk/pgpkey Ramsgate > JID: matthew@infracaninophile.co.uk Kent, CT11 9PW >=20 >=20 >=20 This patch does the trick, I'm now running a script with that patch on to discovers all the uniquename names which are not really uniq regards, Bapt --azskX66S5GHWoEK7 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAk/WEG4ACgkQ8kTtMUmk6EzM7gCaAoMxOuSV3Zxh8mfZFY1NB0na RgwAmwVCwqcYF1p0MrbCNc6IJWxTcGNN =IS91 -----END PGP SIGNATURE----- --azskX66S5GHWoEK7--