- Add CONFLICTS as a preparation of importing new TeX ports based on TeXLive.

  No functional change.
- Style fixes.

9 files changed, 53 insertions, 54 deletions

diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile
index 196331a..e3077456 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 b35b505..2b7bd53 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 addca6a..48d7afc 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 4dfcd5e..580021f 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
diff --git a/print/dvipsk-tetex/Makefile b/print/dvipsk-tetex/Makefile
index 32375bc..7f3dba7 100644
--- a/print/dvipsk-tetex/Makefile
+++ b/print/dvipsk-tetex/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    dvipsk-tetex
-# Date created:         5 May 2004
-# Whom:                 hrs
-#
 # $FreeBSD$
 
 PORTNAME=	dvipsk-tetex
 PORTVERSION=	5.95a
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
@@ -53,7 +49,10 @@ CONFLICTS=	*-teTeX-[0-9]* \
 		ja-ptex-*-[0-9]* \
 		dvips-[0-9]* \
 		*-dvips-[0-9]* \
-		*-dvipsk-[0-9]*
+		*-dvipsk-[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/print/teTeX-base/Makefile b/print/teTeX-base/Makefile
index cf05e6b..a13fdc3 100644
--- a/print/teTeX-base/Makefile
+++ b/print/teTeX-base/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	teTeX-base
-# Date created:		5 December 1996
-# Whom:			Bernd Rosauer <br@netland.inka.de>
-#
+# Created by: Bernd Rosauer <br@netland.inka.de>
 # $FreeBSD$
-#
 
 PORTNAME=	teTeX-base
 PORTVERSION=	3.0
-PORTREVISION=	23
+PORTREVISION=	24
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
@@ -26,8 +22,9 @@ RUN_DEPENDS=	${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib \
-		gd.4:${PORTSDIR}/graphics/gd
+		gd.4:${PORTSDIR}/${GD_PORT}
 
+GD_PORT?=	graphics/gd
 WRKSRC=		${WRKDIR}/tetex-src-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -53,7 +50,10 @@ CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
 PKGMESSAGE=	${WRKDIR}/pkg-message
 CONFLICTS=	ja-ptex-base-[0-9]* latex2e-[0-9]* \
-		tex-[0-9]* dvips-[0-9]* xdvi-[0-9]*
+		tex-[0-9]* dvips-[0-9]* xdvi-[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=	tie.1 kpseaccess.1 kpsereadlink.1 mpost.1 \
 	dmp.1 dvicopy.1 dvilj.1 dvipdfm.1 \
diff --git a/print/teTeX-texmf/Makefile b/print/teTeX-texmf/Makefile
index 1ce17be..f587d28 100644
--- a/print/teTeX-texmf/Makefile
+++ b/print/teTeX-texmf/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	teTeX-texmf
-# Date created:		5 June 2004
-# Whom:			hrs
-#
 # $FreeBSD$
 
 PORTNAME=	teTeX-texmf
 PORTVERSION=	3.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
@@ -24,7 +20,10 @@ RUN_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/share/fonts/amsfonts/doc/fonts/amsfonts/00README:${PORTSDIR}/print/font-amsfonts
 
 CONFLICTS=	latex2e-[0-9]* tex-[0-9]* dvips-[0-9]* xdvi-[0-9]* \
-		ja-ptext-base-[0-9]*
+		ja-ptext-base-[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]*
 
 .include <bsd.port.pre.mk>
 
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index a888ef8..a3387c7 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	teTeX
-# Date created:		5 December 1996
-# Whom:			Bernd Rosauer <br@netland.inka.de>
-#
+# Created by: Bernd Rosauer <br@netland.inka.de>
 # $FreeBSD$
-#
 
 PORTNAME=	teTeX
 PORTVERSION=	3.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -34,7 +30,10 @@ RUN_DEPENDS+=	xdvi:${PORTSDIR}/print/xdvik
 #      in print/teTeX-base.
 DEPENDS_ARGS+=	BATCH=yes
 
-CONFLICTS=	latex2e-[0-9]* tex-[0-9]* dvips-[0-9]* xdvi-[0-9]*
+CONFLICTS=	latex2e-[0-9]* tex-[0-9]* dvips-[0-9]* xdvi-[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]*
 
 .if defined(WITH_LETTERSIZE)
 FLAVOR+=	letter
diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index 850fc7b..ac7814a 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:   xdvik
-# Date created:        26 Feb 1998
-# Whom:                Kentaro Inagaki <JBD01226@niftyserve.ne.jp>
-#
+# Created by: Kentaro Inagaki <JBD01226@niftyserve.ne.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	xdvik
 PORTVERSION=	22.84.16
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	SF/xdvi/${PORTNAME}/${PORTVERSION}
 PKGNAMESUFFIX=	-tetex
@@ -39,7 +35,10 @@ INSTALL_WRKSRC=	${WRKSRC}/texk/xdvik
 
 PLIST_SUB=	TEXMFDIR=${TEXMFDIR} TEXMFCONFIGDIR=${TEXMFDIR}-config
 CONFLICTS_INSTALL=	xdvi-[0-9]* xdvi-*-[0-9]* *-xdvi-[0-9]* \
-			*-xdvik-[0-9]* ja-xdvik-*-[0-9]*
+			*-xdvik-[0-9]* ja-xdvik-*-[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=		xdvi.1
 MLINKS=		xdvi.1 oxdvi.1