Date: Fri, 22 Sep 2000 20:18:38 +0900 (JST) From: makoto@pinpott.spnet.ne.jp To: FreeBSD-gnats-submit@freebsd.org Subject: ports/21471: Update port: games/zangband (by maintainer) Message-ID: <200009221118.UAA47406@rantantan.pinpott.spnet.ne.jp>
next in thread | raw e-mail | index | archive | help
>Number: 21471
>Category: ports
>Synopsis: Update port: games/zangband (by maintainer)
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Sep 22 04:20:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Makoto YAMAKURA
>Release: FreeBSD 4.1-STABLE i386
>Organization:
>Environment:
>Description:
o Update patch for japanese/zangband satellite port.
o Some variables moved to satellite port's Makefile.
o No files added/removed.
This update doesn't affect to games/zangband package,
so I don't increase PORTREVISON. Satellite port have its
own version (.j000922).
Please commit this PR and satellite port's PR at the same time.
Thanks.
>How-To-Repeat:
>Fix:
diff -x work -x *~ -x *gz -x *.orig -ruN zangband-master/Makefile zangband/Makefile
--- zangband-master/Makefile Thu Sep 21 03:37:13 2000
+++ zangband/Makefile Fri Sep 22 19:21:24 2000
@@ -6,18 +6,16 @@
#
PORTNAME= zangband
-PORTVERSION= 2.4.0${JP_VERSION}
+PORTVERSION= 2.4.0${JA_VERSION}
PORTREVISION= 1
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
-.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
+ ${JA_MASTER_SITE}
+DISTFILES= ${PORTNAME}-${E_VERSION:S/.//g}-src.zip \
+ ${JA_DISTFILE}
+DIST_SUBDIR= ${PORTNAME}
+EXTRACT_ONLY= ${PORTNAME}-${E_VERSION:S/.//g}-src.zip
MAINTAINER= makoto@pinpott.spnet.ne.jp
@@ -40,27 +38,24 @@
BINMODE= 2755
MAKE_ARGS+= ANGBANDLIB=${PREFIX}/${ANGBANDLIB}
-.if !defined(JAPANESE)
-ANGBANDLIB?= lib/zangband
-ANGBANDBIN?= bin/zangband
-.else
-ANGBANDLIB?= lib/jzangband
-ANGBANDBIN?= bin/jzangband
-.endif
+ANGBANDLIB?= lib/${PORTNAME}
+ANGBANDBIN?= bin/${PORTNAME}
+
+E_VERSION= ${PORTVERSION:S/${JA_VERSION}//}
-E_VERSION= ${PORTVERSION:S/${JP_VERSION}//}
.if defined(JAPANESE)
-PATCH_VERSION?= 000901
-JP_VERSION= .j${PATCH_VERSION}
-PLIST_ADD= ${PKGDIR}/PLIST.ja
-MAKE_ARGS+= JAPANESE_CFLAGS="-DJP -DEUC"
+PATCH_VERSION?= 000922
+JA_VERSION= .j${PATCH_VERSION}
+JA_DISTFILE= zj${E_VERSION:S/.//g}ux-${PATCH_VERSION}.tgz
.endif
-pre-patch:
.if defined(JAPANESE)
+pre-patch:
(cd ${WRKSRC} ; ${TAR} zxf ${DISTDIR}/${DIST_SUBDIR}/zj${E_VERSION:S/.//g}ux-${PATCH_VERSION}.tgz)
(cd ${WRKSRC}/src ; ${PATCH} -p1 -l -s < ../zj${E_VERSION:S/.//g}.patch ; ${PATCH} -p1 -l -s < ${FILESDIR}/makefile-adjust.patch)
.endif
+
+pre-build:
${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile
${CP} ${WRKSRC}/src/makefile.std ${WRKSRC}/src/Makefile
@${SED} -e "s|%%PREFIX%%|${PREFIX}|g;s|%%ANGBANDBIN%%|${ANGBANDBIN}|g;s|%%ANGBANDLIB%%|${ANGBANDLIB}|g" ${FILESDIR}/MESSAGE.in > ${PKGMESSAGE}
@@ -89,8 +84,8 @@
post-build:
@${RM} -f ${PLIST}
-.for i in ${PKGDIR}/PLIST.a ${PLIST_ADD} ${PKGDIR}/PLIST.b
- @${CAT} ${i} >> ${PLIST}
+.for i in PLIST.a ${JA_PLIST} PLIST.b
+ @${CAT} ${PKGDIR}/${i} >> ${PLIST}
.endfor
.include <bsd.port.mk>
diff -x work -x *~ -x *gz -x *.orig -ruN zangband-master/files/md5 zangband/files/md5
--- zangband-master/files/md5 Thu Sep 21 03:37:13 2000
+++ zangband/files/md5 Fri Sep 22 19:24:03 2000
@@ -1,2 +1,2 @@
MD5 (zangband/zangband-240-src.zip) = 4854d25e7297b5523304398e082cf069
-MD5 (zangband/zj240ux-000901.tgz) = 418692eb496d7bdd51c7794741605130
+MD5 (zangband/zj240ux-000922.tgz) = cd3650c30a9d779eecc7a8e15409d90e
>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?200009221118.UAA47406>