* Update to 0.4.3.

PR:		48262
Submitted by:	Dominic Marks <dom@cus.org.uk>

* Honor CFLAGS.
* Proper pthreads handling on 4.x/5.x

Approved by:	maintainer

4 files changed, 60 insertions, 12 deletions

diff --git a/net-p2p/mutella/Makefile b/net-p2p/mutella/Makefile
index a762b42a453d..8b3dce6a3463 100644
--- a/net-p2p/mutella/Makefile
+++ b/net-p2p/mutella/Makefile
@@ -6,22 +6,20 @@
 #
 
 PORTNAME=	mutella
-PORTVERSION=	0.4.3rc2
+PORTVERSION=	0.4.3
+PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	http://mutella.sourceforge.net/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	mutella
 
 MAINTAINER=	d.marks@student.umist.ac.uk
+COMMENT=	A command line Gnutella client
 
 MAN1=		mutella.1
 
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
-CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|ulong|u_long|' \
-		${WRKSRC}/mutella/asyncsocket.cpp \
-		${WRKSRC}/mutella/asyncsocket.h
+CONFIGURE_TARGET= --target=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 .include <bsd.port.mk>
diff --git a/net-p2p/mutella/distinfo b/net-p2p/mutella/distinfo
index b82fff9168ff..c60ff2ff5f7e 100644
--- a/net-p2p/mutella/distinfo
+++ b/net-p2p/mutella/distinfo
@@ -1 +1 @@
-MD5 (mutella-0.4.3rc2.tar.gz) = 837e6fa15e6556d4739496fbe9738aa7
+MD5 (mutella-0.4.3.tar.gz) = 3fc7b649967dc722cd93532c2d043db1
diff --git a/net-p2p/mutella/files/patch-configure b/net-p2p/mutella/files/patch-configure
new file mode 100644
index 000000000000..588e1e676fa3
--- /dev/null
+++ b/net-p2p/mutella/files/patch-configure
@@ -0,0 +1,51 @@
+
+$FreeBSD$
+
+--- configure.orig	Wed Feb  5 20:36:13 2003
++++ configure	Sat Feb 15 02:11:03 2003
+@@ -5098,16 +5098,16 @@
+ fi
+ 
+ if test $g_link_threads = no ; then
+-		echo "$as_me:$LINENO: checking for pthread_create with -pthread in CFLAGS" >&5
+-echo $ECHO_N "checking for pthread_create with -pthread in CFLAGS... $ECHO_C" >&6
++		echo "$as_me:$LINENO: checking for pthread_create with ${PTHREAD_CFLAGS} in CFLAGS" >&5
++echo $ECHO_N "checking for pthread_create with ${PTHREAD_CFLAGS} in CFLAGS... $ECHO_C" >&6
+ if test "${g_cv_pthread_flag+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 				save_LIBS="$LIBS"
+ 		save_CFLAGS="$CFLAGS"
+-		LIBS="-pthread $LIBS"
+-		CFLAGS="-pthread $CFLAGS"
++		LIBS="${PTHREAD_LIBS} $LIBS"
++		CFLAGS="${PTHREAD_CFLAGS} $CFLAGS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+@@ -5153,8 +5153,8 @@
+ echo "${ECHO_T}$g_cv_pthread_flag" >&6
+ 
+ 	if test $g_cv_pthread_flag=yes ; then
+-		LTHREAD_LIBS="$LTHREAD_LIBS -pthread"
+-		LTHREAD_CFLAGS="$LTHREAD_CFLAGS -pthread"
++		LTHREAD_LIBS="$LTHREAD_LIBS ${PTHREAD_LIBS}"
++		LTHREAD_CFLAGS="$LTHREAD_CFLAGS ${PTHREAD_CFLAGS}"
+ 		g_link_threads=posix
+ 	fi
+ fi
+@@ -6621,13 +6621,6 @@
+ else
+   optimisation=false
+ fi;
+-if test $optimisation = true; then
+-	CFLAGS="$CFLAGS -O2"
+-	CXXFLAGS="$CXXFLAGS -O2"
+-else
+-	CFLAGS="$CFLAGS -O0"
+-	CXXFLAGS="$CXXFLAGS -O0"
+-fi
+ 
+ # Check whether --enable-debug or --disable-debug was given.
+ if test "${enable_debug+set}" = set; then
diff --git a/net-p2p/mutella/pkg-comment b/net-p2p/mutella/pkg-comment
deleted file mode 100644
index 175dda936012..000000000000
--- a/net-p2p/mutella/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A command line Gnutella client