diff options
| author | jaapb <jaapb@pkgsrc.org> | 2013-12-21 10:42:29 +0000 |
|---|---|---|
| committer | jaapb <jaapb@pkgsrc.org> | 2013-12-21 10:42:29 +0000 |
| commit | 02ac5a788bc2be1b0a57e402e73bd707bc26c9de (patch) | |
| tree | 88c05c13094539ff6610dedfc48ca937332a21bd /net | |
| parent | 252e00f104ec0ed3de9282531d4a92f970d80517 (diff) | |
| download | pkgsrc-02ac5a788bc2be1b0a57e402e73bd707bc26c9de.tar.gz | |
Patched configure
Diffstat (limited to 'net')
| -rw-r--r-- | net/mldonkey/Makefile | 4 | ||||
| -rw-r--r-- | net/mldonkey/distinfo | 4 | ||||
| -rw-r--r-- | net/mldonkey/patches/patch-config_configure.in | 27 |
3 files changed, 27 insertions, 8 deletions
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile index 1c6e957d199..01b3f95db56 100644 --- a/net/mldonkey/Makefile +++ b/net/mldonkey/Makefile @@ -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 --git a/net/mldonkey/distinfo b/net/mldonkey/distinfo index 9994e5010d6..72b3df773fe 100644 --- a/net/mldonkey/distinfo +++ b/net/mldonkey/distinfo @@ -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 --git a/net/mldonkey/patches/patch-config_configure.in b/net/mldonkey/patches/patch-config_configure.in index 1d581797e08..fb397904f26 100644 --- a/net/mldonkey/patches/patch-config_configure.in +++ b/net/mldonkey/patches/patch-config_configure.in @@ -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 @@ Correct include paths for lablgtk 2.16 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 |