cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to neverball-1.6.0.

Browse Source
This commit is contained in:
benoit 2015-11-16 10:26:23 +00:00
parent 4e2b8d623d
commit a4801a3132
7 changed files with 817 additions and 413 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
games/neverball/Makefile
View File

@ -1,16 +1,14 @@
# $OpenBSD: Makefile,v 1.16 2015/08/20 18:03:53 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.17 2015/11/16 10:26:23 benoit Exp $
COMMENT-main = tilt the floor to roll a ball through an obstacle course
COMMENT-data = data for Neverball/Neverputt
BROKEN-hppa = SIGILL on data/ball/snowglobe/snowglobe-inner.so
V = 1.5.4
V = 1.6.0
DISTNAME = neverball-$V
PKGNAME-main = neverball-$V
PKGNAME-data = neverball-data-$V
EPOCH = 0
REVISION-main = 3
REVISION-data = 0
CATEGORIES = games x11
@ -23,8 +21,8 @@ MAINTAINER = Benoit Lecocq <benoit@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
WANTLIB = GL SDL X11 c m pthread ogg vorbis vorbisfile \
jpeg png SDL_ttf physfs
WANTLIB-main = GL SDL2 X11 c m pthread z ogg vorbis vorbisfile \
jpeg png SDL2_ttf physfs
MASTER_SITES = ${HOMEPAGE}
@ -33,7 +31,7 @@ LIB_DEPENDS-main = ${MODGETTEXT_LIB_DEPENDS} \
audio/libvorbis \
graphics/jpeg \
graphics/png \
devel/sdl-ttf \
devel/sdl2-ttf \
devel/physfs
RUN_DEPENDS-data =
LIB_DEPENDS-data =
@ -46,7 +44,7 @@ MODULES = devel/gettext
USE_GMAKE = Yes
NO_TEST = Yes
MAKE_FLAGS = CPPFLAGS="-I${X11BASE}/include" \
MAKE_FLAGS = CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -pthread -logg -lvorbis" \
INTL_LIBS="-lintl -liconv"
@ -63,7 +61,7 @@ do-install:
cd ${WRKSRC}/data && find . -type f ! -perm 644 -exec chmod 644 {} \;
cd ${WRKSRC} && find data -type f | pax -rw ${PREFIX}/share/neverball
cd ${WRKSRC} && find locale -type f | pax -rw ${PREFIX}/share
cd ${WRKSRC} && ${INSTALL_DATA} COPYING README doc/AUTHORS doc/MANUAL \
${PREFIX}/share/doc/neverball
cd ${WRKSRC} && ${INSTALL_DATA} LICENSE.md README.md doc/authors.txt \
doc/manual.txt ${PREFIX}/share/doc/neverball
.include <bsd.port.mk>

4
games/neverball/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (neverball-1.5.4.tar.gz) = 6jHKn27scMjmbqog186eSClf2wdzE7l2N8UDsWt7DaY=
SIZE (neverball-1.5.4.tar.gz) = 26767623
SHA256 (neverball-1.6.0.tar.gz) = c/5jzKT5bi01VIDQO8CykE6DoKvfZf6MUttcw8yoj6A=
SIZE (neverball-1.6.0.tar.gz) = 37772911

34
games/neverball/patches/patch-Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.3 2009/12/23 22:41:36 benoit Exp $
--- Makefile.orig Sun Sep 20 12:06:00 2009
+++ Makefile Mon Dec 21 14:06:11 2009
@@ -27,8 +27,8 @@
$OpenBSD: patch-Makefile,v 1.4 2015/11/16 10:26:23 benoit Exp $
--- Makefile.orig Wed May 21 15:21:43 2014
+++ Makefile Fri Sep 5 14:44:11 2014
@@ -21,8 +21,8 @@
# Paths (packagers might want to set DATADIR and LOCALEDIR)
USERDIR := .neverball
@ -10,21 +10,25 @@ $OpenBSD: patch-Makefile,v 1.3 2009/12/23 22:41:36 benoit Exp $
+DATADIR := ${PREFIX}/share/neverball/data
+LOCALEDIR := ${PREFIX}/share/locale
ifdef MINGW
USERDIR := Neverball
@@ -42,11 +42,11 @@
ifeq ($(PLATFORM),mingw)
USERDIR := Neverball
@@ -36,13 +36,13 @@
# Optional flags (CFLAGS, CPPFLAGS, ...)
ifeq ($(DEBUG),1)
- CFLAGS := -g
- CPPFLAGS :=
+ CFLAGS += -g
+ CPPFLAGS +=
- CFLAGS := -g
- CXXFLAGS := -g
- CPPFLAGS :=
+ CFLAGS += -g
+ CXXFLAGS += -g
+ CPPFLAGS +=
else
- CFLAGS := -O2
- CPPFLAGS := -DNDEBUG
+ CFLAGS +=
+ CPPFLAGS += -DNDEBUG
- CFLAGS := -O2
- CXXFLAGS := -O2
- CPPFLAGS := -DNDEBUG
+ CFLAGS +=
+ CXXFLAGS :=
+ CPPFLAGS += -DNDEBUG
endif
#------------------------------------------------------------------------------

