Make teTeX3 the default TEX_DEFAULT

bump PKGREVISION where necessary

Move PKG_TEXMFPREFIX and PKG_LOCALTEXMFPREFIX definitions to
teTeX?/buidlink3.mk, so that packages may include
print/teTeX1-bin/buildlink3.mk directly (however, using teTeX/module.mk do not
allow that)

24 files changed, 87 insertions, 86 deletions

diff --git a/fonts/ec-fonts-mftraced/Makefile b/fonts/ec-fonts-mftraced/Makefile
index 7f6960942d4..e2cb26accd6 100644
--- a/fonts/ec-fonts-mftraced/Makefile
+++ b/fonts/ec-fonts-mftraced/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:14 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/08 14:00:11 tonio Exp $
 #
 
 DISTNAME=		ec-fonts-mftraced-1.0.8
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		fonts
 MASTER_SITES=		http://lilypond.org/download/fonts/
 
diff --git a/fonts/ttf2pk/Makefile b/fonts/ttf2pk/Makefile
index 02510fa6a94..c61670c09b2 100644
--- a/fonts/ttf2pk/Makefile
+++ b/fonts/ttf2pk/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2005/12/05 23:55:07 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/08 14:00:11 tonio Exp $
 #
 
 .include "../../graphics/freetype-lib/Makefile.common"
 
 PKGNAME=		ttf2pk-1.3.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		print
 
 MAINTAINER=		bernhard@SDG.de,hubertf@NetBSD.org
diff --git a/graphics/xdvipresent/Makefile b/graphics/xdvipresent/Makefile
index b15d448b2be..84c255762b4 100644
--- a/graphics/xdvipresent/Makefile
+++ b/graphics/xdvipresent/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2006/01/04 22:37:18 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/01/08 14:00:11 tonio Exp $
 #
 
 DISTNAME=	xdvipresent-0.6p14
 PKGNAME=	xdvipresent-0.6.1.14
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics textproc print x11
 MASTER_SITES=	http://clip.dia.fi.upm.es/Software/
 
