Remove references to teTeX2.

4 files changed, 12 insertions, 25 deletions

diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index bf4bbe0a5ae..b79fb8e9be3 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.127 2006/07/27 23:07:18 lukem Exp $
+# $NetBSD: mk.conf,v 1.128 2006/08/10 03:35:33 minskim Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -1582,7 +1582,7 @@ SUSE_PREFER?=	10.0
 
 TEX_DEFAULT?=	teTeX3
 # Specify the user's favorite latex implementation
-# Possible values: teTeX2, teTeX3
+# Possible values: teTeX3
 # Default: teTeX3
 
 #TEXMFSITE=
diff --git a/mk/tex.buildlink3.mk b/mk/tex.buildlink3.mk
index dd4480c40f1..a97ae031807 100644
--- a/mk/tex.buildlink3.mk
+++ b/mk/tex.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tex.buildlink3.mk,v 1.14 2006/04/19 13:14:57 tonio Exp $
+# $NetBSD: tex.buildlink3.mk,v 1.15 2006/08/10 03:35:33 minskim Exp $
 #
 # A Makefile fragment for TeX and LaTeX packages
 #
@@ -32,7 +32,7 @@
 #   Description:
 #     The user's favorite TeX implementation
 #   Possible values:
-#     teTeX2, teTeX3
+#     teTeX3
 #   Default value:
 #     teTeX3
 #
@@ -50,9 +50,9 @@
 #  Description:
 #    Versions the package accepts (supports).
 #  Possible values:
-#    teTeX2, teTeX3
+#    teTeX3
 #  Default value:
-#    teTeX2, teTeX3
+#    teTeX3
 #
 # Variables provided for tex packages:
 #
@@ -74,7 +74,7 @@
 #   Description:
 #     The type of the used TeX package
 #   Possible values:
-#     teTeX2, teTeX3
+#     teTeX3
 
 .if !defined(TEX_BUILDLINK3_MK)
 TEX_BUILDLINK3_MK=	# defined
@@ -83,13 +83,11 @@ TEX_BUILDLINK3_MK=	# defined
 
 TEX_DEPMETHOD?= run
 
-# Assume only teTeX {2-3} are supported by default.
-TEX_ACCEPTED?=	teTeX2 teTeX3
+# Assume only teTeX 3 is supported by default.
+TEX_ACCEPTED?=	teTeX3
 
 # set up variables for buildlink or depends
 #
-BUILDLINK_API_DEPENDS.teTeX2=	teTeX-bin-2.[0-9]*
-BUILDLINK_PKGSRCDIR.teTeX2=	../../print/teTeX-bin
 BUILDLINK_API_DEPENDS.teTeX3=	teTeX-bin-3.[0-9]*
 BUILDLINK_PKGSRCDIR.teTeX3=	../../print/teTeX3-bin
 
@@ -110,9 +108,6 @@ TEX_TYPE=	none
 .if ${TEX_TYPE} == "teTeX3"
 _TEX_DEPENDENCY=	${BUILDLINK_API_DEPENDS.teTeX3}
 _TEX_PKGSRCDIR=	${BUILDLINK_PKGSRCDIR.teTeX3}
-.elif ${TEX_TYPE} == "teTeX2"
-_TEX_DEPENDENCY=	${BUILDLINK_API_DEPENDS.teTeX2}
-_TEX_PKGSRCDIR=	${BUILDLINK_PKGSRCDIR.teTeX2}
 .endif
 
 .endif	# TEX_BUILDLINK3_MK
diff --git a/print/teTeX/module.mk b/print/teTeX/module.mk
index 497471678e2..a8135554eeb 100644
--- a/print/teTeX/module.mk
+++ b/print/teTeX/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.16 2006/06/15 22:13:59 jlam Exp $
+# $NetBSD: module.mk,v 1.17 2006/08/10 03:35:33 minskim Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # install TeX packages.  It takes care of rebuilding the ls-R database
@@ -34,12 +34,6 @@ PRINT_PLIST_AWK+=	/^(@dirrm )?${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}(\
 PRINT_PLIST_AWK+=	/^(@dirrm )?${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/ \
 			{ gsub(/${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, "$${PKG_LOCALTEXMFPREFIX}"); }
 
-# do not use tex.buildlink3.mk when the only accepted version is teTeX2, to
-# allow bulk build to create packages
-.if defined(TEX_ACCEPTED) && ${TEX_ACCEPTED} == "teTeX2"
-.include "../../print/teTeX-bin/buildlink3.mk"
-.else
 .include "../../mk/tex.buildlink3.mk"
-.endif
 
 .endif			# TEX_PACKAGE_MK
diff --git a/print/texmf-dirs/Makefile b/print/texmf-dirs/Makefile
index 4c8b0726f92..cc9071e8239 100644
--- a/print/texmf-dirs/Makefile
+++ b/print/texmf-dirs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/06/24 10:39:32 hira Exp $
+# $NetBSD: Makefile,v 1.7 2006/08/10 03:35:33 minskim Exp $
 
 DISTNAME=	texmf-dirs-1.3
 CATEGORIES=	print
@@ -20,9 +20,7 @@ WRKSRC=		${WRKDIR}
 
 .include "../../mk/tex.buildlink3.mk"
 REQD_DIRS+=	${TEXMF_DIRS:O:S/^/${PKG_LOCALTEXMFPREFIX}\//}
-.if ${TEX_TYPE} == "teTeX2"
-BUILDLINK_API_DEPENDS.teTeX-bin+=	teTeX-bin>=2.0.2nb7 teTeX-bin<3.0
-.elif ${TEX_TYPE} == "teTeX3"
+.if ${TEX_TYPE} == "teTeX3"
 BUILDLINK_API_DEPENDS.teTeX-bin+=	teTeX-bin>=3.0nb10
 .endif