Date: Thu, 13 Dec 2012 14:47:58 -0600 From: Bryan Drewery <bdrewery@freebsd.org> To: Baptiste Daroussin <bapt@freebsd.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r308598 - in head: . Mk Message-ID: <50CA3EFE.30709@FreeBSD.org> In-Reply-To: <50CA33FD.8060805@FreeBSD.org> References: <201212101014.qBAAE5xX084461@svn.freebsd.org> <50CA33FD.8060805@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig3B4AD7B4802490F6B4DF9E4E Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 12/13/2012 2:01 PM, Bryan Drewery wrote: > On 12/10/2012 4:14 AM, Baptiste Daroussin wrote: >> Author: bapt >> Date: Mon Dec 10 10:14:05 2012 >> New Revision: 308598 >> URL: http://svnweb.freebsd.org/changeset/ports/308598 >> >> Log: >> Extend the options framework providing 2 new macros: >> =20 >> OPTIONS_RADIO: a more user friendly way to allow selecting only 0 or= 1 options >> among a list of options >> OPTIONS_GROUP: this macros should be used to group options by theme = allowing the >> user to select 0 or N options among a list of options= >> =20 >> With hat: portmgr >> Reviewed by: beat >> >> Modified: >> head/CHANGES >> head/Mk/bsd.options.mk >> head/Mk/bsd.port.mk >=20 > Hmm, this is not recording the options in ALL_OPTIONS, which means they= > don't get registered in pkgng packages. >=20 > - (~/freebsd/ports/ports-mgmt/portupgrade) $ make pretty-print-config > +DOCS DB_OVERRIDE( +BDB4 -BDB1 ) > - (~/freebsd/ports/ports-mgmt/portupgrade) $ make -V ALL_OPTIONS > DOCS >=20 > PKGNG Package: >=20 > options: {DOCS: on} >=20 > This causes poudriere to rebuild the package every time: >=20 > =3D=3D=3D=3D>> Options changed, deleting: apr-1.4.6.1.4.1_2.txz > =3D=3D=3D=3D>> Pkg: > =3D=3D=3D=3D>> New: BDB DEVRANDOM GDBM IPV6 SSL THREADS > =3D=3D=3D=3D>> Options changed, deleting: portupgrade-2.4.10.3,2.txz > =3D=3D=3D=3D>> Pkg: DOCS > =3D=3D=3D=3D>> New: BDB4 DOCS Here's a patch: http://people.freebsd.org/~bdrewery/patch-bsd.pkgng.mk-RADIO-GROUP.txt # svn status M bsd.pkgng.mk Index: bsd.pkgng.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 --- bsd.pkgng.mk (revision 308869) +++ bsd.pkgng.mk (working copy) @@ -100,8 +100,28 @@ . endif . endfor .endfor +.for radio in ${OPTIONS_RADIO} +. for opt in ${OPTIONS_RADIO_${radio}} +. if empty(PORT_OPTIONS:M${opt}) + @${ECHO_MSG} -n "${opt}: off, " >> ${MANIFESTF} +. else + @${ECHO_MSG} -n "${opt}: on, " >> ${MANIFESTF} +. endif +. endfor +.endfor +.for group in ${OPTIONS_GROUP} +. for opt in ${OPTIONS_GROUP_${group}} +. if empty(PORT_OPTIONS:M${opt}) + @${ECHO_MSG} -n "${opt}: off, " >> ${MANIFESTF} +. else + @${ECHO_MSG} -n "${opt}: on, " >> ${MANIFESTF} +. endif +. endfor +.endfor .undef multi .undef single +.undef radio +.undef group .undef opt @${ECHO_CMD} "}" >> ${MANIFESTF} @[ -f ${PKGINSTALL} ] && ${CP} ${PKGINSTALL} ${METADIR}/+INSTALL; \ --=20 Regards, Bryan Drewery bdrewery@freenode/EFNet --------------enig3B4AD7B4802490F6B4DF9E4E Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQIcBAEBAgAGBQJQyj7/AAoJEG54KsA8mwz5QeQQALz0d4r3BICW9LhyV6CPPwAO iaVWeryLs46mMAcyyKhtpMzjBqE6pCMo7Ko3SwVRjZktSC1gNn542Mgjy63wou9M KB5KSY/vHe1lfzledDZsc161Fcoil7GdpQ5xNzOeNpRNmv0qm0IgdjN8uC08kTaX TMWDgAjcZqq+4Bj/udBsc69fADU2j5ghf649pXK3h4R1V2YQfSbGAkw74KYAfvkZ t25ioWi+NYdjdeXfrnJgC/Zduiho1pOH33hguLmx0rIFcq/Hxo75N6W6LusXjttR aG1C0EFLZ7KbrfG0GvW7FsjtKlOz15XWaoINzAPdVhyYTDKn3/ckZBi7Tl0wl1Nb Z8wJJeTp1pziNVPcYua89Qc3SsZAVb0qSEIYF53fRdpLKjos3KWEWUhp3E0Kn93B tFQrYF5EmqwlFSxL1H1z8EAZS2p+l/3vdd9z6ZbkIDKQW/D4DGIzZNWQGdU1pykd OMe/0MsVUgg2D0Ub7nceKr+tnmbUWYS6YeMzCDnndNfBiUoTu7YoxSQOq6m9SUNi dVGL9qVKd2wryVMMHIa5S5wvuVlhI0fbn+4i/hLiOp2Yk8jBrBgST2kbUPjuuUcz Gho+av6H4SjWmsHJRiOmkeAwd40HE4PIpxHnjCKIrtx6zGtGPfzWSyw+7Fsquqgs Wz/bJ7enTOQXE544ddgL =tIYi -----END PGP SIGNATURE----- --------------enig3B4AD7B4802490F6B4DF9E4E--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?50CA3EFE.30709>