Date: Mon, 12 Mar 2007 09:43:06 +0300 From: Eygene Ryabinkin <rea-fbsd@codelabs.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: oliver@FreeBSD.org Subject: ports/110208: fix WITH_ and WITHOUT_ options usage in multimedia/audacious-plugins Message-ID: <E1HQeFO-000NIF-7H@pobox.codelabs.ru> Resent-Message-ID: <200703120650.l2C6o3o0043042@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110208
>Category: ports
>Synopsis: fix WITH_ and WITHOUT_ options usage in multimedia/audacious-plugins
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 12 06:50:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Eygene Ryabinkin
>Release: FreeBSD 6.2-STABLE i386
>Organization:
Code Labs
>Environment:
System: FreeBSD XXX 6.2-STABLE FreeBSD 6.2-STABLE #13: Mon Feb 12 15:59:07 MSK 2007 root@XXX:/usr/obj/usr/src/sys/XXX i386
>Description:
The Makefile of ports/multimedia/audacious-plugins uses WITHOUT_<OPTION>
clause when the respective OPTION is set to 'Off' in the OPTIONS variable.
This breaks the builds with BATCH=yes: the respective options are effectively
stays 'Off' even if WITH_<OPTION> is defined.
For the longer explanation on WITH_, WITHOUT_ and BATCH see
Porter's Handbook, section 5.11.2 or drop me a letter.
>How-To-Repeat:
Do 'make -DBATCH -DWITH_VORBIS=yes configure' in the port's directory
and see that Ogg Vorbis support is off.
>Fix:
The patch made against Makefile 1.31 is below. I successfully applied
it to the latest Makefile (1,34), but not tested the building yet. For
1.31 (and the port version 1.3.0) it works OK. I see no changes in the
OPTIONS defaults, so it should work with 1.34 too.
--- Makefile.orig Mon Mar 12 09:13:41 2007
+++ Makefile Mon Mar 12 09:24:41 2007
@@ -97,7 +97,7 @@
PLIST_SUB+= ROCKLIGHTPLUGIN="@comment "
.endif
-.if !defined(WITHOUT_LIRC)
+.if defined(WITH_LIRC)
LIB_DEPENDS+= lirc_client.1:${PORTSDIR}/comms/lirc
CONFIGURE_ARGS+=--enable-lirc
PLIST_SUB+= LIRCPLUGIN=""
@@ -124,7 +124,7 @@
PLIST_SUB+= AOSDPLUGIN="@comment "
.endif
-.if !defined(WITHOUT_ADPLUG)
+.if defined(WITH_ADPLUG)
LIB_DEPENDS+= binio.1:${PORTSDIR}/devel/libbinio
CONFIGURE_ARGS+=--enable-adplug
PLIST_SUB+= ADPLUGPLUGIN=""
@@ -133,7 +133,7 @@
PLIST_SUB+= ADPLUGPLUGIN="@comment "
.endif
-.if !defined(WITHOUT_VORBIS)
+.if defined(WITH_VORBIS)
LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
PLIST_SUB+= VORBISPLUGIN=""
#.if !defined(WITHOUT_FLAC)
@@ -149,7 +149,7 @@
PLIST_SUB+= VORBISPLUGIN="@comment " #FLACPLUGIN="@comment "
.endif
-.if !defined(WITHOUT_WAVPACK)
+.if defined(WITH_WAVPACK)
LIB_DEPENDS+= wavpack.1:${PORTSDIR}/audio/wavpack
CONFIGURE_ARGS+=--enable-wavpack
PLIST_SUB+= WAVPACKPLUGIN=""
@@ -166,7 +166,7 @@
PLIST_SUB+= AACPLUGIN="@comment "
.endif
-.if !defined(WITHOUT_SNDFILE)
+.if defined(WITH_SNDFILE)
LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile
CONFIGURE_ARGS+=--enable-sndfile
PLIST_SUB+= SNDFILEPLUGIN=""
@@ -175,7 +175,7 @@
PLIST_SUB+= SNDFILEPLUGIN="@comment "
.endif
-.if !defined(WITHOUT_MODPLUG)
+.if defined(WITH_MODPLUG)
LIB_DEPENDS+= modplug.0:${PORTSDIR}/audio/libmodplug
PLIST_SUB+= MODPLUG=""
CONFIGURE_ARGS+=--enable-modplug
@@ -184,7 +184,7 @@
CONFIGURE_ARGS+=--disable-modplug
.endif
-.if !defined(WITHOUT_MPC)
+.if defined(WITH_MPC)
LIB_DEPENDS+= mpcdec.5:${PORTSDIR}/audio/libmpcdec \
tag.5:${PORTSDIR}/audio/taglib
PLIST_SUB+= MPCPLUGIN=""
@@ -202,7 +202,7 @@
PLIST_SUB+= WMAPLUGIN="@comment "
.endif
-.if !defined(WITHOUT_JACK)
+.if defined(WITH_JACK)
LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack
CONFIGURE_ARGS+=--enable-jack
PLIST_SUB+= JACKPLUGIN=""
@@ -211,7 +211,7 @@
PLIST_SUB+= JACKPLUGIN="@comment "
.endif
-.if !defined(WITHOUT_ARTS)
+.if defined(WITH_ARTS)
LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
CONFIGURE_ARGS+=--enable-arts
PLIST_SUB+= ARTSPLUGIN=""
@@ -228,7 +228,7 @@
CONFIGURE_ARGS+=--disable-oss
.endif
-.if !defined(WITHOUT_SID)
+.if defined(WITH_SID)
LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay
PLIST_SUB+= SIDPLUGIN=""
CONFIGURE_ARGS+=--enable-sid
@@ -252,7 +252,7 @@
.else
CONFIGURE_ARGS+=--disable-paranormal
PLIST_SUB+= PARANORMALPLUGIN="@comment "
-.if !defined(WITHOUT_MMS)
+.if defined(WITH_MMS)
LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms
CONFIGURE_ARGS+=--enable-mms
PLIST_SUB+= MMSPLUGIN=""
@@ -279,7 +279,7 @@
PLIST_SUB+= TTAPLUGIN="@comment "
.endif
-.if !defined(WITHOUT_LAME)
+.if defined(WITH_LAME)
LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
CONFIGURE_ARGS+=--enable-lame
PLIST_SUB+= LAMEPLUGIN=""
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1HQeFO-000NIF-7H>