Date: Wed, 23 Aug 2000 18:47:12 +0900 (JST) From: Makoto YAMAKURA <makoto@pinpott.spnet.ne.jp> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/20798: Update port: games/zangband 240 Message-ID: <200008230947.SAA02523@rantantan.pinpott.spnet.ne.jp>
next in thread | raw e-mail | index | archive | help
>Number: 20798
>Category: ports
>Synopsis: Update port: games/zangband 240
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 23 02:50:04 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Makoto YAMAKURA
>Release: FreeBSD 4.1-STABLE i386
>Organization:
>Environment:
>Description:
Update Zangband 2.2.8 to 2.4.0
>How-To-Repeat:
>Fix:
diff -x work -x *~ -x *gz -x *.orig -ruN zangband-228/Makefile zangband/Makefile
--- zangband-228/Makefile Thu Aug 10 02:34:15 2000
+++ zangband/Makefile Tue Aug 22 18:27:24 2000
@@ -6,17 +6,17 @@
#
PORTNAME= zangband
-PORTVERSION= 2.2.8${JP_VERSION}
+PORTVERSION= 2.4.0${JP_VERSION}
CATEGORIES+= games
MASTER_SITES= ftp://export.andrew.cmu.edu/angband/Variant/ \
ftp://ftp.sunet.se/pub/games/Angband/Variant/ \
http://www.geocities.co.jp/SiliconValley-SanJose/9606/zg/
-DISTFILES= zangband-${E_VERSION:S/./-/g}-src.zip
+DISTFILES= zangband-${E_VERSION:S/.//g}-src.zip
.if defined(JAPANESE)
DISTFILES+= zj${E_VERSION:S/.//g}ux-${PATCH_VERSION}.tgz
.endif
DIST_SUBDIR= zangband
-EXTRACT_ONLY= zangband-${E_VERSION:S/./-/g}-src.zip
+EXTRACT_ONLY= zangband-${E_VERSION:S/.//g}-src.zip
MAINTAINER= makoto@pinpott.spnet.ne.jp
@@ -49,10 +49,10 @@
E_VERSION= ${PORTVERSION:S/${JP_VERSION}//}
.if defined(JAPANESE)
-PATCH_VERSION= 000714
+PATCH_VERSION= 000822
JP_VERSION= .j${PATCH_VERSION}
PLIST_ADD= ${PKGDIR}/PLIST.ja
-MAKE_ARGS+= JAPANESE_CFLAGS="-DJP -DEUC -DJP_ARTDESC"
+MAKE_ARGS+= JAPANESE_CFLAGS="-DJP -DEUC"
.endif
pre-patch:
diff -x work -x *~ -x *gz -x *.orig -ruN zangband-228/files/makefile-adjust.patch zangband/files/makefile-adjust.patch
--- zangband-228/files/makefile-adjust.patch Thu Aug 10 02:34:16 2000
+++ zangband/files/makefile-adjust.patch Wed Aug 23 18:35:19 2000
@@ -1,13 +1,12 @@
---- /home/makoto/ports/japanese/zangband/work/ZAngband/src/makefile.std Sat Jul 22 21:37:07 2000
-+++ src/makefile.std Sat Jul 22 21:30:29 2000
-@@ -127,8 +127,8 @@
- #CFLAGS = -Wall -O1 -pipe -g -D"USE_X11" -D"USE_GCU"
- #LIBS = -lX11 -lcurses -ltermcap
-
--CFLAGS = -Wall -O2 -m486 -pipe -g -D"USE_X11" -D"JP" -D"EUC" -D"JP_ARTDESC" -D"USE_GCU"
--LIBS = -L/usr/X11R6/lib -lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lcurses
-+CFLAGS = -Wall -O2 -m486 -pipe -g -D"USE_XAW" -D"USE_GCU"
-+LIBS = -L/usr/X11R6/lib -lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lcurses
-
-
+--- src/makefile.std Tue Aug 22 17:08:56 2000
++++ src/makefile.std Thu Jul 20 13:19:50 2000
+@@ -133,8 +131,7 @@
+ ## to get 256 colours.
##
+ CFLAGS = -Wall -O2 -fno-strength-reduce -m486 -pipe -g \
+- -D"USE_X11" -D"USE_GCU" -D"USE_TRANSPARENCY" \
+- -D"JP" -D"EUC"
++ -D"USE_X11" -D"USE_GCU" -D"USE_TRANSPARENCY"
+ LIBS = -lX11 -lcurses -ltermcap -L/usr/X11R6/lib
+
+ #CFLAGS = -Wall -O2 -fno-strength-reduce -m486 -pipe -g \
diff -x work -x *~ -x *gz -x *.orig -ruN zangband-228/files/md5 zangband/files/md5
--- zangband-228/files/md5 Thu Aug 10 02:34:16 2000
+++ zangband/files/md5 Tue Aug 22 17:08:41 2000
@@ -1,2 +1,2 @@
-MD5 (zangband/zangband-2-2-8-src.zip) = 91fe586331686cf28b844adfaf22a362
-MD5 (zangband/zj228ux-000714.tgz) = c778eae7f4719d374067436643521ab8
+MD5 (zangband/zangband-240-src.zip) = 5574902af17600fb6380d45905189206
+MD5 (zangband/zj240ux-000822.tgz) = de20e3ad2bf83179e6397f60946d8f9f
diff -x work -x *~ -x *gz -x *.orig -ruN zangband-228/patches/patch-aa zangband/patches/patch-aa
--- zangband-228/patches/patch-aa Thu Aug 10 02:34:16 2000
+++ zangband/patches/patch-aa Mon Aug 14 15:47:39 2000
@@ -1,5 +1,5 @@
---- src/Makefile.orig Wed Aug 9 11:32:26 2000
-+++ src/Makefile Wed Aug 9 11:32:43 2000
+--- src/makefile.std Thu Jul 20 13:19:50 2000
++++ src/Makefile Fri Aug 11 19:54:28 2000
@@ -103,7 +103,7 @@
#
# This is my compiler of choice, it seems to work most everywhere
@@ -9,18 +9,20 @@
#
-@@ -127,8 +127,8 @@
- #CFLAGS = -Wall -O1 -pipe -g -D"USE_X11" -D"USE_GCU"
- #LIBS = -lX11 -lcurses -ltermcap
-
--CFLAGS = -Wall -O2 -m486 -pipe -g -D"USE_XAW" -D"USE_GCU"
--LIBS = -L/usr/X11R6/lib -lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lcurses
-+#CFLAGS = -Wall -O2 -m486 -pipe -g -D"USE_XAW" -D"USE_GCU"
-+#LIBS = -L/usr/X11R6/lib -lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lcurses
-
-
+@@ -130,9 +130,9 @@
+ ## Note: Get the 16x16.bmp file, and put in Zdirectory/lib/xtra/graf
+ ## to get 256 colours.
##
-@@ -228,6 +228,14 @@
+-CFLAGS = -Wall -O2 -fno-strength-reduce -m486 -pipe -g \
+- -D"USE_X11" -D"USE_GCU" -D"USE_TRANSPARENCY"
+-LIBS = -lX11 -lcurses -ltermcap -L/usr/X11R6/lib
++#CFLAGS = -Wall -O2 -fno-strength-reduce -m486 -pipe -g \
++# -D"USE_X11" -D"USE_GCU" -D"USE_TRANSPARENCY"
++#LIBS = -lX11 -lcurses -ltermcap -L/usr/X11R6/lib
+
+ #CFLAGS = -Wall -O2 -fno-strength-reduce -m486 -pipe -g \
+ # -D"USE_XAW" -D"USE_GCU" -D"USE_TRANSPARENCY"
+@@ -236,6 +236,14 @@
##
#CFLAGS = -Wall -O1 -pipe -g -D"USE_GCU" -arch m68k -arch i386
#LIBS = -lcurses -ltermcap
@@ -30,8 +32,8 @@
+##
+## Variation -- Compile for FreeBSD
+##
-+CFLAGS += -D"USE_X11" -D"USE_GCU" ${EXTRA_CFLAGS}
-+LIBS = -L${X11BASE}/lib -lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lcurses
++CFLAGS += -D"USE_X11" -D"USE_GCU" -D"USE_TRANSPARENCY" ${EXTRA_CFLAGS}
++LIBS = -L${X11BASE}/lib -lX11 -lcurses -ltermcap
diff -x work -x *~ -x *gz -x *.orig -ruN zangband-228/pkg/PLIST.a zangband/pkg/PLIST.a
--- zangband-228/pkg/PLIST.a Thu Aug 10 02:34:16 2000
+++ zangband/pkg/PLIST.a Fri Aug 11 19:20:31 2000
@@ -93,10 +93,14 @@
%%ANGBANDLIB%%/help/birth.hlp
%%ANGBANDLIB%%/help/birth.txt
%%ANGBANDLIB%%/help/bldg.txt
+%%ANGBANDLIB%%/help/charattr.hlp
+%%ANGBANDLIB%%/help/charattr.txt
%%ANGBANDLIB%%/help/command.hlp
%%ANGBANDLIB%%/help/command.txt
%%ANGBANDLIB%%/help/commdesc.hlp
%%ANGBANDLIB%%/help/commdesc.txt
+%%ANGBANDLIB%%/help/defend.hlp
+%%ANGBANDLIB%%/help/defend.txt
%%ANGBANDLIB%%/help/dungeon.hlp
%%ANGBANDLIB%%/help/dungeon.txt
%%ANGBANDLIB%%/help/gambling.txt
@@ -106,6 +110,8 @@
%%ANGBANDLIB%%/help/helpinfo.txt
%%ANGBANDLIB%%/help/magic.hlp
%%ANGBANDLIB%%/help/magic.txt
+%%ANGBANDLIB%%/help/objects.hlp
+%%ANGBANDLIB%%/help/objects.txt
%%ANGBANDLIB%%/help/option.hlp
%%ANGBANDLIB%%/help/option.txt
%%ANGBANDLIB%%/help/pref.hlp
@@ -113,6 +119,8 @@
%%ANGBANDLIB%%/help/readme.txt
%%ANGBANDLIB%%/help/spoiler.hlp
%%ANGBANDLIB%%/help/tang.txt
+%%ANGBANDLIB%%/help/town.hlp
+%%ANGBANDLIB%%/help/town.txt
%%ANGBANDLIB%%/help/version.txt
%%ANGBANDLIB%%/info/delete.me
%%ANGBANDLIB%%/pref/delete.me
@@ -132,6 +140,7 @@
%%ANGBANDLIB%%/user/graf-dos.prf
%%ANGBANDLIB%%/user/graf-gcu.prf
%%ANGBANDLIB%%/user/graf-ibm.prf
+%%ANGBANDLIB%%/user/graf-lsl.prf
%%ANGBANDLIB%%/user/graf-mac.prf
%%ANGBANDLIB%%/user/graf-new.prf
%%ANGBANDLIB%%/user/graf-win.prf
@@ -145,7 +154,6 @@
%%ANGBANDLIB%%/user/pref-gcu.prf
%%ANGBANDLIB%%/user/pref-key.prf
%%ANGBANDLIB%%/user/pref-mac.prf
-%%ANGBANDLIB%%/user/pref-opt.prf
%%ANGBANDLIB%%/user/pref-win.prf
%%ANGBANDLIB%%/user/pref-x11.prf
%%ANGBANDLIB%%/user/pref.prf
@@ -169,19 +177,6 @@
%%ANGBANDLIB%%/xtra/font/8X13B.FON
%%ANGBANDLIB%%/xtra/font/9X15.FON
%%ANGBANDLIB%%/xtra/font/9X15B.FON
-%%ANGBANDLIB%%/xtra/font/xm10x17.fnt
-%%ANGBANDLIB%%/xtra/font/xm10x17b.fnt
-%%ANGBANDLIB%%/xtra/font/xm12x20.fnt
-%%ANGBANDLIB%%/xtra/font/xm12x20b.fnt
-%%ANGBANDLIB%%/xtra/font/xm16x25.fnt
-%%ANGBANDLIB%%/xtra/font/xm16x25b.fnt
-%%ANGBANDLIB%%/xtra/font/xm4x6.fnt
-%%ANGBANDLIB%%/xtra/font/xm5x8.fnt
-%%ANGBANDLIB%%/xtra/font/xm6x12.fnt
-%%ANGBANDLIB%%/xtra/font/xm6x12b.fnt
-%%ANGBANDLIB%%/xtra/font/xm8x13.fnt
-%%ANGBANDLIB%%/xtra/font/xm8x13b.fnt
-%%ANGBANDLIB%%/xtra/font/xm8x16.fnt
%%ANGBANDLIB%%/xtra/font/xm8x16b.fnt
%%ANGBANDLIB%%/xtra/graf/readme.txt
%%ANGBANDLIB%%/xtra/music/delete.me
>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?200008230947.SAA02523>