Skip site navigation (1)Skip section navigation (2)
Date:      12 Sep 2002 23:08:34 -0400
From:      Joe Marcus Clarke <marcus@FreeBSD.org>
To:        esk@ira.uka.de
Cc:        ports@FreeBSD.org
Subject:   xmms patch to correctly disable optional components
Message-ID:  <1031886515.342.39.camel@gyros.marcuscom.com>

next in thread | raw e-mail | index | archive | help

--=-Xv+MtMU2vALmcyNUIy3S
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

It was recently brought up that xmms doesn't respect the WITHOUT_ macros
for its optional components unless the appropriate --disable-* arguments
are specified to configure.  The attached patch corrects the problem. 
May I commit?  Thanks.

Joe
-- 
Joe Marcus Clarke
FreeBSD GNOME Team	::	marcus@FreeBSD.org
http://www.FreeBSD.org/gnome

--=-Xv+MtMU2vALmcyNUIy3S
Content-Disposition: attachment; filename=xmms.diff
Content-Transfer-Encoding: quoted-printable
Content-Type: text/x-patch; name=xmms.diff; charset=ISO8859-1

Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/audio/xmms/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- Makefile	21 Aug 2002 16:47:55 -0000	1.43
+++ Makefile	13 Sep 2002 03:04:45 -0000
@@ -42,6 +42,7 @@
 INPUT_PLUGINS+=3D	mikmod
 PLIST_SUB+=3D	MIKMODPLUGIN:=3D""
 .else
+CONFIGURE_ARGS+=3D	--disable-mikmod
 PLIST_SUB+=3D	MIKMODPLUGIN:=3D"@comment "
 .endif
=20
@@ -50,6 +51,7 @@
 INPUT_PLUGINS+=3D	vorbis
 PLIST_SUB+=3D	VORBISPLUGIN:=3D""
 .else
+CONFIGURE_ARGS+=3D	--disable-vorbis
 PLIST_SUB+=3D	VORBISPLUGIN:=3D"@comment "
 .endif
=20
@@ -63,6 +65,7 @@
 PKGNAMESUFFIX=3D	-esound
 .endif
 .else
+CONFIGURE_ARGS+=3D	--disable-esd
 PLIST_SUB+=3D	ESDPLUGIN:=3D"@comment "
 .endif
=20
@@ -75,7 +78,7 @@
 .endif
 PLIST_SUB+=3D	DATADIR=3D"share/gnome"
 .else
-CONFIGURE_ARGS=3D	--without-gnome
+CONFIGURE_ARGS+=3D	--without-gnome
 PLIST_SUB+=3D	DATADIR=3D"share"
 .endif
=20

--=-Xv+MtMU2vALmcyNUIy3S--


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1031886515.342.39.camel>