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

update to angband-3.3.1 and enable SDL flavor

Browse Source 
OK rpointel@
This commit is contained in:
edd 2011-10-03 10:59:33 +00:00
parent 7de7da5c7e
commit af009786d8
8 changed files with 121 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
games/angband/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.23 2011/09/15 12:30:30 edd Exp $
# $OpenBSD: Makefile,v 1.24 2011/10/03 10:59:33 edd Exp $
# Original from: Robert Ruehlmann
COMMENT= rogue-like game with X11 support
COMMENT-no_x11= rogue-like game
V = 3.3.0
V = 3.3.1
V_DLDIR = ${V:C/\.[0-9]$//}
REVISION = 0
DISTNAME= angband-v${V}
PKGNAME= angband-${V}
CATEGORIES= games
@ -25,18 +24,18 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m ncurses
MASTER_SITES = ${HOMEPAGE}/downloads/${V_DLDIR}/
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-setgid=games \
CONFIGURE_ENV += "LDFLAGS=-L${LOCALBASE}/lib"
CONFIGURE_ARGS += --with-setgid=games \
--with-varpath=/var/games/angband \
--with-configpath=${PREFIX}/share/angband \
--bindir=${PREFIX}/bin \
--disable-sdl-mixer # defaults to ON
--bindir=${PREFIX}/bin
CONFIGURE_ENV= TRUEPREFIX="${TRUEPREFIX}"
USE_GMAKE = Yes
FLAVORS= no_x11 # eventually add SDL
FLAVORS= no_x11 sdl
FLAVOR?=
.if ${FLAVOR:L:Mno_x11}
@ -46,4 +45,19 @@ CONFIGURE_ARGS+= --with-x
WANTLIB+= ICE SM X11
.endif
.if ${FLAVOR:L:Msdl} # funky graphical mode and sounds
CONFIGURE_ARGS += --enable-sdl \
--enable-sdl-mixer
PKG_ARGS += -Dsdl=1
LIB_DEPENDS += devel/sdl-mixer \
devel/sdl-image \
devel/sdl-ttf
WANTLIB += SDL SDL_image SDL_mixer SDL_ttf pthread
.else
CONFIGURE_ARGS += --disable-sdl-mixer # defaults to ON
PKG_ARGS += -Dsdl=0
.endif
NO_REGRESS = Yes
.include <bsd.port.mk>

10
games/angband/distinfo
View File

@ -1,5 +1,5 @@
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
MD5 (angband-v3.3.1.tar.gz) = Kbz+VW1ifw9ZOwFJdFi9qw==
RMD160 (angband-v3.3.1.tar.gz) = HTS8WqZ1bPMA0ItXp6aeHCxoNq4=
SHA1 (angband-v3.3.1.tar.gz) = JbWRwp3qOxpDAjChUz6DGtEalW4=
SHA256 (angband-v3.3.1.tar.gz) = 8WyYCkDulWVIU4A6KnVtIGho/iV0MeFfi71Fj4FT0Rg=
SIZE (angband-v3.3.1.tar.gz) = 3571111

33
games/angband/patches/patch-configure Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-configure,v 1.4 2011/10/03 10:59:33 edd Exp $
Pick up SDL properly
--- configure.orig Wed Sep 21 21:11:21 2011
+++ configure Thu Sep 22 00:40:27 2011
@@ -5422,7 +5422,7 @@ $as_echo_n "checking for SDL - version >= $min_sdl_ver
no_sdl=yes
else
SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
+ SDL_LIBS="-pthread `$SDL_CONFIG $sdlconf_args --libs`"
sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
@@ -5586,7 +5586,7 @@ if ${ac_cv_lib_SDL_image_IMG_LoadPNG_RW+:} false; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSDL_image $LIBS"
+LIBS="-lSDL_image ${SDL_LIBS} $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -5628,7 +5628,7 @@ if ${ac_cv_lib_SDL_ttf_TTF_Init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSDL_ttf $LIBS"
+LIBS="-lSDL_ttf ${SDL_LIBS} $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

49
games/angband/patches/patch-src_prefs_c
View File

@ -1,49 +0,0 @@
$OpenBSD: patch-src_prefs_c,v 1.1 2011/09/15 12:30:30 edd Exp $
Escalate setguid privilege as in order to wrote preferences. Applied upstream.
--- src/prefs.c.orig Sun Jul 31 23:06:56 2011
+++ src/prefs.c Wed Sep 14 18:30:15 2011
@@ -34,6 +34,9 @@ static const char *dump_separator = "#=#=#=#=#=#=#=#=#
/*
* Remove old lines from pref files
+ *
+ * If you are using setgid, make sure privileges were raised prior
+ * to calling this.
*/
static void remove_old_dump(const char *cur_fname, const char *mark)
{
@@ -339,23 +342,30 @@ bool prefs_save(const char *path, void (*dump)(ang_fil
{
ang_file *fff;
+ safe_setuid_grab();
+
/* Remove old keymaps */
remove_old_dump(path, title);
fff = file_open(path, MODE_APPEND, FTYPE_TEXT);
- if (!fff) return FALSE;
+ if (!fff) {
+ safe_setuid_drop();
+ return FALSE;
+ }
/* Append the header */
pref_header(fff, title);
file_putf(fff, "\n\n");
file_putf(fff, "# %s definitions\n\n", strstr(title, " "));
-
+
dump(fff);
file_putf(fff, "\n\n\n");
pref_footer(fff, title);
file_close(fff);
+ safe_setuid_drop();
+
return TRUE;
}

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

@ -1,23 +0,0 @@
$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
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_spells1_c,v 1.2 2011/09/15 12:30:30 edd Exp $
Fixes the scroll of light bug #1533. Applied upstream.
--- 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];

59
games/angband/pkg/PFRAG.sdl Normal file
View File

@ -0,0 +1,59 @@
@comment $OpenBSD: PFRAG.sdl,v 1.1 2011/10/03 10:59:33 edd Exp $
share/angband/xtra/
share/angband/xtra/angband.glade
share/angband/xtra/font/
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
share/angband/xtra/graf/
share/angband/xtra/graf/16x16.png
share/angband/xtra/graf/32x32.png
share/angband/xtra/graf/8x16.png
share/angband/xtra/graf/8x8.png
share/angband/xtra/icon/
share/angband/xtra/icon/att-128.png
share/angband/xtra/icon/att-16.png
share/angband/xtra/icon/att-256.png
share/angband/xtra/icon/att-32.png
share/angband/xtra/icon/att-512.png
share/angband/xtra/sound/
share/angband/xtra/sound/breath.wav
share/angband/xtra/sound/clunk.wav
share/angband/xtra/sound/death.wav
share/angband/xtra/sound/destroy.wav
share/angband/xtra/sound/drop.wav
share/angband/xtra/sound/eat.wav
share/angband/xtra/sound/flee.wav
share/angband/xtra/sound/hallu.wav
share/angband/xtra/sound/hit.wav
share/angband/xtra/sound/hit1.wav
share/angband/xtra/sound/kill.wav
share/angband/xtra/sound/kill1.wav
share/angband/xtra/sound/level.wav
share/angband/xtra/sound/miss.wav
share/angband/xtra/sound/miss1.wav
share/angband/xtra/sound/money.wav
share/angband/xtra/sound/opendoor.wav
share/angband/xtra/sound/shutdoor.wav
share/angband/xtra/sound/sound.cfg
share/angband/xtra/sound/thump.wav
share/angband/xtra/sound/vomit.wav

63
games/angband/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.12 2011/09/13 10:28:39 edd Exp $
@comment $OpenBSD: PLIST,v 1.13 2011/10/03 10:59:33 edd Exp $
%%sdl%%
@extraunexec rm /var/games/angband/*/* 2>/dev/null || true
@group games
@mode g+s
@ -68,66 +69,6 @@ share/angband/pref/xtra-dvg.prf
share/angband/pref/xtra-new.prf
share/angband/pref/xtra-nmd.prf
share/angband/pref/xtra-xxx.prf
share/angband/xtra/
share/angband/xtra/angband.glade
share/angband/xtra/font/
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/