[pkgsrc/trunk]: pkgsrc/print Resolve conflicts between kpathsea and teTeX-{te...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/print Resolve conflicts between kpathsea and teTeX-{te...
From: minskim <minskim%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 07:09:11 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/bbfa55af6690
branches:  trunk
changeset: 552772:bbfa55af6690
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Thu Jan 08 22:09:34 2009 +0000

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

diffstat:

 print/teTeX3-bin/INSTALL          |  23 +++------
 print/teTeX3-bin/Makefile         |  24 ++++++----
 print/teTeX3-bin/PLIST            |  91 +--------------------------------------
 print/teTeX3-bin/distinfo         |  13 +++--
 print/teTeX3-bin/patches/patch-aa |  13 ++++-
 print/teTeX3-bin/patches/patch-ab |  28 +++++++++--
 print/teTeX3-bin/patches/patch-ao |  22 ---------
 print/teTeX3-bin/patches/patch-as |  13 -----
 print/teTeX3-bin/patches/patch-az |  22 +++++++++
 print/teTeX3-bin/patches/patch-ba |  15 ++++++
 print/teTeX3-bin/patches/patch-bb |  19 ++++++++
 print/teTeX3-bin/patches/patch-bc |  19 ++++++++
 print/teTeX3-bin/patches/patch-bd |  13 +++++
 print/teTeX3-texmf/Makefile       |   6 +-
 print/teTeX3-texmf/PLIST          |   3 +-
 15 files changed, 158 insertions(+), 166 deletions(-)

diffs (truncated from 573 to 300 lines):

diff -r 7140eb86b0b3 -r bbfa55af6690 print/teTeX3-bin/INSTALL
--- a/print/teTeX3-bin/INSTALL  Thu Jan 08 21:58:17 2009 +0000
+++ b/print/teTeX3-bin/INSTALL  Thu Jan 08 22:09:34 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.8 2008/12/09 19:43:37 minskim Exp $
+# $NetBSD: INSTALL,v 1.9 2009/01/08 22:09:35 minskim Exp $
 
 PATH="@PREFIX@"/bin:"${PATH}"
 export PATH
@@ -43,10 +43,6 @@
 exitcode=0
 case $ACTION in
 ADD)
-       # Create ls-R databases in all of the usual TeX directories.
-       ${TEST} ! -x ${PKG_PREFIX}/bin/mktexlsr ||
-               ${PKG_PREFIX}/bin/mktexlsr
-
        # Update teTeX installation to support different TeX formats.
        ${TEST} ! -x ${PKG_PREFIX}/bin/fmtutil-sys ||
                ${PKG_PREFIX}/bin/fmtutil-sys --all
@@ -59,14 +55,6 @@
        ;;
 
 REMOVE)
-       # Remove the ls-R databases from the usual TeX directories
-       # generated by mktexlsr.
-       #
-       ${RM} -f ${TEXMF_DISTDATADIR}/ls-R
-       ${RM} -f ${TEXMF_DATADIR}/ls-R
-       ${RM} -f ${TEXMF_LOCALDATADIR}/ls-R
-       ${RM} -f ${TEXMF_VARDIR}/ls-R
-
        # We inspect both the user-modified and distributed fmtutil.cnf
        # files because we want to ensure we remove bits corresponding
        # to both files.
@@ -122,15 +110,22 @@
        ${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
+
        # 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
+               ${TEXMF_VARDIR}/fonts/map/pdftex/updmap                 \
+               @PKG_SYSCONFDIR@/dvips/config                   \
+               @PKG_SYSCONFDIR@/xdvi
        do
                ${RMDIR} -p "$dir" 2>/dev/null || ${TRUE}
        done
+       @MKTEXLSR@ ${TEXMF_VARDIR} @PKG_SYSCONFDIR@
        ;;
 
 *)
