From sw@gegenunendlich.de  Mon Mar 29 05:30:04 2004
Return-Path: <sw@gegenunendlich.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D94D216A4CF
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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)
	by mrelayng.kundenserver.de with asmtp (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 <sw@gegenunendlich.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] net/nicotine: don't autotune, use OPTIONS instead
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>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:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 29 05:30:23 PST 2004
>Closed-Date:    Mon Mar 29 05:36:13 PST 2004
>Last-Modified:  Mon Mar 29 05:36:13 PST 2004
>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:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Mon Mar 29 05:36:05 PST 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=64892 
>Unformatted:
