Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 28 Feb 2004 17:38:02 +0100 (CET)
From:      Stefan Walter <sw@gegenunendlich.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/63502: net/nicotine: add knobs WITH_PSYCO and WITH_GEOIP
Message-ID:  <20040228163802.DE7443F4D@kyuzo.dunkelkammer.void>
Resent-Message-ID: <200402281640.i1SGe30b059019@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         63502
>Category:       ports
>Synopsis:       net/nicotine: add knobs WITH_PSYCO and WITH_GEOIP
>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:   Sat Feb 28 08:40:03 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 root@kyuzo.dunkelkammer.void:/usr/obj/usr/src/sys/KYUZO i386
>Description:
(Please note that this update depends on the net/py-GeoIP port being
added first: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/63490)

Add feature knobs: WITH_PSYCO for optimized compiling and WITH_GEOIP for
a GeoIP based country code blocker.
>How-To-Repeat:
	
>Fix:
--- nicotine-addknobs.patch begins here ---
diff -urN nicotine.old/Makefile nicotine/Makefile
--- nicotine.old/Makefile	Sat Feb 28 16:27:59 2004
+++ nicotine/Makefile	Sat Feb 28 17:13:09 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	nicotine
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://nicotine.thegraveyard.org/
 
@@ -22,12 +23,35 @@
 
 .include <bsd.port.pre.mk>
 
+.if exists(${PYTHON_SITELIBDIR}/GeoIP.so) || defined(WITH_GEOIP)
+WITH_GEOIP=	yes
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/GeoIP.so:${PORTSDIR}/net/py-GeoIP
+.endif
+
+.if exists(${PYTHON_SITELIBDIR}/psyco/_psyco.so) || defined(WITH_PSYCO)
+WITH_PSYCO=	yes
+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
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
-.else
+.endif
+
+.if !defined(WITH_VORBIS) || !defined(WITH_PSYCO) || !defined(WITH_GEOIP)
 pre-everything::
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Define WITH_VORBIS=yes to enable OGG/Vorbis support"
+	@${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
 
--- nicotine-addknobs.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?20040228163802.DE7443F4D>