3 files changed, 57 insertions, 47 deletions

diff --git a/net-p2p/kmldonkey/Makefile b/net-p2p/kmldonkey/Makefile
index cdb68799c7f4..b41bebcb2070 100644
--- a/net-p2p/kmldonkey/Makefile
+++ b/net-p2p/kmldonkey/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kmldonkey
-PORTVERSION=	0.10.pre4
-PORTREVISION=	1
+PORTVERSION=	0.10
 CATEGORIES=	net kde
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,10 +15,12 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.pre/pre/}
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	KDE integration for MLDonkey eDonkey P2P client
 
-EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-configure
+#EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-configure
+EXTRA_PATCHES=	${PORTSDIR}/x11/kde3/files/extrapatch-old_configure
 
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name=''
@@ -27,4 +28,16 @@ INSTALLS_SHLIB=	yes
 
 MAN1=	kmldonkey.1 kmldonkey_submit.1
 
+pre-configure:
+# disable AUTO* tools
+	@${FIND} -E ${WRKSRC} -type f \
+		-iregex ".*(Makefile.in|configure)" \
+		| ${XARGS} -x -n 10 \
+		${REINPLACE_CMD} -E \
+			-e 's!^(AUTOCONF|AUTOHEADER|AUTOMAKE|ACLOCAL).*$$!\1=${TRUE}!'
+
+pre-build:
+# disable AUTO* tools
+	@${ECHO_CMD} > ${WRKSRC}/admin/cvs.sh
+
 .include <bsd.port.mk>
diff --git a/net-p2p/kmldonkey/distinfo b/net-p2p/kmldonkey/distinfo
index b4c1f5e3b0e9..cf22871cca6f 100644
--- a/net-p2p/kmldonkey/distinfo
+++ b/net-p2p/kmldonkey/distinfo
@@ -1,2 +1,2 @@
-MD5 (kmldonkey-0.10pre4.tar.bz2) = 096a45c5202c7d7aa82b8a868300efde
-SIZE (kmldonkey-0.10pre4.tar.bz2) = 966447
+MD5 (kmldonkey-0.10.tar.bz2) = a1e0f8dc726d88056334e691056d744b
+SIZE (kmldonkey-0.10.tar.bz2) = 990496
diff --git a/net-p2p/kmldonkey/pkg-plist b/net-p2p/kmldonkey/pkg-plist
index 28df9a7206df..a58c429b53da 100644
--- a/net-p2p/kmldonkey/pkg-plist
+++ b/net-p2p/kmldonkey/pkg-plist
@@ -51,30 +51,6 @@ share/apps/konqueror/servicemenus/ed2k_slurp.desktop
 share/apps/mldonkeyapplet/pics/mld-launchgui.png
 share/apps/mldonkeyapplet/pics/mld-mutedonkey.png
 share/apps/mldonkeyapplet/pics/mld-unmutedonkey.png
-share/doc/HTML/da/kmldonkey/common
-share/doc/HTML/da/kmldonkey/index.cache.bz2
-share/doc/HTML/da/kmldonkey/index.docbook
-share/doc/HTML/en/kmldonkey/common
-share/doc/HTML/en/kmldonkey/index.cache.bz2
-share/doc/HTML/en/kmldonkey/index.docbook
-share/doc/HTML/et/kmldonkey/common
-share/doc/HTML/et/kmldonkey/index.cache.bz2
-share/doc/HTML/et/kmldonkey/index.docbook
-share/doc/HTML/fr/kmldonkey/common
-share/doc/HTML/fr/kmldonkey/index.cache.bz2
-share/doc/HTML/fr/kmldonkey/index.docbook
-share/doc/HTML/it/kmldonkey/common
-share/doc/HTML/it/kmldonkey/index.cache.bz2
-share/doc/HTML/it/kmldonkey/index.docbook
-share/doc/HTML/pt/kmldonkey/common
-share/doc/HTML/pt/kmldonkey/index.cache.bz2
-share/doc/HTML/pt/kmldonkey/index.docbook
-share/doc/HTML/ru/kmldonkey/common
-share/doc/HTML/ru/kmldonkey/index.cache.bz2
-share/doc/HTML/ru/kmldonkey/index.docbook
-share/doc/HTML/sv/kmldonkey/common
-share/doc/HTML/sv/kmldonkey/index.cache.bz2
-share/doc/HTML/sv/kmldonkey/index.docbook
 share/icons/hicolor/128x128/apps/kmldonkey.png
 share/icons/hicolor/128x128/apps/mldonkey.png
 share/icons/hicolor/16x16/apps/kmldonkey.png
