Update to version 2.3.2.

5 files changed, 28 insertions, 39 deletions

diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index a43c2f81241d..3df0bcbe438a 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	amule
-PORTVERSION=	2.3.1
-PORTREVISION=	15
+PORTVERSION=	2.3.2
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/${PORTNAME}/aMule/${PORTVERSION}
 DISTNAME=	aMule-${PORTVERSION}
@@ -19,7 +18,7 @@ LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 CONFLICTS=	amule-devel-[0-9]*
 
 USES=		bison desktop-file-utils gmake perl5 pkgconfig shebangfix \
-		tar:bzip2
+		tar:xz
 USE_PERL5=	build
 USE_WX=		2.8
 WX_CONF_ARGS=	absolute
diff --git a/net-p2p/amule/distinfo b/net-p2p/amule/distinfo
index 030087db5d5b..9dc096c067a6 100644
--- a/net-p2p/amule/distinfo
+++ b/net-p2p/amule/distinfo
@@ -1,2 +1,3 @@
-SHA256 (aMule-2.3.1.tar.bz2) = d2eda19c34ec574fa123efb95726c7cc241b093c95d074a5161ee7330dece69d
-SIZE (aMule-2.3.1.tar.bz2) = 4565232
+TIMESTAMP = 1474196934
+SHA256 (aMule-2.3.2.tar.xz) = f64720fdc8c6cfa06bdcd4ca3922d30a0ddddba9c897f5bec7605009c7683928
+SIZE (aMule-2.3.2.tar.xz) = 3895300
diff --git a/net-p2p/amule/files/patch-configure b/net-p2p/amule/files/patch-configure
deleted file mode 100644
index 6ee453e6d81e..000000000000
--- a/net-p2p/amule/files/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
- 
--			CFLAGS+=" $LIBPNG_CFLAGS"
--			LDFLAGS+=" $LIBPNG_LDFLAGS"
--			LIBS+=" $LIBPNG_LIBS"
-+			CFLAGS="$CFLAGS $LIBPNG_CFLAGS"
-+			LDFLAGS="$LDFLAGS $LIBPNG_LDFLAGS"
-+			LIBS="$LIBS $LIBPNG_LIBS"
- 
- 			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
diff --git a/net-p2p/amule/files/patch-src_ObservableQueue.h b/net-p2p/amule/files/patch-src_ObservableQueue.h
deleted file mode 100644
index 66a50a65c71e..000000000000
--- a/net-p2p/amule/files/patch-src_ObservableQueue.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/ObservableQueue.h.orig	2011-06-13 08:50:25 UTC
-+++ src/ObservableQueue.h
-@@ -331,14 +331,14 @@ CObservableQueue<ValueType>::~CObservabl
- template <typename ValueType>
- void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
- {
--	NotifyObservers( EventType( EventType::STARTING ), o );
-+	this->NotifyObservers( EventType( EventType::STARTING ), o );
- }
- 
- 
- template <typename ValueType>
- void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
- {
--	NotifyObservers( EventType( EventType::STOPPING ), o );
-+	this->NotifyObservers( EventType( EventType::STOPPING ), o );
- }
- 
- 
diff --git a/net-p2p/amule/pkg-plist b/net-p2p/amule/pkg-plist
index 23b2d4822ffe..c872436328d5 100644
--- a/net-p2p/amule/pkg-plist
+++ b/net-p2p/amule/pkg-plist
@@ -89,6 +89,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
@@ -111,6 +122,17 @@
 %%NLS%%%%ED2K%%man/tr/man1/ed2k.1.gz
 %%NLS%%%%WXCAS%%man/tr/man1/wxcas.1.gz
 %%NLS%%%%XAS%%man/tr/man1/xas.1.gz
+%%NLS%%%%ALC%%man/zh_TW/man1/alc.1.gz
+%%NLS%%%%ALCC%%man/zh_TW/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%man/zh_TW/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%man/zh_TW/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%man/zh_TW/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%man/zh_TW/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%man/zh_TW/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%man/zh_TW/man1/cas.1.gz
+%%NLS%%%%ED2K%%man/zh_TW/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%man/zh_TW/man1/wxcas.1.gz
+%%NLS%%%%XAS%%man/zh_TW/man1/xas.1.gz
 %%DATADIR%%/skins/Mac_Gray.zip
 %%DATADIR%%/skins/gnome.zip
 %%DATADIR%%/skins/kde4.zip
@@ -227,6 +249,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