Thu Jan 28 22:37:33 2010 UTC ()
Use texmf.mk to rebuild ls-R for ${VARBASE}/lib/texmf.


(minskim)
diff -r1.8 -r1.9 pkgsrc/print/texlive/module.mk
diff -r1.1.1.1 -r1.2 pkgsrc/print/texlive-tetex/format.mk
diff -r1.2 -r1.3 pkgsrc/print/texlive-tetex/files/format-deinstall.tmpl
cvs diff -r1.8 -r1.9 pkgsrc/print/texlive/Attic/module.mk (expand / switch to unified diff)

--- pkgsrc/print/texlive/Attic/module.mk 2009/08/08 11:05:35 1.8
+++ pkgsrc/print/texlive/Attic/module.mk 2010/01/28 22:37:32 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: module.mk,v 1.8 2009/08/08 11:05:35 minskim Exp $ 1# $NetBSD: module.mk,v 1.9 2010/01/28 22:37:32 minskim Exp $
2# 2#
3# This Makefile fragment is inteded to be included by packages that build 3# This Makefile fragment is inteded to be included by packages that build
4# TeX Live 2008 packages. 4# TeX Live 2008 packages.
5# 5#
6# Package-settable variables: 6# Package-settable variables:
7# 7#
8# TEX_FORMAT_NAMES 8# TEX_FORMAT_NAMES
9# See ../../print/texlive-tetex/format.mk. 9# See ../../print/texlive-tetex/format.mk.
10# 10#
11# TEX_HYPHEN_DAT 11# TEX_HYPHEN_DAT
12# See ../../print/texlive-tetex/hyphen.mk. 12# See ../../print/texlive-tetex/hyphen.mk.
13# 13#
14# TEX_HYPHEN_DEF 14# TEX_HYPHEN_DEF
@@ -81,28 +81,28 @@ _texlive-install: @@ -81,28 +81,28 @@ _texlive-install:
81 ${INSTALL_SCRIPT} $$script ${DESTDIR}${PREFIX}/bin; \ 81 ${INSTALL_SCRIPT} $$script ${DESTDIR}${PREFIX}/bin; \
82 done; \ 82 done; \
83 fi 83 fi
84 if [ -d ${WRKSRC}/man ]; then \ 84 if [ -d ${WRKSRC}/man ]; then \
85 ${FIND} ${WRKSRC}/man -name \*.orig -exec ${RM} {} \; ; \ 85 ${FIND} ${WRKSRC}/man -name \*.orig -exec ${RM} {} \; ; \
86 ${INSTALL_MAN_DIR} -p ${DESTDIR}${PREFIX}/${PKGMANDIR}; \ 86 ${INSTALL_MAN_DIR} -p ${DESTDIR}${PREFIX}/${PKGMANDIR}; \
87 for f in ${WRKSRC}/man/*; do \ 87 for f in ${WRKSRC}/man/*; do \
88 d=${DESTDIR}${PREFIX}/${PKGMANDIR}/`${BASENAME} $$f`; \ 88 d=${DESTDIR}${PREFIX}/${PKGMANDIR}/`${BASENAME} $$f`; \
89 ${INSTALL_MAN_DIR} $$d; \ 89 ${INSTALL_MAN_DIR} $$d; \
90 ${INSTALL_MAN} $$f/* $$d; \ 90 ${INSTALL_MAN} $$f/* $$d; \
91 done; \ 91 done; \
92 fi 92 fi
93 93
94.if empty(TEX_TEXMF_DIRS) || ${TEX_TEXMF_DIRS} != "none" 
95.include "../../print/kpathsea/texmf.mk" 
96.endif 
97.if !empty(TEX_FORMAT_NAMES) 94.if !empty(TEX_FORMAT_NAMES)
98. include "../../print/texlive-tetex/format.mk" 95. include "../../print/texlive-tetex/format.mk"
99.endif 96.endif
 97.if empty(TEX_TEXMF_DIRS) || ${TEX_TEXMF_DIRS} != "none"
 98.include "../../print/kpathsea/texmf.mk"
 99.endif
100.if !empty(TEX_HYPHEN_DAT) || !empty(TEX_HYPHEN_DEF) 100.if !empty(TEX_HYPHEN_DAT) || !empty(TEX_HYPHEN_DEF)
101. include "../../print/texlive-tetex/hyphen.mk" 101. include "../../print/texlive-tetex/hyphen.mk"
102.endif 102.endif
103.if !empty(TEX_MAP_FILES) || !empty(TEX_MIXEDMAP_FILES) 103.if !empty(TEX_MAP_FILES) || !empty(TEX_MIXEDMAP_FILES)
104. include "../../print/texlive-tetex/map.mk" 104. include "../../print/texlive-tetex/map.mk"
105.endif 105.endif
106 106
107post-extract: _texlive-set-permission _texlive-man 107post-extract: _texlive-set-permission _texlive-man
108do-install: _texlive-install 108do-install: _texlive-install
cvs diff -r1.1.1.1 -r1.2 pkgsrc/print/texlive-tetex/Attic/format.mk (expand / switch to unified diff)

--- pkgsrc/print/texlive-tetex/Attic/format.mk 2009/01/26 21:04:33 1.1.1.1
+++ pkgsrc/print/texlive-tetex/Attic/format.mk 2010/01/28 22:37:32 1.2
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1# $NetBSD: format.mk,v 1.1.1.1 2009/01/26 21:04:33 minskim Exp $ 1# $NetBSD: format.mk,v 1.2 2010/01/28 22:37:32 minskim Exp $
2# 2#
3# This Makefile fragment is intended to be included by packages that 3# This Makefile fragment is intended to be included by packages that
4# install TeX format files. It creates format files at 4# install TeX format files. It creates format files at
5# (de)installation time. 5# (de)installation time.
6# 6#
7# The following variable can be defined: 7# The following variable can be defined:
8# 8#
9# TEX_FORMAT_NAMES - A list of format names. 9# TEX_FORMAT_NAMES - A list of format names.
10# 10#
11 11
12.if !defined(TEX_FORMAT_MK) 12.if !defined(TEX_FORMAT_MK)
13TEX_FORMAT_MK= # defined 13TEX_FORMAT_MK= # defined
14 14
15DEPENDS+= texlive-tetex>=2008:../../print/texlive-tetex 15DEPENDS+= texlive-tetex>=2008:../../print/texlive-tetex
16 16
 17TEX_TEXMF_DIRS+= ${VARBASE}/lib/texmf
 18
17EVAL_PREFIX+= TETEX_PREFIX=texlive-tetex 19EVAL_PREFIX+= TETEX_PREFIX=texlive-tetex
18FILES_SUBST+= FMTUTIL_SYS=${TETEX_PREFIX:Q}/bin/fmtutil-sys 20FILES_SUBST+= FMTUTIL_SYS=${TETEX_PREFIX:Q}/bin/fmtutil-sys
19FILES_SUBST+= FORMAT_NAMES=${TEX_FORMAT_NAMES:Q} 21FILES_SUBST+= FORMAT_NAMES=${TEX_FORMAT_NAMES:Q}
20INSTALL_TEMPLATES+= ../../print/texlive-tetex/files/format-install.tmpl 22INSTALL_TEMPLATES+= ../../print/texlive-tetex/files/format-install.tmpl
21DEINSTALL_TEMPLATES+= ../../print/texlive-tetex/files/format-deinstall.tmpl 23DEINSTALL_TEMPLATES+= ../../print/texlive-tetex/files/format-deinstall.tmpl
22 24
23.endif # TEX_FORMAT_MK 25.endif # TEX_FORMAT_MK
cvs diff -r1.2 -r1.3 pkgsrc/print/texlive-tetex/files/Attic/format-deinstall.tmpl (expand / switch to unified diff)

--- pkgsrc/print/texlive-tetex/files/Attic/format-deinstall.tmpl 2010/01/28 21:37:36 1.2
+++ pkgsrc/print/texlive-tetex/files/Attic/format-deinstall.tmpl 2010/01/28 22:37:33 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: format-deinstall.tmpl,v 1.2 2010/01/28 21:37:36 minskim Exp $ 1# $NetBSD: format-deinstall.tmpl,v 1.3 2010/01/28 22:37:33 minskim Exp $
2# 2#
3# Delete format files. 3# Delete format files.
4# 4#
5 5
6FMTUTIL_CNF=${PKG_SYSCONFBASE}/texmf/web2c/fmtutil.cnf 6FMTUTIL_CNF=${PKG_SYSCONFBASE}/texmf/web2c/fmtutil.cnf
7 7
8case ${STAGE} in 8case ${STAGE} in
9DEINSTALL) 9DEINSTALL)
10 format_names="@FORMAT_NAMES@" 10 format_names="@FORMAT_NAMES@"
11 for f in $format_names ; do 11 for f in $format_names ; do
12 @CAT@ @PREFIX@/share/texmf/fmtutil/format.$f.cnf | 12 @CAT@ @PREFIX@/share/texmf/fmtutil/format.$f.cnf |
13 @GREP@ "^[^#]" | 13 @GREP@ "^[^#]" |
14 while read format engine junk; do 14 while read format engine junk; do
@@ -28,18 +28,17 @@ DEINSTALL) @@ -28,18 +28,17 @@ DEINSTALL)
28 fmtfile="$format.base" 28 fmtfile="$format.base"
29 texengine=metafont 29 texengine=metafont
30 ;; 30 ;;
31 *) 31 *)
32 fmtfile="$format.fmt" 32 fmtfile="$format.fmt"
33 texengine=$engine 33 texengine=$engine
34 ;; 34 ;;
35 esac 35 esac
36 @RM@ -f @VARBASE@/lib/texmf/web2c/$texengine/$fmtfile 36 @RM@ -f @VARBASE@/lib/texmf/web2c/$texengine/$fmtfile
37 @RM@ -f @VARBASE@/lib/texmf/web2c/$texengine/$format.log 37 @RM@ -f @VARBASE@/lib/texmf/web2c/$texengine/$format.log
38 done 38 done
39 done 39 done
40 @FIND@ -d @VARBASE@/lib/texmf -type d -empty -exec @RMDIR@ {} \; 40 @FIND@ -d @VARBASE@/lib/texmf -type d -empty -exec @RMDIR@ {} \;
41 @MKTEXLSR@ @VARBASE@/lib/texmf 
42 ;; 41 ;;
43*) 42*)
44 ;; 43 ;;
45esac 44esac