svn commit: r309126 - head/audio/aumix

[Wesley Shields]

On Mon, Dec 17, 2012 at 09:05:59PM +0100, Baptiste Daroussin wrote:
> On Mon, Dec 17, 2012 at 08:02:11PM +0000, Wesley Shields wrote:
> > Modified: head/audio/aumix/Makefile
> > ==============================================================================
> > --- 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 at FreeBSD.org>
> > -#
> > +# Created by: Chris Piazza <cpiazza at FreeBSD.org>
> >  # $FreeBSD$
> > -#
> >  
> >  PORTNAME=	aumix
> >  PORTVERSION=	2.9.1
> > @@ -34,11 +30,12 @@ PLIST_FILES=	bin/aumix bin/mute bin/xaum
> >  PLIST_FILES+=	share/aumix/${ii}
> >  .endfor
> >  
> > -OPTIONS=	NLS	"Enable NLS support" on \
> > -		GTK2	"Enable GTK2 gui" off
> > +.include <bsd.port.options.mk>
> >  
> > -.include <bsd.port.pre.mk>
> > -.if defined(WITHOUT_NLS)
> > +OPTIONS_DEFINE=	NLS GTK2
> > +OPTIONS_DEFAULT=	NLS
> > +
> 
> This is wrong
> 
> The include should be here, OPTIONS_DEFINE and friends should always be defined
> prior to any bsd.port.options.mk include or bsd.port.pre.mk include
> 
> While here, OPTIONS_DEFAULT= NLS is useless the framework takes care of setting
> NLS on by default

Fixed both. Thanks!

-- WXS