10 files changed, 80 insertions, 56 deletions

diff --git a/games/zangband/Makefile b/games/zangband/Makefile
index 7c1b6b95ffa9..3cfbbbf6c889 100644
--- a/games/zangband/Makefile
+++ b/games/zangband/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zangband
-PORTVERSION=	2.6.1
+PORTVERSION=	2.6.2
 CATEGORIES+=	games
 MASTER_SITES=	ftp://clockwork.dementia.org/angband/Variant/ZAngband/ \
 		ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/
@@ -15,13 +15,14 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	makoto@pinpott.spnet.ne.jp
 
 USE_XLIB=	yes
-HAS_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_AUTOMAKE=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/lib \
 		--with-setgid=${SHAREGRP}
 
 NO_CDROM=	Possible copyright infringement
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}
 PKGMESSAGE=	${WRKDIR}/MESSAGE
 PLIST_SUB+=	ANGBANDBIN=${ANGBANDBIN} ANGBANDLIB=${ANGBANDLIB}
 
@@ -34,12 +35,15 @@ BINMODE=	2755
 ANGBANDLIB?=	lib/${PORTNAME}
 ANGBANDBIN?=	bin/${PORTNAME}
 
+post-patch:
+	(cd ${WRKSRC} ; ${SH} bootstrap)
+
 post-install:
 	(cd ${PREFIX}/${ANGBANDLIB} && \
 		${CHOWN} -R ${SHAREOWN}:${SHAREGRP} apex data ; \
 		${CHMOD} 755 . ; \
 		${CHMOD} -R ug+rw,o-rw * ; \
-		${CHMOD} -R o+r help xtra ; \
+		${CHMOD} -R o+r help ; \
 		${CHMOD} 1777 save user \
 	)
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g;s|%%ANGBANDBIN%%|${ANGBANDBIN}|g;s|%%ANGBANDLIB%%|${ANGBANDLIB}|g" ${FILESDIR}/MESSAGE.in > ${PKGMESSAGE}
diff --git a/games/zangband/distinfo b/games/zangband/distinfo
index 6a13c611c2aa..b3f2a9a7eaf4 100644
--- a/games/zangband/distinfo
+++ b/games/zangband/distinfo
@@ -1 +1 @@
-MD5 (zangband/zangband-2.6.1.tar.gz) = 18a093b379fecfa8db8c44072d45292e
+MD5 (zangband/zangband-2.6.2.tar.gz) = 7fe3efe2c4d8099179e5dc5403635448
diff --git a/games/zangband/files/patch-aa b/games/zangband/files/patch-aa
index 19fdd61f2785..1635d36abf21 100644
--- a/games/zangband/files/patch-aa
+++ b/games/zangband/files/patch-aa
@@ -1,11 +1,20 @@
---- configure.0	Fri Aug 17 04:57:54 2001
-+++ configure	Fri Aug 17 04:58:02 2001
-@@ -814,7 +814,7 @@
+--- configure.in.orig	Tue Sep  4 14:57:18 2001
++++ configure.in	Tue Sep  4 14:57:35 2001
+@@ -7,7 +7,7 @@
+ dnl write the resulting #defines into a header file
+ AM_CONFIG_HEADER(src/autoconf.h)
  