21
games/neverball/patches/patch-scripts_version_sh
View File

@ -1,11 +1,12 @@
$OpenBSD: patch-scripts_version_sh,v 1.1 2009/12/23 22:41:36 benoit Exp $
--- scripts/version.sh.orig Sun Sep 20 12:06:00 2009
+++ scripts/version.sh Mon Dec 21 13:59:18 2009
@@ -9,6 +9,6 @@
test "$svn_rev" != "exported" && echo "r$svn_rev"
}
-version="$(svn_version || date -u +"%Y-%m-%d")"
+version=${V}
test -n "$version" && echo "$version" || echo "unknown"
$OpenBSD: patch-scripts_version_sh,v 1.2 2015/11/16 10:26:23 benoit Exp $
--- scripts/version.sh.orig Wed May 21 15:21:43 2014
+++ scripts/version.sh Fri Sep 5 14:46:26 2014
@@ -29,6 +29,8 @@
VERSION="$(git_version || date -u +"%Y-%m-%d" || echo "$VERSION-dev")"
fi
+VERSION=${V}
+
if [ "$VERSION" != "$(cat "$CACHE_FILE" 2> /dev/null)" ]; then
sed 's,0\.0\.0,'"$VERSION"',' < "$TEMPLATE_FILE" > "$HEADER_FILE"
echo "$VERSION" > "$CACHE_FILE" 2> /dev/null

15
games/neverball/patches/patch-share_base_image_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-share_base_image_c,v 1.1 2013/06/09 14:49:22 naddy Exp $
Fix build with png-1.6.
--- share/base_image.c.orig Sun Sep 20 12:06:00 2009
+++ share/base_image.c Sun Jun 9 16:46:44 2013
@@ -94,7 +94,7 @@ static void *image_load_png(const char *filename, int
default: longjmp(png_jmpbuf(readp), -1);
}
- if (!(bytep = png_malloc(readp, h * png_sizeof(png_bytep))))
+ if (!(bytep = png_malloc(readp, h * sizeof(png_bytep))))
longjmp(png_jmpbuf(readp), -1);
/* Allocate the final pixel buffer and read pixels there. */

1115
games/neverball/pkg/PLIST-data
View File

File diff suppressed because it is too large Load Diff

23
games/neverball/pkg/PLIST-main
View File

@ -1,17 +1,30 @@
@comment $OpenBSD: PLIST-main,v 1.2 2009/12/23 22:41:39 benoit Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2015/11/16 10:26:23 benoit Exp $
@bin bin/neverball
@bin bin/neverputt
share/doc/neverball/
share/doc/neverball/AUTHORS
share/doc/neverball/COPYING
share/doc/neverball/MANUAL
share/doc/neverball/README
share/doc/neverball/LICENSE.md
share/doc/neverball/README.md
share/doc/neverball/authors.txt
share/doc/neverball/manual.txt
share/locale/ca/LC_MESSAGES/neverball.mo
share/locale/de/LC_MESSAGES/neverball.mo
share/locale/el/LC_MESSAGES/neverball.mo
share/locale/eo/LC_MESSAGES/neverball.mo
share/locale/es/LC_MESSAGES/neverball.mo
share/locale/fi/LC_MESSAGES/neverball.mo
share/locale/fr/LC_MESSAGES/neverball.mo
share/locale/gd/
share/locale/gd/LC_MESSAGES/
share/locale/gd/LC_MESSAGES/neverball.mo
share/locale/gl/LC_MESSAGES/neverball.mo
share/locale/hu/LC_MESSAGES/neverball.mo
share/locale/it/LC_MESSAGES/neverball.mo
share/locale/ko/LC_MESSAGES/neverball.mo
share/locale/lv/LC_MESSAGES/neverball.mo
share/locale/nn/LC_MESSAGES/neverball.mo
share/locale/pl/LC_MESSAGES/neverball.mo
share/locale/pt_BR/LC_MESSAGES/neverball.mo
share/locale/ru/LC_MESSAGES/neverball.mo
share/locale/sv/LC_MESSAGES/neverball.mo
share/locale/zh_CN/LC_MESSAGES/neverball.mo
share/locale/zh_TW/LC_MESSAGES/neverball.mo