o Update to 1.4.3

o Unmark FORBIDDEN

PR:		55471
Submitted by:	Morten Rodal <morten@rodal.no>

8 files changed, 19 insertions, 95 deletions

diff --git a/net-p2p/xmule/Makefile b/net-p2p/xmule/Makefile
index 82f14312e6e1..bf0f93d8634c 100644
--- a/net-p2p/xmule/Makefile
+++ b/net-p2p/xmule/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmule
-PORTVERSION=	1.4.0
+PORTVERSION=	1.4.3
 CATEGORIES=	net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xmule
@@ -19,9 +19,6 @@ LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
 		wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
-FORBIDDEN=	"Format string bug: \
-	http://www.xmule.org/geeklog/article.php?story=20030810160606604"
-
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehier \
diff --git a/net-p2p/xmule/distinfo b/net-p2p/xmule/distinfo
index 1f49d0e36b1f..0ff059962913 100644
--- a/net-p2p/xmule/distinfo
+++ b/net-p2p/xmule/distinfo
@@ -1 +1 @@
-MD5 (xmule-1.4.0.tar.bz2) = f63d4f84479c4e0ef625c054e6cbed10
+MD5 (xmule-1.4.3.tar.bz2) = 419b5a764f1d9fd676daa6819e1cf537
diff --git a/net-p2p/xmule/files/patch-src::gsocket.c b/net-p2p/xmule/files/patch-src::gsocket.c
deleted file mode 100644
index 06f7483b3a82..000000000000
--- a/net-p2p/xmule/files/patch-src::gsocket.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/gsocket.c.orig	Tue May 27 14:11:08 2003
-+++ src/gsocket.c	Tue May 27 14:11:58 2003
-@@ -127,6 +127,11 @@
- #  define GSocket_Debug(args)
- #endif /* __GSOCKET_DEBUG__ */
- 
-+/* Added by Un-Thesis 2003-05-15 */
-+/* Allows socket reuse */
-+/* Code contributed by McCabe and arkanes */
-+int intYes = 1;
-+
- /* Global initialisers */
- 
- int GSocket_Init(void)
-@@ -400,7 +405,6 @@
- /* Added by Un-Thesis 2003-05-15 */
- /* Allows socket reuse */
- /* Code contributed by McCabe and arkanes */
--int intYes = 1;
- if(setsockopt(sck->m_fd, SOL_SOCKET, SO_REUSEADDR, &intYes, sizeof(int))) {
- 	return GSOCK_IOERR;
- }
diff --git a/net-p2p/xmule/files/patch-src::updownclient.h b/net-p2p/xmule/files/patch-src::updownclient.h
deleted file mode 100644
index 9891c50e1d6b..000000000000
--- a/net-p2p/xmule/files/patch-src::updownclient.h
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/updownclient.h.orig	Sun May 25 18:27:59 2003
-+++ src/updownclient.h	Tue May 27 21:14:31 2003
-@@ -26,12 +26,20 @@
- #include "SafeFile.h"
- #include "BarShader.h"
- #include "otherfunctions.h"
-+#include <sys/time.h>
- 
- class CPartFile;
- class CKnownFile;
- typedef unsigned char byte;
--extern inline long GetTickCount();
- 
-+inline long GetTickCount()
-+{
-+  struct timeval aika;
-+  gettimeofday(&aika,NULL);
-+  unsigned long secs=aika.tv_sec*1000;
-+  secs+=(aika.tv_usec/1000);
-+  return secs;
-+}
- 
- // uploadstate
- #define	US_UPLOADING		0
diff --git a/net-p2p/xmule/files/patch-src::xmule.cpp b/net-p2p/xmule/files/patch-src::xmule.cpp
index 8e4ba4ff0ed1..09480748d421 100644
--- a/net-p2p/xmule/files/patch-src::xmule.cpp
+++ b/net-p2p/xmule/files/patch-src::xmule.cpp
@@ -1,42 +1,20 @@
---- src/xmule.cpp.orig	Tue May 27 00:02:47 2003
-+++ src/xmule.cpp	Tue May 27 21:31:38 2003
-@@ -55,16 +55,6 @@
- //	ON_COMMAND(ID_HELP, CWinApp::OnHelp)
- //END_MESSAGE_MAP()
- 
--#include <sys/time.h>
--inline long GetTickCount()
--{	
--  struct timeval aika;
--  gettimeofday(&aika,NULL);
--  unsigned long secs=aika.tv_sec*1000;
--  secs+=(aika.tv_usec/1000);
--  return secs;
--}
--
- CxmuleApp::CxmuleApp() {
-   splashBmp=new wxBitmap((const char**)About_jpg);
+--- src/xmule.cpp.orig	Mon Aug 11 14:38:14 2003
++++ src/xmule.cpp	Mon Aug 11 14:38:27 2003
+@@ -763,7 +763,7 @@
+ 	delete[] xmulesig_path;
  }
