diff options
| author | dholland <dholland@pkgsrc.org> | 2014-09-13 07:30:15 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2014-09-13 07:30:15 +0000 |
| commit | d2059f170aff093d7f083e749b9e7ef863010349 (patch) | |
| tree | d1c8afa469f8f9fc6b099a03008325a5e0dc5f57 /games | |
| parent | b0aeba9f0cab943e4d0a4ce99c0b66ea6a12349a (diff) | |
| download | pkgsrc-d2059f170aff093d7f083e749b9e7ef863010349.tar.gz | |
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 (limited to 'games')
| -rw-r--r-- | games/craft/Makefile | 11 | ||||
| -rw-r--r-- | games/craft/distinfo | 9 | ||||
| -rw-r--r-- | games/craft/patches/patch-xfile.hc | 15 |
3 files changed, 12 insertions, 23 deletions
diff --git a/games/craft/Makefile b/games/craft/Makefile index 5f75c59850d..baf0eb43e20 100644 --- a/games/craft/Makefile +++ b/games/craft/Makefile @@ -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 @@ COMMENT= Warcraft-like game for X11 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 @@ CONFIGURE_ARGS= --destdir=${DESTDIR} --prefix=${PREFIX} # 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 --git a/games/craft/distinfo b/games/craft/distinfo index 25c19351709..5ae491f5f0b 100644 --- a/games/craft/distinfo +++ b/games/craft/distinfo @@ -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 --git a/games/craft/patches/patch-xfile.hc b/games/craft/patches/patch-xfile.hc deleted file mode 100644 index 80dd1d61b07..00000000000 --- a/games/craft/patches/patch-xfile.hc +++ /dev/null @@ -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; - }. - |