CVS commit: pkgsrc/games/neverball

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Fri Oct 12 09:37:25 UTC 2018

Modified Files:
        pkgsrc/games/neverball: Makefile distinfo
Added Files:
        pkgsrc/games/neverball/patches: patch-share_common.h

Log Message:
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!


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/games/neverball/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/games/neverball/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/neverball/patches/patch-share_common.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/neverball/Makefile
diff -u pkgsrc/games/neverball/Makefile:1.34 pkgsrc/games/neverball/Makefile:1.35
--- pkgsrc/games/neverball/Makefile:1.34        Sun Jan 14 17:34:00 2018
+++ pkgsrc/games/neverball/Makefile     Fri Oct 12 09:37:25 2018
@@ -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@localhost
 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"

Index: pkgsrc/games/neverball/distinfo
diff -u pkgsrc/games/neverball/distinfo:1.10 pkgsrc/games/neverball/distinfo:1.11
--- pkgsrc/games/neverball/distinfo:1.10        Tue Nov  3 20:57:00 2015
+++ pkgsrc/games/neverball/distinfo     Fri Oct 12 09:37:25 2018
@@ -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

Added files:

Index: pkgsrc/games/neverball/patches/patch-share_common.h
diff -u /dev/null pkgsrc/games/neverball/patches/patch-share_common.h:1.1
--- /dev/null   Fri Oct 12 09:37:25 2018
+++ pkgsrc/games/neverball/patches/patch-share_common.h Fri Oct 12 09:37:25 2018
@@ -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 *);