@@ -87,13 +63,16 @@ share/icons/hicolor/48x48/apps/kmldonkey.png
 share/icons/hicolor/48x48/apps/mldonkey.png
 share/icons/hicolor/64x64/apps/kmldonkey.png
 share/icons/hicolor/64x64/apps/mldonkey.png
+share/locale/br/LC_MESSAGES/kmldonkey.mo
 share/locale/ca/LC_MESSAGES/kmldonkey.mo
+share/locale/cy/LC_MESSAGES/kmldonkey.mo
 share/locale/da/LC_MESSAGES/kmldonkey.mo
 share/locale/de/LC_MESSAGES/kmldonkey.mo
 share/locale/en_GB/LC_MESSAGES/kmldonkey.mo
 share/locale/es/LC_MESSAGES/kmldonkey.mo
 share/locale/et/LC_MESSAGES/kmldonkey.mo
 share/locale/fr/LC_MESSAGES/kmldonkey.mo
+share/locale/ga/LC_MESSAGES/kmldonkey.mo
 share/locale/hu/LC_MESSAGES/kmldonkey.mo
 share/locale/is/LC_MESSAGES/kmldonkey.mo
 share/locale/it/LC_MESSAGES/kmldonkey.mo
@@ -108,7 +87,6 @@ share/locale/sr/LC_MESSAGES/kmldonkey.mo
 share/locale/sv/LC_MESSAGES/kmldonkey.mo
 share/locale/ta/LC_MESSAGES/kmldonkey.mo
 share/locale/tr/LC_MESSAGES/kmldonkey.mo
-share/locale/xx/LC_MESSAGES/kmldonkey.mo
 share/locale/zh_CN/LC_MESSAGES/kmldonkey.mo
 share/services/ed2k.protocol
 share/services/kded/kmldonkeyd.desktop
@@ -120,6 +98,42 @@ share/servicetypes/kmldonkey_plugin.desktop
 @unexec rmdir %D/share/servicetypes 2>/dev/null || true
 @unexec rmdir %D/share/services/kded 2>/dev/null || true
 @unexec rmdir %D/share/services 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
+@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ta/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ta 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sr 2>/dev/null || true
+@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ro 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/nb/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/is/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/is 2>/dev/null || true
+@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ga/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ga 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/et/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/en_GB/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/cy/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/cy 2>/dev/null || true
+@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ca 2>/dev/null || true
+@unexec rmdir %D/share/locale/br/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/br 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
@@ -134,23 +148,6 @@ share/servicetypes/kmldonkey_plugin.desktop
 @unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
 @unexec rmdir %D/share/icons 2>/dev/null || true
-@dirrm share/doc/HTML/sv/kmldonkey
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
-@dirrm share/doc/HTML/ru/kmldonkey
-@unexec rmdir %D/share/doc/HTML/ru 2>/dev/null || true
-@dirrm share/doc/HTML/pt/kmldonkey
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
-@dirrm share/doc/HTML/it/kmldonkey
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
-@dirrm share/doc/HTML/fr/kmldonkey
-@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
-@dirrm share/doc/HTML/et/kmldonkey
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
-@dirrm share/doc/HTML/en/kmldonkey
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@dirrm share/doc/HTML/da/kmldonkey
-@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
 @dirrm share/apps/mldonkeyapplet/pics
 @dirrm share/apps/mldonkeyapplet
 @unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true