Update to monsoon 0.70. Monsoon has upgraded to use the latest release of

the MonoTorrent library, 0.70, which contains numerous bugfixes and
performance enhancements. Numerous minor bugfixes were also included.

4 files changed, 74 insertions, 11 deletions

diff --git a/net/monsoon/Makefile b/net/monsoon/Makefile
index 22238ee7f06..aae8f219ba6 100644
--- a/net/monsoon/Makefile
+++ b/net/monsoon/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2009/06/22 02:02:46 ahoka Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/16 07:55:05 kefren Exp $
 
-DISTNAME=	monsoon-0.15
-PKGREVISION=	2
+DISTNAME=	monsoon-0.20
 CATEGORIES=	net
 MASTER_SITES=	http://www.monsoon-project.org/jaws/data/files/
 
@@ -9,14 +8,15 @@ MAINTAINER=	kefren@NetBSD.org
 HOMEPAGE=	http://www.monsoon-project.org/
 COMMENT=	Open source GTK+ bittorrent client
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	no
-USE_TOOLS+=	gmake gtar perl pkg-config msgfmt
+USE_TOOLS+=	gmake gtar intltool perl pkg-config msgfmt
 EXTRACT_USING=	gtar
 
-DEPENDS+=	intltool>0.40.0:../../textproc/intltool
-
 .include "../../lang/mono/buildlink3.mk"
+.include "../../net/mono-nat/buildlink3.mk"
 .include "../../net/monotorrent/buildlink3.mk"
 .include "../../sysutils/ndesk-dbus/buildlink3.mk"
 .include "../../sysutils/ndesk-dbus-glib/buildlink3.mk"
diff --git a/net/monsoon/PLIST b/net/monsoon/PLIST
index b0edcce5a67..c780dee0cfd 100644
--- a/net/monsoon/PLIST
+++ b/net/monsoon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/11/27 12:32:36 kefren Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/07/16 07:55:05 kefren Exp $
 bin/monsoon
 lib/monsoon/Mono.Nat.dll
 lib/monsoon/MonoTorrent.dll
@@ -21,3 +21,4 @@ share/locale/fr/LC_MESSAGES/monsoon.mo
 share/locale/it/LC_MESSAGES/monsoon.mo
 share/locale/nl/LC_MESSAGES/monsoon.mo
 share/locale/pt_BR/LC_MESSAGES/monsoon.mo
+share/locale/sv/LC_MESSAGES/monsoon.mo
diff --git a/net/monsoon/distinfo b/net/monsoon/distinfo
index 27d1a8d782c..89823eeb68c 100644
--- a/net/monsoon/distinfo
+++ b/net/monsoon/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/06/22 02:02:46 ahoka Exp $
+$NetBSD: distinfo,v 1.3 2009/07/16 07:55:05 kefren Exp $
 
-SHA1 (monsoon-0.15.tar.gz) = dc35543eec1815bb8e58913971eb40cf5ac4564b
-RMD160 (monsoon-0.15.tar.gz) = e88fe289d77a3ccb2e98210e404975c6726b7173
-Size (monsoon-0.15.tar.gz) = 692628 bytes
+SHA1 (monsoon-0.20.tar.gz) = dc89d0539a91ec43524efd812a07b21e2b1130fc
+RMD160 (monsoon-0.20.tar.gz) = e9068436d5afe4231ad8adc75a179bbf7080de53
+Size (monsoon-0.20.tar.gz) = 540409 bytes
 SHA1 (patch-aa) = 7309947d0a5db5abca2654502ef2eea3e58baaf4
+SHA1 (patch-ab) = 67306c96540d4c8025b74cb6e424cca4a1b5a7bc
diff --git a/net/monsoon/patches/patch-ab b/net/monsoon/patches/patch-ab
new file mode 100644
index 00000000000..2a65d65ffaf
--- /dev/null
+++ b/net/monsoon/patches/patch-ab
@@ -0,0 +1,61 @@
+--- configure.orig	2009-07-16 10:27:45.000000000 +0300
++++ configure	2009-07-16 10:28:37.000000000 +0300
+@@ -3561,12 +3561,12 @@
+     pkg_cv_MONOTORRENT_CFLAGS="$MONOTORRENT_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"monotorrent = 0.70\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "monotorrent = 0.70") 2>&5
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"monotorrent >= 0.70\"") >&5
++  ($PKG_CONFIG --exists --print-errors "monotorrent >= 0.70") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_MONOTORRENT_CFLAGS=`$PKG_CONFIG --cflags "monotorrent = 0.70" 2>/dev/null`
++  pkg_cv_MONOTORRENT_CFLAGS=`$PKG_CONFIG --cflags "monotorrent >= 0.70" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -3577,12 +3577,12 @@
+     pkg_cv_MONOTORRENT_LIBS="$MONOTORRENT_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"monotorrent = 0.70\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "monotorrent = 0.70") 2>&5
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"monotorrent >= 0.70\"") >&5
++  ($PKG_CONFIG --exists --print-errors "monotorrent >= 0.70") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_MONOTORRENT_LIBS=`$PKG_CONFIG --libs "monotorrent = 0.70" 2>/dev/null`
++  pkg_cv_MONOTORRENT_LIBS=`$PKG_CONFIG --libs "monotorrent >= 0.70" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -3600,14 +3600,14 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        MONOTORRENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "monotorrent = 0.70" 2>&1`
++	        MONOTORRENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "monotorrent >= 0.70" 2>&1`
+         else
+-	        MONOTORRENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "monotorrent = 0.70" 2>&1`
++	        MONOTORRENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "monotorrent >= 0.70" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$MONOTORRENT_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (monotorrent = 0.70) were not met:
++	{ { $as_echo "$as_me:$LINENO: error: Package requirements (monotorrent >= 0.70) were not met:
+ 
+ $MONOTORRENT_PKG_ERRORS
+ 
+@@ -3618,7 +3618,7 @@
+ and MONOTORRENT_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-$as_echo "$as_me: error: Package requirements (monotorrent = 0.70) were not met:
++$as_echo "$as_me: error: Package requirements (monotorrent >= 0.70) were not met:
+ 
+ $MONOTORRENT_PKG_ERRORS
+