-@@ -641,11 +631,13 @@
-     
- } //End Added By Bouc7
  
--
+-#if defined(__Linux__)
 +#if 0
  #include <execinfo.h>
-+#endif
+ #endif
+ 
+@@ -776,7 +776,7 @@
+     	theApp.clientudp->Destroy();
  
- void CxmuleApp::OnFatalException()
- {
-+#if 0
      // (stkn) create backtrace
+-#if defined(__Linux__)
++#if 0
      void * bt_array[100]; // 100 should be enough ?!?
      char ** bt_strings;
-@@ -666,6 +658,7 @@
-        fprintf(stderr, "[%d] %s\n", i, bt_strings[i]);
-        
-     free(bt_strings);
-+#endif
- }
- 
- #define wxGTK_WINDOW 1
+     int num_entries;
diff --git a/net-p2p/xmule/pkg-descr b/net-p2p/xmule/pkg-descr
index 92da0e12274c..c715878e1581 100644
--- a/net-p2p/xmule/pkg-descr
+++ b/net-p2p/xmule/pkg-descr
@@ -10,7 +10,7 @@ Features
 * Shared files tab works
 * Messages tab is now implemented
 * You can manage friends
-* LMule can be minimized to systray 
+* xMule can be minimized to systray 
 * You can set nearly all preferences 
 
 WWW: http://www.xmule.org/
diff --git a/net-p2p/xmule/pkg-message b/net-p2p/xmule/pkg-message
index 54d48749944d..3a0ad04ff841 100644
--- a/net-p2p/xmule/pkg-message
+++ b/net-p2p/xmule/pkg-message
@@ -1,12 +1,12 @@
 	ATTENTIONATTENTION:
 
 Note: Settings were NEVER saved for SharedFile and QueueList and
-possibly some other lists... Due to this, unless you are using LMule
+possibly some other lists... Due to this, unless you are using xMule
 for the first time, there will be no saved settings for these two
 lists; thus, it will think all of their columns are to be hidden.
  
 Best fix: right-click on the grey top of each list and select each
-item in that popup to display the columns... be SURE to quit LMule
+item in that popup to display the columns... be SURE to quit xMule
 after doing this because if it crashes you have to do this step
 again!
  
@@ -15,5 +15,5 @@ EVERYTHING, including shares and whatnot. The preferences.dat is a
 binary file, thus it will be *incredibly* difficult to change by
 hand.
 
-Information taken from LMule developer
+Information taken from xMule developer
 Ted R. Smith <un-thesis@users.sourceforge.net>
diff --git a/net-p2p/xmule/pkg-plist b/net-p2p/xmule/pkg-plist
index 7e24e81c1c27..d143cb975226 100644
--- a/net-p2p/xmule/pkg-plist
+++ b/net-p2p/xmule/pkg-plist
@@ -1,3 +1,4 @@
+bin/ed2k
 bin/xmule
 share/gnome/applications/xmule.desktop
 share/gnome/pixmaps/xmule.xpm
@@ -6,18 +7,12 @@ share/locale/ee/LC_MESSAGES/xmule.mo
 share/locale/es/LC_MESSAGES/xmule.mo
 share/locale/es_MX/LC_MESSAGES/xmule.mo
 share/locale/fr/LC_MESSAGES/xmule.mo
-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_MX/LC_MESSAGES 2>/dev/null || true