@@ -33,7 +33,6 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/xdvipresent.manl ${PREFIX}/${PKGMANDIR}/man1/xdvipresent.1
 	${INSTALL_DATA_DIR} ${HTML_DIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/xdvipresent_html/* ${HTML_DIR}
-	${PREFIX}/bin/texconfig rehash
 
-.include "../../mk/tex.buildlink3.mk"
+.include "../../print/teTeX/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xdvipresent/PLIST b/graphics/xdvipresent/PLIST
index eee6e3f34c2..299d264a944 100644
--- a/graphics/xdvipresent/PLIST
+++ b/graphics/xdvipresent/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/05 14:54:50 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/01/08 14:00:11 tonio Exp $
 bin/xdvipresent
 man/man1/xdvipresent.1
 share/doc/html/xdvipresent/xdvipresent.css
@@ -8,22 +8,19 @@ share/doc/html/xdvipresent/xdvipresent_2.html
 share/doc/html/xdvipresent/xdvipresent_3.html
 share/doc/html/xdvipresent/xdvipresent_toc.html
 share/examples/xdvipresent/example.tex
-share/texmf/tex/latex/other/images/Clip.ps
-share/texmf/tex/latex/other/images/blue.line.eps
-share/texmf/tex/latex/other/images/blueball.ps
-share/texmf/tex/latex/other/images/clip.eps
-share/texmf/tex/latex/other/images/clip_small.ps
-share/texmf/tex/latex/other/images/clip_tiny.eps
-share/texmf/tex/latex/other/images/example_figure.eps
-share/texmf/tex/latex/other/images/greenball.ps
-share/texmf/tex/latex/other/images/line.fig
-share/texmf/tex/latex/other/images/redball.ps
-share/texmf/tex/latex/other/images/thin_line.fig
-share/texmf/tex/latex/other/images/thin_line.red.eps
-share/texmf/tex/latex/other/xdvislides.cls
-@exec %D/bin/texconfig rehash
-@dirrm share/texmf/tex/latex/other/images
-@unexec ${RMDIR} %D/share/texmf/other 2>/dev/null || ${TRUE}
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/Clip.ps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/blue.line.eps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/blueball.ps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/clip.eps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/clip_small.ps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/clip_tiny.eps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/example_figure.eps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/greenball.ps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/line.fig
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/redball.ps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/thin_line.fig
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/thin_line.red.eps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/xdvislides.cls
+@dirrm ${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images
 @dirrm share/examples/xdvipresent
 @dirrm share/doc/html/xdvipresent/
-@unexec %D/bin/texconfig rehash
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 59492fb26d1..fe405e63a28 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.108 2006/01/05 23:29:04 wiz Exp $
+# $NetBSD: mk.conf,v 1.109 2006/01/08 14:00:11 tonio Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -1628,10 +1628,10 @@ SUSE_PREFER?=	7.3
 # Possible: 7.3, 9.1
 # Default: 9.1 in 2.0 and later, 7.3 otherwise
 
-TEX_DEFAULT?=	teTeX2
+TEX_DEFAULT?=	teTeX3
 # Specify the user's favorite latex implementation
 # Possible values: teTeX1, teTeX2, teTeX3
-# Default: teTeX2
+# Default: teTeX3
 
 #TEXMFSITE=
 # Used in TeXfamily package which depends on teTeX package to specify
diff --git a/mk/tex.buildlink3.mk b/mk/tex.buildlink3.mk
index 97b70676e48..5087cf19271 100644
--- a/mk/tex.buildlink3.mk
+++ b/mk/tex.buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: tex.buildlink3.mk,v 1.8 2005/12/05 22:07:07 rillig Exp $
+# $NetBSD: tex.buildlink3.mk,v 1.9 2006/01/08 14:00:11 tonio Exp $
 #
 # A Makefile fragment for TeX and LaTeX packages
 #
 # 	* Determine the version of teTeX to be used.
-#     Modify TEX_DEFAULT to change the default version (default to teTeX2)
+#     Modify TEX_DEFAULT to change the default version (default to teTeX3)
 #
 #	* tex files are installed...
 #	  	teTeX[1-2]
@@ -34,7 +34,7 @@
 #   Possible values:
 #     teTeX1, teTeX2, teTeX3
 #   Default value:
-#     teTeX2
+#     teTeX3
 #
 # Variables tex packages can provide:
 #
@@ -112,42 +112,34 @@ TEX_TYPE=	none
 .if ${TEX_TYPE} == "teTeX3"
 _TEX_DEPENDENCY=	${BUILDLINK_DEPENDS.teTeX3}
 _TEX_PKGSRCDIR=	${BUILDLINK_PKGSRCDIR.teTeX3}
-#PKG_TEXMFPREFIX=	${PREFIX}/share/texmf-dist
-PKG_TEXMFPREFIX=	${PREFIX}/share/texmf
-#PKG_LOCALTEXMFPREFIX=	${PREFIX}/share/texmf-local
-PKG_LOCALTEXMFPREFIX=	${PREFIX}/share/texmf
 .elif ${TEX_TYPE} == "teTeX2"
 _TEX_DEPENDENCY=	${BUILDLINK_DEPENDS.teTeX2}
 _TEX_PKGSRCDIR=	${BUILDLINK_PKGSRCDIR.teTeX2}
-PKG_TEXMFPREFIX=	${PREFIX}/share/texmf
-PKG_LOCALTEXMFPREFIX=	${PREFIX}/share/texmf
 .elif ${TEX_TYPE} == "teTeX1"
 _TEX_DEPENDENCY=	${BUILDLINK_DEPENDS.teTeX1}
 _TEX_PKGSRCDIR=	${BUILDLINK_PKGSRCDIR.teTeX1}
-PKG_TEXMFPREFIX=	${PREFIX}/share/texmf
-PKG_LOCALTEXMFPREFIX=	${PREFIX}/share/texmf
 .endif
 
-PLIST_SUBST+=	TEX_TYPE=${TEX_TYPE:Q}
-PLIST_SUBST+=	PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX:C|^${PREFIX}/||}
-PLIST_SUBST+=	PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:C|^${PREFIX}/||}
-
-PRINT_PLIST_AWK+=	/^@dirrm ${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}(\/bibtex(\/bib|\/bst)?|\/tex(\/latex)?)?$$/ \
-			{ next; }
-PRINT_PLIST_AWK+=	/^(@dirrm )?${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/ \
-			{ gsub(/${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, "$${PKG_LOCALTEXMFPREFIX}"); \
-			print; next; }
-
 .endif	# TEX_BUILDLINK3_MK
 
 .if ${TEX_TYPE} == "none"
 PKG_FAIL_REASON=	\
 	"${_TEX_TYPE} is not an acceptable TeX version for ${PKGNAME}."
 .else
+PLIST_SUBST+=	TEX_TYPE=${TEX_TYPE:Q}
 .if (${TEX_DEPMETHOD} == "build")
 BUILD_DEPENDS+=	${_TEX_DEPENDENCY}:${_TEX_PKGSRCDIR}
 .else
 TEX_DEPMETHOD:= run
 .  include "${_TEX_PKGSRCDIR}/buildlink3.mk"
+PLIST_SUBST+=	PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX:C|^${PREFIX}/||}
+PLIST_SUBST+=	PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:C|^${PREFIX}/||}
+
+PRINT_PLIST_AWK+=	/^@dirrm ${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}(\/bibtex(\/bib|\/bst)?|\/tex(\/latex)?)?$$/ \
+			{ next; }
+PRINT_PLIST_AWK+=	/^(@dirrm )?${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/ \
+			{ gsub(/${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, "$${PKG_LOCALTEXMFPREFIX}"); \
+			print; next; }
+
 .endif
 .endif
diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index cdd8e0ffb5f..aba07e1a870 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:52 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/08 14:00:11 tonio Exp $
 
 DISTNAME=	dvipdfmx-20050627
 PKGNAME=	${DISTNAME:S/-/-0.0.0./}
+PKGREVISION=	1
 CATEGORIES=	print converters
 MASTER_SITES=	http://project.ktug.or.kr/dvipdfmx/snapshot/release/
 
diff --git a/print/dvipng/Makefile b/print/dvipng/Makefile
index a13cc04dc6a..cfae92493f3 100644
--- a/print/dvipng/Makefile
+++ b/print/dvipng/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2005/11/08 20:46:18 tonio Exp $
+# $NetBSD: Makefile,v 1.17 2006/01/08 14:00:11 tonio Exp $
 
 DISTNAME=	dvipng-1.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	textproc converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dvipng/}
 
diff --git a/print/ja-ptex-bin/Makefile b/print/ja-ptex-bin/Makefile
index bf2bc2d2d6c..30460e54803 100644
--- a/print/ja-ptex-bin/Makefile
+++ b/print/ja-ptex-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:53 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/08 14:00:12 tonio Exp $
 
 DISTNAME=	ptex-src-${PTEX_VERS}
 PKGNAME=	ja-ptex-bin-${PTEX_VERS}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print japanese
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ \
 		ftp://ring.gr.jp/pub/text/TeX/ascii-ptex/tetex/
diff --git a/print/ja-ptex-share/Makefile b/print/ja-ptex-share/Makefile
index 065b6f7f30b..ce22b386086 100644
--- a/print/ja-ptex-share/Makefile
+++ b/print/ja-ptex-share/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/08 14:00:12 tonio Exp $
 
 DISTNAME=	ptex-texmf-2.1
 PKGNAME=	ja-ptex-share-2.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print japanese
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/jvf/ \
diff --git a/print/ja-vfxdvik/Makefile b/print/ja-vfxdvik/Makefile
index 102557f9049..cf80a97f2e3 100644
--- a/print/ja-vfxdvik/Makefile
+++ b/print/ja-vfxdvik/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:53 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/08 14:00:12 tonio Exp $
 
 DISTNAME=	xdvik-${XDVIK_ORIGINAL_VERS}
 PKGNAME=	ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xdvi/} # not xdvik
 
@@ -19,10 +19,12 @@ XDVIK_JP_PATCH_VERS=	j1.14
 
 .if defined(USE_TEXFAMILY)
 DEPENDS+=	TeXfamily>=1.2.1:../../print/texfamily
-TEX_ACCEPTED=	teTeX1
+#TEX_ACCEPTED=	teTeX1
+.include "../../print/teTeX1-bin/buildlink3.mk"
 .else
 DEPENDS+=	ja-ptex-bin>=3.1.2:../../print/ja-ptex-bin
-TEX_ACCEPTED=	teTeX2
+#TEX_ACCEPTED=	teTeX2
+.include "../../print/teTeX-bin/buildlink3.mk"
 .endif
 
 XDVI_DIR=	${WRKDIR}/${DISTNAME}/texk/xdvik
@@ -72,7 +74,6 @@ do-build:
 do-install:
 	cd ${XDVI_DIR} && ${MAKE_PROGRAM} install
 
-.include "../../mk/tex.buildlink3.mk"
 .include "../../www/libwww/buildlink3.mk"
 .include "../../print/ja-vflib-lib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/print/teTeX-bin/buildlink3.mk b/print/teTeX-bin/buildlink3.mk
index c0772f9d3d1..9d4fbdfcfd8 100644
--- a/print/teTeX-bin/buildlink3.mk
+++ b/print/teTeX-bin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/11/14 21:57:00 tonio Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/01/08 14:00:12 tonio Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TETEX_BIN_BUILDLINK3_MK:=	${TETEX_BIN_BUILDLINK3_MK}+
@@ -17,5 +17,7 @@ BUILDLINK_PKGSRCDIR.teTeX-bin?=	../../print/teTeX-bin
 
 TEX=tex
 PDFTEX=pdftex
+PKG_TEXMFPREFIX=	${PREFIX}/share/texmf
+PKG_LOCALTEXMFPREFIX=	${PREFIX}/share/texmf
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index 61895baa0d1..1f4d535538d 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2005/11/11 18:50:25 tonio Exp $
+# $NetBSD: Makefile,v 1.41 2006/01/08 14:00:12 tonio Exp $
 #
 
-DISTNAME=	teTeX-2.0.2
-PKGREVISION=	1
+DISTNAME=	teTeX-3.0
 CATEGORIES=	print meta-pkgs
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/print/teTeX1-bin/buildlink3.mk b/print/teTeX1-bin/buildlink3.mk
index 2023c04008e..d4ea0e0bf01 100644
--- a/print/teTeX1-bin/buildlink3.mk
+++ b/print/teTeX1-bin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/11/08 23:42:24 tonio Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/01/08 14:00:12 tonio Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TETEX_BIN_BUILDLINK3_MK:=	${TETEX_BIN_BUILDLINK3_MK}+
@@ -16,4 +16,7 @@ BUILDLINK_DEPMETHOD.teTeX-bin?=	build
 BUILDLINK_PKGSRCDIR.teTeX-bin?=	../../print/teTeX1-bin
 .endif	# TETEX_BIN_BUILDLINK3_MK
 
+PKG_TEXMFPREFIX=	${PREFIX}/share/texmf
+PKG_LOCALTEXMFPREFIX=	${PREFIX}/share/texmf
+
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/teTeX3-bin/buildlink3.mk b/print/teTeX3-bin/buildlink3.mk
index 36323a1b0e0..2e4c6f9e7c2 100644
--- a/print/teTeX3-bin/buildlink3.mk
+++ b/print/teTeX3-bin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/11/14 21:57:00 tonio Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/01/08 14:00:12 tonio Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TETEX_BIN_BUILDLINK3_MK:=	${TETEX_BIN_BUILDLINK3_MK}+
@@ -17,5 +17,9 @@ BUILDLINK_PKGSRCDIR.teTeX-bin?=	../../print/teTeX3-bin
 
 TEX=etex
 PDFTEX=pdfetex
+#PKG_TEXMFPREFIX=	${PREFIX}/share/texmf-dist
+PKG_TEXMFPREFIX=	${PREFIX}/share/texmf
+#PKG_LOCALTEXMFPREFIX=	${PREFIX}/share/texmf-local
+PKG_LOCALTEXMFPREFIX=	${PREFIX}/share/texmf
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/tex-eurosym/Makefile b/print/tex-eurosym/Makefile
index 46b86e45b0a..3adf3cb672e 100644
--- a/print/tex-eurosym/Makefile
+++ b/print/tex-eurosym/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/11/11 18:50:25 tonio Exp $
+# $NetBSD: Makefile,v 1.14 2006/01/08 14:00:12 tonio Exp $
 #
 
 DISTNAME=	eurosym-1.0
@@ -12,7 +12,7 @@ HOMEPAGE=	ftp://ftp.univie.ac.at/packages/tex/fonts/eurosym/
 COMMENT=	Euro symbols for LaTeX
 
 # included in teTeX[23]
-TEX_ACCEPTED=	teTeX1
+#TEX_ACCEPTED=	teTeX1
 CONFLICTS+=	teTeX>1
 
 WRKSRC=		${WRKDIR}/eurosym
@@ -34,5 +34,5 @@ do-install:
 		${PKG_LOCALTEXMFPREFIX}/tex/latex/eurosym
 	${LOCALBASE}/bin/texconfig rehash
 
-.include "../../mk/tex.buildlink3.mk"
+.include "../../print/teTeX1-bin/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-foiltex/Makefile b/print/tex-foiltex/Makefile
index 1627262ed2d..9e32396d423 100644
--- a/print/tex-foiltex/Makefile
+++ b/print/tex-foiltex/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/11/15 03:15:45 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/08 14:00:12 tonio Exp $
 
 DISTNAME=	# empty
 PKGNAME=	tex-foiltex-2.1.4a
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=macros/latex/contrib/supported/foiltex/}
 DISTFILES=	foiltex.dtx foiltex.ins
diff --git a/print/tex-hugelatex/Makefile b/print/tex-hugelatex/Makefile
index b761f2e3bd6..0fba446f606 100644
--- a/print/tex-hugelatex/Makefile
+++ b/print/tex-hugelatex/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2005/11/13 05:30:11 minskim Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/08 14:00:12 tonio Exp $
 #
 
 DISTNAME=	hugelatex-2.0
 PKGNAME=	tex-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	# none
 DISTFILES=	# nada
diff --git a/print/tex-jadetex/Makefile b/print/tex-jadetex/Makefile
index 9252d4631b3..daa8bb0fb2c 100644
--- a/print/tex-jadetex/Makefile
+++ b/print/tex-jadetex/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2005/12/28 05:05:44 reed Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/08 14:00:12 tonio Exp $
 #
 
 DISTNAME=	jadetex-3.13
 PKGNAME=	tex-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jadetex/}
 
diff --git a/print/tex-musixtex/Makefile b/print/tex-musixtex/Makefile
index 737557cac21..fd9fd5fc926 100644
--- a/print/tex-musixtex/Makefile
+++ b/print/tex-musixtex/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/11/11 18:50:25 tonio Exp $
+# $NetBSD: Makefile,v 1.14 2006/01/08 14:00:12 tonio Exp $
 #
 
 DISTNAME=	musixtex-112
 PKGNAME=	tex-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=macros/musixtex/taupin/}
 DISTFILES=	musixtex-T112.tar.gz
diff --git a/print/tex-textpos/Makefile b/print/tex-textpos/Makefile
index b534a1b8ec6..177a04f4836 100644
--- a/print/tex-textpos/Makefile
+++ b/print/tex-textpos/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2005/11/11 18:50:25 tonio Exp $
+# $NetBSD: Makefile,v 1.14 2006/01/08 14:00:12 tonio Exp $
 #
 
 NAME=		textpos
 DISTNAME=	${NAME}
 PKGNAME=	tex-${NAME}-1.2b
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=macros/latex/contrib/supported/${NAME}/}
 
diff --git a/print/texfamily-share/Makefile b/print/texfamily-share/Makefile
index 7b94147b175..6362ccc1d9f 100644
--- a/print/texfamily-share/Makefile
+++ b/print/texfamily-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/12/03 20:11:40 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2006/01/08 14:00:12 tonio Exp $
 
 DISTNAME=	TeXfamily-share-1.2.1
 PKGREVISION=	5
@@ -27,7 +27,7 @@ NO_CONFIGURE=	yes
 NO_BUILD=	yes
 NO_MTREE=	yes
 PLIST_SRC=	${WRKDIR}/PLIST_SRC
-TEX_ACCEPTED=	teTeX1 # teTeX2 teTeX3
+#TEX_ACCEPTED=	teTeX1 # teTeX2 teTeX3
 
 do-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/texmf.local
@@ -66,5 +66,5 @@ post-install:
 	 	${ECHO} "@dirrm $$DIR" >>${PLIST_SRC}; \
 	 done
 
-.include "../../mk/tex.buildlink3.mk"
+.include "../../print/teTeX1-bin/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/texfamily/Makefile b/print/texfamily/Makefile
index 5ab50de3c79..24b30a5072f 100644
--- a/print/texfamily/Makefile
+++ b/print/texfamily/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:16 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/08 14:00:12 tonio Exp $
 
 DISTNAME=	TeXfamily-1.2.1
 PKGREVISION=	5
@@ -27,7 +27,7 @@ PATCH_DIST_ARGS= -d ${WRKSRC}/texk/web2c/ptex-${TEXFAMILY_PTEXVERSION}
 MAINTAINER=	kei@NetBSD.org
 COMMENT=	TeXfamily (pTeX, JTeX, MuLTeX) - executables
 
-TEX_ACCEPTED=	teTeX1 # teTeX2 teTeX3
+#TEX_ACCEPTED=	teTeX1 # teTeX2 teTeX3
 DEPENDS+=	TeXfamily-share>=1.2.1nb3:../../print/texfamily-share
 DEPENDS+=	ja-vflib-lib-[0-9]*:../../print/ja-vflib-lib
 
@@ -169,5 +169,5 @@ post-install:
 pre-clean:
 	cd ../../print/teTeX1-bin && ${MAKE} clean
 
-.include "../../mk/tex.buildlink3.mk"
+.include "../../print/teTeX1-bin/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/tex-xmltex/Makefile b/textproc/tex-xmltex/Makefile
index 422a173d83a..856e3fd6981 100644
--- a/textproc/tex-xmltex/Makefile
+++ b/textproc/tex-xmltex/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2005/11/14 22:10:54 tonio Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/08 14:00:12 tonio Exp $
 
 DISTNAME=	base
 PKGNAME=	tex-xmltex-1.9
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/base
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=macros/xmltex/}