[131099] trunk/dports/net/mldonkey
ryandesign at macports.org
ryandesign at macports.org
Mon Jan 5 20:56:19 PST 2015
Revision: 131099
https://trac.macports.org/changeset/131099
Author: ryandesign at macports.org
Date: 2015-01-05 20:56:19 -0800 (Mon, 05 Jan 2015)
Log Message:
-----------
mldonkey: update to 3.1.5 (#46377)
Modified Paths:
--------------
trunk/dports/net/mldonkey/Portfile
Added Paths:
-----------
trunk/dports/net/mldonkey/files/patch-src-utils-net-terminal.ml.diff
Removed Paths:
-------------
trunk/dports/net/mldonkey/files/patch-config-configure.diff
Modified: trunk/dports/net/mldonkey/Portfile
===================================================================
--- trunk/dports/net/mldonkey/Portfile 2015-01-06 04:48:33 UTC (rev 131098)
+++ trunk/dports/net/mldonkey/Portfile 2015-01-06 04:56:19 UTC (rev 131099)
@@ -5,8 +5,7 @@
PortGroup active_variants 1.1
name mldonkey
-version 3.1.3
-revision 6
+version 3.1.5
categories net
platforms darwin
maintainers nomaintainer
@@ -28,8 +27,8 @@
master_sites sourceforge:project/mldonkey/mldonkey/${version}
use_bzip2 yes
-checksums rmd160 2b640fbd9ac85918bf3ba0a51f86fabb6d862890 \
- sha256 7c259f9f41cc12899045710ddce02e6d25962b2cb5c22f9cf58af0483f06d9e2
+checksums rmd160 63a21aef47a7510b7f9867544345c8f03edc89c3 \
+ sha256 74f9d4bcc72356aa28d0812767ef5b9daa03efc5d1ddabf56447dc04969911cb
depends_build port:pkgconfig
@@ -50,6 +49,6 @@
# ocaml is not universal
universal_variant no
-patchfiles patch-config-configure.diff
+patchfiles-append patch-src-utils-net-terminal.ml.diff
configure.args --enable-gui=newgui2
Deleted: trunk/dports/net/mldonkey/files/patch-config-configure.diff
===================================================================
--- trunk/dports/net/mldonkey/files/patch-config-configure.diff 2015-01-06 04:48:33 UTC (rev 131098)
+++ trunk/dports/net/mldonkey/files/patch-config-configure.diff 2015-01-06 04:56:19 UTC (rev 131099)
@@ -1,56 +0,0 @@
-https://savannah.nongnu.org/patch/?8123
-http://www.mail-archive.com/mldonkey-users@nongnu.org/msg03645.html
---- config/configure.orig 2012-08-05 10:51:35.000000000 -0500
-+++ config/configure 2013-07-19 03:30:44.000000000 -0500
-@@ -6814,15 +6814,35 @@
- GDMAJORVERSION=`$GDLIBCONFIG --majorversion`
- GDMINORVERSION=`$GDLIBCONFIG --minorversion`
- GDREVISION=`$GDLIBCONFIG --revision`
-- if [ $GDMAJORVERSION = 2 ] && [ $GDMINORVERSION = 0 ] && [ $GDREVISION -gt 14 ]; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDVERSION" >&5
-+ case $GDMAJORVERSION in
-+ 1)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (found $GDVERSION)" >&5
-+$as_echo "no (found $GDVERSION)" >&6; }
-+ LIBGD=no
-+ ;;
-+ 2)
-+ if test $GDMINORVERSION -ge 1; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDVERSION" >&5
- $as_echo "$GDVERSION" >&6; }
-- LIBGD=yes
-- else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (found $GDVERSION)" >&5
-+ LIBGD=yes
-+ else
-+ if test $GDREVISION -gt 14; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDVERSION" >&5
-+$as_echo "$GDVERSION" >&6; }
-+ LIBGD=yes
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (found $GDVERSION)" >&5
- $as_echo "no (found $GDVERSION)" >&6; }
-- LIBGD=no
-- fi
-+ LIBGD=no
-+ fi
-+ fi
-+ ;;
-+ *)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDVERSION" >&5
-+$as_echo "$GDVERSION" >&6; }
-+ LIBGD=yes
-+ ;;
-+ esac
- else
- LIBGD=yes
- fi
-@@ -10784,7 +10804,7 @@
- if test ! -z "$SCM_VERSION"; then
- printf " - SCM: %s" "$SCM_VERSION"
- fi
--ec " completed.\n"
-+echo " completed.\n"
-
- echo ""
- echo "Network modules:"
Added: trunk/dports/net/mldonkey/files/patch-src-utils-net-terminal.ml.diff
===================================================================
--- trunk/dports/net/mldonkey/files/patch-src-utils-net-terminal.ml.diff (rev 0)
+++ trunk/dports/net/mldonkey/files/patch-src-utils-net-terminal.ml.diff 2015-01-06 04:56:19 UTC (rev 131099)
@@ -0,0 +1,14 @@
+Fix build with ocaml 4.02
+http://savannah.nongnu.org/bugs/?43934
+https://github.com/ygrek/mldonkey/commit/c91a78896526640a301f5a9eeab8b698923e285c
+--- src/utils/net/terminal.ml.orig
++++ 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150105/dcfbad18/attachment-0001.html>
More information about the macports-changes
mailing list