Remove teTeX* packages and references to them.

teTeX was desupported in 2006, and we have texlive in pkgsrc since 2009.

62 files changed, 63 insertions, 180 deletions

diff --git a/fonts/gsftopkk/Makefile b/fonts/gsftopkk/Makefile
index c7dc81dfcf0..a61a8dc012e 100644
--- a/fonts/gsftopkk/Makefile
+++ b/fonts/gsftopkk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/06/20 20:50:49 markd Exp $
+# $NetBSD: Makefile,v 1.13 2017/09/06 16:49:22 wiz Exp $
 
 DISTNAME=	texlive-20170524-source
 PKGNAME=	gsftopkk-1.19.2
@@ -11,8 +11,6 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://math.berkeley.edu/~vojta/gsftopk.html
 COMMENT=	Tool to convert bitmaps to .pk format
 
-CONFLICTS+=	teTeX-bin<=3.0nb34
-
 EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
 			${DISTNAME}/texk/gsftopk
 
diff --git a/fonts/ps2pkm/Makefile b/fonts/ps2pkm/Makefile
index c4afedcb030..bb756465da6 100644
--- a/fonts/ps2pkm/Makefile
+++ b/fonts/ps2pkm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/06/20 20:50:49 markd Exp $
+# $NetBSD: Makefile,v 1.12 2017/09/06 16:49:22 wiz Exp $
 
 DISTNAME=	texlive-20170524-source
 PKGNAME=	ps2pkm-1.8
@@ -11,7 +11,6 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.tug.org/texlive/
 COMMENT=	Tool to convert PostSCript fonts into TeX PK fonts
 
-CONFLICTS+=	teTeX-bin<=3.0nb34
 DEPENDS+=	kpathsea>=6.0.1:../../print/kpathsea
 
 EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
diff --git a/fonts/t1lib/MESSAGE b/fonts/t1lib/MESSAGE
index 5b8de656cb2..beafdd5584c 100644
--- a/fonts/t1lib/MESSAGE
+++ b/fonts/t1lib/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/11/08 15:51:25 fredb Exp $
+$NetBSD: MESSAGE,v 1.3 2017/09/06 16:49:22 wiz Exp $
 
 Most programs that use the lib will look first in the directory
 specified by the environment variable T1LIB_CONFIG_DIR, and then
@@ -8,7 +8,7 @@ to run the "xglyph" test X client. E.g, for Bourne shells:
  ``T1LIB_CONFIG_DIR=${PREFIX}/share/t1lib xglyph &''
 
 The complete documentation requires LaTeX to build. If you have
-the print/teTeX package (or some other "tex"),
+the meta-pkgs/texlive-collection-all package (or some subset),
 ``cd ${PREFIX}/share/doc/t1lib; make'' to build t1lib_doc.dvi.
 
 ===========================================================================
diff --git a/fonts/tex-ae-doc/Makefile b/fonts/tex-ae-doc/Makefile
index cd3bd7bdf5c..2a15e3fef25 100644
--- a/fonts/tex-ae-doc/Makefile
+++ b/fonts/tex-ae-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/30 04:56:40 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:22 wiz Exp $
 # TeX Live Revision 15878
 
 DISTNAME=	ae.doc
@@ -8,7 +8,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-ae
 LICENSE=	lppl-1.3c
 
-CONFLICTS+=	teTeX-texmf<=3.0nb18
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-ae/Makefile b/fonts/tex-ae/Makefile
index 743315beff9..8fbbe50aedf 100644
--- a/fonts/tex-ae/Makefile
+++ b/fonts/tex-ae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/30 04:56:40 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:22 wiz Exp $
 # TeX Live Revision 15878
 
 DISTNAME=	ae
@@ -8,7 +8,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Virtual fonts for T1 encoded CMR-fonts
 LICENSE=	lppl-1.3c
 
-CONFLICTS+=	teTeX-texmf<=3.0nb18
 DEPENDS+=	tex-latex-[0-9]*:../../print/tex-latex
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-amsfonts-doc/Makefile b/fonts/tex-amsfonts-doc/Makefile
index 82efb9e37f7..5a776dc075d 100644
--- a/fonts/tex-amsfonts-doc/Makefile
+++ b/fonts/tex-amsfonts-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/11/17 18:49:37 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:22 wiz Exp $
 
 DISTNAME=	amsfonts.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-3.04
@@ -8,7 +8,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-amsfonts
 LICENSE=	ofl-v1.1
 
-CONFLICTS+=	teTeX-texmf<=3.0nb13
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-avantgar/Makefile b/fonts/tex-avantgar/Makefile
index b84877d3770..f13e3d184a7 100644
--- a/fonts/tex-avantgar/Makefile
+++ b/fonts/tex-avantgar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:56:40 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:22 wiz Exp $
 
 DISTNAME=	avantgar
 PKGNAME=	tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Avantgarde font
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS=	teTeX-texmf<=3.0nb29
-
 TEX_MAP_FILES+=	uag.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-bookman/Makefile b/fonts/tex-bookman/Makefile
index aea4c8a3c71..18d30aa4b17 100644
--- a/fonts/tex-bookman/Makefile
+++ b/fonts/tex-bookman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:56:41 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:22 wiz Exp $
 
 DISTNAME=	bookman
 PKGNAME=	tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Bookman font
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS=	teTeX-texmf<=3.0nb29
-
 TEX_MAP_FILES+=	ubk.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-cc-pl/Makefile b/fonts/tex-cc-pl/Makefile
index f5861da53a8..f874366a4f9 100644
--- a/fonts/tex-cc-pl/Makefile
+++ b/fonts/tex-cc-pl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/09/20 12:27:48 markd Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:22 wiz Exp $
 
 DISTNAME=	cc-pl
 PKGNAME=	tex-${DISTNAME}-1.02.2
@@ -9,8 +9,6 @@ HOMEPAGE=	http://ctan.org/pkg/cc-pl
 COMMENT=	Polish extension of Computer Concrete fonts
 LICENSE=	public-domain
 
-CONFLICTS+=	teTeX-texmf<=3.0nb56
-
 TEX_MIXEDMAP_FILES+=	ccpl.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-charter-doc/Makefile b/fonts/tex-charter-doc/Makefile
index 197f1319d27..cce62485e4b 100644
--- a/fonts/tex-charter-doc/Makefile
+++ b/fonts/tex-charter-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/03/03 04:13:26 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=	charter.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-2010
@@ -7,7 +7,5 @@ TEXLIVE_REV=	15878
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-charter
 
-CONFLICTS+=	teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-charter/Makefile b/fonts/tex-charter/Makefile
index a0e3df83887..fff10c6e6ce 100644
--- a/fonts/tex-charter/Makefile
+++ b/fonts/tex-charter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/03/03 04:13:17 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:22 wiz Exp $
 
 DISTNAME=	charter
 PKGNAME=	tex-${DISTNAME}-2010
@@ -7,7 +7,5 @@ TEXLIVE_REV=	15878
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Charter fonts
 
-CONFLICTS+=	teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-cm-doc/Makefile b/fonts/tex-cm-doc/Makefile
index 5ee24c06706..959128ed109 100644
--- a/fonts/tex-cm-doc/Makefile
+++ b/fonts/tex-cm-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/05/05 16:45:57 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=	cm.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-2014
@@ -9,7 +9,5 @@ HOMEPAGE=	http://ctan.org/pkg/cm
 COMMENT=	Documentation for tex-cm
 #LICENSE=	knuth
 
-CONFLICTS+=	teTeX-texmf<=3.0nb22
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-cm/Makefile b/fonts/tex-cm/Makefile
index 7fa1729f958..d25cb763619 100644
--- a/fonts/tex-cm/Makefile
+++ b/fonts/tex-cm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/05/05 16:44:41 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=	cm
 PKGNAME=	tex-${DISTNAME}-2014
@@ -10,8 +10,6 @@ HOMEPAGE=	http://ctan.org/pkg/cm
 COMMENT=	Computer Modern fonts
 #LICENSE=	knuth
 
-CONFLICTS+=	teTeX-texmf<=3.0nb11
-
 TEX_MIXEDMAP_FILES+=	cmtext-bsr-interpolated.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-cmcyr-doc/Makefile b/fonts/tex-cmcyr-doc/Makefile
index b42119bbdb7..0dd65c36c98 100644
--- a/fonts/tex-cmcyr-doc/Makefile
+++ b/fonts/tex-cmcyr-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/06/16 03:57:27 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=	cmcyr.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-2016
@@ -8,7 +8,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-cmcyr
 LICENSE=	public-domain
 
