Modified package to call autotools from Makefile.common to properly rebuild

configure script (was for mldonkey-gui only, now needed for mldonkey as
well). In response to PR pkg/48461.

4 files changed, 25 insertions, 10 deletions

diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 01b3f95db56..9ada5b96d94 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2013/12/21 10:42:29 jaapb Exp $
+# $NetBSD: Makefile,v 1.72 2013/12/26 12:02:39 jaapb Exp $
 #
 
 .include "Makefile.common"
@@ -31,6 +31,9 @@ FILES_SUBST+=		MLDONKEY_GROUP=${MLDONKEY_GROUP:Q}
 FILES_SUBST+=		MLDONKEY_HOME=${MLDONKEY_HOME:Q}
 FILES_SUBST+=		MLDONKEY_USER=${MLDONKEY_USER:Q}
 
+pre-configure:
+	cd ${WRKSRC}/config && autoconf
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${DESTDIR}${PREFIX}/libexec/mldonkey
 
diff --git a/net/mldonkey/Makefile.common b/net/mldonkey/Makefile.common
index 7ba42b7866a..363adb507e8 100644
--- a/net/mldonkey/Makefile.common
+++ b/net/mldonkey/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.47 2013/07/18 17:09:25 wiz Exp $
+# $NetBSD: Makefile.common,v 1.48 2013/12/26 12:02:39 jaapb Exp $
 #
 # used by net/mldonkey/Makefile
 # used by net/mldonkey-gui/Makefile
@@ -18,7 +18,7 @@ PATCHDIR=	${.CURDIR}/../../net/mldonkey/patches
 
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake perl autoconf
 MAKE_JOBS_SAFE=		no
 
 CONFIGURE_ENV+=		WGET=""
diff --git a/net/mldonkey/distinfo b/net/mldonkey/distinfo
index 72b3df773fe..f5f67cc4465 100644
--- a/net/mldonkey/distinfo
+++ b/net/mldonkey/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.59 2013/12/21 10:42:29 jaapb Exp $
+$NetBSD: distinfo,v 1.60 2013/12/26 12:02:39 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) = 222fced9433d1468203f7e987ad504642e8c47df
+SHA1 (patch-config_configure.in) = c10728fbdedf6af5f8694d92f25e80a05cb1b9c0
diff --git a/net/mldonkey/patches/patch-config_configure.in b/net/mldonkey/patches/patch-config_configure.in
index fb397904f26..1a035125e6d 100644
--- a/net/mldonkey/patches/patch-config_configure.in
+++ b/net/mldonkey/patches/patch-config_configure.in
@@ -1,9 +1,8 @@
-$NetBSD: patch-config_configure.in,v 1.2 2013/12/21 10:42:29 jaapb Exp $
+$NetBSD: patch-config_configure.in,v 1.3 2013/12/26 12:02:39 jaapb Exp $
 
-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
-@@ -929,7 +929,17 @@ if test "$GD" != "no"; then
+@@ -929,13 +929,30 @@ if test "$GD" != "no"; then
      GDMAJORVERSION=`$GDLIBCONFIG --majorversion`
      GDMINORVERSION=`$GDLIBCONFIG --minorversion`
      GDREVISION=`$GDLIBCONFIG --revision`
@@ -22,7 +21,20 @@ Correct include paths for lablgtk 2.16; proper GD detection
  	AC_MSG_RESULT($GDVERSION)
  	LIBGD=yes
      else
-@@ -1347,15 +1357,15 @@ if test "$GTK_CONFIG" = "no"; then
+ 	AC_MSG_RESULT(no (found $GDVERSION))
+ 	LIBGD=no
+     fi
++        fi
++        ;;
++      *)
++        AC_MSG_RESULT($GDVERSION)
++        LIBGD=yes
++        ;;
++    esac
+   else
+     LIBGD=yes
+   fi
+@@ -1347,15 +1364,15 @@ if test "$GTK_CONFIG" = "no"; then
       LABLGTK_CONFIG=no
  else
    AC_MSG_CHECKING(for native code $LABLGTK_NAME)
@@ -41,7 +53,7 @@ Correct include paths for lablgtk 2.16; proper GD detection
             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 +1386,7 @@ else
+@@ -1376,7 +1393,7 @@ else
    else
       AC_MSG_RESULT(no)
       LABLGTK_CONFIG=no