diff -r 7140eb86b0b3 -r bbfa55af6690 print/teTeX3-bin/Makefile
--- a/print/teTeX3-bin/Makefile Thu Jan 08 21:58:17 2009 +0000
+++ b/print/teTeX3-bin/Makefile Thu Jan 08 22:09:34 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2008/12/09 19:43:37 minskim Exp $
+# $NetBSD: Makefile,v 1.34 2009/01/08 22:09:35 minskim Exp $
 
 DISTNAME=      tetex-src-3.0
 PKGNAME=       ${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION=   21
+PKGREVISION=   22
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -28,23 +28,19 @@
 CONFIGURE_ARGS+=       --without-texinfo --without-texi2html
 CONFIGURE_ARGS+=       --with-xdvi-x-toolkit=xaw
 
+MAKE_ENV+=             KPATHSEA_PREFIX=${BUILDLINK_PREFIX.kpathsea}
+MAKE_FLAGS+=           LIBTOOL=${LIBTOOL:Q}
 MAKE_FLAGS+=           vartexfonts=${VARBASE:Q}/lib/texmf/fonts
 
-SUBST_CLASSES+=                texmfdir
-SUBST_MESSAGE.texmfdir=        Setting TEXMFSYSVAR.
-SUBST_STAGE.texmfdir=  pre-configure
-SUBST_FILES.texmfdir=  texk/kpathsea/texmf.in-teTeX
-SUBST_SED.texmfdir+=   -e 's,@VARBASE@,${VARBASE},'
-
 BUILD_DEFS+=           VARBASE
 LOWER_PAPERSIZE_cmd=   ${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]'
 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
-CONF_FILES+=   ${PREFIX}/share/texmf/web2c/texmf.cnf.dist              \
-               ${PREFIX}/share/texmf/web2c/texmf.cnf
 OWN_DIRS+=     ${VARBASE}/lib/texmf ${PREFIX}/share/texmf-local
 .for d in pk source tfm
 OWN_DIRS_PERMS+=       ${VARBASE}/lib/texmf/fonts/${d} \
@@ -56,8 +52,16 @@
 INSTALL_MAKE_FLAGS+=   infodir=${DESTDIR}${PREFIX}/${PKGINFODIR}
 INSTALL_MAKE_FLAGS+=   mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
+TEX_TEXMF_DIRS=        ${PREFIX}/share/texmf
+
+.include "../../print/kpathsea/buildlink3.mk"
+.include "../../print/kpathsea/texmf.mk"
 .include "../../print/teTeX3-bin/Makefile.common"
 .include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
+
+post-extract:
+       ${RM} -rf ${WRKSRC}/texk/kpathsea
+
 .include "../../mk/bsd.pkg.mk"
diff -r 7140eb86b0b3 -r bbfa55af6690 print/teTeX3-bin/PLIST
--- a/print/teTeX3-bin/PLIST    Thu Jan 08 21:58:17 2009 +0000
+++ b/print/teTeX3-bin/PLIST    Thu Jan 08 22:09:34 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/07 16:19:15 minskim Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/01/08 22:09:35 minskim Exp $
 bin/a2ping
 bin/afm2tfm
 bin/aleph
@@ -38,13 +38,9 @@
 bin/gftopk
 bin/gftype
 bin/gsftopk
-bin/kpseaccess
 bin/kpsepath
-bin/kpsereadlink
-bin/kpsestat
 bin/kpsetool
 bin/kpsewhere
-bin/kpsewhich
 bin/kpsexpand
 bin/mag
 bin/makeindex
@@ -57,10 +53,6 @@
 bin/mkocp
 bin/mkofm
 bin/mktexfmt
-bin/mktexlsr
-bin/mktexmf
-bin/mktexpk
-bin/mktextfm
 bin/mpost
 bin/mpto
 bin/mptopdf
@@ -121,61 +113,9 @@
 bin/xdvi
 bin/xdvi-xaw.bin
 bin/xdvizilla
-include/kpathsea/absolute.h
-include/kpathsea/c-auto.h
-include/kpathsea/c-ctype.h
-include/kpathsea/c-dir.h
-include/kpathsea/c-errno.h
-include/kpathsea/c-fopen.h
-include/kpathsea/c-limits.h
-include/kpathsea/c-memstr.h
-include/kpathsea/c-minmax.h
-include/kpathsea/c-namemx.h
-include/kpathsea/c-pathch.h
-include/kpathsea/c-pathmx.h
-include/kpathsea/c-proto.h
-include/kpathsea/c-stat.h
-include/kpathsea/c-std.h
-include/kpathsea/c-unistd.h
-include/kpathsea/c-vararg.h
-include/kpathsea/cnf.h
-include/kpathsea/concatn.h
-include/kpathsea/config.h
-include/kpathsea/db.h
-include/kpathsea/debug.h
-include/kpathsea/default.h
-include/kpathsea/expand.h
-include/kpathsea/fn.h
-include/kpathsea/fontmap.h
-include/kpathsea/getopt.h
-include/kpathsea/hash.h
-include/kpathsea/kpathsea.h
-include/kpathsea/lib.h
-include/kpathsea/line.h
-include/kpathsea/magstep.h
-include/kpathsea/paths.h
-include/kpathsea/pathsearch.h
-include/kpathsea/proginit.h
-include/kpathsea/progname.h
-include/kpathsea/readable.h
-include/kpathsea/str-list.h
-include/kpathsea/str-llist.h
-include/kpathsea/systypes.h
-include/kpathsea/tex-file.h
-include/kpathsea/tex-glyph.h
-include/kpathsea/tex-hush.h
-include/kpathsea/tex-make.h
-include/kpathsea/tilde.h
-include/kpathsea/truncate.h
-include/kpathsea/types.h
-include/kpathsea/variable.h
-include/kpathsea/xopendir.h
-include/kpathsea/xstat.h
 info/latex.info
 info/dvips.info
 info/web2c.info
-info/kpathsea.info
-lib/libkpathsea.la
 man/man1/afm2tfm.1
 man/man1/allcm.1
 man/man1/allec.1
@@ -215,13 +155,9 @@
 man/man1/gftopk.1
 man/man1/gftype.1
 man/man1/gsftopk.1
-man/man1/kpseaccess.1
 man/man1/kpsepath.1
-man/man1/kpsereadlink.1
-man/man1/kpsestat.1
 man/man1/kpsetool.1
 man/man1/kpsewhere.1
-man/man1/kpsewhich.1
 man/man1/kpsexpand.1
 man/man1/lambda.1
 man/man1/latex.1
@@ -236,10 +172,6 @@
 man/man1/mkocp.1
 man/man1/mkofm.1
 man/man1/mktexfmt.1
-man/man1/mktexlsr.1
-man/man1/mktexmf.1
-man/man1/mktexpk.1
-man/man1/mktextfm.1
 man/man1/mpost.1
 man/man1/mpto.1
 man/man1/newer.1
@@ -319,34 +251,13 @@
 share/texmf/web2c/aleph.pool
 share/texmf/web2c/fmtutil.cnf.dist
 share/texmf/web2c/mf.pool
-share/texmf/web2c/mktex.opt
-share/texmf/web2c/mktexdir
-share/texmf/web2c/mktexdir.opt
-share/texmf/web2c/mktexnam
-share/texmf/web2c/mktexnam.opt
-share/texmf/web2c/mktexupd
 share/texmf/web2c/mp.pool
 share/texmf/web2c/omega.pool
 share/texmf/web2c/pdfetex-pl.pool
 share/texmf/web2c/pdfetex.pool
 share/texmf/web2c/pdfxtex.pool
 share/texmf/web2c/tex.pool
-share/texmf/web2c/texmf.cnf.dist
 share/texmf/xdvi/XDvi
 share/texmf/xdvi/pixmaps/toolbar.xpm
 share/texmf/xdvi/pixmaps/toolbar2.xpm
 share/texmf/xdvi/xdvi.cfg
-@dirrm share/texmf/xdvi/pixmaps
-@dirrm share/texmf/xdvi
-@dirrm share/texmf/web2c
-@dirrm share/texmf/texconfig/x
-@dirrm share/texmf/texconfig/v
-@dirrm share/texmf/texconfig/g
-@dirrm share/texmf/texconfig
-@dirrm share/texmf/dvips/gsftopk
-@dirrm share/texmf/dvips/base
-@dirrm share/texmf/dvips
-@dirrm share/texmf/doc/tetex
-@dirrm share/texmf/doc
-@dirrm share/texmf
-@dirrm include/kpathsea
diff -r 7140eb86b0b3 -r bbfa55af6690 print/teTeX3-bin/distinfo
--- a/print/teTeX3-bin/distinfo Thu Jan 08 21:58:17 2009 +0000
+++ b/print/teTeX3-bin/distinfo Thu Jan 08 22:09:34 2009 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2008/12/09 19:43:37 minskim Exp $
+$NetBSD: distinfo,v 1.13 2009/01/08 22:09:35 minskim Exp $
 
 SHA1 (teTeX/tetex-src-3.0.tar.gz) = 7637789f7f4929694aed1b89820f5bad4753e8fc
 RMD160 (teTeX/tetex-src-3.0.tar.gz) = 15a139f5f36993e4ed3583260e175cfb13ce7bcc
 Size (teTeX/tetex-src-3.0.tar.gz) = 12749314 bytes
-SHA1 (patch-aa) = 77feabef32c612ac5d0250b1e4db50a3fc497990
-SHA1 (patch-ab) = af4e90102afeb6e6dbd46ffbec51e14dd6d4fed5
+SHA1 (patch-aa) = afdcbf2dafe053db174ca456806667dbe2cc79c2
+SHA1 (patch-ab) = caaf91dbbd8fa94fabf7b4f6fe6e0a97c7a6071a
 SHA1 (patch-ac) = af7d8c65cece55b7f37e7cf3c99c85e75cb911a1
 SHA1 (patch-ad) = 23d8e8729bc10748cceba5be3272484ab50f34e6
 SHA1 (patch-ae) = 68825699db129b82f476c37ba3b6e20a8831ad6e
@@ -17,14 +17,17 @@
 SHA1 (patch-al) = e1fc74bd6ea05176dfac4e99958f0e1281b89b3b
 SHA1 (patch-am) = 54d86197eee3d4e15a6c9bad6ae16ef1e0299667
 SHA1 (patch-an) = a02db18a49f61f965e0277fbc5a3fa72a5060b47
-SHA1 (patch-ao) = f40eb1ac8f9c1d5adaf6aac86d59a217b4c8411d
 SHA1 (patch-ap) = 0ca7341b416842fbc00a935d6cfdb0531c4169ba
 SHA1 (patch-aq) = d7a4dd4864e43cd27b1ca803f8ebfe82e65f84a7
 SHA1 (patch-ar) = 7f0c6cdca69b73bad1c8f8298e417ede1cd89d77
-SHA1 (patch-as) = 0b6c4c6b253ba1160628c19fa7080bc7c307caf3
Prev by Date: [pkgsrc/trunk]: pkgsrc/multimedia/mjpegtools Remove unneeded patch.
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated net/clive to 2.1.2
Previous by Thread: [pkgsrc/trunk]: pkgsrc/multimedia/mjpegtools Remove unneeded patch.
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated net/clive to 2.1.2
Indexes:
Home | Main Index | Thread Index | Old Index