Update with the new PORT{NAME,VERSION}/PKGNAME{PRE,SUF}FIX variables.

Now try to use those variables everywhere around DIST* and PATCH*
definitions as far as possible, for ease of the future updates and the
neatness.

Okay, 60% of `japanese' ports have been done. :)

1 files changed, 18 insertions, 15 deletions

diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index 71b056112a60..b7de6dd00e68 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -1,36 +1,39 @@
 # New ports collection makefile for:	Wnn for Japanese
-# Version required:	4.2
 # Date created:		20 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Wnn4.2
-PKGNAME?=	ja-Wnn-4.2
+PORTNAME=	Wnn
+PORTVERSION=	4.2
 CATEGORIES?=	japanese
 MASTER_SITES=	ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/ \
 		ftp://ftp.wg.omron.co.jp/pub/Wnn/dic/pubdic+/ \
 		http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/Wnn/
-DISTFILES=	Wnn4.2.tar.gz ${WNN_EXTRA_PATCH}
+DISTNAME=	${PORTNAME}${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${WNN_EXTRA_PATCH}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	taoka@FreeBSD.org
 
 USE_XLIB=	yes
-EXTRACT_ONLY=	Wnn4.2.tar.gz
 PATCHDIR=	${.CURDIR}/../../japanese/Wnn/patches
 FILESDIR=	${.CURDIR}/../../japanese/Wnn/files
 PKGDIR=		${.CURDIR}/../../japanese/Wnn/pkg
 WRKSRC=		${WRKDIR}/Xsi
 
-WNN_EXTRA_PATCH= Wnn4.2.patch-981201.tar.gz
+WNN_EXTRA_PATCH= ${DISTNAME}.patch-981201.tar.gz
 MAKE_ENV+=	 PATH=/usr/bin:$${PATH} PORT_IMAKE_DEFINES='${WNN_DEF}'
 
 .if defined(BATCH)
 BATCH=	yes	# make sure it's not empty
 .endif
 
-.if (${PKGNAME} == ja-Wnn-4.2)
+.include <bsd.port.pre.mk>
+
+.if ${PKGNAMEPREFIX} == ja-
 DISTFILES+=	pubdic+.tar.gz pubdic+-fix01.gz pubdic+.diff pubdic+.special.diff
 PORT_DOCDIR=	${PREFIX}/share/doc/ja-Wnn
 DOC_FROM=	${WRKSRC}/Wnn
@@ -41,7 +44,7 @@ SHARED_LIB=	libwnn4
 .else
 BuildWnn=	NO
 .endif
-.if (${PKGNAME} == zh-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == zh-
 PORT_DOCDIR=	${PREFIX}/share/doc/zh-Wnn
 DOC_FROM=	${WRKSRC}/cWnn
 BuildCWnn=	YES
@@ -49,7 +52,7 @@ SHARED_LIB=	libcwnn4
 .else
 BuildCWnn=	NO
 .endif
-.if (${PKGNAME} == ko-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ko-
 # kWnn has no manual.
 BuildKWnn=	YES
 SHARED_LIB=	libkwnn4
@@ -71,7 +74,7 @@ post-extract:
 		${_DISTDIR}${WNN_EXTRA_PATCH} ${EXTRACT_AFTER_ARGS} \
 		-C ${WRKSRC}
 	${LN} -sf Project.tmpl ${WRKSRC}/config/X11.tmpl
-.if (${PKGNAME} == ja-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ja-
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}pubdic+.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
 .endif
 
@@ -79,7 +82,7 @@ pre-patch:
 	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Wnn-patch-01Dec98
 
 #### pubdic+
-.if (${PKGNAME} == ja-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ja-
 post-patch:
 	cd ${PUBDICPDIR}; \
 	${GZCAT} ${_DISTDIR}pubdic+-fix01.gz | ${PATCH} --quiet; \
@@ -112,7 +115,7 @@ do-configure:
 
 pre-build:
 #### pubdic+
-.if (${PKGNAME} == ja-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ja-
 	cd ${PUBDICPDIR}; ${XMKMF}; ${MAKE} wnn; \
 	cd ${WRKSRC}/Pubdic; \
 	for file in ${WDICS}; do \
@@ -130,7 +133,7 @@ pre-build:
 #	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
 
 #### gerodic
-.if (${PKGNAME} == ja-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ja-
 post-build:
 	cd ${WRKSRC}/Contrib/dic/gerodic; \
 	${ATOD} -h ${WRKSRC}/Pubdic/hinsi.data g-jinmei.dic < g-jinmei.u
@@ -142,7 +145,7 @@ pre-install:
 
 post-install:
 #### gerodic
-.if (${PKGNAME} == ja-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ja-
 	cd ${WRKSRC}/Contrib/dic/gerodic; \
 	make all install
 .endif
@@ -167,4 +170,4 @@ post-install:
 	fi
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>