Date: Sat, 1 Oct 2005 10:10:25 +0200 (CEST) From: Ulrich Spoerlein <q@galgenberg.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: mich@FreeBSD.org Subject: ports/86778: [PATCH] audio/amarok: Fix OPTIONS handling Message-ID: <200510010810.j918APDS001869@roadrunner.q.local> Resent-Message-ID: <200510010820.j918KK2x091096@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510010810.j918APDS001869>