Resolve conflicts between kpathsea and teTeX-{texmf,bin}.

With this change, texmf.cnf is handled properaly using CONF_FILES, and
tex-* packages can be shared by teTeX-3 and TeX Live 2008.

Bump PKGREVISION for teTeX-{texmf,bin}.

15 files changed, 158 insertions, 166 deletions

diff --git a/print/teTeX3-bin/INSTALL b/print/teTeX3-bin/INSTALL
index 5fd5ce77c6b..a9685af9cc8 100644
--- a/print/teTeX3-bin/INSTALL
+++ b/print/teTeX3-bin/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.8 2008/12/09 19:43:37 minskim Exp $
+# $NetBSD: INSTALL,v 1.9 2009/01/08 22:09:35 minskim Exp $
 
 PATH="@PREFIX@"/bin:"${PATH}"
 export PATH
@@ -43,10 +43,6 @@ TEXMF_VARDIR="@VARBASE@/lib/texmf"
 exitcode=0
 case $ACTION in
 ADD)
-	# Create ls-R databases in all of the usual TeX directories.
-	${TEST} ! -x ${PKG_PREFIX}/bin/mktexlsr ||
-		${PKG_PREFIX}/bin/mktexlsr
-
 	# Update teTeX installation to support different TeX formats.
 	${TEST} ! -x ${PKG_PREFIX}/bin/fmtutil-sys ||
 		${PKG_PREFIX}/bin/fmtutil-sys --all
@@ -59,14 +55,6 @@ ADD)
 	;;
 
 REMOVE)
-	# Remove the ls-R databases from the usual TeX directories
-	# generated by mktexlsr.
-	#
-	${RM} -f ${TEXMF_DISTDATADIR}/ls-R
-	${RM} -f ${TEXMF_DATADIR}/ls-R
-	${RM} -f ${TEXMF_LOCALDATADIR}/ls-R
-	${RM} -f ${TEXMF_VARDIR}/ls-R
-
 	# We inspect both the user-modified and distributed fmtutil.cnf
 	# files because we want to ensure we remove bits corresponding
 	# to both files.
@@ -122,15 +110,22 @@ REMOVE)
 	${RM} -f ${TEXMF_VARDIR}/fonts/map/pdftex/updmap/pdftex_ndl14.map
 	${RM} -f ${TEXMF_VARDIR}/web2c/updmap.log
 
+	# Remove config files generated by +TEXCONFIG.
+	${RM} -f @PKG_SYSCONFDIR@/dvips/config/config.ps
+	${RM} -f @PKG_SYSCONFDIR@/xdvi/XDvi
+
 	# Remove stray directores.
 	for dir in							\
 		${TEXMF_VARDIR}/web2c					\
 		${TEXMF_VARDIR}/fonts/map/dvipdfm/updmap		\
 		${TEXMF_VARDIR}/fonts/map/dvips/updmap			\
-		${TEXMF_VARDIR}/fonts/map/pdftex/updmap
+		${TEXMF_VARDIR}/fonts/map/pdftex/updmap			\
+		@PKG_SYSCONFDIR@/dvips/config			\
+		@PKG_SYSCONFDIR@/xdvi
 	do
 		${RMDIR} -p "$dir" 2>/dev/null || ${TRUE}
 	done
+	@MKTEXLSR@ ${TEXMF_VARDIR} @PKG_SYSCONFDIR@
 	;;
 
 *)
diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile
index 7aa2c824889..7bdafd6d656 100644
--- a/print/teTeX3-bin/Makefile
+++ b/print/teTeX3-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2008/12/09 19:43:37 minskim Exp $
+# $NetBSD: Makefile,v 1.34 2009/01/08 22:09:35 minskim Exp $
 
 DISTNAME=	tetex-src-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION=	21
+PKGREVISION=	22
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -28,23 +28,19 @@ USE_LIBTOOL=	yes
 CONFIGURE_ARGS+=	--without-texinfo --without-texi2html
 CONFIGURE_ARGS+=	--with-xdvi-x-toolkit=xaw
 
+MAKE_ENV+=		KPATHSEA_PREFIX=${BUILDLINK_PREFIX.kpathsea}
+MAKE_FLAGS+=		LIBTOOL=${LIBTOOL:Q}
 MAKE_FLAGS+=		vartexfonts=${VARBASE:Q}/lib/texmf/fonts
 
