liquidwar: Update to 5.6.5

This allows it to build with the latest Allegro version in pkgsrc.

Changes:

* Code cleanup, updated Allegro calls, indent & lint.
* Introduced Docker files to build the game and run a server.
* Fixed PHP metaserver.
* Fixed DOS & MS-Windows Makefiles to include Polish.
* Using proper PHP tags.
* Added make dist to Jenkins script.
* Fixed Debian issue #716610, was caused by lazy arg parsing.
* First Polish translation by Jan Szenborn.
* Added Jenkins (continuous integration) script.
* Removed compiler warnings.
* Added 5 new maps by Joey Dodson (psyforce).
* Turned on waves by default. Computers are fast now.
* Trying to fix the game for native GP2X support.
* Added informations on how to compile for GP2X.
* German translation update by Jan Gretschuskin.
* Updated 'upgrade to LW6' message.
* Added icon support under X-Windows.
* Doc update.
* Added hi-res icon.
* Changed READMEs charset to UTF-8.
* Makefile distclean fix.
* Updated config.guess & other configure scripts.
* Mac OS X package fix.
* Fixed RPM generation.
* target -> host in configure/Makefile
* Information "Liquid War 6 is out" when starting game.
* Fixed Debian Bug #555468, missing -lm in mapgen Makefile
* Makefile updates for native OS/X support.
* Security patch by Mikhail Yakshin.
* New solsystem map by Rezifull
* .desktop patch by SA Gevatter (FreeDesktop.org compliance)
* Added sample logrotate.d file.
* Liquid War server no more leaves defunct childs on callback.
* Now somewhat version agnostic, will accept 5.6.3 & more.
* Fixed CPU detection, ASM was compiled on x86_64 but isn't linkable.

5 files changed, 37 insertions, 46 deletions

diff --git a/games/liquidwar/Makefile b/games/liquidwar/Makefile
index 95615a69f67..58e19786b45 100644
--- a/games/liquidwar/Makefile
+++ b/games/liquidwar/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.12 2012/10/06 11:54:46 asau Exp $
+# $NetBSD: Makefile,v 1.13 2019/07/04 17:15:21 nia Exp $
 #
 
-DISTNAME=	liquidwar-5.6.4
-PKGREVISION=	1
+DISTNAME=	liquidwar-5.6.5
 CATEGORIES=	games
-MASTER_SITES=	http://www.ufoot.org/download/liquidwar/v5/5.6.4/
+MASTER_SITES=	https://www.ufoot.org/download/liquidwar/v5/${PKGVERSION_NOREV}/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.ufoot.org/liquidwar/v5
+HOMEPAGE=	https://ufoot.org/liquidwar/v5
 COMMENT=	Unique multiplayer wargame
+LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	gmake
 GNU_CONFIGURE=	YES
diff --git a/games/liquidwar/PLIST b/games/liquidwar/PLIST
index 8683ab18dfa..b2c4daec828 100644
--- a/games/liquidwar/PLIST
+++ b/games/liquidwar/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:56:50 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/07/04 17:15:21 nia Exp $
 bin/liquidwar
 bin/liquidwar-mapgen
 bin/liquidwar-server
@@ -8,6 +8,7 @@ share/doc/liquidwar/README
 share/doc/liquidwar/README.de
 share/doc/liquidwar/README.dk
 share/doc/liquidwar/README.fr
+share/doc/liquidwar/README.pl
 share/games/liquidwar/liquidwar.dat
 share/games/liquidwar/map/meditate.bmp
 share/games/liquidwar/map/pacman.bmp
diff --git a/games/liquidwar/distinfo b/games/liquidwar/distinfo
index e9c947f4d27..3f4d2100094 100644
--- a/games/liquidwar/distinfo
+++ b/games/liquidwar/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 20:56:58 agc Exp $
+$NetBSD: distinfo,v 1.9 2019/07/04 17:15:21 nia Exp $
 
