Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Dec 2012 21:05:59 +0100
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        Wesley Shields <wxs@FreeBSD.org>
Cc:        svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org
Subject:   Re: svn commit: r309126 - head/audio/aumix
Message-ID:  <20121217200559.GB68303@ithaqua.etoilebsd.net>
In-Reply-To: <201212172002.qBHK2Bwf057818@svn.freebsd.org>
References:  <201212172002.qBHK2Bwf057818@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--kORqDWCi7qDJ0mEj
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, Dec 17, 2012 at 08:02:11PM +0000, Wesley Shields wrote:
> Author: wxs
> Date: Mon Dec 17 20:02:10 2012
> New Revision: 309126
> URL: http://svnweb.freebsd.org/changeset/ports/309126
>=20
> Log:
>   Convert to new options.
>  =20
>   PR:		ports/173783
>   Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com>
>   Approved by:	maintainer timeout
>=20
> Modified:
>   head/audio/aumix/Makefile   (contents, props changed)
>=20
> Modified: head/audio/aumix/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/audio/aumix/Makefile	Mon Dec 17 20:00:53 2012	(r309125)
> +++ head/audio/aumix/Makefile	Mon Dec 17 20:02:10 2012	(r309126)
> @@ -1,9 +1,5 @@
> -# New ports collection makefile for:	aumix
> -# Date created:        21 May 1999
> -# Whom:                Chris Piazza <cpiazza@FreeBSD.org>
> -#
> +# Created by: Chris Piazza <cpiazza@FreeBSD.org>
>  # $FreeBSD$
> -#
> =20
>  PORTNAME=3D	aumix
>  PORTVERSION=3D	2.9.1
> @@ -34,11 +30,12 @@ PLIST_FILES=3D	bin/aumix bin/mute bin/xaum
>  PLIST_FILES+=3D	share/aumix/${ii}
>  .endfor
> =20
> -OPTIONS=3D	NLS	"Enable NLS support" on \
> -		GTK2	"Enable GTK2 gui" off
> +.include <bsd.port.options.mk>
> =20
> -.include <bsd.port.pre.mk>
> -.if defined(WITHOUT_NLS)
> +OPTIONS_DEFINE=3D	NLS GTK2
> +OPTIONS_DEFAULT=3D	NLS
> +

This is wrong

The include should be here, OPTIONS_DEFINE and friends should always be def=
ined
prior to any bsd.port.options.mk include or bsd.port.pre.mk include

While here, OPTIONS_DEFAULT=3D NLS is useless the framework takes care of s=
etting
NLS on by default

regards,
Bapt

--kORqDWCi7qDJ0mEj
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iEYEARECAAYFAlDPeycACgkQ8kTtMUmk6ExRWgCffCRAbU4V0C4JrdS6CgHsGVe/
OpMAn0vBo5/C0Pfsd4YDbYAPmeSvLGBf
=17ps
-----END PGP SIGNATURE-----

--kORqDWCi7qDJ0mEj--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121217200559.GB68303>