- Update to 10390

PR:             ports/152434
Submitted by:   Anonymous <swell.k@gmail.com> (maintainer)

4 files changed, 12 insertions, 9 deletions

diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index b8af771f1a22..0fe9376ddeaa 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amule
-PORTVERSION=	10310
+PORTVERSION=	10390
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://amule.sourceforge.net/tarballs/
 PKGNAMESUFFIX=	-devel
@@ -42,7 +42,7 @@ OPTIONS=	ALC "Compile aMule Link Creator for GUI" on \
 		ALCC "Compile aMule Link Creator for console" on \
 		AMULECMD "Compile aMule command line client" on \
 		AMULEDAEMON "Compile aMule daemon version" on \
-		AMULEGUI "Compile aMule remote GUI (EXPERIMENTAL)" on \
+		AMULEGUI "Compile aMule remote GUI" on \
 		CAS "Compile aMule Statistics for console" on \
 		ED2K "Compile aMule ed2k links handler" on \
 		FILEVIEW "Compile file viewer for console (EXPERIMENTAL)" on \
@@ -166,7 +166,9 @@ PLIST_SUB+=		MONOLITHIC="@comment "
 .endif
 
 .if !defined(WITHOUT_PLASMAMULE)
-CONFIGURE_ENV+=		ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config
+CONFIGURE_ENV+=		ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config \
+			KBUILDSYCOCA=${KDE4_PREFIX}/bin/kbuildsycoca4 \
+			UPDATE_MIME_DATABASE=/usr/bin/true
 CONFIGURE_ARGS+=	--enable-plasmamule
 USE_KDE4+=		kdelibs
 QT_COMPONENTS+=		dbus gui moc_build
@@ -216,6 +218,7 @@ PLIST_SUB+=		XAS="@comment "
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e '/LDFLAGS/s/-lpthread/${PTHREAD_LIBS}/' \
 		-e 's/test.*-print-file-name.*`/true/' \
+		-e '/if.*test/s/==/=/' \
 		${WRKSRC}/configure
 .if defined(NOPORTDOCS)
 	${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \
@@ -225,7 +228,6 @@ post-patch:	.SILENT
 	${REINPLACE_CMD} -e 's|@prefix@|${KDE4_PREFIX}|' \
 		-e 's|LDFLAGS =|& -L${KDE4_PREFIX}/lib |' \
 		-e '/plasma.*feeder.*LDFLAGS/s/=/& -lQtDBus /' \
-		-e 's/\(plasmamule_so_\)LDFLAGS/\1CXXFLAGS/' \
 		${WRKSRC}/src/utils/plasmamule/Makefile.in
 .endif
 
diff --git a/net-p2p/amule-devel/Makefile.man b/net-p2p/amule-devel/Makefile.man
index 741e8ecc2338..2edac6436edc 100644
--- a/net-p2p/amule-devel/Makefile.man
+++ b/net-p2p/amule-devel/Makefile.man
@@ -11,6 +11,7 @@ MAN1_EN+=	alc.1
 MAN1_DE+=	alc.1
 MAN1_ES+=	alc.1
 MAN1_EU+=	alc.1
+MAN1_FR+=	alc.1
 MAN1_HU+=	alc.1
 MAN1_IT+=	alc.1
 . endif
@@ -55,6 +56,7 @@ MAN1_EN+=	wxcas.1
 MAN1_DE+=	wxcas.1
 MAN1_ES+=	wxcas.1
 MAN1_EU+=	wxcas.1
+MAN1_FR+=	wxcas.1
 MAN1_HU+=	wxcas.1
 MAN1_IT+=	wxcas.1
 . endif
diff --git a/net-p2p/amule-devel/distinfo b/net-p2p/amule-devel/distinfo
index be448a19d6c7..0037246d3c59 100644
--- a/net-p2p/amule-devel/distinfo
+++ b/net-p2p/amule-devel/distinfo
@@ -1,3 +1,2 @@
-MD5 (aMule-SVN-r10310.tar.bz2) = ecd16ddc14e9604de50c5d1a85c4332c
-SHA256 (aMule-SVN-r10310.tar.bz2) = a7f73acf25983a185b5111e8badf70f62aee869b05c8a2abe9ea295a70d9e86f
-SIZE (aMule-SVN-r10310.tar.bz2) = 4507757
+SHA256 (aMule-SVN-r10390.tar.bz2) = 1611af6cebfee4b29f2f2fde0eacad9eef63459a8250a4cccd5a3665cadcf002
+SIZE (aMule-SVN-r10390.tar.bz2) = 4539683
diff --git a/net-p2p/amule-devel/pkg-plist b/net-p2p/amule-devel/pkg-plist
index c96654038be8..db2bcfb4755a 100644
--- a/net-p2p/amule-devel/pkg-plist
+++ b/net-p2p/amule-devel/pkg-plist
@@ -11,8 +11,8 @@
 %%PLASMAMULE%%share/mime/amule.xml
 %%PLASMAMULE%%@exec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
 %%PLASMAMULE%%@unexec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
-%%PLASMAMULE%%@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime 2>/dev/null || true
-%%PLASMAMULE%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime 2>/dev/null || true
+%%PLASMAMULE%%@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime >/dev/null 2>&1 || true
+%%PLASMAMULE%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime >/dev/null 2>&1 || true
 %%PLASMAMULE%%@cwd
 %%ALC%%bin/alc
 %%ALCC%%bin/alcc