-SUBST_CLASSES+=		texmfdir
-SUBST_MESSAGE.texmfdir=	Setting TEXMFSYSVAR.
-SUBST_STAGE.texmfdir=	pre-configure
-SUBST_FILES.texmfdir=	texk/kpathsea/texmf.in-teTeX
-SUBST_SED.texmfdir+=	-e 's,@VARBASE@,${VARBASE},'
-
 BUILD_DEFS+=		VARBASE
 LOWER_PAPERSIZE_cmd=	${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]'
 LOWER_PAPERSIZE=	${LOWER_PAPERSIZE_cmd:sh}
 FILES_SUBST+=		PAPERSIZE=${LOWER_PAPERSIZE:Q}
 
+PKG_SYSCONFSUBDIR=	texmf
+
 CONF_FILES+=	${PREFIX}/share/texmf/web2c/fmtutil.cnf.dist		\
 		${PREFIX}/share/texmf/web2c/fmtutil.cnf
-CONF_FILES+=	${PREFIX}/share/texmf/web2c/texmf.cnf.dist		\
-		${PREFIX}/share/texmf/web2c/texmf.cnf
 OWN_DIRS+=	${VARBASE}/lib/texmf ${PREFIX}/share/texmf-local
 .for d in pk source tfm
 OWN_DIRS_PERMS+=	${VARBASE}/lib/texmf/fonts/${d} \
@@ -56,8 +52,16 @@ INSTALL_MAKE_FLAGS+=	texmf=${DESTDIR}${PREFIX}/share/texmf
 INSTALL_MAKE_FLAGS+=	infodir=${DESTDIR}${PREFIX}/${PKGINFODIR}
 INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
+TEX_TEXMF_DIRS=	${PREFIX}/share/texmf
+
+.include "../../print/kpathsea/buildlink3.mk"
+.include "../../print/kpathsea/texmf.mk"
 .include "../../print/teTeX3-bin/Makefile.common"
 .include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
+
+post-extract:
+	${RM} -rf ${WRKSRC}/texk/kpathsea
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX3-bin/PLIST b/print/teTeX3-bin/PLIST
index 72a91612fb8..b0d440eb5b4 100644
--- a/print/teTeX3-bin/PLIST
+++ b/print/teTeX3-bin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/07 16:19:15 minskim Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/01/08 22:09:35 minskim Exp $
 bin/a2ping
 bin/afm2tfm
 bin/aleph
@@ -38,13 +38,9 @@ bin/gftodvi
 bin/gftopk
 bin/gftype
 bin/gsftopk
-bin/kpseaccess
 bin/kpsepath
-bin/kpsereadlink
-bin/kpsestat
 bin/kpsetool
 bin/kpsewhere
-bin/kpsewhich
 bin/kpsexpand
 bin/mag
 bin/makeindex
@@ -57,10 +53,6 @@ bin/mkindex
 bin/mkocp
 bin/mkofm
 bin/mktexfmt
-bin/mktexlsr
-bin/mktexmf
-bin/mktexpk
-bin/mktextfm
 bin/mpost
 bin/mpto
 bin/mptopdf
@@ -121,61 +113,9 @@ bin/weave
 bin/xdvi
 bin/xdvi-xaw.bin
 bin/xdvizilla
