ports/132936: net-p2p/amule2: some improvements

[Barbara]

>Number:         132936
>Category:       ports
>Synopsis:       net-p2p/amule2: some improvements
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 22 14:40:06 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Barbara
>Release:        6-STABLE
>Organization:
>Environment:
FreeBSD satanasso.local.net 6.4-STABLE FreeBSD 6.4-STABLE #0: Sat Mar 7 00:54:51 CET 2009 root at satanasso.local.net:/usr/obj/usr/src/sys/SATANASSO i386
>Description:
Fixed plist when using WITH_AMULEDAEMON.
Removed an obsolete configure arg and added two new args to suppress some errors/warnings.
Added new GeoIP option.

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.orig	2009-03-22 12:51:31.000000000 +0100
+++ Makefile	2009-03-22 14:12:34.000000000 +0100
@@ -30,7 +30,8 @@
 		--without-included-gettext \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
-		--enable-embedded_crypto
+		--disable-upnp \
+		--with-denoise-level=0
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
@@ -42,7 +43,8 @@
 		CAS "Compile C aMule Statistics (+GUI)" on \
 		ALC "Compile aMule Link Creator (+GUI)" on \
 		AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off \
-		WXUNICODE "Enable Unicode support" on
+		WXUNICODE "Enable Unicode support" on \
+		GEOIP "Enable GeoIP IP2Country support" off
 
 DOCSDIR=	${PREFIX}/share/doc/aMule-${PORTVERSION}
 PORTDOCS=	ABOUT-NLS Changelog EC_Protocol.txt \
@@ -113,6 +115,13 @@
 PLIST_SUB+=		PL_AMULEDAEMON="@comment "
 .endif
 
+.if defined(WITH_GEOIP)
+CONFIGURE_ARGS+=	--enable-geoip
+LIB_DEPENDS+=		GeoIP.5:${PORTSDIR}/net/GeoIP
+.else
+CONFIGURE_ARGS+=	--disable-geoip
+.endif
+
 .if !defined(WITHOUT_WXUNICODE)
 WX_UNICODE=yes
 .endif
--- pkg-plist.orig	2009-03-22 06:45:49.000000000 +0100
+++ pkg-plist	2009-03-22 15:08:11.000000000 +0100
@@ -113,6 +113,7 @@
 share/pixmaps/amule.xpm
 %%PL_CAS%%share/applications/wxcas.desktop
 %%PL_ALC%%share/applications/alc.desktop
+%%PL_AMULEDAEMON%%share/applications/amulegui.desktop
 share/applications/amule.desktop
 %%PL_AMULEWEBSRV%%share/amule/webserver/default/aMule.tmpl
 %%PL_AMULEWEBSRV%%share/amule/webserver/default/add_server.gif


>Release-Note:
>Audit-Trail:
>Unformatted: