Date: Tue, 20 Jan 2004 17:18:53 -0500 From: Joe Marcus Clarke <marcus@FreeBSD.org> To: Eivind Eklund <eivind@FreeBSD.org> Cc: Kris Kennaway <kris@obsecurity.org> Subject: Re: HEADS UP: New bsd.*.mk changes Message-ID: <1074637133.757.128.camel@gyros> In-Reply-To: <20040120184123.GI94636@FreeBSD.org> References: <1074617147.757.16.camel@gyros> <20040120171315.GH94636@FreeBSD.org> <1074619795.757.43.camel@gyros> <400D68A1.4030501@fillmore-labs.com> <1074620919.757.51.camel@gyros> <20040120175136.GC3365@toxic.magnesium.net> <400D6D8F.7010708@fillmore-labs.com> <1074621945.757.63.camel@gyros> <400D7077.30009@fillmore-labs.com> <1074622845.757.69.camel@gyros> <20040120184123.GI94636@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-l2qD4jJv+0HXmIiKDLVW
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On Tue, 2004-01-20 at 13:41, Eivind Eklund wrote:
> On Tue, Jan 20, 2004 at 01:20:45PM -0500, Joe Marcus Clarke wrote:
> > > I totally agree that nobody want to use a variable called 'LATEST_LIN=
K' used for that
> > > purpose, but, hey, it's just a name. If we use something like
> > > OPTIONSNAME?=3D${LATEST_LINK}
> > > we have to use an workaround only for the port that build no packages=
, the rest should
> > > be automagically right. All the work of thinking of an unique name ha=
s already been done
> > > for a lot of ports.
> >=20
> > Yes, sorry I've missed some of these points. I'm trying to balance rea=
l
> > work and this discussion. You're right that we could just "borrow"
> > LATEST_LINK for the options purpose, but it will require your
> > re-ordering patch that will require testing on bento.
> >=20
> > So, the way I see it, we could keep things the way they are and wait fo=
r
> > the next experimental build cycle, or commit a UNIQUENAME patch that is
> > temporary until LATEST_LINK can be evaluated. Once that gets decided,
> > we can PR the patch we want tested.
>=20
> We take a hit if we put OPTIONS into production without a final settlemen=
t
> on this, as the options are saved and the users would lose the options th=
ey
> have set in the meantime.
I just committed this patch. Oliver, if you want to modify your patch,
and send-pr it, we can evaluate that during the next experimental
patches build. Also, if anyone wants to fix the target logic with
persisting options, please send-pr any patches you come up with.
Thanks to everyone for their comments.
Joe
>=20
> Here's a UNIQUENAME patch w/docs:
>=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/pcvs/ports/Mk/bsd.port.mk,v
> retrieving revision 1.475
> diff -u -r1.475 bsd.port.mk
> --- bsd.port.mk 20 Jan 2004 09:14:09 -0000 1.475
> +++ bsd.port.mk 20 Jan 2004 18:10:35 -0000
> @@ -69,6 +86,8 @@
> # Optional.
> # PKGNAMESUFFIX - Suffix to specify compilation options. Optional.
> # Do not define this in your Makefile.
> +# UNIQUENAME - A name for your port that is globally unique. By defa=
ult,
> +# this is set to ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
> # DISTNAME - Name of port or distribution used in generating
> # WRKSRC and DISTFILES below (default:
> # ${PORTNAME}-${PORTVERSION}).
> @@ -1017,7 +1036,8 @@
> # where 'make config' records user configuration options
> PORT_DBDIR?=3D /var/db/ports
> =20
> -OPTIONSFILE?=3D${PORT_DBDIR}/${PORTNAME}/options
> +UNIQUENAME?=3D${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
> +OPTIONSFILE?=3D${PORT_DBDIR}/${UNIQUENAME}/options
> .if exists(${OPTIONSFILE})
> .include "${OPTIONSFILE}"
> .endif
> @@ -4894,8 +4914,8 @@
> .if !defined(OPTIONS)
> @${ECHO_MSG} "=3D=3D=3D> No options to configure"
> .else
> - @(${MKDIR} ${PORT_DBDIR}/${PORTNAME} 2> /dev/null) || \
> - (${ECHO_MSG} "=3D=3D=3D> Cannot create ${PORT_DBDIR}/${PORTNAME}, chec=
k permissions"; exit 1)
> + @(${MKDIR} ${PORT_DBDIR}/${UNIQUENAME} 2> /dev/null) || \
> + (${ECHO_MSG} "=3D=3D=3D> Cannot create ${PORT_DBDIR}/${UNIQUENAME}, ch=
eck permissions"; exit 1)
> -@if [ -e ${OPTIONSFILE} ]; then \
> . ${OPTIONSFILE}; \
> fi; \
> @@ -4964,7 +4984,7 @@
> .if exists(${OPTIONSFILE})
> -@${ECHO_MSG} "=3D=3D=3D> Removing user-configured options for ${PORTNA=
ME}"; \
> ${RM} -f ${OPTIONSFILE}; \
> - ${RMDIR} ${PORT_DBDIR}/${PORTNAME}
> + ${RMDIR} ${PORT_DBDIR}/${UNIQUENAME}
> .else
> @${ECHO_MSG} "=3D=3D=3D> No user-specified options configured for ${POR=
TNAME}"
> .endif
> _______________________________________________
> freebsd-ports@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-ports
> To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org"
--=20
Joe Marcus Clarke
FreeBSD GNOME Team :: marcus@FreeBSD.org
gnome@FreeBSD.org
FreeNode / #freebsd-gnome
http://www.FreeBSD.org/gnome
--=-l2qD4jJv+0HXmIiKDLVW
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)
iD8DBQBADalNb2iPiv4Uz4cRAiKEAJ9Cdfpm/x71bTsN0cWsGU76dRlJHwCeKHsL
XT+PO36GVfNDBDdGeGDnI3Q=
=MEAK
-----END PGP SIGNATURE-----
--=-l2qD4jJv+0HXmIiKDLVW--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1074637133.757.128.camel>