4 files changed, 23 insertions, 20 deletions

diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile
index 196331a5b756..e307745614cd 100644
--- a/japanese/dvipsk/Makefile
+++ b/japanese/dvipsk/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:    dvipsk + jpatch
-# Date created:         25 Aug 1997
-# Whom:                 Makoto WATANABE <watanabe@zlab.phys.nagoya-u.ac.jp>
-#
+# Created by: Makoto WATANABE <watanabe@zlab.phys.nagoya-u.ac.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	dvipsk
 PORTVERSION=	5.95b
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		${MASTER_SITE_LOCAL:S,%SUBDIR%,hrs/teTeX,:S,$,:udvipspatch,}
@@ -62,7 +58,10 @@ CONFIGURE_ARGS= --disable-multiplatform \
 		--with-t1lib-include=${LIBT1_PREFIX}/include \
 		--without-xdvik --without-oxdvik
 CONFLICTS=	dvipsk-tetex-[0-9]* \
-		dvips-[0-9]*
+		dvips-[0-9]* \
+		texlive-[0-9]* tex-web2c-[0-9]* \
+		tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
+		tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]*
 
 MAN1=		dvips.1 afm2tfm.1
 MLINKS=		dvips.1 odvips.1
diff --git a/japanese/ptex/Makefile b/japanese/ptex/Makefile
index b35b50589c11..2b7bd5347c62 100644
--- a/japanese/ptex/Makefile
+++ b/japanese/ptex/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ptex
 PORTVERSION=	3.1.10
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/:1 \
@@ -32,6 +32,11 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
 
+CONFLICTS_INSTALL= \
+		texlive-[0-9]* tex-web2c-[0-9]* \
+		tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
+		tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]*
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${KANJICODE}
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
diff --git a/japanese/teTeX/Makefile b/japanese/teTeX/Makefile
index addca6a23d70..48d7afc8f97f 100644
--- a/japanese/teTeX/Makefile
+++ b/japanese/teTeX/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	teTeX
-# Date created:		3 June 2004
-# Whom:			hrs
-#
 # $FreeBSD$
 
 PORTNAME=	teTeX
 PORTVERSION=	1.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -26,6 +22,10 @@ RUN_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 RUN_DEPENDS+=	xdvi:${PORTSDIR}/japanese/xdvik
 .endif
 
+CONFLICTS=	texlive-[0-9]* tex-web2c-[0-9]* \
+		tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
+		tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]* 
+
 JTEXVF=		${LOCALBASE}/share/texmf-local/fonts/vf/n2a/dmjsy5.vf
 TEXMFLOCAL_LSR=	${LOCALBASE}/share/texmf-local/ls-R
 TEXMFDISTDIR=	share/texmf-dist
diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 4dfcd5ebfdcd..580021fcaf36 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:   xdvik + jp-patch
-# Date created:        15 Jun 1998
-# Whom:                Kentaro Inagaki <inagaki@tg.rim.or.jp>
-#
+# Created by: Kentaro Inagaki <inagaki@tg.rim.or.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	xdvik
 PORTVERSION=	${VERSION_XDVIK}.${VERSION_JPATCH}
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	japanese print
 MASTER_SITES=	SF/xdvi/OldFiles
 PKGNAMESUFFIX=	-tetex
@@ -64,7 +60,10 @@ MAN1=		xdvi.1 xdvizilla.1 t1mapper.1
 INSTALL_WRKSRC=	${WRKSRC}/texk/xdvik
 PLIST_SUB=	TEXMFDIR=${TEXMFDIR} MKTEXLSR=${MKTEXLSR} \
 		XDVIETCDIR=${XDVIETCDIR}
-CONFLICTS=	xdvi-[0-9]* xdvi-*-[0-9]* xdvik-[0-9]*
+CONFLICTS=	texlive-[0-9]* tex-web2c-[0-9]* \
+		tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
+		tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]* \
+		xdvi-[0-9]* xdvi-*-[0-9]* xdvik-[0-9]*
 
 VERSION_XDVIK=	22.40y1
 VERSION_JPATCH=	1.21