- Update patch for japanese/zangband satellite port.

- Some variables moved to satellite port's Makefile.

PR: 21471
Submitted by: MAINTAINER

2 files changed, 19 insertions, 24 deletions

diff --git a/games/zangband/Makefile b/games/zangband/Makefile
index a2c1e0b6c8d6..43375a30fb03 100644
--- a/games/zangband/Makefile
+++ b/games/zangband/Makefile
@@ -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 @@ BINGRP=		games
 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 @@ do-install:
 
 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 --git a/games/zangband/distinfo b/games/zangband/distinfo
index 91efee97a637..3042b5306206 100644
--- a/games/zangband/distinfo
+++ b/games/zangband/distinfo
@@ -1,2 +1,2 @@
 MD5 (zangband/zangband-240-src.zip) = 4854d25e7297b5523304398e082cf069
-MD5 (zangband/zj240ux-000901.tgz) = 418692eb496d7bdd51c7794741605130
+MD5 (zangband/zj240ux-000922.tgz) = cd3650c30a9d779eecc7a8e15409d90e