From owner-svn-ports-all@freebsd.org  Sun Sep 13 12:56:50 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F47AA03776;
 Sun, 13 Sep 2015 12:56:50 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4FD0C14E8;
 Sun, 13 Sep 2015 12:56:50 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8DCuo4o051045;
 Sun, 13 Sep 2015 12:56:50 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8DCuoJM051044;
 Sun, 13 Sep 2015 12:56:50 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201509131256.t8DCuoJM051044@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 13 Sep 2015 12:56:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r396814 - head/audio/mp3blaster
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Sep 2015 12:56:50 -0000

Author: bapt
Date: Sun Sep 13 12:56:49 2015
New Revision: 396814
URL: https://svnweb.freebsd.org/changeset/ports/396814

Log:
  Convert the automatically discovered esound into a proper option
  
  Approved by:	novel (maintainer)

Modified:
  head/audio/mp3blaster/Makefile

Modified: head/audio/mp3blaster/Makefile
==============================================================================
--- head/audio/mp3blaster/Makefile	Sun Sep 13 12:49:13 2015	(r396813)
+++ head/audio/mp3blaster/Makefile	Sun Sep 13 12:56:49 2015	(r396814)
@@ -18,7 +18,7 @@ CONFIGURE_ARGS=	--with-cxxflags="${CXXFL
 CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	LIRC SIDPLAY VORBIS DOCS
+OPTIONS_DEFINE=	LIRC SIDPLAY VORBIS DOCS ESOUND
 OPTIONS_DEFAULT=	SIDPLAY VORBIS
 SIDPLAY_DESC=	Sidplayer support
 
@@ -40,13 +40,8 @@ NAS_CONFIGURE_WITH=	nas
 NAS_LIB_DEPENDS=	libaudio.so:${PORTSDIR}/audio/nas
 NAS_LDFLAGS=		-laudio
 
-.include <bsd.port.pre.mk>
-.if ${HAVE_GNOME:Mesound} != ""
-USE_GNOME+=		esound
-CONFIGURE_ARGS+=	--with-esd
-.else
-CONFIGURE_ARGS+=	--without-esd
-.endif
+ESOUND_CONFIGURE_WITH=	esd
+ESOUND_GNOME=		esound
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local/share/mp3blaster/win2koi.tbl|${DATADIR}/charmap/win2koi.tbl|' \
@@ -58,4 +53,4 @@ post-install-DOCS-on:
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>