-CONFLICTS+=	teTeX-texmf<=3.0nb24
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-cmcyr/Makefile b/fonts/tex-cmcyr/Makefile
index 12cb4f25e75..02acc965572 100644
--- a/fonts/tex-cmcyr/Makefile
+++ b/fonts/tex-cmcyr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/06/16 03:57:27 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=	cmcyr
 PKGNAME=	tex-${DISTNAME}-2016
@@ -8,8 +8,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Computer Modern fonts with cyrillic extensions
 LICENSE=	public-domain
 
-CONFLICTS+=	teTeX-texmf<=3.0nb24
-
 TEX_MAP_FILES+=	cmcyr.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-cmextra/Makefile b/fonts/tex-cmextra/Makefile
index 7ac6fb014e8..f39a45744ff 100644
--- a/fonts/tex-cmextra/Makefile
+++ b/fonts/tex-cmextra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/04/25 07:52:01 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=	cmextra
 PKGNAME=	tex-${DISTNAME}-2014
@@ -7,7 +7,5 @@ TEXLIVE_REV=	32831
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Extra Computer Modern fonts
 
-CONFLICTS+=	teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-courier/Makefile b/fonts/tex-courier/Makefile
index e15ceb5fd21..a2e72f3771a 100644
--- a/fonts/tex-courier/Makefile
+++ b/fonts/tex-courier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/01/30 04:56:41 markd Exp $
+# $NetBSD: Makefile,v 1.10 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=	courier
 PKGNAME=	tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Adobe Type 1 "free" copies of Courier
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS+=	teTeX-texmf<=3.0nb19
-
 TEX_MAP_FILES+=	ucr.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-ec-doc/Makefile b/fonts/tex-ec-doc/Makefile
