Fri Oct 12 09:37:25 2018 UTC ()
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!


(leot)
diff -r1.34 -r1.35 pkgsrc/games/neverball/Makefile
diff -r1.10 -r1.11 pkgsrc/games/neverball/distinfo
diff -r0 -r1.1 pkgsrc/games/neverball/patches/patch-share_common.h
cvs diff -r1.34 -r1.35 pkgsrc/games/neverball/Makefile (expand / switch to unified diff)

--- pkgsrc/games/neverball/Makefile 2018/01/14 17:34:00 1.34
+++ pkgsrc/games/neverball/Makefile 2018/10/12 09:37:25 1.35
@@ -1,26 +1,29 @@ @@ -1,26 +1,29 @@
1# $NetBSD: Makefile,v 1.34 2018/01/14 17:34:00 rillig Exp $ 1# $NetBSD: Makefile,v 1.35 2018/10/12 09:37:25 leot Exp $
2 2
3DISTNAME= neverball-1.6.0 3DISTNAME= neverball-1.6.0
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= games 5CATEGORIES= games
6MASTER_SITES= http://neverball.org/ 6MASTER_SITES= http://neverball.org/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://neverball.org/ 9HOMEPAGE= https://neverball.org/
10COMMENT= Puzzle/action game similar to Super Monkey Ball 10COMMENT= Puzzle/action game similar to Super Monkey Ball
 11LICENSE= gnu-gpl-v2
11 12
12USE_TOOLS+= gmake pax 13USE_TOOLS+= gmake pax
13 14
 15USE_LANGUAGES= c99
 16
14# Avoiding multiples patches... 17# Avoiding multiples patches...
15BUILDLINK_FNAME_TRANSFORM.SDL+= -e "s|/SDL/|/|g" 18BUILDLINK_FNAME_TRANSFORM.SDL+= -e "s|/SDL/|/|g"
16BUILDLINK_FNAME_TRANSFORM.SDL_ttf+= -e "s|/SDL/|/|g" 19BUILDLINK_FNAME_TRANSFORM.SDL_ttf+= -e "s|/SDL/|/|g"
17 20
18MAKE_ENV+= ENABLE_NLS=0 21MAKE_ENV+= ENABLE_NLS=0
19 22
20SHAREDIR= ${PREFIX}/share/${PKGBASE} 23SHAREDIR= ${PREFIX}/share/${PKGBASE}
21 24
22INSTALLATION_DIRS= bin share/doc/${PKGBASE} share/${PKGBASE} 25INSTALLATION_DIRS= bin share/doc/${PKGBASE} share/${PKGBASE}
23 26
24LDFLAGS.DragonFly= -lX11 -lm 27LDFLAGS.DragonFly= -lX11 -lm
25LDFLAGS.SunOS+= -lX11 -lm 28LDFLAGS.SunOS+= -lX11 -lm
26 29
cvs diff -r1.10 -r1.11 pkgsrc/games/neverball/distinfo (expand / switch to unified diff)

--- pkgsrc/games/neverball/distinfo 2015/11/03 20:57:00 1.10
+++ pkgsrc/games/neverball/distinfo 2018/10/12 09:37:25 1.11
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.10 2015/11/03 20:57:00 agc Exp $ 1$NetBSD: distinfo,v 1.11 2018/10/12 09:37:25 leot Exp $
2 2
3SHA1 (neverball-1.6.0.tar.gz) = 3faebf15fea9361358a416176b9689f966c456ea 3SHA1 (neverball-1.6.0.tar.gz) = 3faebf15fea9361358a416176b9689f966c456ea
4RMD160 (neverball-1.6.0.tar.gz) = 3489fcec1efe38c0faac62fe08573117a0f63c9f 4RMD160 (neverball-1.6.0.tar.gz) = 3489fcec1efe38c0faac62fe08573117a0f63c9f
5SHA512 (neverball-1.6.0.tar.gz) = 174d05308aee3a5e693782c54dd389439752b3597f28193771041d30f6c4236a5d055b2fcca9460b1005e9f000ddb3cbc01b86ea15c2abbf6e5a7996e836f787 5SHA512 (neverball-1.6.0.tar.gz) = 174d05308aee3a5e693782c54dd389439752b3597f28193771041d30f6c4236a5d055b2fcca9460b1005e9f000ddb3cbc01b86ea15c2abbf6e5a7996e836f787
6Size (neverball-1.6.0.tar.gz) = 37772911 bytes 6Size (neverball-1.6.0.tar.gz) = 37772911 bytes
7SHA1 (patch-ab) = 3cca20f42390d22c73c03171f725fe562f73cb0d 7SHA1 (patch-ab) = 3cca20f42390d22c73c03171f725fe562f73cb0d
 8SHA1 (patch-share_common.h) = f7f68029ab39d10dd025557c14f122b9980e437c
8SHA1 (patch-share_solid__draw.h) = 85b3271eb10056f19d79688fca305464063752ba 9SHA1 (patch-share_solid__draw.h) = 85b3271eb10056f19d79688fca305464063752ba
File Added: pkgsrc/games/neverball/patches/patch-share_common.h
$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 *);