- Changed dependencies etc. to build with new camlp4 structure;

- added patch to deal with unterminated string constant
- added comment to configure.in patch.

5 files changed, 23 insertions, 6 deletions

diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 75cf80c5522..1869f6ac910 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2014/10/09 19:14:04 jaapb Exp $
+# $NetBSD: Makefile,v 1.76 2014/10/20 10:12:51 jaapb Exp $
 #
 
 .include "Makefile.common"
@@ -34,6 +34,7 @@ FILES_SUBST+=		MLDONKEY_USER=${MLDONKEY_USER:Q}
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${DESTDIR}${PREFIX}/libexec/mldonkey
 
+.include "../../lang/camlp4/buildlink3.mk"
 .include "../../sysutils/file/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/mldonkey/Makefile.common b/net/mldonkey/Makefile.common
index a99e54fc701..cc2f9c84472 100644
--- a/net/mldonkey/Makefile.common
+++ b/net/mldonkey/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.49 2013/12/28 11:03:26 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.50 2014/10/20 10:12:51 jaapb Exp $
 #
 # used by net/mldonkey/Makefile
 # used by net/mldonkey-gui/Makefile
@@ -35,7 +35,7 @@ BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.10.1
 
 pre-configure:
 	cd ${WRKSRC}/config && autoconf
-	
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
diff --git a/net/mldonkey/distinfo b/net/mldonkey/distinfo
index f5f67cc4465..50a9644c45b 100644
--- a/net/mldonkey/distinfo
+++ b/net/mldonkey/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.60 2013/12/26 12:02:39 jaapb Exp $
+$NetBSD: distinfo,v 1.61 2014/10/20 10:12:51 jaapb Exp $
 
 SHA1 (mldonkey-3.1.3.tar.bz2) = 424386f277e84df55a2cbab213fae60787e42c8b
 RMD160 (mldonkey-3.1.3.tar.bz2) = 2b640fbd9ac85918bf3ba0a51f86fabb6d862890
 Size (mldonkey-3.1.3.tar.bz2) = 2848964 bytes
 SHA1 (patch-config_Makefile.in) = a575c505c1f736bc3940790b43a6cf2083f29112
-SHA1 (patch-config_configure.in) = c10728fbdedf6af5f8694d92f25e80a05cb1b9c0
+SHA1 (patch-config_configure.in) = 36bbd265d5237e5568b1964ead1c13061a538321
+SHA1 (patch-src_utils_net_terminal.ml) = 8745d3d6f605c9609febfea4e84c5c6619be0d14
diff --git a/net/mldonkey/patches/patch-config_configure.in b/net/mldonkey/patches/patch-config_configure.in
index 1a035125e6d..ac971ed966d 100644
--- a/net/mldonkey/patches/patch-config_configure.in
+++ b/net/mldonkey/patches/patch-config_configure.in
@@ -1,5 +1,6 @@
-$NetBSD: patch-config_configure.in,v 1.3 2013/12/26 12:02:39 jaapb Exp $
+$NetBSD: patch-config_configure.in,v 1.4 2014/10/20 10:12:51 jaapb Exp $
 
+Do proper GD version checking
 --- config/configure.in.orig	2012-08-05 15:49:02.000000000 +0000
 +++ config/configure.in
 @@ -929,13 +929,30 @@ if test "$GD" != "no"; then
diff --git a/net/mldonkey/patches/patch-src_utils_net_terminal.ml b/net/mldonkey/patches/patch-src_utils_net_terminal.ml
new file mode 100644
index 00000000000..c35643a8011
--- /dev/null
+++ b/net/mldonkey/patches/patch-src_utils_net_terminal.ml
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_utils_net_terminal.ml,v 1.1 2014/10/20 10:12:51 jaapb Exp $
+
+Unterminated string constant cleaned up
+--- src/utils/net/terminal.ml.orig	2005-11-19 17:19:45.000000000 +0000
++++ src/utils/net/terminal.ml
+@@ -185,7 +185,7 @@ module Output = struct
+   let canal = List.assoc chan !chanmap in
+   etat.chan <- Some (chan, canal);
+   info (sprintf "connecte au canal '%s'" chan);
+-  (* {| canal ALL } *)
++  (* { | canal ALL } *)
+        with Not_found -> (* pas encore de recepteur pour ce canal *)
+   try (* on en cree un *)
+     let serveur = nsrecord.get_loc chan in