From 102d6983e9266caa7f0083e33104ff0e585d0cce Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 16 Oct 2017 22:01:08 +0200 Subject: [PATCH] lgeneral: bump version (#1713) --- ...ral-1.3.1.recipe => lgeneral-1.4.3.recipe} | 14 +++++------- ...1.3.1.patchset => lgeneral-1.4.3.patchset} | 22 ------------------- 2 files changed, 6 insertions(+), 30 deletions(-) rename games-strategy/lgeneral/{lgeneral-1.3.1.recipe => lgeneral-1.4.3.recipe} (88%) rename games-strategy/lgeneral/patches/{lgeneral-1.3.1.patchset => lgeneral-1.4.3.patchset} (72%) diff --git a/games-strategy/lgeneral/lgeneral-1.3.1.recipe b/games-strategy/lgeneral/lgeneral-1.4.3.recipe similarity index 88% rename from games-strategy/lgeneral/lgeneral-1.3.1.recipe rename to games-strategy/lgeneral/lgeneral-1.4.3.recipe index f73d98958..72d1c9906 100644 --- a/games-strategy/lgeneral/lgeneral-1.3.1.recipe +++ b/games-strategy/lgeneral/lgeneral-1.4.3.recipe @@ -6,11 +6,11 @@ defensive fire, surprise contacts, surrender, unit supply, weather \ influence, reinforcements and other implementations contribute to the \ tactical and strategic depth of the game." HOMEPAGE="http://lgames.sourceforge.net/" -COPYRIGHT="2000-2015 Michael Speck, Leo Savernik, Peter Ivanyi" +COPYRIGHT="2000-2017 Michael Speck, Leo Savernik, Peter Ivanyi" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="http://downloads.sf.net/lgeneral/lgeneral-$portVersion.tar.gz" -CHECKSUM_SHA256="6e95a84d7772f0bd2d64edac8c2aa45c6f750ae47bfb9dc203fe53a089e5562c" +CHECKSUM_SHA256="9c9d3fbd8595afca33a47533f9c2ce6320577b0bce85851f660c9bee07556028" SOURCE_URI_2="http://downloads.sf.net/lgeneral/pg-data.tar.gz" CHECKSUM_SHA256_2="cc6fa5d263d1d5824d706517958b1bb09b405ba0ed21e63e4a4d38e2727d7a04" PATCHES="lgeneral-$portVersion.patchset" @@ -29,27 +29,25 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libcrypto$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libsdl_mixer$secondaryArchSuffix - lib:libsdl_net$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libcrypto$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libsdl$secondaryArchSuffix devel:libsdl_mixer$secondaryArchSuffix - devel:libsdl_net$secondaryArchSuffix devel:libintl$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:make + cmd:awk + cmd:bison cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix + cmd:make " BUILD() diff --git a/games-strategy/lgeneral/patches/lgeneral-1.3.1.patchset b/games-strategy/lgeneral/patches/lgeneral-1.4.3.patchset similarity index 72% rename from games-strategy/lgeneral/patches/lgeneral-1.3.1.patchset rename to games-strategy/lgeneral/patches/lgeneral-1.4.3.patchset index 67416e725..78da5a2d2 100644 --- a/games-strategy/lgeneral/patches/lgeneral-1.3.1.patchset +++ b/games-strategy/lgeneral/patches/lgeneral-1.4.3.patchset @@ -4,28 +4,6 @@ Date: Thu, 28 Jul 2016 11:46:18 +0200 Subject: applying patch lgeneral 1.3.1 -diff --git a/configure b/configure -index 39e357b..fa13fe3 100755 ---- a/configure -+++ b/configure -@@ -5472,7 +5472,7 @@ if ${ac_cv_lib_m_main+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lm $LIBS" -+LIBS="$LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -5501,7 +5501,7 @@ if test "x$ac_cv_lib_m_main" = xyes; then : - #define HAVE_LIBM 1 - _ACEOF - -- LIBS="-lm $LIBS" -+ LIBS="$LIBS" - - else - as_fn_error $? "maths library is needed" "$LINENO" 5 diff --git a/src/config.c b/src/config.c index 3b1dfef..fb495c0 100644 --- a/src/config.c