Date: Mon, 29 Mar 2004 15:30:01 +0200 (CEST) From: Stefan Walter <sw@gegenunendlich.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/64892: [MAINTAINER] net/nicotine: don't autotune, use OPTIONS instead Message-ID: <20040329133001.8F2523D46@kyuzo.dunkelkammer.void> Resent-Message-ID: <200403291330.i2TDUNNV028763@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 64892
>Category: ports
>Synopsis: [MAINTAINER] net/nicotine: don't autotune, use OPTIONS instead
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 29 05:30:23 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Stefan Walter
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
Infinity Approximation Task Force
>Environment:
System: FreeBSD kyuzo.dunkelkammer.void 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Sat Feb 14 20:59:15 CET 2004
>Description:
Don't depend on existing libraries automatically, which might be
undesirable. Note that Nicotine will still use the optional libraries if
they're installed; it doesn't depend on them, though.
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- nicotine-1.0.7_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/nicotine.old/Makefile /usr/ports/net/nicotine/Makefile
--- /usr/ports/net/nicotine.old/Makefile Mon Mar 29 14:56:16 2004
+++ /usr/ports/net/nicotine/Makefile Mon Mar 29 15:15:22 2004
@@ -22,38 +22,20 @@
USE_PYDISTUTILS= yes
USE_REINPLACE= yes
+OPTIONS= GEOIP "Enable the GeoIP based country code blocker" off \
+ PSYCO "Enable Psyco, the optimizing Python compiler" off \
+ VORBIS "Enable OGG/Vorbis support" on
+
.include <bsd.port.pre.mk>
-.if exists(${PYTHON_SITELIBDIR}/GeoIP.so) || defined(WITH_GEOIP)
-WITH_GEOIP= yes
+.if defined(WITH_GEOIP)
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/GeoIP.so:${PORTSDIR}/net/py-GeoIP
.endif
-
-.if exists(${PYTHON_SITELIBDIR}/psyco/_psyco.so) || defined(WITH_PSYCO)
-WITH_PSYCO= yes
+.if defined(WITH_PSYCO)
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
.endif
-
-.if exists(${PYTHON_SITELIBDIR}/ogg/vorbis.so) || defined(WITH_VORBIS)
-WITH_VORBIS= yes
+.if defined(WITH_VORBIS)
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
-.endif
-
-.if !defined(WITH_VORBIS) || !defined(WITH_PSYCO) || !defined(WITH_GEOIP)
-pre-everything::
- @${ECHO_MSG} ""
- @${ECHO_MSG} "You can define the following for additional features:"
- @${ECHO_MSG} ""
-.if !defined(WITH_GEOIP)
- @${ECHO_MSG} "WITH_GEOIP - enable the GeoIP based country code blocker"
-.endif
-.if !defined(WITH_PSYCO)
- @${ECHO_MSG} "WITH_PSYCO - enable the psyco optimizing compiler"
-.endif
-.if !defined(WITH_VORBIS)
- @${ECHO_MSG} "WITH_VORBIS - enable OGG/Vorbis support"
-.endif
- @${ECHO_MSG} ""
.endif
post-patch:
--- nicotine-1.0.7_1.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?20040329133001.8F2523D46>