From owner-svn-ports-all@FreeBSD.ORG  Mon Dec 17 20:09:48 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4AC5450A;
 Mon, 17 Dec 2012 20:09:48 +0000 (UTC)
 (envelope-from wxs@atarininja.org)
Received: from syn.atarininja.org (syn.csh.rit.edu [129.21.49.45])
 by mx1.freebsd.org (Postfix) with ESMTP id 7F48B8FC14;
 Mon, 17 Dec 2012 20:09:47 +0000 (UTC)
Received: by syn.atarininja.org (Postfix, from userid 1001)
 id 825FF5C39; Mon, 17 Dec 2012 15:09:46 -0500 (EST)
Date: Mon, 17 Dec 2012 15:09:46 -0500
From: Wesley Shields <wxs@FreeBSD.org>
To: Baptiste Daroussin <bapt@FreeBSD.org>
Subject: Re: svn commit: r309126 - head/audio/aumix
Message-ID: <20121217200946.GB93040@atarininja.org>
References: <201212172002.qBHK2Bwf057818@svn.freebsd.org>
 <20121217200559.GB68303@ithaqua.etoilebsd.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20121217200559.GB68303@ithaqua.etoilebsd.net>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org,
 ports-committers@freebsd.org
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 20:09:48 -0000

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@FreeBSD.org>
> > -#
> > +# Created by: Chris Piazza <cpiazza@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