From e5b27e620a6ece857228038d144a44f0e091a7eb Mon Sep 17 00:00:00 2001 From: matt Date: Sun, 6 Aug 2000 21:41:50 +0000 Subject: [PATCH] update to 2.9.1 (from maintainer) --- games/angband/Makefile | 33 ++++++++++++-------------- games/angband/files/md5 | 9 +++----- games/angband/patches/patch-aa | 42 +++++++++++++++++----------------- games/angband/patches/patch-ab | 5 ++-- games/angband/pkg/DESCR | 5 ++-- games/angband/pkg/PLIST | 39 +++++++++++++++++++++++-------- 6 files changed, 73 insertions(+), 60 deletions(-) diff --git a/games/angband/Makefile b/games/angband/Makefile index 558d5892ded..cbe0d856508 100644 --- a/games/angband/Makefile +++ b/games/angband/Makefile @@ -1,35 +1,33 @@ -# $OpenBSD: Makefile,v 1.2 2000/04/19 00:17:18 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2000/08/06 21:41:50 matt Exp $ +# Original from: Ben Harrison, Robert Ruehlmann -DISTNAME= angband-283 -PKGNAME= angband-2.8.3 +DISTNAME= angband-291-src +PKGNAME= angband-2.9.1 CATEGORIES= games +HOMEPAGE= http://thangorodrim.angband.org/ + MAINTAINER= ci2@gmx.net +PERMIT_PACKAGE_CDROM= No +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= No +PERMIT_DISTFILES_FTP= Yes + MASTER_SITES= ftp://export.andrew.cmu.edu/angband/Source/ \ ftp://ftp.sunet.se/pub/games/Angband/Source/ -DISTFILES= ${DISTNAME}.tar.gz ext-x11-283.tar.gz +EXTRACT_SUFX= .tgz + MAKE_FILE= Makefile.std - -# basic no fee license -PERMIT_PACKAGE_FTP= Yes -PERMIT_PACKAGE_CDROM= No -PERMIT_DISTFILES_FTP= Yes -PERMIT_DISTFILES_CDROM= No - MAKE_FLAGS= CC='${CC}' CFLAGS='${CFLAGS}' LIBS="${LIBS}" -FAKE= Yes - +WRKDIST= ${WRKDIR}/angband-291 WRKSRC= ${WRKDIST}/src -HOMEPAGE= http://www.phial.com/angband/ - -ALL_TARGET= angband FLAVORS=no_x11 FLAVOR?= -CFLAGS+= -Wall -DDEFAULT_PATH=\"${PREFIX}/share/angband/\" -DUSE_GCU +CFLAGS+= -Wall -DDEFAULT_PATH=\"${PREFIX}/share/angband/\" -DUSE_GCU LIBS= -lcurses -ltermcap .if !${FLAVOR:L:Mno_x11} @@ -40,7 +38,6 @@ LIBS+= -L${X11BASE}/lib -lXaw -lXmu -lXt -lX11 do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/angband (cd ${WRKDIST}/lib && ${TAR} -cf - * ) | (cd ${PREFIX}/share/angband && tar -xf - ) - ${INSTALL_DATA} ${WRKDIR}/ext-x11-283/lib/xtra/tiles.raw ${PREFIX}/share/angband/xtra chown -R ${SHAREOWN}:games ${PREFIX}/share/angband cd ${PREFIX}/share/angband && chmod 0775 apex data save user ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} -g games -m 2555 ${WRKSRC}/angband ${PREFIX}/bin diff --git a/games/angband/files/md5 b/games/angband/files/md5 index cacf50d3aed..5cbb05811dd 100644 --- a/games/angband/files/md5 +++ b/games/angband/files/md5 @@ -1,6 +1,3 @@ -MD5 (angband-283.tar.gz) = 33c56940cf2f9c7aa265204159ab1cf8 -MD5 (ext-x11-283.tar.gz) = 05b9b5c0c06bddc24f9e5b62cc4764c7 -RMD160 (angband-283.tar.gz) = 0b910673d6bd6faa07850274ff19bfae51b03707 -RMD160 (ext-x11-283.tar.gz) = c531dd9ef78577bdee1fc1bdbd950d173f6b295c -SHA1 (angband-283.tar.gz) = 1dc4a2786c31c2336daf57f76f4fa762f7d84cf3 -SHA1 (ext-x11-283.tar.gz) = 92856cc4f84ba7ea6e40127440ebb236d1056294 +MD5 (angband-291-src.tgz) = e2f154f6f4c401bfb4371dd6f18137f4 +RMD160 (angband-291-src.tgz) = 236b990d4b57c7faad642afc83f8834d19018654 +SHA1 (angband-291-src.tgz) = 764e2ee9051d83c6355bc6c51f93d1a48e95b02a diff --git a/games/angband/patches/patch-aa b/games/angband/patches/patch-aa index 057695c8a4d..f83a72477a5 100644 --- a/games/angband/patches/patch-aa +++ b/games/angband/patches/patch-aa @@ -1,8 +1,8 @@ ---- src/cmd4.c.orig Wed Feb 11 12:30:28 1998 -+++ src/cmd4.c Sat Apr 15 19:42:04 2000 -@@ -2603,12 +2603,15 @@ static void do_cmd_knowledge_artifacts(v +--- 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[MAX_A_IDX]; + bool *okay; + int fd; @@ -10,50 +10,50 @@ - 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"); ++ 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 artifacts */ - for (k = 0; k < MAX_A_IDX; k++) -@@ -2737,12 +2740,15 @@ static void do_cmd_knowledge_uniques(voi + /* 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; - char file_name[1024]; - -+ int fd; ++ 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"); ++ 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 monster races */ - for (k = 1; k < MAX_R_IDX-1; k++) -@@ -2789,12 +2795,15 @@ static void do_cmd_knowledge_objects(voi + /* 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; ++ 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"); ++ 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 < MAX_K_IDX; k++) + for (k = 1; k < z_info->k_max; k++) diff --git a/games/angband/patches/patch-ab b/games/angband/patches/patch-ab index a1c7f0d4b42..6dc39af2fb5 100644 --- a/games/angband/patches/patch-ab +++ b/games/angband/patches/patch-ab @@ -1,6 +1,5 @@ -$OpenBSD: patch-ab,v 1.1.1.1 2000/04/16 21:03:15 espie Exp $ ---- src/util.c.orig Sat Apr 15 19:36:48 2000 -+++ src/util.c Sat Apr 15 19:42:19 2000 +--- 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 */ diff --git a/games/angband/pkg/DESCR b/games/angband/pkg/DESCR index 62b4a1f6d98..9fbad417976 100644 --- a/games/angband/pkg/DESCR +++ b/games/angband/pkg/DESCR @@ -3,7 +3,6 @@ Angband is a "graphical" dungeon adventure game in the vein of There are some ascii "on line help" files in /usr/local/share/angband/help -Use commandline option -g to request graphics mode. - -Official Angband Home Page "http://www.phial.com/angband/" +Angband Home Page http://thangorodrim.angband.org/ Newsgroup rec.games.roguelike.angband + diff --git a/games/angband/pkg/PLIST b/games/angband/pkg/PLIST index 07fdaa8c6f1..03d4d97dc3b 100644 --- a/games/angband/pkg/PLIST +++ b/games/angband/pkg/PLIST @@ -1,13 +1,19 @@ -@group games -@mode 2755 +@comment $OpenBSD: PLIST,v 1.2 2000/08/06 21:41:51 matt Exp $ bin/angband -@mode +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 @@ -19,6 +25,9 @@ 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 @@ -28,12 +37,16 @@ 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 @@ -44,19 +57,27 @@ share/angband/user/pref-x11.prf share/angband/user/pref.prf share/angband/user/user-mac.prf share/angband/user/user.prf -share/angband/xtra/tiles.raw -@exec mkdir -m 0775 %D/share/angband/apex -@exec mkdir -m 0755 %D/share/angband/bone -@exec mkdir -m 0775 %D/share/angband/data -@exec mkdir -m 0755 %D/share/angband/info -@exec mkdir -m 0775 %D/share/angband/save +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