5 files changed, 9 insertions, 45 deletions

diff --git a/net-p2p/xmule/Makefile b/net-p2p/xmule/Makefile
index 05bc65252962..a93551be354b 100644
--- a/net-p2p/xmule/Makefile
+++ b/net-p2p/xmule/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xmule
-DISTVERSION=	1.12.0
-PORTREVISION=	1
+PORTVERSION=	1.12.2
 CATEGORIES=	net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 #MASTER_SITES=	http://download.berlios.de/%SUBDIR%/
diff --git a/net-p2p/xmule/distinfo b/net-p2p/xmule/distinfo
index 9b5a83ad0322..d90697f2752f 100644
--- a/net-p2p/xmule/distinfo
+++ b/net-p2p/xmule/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmule-1.12.0.tar.bz2) = 822cc602a9b6072b307577873bf0ecd2
-SHA256 (xmule-1.12.0.tar.bz2) = aecf268bb9bc1b12b5ce02ec14c62deb5ec662337ce23db7b39b5d82bee9c9bc
-SIZE (xmule-1.12.0.tar.bz2) = 1286122
+MD5 (xmule-1.12.2.tar.bz2) = 372c02793f8282312a1370443420fda7
+SHA256 (xmule-1.12.2.tar.bz2) = e53b0f0d8d2fac630921c5bf82aedf298ceb48fb1b8a83b5361a81a272be1af5
+SIZE (xmule-1.12.2.tar.bz2) = 1290859
diff --git a/net-p2p/xmule/files/patch-Makefile.in b/net-p2p/xmule/files/patch-Makefile.in
index c73e314bc71e..0d5c824713fd 100644
--- a/net-p2p/xmule/files/patch-Makefile.in
+++ b/net-p2p/xmule/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Sat Apr  2 22:24:36 2005
-+++ Makefile.in	Sat Apr  2 22:25:03 2005
+--- Makefile.in.orig	Fri Dec  9 19:22:49 2005
++++ Makefile.in	Fri Dec  9 19:23:02 2005
 @@ -268,10 +268,9 @@
  	@rm -rf Compilation.flags Makefile aclocal.m4 autom4te.cache config.h* config.l* config.st* config.rp* configure depcomp intl
  
  install: all
 -	@mkdir -p @bindir@
--	@mkdir -p @datadir@/{applications,locale,pixmaps}
+-	@mkdir -p @datadir@/{applications,locale,icons}
 -	@cp -f ed2k.xmule-2.0 xmule @bindir@
 -	@cp -f ed2k.xmule-2.0 @bindir@/ed2k
 +	@mkdir -p @datadir@/applications
@@ -13,4 +13,4 @@
 +	@mkdir -p @datadir@/pixmaps
  	@cd po && $(MAKE) install
  	@cp -f xmule.desktop @datadir@/applications
- 	@cp -f xmule.xpm @datadir@/pixmaps
+ 	@cp -f xmule.xpm @datadir@/icons
diff --git a/net-p2p/xmule/files/patch-configure b/net-p2p/xmule/files/patch-configure
deleted file mode 100644
index 1f41d2c4af25..000000000000
--- a/net-p2p/xmule/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig	Thu Oct 27 17:47:55 2005
-+++ configure	Fri Nov 18 04:36:06 2005
-@@ -9070,15 +9070,15 @@
- 
- if test x"$have_cryptopp" = x"yes"; then
-     cryp_name="cryptopp";
--    have_crypto = 1
-+    have_crypto=1
- fi
- 
- if test x"$have_cryptopp2" = x"yes"; then
-     cryp_name="crypto++"
--    have_crypto = 1
-+    have_crypto=1
- fi
- 
--if have_crypto -eq 1; then
-+if [ ${have_crypto} -eq 1 ]; then
-     echo "Cryp name: -$cryp_name-"
- 
- cat >>confdefs.h <<_ACEOF
diff --git a/net-p2p/xmule/pkg-plist b/net-p2p/xmule/pkg-plist
index 36670a8a5535..07e8bdbe6030 100644
--- a/net-p2p/xmule/pkg-plist
+++ b/net-p2p/xmule/pkg-plist
@@ -1,7 +1,7 @@
 bin/xmule
 bin/xmule-ed2k-handler
 share/gnome/applications/xmule.desktop
-share/gnome/pixmaps/xmule.xpm
+share/gnome/icons/xmule.xpm
 share/locale/de/LC_MESSAGES/xmule.mo
 share/locale/ee/LC_MESSAGES/xmule.mo
 share/locale/es/LC_MESSAGES/xmule.mo
@@ -11,21 +11,7 @@ share/locale/it/LC_MESSAGES/xmule.mo
 share/locale/ko/LC_MESSAGES/xmule.mo
 share/locale/pl/LC_MESSAGES/xmule.mo
 share/locale/tr/LC_MESSAGES/xmule.mo
-@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr 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/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
 @unexec rmdir %D/share/locale/ee/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/ee 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
 @unexec rmdir %D/share/locale 2>/dev/null || true
 @unexec rmdir %D/share/gnome/locale 2>/dev/null || true