summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorminskim <minskim>2010-01-28 22:37:32 +0000
committerminskim <minskim>2010-01-28 22:37:32 +0000
commit31ee98adf78ff19338e759cbb6cac1736bfc3161 (patch)
treef94170ae5c82aa41629a695698b54542d1e12d45
parent68967f685226804eba4ea524af99f356a71d4c83 (diff)
downloadpkgsrc-31ee98adf78ff19338e759cbb6cac1736bfc3161.tar.gz
Use texmf.mk to rebuild ls-R for ${VARBASE}/lib/texmf.
-rw-r--r--print/texlive-tetex/files/format-deinstall.tmpl3
-rw-r--r--print/texlive-tetex/format.mk4
-rw-r--r--print/texlive/module.mk8
3 files changed, 8 insertions, 7 deletions
diff --git a/print/texlive-tetex/files/format-deinstall.tmpl b/print/texlive-tetex/files/format-deinstall.tmpl
index 6df342bf871..7d0c2e765b1 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.2 2010/01/28 21:37:36 minskim Exp $
+# $NetBSD: format-deinstall.tmpl,v 1.3 2010/01/28 22:37:33 minskim Exp $
#
# Delete format files.
#
@@ -38,7 +38,6 @@ DEINSTALL)
done
done
@FIND@ -d @VARBASE@/lib/texmf -type d -empty -exec @RMDIR@ {} \;
- @MKTEXLSR@ @VARBASE@/lib/texmf
;;
*)
;;
diff --git a/print/texlive-tetex/format.mk b/print/texlive-tetex/format.mk
index a4965686280..7cca8d9a7e0 100644
--- a/print/texlive-tetex/format.mk
+++ b/print/texlive-tetex/format.mk
@@ -1,4 +1,4 @@
-# $NetBSD: format.mk,v 1.1.1.1 2009/01/26 21:04:33 minskim Exp $
+# $NetBSD: format.mk,v 1.2 2010/01/28 22:37:32 minskim Exp $
#
# This Makefile fragment is intended to be included by packages that
# install TeX format files. It creates format files at
@@ -14,6 +14,8 @@ TEX_FORMAT_MK= # defined
DEPENDS+= texlive-tetex>=2008:../../print/texlive-tetex
+TEX_TEXMF_DIRS+= ${VARBASE}/lib/texmf
+
EVAL_PREFIX+= TETEX_PREFIX=texlive-tetex
FILES_SUBST+= FMTUTIL_SYS=${TETEX_PREFIX:Q}/bin/fmtutil-sys
FILES_SUBST+= FORMAT_NAMES=${TEX_FORMAT_NAMES:Q}
diff --git a/print/texlive/module.mk b/print/texlive/module.mk
index 325eec47b16..b4cab2b892f 100644
--- a/print/texlive/module.mk
+++ b/print/texlive/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.8 2009/08/08 11:05:35 minskim Exp $
+# $NetBSD: module.mk,v 1.9 2010/01/28 22:37:32 minskim Exp $
#
# This Makefile fragment is inteded to be included by packages that build
# TeX Live 2008 packages.
@@ -91,12 +91,12 @@ _texlive-install:
done; \
fi
-.if empty(TEX_TEXMF_DIRS) || ${TEX_TEXMF_DIRS} != "none"
-.include "../../print/kpathsea/texmf.mk"
-.endif
.if !empty(TEX_FORMAT_NAMES)
. include "../../print/texlive-tetex/format.mk"
.endif
+.if empty(TEX_TEXMF_DIRS) || ${TEX_TEXMF_DIRS} != "none"
+.include "../../print/kpathsea/texmf.mk"
+.endif
.if !empty(TEX_HYPHEN_DAT) || !empty(TEX_HYPHEN_DEF)
. include "../../print/texlive-tetex/hyphen.mk"
.endif