- Update to 10589

- Only try to update desktop database if desktop-file-utils installed
- Use bsd.port.options.mk

PR:		ports/154238
Submitted by:	Pan Tsu (maintainer)
Approved by:	rene (mentor)

4 files changed, 32 insertions, 51 deletions

diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index fe4c1c3398bb..47097121ae72 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	amule
-PORTVERSION=	10400
-PORTREVISION=	2
+PORTVERSION=	10589
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://amule.sourceforge.net/tarballs/
 PKGNAMESUFFIX=	-devel
@@ -28,8 +27,6 @@ LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING
 USE_BZIP2=	yes
 USE_GNOME=	pkgconfig
 USE_GMAKE=	yes
-USE_KDE4=	# empty
-USE_QT_VER=	4
 USE_WX=		2.8
 WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
@@ -61,14 +58,13 @@ OPTIONS=	ALC "Compile aMule Link Creator for GUI" on \
 		WXUNICODE "Enable Unicode support" on \
 		XAS "Install XChat2 plugin" on
 
-PORTDOCS=	ABOUT-NLS Changelog EC_Protocol.txt \
-		ED2K-Links.HOWTO INSTALL README TODO \
-		amule-win32.HOWTO.txt amulesig.txt license.txt socks4.protocol
+PORTDOCS=	ABOUT-NLS Changelog EC_Protocol.txt INSTALL README TODO \
+		amulesig.txt license.txt
 
 FLEX?=		${LOCALBASE}/bin/flex
 PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--disable-debug
@@ -175,7 +171,8 @@ 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
+USE_KDE4=		kdelibs
+USE_QT_VER=		4
 QT_COMPONENTS+=		dbus gui moc_build
 PLIST_SUB+=		PLASMAMULE=""
 .else
@@ -232,7 +229,6 @@ post-patch:	.SILENT
 .if !defined(WITHOUT_PLASMAMULE)
 	${REINPLACE_CMD} -e 's|@prefix@|${KDE4_PREFIX}|' \
 		-e 's|LDFLAGS =|& -L${KDE4_PREFIX}/lib |' \
-		-e '/plasma.*feeder.*LDFLAGS/s/=/& -lQtDBus /' \
 		${WRKSRC}/src/utils/plasmamule/Makefile.in
 .endif
 
@@ -240,10 +236,14 @@ post-install:
 .if !defined(WITHOUT_FILEVIEW)
 	${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${PREFIX}/bin
 .endif
-.if !defined(WITHOUT_PLASMAMULE)
+.if exists(${LOCALBASE}/bin/update-desktop-database)
+. if !defined(WITHOUT_PLASMAMULE)
 	-update-desktop-database ${KDE4_PREFIX}/share/applications
+.  if exists(${LOCALBASE}/bin/update-mime-database)
 	-update-mime-database ${KDE4_PREFIX}/share/mime
-.endif
+.  endif
+. endif
 	-update-desktop-database ${PREFIX}/share/applications
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-p2p/amule-devel/Makefile.man b/net-p2p/amule-devel/Makefile.man
index 2edac6436edc..a282ce2e5585 100644
--- a/net-p2p/amule-devel/Makefile.man
+++ b/net-p2p/amule-devel/Makefile.man
@@ -1,28 +1,16 @@
-# TODO : Add fr here when pages are complete
-MANLANG=	"" de es eu fr hu it
-#MANCOMPRESSED=	no
+# no eu for amulegui.1
+# no fr,ru for xas.1
+MANLANG=	"" de es eu fr hu it ru
 
 .if !defined(WITHOUT_NLS)
 . if !defined(WITHOUT_MONOLITHIC)
 MAN1+=		amule.1
 . endif
 . if !defined(WITHOUT_ALC)
-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
+MAN1+=		alc.1
 . endif
 . if !defined(WITHOUT_ALCC)
-MAN1_EN+=	alcc.1
-MAN1_DE+=	alcc.1
-MAN1_ES+=	alcc.1
-MAN1_EU+=	alcc.1
-MAN1_FR+=	alcc.1
-MAN1_HU+=	alcc.1
-MAN1_IT+=	alcc.1
+MAN1+=		alcc.1
 . endif
 . if !defined(WITHOUT_AMULECMD)
 MAN1+=		amulecmd.1
@@ -34,16 +22,13 @@ MAN1+=		amuled.1
 MAN1_EN+=	amulegui.1
 MAN1_DE+=	amulegui.1
 MAN1_ES+=	amulegui.1
+MAN1_FR+=	amulegui.1
 MAN1_HU+=	amulegui.1
 MAN1_IT+=	amulegui.1
+MAN1_RU+=	amulegui.1
 . endif
 . if !defined(WITHOUT_CAS)
-MAN1_EN+=	cas.1
-MAN1_DE+=	cas.1
-MAN1_ES+=	cas.1
-MAN1_EU+=	cas.1
-MAN1_HU+=	cas.1
-MAN1_IT+=	cas.1
+MAN1+=		cas.1
 . endif
 . if !defined(WITHOUT_ED2K)
 MAN1+=		ed2k.1
@@ -52,13 +37,7 @@ MAN1+=		ed2k.1
 MAN1+=		amuleweb.1
 . endif
 . if !defined(WITHOUT_WXCAS)
-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
+MAN1+=		wxcas.1
 . endif
 .endif # !WITHOUT_NLS
 
diff --git a/net-p2p/amule-devel/distinfo b/net-p2p/amule-devel/distinfo
index 9729c0b0d0ef..f62ba927442e 100644
--- a/net-p2p/amule-devel/distinfo
+++ b/net-p2p/amule-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aMule-SVN-r10400.tar.bz2) = 8ded9e003b3001c5d16b1d72a6a63938a9b3a238ef090f2b0c29ed6ed1cf0ea7
-SIZE (aMule-SVN-r10400.tar.bz2) = 4538567
+SHA256 (aMule-SVN-r10589.tar.bz2) = 5aa4566af29f6094069f1af02cd7c2fe052f19e285252c8ef3fa9aae148399f3
+SIZE (aMule-SVN-r10589.tar.bz2) = 4560388
diff --git a/net-p2p/amule-devel/pkg-plist b/net-p2p/amule-devel/pkg-plist
index db2bcfb4755a..6c5d02ab77be 100644
--- a/net-p2p/amule-devel/pkg-plist
+++ b/net-p2p/amule-devel/pkg-plist
@@ -9,10 +9,10 @@
 %%PLASMAMULE%%share/kde4/services/plasma-applet-plasmamule.desktop
 %%PLASMAMULE%%share/kde4/services/plasma-engine-plasmamule.desktop
 %%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 >/dev/null 2>&1 || true
-%%PLASMAMULE%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime >/dev/null 2>&1 || true
+%%PLASMAMULE%%@exec [ -f %%LOCALBASE%%/bin/update-desktop-database ] && %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
+%%PLASMAMULE%%@unexec [ -f %%LOCALBASE%%/bin/update-desktop-database ] && %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
+%%PLASMAMULE%%@exec [ -f %%LOCALBASE%%/bin/update-mime-database ] && %%LOCALBASE%%/bin/update-mime-database %D/share/mime >/dev/null 2>&1 || true
+%%PLASMAMULE%%@unexec [ -f %%LOCALBASE%%/bin/update-mime-database ] && %%LOCALBASE%%/bin/update-mime-database %D/share/mime >/dev/null 2>&1 || true
 %%PLASMAMULE%%@cwd
 %%ALC%%bin/alc
 %%ALCC%%bin/alcc
@@ -162,6 +162,8 @@
 @dirrmtry man/hu
 @dirrmtry man/it/man1
 @dirrmtry man/it
+@dirrmtry man/ru/man1
+@dirrmtry man/ru
 @dirrm %%DATADIR%%/skins
 %%WEBSERVER%%@dirrm %%DATADIR%%/webserver/default
 %%WEBSERVER%%@dirrm %%DATADIR%%/webserver
@@ -176,5 +178,5 @@
 %%NLS%%@dirrmtry share/locale/it_CH
 %%NLS%%@dirrmtry share/locale/ko_KR/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ko_KR
-@exec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
-@unexec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
+@exec [ -f %%LOCALBASE%%/bin/update-desktop-database ] && %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
+@unexec [ -f %%LOCALBASE%%/bin/update-desktop-database ] && %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true