+-AM_INIT_AUTOMAKE(zangband, 2.6.1)
++AM_INIT_AUTOMAKE(zangband, 2.6.2)
+ 
+ AC_ARG_WITH(setgid,
+ [  --with-setgid=NAME      setgid usage: install angband as group NAME],
+@@ -23,7 +23,7 @@
+ 
+ dnl generate the installation path for the ./lib/ folder
  if test "$GAMEGROUP" != ""; then
-   
--  game_datadir="$datadir/games/$PACKAGE/lib/"
-+  game_datadir="$datadir/$PACKAGE/"
-   game_datadir=`(
-        test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-        test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
+-  MY_EXPAND_DIR(game_datadir, "$datadir/games/$PACKAGE/lib/")
++  MY_EXPAND_DIR(game_datadir, "$datadir/$PACKAGE/")
+ else
+   MY_EXPAND_DIR(game_datadir, "./lib/")
+   bindir=".."
diff --git a/games/zangband/files/patch-ab b/games/zangband/files/patch-ab
index 0fae8d4cb64d..3a8cccb01ebe 100644
--- a/games/zangband/files/patch-ab
+++ b/games/zangband/files/patch-ab
@@ -1,11 +1,11 @@
---- lib/apex/Makefile.in.0	Fri Aug 17 05:10:34 2001
-+++ lib/apex/Makefile.in	Fri Aug 17 05:10:52 2001
-@@ -200,7 +200,7 @@
- 
+--- lib/apex/Makefile.am.0	Tue Sep  4 15:12:16 2001
++++ lib/apex/Makefile.am	Tue Sep  4 15:12:48 2001
+@@ -16,7 +16,7 @@
  install-data-hook:
- @SET_GID_TRUE@	touch "$(DESTDIR)$(angbanddir)/scores.raw"
--@SET_GID_TRUE@	chown -R root.@GAMEGROUP@ "$(DESTDIR)$(angbanddir)"
-+@SET_GID_TRUE@	chown -R root:@GAMEGROUP@ "$(DESTDIR)$(angbanddir)"
- @SET_GID_TRUE@	chmod -R g+w "$(DESTDIR)$(angbanddir)"
+ if SET_GID
+ 	touch "$(DESTDIR)$(angbanddir)/scores.raw"
+-	chown -R root.@GAMEGROUP@ "$(DESTDIR)$(angbanddir)"
++	chown -R root:@GAMEGROUP@ "$(DESTDIR)$(angbanddir)"
+ 	chmod -R g+w "$(DESTDIR)$(angbanddir)"
+ endif
  
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/games/zangband/files/patch-ac b/games/zangband/files/patch-ac
index e27f9b4eca29..46c554af22f6 100644
--- a/games/zangband/files/patch-ac
+++ b/games/zangband/files/patch-ac
@@ -1,11 +1,11 @@
---- lib/bone/Makefile.in.0	Fri Aug 17 05:14:44 2001
-+++ lib/bone/Makefile.in	Fri Aug 17 05:15:40 2001
-@@ -199,7 +199,7 @@
- 
+--- lib/bone/Makefile.am.0	Tue Sep  4 15:12:21 2001
++++ lib/bone/Makefile.am	Tue Sep  4 15:13:06 2001
+@@ -15,7 +15,7 @@
  
  install-data-hook:
--@SET_GID_TRUE@	chown -R root.@GAMEGROUP@ "$(DESTDIR)$(angbanddir)"
-+@SET_GID_TRUE@	chown -R root:@GAMEGROUP@ "$(DESTDIR)$(angbanddir)"
- @SET_GID_TRUE@	chmod -R 070 "$(DESTDIR)$(angbanddir)"
+ if SET_GID
+-	chown -R root.@GAMEGROUP@ "$(DESTDIR)$(angbanddir)"
++	chown -R root:@GAMEGROUP@ "$(DESTDIR)$(angbanddir)"
+ 	chmod -R 070 "$(DESTDIR)$(angbanddir)"
+ endif
  
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/games/zangband/files/patch-ad b/games/zangband/files/patch-ad
index e3c86ac0956b..0abf74f9cd34 100644
--- a/games/zangband/files/patch-ad
+++ b/games/zangband/files/patch-ad
@@ -1,11 +1,11 @@
---- lib/data/Makefile.in.0	Fri Aug 17 05:14:55 2001
-+++ lib/data/Makefile.in	Fri Aug 17 05:15:19 2001
-@@ -206,7 +206,7 @@
- @SET_GID_TRUE@	  touch "$(DESTDIR)$(angbanddir)/k_info.raw" && \
- @SET_GID_TRUE@	  touch "$(DESTDIR)$(angbanddir)/r_info.raw" && \
- @SET_GID_TRUE@	  touch "$(DESTDIR)$(angbanddir)/v_info.raw" && \
--@SET_GID_TRUE@	  chown -R root.@GAMEGROUP@ "$(DESTDIR)$(angbanddir)" && \
-+@SET_GID_TRUE@	  chown -R root:@GAMEGROUP@ "$(DESTDIR)$(angbanddir)" && \
- @SET_GID_TRUE@	  chmod -R g+w "$(DESTDIR)$(angbanddir)" ;\
- @SET_GID_TRUE@	fi
- 
+--- lib/data/Makefile.am.0	Tue Sep  4 15:12:34 2001
++++ lib/data/Makefile.am	Tue Sep  4 15:13:18 2001
+@@ -23,7 +23,7 @@
+ 	  touch "$(DESTDIR)$(angbanddir)/k_info.raw" && \
+ 	  touch "$(DESTDIR)$(angbanddir)/r_info.raw" && \
+ 	  touch "$(DESTDIR)$(angbanddir)/v_info.raw" && \
+-	  chown -R root.@GAMEGROUP@ "$(DESTDIR)$(angbanddir)" && \
++	  chown -R root:@GAMEGROUP@ "$(DESTDIR)$(angbanddir)" && \
+ 	  chmod -R g+w "$(DESTDIR)$(angbanddir)" ;\
+ 	fi
+ endif
diff --git a/games/zangband/files/patch-ae b/games/zangband/files/patch-ae
index 4ccf91336efd..f835fc6c1a24 100644
--- a/games/zangband/files/patch-ae
+++ b/games/zangband/files/patch-ae
@@ -1,11 +1,10 @@
---- lib/save/Makefile.in.0	Fri Aug 17 05:14:58 2001
-+++ lib/save/Makefile.in	Fri Aug 17 05:15:09 2001
-@@ -199,7 +199,7 @@
- 
+--- lib/save/Makefile.am.0	Tue Sep  4 15:12:25 2001
++++ lib/save/Makefile.am	Tue Sep  4 15:12:57 2001
+@@ -15,6 +15,6 @@
  
  install-data-hook:
--@SET_GID_TRUE@	chown -R root.@GAMEGROUP@ "$(DESTDIR)$(angbanddir)"
-+@SET_GID_TRUE@	chown -R root:@GAMEGROUP@ "$(DESTDIR)$(angbanddir)"
- @SET_GID_TRUE@	chmod -R 070 "$(DESTDIR)$(angbanddir)"
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ if SET_GID
+-	chown -R root.@GAMEGROUP@ "$(DESTDIR)$(angbanddir)"
++	chown -R root:@GAMEGROUP@ "$(DESTDIR)$(angbanddir)"
+ 	chmod -R 070 "$(DESTDIR)$(angbanddir)"
+ endif
diff --git a/games/zangband/files/patch-af b/games/zangband/files/patch-af
new file mode 100644
index 000000000000..2521a196b9f7
--- /dev/null
+++ b/games/zangband/files/patch-af
@@ -0,0 +1,8 @@
+--- lib/Makefile.am.0	Tue Sep  4 18:04:49 2001
++++ lib/Makefile.am	Tue Sep  4 18:04:58 2001
+@@ -1,4 +1,4 @@
+ ## Makefile.am -- Process this file with automake to process Makefile.in
+ 
+-SUBDIRS = apex bone data edit file help info pref save script user xtra
++SUBDIRS = apex bone data edit file help info pref save user
+ 
diff --git a/games/zangband/files/patch-ag b/games/zangband/files/patch-ag
new file mode 100644
index 000000000000..65a0ad8e7355
--- /dev/null
+++ b/games/zangband/files/patch-ag
@@ -0,0 +1,8 @@
+--- configure.in.0	Tue Sep  4 18:21:09 2001
++++ configure.in	Tue Sep  4 18:21:32 2001
+@@ -97,4 +97,4 @@
+ AC_FUNC_VPRINTF
+ AC_CHECK_FUNCS(gethostname mkdir select strstr strtol usleep mkstemp)
+ 
+-AC_OUTPUT(Makefile src/makefile lib/Makefile lib/apex/Makefile lib/bone/Makefile lib/data/Makefile lib/edit/Makefile lib/file/Makefile lib/help/Makefile lib/info/Makefile lib/pref/Makefile lib/save/Makefile lib/script/Makefile lib/user/Makefile lib/xtra/Makefile)
++AC_OUTPUT(Makefile src/makefile lib/Makefile lib/apex/Makefile lib/bone/Makefile lib/data/Makefile lib/edit/Makefile lib/file/Makefile lib/help/Makefile lib/info/Makefile lib/pref/Makefile lib/save/Makefile lib/user/Makefile lib/xtra/Makefile)
diff --git a/games/zangband/pkg-plist b/games/zangband/pkg-plist
index 4e882d369c7c..8cf896556ceb 100644
--- a/games/zangband/pkg-plist
+++ b/games/zangband/pkg-plist
@@ -125,14 +125,12 @@
 %%ANGBANDLIB%%/pref/xtra-new.prf
 %%ANGBANDLIB%%/pref/xtra-xxx.prf
 %%ANGBANDLIB%%/save/delete.me
-%%ANGBANDLIB%%/script/delete.me
 %%ANGBANDLIB%%/user/delete.me
-%%ANGBANDLIB%%/xtra/delete.me
 @exec mkdir %D/%%ANGBANDLIB%%/data
 @exec chown -R games:games %D/%%ANGBANDLIB%%/apex %D/%%ANGBANDLIB%%/data
 @exec chmod 775 %D/%%ANGBANDLIB%%
 @exec chmod -R ug+rw,o-rw %D/%%ANGBANDLIB%%/*
-@exec chmod -R o+r %D/%%ANGBANDLIB%%/help %D/%%ANGBANDLIB%%/xtra
+@exec chmod -R o+r %D/%%ANGBANDLIB%%/help
 @exec chmod 1777 %D/%%ANGBANDLIB%%/save %D/%%ANGBANDLIB%%/user
 @dirrm %%ANGBANDLIB%%/apex
 @dirrm %%ANGBANDLIB%%/bone
@@ -143,7 +141,5 @@
 @dirrm %%ANGBANDLIB%%/info
 @dirrm %%ANGBANDLIB%%/pref
 @dirrm %%ANGBANDLIB%%/save
-@dirrm %%ANGBANDLIB%%/script
 @dirrm %%ANGBANDLIB%%/user
-@dirrm %%ANGBANDLIB%%/xtra
 @dirrm %%ANGBANDLIB%%