Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Jan 2003 17:02:59 +0300 (MSK)
From:      Maxim Maximov <mcsi@agava.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/47017: update games/zangband to 2.7.2
Message-ID:  <200301131402.h0DE2xFV003797@ultra.domain>

next in thread | raw e-mail | index | archive | help

>Number:         47017
>Category:       ports
>Synopsis:       update games/zangband to 2.7.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 13 06:10:02 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Maxim Maximov
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD ultra.domain 4.7-STABLE FreeBSD 4.7-STABLE #10: Tue Nov 12 16:15:12 MSK 2002 mcsi@ultra.domain:/usr/obj/usr/src/sys/ULTRA i386


	
>Description:
	update games/zangband to 2.7.2
>How-To-Repeat:
>Fix:

diff -ur zangband.old/Makefile zangband/Makefile
--- zangband.old/Makefile	Mon Nov 25 08:36:06 2002
+++ zangband/Makefile	Mon Jan 13 16:53:46 2003
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	zangband
-PORTVERSION=	2.6.2
+PORTVERSION=	2.7.2
 CATEGORIES+=	games
-MASTER_SITES=	ftp://clockwork.dementia.org/angband/Variant/ZAngband/ \
-		ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/
+MASTER_SITES=	ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/ \
+		ftp://clockwork.dementia.org/angband/Variant/ZAngband/
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	makoto@pinpott.spnet.ne.jp
@@ -17,12 +17,13 @@
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=14
-CONFIGURE_ARGS=	--datadir=${PREFIX}/lib \
-		--with-setgid=${SHAREGRP}
+
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--datadir=${PREFIX}/lib --with-setgid=${SHAREGRP}
 
 NO_CDROM=	Possible copyright infringement
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+#WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PKGMESSAGE=	${WRKDIR}/MESSAGE
 PLIST_SUB+=	ANGBANDBIN=${ANGBANDBIN} ANGBANDLIB=${ANGBANDLIB}
 
@@ -36,10 +37,7 @@
 ANGBANDBIN?=	bin/${PORTNAME}
 
 pre-patch:
-	@${PERL} -pi.orig -e 's|^aclocal|${ACLOCAL}|; \
-		s|^autoheader|${AUTOHEADER}|; \
-		s|^automake|${AUTOMAKE}|; s|^autoconf|${AUTOCONF}|' \
-		${WRKSRC}/bootstrap
+	        ${SED} -i -e 's|^aclocal|${ACLOCAL}|; s|^autoheader|${AUTOHEADER}|; s|^automake|${AUTOMAKE}|; s|^autoconf|${AUTOCONF}|' ${WRKSRC}/bootstrap
 
 pre-configure:
 	(cd ${WRKSRC} ; ${SH} bootstrap)
diff -ur zangband.old/distinfo zangband/distinfo
--- zangband.old/distinfo	Mon Sep 10 08:01:26 2001
+++ zangband/distinfo	Mon Jan 13 16:07:23 2003
@@ -1 +1 @@
-MD5 (zangband/zangband-2.6.2.tar.gz) = 7fe3efe2c4d8099179e5dc5403635448
+MD5 (zangband/zangband-2.7.2.tar.gz) = 131d9a74d5566129ffae200c5d663283
diff -ur zangband.old/files/patch-aa zangband/files/patch-aa
--- zangband.old/files/patch-aa	Mon Sep 10 08:01:26 2001
+++ zangband/files/patch-aa	Mon Jan 13 16:13:23 2003
@@ -1,20 +1,17 @@
---- 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 @@
+--- configure.in.dist	Mon Jan 13 16:08:15 2003
++++ configure.in	Mon Jan 13 16:13:15 2003
+@@ -25,7 +25,7 @@
  
  dnl generate the installation path for the ./lib/ folder
  if test "$GAMEGROUP" != ""; then
--  MY_EXPAND_DIR(game_datadir, "$datadir/games/$PACKAGE/lib/")
-+  MY_EXPAND_DIR(game_datadir, "$datadir/$PACKAGE/")
+-  game_datadir="$datadir/games/$PACKAGE/lib/"
++  game_datadir="$datadir/$PACKAGE/"
  else
-   MY_EXPAND_DIR(game_datadir, "./lib/")
-   bindir=".."
+   game_datadir="$basedir/lib/"
+   bindir="$basedir"
+@@ -105,4 +105,4 @@
+ AC_FUNC_VPRINTF
+ AC_CHECK_FUNCS(gethostname mkdir select strstr strtol usleep mkstemp)
+ 
+-AC_OUTPUT(Makefile src/makefile src/lua/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 src/lua/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 -ur zangband.old/files/patch-ad zangband/files/patch-ad
--- zangband.old/files/patch-ad	Mon Sep 10 08:01:26 2001
+++ zangband/files/patch-ad	Mon Jan 13 16:20:04 2003
@@ -1,9 +1,9 @@
---- 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" && \
+--- lib/data/Makefile.am.orig	Sun Aug 11 13:31:15 2002
++++ lib/data/Makefile.am	Mon Jan 13 16:19:33 2003
+@@ -27,7 +27,7 @@
  	  touch "$(DESTDIR)$(angbanddir)/r_info.raw" && \
  	  touch "$(DESTDIR)$(angbanddir)/v_info.raw" && \
+ 	  touch "$(DESTDIR)$(angbanddir)/misc.raw" && \
 -	  chown -R root.@GAMEGROUP@ "$(DESTDIR)$(angbanddir)" && \
 +	  chown -R root:@GAMEGROUP@ "$(DESTDIR)$(angbanddir)" && \
  	  chmod -R g+w "$(DESTDIR)$(angbanddir)" ;\
diff -ur zangband.old/files/patch-ag zangband/files/patch-ag
--- zangband.old/files/patch-ag	Mon Sep 10 05:25:41 2001
+++ zangband/files/patch-ag	Mon Jan 13 16:15:34 2003
@@ -1,8 +1,11 @@
---- 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)
+--- lib/apex/Makefile.in.orig	Mon Jan 13 16:14:03 2003
++++ lib/apex/Makefile.in	Mon Jan 13 16:14:22 2003
+@@ -300,7 +300,7 @@
  
--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)
+ 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)"
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Only in zangband/files: patch-ah
Only in zangband/files: patch-ai
Only in zangband/files: patch-aj



patch-ah:

--- lib/bone/Makefile.in.orig	Mon Jan 13 16:14:33 2003
+++ lib/bone/Makefile.in	Mon Jan 13 16:14:39 2003
@@ -302,7 +302,7 @@
 	touch delete.me
 
 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.
 # Otherwise a system limit (for SysV at least) may be exceeded.


patch-ai:

--- lib/data/Makefile.in.orig	Mon Jan 13 16:14:43 2003
+++ lib/data/Makefile.in	Mon Jan 13 16:14:49 2003
@@ -310,7 +310,7 @@
 @SET_GID_TRUE@	  touch "$(DESTDIR)$(angbanddir)/r_info.raw" && \
 @SET_GID_TRUE@	  touch "$(DESTDIR)$(angbanddir)/v_info.raw" && \
 @SET_GID_TRUE@	  touch "$(DESTDIR)$(angbanddir)/misc.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
 # Tell versions [3.59,3.63) of GNU make to not export all variables.


patch-aj:

--- lib/save/Makefile.in.orig	Mon Jan 13 16:14:54 2003
+++ lib/save/Makefile.in	Mon Jan 13 16:15:02 2003
@@ -302,7 +302,7 @@
 	touch delete.me
 
 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.
 # Otherwise a system limit (for SysV at least) may be exceeded.
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200301131402.h0DE2xFV003797>