[pkgsrc/trunk]: pkgsrc/games/craft Rev the distfile patch.

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fa12e68f93e1
branches:  trunk
changeset: 639433:fa12e68f93e1
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sat Sep 13 07:30:15 2014 +0000

description:
Rev the distfile patch.
  - roll in patch-xfile.hc
  - fix build with the solaris compiler
  - use snprintf instead of sprintf (mostly)
  - tidy a few things

There is a problem between this thing's precompiler and clang such
that clang builds fail with spurious errors about unterminated string
constants. I don't see what's wrong.

Also, in the course of doing the snprintf changes I discovered that
this depends on both csh and netpbm existing at runtime, so add the
necessary bits.

PKGREVISION -> 4.

diffstat:

 games/craft/Makefile               |  11 ++++++++---
 games/craft/distinfo               |   9 ++++-----
 games/craft/patches/patch-xfile.hc |  15 ---------------
 3 files changed, 12 insertions(+), 23 deletions(-)

diffs (75 lines):

diff -r fc6635abf8e9 -r fa12e68f93e1 games/craft/Makefile
--- a/games/craft/Makefile      Sat Sep 13 02:46:21 2014 +0000
+++ b/games/craft/Makefile      Sat Sep 13 07:30:15 2014 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.31 2013/01/21 06:56:38 dholland Exp $
+# $NetBSD: Makefile,v 1.32 2014/09/13 07:30:15 dholland Exp $
 
 DISTNAME=      craftcc35
 PKGNAME=       craft-3.5
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    games x11
 MASTER_SITES=  http://ibiblio.org/pub/linux/games/strategy/
 EXTRACT_SUFX=  .tar.Z
 
-PATCHFILES=    craft-jumbo-patch-20130120.gz
+PATCHFILES=    craft-jumbo-patch-20140913.gz
 PATCH_SITES=   http://www.NetBSD.org/~dholland/patchkits/craft/
 PATCH_DIST_STRIP= -p1
 
@@ -19,6 +19,7 @@
 WRKSRC=                ${WRKDIR}
 USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config
+DEPENDS+=      netpbm>=10:../../graphics/netpbm
 HAS_CONFIGURE= yes
 CONFIGURE_ARGS=        --destdir=${DESTDIR} --prefix=${PREFIX}
 
@@ -26,6 +27,10 @@
 # downloaded; the only thing it contains that isn't in the main
 # distfile is a few unreferenced images.
 
+# XXX: this calls system("csh -f -c ...") in a few places. These
+# really ought to be patched out.
+USE_TOOLS+=    csh:run
+
 SUBST_CLASSES+=                buttons
 SUBST_STAGE.buttons=   pre-configure
 SUBST_FILES.buttons=   .windefaults.params
diff -r fc6635abf8e9 -r fa12e68f93e1 games/craft/distinfo
--- a/games/craft/distinfo      Sat Sep 13 02:46:21 2014 +0000
+++ b/games/craft/distinfo      Sat Sep 13 07:30:15 2014 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.10 2014/06/29 04:10:55 dholland Exp $
+$NetBSD: distinfo,v 1.11 2014/09/13 07:30:15 dholland Exp $
 
-SHA1 (craft-jumbo-patch-20130120.gz) = 6396b3f4b30fd62aeb1b0d7ee4baf4bdde093f0d
-RMD160 (craft-jumbo-patch-20130120.gz) = 699a9114acc2fac56c47cce437a54850b47ab475
-Size (craft-jumbo-patch-20130120.gz) = 12457 bytes
+SHA1 (craft-jumbo-patch-20140913.gz) = 8bb0f2e67bda9e8e7cb093db3625958f0fd6ed39
+RMD160 (craft-jumbo-patch-20140913.gz) = 95d696f9ccd227f23f28cb898b9af54c7fbc18ad
+Size (craft-jumbo-patch-20140913.gz) = 18684 bytes
 SHA1 (craftcc35.tar.Z) = 8862b9001aa7d752a597033ef45d38ebfcee533f
 RMD160 (craftcc35.tar.Z) = 402a2c2ca37df4d86381b434437395424199859e
 Size (craftcc35.tar.Z) = 3123677 bytes
-SHA1 (patch-xfile.hc) = 76815f0e03322eb6022c7f26d9db802df7be9ba1
diff -r fc6635abf8e9 -r fa12e68f93e1 games/craft/patches/patch-xfile.hc
--- a/games/craft/patches/patch-xfile.hc        Sat Sep 13 02:46:21 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-xfile.hc,v 1.1 2014/06/29 04:10:55 dholland Exp $
-
-Fix tautological comparison.
-
---- xfile.hc~  2014-06-29 04:04:06.000000000 +0000
-+++ xfile.hc
-@@ -339,7 +339,7 @@ bool bscanf (FILE *f, int num_bytes, int
- 
- .  get_byte
-      {c.b     = 0;
--      was_eof = ((c.a.b3 = fgetc (f)) == EOF);
-+      was_eof = (t = fgetc (f), c.a.b3 = t, t == EOF);
-       i       = c.b;
-      }.
-