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}.

9 files changed, 122 insertions, 42 deletions

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@