-include/kpathsea/absolute.h
-include/kpathsea/c-auto.h
-include/kpathsea/c-ctype.h
-include/kpathsea/c-dir.h
-include/kpathsea/c-errno.h
-include/kpathsea/c-fopen.h
-include/kpathsea/c-limits.h
-include/kpathsea/c-memstr.h
-include/kpathsea/c-minmax.h
-include/kpathsea/c-namemx.h
-include/kpathsea/c-pathch.h
-include/kpathsea/c-pathmx.h
-include/kpathsea/c-proto.h
-include/kpathsea/c-stat.h
-include/kpathsea/c-std.h
-include/kpathsea/c-unistd.h
-include/kpathsea/c-vararg.h
-include/kpathsea/cnf.h
-include/kpathsea/concatn.h
-include/kpathsea/config.h
-include/kpathsea/db.h
-include/kpathsea/debug.h
-include/kpathsea/default.h
-include/kpathsea/expand.h
-include/kpathsea/fn.h
-include/kpathsea/fontmap.h
-include/kpathsea/getopt.h
-include/kpathsea/hash.h
-include/kpathsea/kpathsea.h
-include/kpathsea/lib.h
-include/kpathsea/line.h
-include/kpathsea/magstep.h
-include/kpathsea/paths.h
-include/kpathsea/pathsearch.h
-include/kpathsea/proginit.h
-include/kpathsea/progname.h
-include/kpathsea/readable.h
-include/kpathsea/str-list.h
-include/kpathsea/str-llist.h
-include/kpathsea/systypes.h
-include/kpathsea/tex-file.h
-include/kpathsea/tex-glyph.h
-include/kpathsea/tex-hush.h
-include/kpathsea/tex-make.h
-include/kpathsea/tilde.h
-include/kpathsea/truncate.h
-include/kpathsea/types.h
-include/kpathsea/variable.h
-include/kpathsea/xopendir.h
-include/kpathsea/xstat.h
 info/latex.info
 info/dvips.info
 info/web2c.info
-info/kpathsea.info
-lib/libkpathsea.la
 man/man1/afm2tfm.1
 man/man1/allcm.1
 man/man1/allec.1
@@ -215,13 +155,9 @@ man/man1/gftodvi.1
 man/man1/gftopk.1
 man/man1/gftype.1
 man/man1/gsftopk.1
-man/man1/kpseaccess.1
 man/man1/kpsepath.1
-man/man1/kpsereadlink.1
-man/man1/kpsestat.1
 man/man1/kpsetool.1
 man/man1/kpsewhere.1
-man/man1/kpsewhich.1
 man/man1/kpsexpand.1
 man/man1/lambda.1
 man/man1/latex.1
@@ -236,10 +172,6 @@ man/man1/mkindex.1
 man/man1/mkocp.1
 man/man1/mkofm.1
 man/man1/mktexfmt.1
-man/man1/mktexlsr.1
-man/man1/mktexmf.1
-man/man1/mktexpk.1
-man/man1/mktextfm.1
 man/man1/mpost.1
 man/man1/mpto.1
 man/man1/newer.1
@@ -319,34 +251,13 @@ share/texmf/texconfig/x/xterm
 share/texmf/web2c/aleph.pool
 share/texmf/web2c/fmtutil.cnf.dist
 share/texmf/web2c/mf.pool
-share/texmf/web2c/mktex.opt
-share/texmf/web2c/mktexdir
-share/texmf/web2c/mktexdir.opt
-share/texmf/web2c/mktexnam
-share/texmf/web2c/mktexnam.opt
-share/texmf/web2c/mktexupd
 share/texmf/web2c/mp.pool
 share/texmf/web2c/omega.pool
 share/texmf/web2c/pdfetex-pl.pool
 share/texmf/web2c/pdfetex.pool
 share/texmf/web2c/pdfxtex.pool
 share/texmf/web2c/tex.pool
-share/texmf/web2c/texmf.cnf.dist
 share/texmf/xdvi/XDvi
 share/texmf/xdvi/pixmaps/toolbar.xpm
 share/texmf/xdvi/pixmaps/toolbar2.xpm
 share/texmf/xdvi/xdvi.cfg
-@dirrm share/texmf/xdvi/pixmaps
-@dirrm share/texmf/xdvi
-@dirrm share/texmf/web2c
-@dirrm share/texmf/texconfig/x
-@dirrm share/texmf/texconfig/v
-@dirrm share/texmf/texconfig/g
-@dirrm share/texmf/texconfig
-@dirrm share/texmf/dvips/gsftopk
-@dirrm share/texmf/dvips/base
-@dirrm share/texmf/dvips
-@dirrm share/texmf/doc/tetex
-@dirrm share/texmf/doc
-@dirrm share/texmf
-@dirrm include/kpathsea
diff --git a/print/teTeX3-bin/distinfo b/print/teTeX3-bin/distinfo
index 2394a2b482c..f6b8208873c 100644
--- a/print/teTeX3-bin/distinfo
+++ b/print/teTeX3-bin/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2008/12/09 19:43:37 minskim Exp $
+$NetBSD: distinfo,v 1.13 2009/01/08 22:09:35 minskim Exp $
 
 SHA1 (teTeX/tetex-src-3.0.tar.gz) = 7637789f7f4929694aed1b89820f5bad4753e8fc
 RMD160 (teTeX/tetex-src-3.0.tar.gz) = 15a139f5f36993e4ed3583260e175cfb13ce7bcc
 Size (teTeX/tetex-src-3.0.tar.gz) = 12749314 bytes
-SHA1 (patch-aa) = 77feabef32c612ac5d0250b1e4db50a3fc497990
-SHA1 (patch-ab) = af4e90102afeb6e6dbd46ffbec51e14dd6d4fed5
+SHA1 (patch-aa) = afdcbf2dafe053db174ca456806667dbe2cc79c2
+SHA1 (patch-ab) = caaf91dbbd8fa94fabf7b4f6fe6e0a97c7a6071a
 SHA1 (patch-ac) = af7d8c65cece55b7f37e7cf3c99c85e75cb911a1
 SHA1 (patch-ad) = 23d8e8729bc10748cceba5be3272484ab50f34e6
 SHA1 (patch-ae) = 68825699db129b82f476c37ba3b6e20a8831ad6e
@@ -17,14 +17,17 @@ SHA1 (patch-ak) = ba06c10c1151173e04f3a6cc44d44a89f1933bb8
 SHA1 (patch-al) = e1fc74bd6ea05176dfac4e99958f0e1281b89b3b
 SHA1 (patch-am) = 54d86197eee3d4e15a6c9bad6ae16ef1e0299667
 SHA1 (patch-an) = a02db18a49f61f965e0277fbc5a3fa72a5060b47
-SHA1 (patch-ao) = f40eb1ac8f9c1d5adaf6aac86d59a217b4c8411d
 SHA1 (patch-ap) = 0ca7341b416842fbc00a935d6cfdb0531c4169ba
 SHA1 (patch-aq) = d7a4dd4864e43cd27b1ca803f8ebfe82e65f84a7
 SHA1 (patch-ar) = 7f0c6cdca69b73bad1c8f8298e417ede1cd89d77
-SHA1 (patch-as) = 0b6c4c6b253ba1160628c19fa7080bc7c307caf3
 SHA1 (patch-at) = aaeddf2240f1b0e394ab78122352c111f3aa9718
 SHA1 (patch-au) = 119e3714b5c1ff2fe7b7ec8041a3bb8eab6fb944
 SHA1 (patch-av) = 53c963ac1b5f1963f707228badeaf0d57b159344
 SHA1 (patch-aw) = 4876a029e00298aa0f01b2e652fe101b6453afbd
 SHA1 (patch-ax) = 6f32d91113254335f683466149f25050d21dbc08
 SHA1 (patch-ay) = 277a5d8c80b3c2c594bf38de27635d5236f755a6
+SHA1 (patch-az) = 46b4a161f74eca38b73a413c4132fdb96bbb6c7c
+SHA1 (patch-ba) = 598a0668da03f01f30239ac1f3dafaa2a0831c58
+SHA1 (patch-bb) = 14e1ca5de201037f4d9d8a818da3a01bc552a389
+SHA1 (patch-bc) = 7a2f9a3f7218a7985b551c0e5023372436b4eb53
+SHA1 (patch-bd) = 6b4947689c1a3763f1cf274583ca10789e2283f5
diff --git a/print/teTeX3-bin/patches/patch-aa b/print/teTeX3-bin/patches/patch-aa
index 0ae7c75134a..df37505e106 100644
--- a/print/teTeX3-bin/patches/patch-aa
+++ b/print/teTeX3-bin/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/03/31 22:09:18 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2009/01/08 22:09:35 minskim Exp $
 
---- texk/configure.in.orig	Mon Jan 13 11:32:40 2003
+--- texk/configure.in.orig	2004-05-12 13:32:37.000000000 -0700
 +++ texk/configure.in
+@@ -9,7 +9,7 @@ dnl Consequence: we don't need to run co
+ dnl itself; we can just copy from a program directory.  We'll use the
+ dnl first one.
+ dnl 
+-AC_INIT(kpathsea/kpathsea.texi)
++AC_INIT(web2c/tex.web)
+ 
+ dnl These configure scripts won't work with anything else.
+ AC_PREREQ(2.13)
 @@ -29,6 +29,9 @@ dnl Pass this down from the top level so
  dnl install kpathsea a command line value is propagated.
  AC_PROG_INSTALL
