From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Mar 29 05:30:24 2004 Return-Path: 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 EB71D16A4CF for ; Mon, 29 Mar 2004 05:30:23 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CFCB243D2F for ; Mon, 29 Mar 2004 05:30:23 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i2TDUNbv028764 for ; Mon, 29 Mar 2004 05:30:23 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i2TDUNNV028763; Mon, 29 Mar 2004 05:30:23 -0800 (PST) (envelope-from gnats) Resent-Date: Mon, 29 Mar 2004 05:30:23 -0800 (PST) Resent-Message-Id: <200403291330.i2TDUNNV028763@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, Stefan Walter Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D94D216A4CF for ; Mon, 29 Mar 2004 05:30:04 -0800 (PST) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.189]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BCD843D2F for ; Mon, 29 Mar 2004 05:30:04 -0800 (PST) (envelope-from sw@gegenunendlich.de) Received: from [212.227.126.207] (helo=mrelayng.kundenserver.de) by moutng.kundenserver.de with esmtp (Exim 3.35 #1) id 1B7wq3-00044k-00 for FreeBSD-gnats-submit@freebsd.org; Mon, 29 Mar 2004 15:30:03 +0200 Received: from [80.142.212.225] (helo=kyuzo.dunkelkammer.void) (TLSv1:EDH-RSA-DES-CBC3-SHA:168) (Exim 3.35 #1) id 1B7wq3-0003aU-00 for FreeBSD-gnats-submit@freebsd.org; Mon, 29 Mar 2004 15:30:03 +0200 Received: by kyuzo.dunkelkammer.void (Postfix, from userid 1002) id 8F2523D46; Mon, 29 Mar 2004 15:30:01 +0200 (CEST) Message-Id: <20040329133001.8F2523D46@kyuzo.dunkelkammer.void> Date: Mon, 29 Mar 2004 15:30:01 +0200 (CEST) From: Stefan Walter To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/64892: [MAINTAINER] net/nicotine: don't autotune, use OPTIONS instead X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Mar 2004 13:30:24 -0000 >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 -.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: