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

update to 3.3.0, take maintainership

Browse Source 
OK dcoppa@
This commit is contained in:
edd 2011-09-13 10:28:38 +00:00
parent ed1516a867
commit 934d4b7a0d
10 changed files with 234 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
games/angband/Makefile
View File

@ -1,49 +1,48 @@
# $OpenBSD: Makefile,v 1.21 2011/05/11 06:56:42 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.22 2011/09/13 10:28:38 edd Exp $
# Original from: Robert Ruehlmann
COMMENT= rogue-like game with X11 support
COMMENT-no_x11= rogue-like game
DISTNAME= angband-3.0.6
REVISION = 2
V = 3.3.0
V_DLDIR = ${V:C/\.[0-9]$//}
DISTNAME= angband-v${V}
PKGNAME= angband-${V}
CATEGORIES= games
HOMEPAGE= http://www.thangorodrim.net/angband.html
HOMEPAGE= http://rephial.org
MAINTAINER= Niall O Higgins <niallo@openbsd.org>
MAINTAINER = Edd Barrett <edd@openbsd.org>
# Multi license, including GPLv2, angband license, CC, freeware...
# The angband license contains the line "other copyrights may also apply"
PERMIT_PACKAGE_CDROM= unclear license
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= unclear license
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c ncurses
MASTER_SITES= ftp://ftp.thangorodrim.net/pub/angband/Source/ \
ftp://clockwork.dementia.org/angband/Source/ \
ftp://ftp.sunet.se/pub/games/Angband/Source/
WANTLIB= c m ncurses
MASTER_SITES = ${HOMEPAGE}/downloads/${V_DLDIR}/
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-setgid=games
CONFIGURE_ENV= TRUEPREFIX="${TRUEPREFIX}"
CONFIGURE_ARGS+= --with-setgid=games \
--with-varpath=/var/games/angband/ \
--with-configpath=${PREFIX}/share/angband \
--bindir=${PREFIX}/bin \
--disable-sdl-mixer # defaults to ON
FLAVORS= no_x11
CONFIGURE_ENV= TRUEPREFIX="${TRUEPREFIX}"
USE_GMAKE = Yes
FLAVORS= no_x11 # eventually add SDL
FLAVOR?=
.if ${FLAVOR:L:Mno_x11}
CONFIGURE_ARGS+= --without-x
.else
CONFIGURE_ARGS+= --with-x
WANTLIB+= ICE SM X11 Xaw Xext Xmu Xt pthread-stubs xcb
WANTLIB+= ICE SM X11
.endif
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/angband
(cd ${WRKDIST}/lib && tar -cf - * ) | \
(cd ${PREFIX}/share/angband && tar -xf - )
@chown -R ${SHAREOWN}:games ${PREFIX}/share/angband
@find ${PREFIX} \( -name Makefile\* -o -name delete.me \) \
-exec rm "{}" \;
${INSTALL} -s -o ${BINOWN} -g games -m 2555 ${WRKSRC}/src/angband \
${PREFIX}/bin
.include <bsd.port.mk>

10
games/angband/distinfo
View File

@ -1,5 +1,5 @@
MD5 (angband-3.0.6.tar.gz) = TDGxs2ed/yDbal/LGCw+lg==
RMD160 (angband-3.0.6.tar.gz) = FvL5B+1QG7scZF1UpnegVoQla4o=
SHA1 (angband-3.0.6.tar.gz) = U/YWcPMeMOp0kZM/Qr6s3R/WIBw=
SHA256 (angband-3.0.6.tar.gz) = nV8tN84SbHdIQOP9hsHqF0/moaSk81wUKcsKFIAHNlE=
SIZE (angband-3.0.6.tar.gz) = 1570831
MD5 (angband-v3.3.0.tar.gz) = vXZ2r56+5pOPHlTqzCNNjA==
RMD160 (angband-v3.3.0.tar.gz) = hLkTnjyPbz6N6QrhXArIS+OYWkQ=
SHA1 (angband-v3.3.0.tar.gz) = Qg3WIEKaa7BMBkBxaUG1J4jDjGY=
SHA256 (angband-v3.3.0.tar.gz) = c5KYs9oD68gWOQaZUcwMUTDWHpQqh9zDGjOI3qBIg/c=
SIZE (angband-v3.3.0.tar.gz) = 3618027

16
games/angband/patches/patch-configure
View File

@ -1,16 +0,0 @@
--- configure 2005/02/24 20:36:35 1.1
+++ configure 2005/02/24 20:37:56
@@ -1764,11 +1764,10 @@
cat >>confdefs.h <<_ACEOF
-#define DEFAULT_PATH "$game_datadir"
+#define DEFAULT_PATH "$TRUEPREFIX/share/angband"
_ACEOF
-DEFAULT_PATH="$game_datadir"
-
+#define DEFAULT_PATH "$TRUEPREFIX/share/angband"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'

54
games/angband/patches/patch-mk_buildsys_mk Normal file
View File

@ -0,0 +1,54 @@
$OpenBSD: patch-mk_buildsys_mk,v 1.1 2011/09/13 10:28:39 edd Exp $
Show what the compiler is doing.
--- mk/buildsys.mk.orig Fri Sep 9 11:49:10 2011
+++ mk/buildsys.mk Fri Sep 9 12:02:24 2011
@@ -66,6 +66,7 @@ pre-depend:
${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS}
${LINK_STATUS}
+ @echo "${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}"
if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}; then \
${LINK_OK}; \
else \
@@ -74,6 +75,7 @@ ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS}
${LIB} ${LIB_NOINST}: ${EXT_DEPS} ${OBJS}
${LINK_STATUS}
+ @echo "${LD} -o $@ ${OBJS} ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}"
if ${LD} -o $@ ${OBJS} ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
${LINK_OK}; \
else \
@@ -82,6 +84,7 @@ ${LIB} ${LIB_NOINST}: ${EXT_DEPS} ${OBJS}
${PLUGIN} ${PLUGIN_NONST}: ${EXT_DEPS} ${OBJS}
${LINK_STATUS}
+ @echo "${LD} -o $@ ${OBJS} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}"
if ${LD} -o $@ ${OBJS} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
${LINK_OK}; \
else \
@@ -90,6 +93,7 @@ ${PLUGIN} ${PLUGIN_NONST}: ${EXT_DEPS} ${OBJS}
${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS}
${LINK_STATUS}
+ @echo "${AR} cr $@ ${OBJS}"
if ${AR} cr $@ ${OBJS}; then \
${LINK_OK}; \
else \
@@ -98,6 +102,7 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS
.c.o:
${COMPILE_STATUS}
+ @echo "${CC} ${CFLAGS} ${CPPFLAGS} ${INCLUDE} -c -o $@ $<"
if ${CC} ${CFLAGS} ${CPPFLAGS} ${INCLUDE} -c -o $@ $<; then \
${COMPILE_OK}; \
else \
@@ -106,6 +111,7 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS
.cc.o .cxx.o:
${COMPILE_STATUS}
+ @echo "${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<"
if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
${COMPILE_OK}; \
else \

15
games/angband/patches/patch-src_Makefile Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_Makefile,v 1.1 2011/09/13 10:28:39 edd Exp $
Remove -O0
--- src/Makefile.orig Fri Sep 9 12:04:59 2011
+++ src/Makefile Fri Sep 9 12:05:02 2011
@@ -9,7 +9,7 @@ SRCS = ${OBJECTS:.o=.c} ${MAINFILES:.o=.c}
SUBDIRS = gtk monster object player
PROG = angband
VERSION := $(shell ../scripts/version.sh)
-CFLAGS += -DBUILD_ID=${VERSION} -I. -std=c99 -Wdeclaration-after-statement -O0
+CFLAGS += -DBUILD_ID=${VERSION} -I. -std=c99 -Wdeclaration-after-statement
# gcov intermediate data
GCOBJS = $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda)

21
games/angband/patches/patch-src_config_h Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_config_h,v 1.1 2011/09/13 10:28:39 edd Exp $
This was preventing shared saved games/scores from working.
Build system bug?
--- src/config.h.orig Sun Sep 11 19:51:10 2011
+++ src/config.h Sun Sep 11 19:54:41 2011
@@ -52,11 +52,13 @@
* OPTION: Create and use a hidden directory in the users home directory
* for storing pref files and character dumps.
*/
+#if 0
#ifdef SET_UID
# ifndef PRIVATE_USER_PATH
# define PRIVATE_USER_PATH "~/.angband"
# endif /* PRIVATE_USER_PATH */
#endif /* SET_UID */
+#endif
/*

27
games/angband/patches/patch-src_init2_c
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-src_init2_c,v 1.3 2005/11/03 17:01:05 niallo Exp $
--- src/init2.c.orig Sun Jan 16 14:35:57 2005
+++ src/init2.c Thu Nov 3 14:11:16 2005
@@ -200,19 +200,19 @@ void init_file_paths(char *path)
/* Build a path name */
strcpy(tail, "apex");
- ANGBAND_DIR_APEX = string_make(path);
+ ANGBAND_DIR_APEX = string_make("/var/games/angband/apex");
/* Build a path name */
strcpy(tail, "bone");
- ANGBAND_DIR_BONE = string_make(path);
+ ANGBAND_DIR_BONE = string_make("/var/games/angband/bone");
/* Build a path name */
strcpy(tail, "data");
- ANGBAND_DIR_DATA = string_make(path);
+ ANGBAND_DIR_DATA = string_make("/var/games/angband/data");
/* Build a path name */
strcpy(tail, "save");
- ANGBAND_DIR_SAVE = string_make(path);
+ ANGBAND_DIR_SAVE = string_make("/var/games/angband/save");
#endif /* USE_PRIVATE_PATHS */

23
games/angband/patches/patch-src_signals_c Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-src_signals_c,v 1.1 2011/09/13 10:28:39 edd Exp $
Turn off signal handlers so that angband may be debugged
--- src/signals.c.orig Sun Sep 11 22:18:29 2011
+++ src/signals.c Sun Sep 11 22:20:28 2011
@@ -300,12 +300,16 @@ void signals_init(void)
(void)(*signal_aux)(SIGIOT, handle_signal_abort);
#endif
+#if 0
#ifdef SIGBUS
(void)(*signal_aux)(SIGBUS, handle_signal_abort);
#endif
+#endif
+#if 0
#ifdef SIGSEGV
(void)(*signal_aux)(SIGSEGV, handle_signal_abort);
+#endif
#endif
#ifdef SIGTERM

16
games/angband/patches/patch-src_spells1_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_spells1_c,v 1.1 2011/09/13 10:28:39 edd Exp $
Fixes the scroll of light bug #1533
--- src/spells1.c.orig Mon Sep 12 20:47:46 2011
+++ src/spells1.c Mon Sep 12 20:56:10 2011
@@ -2818,6 +2818,9 @@ static bool project_m(int who, int r, int y, int x, in
*/
static bool project_p(int who, int r, int y, int x, int dam, int typ, bool obvious)
{
+ if (who == -1)
+ return(obvious);
+
/* Get the damage type details */
const struct gf_type *gf_ptr = &gf_table[typ];

118
games/angband/pkg/PLIST
View File

@ -1,34 +1,41 @@
@comment $OpenBSD: PLIST,v 1.11 2011/05/11 06:56:42 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.12 2011/09/13 10:28:39 edd Exp $
@extraunexec rm /var/games/angband/*/* 2>/dev/null || true
@group games
@mode g+s
bin/angband
@bin bin/angband
@mode
share/angband/
@comment share/angband/apex/
@comment share/angband/bone/
@comment share/angband/data/
share/angband/edit/
share/angband/edit/artifact.txt
share/angband/edit/cost_adj.txt
share/angband/edit/ego_item.txt
share/angband/edit/flavor.txt
share/angband/edit/hints.txt
share/angband/edit/limits.txt
share/angband/edit/monster.txt
share/angband/edit/monster_base.txt
share/angband/edit/names.txt
share/angband/edit/object.txt
share/angband/edit/object_base.txt
share/angband/edit/p_class.txt
share/angband/edit/p_hist.txt
share/angband/edit/p_race.txt
share/angband/edit/pain.txt
share/angband/edit/pit.txt
share/angband/edit/shop_own.txt
share/angband/edit/spell.txt
share/angband/edit/store.txt
share/angband/edit/terrain.txt
share/angband/edit/vault.txt
share/angband/file/
share/angband/file/crown.txt
share/angband/file/dead.txt
share/angband/file/news.txt
share/angband/help/
share/angband/help/330.txt
share/angband/help/attack.txt
share/angband/help/birth.txt
share/angband/help/command.txt
share/angband/help/debug.txt
share/angband/help/dungeon.txt
share/angband/help/general.txt
share/angband/help/help.hlp
@ -36,62 +43,93 @@ share/angband/help/option.txt
share/angband/help/playing.txt
share/angband/help/version.txt
share/angband/info/
share/angband/info/readme.txt
share/angband/pref/
share/angband/pref/flvr-dvg.prf
share/angband/pref/flvr-new.prf
share/angband/pref/flvr-nmd.prf
share/angband/pref/flvr-xxx.prf
share/angband/pref/font-ami.prf
share/angband/pref/font-dos.prf
share/angband/pref/font-ibm.prf
share/angband/pref/font-gcu.prf
share/angband/pref/font-mac.prf
share/angband/pref/font-sdl.prf
share/angband/pref/font-win.prf
share/angband/pref/font-x11.prf
share/angband/pref/font-xxx.prf
share/angband/pref/font.prf
share/angband/pref/graf-ami.prf
share/angband/pref/graf-dvg.prf
share/angband/pref/graf-gcu.prf
share/angband/pref/graf-ibm.prf
share/angband/pref/graf-lsl.prf
share/angband/pref/graf-mac.prf
share/angband/pref/graf-new.prf
share/angband/pref/graf-win.prf
share/angband/pref/graf-x11.prf
share/angband/pref/graf-nmd.prf
share/angband/pref/graf-xxx.prf
share/angband/pref/graf.prf
share/angband/pref/message.prf
share/angband/pref/pref-acn.prf
share/angband/pref/pref-ami.prf
share/angband/pref/pref-dos.prf
share/angband/pref/pref-emx.prf
share/angband/pref/pref-gcu.prf
share/angband/pref/pref-mac.prf
share/angband/pref/pref-win.prf
share/angband/pref/pref-x11.prf
share/angband/pref/pref.prf
share/angband/pref/user-mac.prf
share/angband/pref/user.prf
share/angband/pref/xtra-dvg.prf
share/angband/pref/xtra-new.prf
share/angband/pref/xtra-nmd.prf
share/angband/pref/xtra-xxx.prf
@comment share/angband/save/
share/angband/script/
share/angband/script/birth.lua
share/angband/script/event.lua
share/angband/script/init.lua
share/angband/script/object.lua
share/angband/script/player.lua
share/angband/script/spell.lua
share/angband/script/store.lua
share/angband/script/test.lua
share/angband/script/trace.lua
share/angband/user/
share/angband/xtra/
share/angband/xtra/angband.glade
share/angband/xtra/font/
share/angband/xtra/font/16x16.txt
share/angband/xtra/font/10x14x.fon
share/angband/xtra/font/10x14xb.fon
share/angband/xtra/font/10x20x.fon
share/angband/xtra/font/12x18x.fon
share/angband/xtra/font/12x24x.fon
share/angband/xtra/font/16x16x.fon
share/angband/xtra/font/16x24x.fon
share/angband/xtra/font/5x8x.fon
share/angband/xtra/font/6x10x.fon
share/angband/xtra/font/6x12x.fon
share/angband/xtra/font/6x13x.fon
share/angband/xtra/font/6x13xb.fon
share/angband/xtra/font/7x13x.fon
share/angband/xtra/font/7x13xb.fon
share/angband/xtra/font/8x12x.fon
share/angband/xtra/font/8x12xb.fon
share/angband/xtra/font/8x13x.fon
share/angband/xtra/font/8x16x.fon
share/angband/xtra/font/8x8x.fon
share/angband/xtra/font/8x8xb.fon
share/angband/xtra/font/9x15x.fon
share/angband/xtra/font/9x15xb.fon
@comment --- Sound/gfx will be enabled later, needs sdl
@comment --- These would go in a PFRAG.sdl
@comment share/angband/xtra/graf/
@comment share/angband/xtra/graf/16x16.png
@comment share/angband/xtra/graf/32x32.png
@comment share/angband/xtra/graf/8x16.png
@comment share/angband/xtra/graf/8x8.png
@comment share/angband/xtra/icon/
@comment share/angband/xtra/icon/att-128.png
@comment share/angband/xtra/icon/att-16.png
@comment share/angband/xtra/icon/att-256.png
@comment share/angband/xtra/icon/att-32.png
@comment share/angband/xtra/icon/att-512.png
@comment share/angband/xtra/sound/
@comment share/angband/xtra/sound/breath.wav
@comment share/angband/xtra/sound/clunk.wav
@comment share/angband/xtra/sound/death.wav
@comment share/angband/xtra/sound/destroy.wav
@comment share/angband/xtra/sound/drop.wav
@comment share/angband/xtra/sound/eat.wav
@comment share/angband/xtra/sound/flee.wav
@comment share/angband/xtra/sound/hallu.wav
@comment share/angband/xtra/sound/hit.wav
@comment share/angband/xtra/sound/hit1.wav
@comment share/angband/xtra/sound/kill.wav
@comment share/angband/xtra/sound/kill1.wav
@comment share/angband/xtra/sound/level.wav
@comment share/angband/xtra/sound/miss.wav
@comment share/angband/xtra/sound/miss1.wav
@comment share/angband/xtra/sound/money.wav
@comment share/angband/xtra/sound/opendoor.wav
@comment share/angband/xtra/sound/shutdoor.wav
@comment share/angband/xtra/sound/sound.cfg
@comment share/angband/xtra/sound/thump.wav
@comment share/angband/xtra/sound/vomit.wav
@mode 775
@sample /var/games/angband/
@sample /var/games/angband/apex/
@sample /var/games/angband/save/
@sample /var/games/angband/data/
@sample /var/games/angband/bone/
@sample /var/games/angband/user/