7 files changed, 22 insertions, 67 deletions

diff --git a/japanese/mendexk-euc/Makefile b/japanese/mendexk-euc/Makefile
index bf04cf7decdd..b5f5751a0659 100644
--- a/japanese/mendexk-euc/Makefile
+++ b/japanese/mendexk-euc/Makefile
@@ -9,13 +9,18 @@ PORTNAME=	mendexk
 PORTVERSION=	2.5
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/mendex/
-PKGNAMESUFFIX=	-euc
+PKGNAMESUFFIX=	-${KANJICODE}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	watanabe@zlab.phys.nagoya-u.ac.jp
-COMMENT=	Index formatter for Japanese (EUC)
+COMMENT=	Index formatter for Japanese
+
+KANJICODE?=	euc
 
 EXTRACT_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/japanese/ptex-base:configure
+.if ${KANJICODE} == "sjis"
+EXTRACT_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
+.endif
 
 USE_GMAKE=	yes
 DIST_SUBDIR=	teTeX
@@ -23,6 +28,7 @@ WRKSRC=	${WRKDIRPREFIX}${.CURDIR}/../ptex-base/work/tetex-src-${TETEX_VERSION}/t
 ALL_TARGET=	mendex
 
 TETEX_VERSION=	2.0.2
+KANJI_FILES=	kana.h ktable.h
 
 MANLANG=	ja
 MAN1=		mendex.1
@@ -30,6 +36,13 @@ MAN1=		mendex.1
 post-extract:
 	@${RM} -rf ${WRKSRC}
 	@${MV} ${WRKDIR}/${DISTNAME} ${WRKSRC}
+.if ${KANJICODE} == "sjis"
+	@( cd ${WRKSRC} ; \
+	    for i in ${KANJI_FILES}; do \
+	      ${MV} $$i $$i.orig ; \
+	      nkf -s $$i.orig > $$i ; \
+	    done )
+.endif
 
 pre-build:
 	@(cd ${WRKSRC}/../kpathsea; ${MAKE})
@@ -39,8 +52,8 @@ do-install:
 	@${MKDIR} ${PREFIX}/man/${MANLANG}/man1
 	@${INSTALL_MAN} ${WRKSRC}/mendex.1 ${PREFIX}/man/${MANLANG}/man1
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/mendex
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mendex
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 pre-clean:
diff --git a/japanese/mendexk-euc/pkg-descr b/japanese/mendexk-euc/pkg-descr
index 33bd400e5190..1d725a95fc4c 100644
--- a/japanese/mendexk-euc/pkg-descr
+++ b/japanese/mendexk-euc/pkg-descr
@@ -1,7 +1,5 @@
 The program mendex is a index formatter for Japanese, has
 the compatibility with makeindex.
 
-The mendex installed using this package supports EUC code.
-
 - Makoto WATANABE
 watanabe@zlab.phys.nagoya-u.ac.jp
diff --git a/japanese/mendexk-euc/pkg-plist b/japanese/mendexk-euc/pkg-plist
index c3f4a0811320..b9e27663b8af 100644
--- a/japanese/mendexk-euc/pkg-plist
+++ b/japanese/mendexk-euc/pkg-plist
@@ -1,3 +1,3 @@
 bin/mendex
-share/doc/mendex/README
-@dirrm share/doc/mendex
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/mendexk-sjis/Makefile b/japanese/mendexk-sjis/Makefile
index f9f76fe64c02..4858ef9060e8 100644
--- a/japanese/mendexk-sjis/Makefile
+++ b/japanese/mendexk-sjis/Makefile
@@ -5,51 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	mendexk
-PKGNAMESUFFIX=	-sjis
-PORTVERSION=	2.4d
-CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/mendex/ \
-		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/web2c/
-DISTNAME=	${PORTNAME}${PORTVERSION}
+KANJICODE=	sjis
+MASTERDIR=	${.CURDIR}/../mendexk-euc
 
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${KPATHSEA_PARENT}${EXTRACT_SUFX}
-
-MAINTAINER=	watanabe@zlab.phys.nagoya-u.ac.jp
-COMMENT=	Index formatter for Japanese (SJIS)
-
-BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
-
-USE_GMAKE=	yes
-DIST_SUBDIR=	ptex
-
-MANLANG=	ja
-MAN1=		mendex.1
-
-KPATHSEA_PARENT=	web2c-7.2
-
-KANJI_FILES=	kana.h ktable.h
-
-pre-configure:
-	@( cd ${WRKDIR}/${KPATHSEA_PARENT}/kpathsea ; \
-	    ./configure --prefix=${PREFIX} )
-	@( cd ${WRKSRC} ; \
-	    for i in ${KANJI_FILES}; do \
-	      ${MV} $$i $$i.orig ; \
-	      nkf -s $$i.orig > $$i ; \
-	    done )
-
-do-build:
-	@( cd ${WRKDIR}/${KPATHSEA_PARENT}/kpathsea ; ${GMAKE} )
-	@( cd ${WRKSRC} ; ${MAKE} kpathsea_parent=../${KPATHSEA_PARENT} )
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/mendex ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/man/${MANLANG}/man1
-	@${INSTALL_MAN} ${WRKSRC}/mendex.1 ${PREFIX}/man/${MANLANG}/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/mendex
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mendex
-.endif
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/mendexk-sjis/distinfo b/japanese/mendexk-sjis/distinfo
deleted file mode 100644
index d6486fd1c10e..000000000000
--- a/japanese/mendexk-sjis/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (ptex/mendexk2.4d.tar.gz) = 74c36aeeff187e7208a2fa8c26226f94
-MD5 (ptex/web2c-7.2.tar.gz) = 1451b51656d9624bee4052f6688af4cf
diff --git a/japanese/mendexk-sjis/pkg-descr b/japanese/mendexk-sjis/pkg-descr
deleted file mode 100644
index c217b5225b3c..000000000000
--- a/japanese/mendexk-sjis/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-The program mendex is a index formatter for Japanese, has
-the compatibility with makeindex.
-
-The mendex installed using this package supports SJIS code.
-
-- Makoto WATANABE
-watanabe@zlab.phys.nagoya-u.ac.jp
diff --git a/japanese/mendexk-sjis/pkg-plist b/japanese/mendexk-sjis/pkg-plist
deleted file mode 100644
index c3f4a0811320..000000000000
--- a/japanese/mendexk-sjis/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/mendex
-share/doc/mendex/README
-@dirrm share/doc/mendex