- Change security/cryptopp from BUILD_DEPENDS to LIB_DEPENDS as it defaults to non-static build

- Update devel port to svn revision 10871
- Remove WX_UNICODE
- Regenerate patch
- Try sorting USES
- Remove article from COMMENT

PR: 203670

5 files changed, 27 insertions, 18 deletions

diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 945bb55a35fb..42dc63538aea 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -2,29 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	amule
-PORTVERSION=	10834
-PORTREVISION=	6
+PORTVERSION=	10871
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://amule.sourceforge.net/tarballs/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	aMule-SVN-r${PORTVERSION}
 
 MAINTAINER=	bar@FreeBSD.org
-COMMENT=	The all-platform eMule p2p client
+COMMENT=	All-platform eMule p2p client
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
+LIB_DEPENDS=	libcryptopp.so:${PORTSDIR}/security/cryptopp
 
 CONFLICTS=	amule-[0-9]*
 
-USES=		bison gmake pkgconfig perl5 shebangfix tar:bzip2 \
-		desktop-file-utils
+USES=		bison desktop-file-utils gmake perl5 pkgconfig shebangfix \
+		tar:bzip2
 USE_PERL5=	build
 USE_WX=		2.8
 WX_CONF_ARGS=	absolute
-WX_UNICODE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-denoise-level=0
diff --git a/net-p2p/amule-devel/distinfo b/net-p2p/amule-devel/distinfo
index 18f45e905d0e..4bd0b848d4aa 100644
--- a/net-p2p/amule-devel/distinfo
+++ b/net-p2p/amule-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aMule-SVN-r10834.tar.bz2) = dd9170e43a51d3f6dd581d6abb178cf1deca66210eab9799a8eb16fb0c03f09a
-SIZE (aMule-SVN-r10834.tar.bz2) = 4636398
+SHA256 (aMule-SVN-r10871.tar.bz2) = d816d58d47fbe81a79110d7b7426a40b7642816ee50300b0aa9ae34d5c0c043b
+SIZE (aMule-SVN-r10871.tar.bz2) = 4711860
diff --git a/net-p2p/amule-devel/pkg-plist b/net-p2p/amule-devel/pkg-plist
index b96f5948ba2b..bdef265a32c8 100644
--- a/net-p2p/amule-devel/pkg-plist
+++ b/net-p2p/amule-devel/pkg-plist
@@ -91,6 +91,17 @@
 %%ED2K%%man/man1/ed2k.1.gz
 %%WXCAS%%man/man1/wxcas.1.gz
 %%XAS%%man/man1/xas.1.gz
+%%NLS%%%%ALC%%man/ro/man1/alc.1.gz
+%%NLS%%%%ALCC%%man/ro/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%man/ro/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%man/ro/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%man/ro/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%man/ro/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%man/ro/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%man/ro/man1/cas.1.gz
+%%NLS%%%%ED2K%%man/ro/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%man/ro/man1/wxcas.1.gz
+%%NLS%%%%XAS%%man/ro/man1/xas.1.gz
 %%NLS%%%%ALC%%man/ru/man1/alc.1.gz
 %%NLS%%%%ALCC%%man/ru/man1/alcc.1.gz
 %%NLS%%%%MONOLITHIC%%man/ru/man1/amule.1.gz
@@ -240,6 +251,7 @@
 %%NLS%%share/locale/pl/LC_MESSAGES/amule.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/amule.mo
 %%NLS%%share/locale/pt_PT/LC_MESSAGES/amule.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/amule.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/amule.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/amule.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/amule.mo
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index 63fdfe546f00..f03955ac8383 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -3,26 +3,25 @@
 
 PORTNAME=	amule
 PORTVERSION=	2.3.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/${PORTNAME}/aMule/${PORTVERSION}
 DISTNAME=	aMule-${PORTVERSION}
 
 MAINTAINER=	bar@FreeBSD.org
-COMMENT=	The all-platform eMule p2p client
+COMMENT=	All-platform eMule p2p client
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
+LIB_DEPENDS=	libcryptopp.so:${PORTSDIR}/security/cryptopp
 
 CONFLICTS=	amule-devel-[0-9]*
 
-USES=		bison gmake pkgconfig perl5 shebangfix tar:bzip2 \
-		desktop-file-utils
+USES=		bison desktop-file-utils gmake perl5 pkgconfig shebangfix \
+		tar:bzip2
 USE_PERL5=	build
 USE_WX=		2.8
-WX_UNICODE=	yes
 WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-denoise-level=0
diff --git a/net-p2p/amule/files/patch-configure b/net-p2p/amule/files/patch-configure
index 11c0bbd01e34..6ee453e6d81e 100644
--- a/net-p2p/amule/files/patch-configure
+++ b/net-p2p/amule/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2011-11-11 21:59:26.000000000 +0100
-+++ configure	2011-12-11 17:11:22.000000000 +0100
-@@ -7360,9 +7360,9 @@
+--- configure.orig	2011-11-11 20:59:26 UTC
++++ configure
+@@ -7360,9 +7360,9 @@ $as_echo_n "checking if libpng is usable
  			SAVED_LDFLAGS=$LDFLAGS
  			SAVED_LIBS=$LIBS