ports/58089: Update of net/xmule from 1.6.0 to 1.6.1

[Morten Rodal]

>Number:         58089
>Category:       ports
>Synopsis:       Update of net/xmule from 1.6.0 to 1.6.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 15 12:50:24 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Morten Rodal
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD slurp.rodal.no 5.1-CURRENT FreeBSD 5.1-CURRENT #3: Tue Oct 14 20:47:45 CEST 2003 root at slurp.rodal.no:/usr/obj/usr/src/sys/slurp i386


>Description:
Update of the net/xmule port.  Should work flawlessly with wxgtk-devel
built with GTK2.

Removed forbidden line.
>How-To-Repeat:
>Fix:

cd /usr/ports/net/emule
patch -p1 < xmule.patch

diff -udrN xmule.old/Makefile xmule/Makefile
--- xmule.old/Makefile	Wed Oct 15 20:59:26 2003
+++ xmule/Makefile	Tue Oct 14 07:44:27 2003
@@ -6,16 +6,13 @@
 #
 
 PORTNAME=	xmule
-PORTVERSION=	1.6.0
+PORTVERSION=	1.6.1
 CATEGORIES=	net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xmule
 
 MAINTAINER=	lioux at FreeBSD.org
 COMMENT=	Port of eMule eDonkey P2P client using wxWindows class library
-
-FORBIDDEN=	Multiple vulnerabilities, see \
-	   	http://security.e-matters.de/advisories/022003.html
 
 LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
 		expat.4:${PORTSDIR}/textproc/expat2 \
diff -udrN xmule.old/distinfo xmule/distinfo
--- xmule.old/distinfo	Wed Oct 15 20:59:26 2003
+++ xmule/distinfo	Tue Oct 14 07:45:30 2003
@@ -1 +1 @@
-MD5 (xmule-1.6.0.tar.bz2) = 513aee4826007d2e9c5bade5ca48b144
+MD5 (xmule-1.6.1.tar.bz2) = 7db64383f0b2ed33f09f1cb5e34dd161
diff -udrN xmule.old/files/patch-configure xmule/files/patch-configure
--- xmule.old/files/patch-configure	Wed Oct 15 20:59:26 2003
+++ xmule/files/patch-configure	Wed Oct 15 10:48:06 2003
@@ -1,12 +1,11 @@
---- configure.orig	Tue Sep  9 00:47:46 2003
-+++ configure	Tue Sep  9 00:46:14 2003
-@@ -7540,7 +7540,8 @@
+--- configure.orig	Wed Oct 15 10:45:44 2003
++++ configure	Wed Oct 15 10:47:43 2003
+@@ -7756,7 +7756,7 @@
  
    echo "$as_me:$LINENO: checking if wxWindows was linked with GTK2" >&5
  echo $ECHO_N "checking if wxWindows was linked with GTK2... $ECHO_C" >&6
--  if $WX_CONFIG_NAME --cppflags | grep -q 'gtk2' ; then
-+#if $WX_CONFIG_NAME --cppflags | grep -q 'gtk2' ; then
-+  if $WX_CONFIG_NAME --static --libs | grep -q 'glib-2' ; then
+-  if $WX_CONFIG_NAME --static --libs | grep 'gtk2' > /dev/null ; then
++  if $WX_CONFIG_NAME --static --libs | grep 'gtk-x11-2.0' > /dev/null ; then
       GTK_USEDVERSION=2
       echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
diff -udrN xmule.old/files/patch-src::xmule.cpp xmule/files/patch-src::xmule.cpp
--- xmule.old/files/patch-src::xmule.cpp	Wed Oct 15 20:59:26 2003
+++ xmule/files/patch-src::xmule.cpp	Tue Oct 14 07:55:32 2003
@@ -1,19 +1,10 @@
---- src/xmule.cpp.orig	Tue Sep  9 00:15:19 2003
-+++ src/xmule.cpp	Tue Sep  9 00:16:06 2003
-@@ -797,7 +797,7 @@
- 	delete[] emulesig_path;
- 	delete[] xmulesig_path;
- } //End Added By Bouc7
--#if defined(__Linux__)
-+#if 0
- #include <execinfo.h>
- #endif
- 
-@@ -810,7 +810,7 @@
+--- src/xmule.cpp.orig	Mon Sep  8 03:04:18 2003
++++ src/xmule.cpp	Tue Oct 14 07:54:59 2003
+@@ -814,7 +814,7 @@
  		theApp.clientudp->Destroy();
  
  	// (stkn) create backtrace
--#if defined(__Linux__)
+-#if defined(__linux__)
 +#if 0
  	void *bt_array[100];	// 100 should be enough ?!?
  	char **bt_strings;
>Release-Note:
>Audit-Trail:
>Unformatted: