From owner-svn-ports-all@FreeBSD.ORG Mon Sep 17 01:51:19 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B9DE21065672; Mon, 17 Sep 2012 01:51:19 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A46498FC12; Mon, 17 Sep 2012 01:51:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8H1pJMi025507; Mon, 17 Sep 2012 01:51:19 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8H1pJDG025505; Mon, 17 Sep 2012 01:51:19 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201209170151.q8H1pJDG025505@svn.freebsd.org> From: Eitan Adler Date: Mon, 17 Sep 2012 01:51:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r304382 - head/multimedia/xmms X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Sep 2012 01:51:19 -0000 Author: eadler Date: Mon Sep 17 01:51:19 2012 New Revision: 304382 URL: http://svn.freebsd.org/changeset/ports/304382 Log: Convert to optionsng Modified: head/multimedia/xmms/Makefile Modified: head/multimedia/xmms/Makefile ============================================================================== --- head/multimedia/xmms/Makefile Sun Sep 16 22:49:35 2012 (r304381) +++ head/multimedia/xmms/Makefile Mon Sep 17 01:51:19 2012 (r304382) @@ -43,22 +43,22 @@ INPUT_PLUGINS= cdaudio mpg123 tonegen wa OUTPUT_PLUGINS= OSS disk_writer VISUALIZATION_PLUGINS= blur_scope sanalyzer -OPTIONS= IPV6 "Enable ipv6" on \ - MIKMOD "Enable Mikemod Plugin" on \ - SIMD "Enable x86 SIMD (3DNow!/MMX)" on \ - SPEC "Visualization opengl_spectrum" off \ - VFILEINFO "Enable Extended Vorbis Fileinfo" off \ - VORBIS "Enable Vorbis Plugin" on +OPTIONS_DEFINE= IPV6 MIKMOD SIMD SPEC VFILEINFO VORBIS RUSXMMS_PATCHES +OPTIONS_DEFAULT= IPV6 MIKMOD SIMD VORBIS +SPEC_DESC= Visualization opengl_spectrum +VFILEINFO_DESC= Enable Extended Vorbis Fileinfo +RUSXMMS_PATCHES_DESC= Custom IDv3 patches + .include -.if !defined(WITHOUT_IPV6) +.if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif -.if defined(WITH_RUSXMMS_PATCHES) +.if ${PORT_OPTIONS:MRUSXMMS_PATCHES} ENC_PATCHLEVEL= 41 DISTFILES+= RusXMMS2-csa${ENC_PATCHLEVEL}${EXTRACT_SUFX}:enc MASTER_SITES+= SF/rusxmms/rusxmms2/csa41%20%28${PORTVERSION}%29:enc @@ -68,11 +68,11 @@ LIB_DEPENDS+= rcc.2:${PORTSDIR}/devel/li LIB_DEPENDS+= rcd.1:${PORTSDIR}/devel/librcd .endif -.if defined(WITH_VFILEINFO) +.if ${PORT_OPTIONS:MVFILEINFO} CFLAGS+= -DALL_VORBIS_TAGS .endif -.if !defined(WITHOUT_MIKMOD) +.if ${PORT_OPTIONS:MMIKMOD} LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio/libmikmod INPUT_PLUGINS+= mikmod PLIST_SUB+= MIKMODPLUGIN:="" @@ -81,7 +81,7 @@ CONFIGURE_ARGS+= --disable-mikmod PLIST_SUB+= MIKMODPLUGIN:="@comment " .endif -.if !defined(WITHOUT_VORBIS) +.if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis INPUT_PLUGINS+= vorbis PLIST_SUB+= VORBISPLUGIN:="" @@ -100,18 +100,18 @@ PLIST_SUB+= ESDPLUGIN:="@comment " .endif .if ${ARCH} != "i386" -WITHOUT_SIMD+= yes +${UNIQUENAME}_UNSET+= SIMD .endif -.if !defined(WITHOUT_SIMD) +.if ${PORT_OPTIONS:MSIMD} CONFIGURE_ARGS+= --enable-simd .else .if ${ARCH} == "i386" -BROKEN= must use option WITH_SIMD on ${ARCH} see pr ports/63456 +BROKEN= must use option SIMD on ${ARCH} see pr ports/63456 .endif .endif -.if defined(WITH_SPEC) +.if ${PORT_OPTIONS:MSPEC} PLIST_SUB+= SPEC="" VISUALIZATION_PLUGINS+= opengl_spectrum .else @@ -119,7 +119,7 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-V PLIST_SUB+= SPEC="@comment " .endif -.if defined(WITHOUT_SIMD) +.if empty(${PORT_OPTIONS:MSIMD}) post-extract: (cd ${WRKSRC}/Input/mpg123 && ${MV} decode_i586.s decode_i586.S && \ cd ${WRKSRC}/Visualization/blur_scope && ${MV} blur_8.s blur_8.S); @@ -137,15 +137,15 @@ pre-extract: @${ECHO_MSG} "" .endif -.if !defined(WITH_RUSXMMS_PATCHES) +.if empty(${PORT_OPTIONS:MRUSXMMS_PATCHES}) @${ECHO_MSG} "" @${ECHO_MSG} "You can enable support for ID3v2 tags and CP1251" - @${ECHO_MSG} "encoding by defining WITH_RUSXMMS_PATCHES." + @${ECHO_MSG} "encoding by setting the RUSXMMS_PATCHES option." @${ECHO_MSG} "" .endif post-patch: -.if defined(WITH_RUSXMMS_PATCHES) +.if ${PORT_OPTIONS:MRUSXMMS_PATCHES} . for src in source/rcc.c source/rcc.h source/rcc_langs.h @${INSTALL_DATA} ${WRKDIR}/RusXMMS2/${src} ${WRKSRC}/libxmms . endfor