index 27689a358bd..c981ea07b4a 100644
--- a/fonts/tex-ec-doc/Makefile
+++ b/fonts/tex-ec-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/01/11 17:00:01 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=	ec.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-1.0
@@ -8,7 +8,5 @@ DIST_SUBDIR=	tex-${DISTNAME:S/.doc//}-${TEXLIVE_REV}.2010
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-ec
 
-CONFLICTS+=	teTeX-texmf<=3.0nb24
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-ec/Makefile b/fonts/tex-ec/Makefile
index ce9cf5c2ea7..7d8fca7a968 100644
--- a/fonts/tex-ec/Makefile
+++ b/fonts/tex-ec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/01/11 17:00:01 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=	ec
 PKGNAME=	tex-${DISTNAME}-1.0
@@ -8,7 +8,5 @@ DIST_SUBDIR=	tex-${DISTNAME}-${TEXLIVE_REV}.2010
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Computer modern fonts in T1 and TS1 encodings
 
-CONFLICTS+=	teTeX-texmf<=3.0nb24
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-esint/Makefile b/fonts/tex-esint/Makefile
index d268ed5f505..ca63d03990d 100644
--- a/fonts/tex-esint/Makefile
+++ b/fonts/tex-esint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:56:41 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=	esint
 PKGNAME=	tex-${DISTNAME}-1.1
@@ -8,7 +8,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Extended set of integrals for Computer Modern
 LICENSE=	public-domain
 
-CONFLICTS=	teTeX-texmf<=3.0nb29
 DEPENDS+=	tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-eurosym-doc/Makefile b/fonts/tex-eurosym-doc/Makefile
index a5a289ce57f..5a3b2c031ce 100644
--- a/fonts/tex-eurosym-doc/Makefile
+++ b/fonts/tex-eurosym-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/09/08 18:32:06 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=	eurosym.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-1.4
@@ -8,7 +8,5 @@ TEXLIVE_REV=	17265
 MAINTAINER=	nico@orgrim.net
 COMMENT=	Documentation for tex-eurosym
 
-CONFLICTS+=	teTeX-texmf<=3.0nb27
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-eurosym/Makefile b/fonts/tex-eurosym/Makefile
index 6ed8158e49f..c1f42f8aba9 100644
--- a/fonts/tex-eurosym/Makefile
+++ b/fonts/tex-eurosym/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/11/06 08:43:31 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=	eurosym
 PKGNAME=	tex-${DISTNAME}-1.4
@@ -10,8 +10,6 @@ TEXLIVE_REV=	17265
 MAINTAINER=	nico@orgrim.net
 COMMENT=	MetaFont and macros for Euro sign
 
-CONFLICTS+=	teTeX-texmf<=3.0nb27
-
 TEX_MIXEDMAP_FILES+=	eurosym.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-fontinst-doc/Makefile b/fonts/tex-fontinst-doc/Makefile
index 4c3ebe2d26a..dd85667c975 100644
--- a/fonts/tex-fontinst-doc/Makefile
+++ b/fonts/tex-fontinst-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/04/30 07:23:54 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=	fontinst.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-1.933
@@ -8,7 +8,5 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Documentation for tex-fontinst
 LICENSE=	lppl-1.3c
 
-CONFLICTS+=	teTeX-texmf<=3.0nb45
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-fontinst/Makefile b/fonts/tex-fontinst/Makefile
index 5372b9ac954..7a44dfed676 100644
--- a/fonts/tex-fontinst/Makefile
+++ b/fonts/tex-fontinst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/04/30 07:23:54 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=	fontinst
 PKGNAME=	tex-${DISTNAME}-1.933
@@ -8,8 +8,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Help with installing fonts for TeX and LaTeX
 LICENSE=	lppl-1.3c
 
-CONFLICTS+=	teTeX-texmf<=3.0nb45
-
 USE_TOOLS+=	sh:run
 REPLACE_SH=	bin/fontinst
 
diff --git a/fonts/tex-fontname-doc/Makefile b/fonts/tex-fontname-doc/Makefile
index de14be51561..f566c6bdaac 100644
--- a/fonts/tex-fontname-doc/Makefile
+++ b/fonts/tex-fontname-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/06/16 03:57:28 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=	fontname.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-2016
@@ -8,8 +8,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-fontname
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS=	teTeX-texmf<=3.0nb29
-
 INFO_FILES=	yes
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-fontname/Makefile b/fonts/tex-fontname/Makefile
index 9c5d0070358..a2a65ff75ef 100644
--- a/fonts/tex-fontname/Makefile
+++ b/fonts/tex-fontname/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/06/16 03:57:28 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=	fontname
 PKGNAME=	tex-${DISTNAME}-2016
@@ -8,7 +8,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Scheme for naming fonts in TeX
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS=	teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-fpl-doc/Makefile b/fonts/tex-fpl-doc/Makefile
index c378dfe790e..cd5679fe0aa 100644
--- a/fonts/tex-fpl-doc/Makefile
+++ b/fonts/tex-fpl-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/30 04:56:42 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=	fpl.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-1.002
@@ -8,7 +8,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-fpl
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS=	teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-fpl/Makefile b/fonts/tex-fpl/Makefile
index 962c1611233..9db6258eb46 100644
--- a/fonts/tex-fpl/Makefile
+++ b/fonts/tex-fpl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:56:42 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=	fpl
 PKGNAME=	tex-${DISTNAME}-1.002
@@ -8,7 +8,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	SC and OsF fonts for URW Palladio L
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS=	teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-helvetic/Makefile b/fonts/tex-helvetic/Makefile
index 11c222d596d..186fea06bc3 100644
--- a/fonts/tex-helvetic/Makefile
+++ b/fonts/tex-helvetic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/01/30 04:56:42 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=	helvetic
 PKGNAME=	tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Adobe Helvetica fonts
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS+=	teTeX-texmf<=3.0nb19
-
 TEX_MAP_FILES+=	uhv.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-latex-fonts/Makefile b/fonts/tex-latex-fonts/Makefile
index 76ebc722bda..f88a29b3b9e 100644
--- a/fonts/tex-latex-fonts/Makefile
+++ b/fonts/tex-latex-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/01/30 04:56:42 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=	latex-fonts
 PKGNAME=	tex-${DISTNAME}-2013
@@ -9,7 +9,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Collection of fonts used in LaTeX distributions
 LICENSE=	lppl-1.3c
 
-CONFLICTS+=	teTeX-texmf<=3.0nb12
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-lh-doc/Makefile b/fonts/tex-lh-doc/Makefile
index 735eddff5f6..c566663ce70 100644
--- a/fonts/tex-lh-doc/Makefile
+++ b/fonts/tex-lh-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=	lh.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-3.5g
@@ -8,7 +8,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-lh
 LICENSE=	lppl-1.3c
 
-CONFLICTS+=	teTeX-texmf<=3.0nb24
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-lh/Makefile b/fonts/tex-lh/Makefile
index 19b615a06c7..dcbaf3df3ad 100644
--- a/fonts/tex-lh/Makefile
+++ b/fonts/tex-lh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=	lh
 PKGNAME=	tex-${DISTNAME}-3.5g
@@ -8,7 +8,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Cyrillic fonts that support LaTeX standard encodings
 LICENSE=	lppl-1.3c
 
-CONFLICTS+=	teTeX-texmf<=3.0nb24
 DEPENDS+=	tex-ec>=1.0:../../fonts/tex-ec
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-lm-doc/Makefile b/fonts/tex-lm-doc/Makefile
index 6cde01cfd3b..d01c1cdcece 100644
--- a/fonts/tex-lm-doc/Makefile
+++ b/fonts/tex-lm-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=	lm.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-2.004
@@ -8,7 +8,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-lm
 LICENSE=	gfsl
 
-CONFLICTS+=	teTeX-texmf<=3.0nb16
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-lm/Makefile b/fonts/tex-lm/Makefile
index 32ae4d600ea..655b6f583c1 100644
--- a/fonts/tex-lm/Makefile
+++ b/fonts/tex-lm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=	lm
 PKGNAME=	tex-${DISTNAME}-2.004
@@ -9,8 +9,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Latin modern fonts in outline formats
 LICENSE=	gfsl
 
-CONFLICTS+=	teTeX-texmf<=3.0nb16
-
 TEX_MAP_FILES+=	lm.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-manfnt-font/Makefile b/fonts/tex-manfnt-font/Makefile
index 1bd0b5a5c28..41743130060 100644
--- a/fonts/tex-manfnt-font/Makefile
+++ b/fonts/tex-manfnt-font/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=	manfnt-font
 PKGNAME=	tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Font for LaTeX support for the TeX book symbols
 LICENSE=	lppl-1.3c
 
-CONFLICTS+=	teTeX-texmf<=3.0nb15
-
 TEX_MIXEDMAP_FILES+=	manfnt.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-manfnt/Makefile b/fonts/tex-manfnt/Makefile
index 4faff0702cc..3133d0f5a80 100644
--- a/fonts/tex-manfnt/Makefile
+++ b/fonts/tex-manfnt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=	manfnt
 PKGNAME=	tex-${DISTNAME}-2014
@@ -8,7 +8,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	LaTeX support for the TeX book symbols
 LICENSE=	lppl-1.3c
 
-CONFLICTS+=	teTeX-texmf<=3.0nb15
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-marvosym-doc/Makefile b/fonts/tex-marvosym-doc/Makefile
index f060a39cd33..00b3d3230a3 100644
--- a/fonts/tex-marvosym-doc/Makefile
+++ b/fonts/tex-marvosym-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=	marvosym.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-2.2a
@@ -8,7 +8,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-marvosym
 LICENSE=	ofl-v1.1
 
-CONFLICTS+=	teTeX-texmf<=3.0nb13
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-marvosym/Makefile b/fonts/tex-marvosym/Makefile
index 834e8f5cd0c..2072c2bf4c6 100644
--- a/fonts/tex-marvosym/Makefile
+++ b/fonts/tex-marvosym/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=	marvosym
 PKGNAME=	tex-${DISTNAME}-2.2a
@@ -8,8 +8,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Martin Vogel's Symbols font
 LICENSE=	ofl-v1.1
 
-CONFLICTS+=	teTeX-texmf<=3.0nb13
-
 TEX_MAP_FILES+=	marvosym.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-mathpazo-doc/Makefile b/fonts/tex-mathpazo-doc/Makefile
index 29d2656bb11..3ff797497e4 100644
--- a/fonts/tex-mathpazo-doc/Makefile
+++ b/fonts/tex-mathpazo-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=	mathpazo.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-1.003
@@ -8,7 +8,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-mathpazo
 LICENSE=	lppl-1.3c
 
-CONFLICTS=	teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-mathpazo/Makefile b/fonts/tex-mathpazo/Makefile
index cb49849f08d..13bc157ad8e 100644
--- a/fonts/tex-mathpazo/Makefile
+++ b/fonts/tex-mathpazo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=	mathpazo
 PKGNAME=	tex-${DISTNAME}-1.003
@@ -8,7 +8,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Fonts to typeset mathematics to match Palatino
 LICENSE=	lppl-1.3c
 
-CONFLICTS=	teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-metafont/Makefile b/fonts/tex-metafont/Makefile
index 340c280f0d7..e4701e4d589 100644
--- a/fonts/tex-metafont/Makefile
+++ b/fonts/tex-metafont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/05/05 18:25:36 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=	metafont
 # should be this instead:
@@ -12,9 +12,6 @@ HOMEPAGE=	http://ctan.org/pkg/metafont
 COMMENT=	METAFONT system for specifying fonts
 #LICENSE=	knuth
 
-CONFLICTS+=	teTeX-bin<=3.0nb32
-CONFLICTS+=	teTeX-texmf<=3.0nb13
-CONFLICTS+=	tex-bin-metapost-[0-9]*
 DEPENDS+=	tex-kpathsea-[0-9]*:../../print/tex-kpathsea
 DEPENDS+=	web2c-[0-9]*:../../print/web2c
 
diff --git a/fonts/tex-mflogo-font/Makefile b/fonts/tex-mflogo-font/Makefile
index 03741813931..1d273eedb87 100644
--- a/fonts/tex-mflogo-font/Makefile
+++ b/fonts/tex-mflogo-font/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/06/14 11:19:59 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=	mflogo-font
 PKGNAME=	tex-${DISTNAME}-1.002pl36898
@@ -7,8 +7,6 @@ TEXLIVE_REV=	36898
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Metafont logo font
 
-CONFLICTS+=	teTeX-texmf<=3.0nb15
-
 TEX_MIXEDMAP_FILES+=	mflogo.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-mflogo/Makefile b/fonts/tex-mflogo/Makefile
index 856f5ceff77..d8f9b7a8c05 100644
--- a/fonts/tex-mflogo/Makefile
+++ b/fonts/tex-mflogo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/06/16 03:57:30 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=	mflogo
 # should be 
@@ -11,7 +11,5 @@ HOMEPAGE=	http://ctan.org/pkg/mflogo
 COMMENT=	LaTeX support for MetaFont logo fonts
 LICENSE=	lppl-1.3c
 
-CONFLICTS+=	teTeX-texmf<=3.0nb15
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-mfware/Makefile b/fonts/tex-mfware/Makefile
index 5470979dd63..e0a2cc20a3e 100644
--- a/fonts/tex-mfware/Makefile
+++ b/fonts/tex-mfware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/05/05 18:33:51 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=	mfware
 PKGNAME=	tex-${DISTNAME}-2014
@@ -9,7 +9,6 @@ HOMEPAGE=	http://ctan.org/pkg/mfware
 COMMENT=	Supporting tools for use with MetaFont
 #LICENSE=	knuth
 
-CONFLICTS+=	teTeX-texmf<=3.0nb22
 DEPENDS+=	web2c-[0-9]*:../../print/web2c
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-ncntrsbk/Makefile b/fonts/tex-ncntrsbk/Makefile
index d9d1ad4349f..276ca82514b 100644
--- a/fonts/tex-ncntrsbk/Makefile
+++ b/fonts/tex-ncntrsbk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=	ncntrsbk
 PKGNAME=	tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	New Century Schoolbook fonts
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS=	teTeX-texmf<=3.0nb29
-
 TEX_MAP_FILES+=	unc.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-palatino/Makefile b/fonts/tex-palatino/Makefile
index 3b0d8bdee9f..9957a57e1b2 100644
--- a/fonts/tex-palatino/Makefile
+++ b/fonts/tex-palatino/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=	palatino
 PKGNAME=	tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Palatino font family for TeX
 LICENSE=	lppl-1.3c
 
-CONFLICTS=	teTeX-texmf<=3.0nb29
-
 TEX_MAP_FILES+=	upl.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-psnfss-doc/Makefile b/fonts/tex-psnfss-doc/Makefile
index 3b372c0b5fa..209aaf1bf8c 100644
--- a/fonts/tex-psnfss-doc/Makefile
+++ b/fonts/tex-psnfss-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=	psnfss.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-9.2a.33946
@@ -8,7 +8,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-psnfss
 LICENSE=	lppl-1.3c
 
-CONFLICTS+=	teTeX-texmf<=3.0nb13
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-psnfss/Makefile b/fonts/tex-psnfss/Makefile
index cf05d5492aa..91522af76d7 100644
--- a/fonts/tex-psnfss/Makefile
+++ b/fonts/tex-psnfss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.11 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=	psnfss
 PKGNAME=	tex-${DISTNAME}-9.2a.33946
@@ -8,7 +8,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Font support for common PostScript fonts
 LICENSE=	lppl-1.3c
 
-CONFLICTS+=	teTeX-texmf<=3.0nb13
 DEPENDS+=	tex-avantgar-[0-9]*:../../fonts/tex-avantgar
 DEPENDS+=	tex-bookman-[0-9]*:../../fonts/tex-bookman
 DEPENDS+=	tex-charter-[0-9]*:../../fonts/tex-charter
diff --git a/fonts/tex-pxfonts-doc/Makefile b/fonts/tex-pxfonts-doc/Makefile
index 86f948f35b1..3d24a0b7e13 100644
--- a/fonts/tex-pxfonts-doc/Makefile
+++ b/fonts/tex-pxfonts-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=	pxfonts.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-2010
@@ -8,7 +8,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-pxfonts
 LICENSE=	lppl-1.3c
 
-CONFLICTS=	teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-pxfonts/Makefile b/fonts/tex-pxfonts/Makefile
index cb284e80ea2..eb748d219e8 100644
--- a/fonts/tex-pxfonts/Makefile
+++ b/fonts/tex-pxfonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=	pxfonts
 PKGNAME=	tex-${DISTNAME}-2010
@@ -9,8 +9,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Palatino-like fonts in support of mathematics
 LICENSE=	lppl-1.3c
 
-CONFLICTS=	teTeX-texmf<=3.0nb29
-
 TEX_MAP_FILES+=	pxfonts.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-rsfs-doc/Makefile b/fonts/tex-rsfs-doc/Makefile
index bc72df42f9b..906eb4f6563 100644
--- a/fonts/tex-rsfs-doc/Makefile
+++ b/fonts/tex-rsfs-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/09/14 00:24:39 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=	rsfs.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-2009
@@ -8,8 +8,5 @@ DIST_SUBDIR=	${PKGBASE:S/-doc//}-${TEXLIVE_REV}.2010
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-rsfs
 
-CONFLICTS+=	teTeX-texmf<=3.0nb15
-
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-rsfs/Makefile b/fonts/tex-rsfs/Makefile
index 3f43e0e0fea..5ec9317eb60 100644
--- a/fonts/tex-rsfs/Makefile
+++ b/fonts/tex-rsfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/11/06 08:43:32 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=	rsfs
 PKGNAME=	tex-${DISTNAME}-2009
@@ -9,8 +9,6 @@ DIST_SUBDIR=	${PKGBASE}-${TEXLIVE_REV}.2010
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Ralph Smith's Formal Script font
 
-CONFLICTS+=	teTeX-texmf<=3.0nb15
-
 TEX_MIXEDMAP_FILES+=	rsfs.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-stmaryrd-doc/Makefile b/fonts/tex-stmaryrd-doc/Makefile
index 54bcc6bdd2e..97e7c1e8a0c 100644
--- a/fonts/tex-stmaryrd-doc/Makefile
+++ b/fonts/tex-stmaryrd-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=	stmaryrd.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-2010
@@ -8,7 +8,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-stmaryrd
 LICENSE=	lppl-1.3c
 
-CONFLICTS+=	teTeX-texmf<=3.0nb15
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-stmaryrd/Makefile b/fonts/tex-stmaryrd/Makefile
index 888e459f019..c3999f67243 100644
--- a/fonts/tex-stmaryrd/Makefile
+++ b/fonts/tex-stmaryrd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=	stmaryrd
 PKGNAME=	tex-${DISTNAME}-2010
@@ -9,8 +9,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	St Mary Road symbols for theoretical computer science
 LICENSE=	lppl-1.3c
 
-CONFLICTS+=	teTeX-texmf<=3.0nb15
-
 TEX_MIXEDMAP_FILES+=	stmaryrd.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-symbol/Makefile b/fonts/tex-symbol/Makefile
index 1ccd86b6df9..813a5317ed8 100644
--- a/fonts/tex-symbol/Makefile
+++ b/fonts/tex-symbol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=	symbol
 PKGNAME=	tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Symbol fonts for TeX
 LICENSE=	lppl-1.3c
 
-CONFLICTS+=	teTeX-texmf<=3.0nb14
-
 TEX_MAP_FILES+=	usy.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-times/Makefile b/fonts/tex-times/Makefile
index 11f2c9910fb..6fd90e2a153 100644
--- a/fonts/tex-times/Makefile
+++ b/fonts/tex-times/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=	times
 PKGNAME=	tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Select Adobe Times Roman (or equivalent) as default font
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS+=	teTeX-texmf<=3.0nb16
-
 TEX_MAP_FILES+=	utm.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-txfonts-doc/Makefile b/fonts/tex-txfonts-doc/Makefile
index ba1ad9363bf..1cadec26ba5 100644
--- a/fonts/tex-txfonts-doc/Makefile
+++ b/fonts/tex-txfonts-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=	txfonts.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-2009
@@ -8,7 +8,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-txfonts
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS+=	teTeX-texmf<=3.0nb19
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-txfonts/Makefile b/fonts/tex-txfonts/Makefile
index eeadbcb85f1..e717616e6f9 100644
--- a/fonts/tex-txfonts/Makefile
+++ b/fonts/tex-txfonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=	txfonts
 PKGNAME=	tex-${DISTNAME}-2009
@@ -9,8 +9,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Times-like fonts in support of mathematics
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS+=	teTeX-texmf<=3.0nb19
-
 TEX_MAP_FILES+=	txfonts.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-wasy/Makefile b/fonts/tex-wasy/Makefile
index 3da7baf71ff..1f6362774bf 100644
--- a/fonts/tex-wasy/Makefile
+++ b/fonts/tex-wasy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/30 04:56:45 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=	wasy
 PKGNAME=	tex-${DISTNAME}-2014
@@ -8,7 +8,5 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Waldi's symbol fonts
 LICENSE=	public-domain
 
-CONFLICTS+=	teTeX-texmf<=3.0nb15
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-wasysym/Makefile b/fonts/tex-wasysym/Makefile
index 9e7eb1a7b4c..06f15fa2fd2 100644
--- a/fonts/tex-wasysym/Makefile
+++ b/fonts/tex-wasysym/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/30 04:56:45 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=	wasysym
 PKGNAME=	tex-${DISTNAME}-2.0
@@ -9,7 +9,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	LaTeX support file to use the WASY2 fonts
 LICENSE=	lppl-1.3c
 
-CONFLICTS=	teTeX-texmf<=3.0nb29
 DEPENDS+=	tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 DEPENDS+=	tex-wasy-[0-9]*:../../fonts/tex-wasy
 DEPENDS+=	tex-wasy2-ps-[0-9]*:../../fonts/tex-wasy2-ps
diff --git a/fonts/tex-zapfchan/Makefile b/fonts/tex-zapfchan/Makefile
index aaf2310888a..1847edf1ed0 100644
--- a/fonts/tex-zapfchan/Makefile
+++ b/fonts/tex-zapfchan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/30 04:56:45 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:27 wiz Exp $
 
 DISTNAME=	zapfchan
 PKGNAME=	tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Zapf Chancery fonts
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS=	teTeX-texmf<=3.0nb29
-
 TEX_MAP_FILES+=	uzc.map
 
 .include "../../print/texlive/package.mk"
diff --git a/fonts/tex-zapfding/Makefile b/fonts/tex-zapfding/Makefile
index 397b5db4d45..680d2b72230 100644
--- a/fonts/tex-zapfding/Makefile
+++ b/fonts/tex-zapfding/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/30 04:56:45 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:27 wiz Exp $
 
 DISTNAME=	zapfding
 PKGNAME=	tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Dingbat typeface designed by Hermann Zapf
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS+=	teTeX-texmf<=3.0nb14
-
 TEX_MAP_FILES+=	uzd.map
 
 .include "../../print/texlive/package.mk"