Cosmetic.

{chinese,japanese,korean}/mule-*:
  - Set only the lang-specific category for each.

editors/mule:
  - Set CATEGORIES+= editors to follow after a slave's lang-specific category.
  - Define MULE_VERSION and EMACS_VERSION to use.

editors/mule-common:
  - Remove redundant `Version required' line.
  - Define MULE_VERSION and EMACS_VERSION to use.
  - Use ${VAR:S/../../} modifier instead of !=, and `echo | sed'.

1 files changed, 21 insertions, 19 deletions

diff --git a/textproc/coco/Makefile b/textproc/coco/Makefile
index 9ef0d94b2343..454eaa05fdc1 100644
--- a/textproc/coco/Makefile
+++ b/textproc/coco/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	files except executables for mule 2.3@19.34
-# Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
@@ -7,24 +6,27 @@
 #
 
 PORTNAME=	mule-common
-PORTVERSION=	2.3
+PORTVERSION=	${MULE_VERSION}
 CATEGORIES=	editors japanese
 MASTER_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
 		ftp://ftp.mei.co.jp/archive/free/gnu/emacs/Mule/ \
 		ftp://ftp.iij.ad.jp/pub/misc/mule/ \
 		http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/mule/
-DISTNAME=	mule-${PORTVERSION}
-DISTFILES=	emacs-19.34b.tar.gz mule-2.3-19.34.patch-981002.tar.gz
+DISTFILES=	emacs-${EMACS_VERSION}b${EXTRACT_SUFX} \
+		mule-${MULE_VERSION}-${EMACS_VERSION}.patch-981002.tar.gz
 
 PATCH_SITES=	ftp://etlport.etl.go.jp/pub/mule/
-PATCHFILES=	mule-23-1934-alpha01.diff.gz
+PATCHFILES=	mule-${MULE_VERSION:S/.//}-${EMACS_VERSION:S/.//}-alpha01.diff.gz
 PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	taoka@FreeBSD.org
 
+MULE_VERSION=	2.3
+EMACS_VERSION=	19.34
+
 .include <bsd.port.pre.mk>
 
-WRKDIRBASE!=	${ECHO} ${WRKDIRPREFIX}${.CURDIR} | sed s:/editors/mule-common$$::
+WRKDIRBASE=	${WRKDIRPREFIX}${.CURDIR:S,/editors/mule-common$,,}
 
 .for dir in 	chinese/mule-wnn4 \
 		editors/mule \
@@ -46,7 +48,7 @@ WRKDIR=		${WRKDIRBASE}/${dir}/work
 WRKDIR?=	${WRKDIRBASE}/${dir}/work
 .endif
 .endfor
-WRKSRC= ${WRKDIR}/emacs-19.34
+WRKSRC=		${WRKDIR}/emacs-${EMACS_VERSION}
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/mule.sh
 
 .if !defined(WRKDIR)
@@ -63,7 +65,7 @@ BROKEN=		You should build install one of the other mule ports first
 INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
 PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
 TMPPLIST=	${WRKDIR}/.PLIST.mktmp-${PKGNAME}
-PLIST_SUB=	EMACS_VERSION=19.34 EMACS_ARCH=${CONFIGURE_TARGET}
+PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${CONFIGURE_TARGET}
 
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
@@ -88,10 +90,10 @@ ELC_DIR=	../lisp
 #   MEW_ORG_PATCH: apply mew's patches to original mule (http://www.mew.org)
 #   MEW_PATCH: apply mew's patch after apply Mr. Katayama's patches
 post-extract:
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3-19.34.patch-981002.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-${MULE_VERSION}-${EMACS_VERSION}.patch-981002.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
 	${CP} ${FILESDIR}/unexfreebsd.c ${WRKSRC}/src
 .if !defined(ORIGINAL) && !defined(MEW_ORG_PATCH)
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-19.34.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-${EMACS_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
 	${MKDIR} ${WRKSRC}/lisp/its
 	${CP} ${WRKDIR}/lisp/its/* ${WRKSRC}/lisp/its/
 .endif
@@ -99,24 +101,24 @@ post-extract:
 .if !defined(ORIGINAL)
 post-patch:
 .if !defined(MEW_ORG_PATCH)
-	cd ${WRKSRC}; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/patch-19.34
-	cd ${WRKSRC}; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/Mule-2.3-19.34.patch
+	cd ${WRKSRC}; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/patch-${EMACS_VERSION}
+	cd ${WRKSRC}; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/Mule-${MULE_VERSION}-${EMACS_VERSION}.patch
 	cd ${WRKSRC}; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/extra.patch
 .if defined(MEW_PATCH)
-	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/egg.el-19.34.patch-for_katayama
+	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/egg.el-${EMACS_VERSION}.patch-for_katayama
 .endif
 .else
-	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/egg.el-19.34.patch
+	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/egg.el-${EMACS_VERSION}.patch
 .endif
 .if defined(MEW_PATCH) || defined(MEW_ORG_PATCH)
-	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/canna.el-19.34.patch
+	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/canna.el-${EMACS_VERSION}.patch
 	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/sj3-egg.el.patch
 .endif
 .endif
 
 pre-build:
 	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
-	${RM} -f ${WRKSRC}/etc/DOC* ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-19.34.*
+	${RM} -f ${WRKSRC}/etc/DOC* ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VERSION}.*
 
 post-build:
 # bytecompile elisps for Japanese input method
@@ -131,9 +133,9 @@ post-install:
 .for file in b2m coco ctags emacsclient etags m2ps
 	strip ${PREFIX}/bin/${file}
 .endfor
-	if [ ! -f ${PREFIX}/share/mule/19.34/info/dir ]; then \
-	  ${MKDIR} ${PREFIX}/share/mule/19.34/info; \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/share/mule/19.34/info/dir; \
+	if [ ! -f ${PREFIX}/share/mule/${EMACS_VERSION}/info/dir ]; then \
+	  ${MKDIR} ${PREFIX}/share/mule/${EMACS_VERSION}/info; \
+	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/share/mule/${EMACS_VERSION}/info/dir; \
 	fi
 .for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message
 	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir