diff --git a/games-strategy/lgeneral/lgeneral-1.4.3.recipe b/games-strategy/lgeneral/lgeneral-1.4.3.recipe index 3b1e05b02..500ce2112 100644 --- a/games-strategy/lgeneral/lgeneral-1.4.3.recipe +++ b/games-strategy/lgeneral/lgeneral-1.4.3.recipe @@ -8,7 +8,7 @@ tactical and strategic depth of the game." HOMEPAGE="http://lgames.sourceforge.net/" COPYRIGHT="2000-2017 Michael Speck, Leo Savernik, Peter Ivanyi" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="http://downloads.sf.net/lgeneral/lgeneral-$portVersion.tar.gz" CHECKSUM_SHA256="9c9d3fbd8595afca33a47533f9c2ce6320577b0bce85851f660c9bee07556028" SOURCE_URI_2="http://downloads.sf.net/lgeneral/pg-data.tar.gz" @@ -16,7 +16,7 @@ CHECKSUM_SHA256_2="cc6fa5d263d1d5824d706517958b1bb09b405ba0ed21e63e4a4d38e2727d7 PATCHES="lgeneral-$portVersion.patchset" ADDITIONAL_FILES="lgeneral.rdef" -ARCHITECTURES="?all !x86_gcc2 x86" +ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" PROVIDES=" @@ -30,29 +30,33 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libiconv$secondaryArchSuffix - lib:libsdl$secondaryArchSuffix - lib:libsdl_mixer$secondaryArchSuffix + lib:libSDL_1.2$secondaryArchSuffix + lib:libSDL_mixer_1.2$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix - devel:libsdl$secondaryArchSuffix - devel:libsdl_mixer$secondaryArchSuffix + devel:libSDL_1.2$secondaryArchSuffix + devel:libSDL_mixer_1.2$secondaryArchSuffix " BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoreconf + cmd:automake cmd:awk cmd:bison cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix " BUILD() { - libtoolize --force --copy --install + autoreconf -vfi runConfigure ./configure --disable-nls mkdir -p pg-data diff --git a/games-strategy/lgeneral/patches/lgeneral-1.4.3.patchset b/games-strategy/lgeneral/patches/lgeneral-1.4.3.patchset index 78da5a2d2..561a47f3f 100644 --- a/games-strategy/lgeneral/patches/lgeneral-1.4.3.patchset +++ b/games-strategy/lgeneral/patches/lgeneral-1.4.3.patchset @@ -1,11 +1,11 @@ -From b7ed76706d82e32bfb3f748dadffafa622eb3968 Mon Sep 17 00:00:00 2001 +From 4b9aa740caa024e432a50f7252f3dd316da7a309 Mon Sep 17 00:00:00 2001 From: begasus Date: Thu, 28 Jul 2016 11:46:18 +0200 Subject: applying patch lgeneral 1.3.1 diff --git a/src/config.c b/src/config.c -index 3b1dfef..fb495c0 100644 +index bfa95fa..714f883 100644 --- a/src/config.c +++ b/src/config.c @@ -22,6 +22,13 @@ @@ -47,5 +47,63 @@ index 3b1dfef..fb495c0 100644 int res; -- -2.7.0 +2.37.3 + + +From 7406496fa2be9f0719c69131b820af077a136e4e Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Tue, 4 Jul 2023 10:46:29 +0000 +Subject: Fix missing define for HAVE_PUTENV + + +diff --git a/util/portability.c b/util/portability.c +index 5e309e3..6f55b29 100644 +--- a/util/portability.c ++++ b/util/portability.c +@@ -32,6 +32,10 @@ + #ifndef HAVE_SETENV + int setenv(const char *name, const char *value, int override) { + ++#ifndef HAVE_PUTENV ++#define HAVE_PUTENV ++#endif ++ + #ifdef HAVE_PUTENV + char *new_value = malloc( strlen(name) + strlen(value) + 2 ); + strcpy(new_value, name); +-- +2.37.3 + + +From 26b06a8ee36c6333f363fbf5bbf5ed930465da7a Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Tue, 4 Jul 2023 12:34:21 +0000 +Subject: Fix error: possibly undefined macro: AM_INTL_SUBDIR + + +diff --git a/Makefile.am b/Makefile.am +index 1d317d1..b0ae4df 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = intl util lgc-pg lged src tools po ++SUBDIRS = util lgc-pg lged src tools po + + EXTRA_DIST = AUTHORS COPYING ChangeLog README.lgeneral \ + README.lgc-pg README.redit TODO \ +diff --git a/configure.in b/configure.in +index 3f80ef9..a2ffd12 100644 +--- a/configure.in ++++ b/configure.in +@@ -38,7 +38,7 @@ dnl L10n support + ALL_LINGUAS="en de" + + AC_GNU_SOURCE +-AM_GNU_GETTEXT ++AM_GNU_GETTEXT([external]) + + XGETTEXTFLAGS= + MSGFMTFLAGS=-v +-- +2.37.3