TEX_FORMAT_NAMES is no longer used.

4 files changed, 6 insertions, 49 deletions

diff --git a/print/kpathsea/texmf.mk b/print/kpathsea/texmf.mk
index 6af893c2d31..8c645c17d1b 100644
--- a/print/kpathsea/texmf.mk
+++ b/print/kpathsea/texmf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: texmf.mk,v 1.5 2012/03/04 01:03:59 minskim Exp $
+# $NetBSD: texmf.mk,v 1.6 2012/10/14 18:12:37 minskim Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # install TeX packages.  It rebuilds the ls-R databases at
@@ -41,8 +41,8 @@ INSTALL_TEMPLATES+=	../../print/kpathsea/files/config-install.tmpl
 DEINSTALL_TEMPLATES+=	../../print/kpathsea/files/config-deinstall.tmpl
 .  endif
 
-.if !empty(TEX_FORMATS) || !empty(TEX_FORMAT_NAMES)
-.  include "../../print/texlive-tetex/format.mk"
+.if !empty(TEX_FORMATS)
+.  include "../../print/tex-tetex/format.mk"
 .endif
 .if !empty(TEX_HYPHEN_DAT) || !empty(TEX_HYPHEN_DEF)
 .  include "../../print/texlive-tetex/hyphen.mk"
diff --git a/print/texlive-tetex/files/format-deinstall.tmpl b/print/texlive-tetex/files/format-deinstall.tmpl
index af9a7397ae3..2223022d653 100644
--- a/print/texlive-tetex/files/format-deinstall.tmpl
+++ b/print/texlive-tetex/files/format-deinstall.tmpl
@@ -1,4 +1,4 @@
-# $NetBSD: format-deinstall.tmpl,v 1.7 2012/07/23 19:17:40 jperkin Exp $
+# $NetBSD: format-deinstall.tmpl,v 1.8 2012/10/14 18:12:37 minskim Exp $
 #
 # Delete format files.
 #
@@ -32,36 +32,6 @@ DEINSTALL)
 			@RM@ -f @VARBASE@/lib/texmf/web2c/$texengine/$format.log
 		done
 	fi
-	format_names="@FORMAT_NAMES@"
-	for f in $format_names ; do
-		@CAT@ @PREFIX@/share/texmf/fmtutil/format.$f.cnf |
-		@GREP@ "^[^#]" |
-		while read format engine junk; do
-		  ${GREP} -v "^${format}[[:space:]][[:space:]]*${engine}[[:space:]]" ${FMTUTIL_CNF} > \
-			${FMTUTIL_CNF}.tmp &&
-		  ${MV} ${FMTUTIL_CNF}.tmp ${FMTUTIL_CNF}
-		  case "$engine" in
-		    mpost)
-		      if [ "$format" = "mpost" ]; then
-		        fmtfile="mp*.mem"
-		      else
-		        fmtfile="$format.mem"
-		      fi
-		      texengine=metapost
-		      ;;
-		    mf*)
-		      fmtfile="$format.base"
-		      texengine=metafont
-		      ;;
-		    *)
-		      fmtfile="$format.fmt"
-		      texengine=$engine
-		      ;;
-		  esac
-			@RM@ -f @VARBASE@/lib/texmf/web2c/$texengine/$fmtfile
-			@RM@ -f @VARBASE@/lib/texmf/web2c/$texengine/$format.log
-		done
-	done
 	@FIND@ @VARBASE@/lib/texmf -depth -type d -exec @RMDIR@ {} \; 2>/dev/null
 	@MKTEXLSR@ @VARBASE@/lib/texmf
         ;;
diff --git a/print/texlive-tetex/files/format-install.tmpl b/print/texlive-tetex/files/format-install.tmpl
index 9a6ac5c122d..6fe8615f9a9 100644
--- a/print/texlive-tetex/files/format-install.tmpl
+++ b/print/texlive-tetex/files/format-install.tmpl
@@ -1,4 +1,4 @@
-# $NetBSD: format-install.tmpl,v 1.4 2010/01/29 19:59:47 minskim Exp $
+# $NetBSD: format-install.tmpl,v 1.5 2012/10/14 18:12:37 minskim Exp $
 #
 # Create format files.
 #
@@ -15,16 +15,6 @@ POST-INSTALL)
 			@FMTUTIL_SYS@ --byfmt $format
 		done
 	fi
-	format_names="@FORMAT_NAMES@"
-	for f in $format_names ; do
-		${GREP} -v "^#" @PREFIX@/share/texmf/fmtutil/format.$f.cnf |
-		${GREP} "...." >> ${FMTUTIL_CNF}
-		@CAT@ @PREFIX@/share/texmf/fmtutil/format.$f.cnf |
-		@GREP@ "^[^#]" |
-		while read format engine junk; do
-			@FMTUTIL_SYS@ --byfmt $format
-		done
-	done
 	@MKTEXLSR@ @VARBASE@/lib/texmf
         ;;
 *)
diff --git a/print/texlive-tetex/format.mk b/print/texlive-tetex/format.mk
index 5c0587b74b9..a50f39cb537 100644
--- a/print/texlive-tetex/format.mk
+++ b/print/texlive-tetex/format.mk
@@ -1,4 +1,4 @@
-# $NetBSD: format.mk,v 1.5 2010/01/29 19:59:47 minskim Exp $
+# $NetBSD: format.mk,v 1.6 2012/10/14 18:12:37 minskim Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # install TeX format files.  It creates format files at
@@ -8,8 +8,6 @@
 #
 #    TEX_FORMATS - A list of parameters to build formats
 #
-#    TEX_FORMAT_NAMES (for TeX Live 2008 only) - A list of format names.
-#
 
 .if !defined(TEX_FORMAT_MK)
 TEX_FORMAT_MK=		# defined
@@ -18,7 +16,6 @@ DEPENDS+=		texlive-tetex>=2008:../../print/texlive-tetex
 
 EVAL_PREFIX+=		TETEX_PREFIX=texlive-tetex
 FILES_SUBST+=		FMTUTIL_SYS=${TETEX_PREFIX:Q}/bin/fmtutil-sys
-FILES_SUBST+=		FORMAT_NAMES=${TEX_FORMAT_NAMES:Q}
 FILES_SUBST+=		FORMATS=${TEX_FORMATS:Q}
 FILES_SUBST+=		PRINTF=${PRINTF:Q}
 INSTALL_TEMPLATES+=	../../print/texlive-tetex/files/format-install.tmpl