-SHA1 (liquidwar-5.6.4.tar.gz) = a3006c4da9517c3af3b7bf165b2c86fa369a71c6
-RMD160 (liquidwar-5.6.4.tar.gz) = 991da4af05d1a8cf292faf23e9c06c1f7571672c
-SHA512 (liquidwar-5.6.4.tar.gz) = 7145a8362c46a0f39662327edf81b341659a3ce8216f9fb3bb32e483de618c0f46169ed916fe2c4c651ebc5925ecdc534b372c381e16c3ddae9a50fb48f98ed7
-Size (liquidwar-5.6.4.tar.gz) = 3268432 bytes
+SHA1 (liquidwar-5.6.5.tar.gz) = 42cc7d02a2f21ab826af1e064a79ede04f36b067
+RMD160 (liquidwar-5.6.5.tar.gz) = c925cbf2d81c38e581db4832ee4da036cba9fdbf
+SHA512 (liquidwar-5.6.5.tar.gz) = 15dc2cacd1f3b00f8dcac4318cbaf5c713f2d0e111392d14dd56eec7ae97a64af1487a11038dc108743baf3c995e9136100d56331fadc4cf19dc5702d5051a25
+Size (liquidwar-5.6.5.tar.gz) = 6508987 bytes
 SHA1 (patch-aa) = b47749852d8e56844bd5f21791f6b0b8f2389968
-SHA1 (patch-ab) = da49f5a2695fb95ceff6b9445b4cae34031d215b
+SHA1 (patch-configure) = 8a4e57c1d658875d463674157d6b4f9062b850b9
diff --git a/games/liquidwar/patches/patch-ab b/games/liquidwar/patches/patch-ab
deleted file mode 100644
index 6f43bae7558..00000000000
--- a/games/liquidwar/patches/patch-ab
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2011/12/12 16:26:37 dholland Exp $
-
-- remove bashisms
-- correct strange belief that 32-bit asm works on x86_64
-
---- configure.orig	2007-10-17 20:00:50.000000000 +0000
-+++ configure
-@@ -6024,7 +6024,7 @@ fi
- 
- 
- I386="no"
--for i in i386 i486 i586 i686 i786 x86_64 ; do
-+for i in i386 i486 i586 i686 i786 ; do
-   if test "$i" = "$target_cpu" ; then
-     I386="yes"
-   fi;
-@@ -6392,7 +6392,7 @@ echo $ECHO_N "checking for target specif
- # Check whether --enable-target-opt was given.
- if test "${enable_target_opt+set}" = set; then
-   enableval=$enable_target_opt;
--  if test "$I386" == "yes" && test "$enableval" != "no" ; then
-+  if test "$I386" = "yes" && test "$enableval" != "no" ; then
-     TARGET_OPT=yes
-     { echo "$as_me:$LINENO: result: enabled" >&5
- echo "${ECHO_T}enabled" >&6; }
-@@ -6404,7 +6404,7 @@ echo "${ECHO_T}disabled" >&6; }
- 
- else
- 
--  if test "$I386" == "yes" ; then
-+  if test "$I386" = "yes" ; then
-     TARGET_OPT=yes
-     { echo "$as_me:$LINENO: result: enabled" >&5
- echo "${ECHO_T}enabled" >&6; }
diff --git a/games/liquidwar/patches/patch-configure b/games/liquidwar/patches/patch-configure
new file mode 100644
index 00000000000..14e321e0869
--- /dev/null
+++ b/games/liquidwar/patches/patch-configure
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure,v 1.1 2019/07/04 17:15:21 nia Exp $
+
+Remove bashisms.
+
+--- configure.orig	2018-12-23 19:04:36.000000000 +0000
++++ configure
+@@ -4385,7 +4385,7 @@ $as_echo_n "checking for host specific o
+ # Check whether --enable-host-opt was given.
+ if test "${enable_host_opt+set}" = set; then :
+   enableval=$enable_host_opt;
+-  if test "$I386" == "yes" && test "$enableval" != "no" ; then
++  if test "$I386" = "yes" && test "$enableval" != "no" ; then
+     HOST_OPT=yes
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled" >&5
+ $as_echo "enabled" >&6; }
+@@ -4397,7 +4397,7 @@ $as_echo "disabled" >&6; }
+ 
+ else
+ 
+-  if test "$I386" == "yes" ; then
++  if test "$I386" = "yes" ; then
+     HOST_OPT=yes
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled" >&5
+ $as_echo "enabled" >&6; }