[pkgsrc/trunk]: pkgsrc/net/mldonkey Patched configure

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/650a23896643
branches:  trunk
changeset: 627926:650a23896643
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Sat Dec 21 10:42:29 2013 +0000

description:
Patched configure

diffstat:

 net/mldonkey/Makefile                          |   4 +-
 net/mldonkey/distinfo                          |   4 +-
 net/mldonkey/patches/patch-config_configure.in |  27 ++++++++++++++++++++++---
 3 files changed, 27 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r afafcad30716 -r 650a23896643 net/mldonkey/Makefile
--- a/net/mldonkey/Makefile     Sat Dec 21 08:59:41 2013 +0000
+++ b/net/mldonkey/Makefile     Sat Dec 21 10:42:29 2013 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.70 2013/11/01 11:30:22 jaapb Exp $
+# $NetBSD: Makefile,v 1.71 2013/12/21 10:42:29 jaapb Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=           11
+PKGREVISION=           12
 
 RCD_SCRIPTS=           mldonkey
 
diff -r afafcad30716 -r 650a23896643 net/mldonkey/distinfo
--- a/net/mldonkey/distinfo     Sat Dec 21 08:59:41 2013 +0000
+++ b/net/mldonkey/distinfo     Sat Dec 21 10:42:29 2013 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.58 2012/09/14 19:23:30 jaapb Exp $
+$NetBSD: distinfo,v 1.59 2013/12/21 10:42:29 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) = aaec2d1b5ca2520f6a9449a8680ad6456bb89dcc
+SHA1 (patch-config_configure.in) = 222fced9433d1468203f7e987ad504642e8c47df
diff -r afafcad30716 -r 650a23896643 net/mldonkey/patches/patch-config_configure.in
--- a/net/mldonkey/patches/patch-config_configure.in    Sat Dec 21 08:59:41 2013 +0000
+++ b/net/mldonkey/patches/patch-config_configure.in    Sat Dec 21 10:42:29 2013 +0000
@@ -1,9 +1,28 @@
-$NetBSD: patch-config_configure.in,v 1.1 2012/09/14 19:23:31 jaapb Exp $
+$NetBSD: patch-config_configure.in,v 1.2 2013/12/21 10:42:29 jaapb Exp $
 
-Correct include paths for lablgtk 2.16
+Correct include paths for lablgtk 2.16; proper GD detection
 --- config/configure.in.orig   2012-08-05 15:49:02.000000000 +0000
 +++ config/configure.in
-@@ -1347,15 +1347,15 @@ if test "$GTK_CONFIG" = "no"; then
+@@ -929,7 +929,17 @@ if test "$GD" != "no"; then
+     GDMAJORVERSION=`$GDLIBCONFIG --majorversion`
+     GDMINORVERSION=`$GDLIBCONFIG --minorversion`
+     GDREVISION=`$GDLIBCONFIG --revision`
+-    if [ [ $GDMAJORVERSION = 2 ] && [ $GDMINORVERSION = 0 ] && [ $GDREVISION -gt 14 ]]; then
++              case $GDMAJORVERSION in
++                      1)
++                              AC_MSG_RESULT(no (found $GDVERSION))
++                              LIBGD=no
++                              ;;
++                      2)
++                              if test $GDMINORVERSION -ge 1; then
++                              AC_MSG_RESULT($GDVERSION)
++                              LIBGD=yes
++                              else
++                                      if test $GDREVISION -gt 14; then
+       AC_MSG_RESULT($GDVERSION)
+       LIBGD=yes
+     else
+@@ -1347,15 +1357,15 @@ if test "$GTK_CONFIG" = "no"; then
       LABLGTK_CONFIG=no
  else
    AC_MSG_CHECKING(for native code $LABLGTK_NAME)
@@ -22,7 +41,7 @@
             echo "---------------------------------------------------------"
             echo "lablrsvg is not installed properly. See the INSTALL.txt"
             echo "file of mldonkey to see how to compile $LABLGTK_NAME. You"
-@@ -1376,7 +1376,7 @@ else
+@@ -1376,7 +1386,7 @@ else
    else
       AC_MSG_RESULT(no)
       LABLGTK_CONFIG=no