5 files changed, 22 insertions, 30 deletions

diff --git a/net-p2p/mutella/Makefile b/net-p2p/mutella/Makefile
index 10d3d78d29d1..3df500ff0c7d 100644
--- a/net-p2p/mutella/Makefile
+++ b/net-p2p/mutella/Makefile
@@ -6,20 +6,21 @@
 #
 
 PORTNAME=	mutella
-PORTVERSION=	0.4.1
+PORTVERSION=	0.4.3rc1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://mutella.sourceforge.net/
 
 MAINTAINER=	d.marks@student.umist.ac.uk
 
+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|' \
+	@${REINPLACE_CMD} -e 's|ulong|u_long|' \
 		${WRKSRC}/mutella/asyncsocket.cpp \
 		${WRKSRC}/mutella/asyncsocket.h
 
diff --git a/net-p2p/mutella/distinfo b/net-p2p/mutella/distinfo
index 2c9704c3b59b..596ecb5852f9 100644
--- a/net-p2p/mutella/distinfo
+++ b/net-p2p/mutella/distinfo
@@ -1 +1 @@
-MD5 (mutella-0.4.1.tar.gz) = 68e83b16e63c59304fc65e19635985bc
+MD5 (mutella-0.4.3rc1.tar.gz) = 2181de92901e43ea50401d3e138d7c8e
diff --git a/net-p2p/mutella/files/patch-mutella::mutella.h b/net-p2p/mutella/files/patch-mutella::mutella.h
deleted file mode 100644
index 1c4a03f6f1f7..000000000000
--- a/net-p2p/mutella/files/patch-mutella::mutella.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- mutella/mutella.h.orig      Sat Dec 21 04:06:30 2002
-+++ mutella/mutella.h   Sat Dec 21 04:09:31 2002
-@@ -70,6 +70,7 @@
- // declare namespaces
- using std::min;
- using std::max;
-+using std::find;
- using std::swap;
- //using std::queue;
- //using std::deque;
-@@ -80,7 +81,11 @@
- #ifdef NAVE_NO_SLIST
- #  define slist list
- #else
-+#ifdef HAVE_EXT_SLIST
-+  using __gnu_cxx::slist;
-+#else
-   using std::slist;
-+#endif
- #endif
-
- #endif /*__cplusplus*/
diff --git a/net-p2p/mutella/files/patch-mutella::xsleep.h b/net-p2p/mutella/files/patch-mutella::xsleep.h
new file mode 100644
index 000000000000..e4d3f7883fb3
--- /dev/null
+++ b/net-p2p/mutella/files/patch-mutella::xsleep.h
@@ -0,0 +1,11 @@
+--- mutella/xsleep.h.orig	Tue Dec  3 01:05:35 2002
++++ mutella/xsleep.h	Sun Jan  5 22:59:26 2003
+@@ -64,7 +64,7 @@
+ 
+ // Support dumb missing headers on OSX.
+ #ifdef HAVE_NANOSLEEP
+-#if defined HAVE_DECL_NANOSLEEP__ && !HAVE_DECL_NANOSLEEP__
++#if defined HAVE_DECL_NANOSLEEP__ && !HAVE_DECL_NANOSLEEP__ && !defined(__FreeBSD__)
+ //#ifdef __APPLE__
+ int nanosleep(struct timespec *, struct timespec *);
+ #endif
diff --git a/net-p2p/mutella/pkg-plist b/net-p2p/mutella/pkg-plist
index 648cbb897183..6b01581d5ed5 100644
--- a/net-p2p/mutella/pkg-plist
+++ b/net-p2p/mutella/pkg-plist
@@ -53,9 +53,11 @@ share/mutella/remote/template/log.html
 share/mutella/remote/template/message.html
 share/mutella/remote/template/move.html
 share/mutella/remote/template/mutella-remote.css
-share/mutella/remote/template/results-detail.html
-share/mutella/remote/template/results-overview.html
-share/mutella/remote/template/results-ungrouped.html
+share/mutella/remote/template/modules/results-detail.html
+share/mutella/remote/template/modules/results-grouped-body.html
+share/mutella/remote/template/modules/results-grouped-head.html
+share/mutella/remote/template/modules/results-ungrouped-body.html
+share/mutella/remote/template/modules/results-ungrouped-head.html
 share/mutella/remote/template/results.html
 share/mutella/remote/template/searches.html
 share/mutella/remote/template/transfers.html