From owner-svn-ports-head@FreeBSD.ORG Sun Mar 2 21:10:40 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5C5FE838; Sun, 2 Mar 2014 21:10:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2E94E18FE; Sun, 2 Mar 2014 21:10:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s22LAe2G071053; Sun, 2 Mar 2014 21:10:40 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s22LAeJo071052; Sun, 2 Mar 2014 21:10:40 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201403022110.s22LAeJo071052@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 2 Mar 2014 21:10:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346804 - head/audio/streamtuner X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Mar 2014 21:10:40 -0000 Author: bapt Date: Sun Mar 2 21:10:39 2014 New Revision: 346804 URL: http://svnweb.freebsd.org/changeset/ports/346804 QAT: https://qat.redports.org/buildarchive/r346804/ Log: Support stage Add python option Use options helpers Modified: head/audio/streamtuner/Makefile Modified: head/audio/streamtuner/Makefile ============================================================================== --- head/audio/streamtuner/Makefile Sun Mar 2 20:58:23 2014 (r346803) +++ head/audio/streamtuner/Makefile Sun Mar 2 21:10:39 2014 (r346804) @@ -15,7 +15,6 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSD LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme -NO_STAGE= yes USES= gmake pathfix pkgconfig USE_GNOME= gtk20 gnomeprefix INSTALLS_OMF= yes @@ -23,7 +22,7 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= SHOUTCAST LIVE365 XIPH LOCAL LOCAL_METADATA +OPTIONS_DEFINE= SHOUTCAST LIVE365 XIPH LOCAL LOCAL_METADATA PYTHON OPTIONS_DEFAULT= SHOUTCAST LIVE365 XIPH LOCAL LOCAL_METADATA SHOUTCAST_DESC= SHOUTcast plugin LIVE365_DESC= Live365 plugin @@ -31,29 +30,14 @@ LOCAL_DESC= Local plugin LOCAL_METADATA_DESC= Metadata support for the Local plugin XIPH_DESC= Xiph plugin -.include - -.if ${PORT_OPTIONS:MSHOUTCAST} -PLIST_SUB+= SHOUTCAST="" -.else -CONFIGURE_ARGS+= --disable-shoutcast -PLIST_SUB+= SHOUTCAST="@comment " -.endif - -.if ${PORT_OPTIONS:MLIVE365} -PLIST_SUB+= LIVE365="" -.else -CONFIGURE_ARGS+= --disable-live365 -PLIST_SUB+= LIVE365="@comment " -.endif +OPTIONS_SUB= yes +SHOUTCAST_CONFIGURE_ENABLE= shoutcast +LIB365_CONFIGURE_ENABLE= libve365 +XIPH_CONFIGURE_ENABLE= xiph +PYTHON_USE= python=yes gnome=pygtk2 +PYTHON_CONFIGURE_ENABLE= python -.if ${PORT_OPTIONS:MXIPH} -PLIST_SUB+= XIPH="" -USE_GNOME+= libxml2 -.else -CONFIGURE_ARGS+= --disable-xiph -PLIST_SUB+= XIPH="@comment " -.endif +.include .if ${PORT_OPTIONS:MLOCAL} PLIST_SUB+= LOCAL="" @@ -67,18 +51,6 @@ CONFIGURE_ARGS+= --disable-local PLIST_SUB+= LOCAL="@comment " .endif -.if ${PORT_OPTIONS:MPYTHON} -PLIST_SUB+= PYTHON="" -USE_PYTHON= yes -# we need to manually include this, because USE_PYTHON is defined -# after including bsd.port.pre.mk -.include "${PORTSDIR}/Mk/bsd.python.mk" -USE_GNOME+= pygtk2 -.else -CONFIGURE_ARGS+= --disable-python -PLIST_SUB+= PYTHON="@comment " -.endif - post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|[(]datadir[)]/help|(datadir)/gnome/help|g' \