Subject: Re: CVS commit: pkgsrc/mk
To: None <pkgsrc-changes@NetBSD.org>
From: Lubomir Sedlacik <salo@Xtrmntr.org>
List: pkgsrc-changes
Date: 12/05/2004 18:02:30
--Zqu75NDXmDJGUu04
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Dec 05, 2004 at 05:12:01PM +0100, Jukka Salmi wrote:
=20
> The applied patch should fix the problem.
>=20
> --- bsd.options.mk.bak	2004-12-05 13:36:52.000000000 +0100
> +++ bsd.options.mk	2004-12-05 15:48:38.000000000 +0100
> @@ -176,13 +176,13 @@
>  		END { if (length(line) > 0) print "	"line }		\
>  	'
> =20
> -.if !defined(_PKG_OPTIONS_AVAILABLE)
> +.if !defined(_PKG_OPTIONS_AVAILABLE) && !empty(PKG_SUPPORTED_OPTIONS)
>  _PKG_OPTIONS_AVAILABLE!=3D	${ECHO} ${PKG_SUPPORTED_OPTIONS} | ${XARGS} -=
n 1 | ${SORT}
>  .endif
> -.if !defined(_PKG_OPTIONS_DEFAULT)
> +.if !defined(_PKG_OPTIONS_DEFAULT) && !empty(PKG_DEFAULT_OPTIONS)
>  _PKG_OPTIONS_DEFAULT!=3D		${ECHO} ${PKG_DEFAULT_OPTIONS} | ${XARGS} -n 1=
 | ${SORT}
>  .endif
> -.if !defined(_PKG_OPTIONS_ENABLED)
> +.if !defined(_PKG_OPTIONS_ENABLED) && !empty(PKG_OPTIONS)
>  _PKG_OPTIONS_ENABLED!=3D		${ECHO} ${PKG_OPTIONS} | ${XARGS} -n 1 | ${SOR=
T}
>  .endif

if there are no PKG_SUPPORTED_OPTIONS defined, it doesn't make much
sense to test for PKG_DEFAULT_OPTIONS or PKG_OPTIONS.. mmm, wasting cpu
cycles.


regards,

--=20
-- Lubomir Sedlacik <salo@{NetBSD,Xtrmntr,silcnet}.org>   --

--Zqu75NDXmDJGUu04
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (NetBSD)

iD8DBQFBsz8miwjDDlS8cmMRAkuyAJ9nsgHSQQdKuSjqrlqe1mNpjp5CSgCfRnY7
gFUqaUSIfIz6DRupRcYiNv4=
=5wKL
-----END PGP SIGNATURE-----

--Zqu75NDXmDJGUu04--