- Update to 2.2.4

Submitted by:	<boris@tagnet.ru> (maintainer)

4 files changed, 24 insertions, 38 deletions

diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 6897cdeb6a49..00f0811f336c 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	aMule
-PORTVERSION=	2.2.3
+PORTVERSION=	2.2.4
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/amule
 
@@ -30,7 +30,9 @@ CONFIGURE_ARGS=	--disable-debug \
 		--without-included-gettext \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
-		--enable-embedded_crypto
+		--with-crypto-prefix=${LOCALBASE} \
+		--disable-upnp \
+		--with-denoise-level=0
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
@@ -42,7 +44,8 @@ OPTIONS=	OPTIMIZE "Build with optimization" on \
 		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 +116,13 @@ CONFIGURE_ARGS+=	--disable-amule-daemon --disable-amule-gui
 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
@@ -120,24 +130,4 @@ WX_UNICODE=yes
 # Man pages management
 .include "Makefile.man"
 
-post-install:
-# fr manpages are still incomplete and can't be managed
-# by MANLANG. Will be done when pages are complete.
-	${GZIP_CMD} ${PREFIX}/man/fr/man1/amule.1
-.if defined(WITH_AMULECMD)
-	${GZIP_CMD} ${PREFIX}/man/fr/man1/amulecmd.1
-.endif
-.if defined(WITH_AMULEWEBSRV)
-	${GZIP_CMD} ${PREFIX}/man/fr/man1/amuleweb.1
-.endif
-.if defined(WITH_AMULEDAEMON)
-	${GZIP_CMD} ${PREFIX}/man/fr/man1/amuled.1
-.endif
-.if defined(WITH_ED2K)
-	${GZIP_CMD} ${PREFIX}/man/fr/man1/ed2k.1
-.endif
-.if defined(WITH_ALC)
-	${GZIP_CMD} ${PREFIX}/man/fr/man1/alcc.1
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/net-p2p/amule-devel/Makefile.man b/net-p2p/amule-devel/Makefile.man
index 86506f0998be..79492c5046f9 100644
--- a/net-p2p/amule-devel/Makefile.man
+++ b/net-p2p/amule-devel/Makefile.man
@@ -1,5 +1,5 @@
 # TODO : Add fr here when pages are complete
-MANLANG=	"" de es eu hu
+MANLANG=	"" de es eu fr hu
 #MANCOMPRESSED=	no
 .if defined(WITH_CAS)
 MAN1_EN+=	cas.1
@@ -20,25 +20,22 @@ MAN1_ES+=	alc.1
 MAN1_EU+=	alc.1
 MAN1_HU+=	alc.1
 MAN1+=	alcc.1
-MAN1_FR+=	alcc.1
 .endif
 .if defined(WITH_AMULEWEBSRV)
 MAN1+=	amuleweb.1
-MAN1_FR+=	amuleweb.1
 .endif
 .if defined(WITH_AMULECMD)
 MAN1+=	amulecmd.1
-MAN1_FR+=	amulecmd.1
 .endif
 .if defined(WITH_ED2K)
 MAN1+=	ed2k.1
-MAN1_FR+=	ed2k.1
 .endif
 .if defined(WITH_AMULEDAEMON)
 MAN1+=	amuled.1
 MAN1_EN+=	amulegui.1
+MAN1_DE+=	amulegui.1
 .endif
-MAN1+=	amule.1
+MAN1+=		amule.1
 MAN1_EN+=	xas.1
 MAN1_DE+=	xas.1
 MAN1_ES+=	xas.1
diff --git a/net-p2p/amule-devel/distinfo b/net-p2p/amule-devel/distinfo
index eb5f8c59c6a1..b6a6e3986f96 100644
--- a/net-p2p/amule-devel/distinfo
+++ b/net-p2p/amule-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (aMule-2.2.3.tar.bz2) = 64a0d41edbdd7cf36fa892e45a652bfd
-SHA256 (aMule-2.2.3.tar.bz2) = 8886215ae8b3aef74875cd1ace551109324649d1d353db6b0c1ac785f48dc44a
-SIZE (aMule-2.2.3.tar.bz2) = 4666001
+MD5 (aMule-2.2.4.tar.bz2) = 283c428dd2961a57f2691c455c845a42
+SHA256 (aMule-2.2.4.tar.bz2) = ff5c243a401ebde5ae40ffc72bb210f2cde2d0af1dffd76499188554e197d5da
+SIZE (aMule-2.2.4.tar.bz2) = 4705472
diff --git a/net-p2p/amule-devel/pkg-plist b/net-p2p/amule-devel/pkg-plist
index 0cbec9cad0e1..423fed84f2f3 100644
--- a/net-p2p/amule-devel/pkg-plist
+++ b/net-p2p/amule-devel/pkg-plist
@@ -1,10 +1,5 @@
-%%PL_ALC%%man/fr/man1/alcc.1.gz
-%%PL_AMULEWEBSRV%%man/fr/man1/amuleweb.1.gz
-%%PL_AMULECMD%%man/fr/man1/amulecmd.1.gz
-%%PL_ED2K%%man/fr/man1/ed2k.1.gz
-%%PL_AMULEDAEMON%%man/fr/man1/amuled.1.gz
-man/fr/man1/amule.1.gz
 share/locale/ar/LC_MESSAGES/amule.mo
+share/locale/ast/LC_MESSAGES/amule.mo
 share/locale/bg/LC_MESSAGES/amule.mo
 share/locale/ca/LC_MESSAGES/amule.mo
 share/locale/cs/LC_MESSAGES/amule.mo
@@ -41,6 +36,8 @@ share/locale/zh_CN/LC_MESSAGES/amule.mo
 share/locale/zh_TW/LC_MESSAGES/amule.mo
 @dirrmtry share/locale/ar/LC_MESSAGES
 @dirrmtry share/locale/ar
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @dirrmtry share/locale/bg/LC_MESSAGES
 @dirrmtry share/locale/bg
 @dirrmtry share/locale/ca/LC_MESSAGES
@@ -110,9 +107,11 @@ share/locale/zh_TW/LC_MESSAGES/amule.mo
 %%PL_CAS%%@dirrmtry share/cas
 %%PL_CAS%%share/pixmaps/wxcas.xpm
 %%PL_ALC%%share/pixmaps/alc.xpm
+%%PL_AMULEDAEMON%%share/pixmaps/amulegui.xpm
 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