From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 1 08:20:21 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D974E16A431 for ; Sat, 1 Oct 2005 08:20:21 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA0E443D73 for ; Sat, 1 Oct 2005 08:20:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j918KK7n091097 for ; Sat, 1 Oct 2005 08:20:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j918KK2x091096; Sat, 1 Oct 2005 08:20:20 GMT (envelope-from gnats) Resent-Date: Sat, 1 Oct 2005 08:20:20 GMT Resent-Message-Id: <200510010820.j918KK2x091096@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ulrich Spoerlein Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 778A716A41F; Sat, 1 Oct 2005 08:10:29 +0000 (GMT) (envelope-from spoerlein@informatik.uni-wuerzburg.de) Received: from wrzx28.rz.uni-wuerzburg.de (wrzx28.rz.uni-wuerzburg.de [132.187.3.28]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5D7D43D53; Sat, 1 Oct 2005 08:10:28 +0000 (GMT) (envelope-from spoerlein@informatik.uni-wuerzburg.de) Received: from wrzx30.rz.uni-wuerzburg.de (wrzx30.rz.uni-wuerzburg.de [132.187.1.30]) by wrzx28.rz.uni-wuerzburg.de (Postfix) with ESMTP id 0AD0C13E648; Sat, 1 Oct 2005 10:10:27 +0200 (CEST) Received: from virusscan (localhost [127.0.0.1]) by wrzx30.rz.uni-wuerzburg.de (Postfix) with ESMTP id E27DF9DB6F; Sat, 1 Oct 2005 10:10:26 +0200 (CEST) Received: from wrzx28.rz.uni-wuerzburg.de (wrzx28.rz.uni-wuerzburg.de [132.187.3.28]) by wrzx30.rz.uni-wuerzburg.de (Postfix) with ESMTP id C578A9232B; Sat, 1 Oct 2005 10:10:26 +0200 (CEST) Received: from frodo.galgenberg.net (wwsx14.win-screen.uni-wuerzburg.de [132.187.253.14]) by wrzx28.rz.uni-wuerzburg.de (Postfix) with ESMTP id 867F513E648; Sat, 1 Oct 2005 10:10:26 +0200 (CEST) Received: from coyote.q.local (gb-21-237.galgenberg.net [172.16.21.237]) by frodo.galgenberg.net (8.13.1/8.13.1) with ESMTP id j918AQ6a093780; Sat, 1 Oct 2005 10:10:26 +0200 (CEST) (envelope-from spoerlein@informatik.uni-wuerzburg.de) Received: from roadrunner.q.local (roadrunner.q.local [192.168.0.148]) by coyote.q.local (8.13.3/8.13.1) with ESMTP id j918AP1Y005105; Sat, 1 Oct 2005 10:10:25 +0200 (CEST) (envelope-from q@roadrunner.q.local) Received: from roadrunner.q.local (localhost [127.0.0.1]) by roadrunner.q.local (8.13.4/8.13.4) with ESMTP id j918APeT001870; Sat, 1 Oct 2005 10:10:25 +0200 (CEST) (envelope-from q@roadrunner.q.local) Received: (from q@localhost) by roadrunner.q.local (8.13.4/8.13.4/Submit) id j918APDS001869; Sat, 1 Oct 2005 10:10:25 +0200 (CEST) (envelope-from q) Message-Id: <200510010810.j918APDS001869@roadrunner.q.local> Date: Sat, 1 Oct 2005 10:10:25 +0200 (CEST) From: Ulrich Spoerlein To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: mich@FreeBSD.org Subject: ports/86778: [PATCH] audio/amarok: Fix OPTIONS handling X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Oct 2005 08:20:22 -0000 >Number: 86778 >Category: ports >Synopsis: [PATCH] audio/amarok: Fix OPTIONS handling >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 01 08:20:20 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Ulrich Spoerlein >Release: FreeBSD 6.0-BETA5 i386 >Organization: >Environment: System: FreeBSD roadrunner 6.0-BETA5 FreeBSD 6.0-BETA5 #1: Tue Sep 20 21:30:40 CEST 2005 >Description: OPTIONS handling within audio/amarok are flawed. OPTIONS set *ALL* the options that are defined as defaults. Now, if you want to check for an override you have to check "the other" variable. For example, XMMS is default-off, which means OPTIONS will set WITHOUT_XMMS. Right now, the port will completely ignore a -DWITH_XMMS because it is for WITHOUT_XMMS which is always set. Fix below. NB: I did not test *all* the options, I only know it does the right thing for XMMS, XINE and LIBVISUAL. Please review all the changes before committing. Thanks! I also only negated the if defined() stuff, this could be made better, if the if-then-else sections were reversed. But I wanted to keep the diff minimal. Port maintainer (mich@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- amarok-1.3.2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/audio/amarok/Makefile,v retrieving revision 1.31 diff -u -u -r1.31 Makefile --- Makefile 27 Sep 2005 09:40:30 -0000 1.31 +++ Makefile 1 Oct 2005 08:05:40 -0000 @@ -43,7 +43,7 @@ PLIST_SUB+= ARTS="" .endif -.if defined(WITHOUT_GSTREAMER) +.if !defined(WITH_GSTREAMER) CONFIGURE_ARGS+=--without-gstreamer PLIST_SUB+= GSTREAMER="@comment " .else @@ -51,7 +51,7 @@ PLIST_SUB+= GSTREAMER="" .endif -.if defined(WITHOUT_XINE) +.if !defined(WITH_XINE) CONFIGURE_ARGS+=--without-xine PLIST_SUB+= XINE="@comment " .else @@ -59,7 +59,7 @@ PLIST_SUB+= XINE="" .endif -.if defined(WITHOUT_XMMS) +.if !defined(WITH_XMMS) PLIST_SUB+= XMMS="@comment " .else BUILD_DEPENDS+= xmms-config:${PORTSDIR}/multimedia/xmms @@ -67,7 +67,7 @@ PLIST_SUB+= XMMS="" .endif -.if defined(WITHOUT_LIBVISUAL) +.if !defined(WITH_LIBVISUAL) PLIST_SUB+= LIBVISUAL="@comment " .else LIB_DEPENDS+= visual.0:${PORTSDIR}/graphics/libvisual @@ -82,12 +82,12 @@ CONFIGURE_ARGS+=--without-amazon .endif -.if !defined(WITHOUT_MYSQL) +.if defined(WITH_MYSQL) USE_MYSQL= yes CONFIGURE_ARGS+=--enable-mysql .endif -.if !defined(WITHOUT_POSTGRESQL) +.if defined(WITH_POSTGRESQL) USE_PGSQL= yes CONFIGURE_ARGS+=--enable-postgresql .endif @@ -98,17 +98,17 @@ @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${TOUCH} post-configure: -.if defined(WITHOUT_XMMS) +.if !defined(WITH_XMMS) @${REINPLACE_CMD} -e '/XMMS /d' ${WRKSRC}/config.h @${REINPLACE_CMD} -e 's/xmmswrapper//g' ${WRKSRC}/amarok/src/vis/Makefile .endif -.if defined(WITHOUT_LIBVISUAL) +.if !defined(WITH_LIBVISUAL) @${REINPLACE_CMD} -e '/LIBVISUAL /d' ${WRKSRC}/config.h @${REINPLACE_CMD} -e 's/libvisual//g' ${WRKSRC}/amarok/src/vis/Makefile .endif post-install: -.if !defined(WITHOUT_LIBVISUAL) +.if defined(WITH_LIBVISUAL) @${CAT} ${PKGMESSAGE} .endif --- amarok-1.3.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: