diff options
| author | leot <leot@pkgsrc.org> | 2018-10-12 09:37:25 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2018-10-12 09:37:25 +0000 |
| commit | 65cd4bf1cbccfbab1913b201fcc794f8bf63f6de (patch) | |
| tree | c146da977f0c5e3b3472d9c435d3da2041a74fd2 /games | |
| parent | a82ee0638ed6f74e1f79cf8cd90b1e61b2342c42 (diff) | |
| download | pkgsrc-65cd4bf1cbccfbab1913b201fcc794f8bf63f6de.tar.gz | |
neverball: Needs c99 and avoid vsnprintf(3) hacks
- On NetBSD (and probably other operating system) the build failed
because due `extern int vsnprintf(char *, size_t, const char *, va_list);'
and SSP use. `-std=c99' is already passed to the compiler
and vsnprintf(3) is part of C99 so avoid the `extern'.
- Add LICENSE
Bump PKGREVISION
Problem noticed and original patch by chardar on #pkgsrc with little
adjustments from me, thanks a lot!
Diffstat (limited to 'games')
| -rw-r--r-- | games/neverball/Makefile | 7 | ||||
| -rw-r--r-- | games/neverball/distinfo | 3 | ||||
| -rw-r--r-- | games/neverball/patches/patch-share_common.h | 22 |
3 files changed, 29 insertions, 3 deletions
diff --git a/games/neverball/Makefile b/games/neverball/Makefile index 01d30a32f16..8efb374f997 100644 --- a/games/neverball/Makefile +++ b/games/neverball/Makefile @@ -1,16 +1,19 @@ -# $NetBSD: Makefile,v 1.34 2018/01/14 17:34:00 rillig Exp $ +# $NetBSD: Makefile,v 1.35 2018/10/12 09:37:25 leot Exp $ DISTNAME= neverball-1.6.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= games MASTER_SITES= http://neverball.org/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://neverball.org/ COMMENT= Puzzle/action game similar to Super Monkey Ball +LICENSE= gnu-gpl-v2 USE_TOOLS+= gmake pax +USE_LANGUAGES= c99 + # Avoiding multiples patches... BUILDLINK_FNAME_TRANSFORM.SDL+= -e "s|/SDL/|/|g" BUILDLINK_FNAME_TRANSFORM.SDL_ttf+= -e "s|/SDL/|/|g" diff --git a/games/neverball/distinfo b/games/neverball/distinfo index b629e21a31e..7088df4a08a 100644 --- a/games/neverball/distinfo +++ b/games/neverball/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 20:57:00 agc Exp $ +$NetBSD: distinfo,v 1.11 2018/10/12 09:37:25 leot Exp $ SHA1 (neverball-1.6.0.tar.gz) = 3faebf15fea9361358a416176b9689f966c456ea RMD160 (neverball-1.6.0.tar.gz) = 3489fcec1efe38c0faac62fe08573117a0f63c9f SHA512 (neverball-1.6.0.tar.gz) = 174d05308aee3a5e693782c54dd389439752b3597f28193771041d30f6c4236a5d055b2fcca9460b1005e9f000ddb3cbc01b86ea15c2abbf6e5a7996e836f787 Size (neverball-1.6.0.tar.gz) = 37772911 bytes SHA1 (patch-ab) = 3cca20f42390d22c73c03171f725fe562f73cb0d +SHA1 (patch-share_common.h) = f7f68029ab39d10dd025557c14f122b9980e437c SHA1 (patch-share_solid__draw.h) = 85b3271eb10056f19d79688fca305464063752ba diff --git a/games/neverball/patches/patch-share_common.h b/games/neverball/patches/patch-share_common.h new file mode 100644 index 00000000000..2e104c8fd1e --- /dev/null +++ b/games/neverball/patches/patch-share_common.h @@ -0,0 +1,22 @@ +$NetBSD: patch-share_common.h,v 1.1 2018/10/12 09:37:25 leot Exp $ + +C99 is already passed via CFLAGS and vsnprintf(3) is part of it. + +--- share/common.h.orig 2014-05-21 13:21:43.000000000 +0000 ++++ share/common.h +@@ -81,15 +81,6 @@ char *concat_string(const char *first, . + #define str_starts_with(s, h) (strncmp((s), (h), strlen(h)) == 0) + #define str_ends_with(s, t) ((strlen(s) >= strlen(t)) && strcmp((s) + strlen(s) - strlen(t), (t)) == 0) + +-/* +- * Declaring vsnprintf with the C99 signature, even though we're +- * claiming to be ANSI C. This is probably bad but is not known to not +- * work. +- */ +-#ifndef __APPLE__ +-extern int vsnprintf(char *, size_t, const char *, va_list); +-#endif +- + /* Time. */ + + time_t make_time_from_utc(struct tm *); |