Update to 1.1.5, provided by Benedek Gergely on pkgsrc-users.

While here, add comments to patches.

Changelog not found, author doesn't seem to believe in it.

6 files changed, 28 insertions, 100 deletions

diff --git a/games/zoom/Makefile b/games/zoom/Makefile
index cc0f4448a45..17bc57dad90 100644
--- a/games/zoom/Makefile
+++ b/games/zoom/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.35 2015/06/12 10:50:07 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2015/07/27 22:24:51 wiz Exp $
 
-DISTNAME=	zoom-1.0.3
-PKGREVISION=	16
+DISTNAME=	zoom-1.1.5
 CATEGORIES=	games
 MASTER_SITES=	http://www.logicalshift.co.uk/unix/zoom/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.logicalshift.demon.co.uk/unix/zoom/
 COMMENT=		Plays Infocom-compatible games, with graphics support
+LICENSE=		gnu-gpl-v1
 
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/games/zoom/distinfo b/games/zoom/distinfo
index ece05b271ea..bd00e6cd5e6 100644
--- a/games/zoom/distinfo
+++ b/games/zoom/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.6 2012/06/15 18:51:32 joerg Exp $
+$NetBSD: distinfo,v 1.7 2015/07/27 22:24:51 wiz Exp $
 
-SHA1 (zoom-1.0.3.tar.gz) = 1a171aaae1f9eaffb4a6c9aee2c32e26c4c3a081
-RMD160 (zoom-1.0.3.tar.gz) = e40b7c7848299ae7e5005c138ea329e523f7cade
-Size (zoom-1.0.3.tar.gz) = 1186847 bytes
-SHA1 (patch-aa) = 3e38ab601ff5f0ec423991c91d5107b4775644b7
+SHA1 (zoom-1.1.5.tar.gz) = 67bebc7b14e1380a848277aa582921ceac5bfb1e
+RMD160 (zoom-1.1.5.tar.gz) = 9636dacc3a3f29d3bbb5a218eb579b13d90703dc
+Size (zoom-1.1.5.tar.gz) = 2185098 bytes
 SHA1 (patch-ab) = c0953b6dcbbb41f7941b06ac86b22b62e225b90e
-SHA1 (patch-src_state.c) = 4cb81640e6c56f089ae7e6c67e1dc92c09319439
-SHA1 (patch-src_tokenise.c) = 9242b110b5344c5804d7d7f71409c804a6e509e8
+SHA1 (patch-configure) = 714c33ba4b06654bfbab9c3b5b2e3ad501db5466
+SHA1 (patch-src_tokenise.c) = 878fb78143499ee3116f218db3749464aafbc2e5
diff --git a/games/zoom/patches/patch-aa b/games/zoom/patches/patch-aa
deleted file mode 100644
index 99d170a42a3..00000000000
--- a/games/zoom/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/08/04 10:40:38 adam Exp $
-
---- configure.orig	2005-08-03 10:14:05.000000000 +0000
-+++ configure
-@@ -10336,7 +10336,8 @@ if test "${ac_cv_lib_Xft_XftInit+set}" =
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lXft  $LIBS"
-+LIBS="`xft-config --libs`  $LIBS"
-+CFLAGS="$CFLAGS `xft-config --cflags`"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
diff --git a/games/zoom/patches/patch-configure b/games/zoom/patches/patch-configure
new file mode 100644
index 00000000000..3907d1f1a93
--- /dev/null
+++ b/games/zoom/patches/patch-configure
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure,v 1.1 2015/07/27 22:24:51 wiz Exp $
+
+Use xft-config to find proper linker flags for xft.
+
+--- configure.orig	2011-11-05 14:29:03.000000000 +0000
++++ configure
+@@ -7494,7 +7494,8 @@ if ${ac_cv_lib_Xft_XftInit+:} false; the
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lXft  $LIBS"
++LIBS="`xft-config --libs`  $LIBS"
++CFLAGS="$CFLAGS `xft-config --cflags`"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
diff --git a/games/zoom/patches/patch-src_state.c b/games/zoom/patches/patch-src_state.c
deleted file mode 100644
index d06f6f8b4ea..00000000000
--- a/games/zoom/patches/patch-src_state.c
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-src_state.c,v 1.1 2012/06/15 18:51:32 joerg Exp $
-
-Avoid nested functions.
-
---- src/state.c.orig	2012-06-15 14:14:35.000000000 +0000
-+++ src/state.c
-@@ -181,37 +181,37 @@ ZByte* state_compile(ZStack* stack, ZDWo
-   time_t now;
-   ZByte version;
-   
--  inline void wblock(ZByte* x, int len)
--    {
--      flen += len;
--      data = realloc(data, flen+16);
--      memcpy(data + flen - len, x, len);
--    }
--  
--  inline void wdword(ZDWord w)
--    {
--      flen +=4;
--      data = realloc(data, flen+16);
--      data[flen-4] = w>>24;
--      data[flen-3] = w>>16;
--      data[flen-2] = w>>8;
--      data[flen-1] = w;
--    }
--  
--  inline void wword(ZUWord w)
--    {
--      flen += 2;
--      data = realloc(data, flen+16);
--      data[flen-2] = w>>8;
--      data[flen-1] = w;
--    }
--  
--  inline void wbyte(ZUWord w)
--    {
--      flen += 1;
--      data = realloc(data, flen+16);
--      data[flen-1] = w;
--    }
-+#define wblock(x,len) do { \
-+  size_t wblock_len = (len); \
-+  flen += wblock_len; \
-+  data = realloc(data, flen+16); \
-+  memcpy(data + flen - wblock_len, (x), wblock_len); \
-+} while (0)
-+
-+#define wdword(w) do { \
-+  ZDWord wdword_w = (w); \
-+  flen +=4; \
-+  data = realloc(data, flen+16); \
-+  data[flen-4] = wdword_w>>24; \
-+  data[flen-3] = wdword_w>>16; \
-+  data[flen-2] = wdword_w>>8; \
-+  data[flen-1] = wdword_w; \
-+} while (0)
-+
-+#define wword(w) do { \
-+  ZUWord wword_w = (w); \
-+  flen += 2; \
-+  data = realloc(data, flen+16); \
-+  data[flen-2] = wword_w>>8; \
-+  data[flen-1] = wword_w; \
-+} while (0)
-+
-+#define wbyte(w) do { \
-+  ZUWord wbyte_w = (w); \
-+  flen += 1; \
-+  data = realloc(data, flen+16); \
-+  data[flen-1] = w; \
-+} while (0)
- 
-   *len = -1;
-   version = ReadByte(0);
diff --git a/games/zoom/patches/patch-src_tokenise.c b/games/zoom/patches/patch-src_tokenise.c
index c17c5cb43e4..9d26b7e5e91 100644
--- a/games/zoom/patches/patch-src_tokenise.c
+++ b/games/zoom/patches/patch-src_tokenise.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_tokenise.c,v 1.1 2012/06/15 18:51:32 joerg Exp $
+$NetBSD: patch-src_tokenise.c,v 1.2 2015/07/27 22:24:51 wiz Exp $
+
+Fix C99 inline usage.
 
 --- src/tokenise.c.orig	2012-06-15 14:24:46.000000000 +0000
 +++ src/tokenise.c