From bc377ed0305dd8ec00016661a3ec29af91fee9fc Mon Sep 17 00:00:00 2001 From: David Melik Date: Fri, 10 Aug 2012 17:50:07 -0500 Subject: [PATCH] games/angband: Updated for version 3.3.2 (+ new maintainer) Signed-off-by: Robby Workman --- games/angband/Fix_DESTDIR_support.patch | 93 ------------------------ games/angband/angband.SlackBuild | 56 ++++++-------- games/angband/angband.desktop | 8 ++ games/angband/angband.info | 10 +-- games/angband/angband.png | Bin 0 -> 603 bytes games/angband/doinst.sh | 36 +++++---- games/angband/slack-desc | 24 +++--- 7 files changed, 70 insertions(+), 157 deletions(-) delete mode 100644 games/angband/Fix_DESTDIR_support.patch create mode 100644 games/angband/angband.desktop create mode 100644 games/angband/angband.png diff --git a/games/angband/Fix_DESTDIR_support.patch b/games/angband/Fix_DESTDIR_support.patch deleted file mode 100644 index 51cc9433f7..0000000000 --- a/games/angband/Fix_DESTDIR_support.patch +++ /dev/null @@ -1,93 +0,0 @@ -Trivial patch by Robby Workman -This simply fixes the install-posthook files to respect DESTDIR settings -instead of trying to write to the real / filesystem. This will only be -noticed if you enable setgid functionality... - -diff -Nur angband-3.1.0beta.orig/lib/apex/Makefile angband-3.1.0beta/lib/apex/Makefile ---- angband-3.1.0beta.orig/lib/apex/Makefile 2008-05-17 08:08:23.000000000 -0500 -+++ angband-3.1.0beta/lib/apex/Makefile 2009-03-23 00:05:28.102772735 -0500 -@@ -6,10 +6,10 @@ - - install-posthook: - if [ "x$(SETEGID)" != "x" ]; then \ -- printf "%10s %-20s\n" TOUCH ${DATA_PATH}/apex/scores.raw; \ -+ printf "%10s %-20s\n" TOUCH $(DESTDIR)${DATA_PATH}/apex/scores.raw; \ - if [ "x$(DRY)" = "x" ]; then \ -- touch ${DATA_PATH}/apex/scores.raw; \ -- chown -R root:${SETEGID} ${DATA_PATH}/apex; \ -- chmod -R g+w ${DATA_PATH}/apex; \ -+ touch $(DESTDIR)${DATA_PATH}/apex/scores.raw; \ -+ chown -R root:${SETEGID} $(DESTDIR)${DATA_PATH}/apex; \ -+ chmod -R g+w $(DESTDIR)${DATA_PATH}/apex; \ - fi; \ - fi; -diff -Nur angband-3.1.0beta.orig/lib/bone/Makefile angband-3.1.0beta/lib/bone/Makefile ---- angband-3.1.0beta.orig/lib/bone/Makefile 2008-05-17 08:08:23.000000000 -0500 -+++ angband-3.1.0beta/lib/bone/Makefile 2009-03-23 00:05:36.083328120 -0500 -@@ -7,7 +7,7 @@ - install-posthook: - if [ "x$(SETEGID)" != "x" ]; then \ - if [ "x$(DRY)" = "x" ]; then \ -- chown root:${SETEGID} ${DATA_PATH}/bone; \ -- chmod 070 ${DATA_PATH}/bone; \ -+ chown root:${SETEGID} $(DESTDIR)${DATA_PATH}/bone; \ -+ chmod 070 $(DESTDIR)${DATA_PATH}/bone; \ - fi; \ - fi -diff -Nur angband-3.1.0beta.orig/lib/data/Makefile angband-3.1.0beta/lib/data/Makefile ---- angband-3.1.0beta.orig/lib/data/Makefile 2008-06-02 12:36:12.000000000 -0500 -+++ angband-3.1.0beta/lib/data/Makefile 2009-03-23 00:05:43.223826793 -0500 -@@ -9,23 +9,23 @@ - - install-posthook: - if [ "x$(SETEGID)" != "x" ]; then \ -- printf "%10s %s*.raw\n" TOUCH ${DATA_PATH}/data/; \ -+ printf "%10s %s*.raw\n" TOUCH $(DESTDIR)${DATA_PATH}/data/; \ - if [ "x$(DRY)" = "x" ]; then \ -- touch ${DATA_PATH}/data/artifact.raw; \ -- touch ${DATA_PATH}/data/ego_item.raw; \ -- touch ${DATA_PATH}/data/flavor.raw; \ -- touch ${DATA_PATH}/data/limits.raw; \ -- touch ${DATA_PATH}/data/monster.raw; \ -- touch ${DATA_PATH}/data/object.raw; \ -- touch ${DATA_PATH}/data/p_class.raw; \ -- touch ${DATA_PATH}/data/p_hist.raw; \ -- touch ${DATA_PATH}/data/p_race.raw; \ -- touch ${DATA_PATH}/data/prices.raw; \ -- touch ${DATA_PATH}/data/shop_own.raw; \ -- touch ${DATA_PATH}/data/spells.raw; \ -- touch ${DATA_PATH}/data/terrain.raw; \ -- touch ${DATA_PATH}/data/vault.raw; \ -- chown -R root:${SETEGID} ${DATA_PATH}/data; \ -- chmod -R g+w ${DATA_PATH}/data; \ -+ touch $(DESTDIR)${DATA_PATH}/data/artifact.raw; \ -+ touch $(DESTDIR)${DATA_PATH}/data/ego_item.raw; \ -+ touch $(DESTDIR)${DATA_PATH}/data/flavor.raw; \ -+ touch $(DESTDIR)${DATA_PATH}/data/limits.raw; \ -+ touch $(DESTDIR)${DATA_PATH}/data/monster.raw; \ -+ touch $(DESTDIR)${DATA_PATH}/data/object.raw; \ -+ touch $(DESTDIR)${DATA_PATH}/data/p_class.raw; \ -+ touch $(DESTDIR)${DATA_PATH}/data/p_hist.raw; \ -+ touch $(DESTDIR)${DATA_PATH}/data/p_race.raw; \ -+ touch $(DESTDIR)${DATA_PATH}/data/prices.raw; \ -+ touch $(DESTDIR)${DATA_PATH}/data/shop_own.raw; \ -+ touch $(DESTDIR)${DATA_PATH}/data/spells.raw; \ -+ touch $(DESTDIR)${DATA_PATH}/data/terrain.raw; \ -+ touch $(DESTDIR)${DATA_PATH}/data/vault.raw; \ -+ chown -R root:${SETEGID} $(DESTDIR)${DATA_PATH}/data; \ -+ chmod -R g+w $(DESTDIR)${DATA_PATH}/data; \ - fi; \ - fi -diff -Nur angband-3.1.0beta.orig/lib/save/Makefile angband-3.1.0beta/lib/save/Makefile ---- angband-3.1.0beta.orig/lib/save/Makefile 2008-05-17 08:08:23.000000000 -0500 -+++ angband-3.1.0beta/lib/save/Makefile 2009-03-23 00:06:04.161286215 -0500 -@@ -7,7 +7,7 @@ - install-posthook: - if [ "x$(SETEGID)" != "x" ]; then \ - if [ "x$(DRY)" = "x" ]; then \ -- chown root:${SETEGID} ${DATA_PATH}/save; \ -- chmod 070 ${DATA_PATH}/save; \ -+ chown root:${SETEGID} $(DESTDIR)${DATA_PATH}/save; \ -+ chmod 070 $(DESTDIR)${DATA_PATH}/save; \ - fi; \ - fi diff --git a/games/angband/angband.SlackBuild b/games/angband/angband.SlackBuild index 1fc0041ca9..5b89130e95 100644 --- a/games/angband/angband.SlackBuild +++ b/games/angband/angband.SlackBuild @@ -3,18 +3,17 @@ # Slackware build script for angband # Written by Marshall Scott (bacchist@gmail.com) +# Heavily edited and currently maintained by David Melik (dchmelik@gmail.com) PRGNAM=angband -VERSION=3.1.0beta +VERSION=v3.3.2 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -38,64 +37,58 @@ else LIBDIRSUFFIX="" fi +set -e # Exit on most errors + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT rm -rf $TMP/$PRGNAM-$VERSION -cd $TMP || exit 1 -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1 -cd $PRGNAM-$VERSION || exit 1 +cd $TMP +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . -# Fixup the DESTDIR support for --with-setgid -patch -p1 < $CWD/Fix_DESTDIR_support.patch || exit 1 - # --enable-gtk and setgid are incompatible, so we'll not build the gtk part CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ --with-libpath=/usr/share/games/angband \ + --with-configpath=/etc/angband \ + --with-varpath=/var/games/angband \ --bindir=/usr/games \ --with-setgid=games \ --build=$ARCH-slackware-linux \ - || exit 1 -make || exit -make install DESTDIR=$PKG || exit +make +make install DESTDIR=$PKG -# We'll deviate from what upstream does a little bit... -mkdir -p $PKG/var/games/angband -mv $PKG/usr/share/games/angband/{apex,bone,data,save} $PKG/var/games/angband -( cd $PKG/usr/share/games/angband - for i in apex bone data save ; do - ln -s ../../../../var/games/angband/$i . - done -) +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null # We'll kill the "delete.me" files in the package; probably these are left so # that lesser package management tools don't choke on empty directories -find $PKG -name "delete.me" -exec rm -f {} \; || true +find $PKG -name "delete.me" -exec rm -f {} \; # Now let's prevent upgrades from clobbering any existing datafiles # We'll handle these in doinst.sh -mv $PKG/var/games/angband/apex/scores.raw \ - $PKG/var/games/angband/apex/scores.raw.new for i in \ - artifact ego_item flavor limits monster object p_class \ - p_hist p_race prices shop_own spells terrain vault ; - do mv $PKG/var/games/angband/data/$i.raw \ - $PKG/var/games/angband/data/$i.raw.new ; + artifact ego_item flavor hints limits monster monster_base names object \ + object_base p_class p_hist p_race pain pit shop_own spell store terrain \ + vault ; + do mv $PKG/etc/angband/edit/$i.txt \ + $PKG/etc/angband/edit/$i.txt.new ; done +mkdir -p $PKG/usr/share/{applications,pixmaps} +cp $CWD/angband.png $PKG/usr/share/pixmaps +cp $CWD/angband.desktop $PKG/usr/share/applications + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ changes.txt copying.txt faq.txt readme.txt thanks.txt lib/help/ \ $PKG/usr/doc/$PRGNAM-$VERSION find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \; -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$APP.SlackBuild +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild rm -f $PKG/usr/doc/$PRGNAM-$VERSION/help/.depend* mkdir -p $PKG/install @@ -104,4 +97,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} - diff --git a/games/angband/angband.desktop b/games/angband/angband.desktop new file mode 100644 index 0000000000..e50fb02319 --- /dev/null +++ b/games/angband/angband.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Angband +Comment=Dive into Arda and defeat Morgoth +Exec=angband +Terminal=true +Type=Application +Categories=Game; +Icon=tome \ No newline at end of file diff --git a/games/angband/angband.info b/games/angband/angband.info index 2047b2d30f..7024dacc7c 100644 --- a/games/angband/angband.info +++ b/games/angband/angband.info @@ -1,10 +1,10 @@ PRGNAM="angband" -VERSION="3.1.0beta" +VERSION="v3.3.2" HOMEPAGE="http://www.rephial.org/" -DOWNLOAD="http://angband.oook.cz/download/angband-3.1.0beta.tar.gz" -MD5SUM="65215f909583673e196579fe6d0be105" +DOWNLOAD="http://rephial.org/downloads/3.3/angband-v3.3.2.tar.gz" +MD5SUM="6bb1cac39e8f3d1146bac5ff561fc3a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -MAINTAINER="Marshall Scott" -EMAIL="bacchist@gmail.com" +MAINTAINER="David Melik" +EMAIL="dchmelik@gmail.com" APPROVED="rworkman" diff --git a/games/angband/angband.png b/games/angband/angband.png new file mode 100644 index 0000000000000000000000000000000000000000..ee931a91ee6dffb961c85c5d7e8c9c982b6f16a0 GIT binary patch literal 603 zcmV-h0;K(kP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXb* z1O*Y4MRUIZ00G-cL_t(o!{t|9lfxhgWIO%e+F#B+L?XzC=B{t&Ovfhb?g}V`=)X6N zo)6|cX?%(WnanKfV0r*MF^-J+90&LOfL!+|>~OL^z`>CPWYH6n-MS$HL`1J?jvS1c z#v%&>z`gf7jc{js`EWq7$bt{wrR2=wd%ndkv2Y7Owv*YD1OEVt_&F{jn3=i}9mNte zGuOS$>#85P_c#%`aq`dMaoUov;H!viT(74}#Ba#6ogRqTyWs@%sfd1Rfv4meyq{Sj zw?Ibj0;-egPc2bepdyzh|Ebp^DmQIoATpa4Af)Rri~7j??>J+s>;+IWm(FZ$+|j+; z_q|{1=1n->6H#AqP^DH$BnZIF_{WRmR;FYGxnP1`KCt9O_Byp$&XZrFYVyzmQ86LC zc0)_%;X}l&PQghwJjseRIT45C%ClSvU~TplMBLoMa%*3#WLfaF#-R90i>S!OGFPsT z#mrQ{6)=_BSjcuR71MIGoERGA89O(;R`cuPBY)OWjk2m&#O@d`7m=<3ebi?Gc@fAx zL8^X?MEL3&u>~f1tG^epJGz?i;;={Zz3xQsu-%axnO*O2eQz(X>PWveLnLB%lV#xz pfc3D)J;()L_(rU-|BCmW_5&JGG7qgvGOPdq002ovPDHLkV1j2h6IcKM literal 0 HcmV?d00001 diff --git a/games/angband/doinst.sh b/games/angband/doinst.sh index fa833fa0f0..4da6d8736e 100644 --- a/games/angband/doinst.sh +++ b/games/angband/doinst.sh @@ -5,19 +5,25 @@ config() { rm -f $NEW } -config var/games/angband/apex/scores.raw.new -config var/games/angband/data/artifact.raw.new -config var/games/angband/data/ego_item.raw.new -config var/games/angband/data/flavor.raw.new -config var/games/angband/data/limits.raw.new -config var/games/angband/data/monster.raw.new -config var/games/angband/data/object.raw.new -config var/games/angband/data/p_class.raw.new -config var/games/angband/data/p_hist.raw.new -config var/games/angband/data/p_race.raw.new -config var/games/angband/data/prices.raw.new -config var/games/angband/data/shop_own.raw.new -config var/games/angband/data/spells.raw.new -config var/games/angband/data/terrain.raw.new -config var/games/angband/data/vault.raw.new +config etc/angband/edit/artifact.txt.new +config etc/angband/edit/ego_item.txt.new +config etc/angband/edit/flavor.txt.new +config etc/angband/edit/hints.txt.new +config etc/angband/edit/limits.txt.new +config etc/angband/edit/monster.txt.new +config etc/angband/edit/monster_base.txt.new +config etc/angband/edit/names.txt.new +config etc/angband/edit/object.txt.new +config etc/angband/edit/object_base.txt.new +config etc/angband/edit/p_class.txt.new +config etc/angband/edit/p_hist.txt.new +config etc/angband/edit/p_race.txt.new +config etc/angband/edit/pain.txt.new +config etc/angband/edit/pit.txt.new +config etc/angband/edit/shop_own.txt.new +config etc/angband/edit/spell.txt.new +config etc/angband/edit/store.txt.new +config etc/angband/edit/terrain.txt.new +config etc/angband/edit/vault.txt.new + diff --git a/games/angband/slack-desc b/games/angband/slack-desc index ef83433997..9c84ebe6ac 100644 --- a/games/angband/slack-desc +++ b/games/angband/slack-desc @@ -1,19 +1,19 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| angband: angband (graphical dungeon adventure game) angband: angband: Angband is a graphical dungeon adventure game that uses textual angband: characters to represent the walls and floors of a dungeon and the -angband: inhabitants therein, in the vein of games like NetHack and Rogue. -angband: For more information about the game, its variants, and somewhere to -angband: upload your characters and screenshots, please see -angband: http://angband.oook.cz/. -angband: -angband: Home: http://rephial.org/ Forum: http://angband.oook.cz/forum/ -angband: +angband: inhabitants therein, in the vein of games like NetHack and Rogue. For +angband: more information about the game, its variants, and somewhere to upload +angband: your characters and screenshots, please see http://angband.oook.cz/. +angband: +angband: home: http://rephial.org/ forum: http://angband.oook.cz/forum/ +angband: Usenet newsgroup: nntp://rec.games.roguelike.angband +angband: