Date: Mon, 11 Jun 2012 14:17:21 +0100 From: Matthew Seaman <m.seaman@infracaninophile.co.uk> To: Baptiste Daroussin <bapt@freebsd.org> Cc: ports@freebsd.org Subject: Re: ports need a uniq identifier, do you have any suggestion? Message-ID: <4FD5EFE1.30200@infracaninophile.co.uk> In-Reply-To: <20120611115529.GV60433@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>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enig76A27F98D701ABB48E1B2102
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
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}
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=
=2E
How about this (untested):
% 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
-OPTIONSFILE?=3D ${PORT_DBDIR}/${UNIQUENAME}/options
-
#ALL_OPTIONS=3D DOCS \
# NLS
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
+.if !defined(OPTIONSFILE)
+OPTIONSFILE:=3D ${PORT_DBDIR}/${UNIQUENAME}/options
+.endif
+
.endif
DOS2UNIX_REGEX?=3D .*
So OPTIONSFILE is at least independent of any changes to PKGNAMEPREFIX
made by bsd.$guilty.mk?
Port maintainers wishing to override the default OPTIONSFILE setting
should obviously do that before the inclusion of bsd.port.options.mk
Cheers,
Matthew
--=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
--------------enig76A27F98D701ABB48E1B2102
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.16 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk/V7+kACgkQ8Mjk52CukIxVNACfS+TWU9IXe1zXGndPPI6deAwB
t6oAnAj0QLyT+OwvUMkdtjpkMIgCRCvo
=Y8tI
-----END PGP SIGNATURE-----
--------------enig76A27F98D701ABB48E1B2102--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4FD5EFE1.30200>