From owner-freebsd-ports Thu Sep 12 20: 8:44 2002 Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0151637B400 for ; Thu, 12 Sep 2002 20:08:41 -0700 (PDT) Received: from creme-brulee.marcuscom.com (rdu57-17-158.nc.rr.com [66.57.17.158]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A50F43E75 for ; Thu, 12 Sep 2002 20:08:40 -0700 (PDT) (envelope-from marcus@FreeBSD.org) Received: from gyros (gyros.marcuscom.com [192.168.1.9]) by creme-brulee.marcuscom.com (8.12.5/8.12.5) with ESMTP id g8D363iv013266; Thu, 12 Sep 2002 23:06:03 -0400 (EDT) (envelope-from marcus@FreeBSD.org) Subject: xmms patch to correctly disable optional components From: Joe Marcus Clarke To: esk@ira.uka.de Cc: ports@FreeBSD.org Content-Type: multipart/mixed; boundary="=-Xv+MtMU2vALmcyNUIy3S" X-Mailer: Ximian Evolution 1.0.8 Date: 12 Sep 2002 23:08:34 -0400 Message-Id: <1031886515.342.39.camel@gyros.marcuscom.com> Mime-Version: 1.0 X-Spam-Status: No, hits=1.4 required=5.0 tests=UPPERCASE_25_50,MIME_EXCESSIVE_QP,AWL version=2.31 X-Spam-Level: * Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org --=-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