From 6d826eb5e070507a1e4afd7d879c15b95d5d8509 Mon Sep 17 00:00:00 2001 From: lebel Date: Wed, 8 Aug 2001 23:36:28 +0000 Subject: [PATCH] update games/angband to 2.9.3; from maintainer, Carsten Ilchmann --- games/angband/Makefile | 50 +++---- games/angband/files/md5 | 6 +- games/angband/patches/patch-src_cmd4.c | 59 --------- games/angband/patches/patch-src_util.c | 18 --- games/angband/pkg/DESCR | 6 +- games/angband/pkg/PLIST | 175 +++++++++++++------------ 6 files changed, 115 insertions(+), 199 deletions(-) delete mode 100644 games/angband/patches/patch-src_cmd4.c delete mode 100644 games/angband/patches/patch-src_util.c diff --git a/games/angband/Makefile b/games/angband/Makefile index f48bf58fb0f..839cd7a9139 100644 --- a/games/angband/Makefile +++ b/games/angband/Makefile @@ -1,47 +1,35 @@ -# $OpenBSD: Makefile,v 1.7 2001/05/06 05:15:12 lebel Exp $ -# Original from: Ben Harrison, Robert Ruehlmann +# $OpenBSD: Makefile,v 1.8 2001/08/08 23:36:28 lebel Exp $ +# Original from: Robert Ruehlmann -COMMENT= "rogue-like game with X11 support" -COMMENT-no_x11= "rogue-like game" +COMMENT= "rogue-like game with X11 support" +COMMENT-no_x11= "rogue-like game" -DISTNAME= angband-291-src -PKGNAME= angband-2.9.1 -CATEGORIES= games -MASTER_SITES= ftp://export.andrew.cmu.edu/angband/Source/ \ - ftp://ftp.sunet.se/pub/games/Angband/Source/ -EXTRACT_SUFX= .tgz -NEED_VERSION= 1.402 +DISTNAME= angband-2.9.3 +CATEGORIES= games +NEED_VERSION= 1.433 -HOMEPAGE= http://thangorodrim.angband.org/ +HOMEPAGE= http://thangorodrim.angband.org/ -MAINTAINER= Carsten Ilchmann +MAINTAINER= Carsten Ilchmann PERMIT_PACKAGE_CDROM= No PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= No +PERMIT_DISTFILES_CDROM= No PERMIT_DISTFILES_FTP= Yes -CFLAGS+= -Wall -DDEFAULT_PATH=\"${PREFIX}/share/angband/\" -DUSE_GCU -LIBS= -lcurses -ltermcap +MASTER_SITES= ftp://clockwork.dementia.org/angband/Source/ \ + ftp://ftp.sunet.se/pub/games/Angband/Source/ -MAKE_FLAGS= CC="${CC}" CFLAGS='${CFLAGS}' LIBS="${LIBS}" -MAKE_FILE= Makefile.std +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS+= --with-setgid=games -FLAVORS= no_x11 +FLAVORS= no_x11 FLAVOR?= -.if !${FLAVOR:L:Mno_x11} -CFLAGS+= -DUSE_XAW -I$(X11BASE)/include -LIBS+= -L${X11BASE}/lib -lXaw -lXmu -lXt -lX11 +.if ${FLAVOR:L:Mno_x11} +CONFIGURE_ARGS+= --without-x +.else +CONFIGURE_ARGS+= --with-x .endif -WRKDIST= ${WRKDIR}/angband-291 -WRKSRC= ${WRKDIST}/src - -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 - ${INSTALL} -o ${BINOWN} -g games -m 2555 ${WRKSRC}/angband ${PREFIX}/bin - .include diff --git a/games/angband/files/md5 b/games/angband/files/md5 index 5cbb05811dd..11ee716d0bb 100644 --- a/games/angband/files/md5 +++ b/games/angband/files/md5 @@ -1,3 +1,3 @@ -MD5 (angband-291-src.tgz) = e2f154f6f4c401bfb4371dd6f18137f4 -RMD160 (angband-291-src.tgz) = 236b990d4b57c7faad642afc83f8834d19018654 -SHA1 (angband-291-src.tgz) = 764e2ee9051d83c6355bc6c51f93d1a48e95b02a +MD5 (angband-2.9.3.tar.gz) = 0d52080bce9f248b73cf2af5dfbb1675 +RMD160 (angband-2.9.3.tar.gz) = a933a6b70b436080e7eab68ebcc8f7b74e158e7f +SHA1 (angband-2.9.3.tar.gz) = 36c97211a3462028978acc3a600efed93fdfa3bc diff --git a/games/angband/patches/patch-src_cmd4.c b/games/angband/patches/patch-src_cmd4.c deleted file mode 100644 index f83a72477a5..00000000000 --- a/games/angband/patches/patch-src_cmd4.c +++ /dev/null @@ -1,59 +0,0 @@ ---- src/cmd4.c.orig Thu Aug 3 14:01:43 2000 -+++ src/cmd4.c Thu Aug 3 14:08:23 2000 -@@ -2637,12 +2637,15 @@ static void do_cmd_knowledge_artifacts(v - - bool *okay; - -+ int fd; - - /* Temporary file */ -- if (path_temp(file_name, 1024)) return; -+ strcpy(file_name, "/tmp/ang.XXXXXXXXXX"); -+ fd = mkstemp(file_name); -+ if (fd < 0) fff = NULL; -+ else fff = fdopen(fd, "w"); - -- /* Open a new file */ -- fff = my_fopen(file_name, "w"); -+/* fff = my_fopen(file_name, "w"); */ - - /* Allocate the "okay" array */ - C_MAKE(okay, z_info->a_max, bool); -@@ -2777,12 +2780,15 @@ static void do_cmd_knowledge_uniques(voi - u16b why = 2; - u16b *who; - -+ int fd; - - /* Temporary file */ -- if (path_temp(file_name, 1024)) return; -+ strcpy(file_name, "/tmp/ang.XXXXXXXXXX"); -+ fd = mkstemp(file_name); -+ if (fd < 0) fff = NULL; -+ else fff = fdopen(fd, "w"); - -- /* Open a new file */ -- fff = my_fopen(file_name, "w"); -+/* fff = my_fopen(file_name, "w"); */ - - /* Allocate the "who" array */ - C_MAKE(who, z_info->r_max, u16b); -@@ -2850,12 +2856,15 @@ static void do_cmd_knowledge_objects(voi - - char file_name[1024]; - -+ int fd; - - /* Temporary file */ -- if (path_temp(file_name, 1024)) return; -+ strcpy(file_name, "/tmp/ang.XXXXXXXXXX"); -+ fd = mkstemp(file_name); -+ if (fd < 0) fff = NULL; -+ else fff = fdopen(fd, "w"); - -- /* Open a new file */ -- fff = my_fopen(file_name, "w"); -+/* fff = my_fopen(file_name, "w"); */ - - /* Scan the object kinds */ - for (k = 1; k < z_info->k_max; k++) diff --git a/games/angband/patches/patch-src_util.c b/games/angband/patches/patch-src_util.c deleted file mode 100644 index 6dc39af2fb5..00000000000 --- a/games/angband/patches/patch-src_util.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/util.c.orig Thu Aug 3 14:08:40 2000 -+++ src/util.c Thu Aug 3 14:09:31 2000 -@@ -274,6 +274,7 @@ errr path_parse(char *buf, int max, cptr - #endif /* SET_UID */ - - -+#if 0 - /* - * Hack -- acquire a "temporary" file name if possible - * -@@ -295,6 +296,7 @@ errr path_temp(char *buf, int max) - /* Success */ - return (0); - } -+#endif - - - /* diff --git a/games/angband/pkg/DESCR b/games/angband/pkg/DESCR index ac87cac95b5..23f198f8581 100644 --- a/games/angband/pkg/DESCR +++ b/games/angband/pkg/DESCR @@ -1,6 +1,10 @@ Angband is a "graphical" dungeon adventure game in the vein of "rogue", "hack", "nethack", and "moria". -There are some ascii "on line help" files in ${PREFIX}/share/angband/help +There are some ascii "on line help" files in +${PREFIX}/share/games/angband/lib/help + +Flavors: + no_x11 - build without X11 support WWW: ${HOMEPAGE} diff --git a/games/angband/pkg/PLIST b/games/angband/pkg/PLIST index 03d4d97dc3b..e97baffc5ca 100644 --- a/games/angband/pkg/PLIST +++ b/games/angband/pkg/PLIST @@ -1,88 +1,89 @@ -@comment $OpenBSD: PLIST,v 1.2 2000/08/06 21:41:51 matt Exp $ +@comment $OpenBSD: PLIST,v 1.3 2001/08/08 23:36:28 lebel Exp $ bin/angband -share/angband/apex/delete.me -share/angband/bone/delete.me -share/angband/data/delete.me -share/angband/edit/a_info.txt -share/angband/edit/b_info.txt -share/angband/edit/e_info.txt -share/angband/edit/f_info.txt -share/angband/edit/g_info.txt -share/angband/edit/h_info.txt -share/angband/edit/k_info.txt -share/angband/edit/p_info.txt -share/angband/edit/r_info.txt -share/angband/edit/v_info.txt -share/angband/edit/z_info.txt -share/angband/file/dead.txt -share/angband/file/news.txt -share/angband/help/attack.txt -share/angband/help/birth.txt -share/angband/help/command.txt -share/angband/help/dungeon.txt -share/angband/help/general.txt -share/angband/help/help.hlp -share/angband/help/option.txt -share/angband/help/playing.txt -share/angband/help/version.txt -share/angband/info/delete.me -share/angband/pref/delete.me -share/angband/save/delete.me -share/angband/user/font-ami.prf -share/angband/user/font-dos.prf -share/angband/user/font-ibm.prf -share/angband/user/font-mac.prf -share/angband/user/font-win.prf -share/angband/user/font-x11.prf -share/angband/user/font-xxx.prf -share/angband/user/font.prf -share/angband/user/graf-ami.prf -share/angband/user/graf-gcu.prf -share/angband/user/graf-ibm.prf -share/angband/user/graf-lsl.prf -share/angband/user/graf-mac.prf -share/angband/user/graf-new.prf -share/angband/user/graf-win.prf -share/angband/user/graf-x11.prf -share/angband/user/graf-xxx.prf -share/angband/user/graf.prf -share/angband/user/message.prf -share/angband/user/pref-acn.prf -share/angband/user/pref-ami.prf -share/angband/user/pref-emx.prf -share/angband/user/pref-gcu.prf -share/angband/user/pref-mac.prf -share/angband/user/pref-win.prf -share/angband/user/pref-x11.prf -share/angband/user/pref.prf -share/angband/user/user-mac.prf -share/angband/user/user.prf -share/angband/user/xtra-new.prf -share/angband/user/xtra-xxx.prf -share/angband/xtra/font/delete.me -share/angband/xtra/graf/readme.txt -share/angband/xtra/music/delete.me -share/angband/xtra/sound/sound.cfg -@exec chmod 0775 %D/share/angband/apex -@exec chmod 0775 %D/share/angband/data -@exec chmod 0775 %D/share/angband/save -@exec chmod 0775 %D/share/angband/user -@unexec rm -f %D/share/angband/apex/* -@unexec rm -f %D/share/angband/data/* -@unexec rm -f %D/share/angband/save/* -@dirrm share/angband/xtra/sound -@dirrm share/angband/xtra/music -@dirrm share/angband/xtra/graf -@dirrm share/angband/xtra/font -@dirrm share/angband/xtra -@dirrm share/angband/user -@dirrm share/angband/save -@dirrm share/angband/pref -@dirrm share/angband/info -@dirrm share/angband/help -@dirrm share/angband/file -@dirrm share/angband/edit -@dirrm share/angband/data -@dirrm share/angband/bone -@dirrm share/angband/apex -@dirrm share/angband +share/games/angband/lib/edit/artifact.txt +share/games/angband/lib/edit/cost_adj.txt +share/games/angband/lib/edit/ego_item.txt +share/games/angband/lib/edit/limits.txt +share/games/angband/lib/edit/monster.txt +share/games/angband/lib/edit/object.txt +share/games/angband/lib/edit/p_class.txt +share/games/angband/lib/edit/p_hist.txt +share/games/angband/lib/edit/p_race.txt +share/games/angband/lib/edit/shop_own.txt +share/games/angband/lib/edit/terrain.txt +share/games/angband/lib/edit/vault.txt +share/games/angband/lib/file/dead.txt +share/games/angband/lib/file/news.txt +share/games/angband/lib/help/attack.txt +share/games/angband/lib/help/birth.txt +share/games/angband/lib/help/command.txt +share/games/angband/lib/help/dungeon.txt +share/games/angband/lib/help/general.txt +share/games/angband/lib/help/help.hlp +share/games/angband/lib/help/option.txt +share/games/angband/lib/help/playing.txt +share/games/angband/lib/help/version.txt +share/games/angband/lib/pref/font-ami.prf +share/games/angband/lib/pref/font-dos.prf +share/games/angband/lib/pref/font-ibm.prf +share/games/angband/lib/pref/font-mac.prf +share/games/angband/lib/pref/font-win.prf +share/games/angband/lib/pref/font-x11.prf +share/games/angband/lib/pref/font-xxx.prf +share/games/angband/lib/pref/font.prf +share/games/angband/lib/pref/graf-ami.prf +share/games/angband/lib/pref/graf-gcu.prf +share/games/angband/lib/pref/graf-ibm.prf +share/games/angband/lib/pref/graf-lsl.prf +share/games/angband/lib/pref/graf-mac.prf +share/games/angband/lib/pref/graf-new.prf +share/games/angband/lib/pref/graf-win.prf +share/games/angband/lib/pref/graf-x11.prf +share/games/angband/lib/pref/graf-xxx.prf +share/games/angband/lib/pref/graf.prf +share/games/angband/lib/pref/message.prf +share/games/angband/lib/pref/pref-acn.prf +share/games/angband/lib/pref/pref-ami.prf +share/games/angband/lib/pref/pref-emx.prf +share/games/angband/lib/pref/pref-gcu.prf +share/games/angband/lib/pref/pref-mac.prf +share/games/angband/lib/pref/pref-win.prf +share/games/angband/lib/pref/pref-x11.prf +share/games/angband/lib/pref/pref.prf +share/games/angband/lib/pref/user-mac.prf +share/games/angband/lib/pref/user.prf +share/games/angband/lib/pref/xtra-new.prf +share/games/angband/lib/pref/xtra-xxx.prf +@exec mkdir -p %D/share/games/angband/lib/apex +@exec mkdir -p %D/share/games/angband/lib/bone +@exec mkdir -p %D/share/games/angband/lib/data +@exec mkdir -p %D/share/games/angband/lib/save +@exec mkdir -p %D/share/games/angband/lib/user +@exec mkdir -p %D/share/games/angband/lib/info +@exec mkdir -p %D/share/games/angband/lib/xtra +@exec chmod 0775 %D/share/games/angband/lib/apex +@exec chmod 0775 %D/share/games/angband/lib/bone +@exec chmod 0775 %D/share/games/angband/lib/data +@exec chmod 0775 %D/share/games/angband/lib/save +@exec chmod 0775 %D/share/games/angband/lib/user +@exec chgrp games %D/share/games/angband/lib/apex +@exec chgrp games %D/share/games/angband/lib/bone +@exec chgrp games %D/share/games/angband/lib/data +@exec chgrp games %D/share/games/angband/lib/save +@exec chgrp games %D/share/games/angband/lib/user +@unexec rm -f %D/share/games/angband/lib/apex/* +@unexec rm -f %D/share/games/angband/lib/save/* +@unexec rm -f %D/share/games/angband/lib/data/* +@dirrm share/games/angband/lib/xtra +@dirrm share/games/angband/lib/user +@dirrm share/games/angband/lib/save +@dirrm share/games/angband/lib/pref +@dirrm share/games/angband/lib/info +@dirrm share/games/angband/lib/help +@dirrm share/games/angband/lib/file +@dirrm share/games/angband/lib/edit +@dirrm share/games/angband/lib/data +@dirrm share/games/angband/lib/bone +@dirrm share/games/angband/lib/apex +@dirrm share/games/angband/lib +@dirrm share/games/angband