6 files changed, 5 insertions, 89 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 02ce29928fd7..74e0a8db417a 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -166,7 +166,6 @@
     SUBDIR += kterm
     SUBDIR += kterm16c
     SUBDIR += lambdamoo
-    SUBDIR += latex-japanese
     SUBDIR += latex2html
     SUBDIR += leafrogue
     SUBDIR += less
@@ -275,6 +274,7 @@
     SUBDIR += php_doc
     SUBDIR += plain2
     SUBDIR += plan
+    SUBDIR += platex-japanese
     SUBDIR += platex-jsclasses
     SUBDIR += platex-otf
     SUBDIR += platex209
diff --git a/japanese/latex-japanese/Makefile b/japanese/latex-japanese/Makefile
deleted file mode 100644
index adb241683ca6..000000000000
--- a/japanese/latex-japanese/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# New ports collection makefile for:	latex-japanese
-# Date created:		2007-11-19
-# Whom:			Koji Yokota <yokota@res.otaru-uc.ac.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	japanese
-PORTVERSION=	1.3
-CATEGORIES=	japanese print
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR=	language/japanese
-PKGNAMEPREFIX=	latex-
-DISTNAME=	${PORTNAME}
-DIST_SUBDIR=	latex
-
-MAINTAINER=	yokota@res.otaru-uc.ac.jp
-COMMENT=	LaTeX package that literally provides japanese option to babel
-
-BUILD_DEPENDS=	${LOCALBASE}/share/texmf:${PORTSDIR}/print/teTeX-texmf \
-		ptex:${PORTSDIR}/japanese/ptex \
-		iconv:${PORTSDIR}/converters/libiconv
-
-USE_ZIP=	yes
-
-TEXMFDIR=	share/texmf
-STYDIR=		tex/generic/babel
-DOCSDIR=	doc/generic/babel/${PORTNAME}
-INSFILE=	${PORTNAME}.ins
-DTXFILE=	${PORTNAME}.dtx
-LDFFILE=	${PORTNAME}.ldf
-SAMPLEFILE=	sample.tex
-PDFFILE=	sample.pdf
-TEXTFILE=	README
-ENCODING?=	EUC-JP
-ICONV=		${LOCALBASE}/bin/iconv
-MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
-
-.SILENT::
-pre-configure:
-	@${ECHO_MSG}
-	@${ECHO_MSG} Using ${ENCODING} to set locale of installing files.
-	@${ECHO_MSG} To change it, set the $$\{ENCODING\} variable to a desirable iconv\'s locale.
-	@${ECHO_MSG} See \'iconv -l\' for available values.
-	@${ECHO_MSG}
-
-post-configure:
-	( cd ${WRKSRC} && ${MV} ${INSFILE} ${INSFILE:S/$/.orig/} && \
-	   ${SED} -e 's/\(sample\.tex\)/j\1/g' ${INSFILE:S/$/.orig/} \
-	   > ${INSFILE} && \
-	   ${MV} ${DTXFILE} ${DTXFILE}.orig && \
-	   ${ICONV} -f ISO-2022-JP -t ${ENCODING} ${DTXFILE}.orig > ${DTXFILE} )
-
-do-build:
-	( cd ${WRKSRC} && platex ${INSFILE} && \
-	   ${MV} j${SAMPLEFILE} ${SAMPLEFILE})
-
-do-install:
-	( cd ${WRKSRC} && \
-	   ${MKDIR} ${PREFIX}/${TEXMFDIR}/${STYDIR} && \
-	   ${CP} -pv ${LDFFILE} ${PREFIX}/${TEXMFDIR}/${STYDIR} )
-.if !defined(NOPORTDOCS)
-	( cd ${WRKSRC} && \
-	   ${MKDIR} ${PREFIX}/${TEXMFDIR}/${DOCSDIR} && \
-	   for _FILE in ${PDFFILE} ${TEXTFILE} ${SAMPLEFILE} ; do \
-	   ${CP} -pv $${_FILE} ${PREFIX}/${TEXMFDIR}/${DOCSDIR} ; done )
-.endif
-
-post-install:
-	${MKTEXLSR} ${PREFIX}/${TEXMFDIR}
-
-.include <bsd.port.mk>
diff --git a/japanese/latex-japanese/distinfo b/japanese/latex-japanese/distinfo
deleted file mode 100644
index 8c5eff3f5e21..000000000000
--- a/japanese/latex-japanese/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (latex/japanese.zip) = 8475593270897f261e8b010aa5529ecd
-SHA256 (latex/japanese.zip) = 96d6d0b625ff58dc10bb66ead14fb297ca9ce19e95f9f4686f775f67eddeea2d
-SIZE (latex/japanese.zip) = 49436
diff --git a/japanese/latex-japanese/pkg-descr b/japanese/latex-japanese/pkg-descr
deleted file mode 100644
index 58f8cefd6991..000000000000
--- a/japanese/latex-japanese/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-The original babel package for LaTeX does not have an option Japanese.
-This port adds Japanese option to babel.
-
-WWW:    http://www.ctan.org/tex-archive/language/japanese/japanese/
diff --git a/japanese/latex-japanese/pkg-plist b/japanese/latex-japanese/pkg-plist
deleted file mode 100644
index 9e8ae2237c7d..000000000000
--- a/japanese/latex-japanese/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $FreeBSD$
-%%PORTDOCS%%share/texmf/doc/generic/babel/japanese/README
-%%PORTDOCS%%share/texmf/doc/generic/babel/japanese/sample.pdf
-%%PORTDOCS%%share/texmf/doc/generic/babel/japanese/sample.tex
-share/texmf/tex/generic/babel/japanese.ldf
-%%PORTDOCS%%@dirrm share/texmf/doc/generic/babel/japanese
diff --git a/japanese/platex-japanese/Makefile b/japanese/platex-japanese/Makefile
index adb241683ca6..3999407ab073 100644
--- a/japanese/platex-japanese/Makefile
+++ b/japanese/platex-japanese/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	latex-japanese
+# New ports collection makefile for:	platex-japanese
 # Date created:		2007-11-19
 # Whom:			Koji Yokota <yokota@res.otaru-uc.ac.jp>
 #
@@ -7,15 +7,16 @@
 
 PORTNAME=	japanese
 PORTVERSION=	1.3
+PORTREVIISION=	1
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	language/japanese
-PKGNAMEPREFIX=	latex-
+PKGNAMEPREFIX=	platex-
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	latex
 
 MAINTAINER=	yokota@res.otaru-uc.ac.jp
-COMMENT=	LaTeX package that literally provides japanese option to babel
+COMMENT=	pLaTeX package that literally provides japanese option to babel
 
 BUILD_DEPENDS=	${LOCALBASE}/share/texmf:${PORTSDIR}/print/teTeX-texmf \
 		ptex:${PORTSDIR}/japanese/ptex \