- Fix pkg-plist

- Improve CONFLICTS

PR:		ports/75354
Submitted by:	maintainer

2 files changed, 61 insertions, 6 deletions

diff --git a/net/amule-devel/Makefile b/net/amule-devel/Makefile
index fc83224ad0b9..521b0f621dd8 100644
--- a/net/amule-devel/Makefile
+++ b/net/amule-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	2.0.0rc7
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://download.berlios.de/amule/
 PKGNAMESUFFIX=	-devel
@@ -20,7 +21,7 @@ LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \
 #		gd.4:${PORTSDIR}/graphics/gd
 
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
-CONFLICTS=	aMule-1*
+CONFLICTS=	aMule-[0-9]*
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
diff --git a/net/amule-devel/pkg-plist b/net/amule-devel/pkg-plist
index 0c2e0690ab77..c285ddf92d51 100644
--- a/net/amule-devel/pkg-plist
+++ b/net/amule-devel/pkg-plist
@@ -1,28 +1,78 @@
 share/locale/ar/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/ar/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/ar 2>/dev/null || true
 share/locale/bg/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/bg/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/bg 2>/dev/null || true
 share/locale/ca/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/ca/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/ca 2>/dev/null || true
 share/locale/da/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/da/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/da 2>/dev/null || true
 share/locale/de/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/de 2>/dev/null || true
 share/locale/en_GB/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/en_GB/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/en_GB 2>/dev/null || true
 share/locale/es/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/es 2>/dev/null || true
 share/locale/es_MX/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/es_MX/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/es_MX 2>/dev/null || true
 share/locale/et_EE/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/et_EE/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/et_EE 2>/dev/null || true
 share/locale/eu/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/eu/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/eu 2>/dev/null || true
 share/locale/fi/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/fi/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/fi 2>/dev/null || true
 share/locale/fr/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/fr 2>/dev/null || true
 share/locale/gl/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/gl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/gl 2>/dev/null || true
 share/locale/hr/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/hr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/hr 2>/dev/null || true
 share/locale/hu/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/hu/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/hu 2>/dev/null || true
 share/locale/it/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/it/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/it 2>/dev/null || true
 share/locale/it_CH/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/it_CH/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/it_CH 2>/dev/null || true
 share/locale/ko/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/ko/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/ko 2>/dev/null || true
 share/locale/nl/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/nl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/nl 2>/dev/null || true
 share/locale/pl/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/pl 2>/dev/null || true
 share/locale/pt_BR/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/pt_BR 2>/dev/null || true
 share/locale/pt_PT/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/pt_PT/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/pt_PT 2>/dev/null || true
 share/locale/ru/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/ru/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/ru 2>/dev/null || true
 share/locale/zh_CN/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/zh_CN 2>/dev/null || true
 share/locale/zh_TW/LC_MESSAGES/amule.mo
+@unexec rmdir share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/zh_TW 2>/dev/null || true
 share/gnome/doc/aMule-2.0.0rc7/ABOUT-NLS
 share/gnome/doc/aMule-2.0.0rc7/Changelog
 share/gnome/doc/aMule-2.0.0rc7/Doxyfile
@@ -33,13 +83,16 @@ share/gnome/doc/aMule-2.0.0rc7/TODO
 share/gnome/doc/aMule-2.0.0rc7/amule-win32.HOWTO.txt
 share/gnome/doc/aMule-2.0.0rc7/amulesig.txt
 share/gnome/doc/aMule-2.0.0rc7/license.txt
-@dirrm share/gnome/doc/aMule-2.0.0rc7
+@unexec rmdir share/gnome/doc/aMule-2.0.0rc7 2>/dev/null || true
+@unexec rmdir share/gnome/doc 2>/dev/null || true
 share/gnome/pixmaps/amule.xpm
 %%PL_ALC%%share/gnome/pixmaps/alc.xpm
 %%PL_CAS%%share/gnome/pixmaps/wxcas.xpm
+@unexec rmdir share/gnome/pixmaps 2>/dev/null || true
 share/gnome/applications/amule.desktop
 %%PL_ALC%%share/gnome/applications/alc.desktop
 %%PL_CAS%%share/gnome/applications/wxcas.desktop
+@unexec rmdir share/gnome/applications 2>/dev/null || true
 %%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/GraphCon.gif
 %%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/GraphDL.gif
 %%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/GraphUL.gif
@@ -82,12 +135,14 @@ share/gnome/applications/amule.desktop
 %%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/transparent.gif
 %%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/yellow.gif
 %%PL_AMULEWEBSRV%%share/gnome/amuleweb/aMule.tmpl
-%%PL_AMULEWEBSRV%%@dirrm share/gnome/amuleweb/webserver
-%%PL_AMULEWEBSRV%%@dirrm share/gnome/amuleweb
+%%PL_AMULEWEBSRV%%@unexec rmdir share/gnome/amuleweb/webserver 2>/dev/null || true
+%%PL_AMULEWEBSRV%%@unexec rmdir share/gnome/amuleweb 2>/dev/null || true
 %%PL_CAS%%share/gnome/cas/stat.png
 %%PL_CAS%%share/gnome/cas/tmp.html
-%%PL_CAS%%@dirrm share/gnome/cas
+%%PL_CAS%%@unexec rmdir share/gnome/cas 2>/dev/null || true
 lib/xchat/plugins/xas.pl
+@unexec rmdir lib/xchat/plugins 2>/dev/null || true
+@unexec rmdir lib/xchat 2>/dev/null || true
 %%PL_CAS%%bin/cas
 %%PL_CAS%%bin/wxcas
 %%PL_ALC%%bin/alc
@@ -98,4 +153,3 @@ lib/xchat/plugins/xas.pl
 %%PL_AMULECMD%%bin/amulecmdDLG
 %%PL_ED2K%%bin/amule-ed2k
 bin/amule
-@unexec rmdir %D/lib/xchat 2>/dev/null || true