aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chinese/mule-freewnn/Makefile2
-rw-r--r--editors/mule-common/Makefile40
-rw-r--r--editors/mule/Makefile39
-rw-r--r--japanese/mule-canna+freewnn+sj3/Makefile2
-rw-r--r--japanese/mule-canna+freewnn/Makefile2
-rw-r--r--japanese/mule-canna+sj3+wnn6/Makefile2
-rw-r--r--japanese/mule-canna+sj3+wnn7/Makefile2
-rw-r--r--japanese/mule-canna+sj3/Makefile2
-rw-r--r--japanese/mule-canna+wnn6/Makefile2
-rw-r--r--japanese/mule-canna+wnn7/Makefile2
-rw-r--r--japanese/mule-canna/Makefile2
-rw-r--r--japanese/mule-freewnn+sj3/Makefile2
-rw-r--r--japanese/mule-freewnn/Makefile2
-rw-r--r--japanese/mule-sj3+wnn6/Makefile2
-rw-r--r--japanese/mule-sj3+wnn7/Makefile2
-rw-r--r--japanese/mule-sj3/Makefile2
-rw-r--r--japanese/mule-wnn6/Makefile2
-rw-r--r--japanese/mule-wnn7/Makefile2
-rw-r--r--korean/mule-freewnn/Makefile2
-rw-r--r--textproc/coco/Makefile40
20 files changed, 80 insertions, 73 deletions
diff --git a/chinese/mule-freewnn/Makefile b/chinese/mule-freewnn/Makefile
index f723fb534e28..015d8c6dbcb7 100644
--- a/chinese/mule-freewnn/Makefile
+++ b/chinese/mule-freewnn/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -wnn4
-CATEGORIES= chinese editors
+CATEGORIES= chinese
CWNN4= yes
MASTERDIR= ${.CURDIR}/../../editors/mule
diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index 9ef0d94b2343..454eaa05fdc1 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/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
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 9afccf2de862..6cc4477b79f3 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: mule 2.3@19.34
-# Version required: 2.3@19.34
# Date created: 6 July 1997
# Whom: Satoshi Taoka <taoka@FreeBSD.org>
#
@@ -7,27 +6,31 @@
#
PORTNAME= mule
-PORTVERSION= 2.3
-CATEGORIES?= editors
+PORTVERSION= ${MULE_VERSION}
+CATEGORIES+= editors
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/
-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
-RUN_DEPENDS= ${PREFIX}/share/${EMACS_PREFIX}/19.34/lisp/mule.el:${PORTSDIR}/editors/mule-common
+RUN_DEPENDS= ${PREFIX}/share/${EMACS_PREFIX}/${EMACS_VERSION}/lisp/mule.el:${PORTSDIR}/editors/mule-common
LIB_DEPENDS= ${LIB_INPUT_METHOD}
BUILD_DEPENDS= ${BUILD_INPUT_METHOD}
+MULE_VERSION= 2.3
+EMACS_VERSION= 19.34
+
USE_XLIB= yes
-EXTRACT_ONLY= emacs-19.34b.tar.gz
-WRKSRC= ${WRKDIR}/emacs-19.34
+EXTRACT_ONLY= emacs-${EMACS_VERSION}b${EXTRACT_SUFX}
+WRKSRC= ${WRKDIR}/emacs-${EMACS_VERSION}
PATCHDIR= ${.CURDIR}/../../editors/mule-common/patches
FILESDIR= ${.CURDIR}/../../editors/mule-common/files
SCRIPTDIR= ${.CURDIR}/../../editors/mule-common/scripts
@@ -81,7 +84,7 @@ ELC_DIR= ../lisp
WITH_DIALOGS= --with-x-toolkit
-SITE_START=${PREFIX}/share/${EMACS_PREFIX}/19.34/site-lisp/site-start.el
+SITE_START=${PREFIX}/share/${EMACS_PREFIX}/${EMACS_VERSION}/site-lisp/site-start.el
# ORIGINAL, MEW_ORG_PATCH and MEW_PATCH are used for debugging.
#
@@ -89,10 +92,10 @@ SITE_START=${PREFIX}/share/${EMACS_PREFIX}/19.34/site-lisp/site-start.el
# 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
@@ -100,24 +103,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
@@ -137,7 +140,7 @@ pre-install:
fi
post-install:
- strip ${PREFIX}/bin/${EMACS_EXECUTABLE}-19.34
+ strip ${PREFIX}/bin/${EMACS_EXECUTABLE}-${EMACS_VERSION}
# for wnn4+sj3 or wnn6+sj3
@if [ -e ${PKGDIR}/INSTALL ]; then \
${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL; \
diff --git a/japanese/mule-canna+freewnn+sj3/Makefile b/japanese/mule-canna+freewnn+sj3/Makefile
index e038f7c78bc6..8abf8ac88b40 100644
--- a/japanese/mule-canna+freewnn+sj3/Makefile
+++ b/japanese/mule-canna+freewnn+sj3/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -canna+sj3+wnn4
-CATEGORIES= japanese editors
+CATEGORIES= japanese
CANNA= yes
SJ3= yes
diff --git a/japanese/mule-canna+freewnn/Makefile b/japanese/mule-canna+freewnn/Makefile
index b36d487ebac4..7d7a7383e5e4 100644
--- a/japanese/mule-canna+freewnn/Makefile
+++ b/japanese/mule-canna+freewnn/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -canna+wnn4
-CATEGORIES= japanese editors
+CATEGORIES= japanese
CANNA= yes
WNN4= yes
diff --git a/japanese/mule-canna+sj3+wnn6/Makefile b/japanese/mule-canna+sj3+wnn6/Makefile
index 1024913f4faf..96a18c04a148 100644
--- a/japanese/mule-canna+sj3+wnn6/Makefile
+++ b/japanese/mule-canna+sj3+wnn6/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -canna+sj3+wnn6
-CATEGORIES= japanese editors
+CATEGORIES= japanese
CANNA= yes
SJ3= yes
diff --git a/japanese/mule-canna+sj3+wnn7/Makefile b/japanese/mule-canna+sj3+wnn7/Makefile
index 1024913f4faf..96a18c04a148 100644
--- a/japanese/mule-canna+sj3+wnn7/Makefile
+++ b/japanese/mule-canna+sj3+wnn7/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -canna+sj3+wnn6
-CATEGORIES= japanese editors
+CATEGORIES= japanese
CANNA= yes
SJ3= yes
diff --git a/japanese/mule-canna+sj3/Makefile b/japanese/mule-canna+sj3/Makefile
index d623c1fc2bc6..409ef4d73961 100644
--- a/japanese/mule-canna+sj3/Makefile
+++ b/japanese/mule-canna+sj3/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -canna+sj3
-CATEGORIES= japanese editors
+CATEGORIES= japanese
CANNA= yes
SJ3= yes
diff --git a/japanese/mule-canna+wnn6/Makefile b/japanese/mule-canna+wnn6/Makefile
index e16ac7ae5a5f..9662c4cc342b 100644
--- a/japanese/mule-canna+wnn6/Makefile
+++ b/japanese/mule-canna+wnn6/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -canna+wnn6
-CATEGORIES= japanese editors
+CATEGORIES= japanese
CANNA= yes
WNN6= yes
diff --git a/japanese/mule-canna+wnn7/Makefile b/japanese/mule-canna+wnn7/Makefile
index e16ac7ae5a5f..9662c4cc342b 100644
--- a/japanese/mule-canna+wnn7/Makefile
+++ b/japanese/mule-canna+wnn7/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -canna+wnn6
-CATEGORIES= japanese editors
+CATEGORIES= japanese
CANNA= yes
WNN6= yes
diff --git a/japanese/mule-canna/Makefile b/japanese/mule-canna/Makefile
index 9b082632ebac..a018e018f7b4 100644
--- a/japanese/mule-canna/Makefile
+++ b/japanese/mule-canna/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -canna
-CATEGORIES= japanese editors
+CATEGORIES= japanese
CANNA= yes
diff --git a/japanese/mule-freewnn+sj3/Makefile b/japanese/mule-freewnn+sj3/Makefile
index 2c6fb83e59c2..01b58e5fab10 100644
--- a/japanese/mule-freewnn+sj3/Makefile
+++ b/japanese/mule-freewnn+sj3/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -sj3+wnn4
-CATEGORIES= japanese editors
+CATEGORIES= japanese
SJ3= yes
WNN4= yes
diff --git a/japanese/mule-freewnn/Makefile b/japanese/mule-freewnn/Makefile
index 401f0188d64c..382769b9cf0f 100644
--- a/japanese/mule-freewnn/Makefile
+++ b/japanese/mule-freewnn/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -wnn4
-CATEGORIES= japanese editors
+CATEGORIES= japanese
WNN4= yes
diff --git a/japanese/mule-sj3+wnn6/Makefile b/japanese/mule-sj3+wnn6/Makefile
index 7173c41608c9..499628a4243c 100644
--- a/japanese/mule-sj3+wnn6/Makefile
+++ b/japanese/mule-sj3+wnn6/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -sj3+wnn6
-CATEGORIES= japanese editors
+CATEGORIES= japanese
SJ3= yes
WNN6= yes
diff --git a/japanese/mule-sj3+wnn7/Makefile b/japanese/mule-sj3+wnn7/Makefile
index 7173c41608c9..499628a4243c 100644
--- a/japanese/mule-sj3+wnn7/Makefile
+++ b/japanese/mule-sj3+wnn7/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -sj3+wnn6
-CATEGORIES= japanese editors
+CATEGORIES= japanese
SJ3= yes
WNN6= yes
diff --git a/japanese/mule-sj3/Makefile b/japanese/mule-sj3/Makefile
index fd4d004e761b..abba2ca59029 100644
--- a/japanese/mule-sj3/Makefile
+++ b/japanese/mule-sj3/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -sj3
-CATEGORIES= japanese editors
+CATEGORIES= japanese
SJ3= yes
diff --git a/japanese/mule-wnn6/Makefile b/japanese/mule-wnn6/Makefile
index 7efc7665b988..adf299b8db75 100644
--- a/japanese/mule-wnn6/Makefile
+++ b/japanese/mule-wnn6/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -wnn6
-CATEGORIES= japanese editors
+CATEGORIES= japanese
WNN6= yes
diff --git a/japanese/mule-wnn7/Makefile b/japanese/mule-wnn7/Makefile
index 7efc7665b988..adf299b8db75 100644
--- a/japanese/mule-wnn7/Makefile
+++ b/japanese/mule-wnn7/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -wnn6
-CATEGORIES= japanese editors
+CATEGORIES= japanese
WNN6= yes
diff --git a/korean/mule-freewnn/Makefile b/korean/mule-freewnn/Makefile
index 472f8f831da1..e5319df99f94 100644
--- a/korean/mule-freewnn/Makefile
+++ b/korean/mule-freewnn/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -wnn4
-CATEGORIES= korean editors
+CATEGORIES= korean
KWNN4= yes
MASTERDIR= ${.CURDIR}/../../editors/mule
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 00:59:34 +0000