From 4cc20e754e53834da41518f1a3c673a92e3e27ab Mon Sep 17 00:00:00 2001 From: dcoppa Date: Tue, 1 Mar 2016 09:05:33 +0000 Subject: [PATCH] Switch to CONFIGURE_STYLE=gnu OK naddy@ for after the unlock --- net/mldonkey/Makefile | 11 +++--- net/mldonkey/patches/patch-config_configure | 39 +++++++++++++++++++ .../patches/patch-config_configure_in | 39 ------------------- net/mldonkey/patches/patch-configure | 10 ----- 4 files changed, 44 insertions(+), 55 deletions(-) create mode 100644 net/mldonkey/patches/patch-config_configure delete mode 100644 net/mldonkey/patches/patch-config_configure_in delete mode 100644 net/mldonkey/patches/patch-configure diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile index e3ba102299f..b4c7c9be32b 100644 --- a/net/mldonkey/Makefile +++ b/net/mldonkey/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2015/12/23 14:46:06 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.16 2016/03/01 09:05:33 dcoppa Exp $ COMMENT = e-donkey client DISTNAME = mldonkey-3.1.5 @@ -22,11 +22,7 @@ WANTLIB += stdc++ tiff vpx z EXTRACT_SUFX = .tar.bz2 -CONFIGURE_STYLE = autoconf no-autoheader -AUTOCONF_DIR = ${WRKSRC}/config -AUTOCONF_VERSION = 2.69 -MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config - +CONFIGURE_STYLE = gnu CONFIGURE_ARGS += --enable-gui=newgui2 \ --enable-upnp-natpmp CONFIGURE_ENV += CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include' \ @@ -34,6 +30,9 @@ CONFIGURE_ENV += CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include' \ ac_cv_prog_RPMBUILD="" \ ac_cv_prog_WGET="" +MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/config +WRKCONF = ${WRKSRC}/config + USE_GMAKE = Yes MODULES = lang/ocaml devel/gettext BUILD_DEPENDS = lang/ocaml-camlp4 x11/lablgtk2 diff --git a/net/mldonkey/patches/patch-config_configure b/net/mldonkey/patches/patch-config_configure new file mode 100644 index 00000000000..0181fe50971 --- /dev/null +++ b/net/mldonkey/patches/patch-config_configure @@ -0,0 +1,39 @@ +$OpenBSD: patch-config_configure,v 1.5 2016/03/01 09:05:33 dcoppa Exp $ +--- config/configure.orig Thu Feb 11 09:52:53 2016 ++++ config/configure Thu Feb 11 09:53:12 2016 +@@ -7021,7 +7021,7 @@ if ${ac_cv_lib_png_png_create_read_struct_+:} false; t + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lpng $LIBS" ++LIBS="-lpng -lz -lm $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -7151,7 +7151,7 @@ if ${ac_cv_lib_png_png_access_version_number+:} false; + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lpng $LIBS" ++LIBS="-lpng -lz -lm $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -9433,7 +9433,7 @@ else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GToolbox.popup_menu args" >&5 + $as_echo_n "checking GToolbox.popup_menu args... " >&6; } + GTOOLBOX="$OCAMLLIB/$LABLGTK_NAME/gToolbox.mli" +- grep popup $GTOOLBOX | grep -i button 2> /dev/null && GTOOLBOX_ARGS=new ++ grep popup $GTOOLBOX | grep -q -i button && GTOOLBOX_ARGS=new + if test "$GTOOLBOX_ARGS" = "new"; then + GTOOLBOX_POPUPMENU=' ~button: button ~time: time ' + { $as_echo "$as_me:${as_lineno-$LINENO}: result: new" >&5 +@@ -10835,7 +10835,7 @@ cd .. + + echo "" + echo "Building dependencies (if it blocks, try '$GNU_MAKE depend' to see the problem)" +-$GNU_MAKE depend 2> /dev/null > /dev/null || echo "Building dependencies fails: try: '$GNU_MAKE depend'" ++$GNU_MAKE depend || echo "Building dependencies fails: try: '$GNU_MAKE depend'" + + echo "" + printf "Configuring MLDonkey %s" "$MLDONKEY_VERSION" diff --git a/net/mldonkey/patches/patch-config_configure_in b/net/mldonkey/patches/patch-config_configure_in deleted file mode 100644 index 12dad3ff4f1..00000000000 --- a/net/mldonkey/patches/patch-config_configure_in +++ /dev/null @@ -1,39 +0,0 @@ -$OpenBSD: patch-config_configure_in,v 1.2 2016/02/01 10:54:33 dcoppa Exp $ ---- config/configure.in.orig Mon Feb 1 11:30:06 2016 -+++ config/configure.in Mon Feb 1 11:31:11 2016 -@@ -1011,7 +1011,7 @@ if test "$GD" != "no"; then - PNG_LDFLAGS=`$PNGLIBCONFIG --ldflags` - LDFLAGS="$LDFLAGS $PNG_LDFLAGS" - fi -- AC_CHECK_LIB(png, png_create_read_struct , [LIBPNG=yes]) -+ AC_CHECK_LIB(png, png_create_read_struct , [LIBPNG=yes],, -lz -lm) - # restore variables - LIBS=$SAVE_LIBS_PNG - CFLAGS=$SAVE_CFLAGS_PNG -@@ -1040,7 +1040,7 @@ if test "$GD" != "no"; then - GD_PNG=yes - GD_LIBS="$GD_LIBS $PNG_LIBS" - AC_MSG_RESULT(yes) -- AC_CHECK_LIB(png, png_access_version_number,[AC_DEFINE(HAVE_PNGVERSION, 1,)]) -+ AC_CHECK_LIB(png, png_access_version_number,[AC_DEFINE(HAVE_PNGVERSION, 1,)],, -lz -lm) - AC_DEFINE(HAVE_GD_PNG, 1, [Define to 1 if you have png support in libgd.]) - else - AC_MSG_RESULT(no) -@@ -1501,7 +1501,7 @@ else - MORE_TARGETS="$MORE_TARGETS $GUIS" - AC_MSG_CHECKING(GToolbox.popup_menu args) - GTOOLBOX="$OCAMLLIB/$LABLGTK_NAME/gToolbox.mli" -- grep popup $GTOOLBOX | grep -i button 2> /dev/null && GTOOLBOX_ARGS=new -+ grep popup $GTOOLBOX | grep -q -i button && GTOOLBOX_ARGS=new - if test "$GTOOLBOX_ARGS" = "new"; then - GTOOLBOX_POPUPMENU=' ~button: button ~time: time ' - AC_MSG_RESULT(new) -@@ -1627,7 +1627,7 @@ cd .. - - echo "" - echo "Building dependencies (if it blocks, try '$GNU_MAKE depend' to see the problem)" --$GNU_MAKE depend 2> /dev/null > /dev/null || echo "Building dependencies fails: try: '$GNU_MAKE depend'" -+$GNU_MAKE depend || echo "Building dependencies fails: try: '$GNU_MAKE depend'" - - echo "" - printf "Configuring MLDonkey %s" "$MLDONKEY_VERSION" diff --git a/net/mldonkey/patches/patch-configure b/net/mldonkey/patches/patch-configure deleted file mode 100644 index 04141a1408f..00000000000 --- a/net/mldonkey/patches/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ -$OpenBSD: patch-configure,v 1.1 2014/10/31 08:19:39 dcoppa Exp $ ---- configure.orig Wed Jun 1 23:56:39 2011 -+++ configure Wed Jun 1 23:56:54 2011 -@@ -43,5 +43,5 @@ else - echo "Running m4 to generate Makefile..." - m4 Makefile.in > ../Makefile - fi \ -- && ./configure --enable-option-checking=fatal "$@" -+ && ./configure --enable-option-checking "$@" - fi