pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print Use format.mk and map.mk in texlive-tetex to upd...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9c55f3af2860
branches: trunk
changeset: 553626:9c55f3af2860
user: minskim <minskim%pkgsrc.org@localhost>
date: Mon Jan 26 21:17:04 2009 +0000
description:
Use format.mk and map.mk in texlive-tetex to update TeX formats and
font maps for dvips and dvipdfm. In this way, configuration files
(fmtutil.cnf and updmap.cfg) are properly installed under
PKG_SYSCONFDIR, not under PREFIX.
Bump PKGREVISION for teTeX-texmf and teTeX-bin.
diffstat:
print/teTeX3-bin/INSTALL | 77 +--
print/teTeX3-bin/Makefile | 61 +-
print/teTeX3-bin/PLIST | 78 +--
print/teTeX3-bin/distinfo | 7 +-
print/teTeX3-bin/patches/patch-ar | 6 +-
print/teTeX3-texmf/Makefile | 16 +-
print/teTeX3-texmf/PLIST | 1053 +------------------------------------
7 files changed, 83 insertions(+), 1215 deletions(-)
diffs (truncated from 1587 to 300 lines):
diff -r bd788f912333 -r 9c55f3af2860 print/teTeX3-bin/INSTALL
--- a/print/teTeX3-bin/INSTALL Mon Jan 26 21:05:51 2009 +0000
+++ b/print/teTeX3-bin/INSTALL Mon Jan 26 21:17:04 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.9 2009/01/08 22:09:35 minskim Exp $
+# $NetBSD: INSTALL,v 1.10 2009/01/26 21:17:05 minskim Exp $
PATH="@PREFIX@"/bin:"${PATH}"
export PATH
@@ -44,88 +44,23 @@
case $ACTION in
ADD)
# Update teTeX installation to support different TeX formats.
- ${TEST} ! -x ${PKG_PREFIX}/bin/fmtutil-sys ||
- ${PKG_PREFIX}/bin/fmtutil-sys --all
${TEST} ! -x ${PKG_PREFIX}/bin/texlinks ||
${PKG_PREFIX}/bin/texlinks
-
- # Update the font map files for TeX output drivers.
- ${TEST} ! -x ${PKG_PREFIX}/bin/updmap-sys ||
- ${PKG_PREFIX}/bin/updmap-sys
;;
REMOVE)
- # We inspect both the user-modified and distributed fmtutil.cnf
- # files because we want to ensure we remove bits corresponding
- # to both files.
- #
- FMTUTIL_CNF=
- for cnf in fmtutil.cnf.dist fmtutil.cnf; do
- file="${TEXMF_DATADIR}/web2c/$cnf"
- ${TEST} ! -f "$file" ||
- FMTUTIL_CNF="${FMTUTIL_CNF} $file"
- done
-
- # Remove fmt, mem, and log files generated by fmtutil-sys.
- ${TEST} -z "${FMTUTIL_CNF}" ||
- ${CAT} ${FMTUTIL_CNF} | ${GREP} "^[^#]" |
- while read format junk; do
- ${RM} -f ${TEXMF_VARDIR}/web2c/$format.base
- ${RM} -f ${TEXMF_VARDIR}/web2c/$format.fmt
- ${RM} -f ${TEXMF_VARDIR}/web2c/$format.log
- ${RM} -f ${TEXMF_VARDIR}/web2c/$format.mem
- done
-
- # Remove engines generated by texlinks. This is related to the
- # install_link() function in texlinks.
- #
- ${TEST} -z "${FMTUTIL_CNF}" ||
- ${CAT} ${FMTUTIL_CNF} | ${GREP} "^[^#]" |
- while read format engine junk; do
- case "$format" in
- cont-??|metafun|mptopdf)
- ;;
- *)
- ${TEST} "$format" = "$engine" ||
- ${RM} -f ${PKG_PREFIX}/bin/$format
- ;;
- esac
- done
-
- # Remove font map files generated by updmap-sys. The list of
- # files is taken from the updmap man page and matches the
- # "output files" for updmap.
- #
- ${RM} -f ${TEXMF_VARDIR}/fonts/map/dvipdfm/updmap/dvipdfm.map
- ${RM} -f ${TEXMF_VARDIR}/fonts/map/dvipdfm/updmap/dvipdfm_dl14.map
- ${RM} -f ${TEXMF_VARDIR}/fonts/map/dvipdfm/updmap/dvipdfm_ndl14.map
- ${RM} -f ${TEXMF_VARDIR}/fonts/map/dvips/updmap/builtin35.map
- ${RM} -f ${TEXMF_VARDIR}/fonts/map/dvips/updmap/download35.map
- ${RM} -f ${TEXMF_VARDIR}/fonts/map/dvips/updmap/ps2pk.map
- ${RM} -f ${TEXMF_VARDIR}/fonts/map/dvips/updmap/psfonts.map
- ${RM} -f ${TEXMF_VARDIR}/fonts/map/dvips/updmap/psfonts_pk.map
- ${RM} -f ${TEXMF_VARDIR}/fonts/map/dvips/updmap/psfonts_t1.map
- ${RM} -f ${TEXMF_VARDIR}/fonts/map/pdftex/updmap/pdftex.map
- ${RM} -f ${TEXMF_VARDIR}/fonts/map/pdftex/updmap/pdftex_dl14.map
- ${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
+ ${RM} -f @PKG_SYSCONFBASE@/texmf/dvips/config/config.ps
+ ${RM} -f @PKG_SYSCONFBASE@/texmf/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 \
- @PKG_SYSCONFDIR@/dvips/config \
- @PKG_SYSCONFDIR@/xdvi
+ @PKG_SYSCONFBASE@/texmf/dvips/config \
+ @PKG_SYSCONFBASE@/texmf/xdvi
do
${RMDIR} -p "$dir" 2>/dev/null || ${TRUE}
done
- @MKTEXLSR@ ${TEXMF_VARDIR} @PKG_SYSCONFDIR@
+ @MKTEXLSR@ ${TEXMF_VARDIR} @PKG_SYSCONFBASE@/texmf
;;
*)
diff -r bd788f912333 -r 9c55f3af2860 print/teTeX3-bin/Makefile
--- a/print/teTeX3-bin/Makefile Mon Jan 26 21:05:51 2009 +0000
+++ b/print/teTeX3-bin/Makefile Mon Jan 26 21:17:04 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2009/01/08 22:09:35 minskim Exp $
+# $NetBSD: Makefile,v 1.35 2009/01/26 21:17:05 minskim Exp $
DISTNAME= tetex-src-3.0
PKGNAME= ${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION= 22
+PKGREVISION= 23
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
@@ -13,7 +13,7 @@
PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= teTeX-texmf>=3.0nb3:../../print/teTeX3-texmf
-DEPENDS+= dialog>=0.6z:../../misc/dialog
+DEPENDS+= texlive-tetex-[0-9]*:../../wip/texlive-tetex
# games/omega previously installed an omega executable too
CONFLICTS+= omega<0.90.4nb1
@@ -37,10 +37,6 @@
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
OWN_DIRS+= ${VARBASE}/lib/texmf ${PREFIX}/share/texmf-local
.for d in pk source tfm
OWN_DIRS_PERMS+= ${VARBASE}/lib/texmf/fonts/${d} \
@@ -52,11 +48,62 @@
INSTALL_MAKE_FLAGS+= infodir=${DESTDIR}${PREFIX}/${PKGINFODIR}
INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+INSTALLATION_DIRS+= share/texmf/fmtutil
+
TEX_TEXMF_DIRS= ${PREFIX}/share/texmf
+TEX_FORMAT_NAMES+= tetex
+TEX_MAP_FILES+= antp.map
+TEX_MAP_FILES+= cork-antt.map
+TEX_MAP_FILES+= cs-antt.map
+TEX_MAP_FILES+= exp-antt.map
+TEX_MAP_FILES+= greek-antt.map
+TEX_MAP_FILES+= qx-antt.map
+TEX_MAP_FILES+= t2a-antt.map
+TEX_MAP_FILES+= t2b-antt.map
+TEX_MAP_FILES+= t2c-antt.map
+TEX_MAP_FILES+= t5-antt.map
+TEX_MAP_FILES+= texnansi-antt.map
+TEX_MAP_FILES+= wncy-antt.map
+TEX_MAP_FILES+= qbk.map
+TEX_MAP_FILES+= qcr.map
+TEX_MAP_FILES+= qhv.map
+TEX_MAP_FILES+= qpl.map
+TEX_MAP_FILES+= qtm.map
+TEX_MAP_FILES+= qzc.map
+TEX_MAP_FILES+= charter.map
+TEX_MAP_FILES+= cmcyr.map
+TEX_MAP_FILES+= contnav.map
+TEX_MAP_FILES+= cork-lm.map
+TEX_MAP_FILES+= qx-lm.map
+TEX_MAP_FILES+= texnansi-lm.map
+TEX_MAP_FILES+= ts1-lm.map
+TEX_MAP_FILES+= marvosym.map
+TEX_MAP_FILES+= mathpple.map
+TEX_MAP_FILES+= omega.map
+TEX_MAP_FILES+= pazo.map
+TEX_MAP_FILES+= pxfonts.map
+TEX_MAP_FILES+= txfonts.map
+TEX_MAP_FILES+= xypic.map
+TEX_MAP_FILES+= mt-belleek.map
+TEX_MAP_FILES+= urwvn.map
+TEX_MAP_FILES+= dstroke.map
+TEX_MAP_FILES+= fpls.map
+TEX_MIXEDMAP_FILES+= ttcmex.map
+TEX_MIXEDMAP_FILES+= bsr.map
+TEX_MIXEDMAP_FILES+= bsr-interpolated.map
+TEX_MIXEDMAP_FILES+= cs.map
+TEX_MIXEDMAP_FILES+= hoekwater.map
+TEX_MIXEDMAP_FILES+= pl.map
+TEX_MIXEDMAP_FILES+= ccpl.map
+TEX_MIXEDMAP_FILES+= eurosym.map
+TEX_MIXEDMAP_FILES+= vnr.map
+
.include "../../print/kpathsea/buildlink3.mk"
.include "../../print/kpathsea/texmf.mk"
.include "../../print/teTeX3-bin/Makefile.common"
+.include "../../wip/texlive-tetex/format.mk"
+.include "../../wip/texlive-tetex/map.mk"
.include "../../x11/libXp/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../mk/xaw.buildlink3.mk"
diff -r bd788f912333 -r 9c55f3af2860 print/teTeX3-bin/PLIST
--- a/print/teTeX3-bin/PLIST Mon Jan 26 21:05:51 2009 +0000
+++ b/print/teTeX3-bin/PLIST Mon Jan 26 21:17:04 2009 +0000
@@ -1,16 +1,12 @@
-@comment $NetBSD: PLIST,v 1.6 2009/01/08 22:09:35 minskim Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/01/26 21:17:05 minskim Exp $
bin/a2ping
bin/afm2tfm
bin/aleph
-bin/allcm
-bin/allec
-bin/allneeded
bin/bibtex
bin/ctangle
bin/ctie
bin/cweave
bin/dmp
-bin/dvi2fax
bin/dvicopy
bin/dvigif
bin/dvihp
@@ -23,7 +19,6 @@
bin/dvipdft
bin/dvipng
bin/dvips
-bin/dvired
bin/dvitomp
bin/dvitype
bin/e2pall
@@ -31,17 +26,10 @@
bin/epstopdf
bin/fdf2tan
bin/fdf2tex
-bin/fmtutil
-bin/fmtutil-sys
-bin/fontinst
bin/gftodvi
bin/gftopk
bin/gftype
bin/gsftopk
-bin/kpsepath
-bin/kpsetool
-bin/kpsewhere
-bin/kpsexpand
bin/mag
bin/makeindex
bin/makempx
@@ -52,7 +40,6 @@
bin/mkindex
bin/mkocp
bin/mkofm
-bin/mktexfmt
bin/mpost
bin/mpto
bin/mptopdf
@@ -80,24 +67,14 @@
bin/pktype
bin/pltotf
bin/pooltype
-bin/ps2frag
bin/ps2pk
-bin/ps4pdf
-bin/pslatex
-bin/rubibtex
-bin/rumakeindex
bin/tangle
bin/tex
-bin/texconfig
-bin/texconfig-dialog
-bin/texconfig-sys
bin/texdoc
bin/texdoctk
bin/texexec
bin/texfind
bin/texfont
-bin/texhash
-bin/texlinks
bin/texshow
bin/texutil
bin/tftopl
@@ -105,8 +82,6 @@
bin/tie
bin/ttf2afm
bin/uniqleaf
-bin/updmap
-bin/updmap-sys
bin/vftovp
bin/vptovf
bin/weave
@@ -117,9 +92,6 @@
info/dvips.info
info/web2c.info
man/man1/afm2tfm.1
-man/man1/allcm.1
-man/man1/allec.1
-man/man1/allneeded.1
man/man1/amstex.1
man/man1/bibtex.1
man/man1/ctangle.1
@@ -127,7 +99,6 @@
Home |
Main Index |
Thread Index |
Old Index