diff --git a/print/teTeX3-bin/patches/patch-ab b/print/teTeX3-bin/patches/patch-ab
index 62d9f141fdf..77247e26783 100644
--- a/print/teTeX3-bin/patches/patch-ab
+++ b/print/teTeX3-bin/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/03/31 22:09:18 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 2009/01/08 22:09:35 minskim Exp $
 
---- texk/configure.orig	2005-02-06 18:27:03.000000000 +0000
+--- texk/configure.orig	2005-02-06 10:27:03.000000000 -0800
 +++ texk/configure
-@@ -1463,6 +1463,50 @@
+@@ -774,7 +774,7 @@ echo > confdefs.h
+ 
+ # A filename unique to this package, relative to the directory that
+ # configure is in, which we can look for to find out if srcdir is correct.
+-ac_unique_file=kpathsea/kpathsea.texi
++ac_unique_file=web2c/tex.web
+ 
+ # Find the source files, if location was not specified.
+ if test -z "$srcdir"; then
+@@ -1463,6 +1463,50 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
  # as few characters as possible.  Prefer GNU sed if found.
  
  
@@ -53,7 +62,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/03/31 22:09:18 hubertf Exp $
  
  # Check whether --with-bibtex8 or --without-bibtex8 was given.
  if test "${with_bibtex8+set}" = set; then
-@@ -6711,7 +6755,7 @@
+@@ -6697,6 +6741,8 @@ for ac_option
+ do
+   case "\$ac_option" in
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+@@ -6711,7 +6757,7 @@ done
  ac_given_srcdir=$srcdir
  ac_given_INSTALL="$INSTALL"
  
@@ -62,7 +80,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/03/31 22:09:18 hubertf Exp $
  EOF
  cat >> $CONFIG_STATUS <<EOF
  
-@@ -6913,6 +6957,113 @@
+@@ -6913,6 +6959,113 @@ s%@INSTALL@%$INSTALL%g
  fi; done
  rm -f conftest.s*
  
diff --git a/print/teTeX3-bin/patches/patch-ao b/print/teTeX3-bin/patches/patch-ao
deleted file mode 100644
index c6c82575aba..00000000000
--- a/print/teTeX3-bin/patches/patch-ao
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2008/12/09 19:43:37 minskim Exp $
-
---- texk/kpathsea/texmf.in-teTeX.orig	2005-02-05 16:04:35.000000000 -0800
-+++ texk/kpathsea/texmf.in-teTeX
-@@ -72,7 +72,7 @@ TEXMFLOCAL = @texmf@-local
- %   TEXMFSYSVAR = $TEXMFMAIN
- % For using a separate tree:
- %   TEXMFSYSVAR = @texmf@-var
--TEXMFSYSVAR = @texmf@-var
-+TEXMFSYSVAR = @VARBASE@/lib/texmf
- 
- % TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
- % With teTeX-3.0 or later, this must be set.
-@@ -126,7 +126,7 @@ VARTEXFONTS = @vartexfonts@
- %
- % Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below
- % one of the TEXMF directories (avoids overlapping ls-R files).
--TEXMFDBS = $TEXMF;$VARTEXFONTS
-+TEXMFDBS = $TEXMF
- 
- % It may be convenient to define TEXMF like this:
- %   TEXMF = {$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFMAIN,$HOME}
diff --git a/print/teTeX3-bin/patches/patch-as b/print/teTeX3-bin/patches/patch-as
deleted file mode 100644
index 3b39cefb87b..00000000000
--- a/print/teTeX3-bin/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.1 2006/04/05 16:04:01 jlam Exp $
-
---- texk/kpathsea/Makefile.in.orig	2005-01-30 11:56:30.000000000 -0500
-+++ texk/kpathsea/Makefile.in
-@@ -198,7 +198,7 @@ install-data: texmf.cnf kpathsea.info in
- 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf) $(infodir) $(web2cdir)
- 	if grep 'original texmf.cnf --' $(web2cdir)/texmf.cnf >/dev/null 2>&1 \
- 	   || test ! -r $(web2cdir)/texmf.cnf; then \
--	  $(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf; \
-+	  $(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf.dist; \
- 	else true; fi
- 	test -r ./kpathsea.info || cd $(srcdir) && for i in kpathsea.i*; do \
- 	  $(INSTALL_DATA) $$i $(infodir)/$$i; done
diff --git a/print/teTeX3-bin/patches/patch-az b/print/teTeX3-bin/patches/patch-az
new file mode 100644
index 00000000000..607423177e5
--- /dev/null
+++ b/print/teTeX3-bin/patches/patch-az
@@ -0,0 +1,22 @@
+$NetBSD: patch-az,v 1.1 2009/01/08 22:09:35 minskim Exp $
+
+--- texk/Makefile.in.orig	2005-01-21 01:11:48.000000000 -0800
++++ texk/Makefile.in
+@@ -36,7 +36,7 @@ default all: do-kpathsea
+ 	  (cd $$d && $(MAKE) $(makeargs) $@) || exit 1; else true; fi; done
+ 
+ install install-data install-exec:
+-	for d in kpathsea $(programs); do if test -f $$d/Makefile; then \
++	for d in $(programs); do if test -f $$d/Makefile; then \
+ 	  (cd $$d && $(MAKE) $(installargs) $@) || exit 1; else true; fi; done
+ 
+ # Other standard targets for everything.
+@@ -59,7 +59,7 @@ distclean realclean::
+ # Unconditionally remake the library, since we don't want to write out
+ # the dependencies here.
+ do-kpathsea:
+-	cd $(kpathsea_dir) && $(MAKE) $(makeargs)
++	true
+ 
+ # Targets that only apply to web2c.
+ triptrap trip trap mptrap \
diff --git a/print/teTeX3-bin/patches/patch-ba b/print/teTeX3-bin/patches/patch-ba
new file mode 100644
index 00000000000..31bde171dfd
--- /dev/null
+++ b/print/teTeX3-bin/patches/patch-ba
@@ -0,0 +1,15 @@
+$NetBSD: patch-ba,v 1.1 2009/01/08 22:09:35 minskim Exp $
+
+--- texk/web2c/kpathsea.mk.orig	1999-01-12 11:11:00.000000000 -0800
++++ texk/web2c/kpathsea.mk
+@@ -1,7 +1,7 @@
+ # web2c/kpathsea.mk -- In subdirectories of web2c, the build directory
+ # for kpathsea is one more level up.  c_auto_h_dir is used by make depend.
+-kpathsea_parent = ../..
+-c_auto_h_dir = ..
++kpathsea_parent = $(KPATHSEA_PREFIX)/include
++c_auto_h_dir = $(KPATHSEA_PREFIX)/include/kpathsea
+ 
+-prog_cflags = -I.. -I$(srcdir)/..
++prog_cflags = -I$(KPATHSEA_PREFIX)/include -I$(srcdir)/..
+ # End of web2c/kpathsea.mk.
diff --git a/print/teTeX3-bin/patches/patch-bb b/print/teTeX3-bin/patches/patch-bb
new file mode 100644
index 00000000000..37c917f26df
--- /dev/null
+++ b/print/teTeX3-bin/patches/patch-bb
@@ -0,0 +1,19 @@
+$NetBSD: patch-bb,v 1.1 2009/01/08 22:09:35 minskim Exp $
+
+--- texk/make/common.mk.orig	2004-08-06 11:40:50.000000000 -0700
++++ texk/make/common.mk
+@@ -50,11 +50,11 @@ UNINSTALL_LIBTOOL_LIBS = $(LIBTOOL) --mo
+ UNINSTALL_LIBTOOL_PROG = $(LIBTOOL) --mode=uninstall $(RM)
+ 
+ # We use these for many things.
+-kpathsea_parent = ..
++kpathsea_parent = $(KPATHSEA_PREFIX)/include
+ kpathsea_dir = $(kpathsea_parent)/kpathsea
+ kpathsea_srcdir_parent = $(top_srcdir)/..
+-kpathsea_srcdir = $(kpathsea_srcdir_parent)/kpathsea
+-kpathsea = $(kpathsea_dir)/libkpathsea.la
++kpathsea_srcdir = $(KPATHSEA_PREFIX)/include/kpathsea
++kpathsea = $(KPATHSEA_PREFIX)/lib/libkpathsea.la
+ 
+ @MAINT@ifeq ($(CC), gcc)
+ @MAINT@XDEFS = -Wpointer-arith $(warn_more)
diff --git a/print/teTeX3-bin/patches/patch-bc b/print/teTeX3-bin/patches/patch-bc
new file mode 100644
index 00000000000..830b8cb4e46
--- /dev/null
+++ b/print/teTeX3-bin/patches/patch-bc
@@ -0,0 +1,19 @@
+$NetBSD: patch-bc,v 1.1 2009/01/08 22:09:35 minskim Exp $
+
+--- texk/make/tkpathsea.mk.orig	2002-11-16 11:35:14.000000000 -0800
++++ texk/make/tkpathsea.mk
+@@ -3,10 +3,9 @@ makeargs = $(MFLAGS) CC='$(CC)' CFLAGS='
+ 
+ # This is wrong: the library doesn't depend on kpsewhich.c or
+ # acconfig.h.  But what to do?
+-$(kpathsea): $(kpathsea_srcdir)/*.c $(kpathsea_srcdir)/*.h \
+-	     $(kpathsea_srcdir)/texmf.in $(top_srcdir)/../make/paths.mk
+-	cd $(kpathsea_dir) && $(MAKE) $(makeargs)
++$(kpathsea):
++	true
+ 
+-$(kpathsea_dir)/paths.h: $(kpathsea_srcdir)/texmf.in
+-	cd $(kpathsea_dir) && $(MAKE) $(makeargs)
++$(kpathsea_dir)/paths.h:
++	true
+ # End of tkpathsea.mk.
diff --git a/print/teTeX3-bin/patches/patch-bd b/print/teTeX3-bin/patches/patch-bd
new file mode 100644
index 00000000000..9dcbcf590ac
--- /dev/null
+++ b/print/teTeX3-bin/patches/patch-bd
@@ -0,0 +1,13 @@
+$NetBSD: patch-bd,v 1.1 2009/01/08 22:09:35 minskim Exp $
+
+--- texk/xdvik/gui/Makefile.in.orig	2004-04-18 05:21:13.000000000 -0700
++++ texk/xdvik/gui/Makefile.in
+@@ -12,7 +12,7 @@ ac_include ../make/library.mk
+ ac_include ../make/common.mk
+ ac_include ../make/programs.mk
+ 
+-kpathsea_parent = ../..
++kpathsea_parent = $(KPATHSEA_PREFIX)/include
+ 
+ CPP = @CPP@
+ RANLIB = @RANLIB@
diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile
index 881bf7296e5..157bd631d34 100644
--- a/print/teTeX3-texmf/Makefile
+++ b/print/teTeX3-texmf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2008/05/26 22:37:30 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2009/01/08 22:09:34 minskim Exp $
 #
 
 DISTNAME=	tetex-texmf-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -27,7 +27,7 @@ CHECK_INTERPRETER_SKIP+=share/texmf-dist/doc/generic/ruhyphen/reduce-patt \
 REPLACE_SH+=	doc/latex/bibunits/bibtexall doc/latex/multibib/bibtexall
 USE_TOOLS+=	sh:run pax
 
-INSTALLATION_DIRS=	share/texmf-dist
+.include "../../print/kpathsea/texmf.mk"
 
 post-extract:
 	rm -f ${WRKSRC}/ls-R
diff --git a/print/teTeX3-texmf/PLIST b/print/teTeX3-texmf/PLIST
index e1351439bc3..8aea98741d7 100644
--- a/print/teTeX3-texmf/PLIST
+++ b/print/teTeX3-texmf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/07 16:19:15 minskim Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/01/08 22:09:34 minskim Exp $
 share/texmf-dist/ChangeLog
 share/texmf-dist/LICENSE.texmf
 share/texmf-dist/aliases
@@ -14821,4 +14821,3 @@ share/texmf-dist/web2c/viscii-t5.tcx
 @dirrm share/texmf-dist/bibtex/bib/ams
 @dirrm share/texmf-dist/bibtex/bib
 @dirrm share/texmf-dist/bibtex
-@dirrm share/texmf-dist