[pkgsrc/trunk]: pkgsrc Make teTeX3 the default TEX_DEFAULT

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Make teTeX3 the default TEX_DEFAULT
From: tonio <tonio%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 02:51:41 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/575dbd7515cf
branches:  trunk
changeset: 505842:575dbd7515cf
user:      tonio <tonio%pkgsrc.org@localhost>
date:      Sun Jan 08 14:00:11 2006 +0000

description:
Make teTeX3 the default TEX_DEFAULT
bump PKGREVISION where necessary

Move PKG_TEXMFPREFIX and PKG_LOCALTEXMFPREFIX definitions to
teTeX?/buidlink3.mk, so that packages may include
print/teTeX1-bin/buildlink3.mk directly (however, using teTeX/module.mk do not
allow that)

diffstat:

 fonts/ec-fonts-mftraced/Makefile |   4 ++--
 fonts/ttf2pk/Makefile            |   4 ++--
 graphics/xdvipresent/Makefile    |   7 +++----
 graphics/xdvipresent/PLIST       |  33 +++++++++++++++------------------
 mk/defaults/mk.conf              |   6 +++---
 mk/tex.buildlink3.mk             |  36 ++++++++++++++----------------------
 print/dvipdfmx/Makefile          |   3 ++-
 print/dvipng/Makefile            |   4 ++--
 print/ja-ptex-bin/Makefile       |   4 ++--
 print/ja-ptex-share/Makefile     |   4 ++--
 print/ja-vfxdvik/Makefile        |  11 ++++++-----
 print/teTeX-bin/buildlink3.mk    |   4 +++-
 print/teTeX/Makefile             |   5 ++---
 print/teTeX1-bin/buildlink3.mk   |   5 ++++-
 print/teTeX3-bin/buildlink3.mk   |   6 +++++-
 print/tex-eurosym/Makefile       |   6 +++---
 print/tex-foiltex/Makefile       |   3 ++-
 print/tex-hugelatex/Makefile     |   4 ++--
 print/tex-jadetex/Makefile       |   4 ++--
 print/tex-musixtex/Makefile      |   3 ++-
 print/tex-textpos/Makefile       |   4 ++--
 print/texfamily-share/Makefile   |   6 +++---
 print/texfamily/Makefile         |   6 +++---
 textproc/tex-xmltex/Makefile     |   3 ++-
 24 files changed, 88 insertions(+), 87 deletions(-)

diffs (truncated from 517 to 300 lines):

diff -r 4aa0c6206fe3 -r 575dbd7515cf fonts/ec-fonts-mftraced/Makefile
--- a/fonts/ec-fonts-mftraced/Makefile  Sun Jan 08 13:50:53 2006 +0000
+++ b/fonts/ec-fonts-mftraced/Makefile  Sun Jan 08 14:00:11 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:14 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/08 14:00:11 tonio Exp $
 #
 
 DISTNAME=              ec-fonts-mftraced-1.0.8
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            fonts
 MASTER_SITES=          http://lilypond.org/download/fonts/
 
diff -r 4aa0c6206fe3 -r 575dbd7515cf fonts/ttf2pk/Makefile
--- a/fonts/ttf2pk/Makefile     Sun Jan 08 13:50:53 2006 +0000
+++ b/fonts/ttf2pk/Makefile     Sun Jan 08 14:00:11 2006 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2005/12/05 23:55:07 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/08 14:00:11 tonio Exp $
 #
 
 .include "../../graphics/freetype-lib/Makefile.common"
 
 PKGNAME=               ttf2pk-1.3.1
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            print
 
 MAINTAINER=            bernhard%SDG.de@localhost,hubertf%NetBSD.org@localhost
diff -r 4aa0c6206fe3 -r 575dbd7515cf graphics/xdvipresent/Makefile
--- a/graphics/xdvipresent/Makefile     Sun Jan 08 13:50:53 2006 +0000
+++ b/graphics/xdvipresent/Makefile     Sun Jan 08 14:00:11 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2006/01/04 22:37:18 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/01/08 14:00:11 tonio Exp $
 #
 
 DISTNAME=      xdvipresent-0.6p14
 PKGNAME=       xdvipresent-0.6.1.14
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    graphics textproc print x11
 MASTER_SITES=  http://clip.dia.fi.upm.es/Software/
 
@@ -33,7 +33,6 @@
        ${INSTALL_MAN} ${WRKSRC}/doc/xdvipresent.manl ${PREFIX}/${PKGMANDIR}/man1/xdvipresent.1
        ${INSTALL_DATA_DIR} ${HTML_DIR}
        ${INSTALL_DATA} ${WRKSRC}/doc/xdvipresent_html/* ${HTML_DIR}
-       ${PREFIX}/bin/texconfig rehash
 
-.include "../../mk/tex.buildlink3.mk"
+.include "../../print/teTeX/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 4aa0c6206fe3 -r 575dbd7515cf graphics/xdvipresent/PLIST
--- a/graphics/xdvipresent/PLIST        Sun Jan 08 13:50:53 2006 +0000
+++ b/graphics/xdvipresent/PLIST        Sun Jan 08 14:00:11 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/05 14:54:50 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/01/08 14:00:11 tonio Exp $
 bin/xdvipresent
 man/man1/xdvipresent.1
 share/doc/html/xdvipresent/xdvipresent.css
@@ -8,22 +8,19 @@
 share/doc/html/xdvipresent/xdvipresent_3.html
 share/doc/html/xdvipresent/xdvipresent_toc.html
 share/examples/xdvipresent/example.tex
-share/texmf/tex/latex/other/images/Clip.ps
-share/texmf/tex/latex/other/images/blue.line.eps
-share/texmf/tex/latex/other/images/blueball.ps
-share/texmf/tex/latex/other/images/clip.eps
-share/texmf/tex/latex/other/images/clip_small.ps
-share/texmf/tex/latex/other/images/clip_tiny.eps
-share/texmf/tex/latex/other/images/example_figure.eps
-share/texmf/tex/latex/other/images/greenball.ps
-share/texmf/tex/latex/other/images/line.fig
-share/texmf/tex/latex/other/images/redball.ps
-share/texmf/tex/latex/other/images/thin_line.fig
-share/texmf/tex/latex/other/images/thin_line.red.eps
-share/texmf/tex/latex/other/xdvislides.cls
-@exec %D/bin/texconfig rehash
-@dirrm share/texmf/tex/latex/other/images
-@unexec ${RMDIR} %D/share/texmf/other 2>/dev/null || ${TRUE}
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/Clip.ps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/blue.line.eps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/blueball.ps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/clip.eps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/clip_small.ps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/clip_tiny.eps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/example_figure.eps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/greenball.ps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/line.fig
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/redball.ps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/thin_line.fig
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images/thin_line.red.eps
+${PKG_LOCALTEXMFPREFIX}/tex/latex/other/xdvislides.cls
+@dirrm ${PKG_LOCALTEXMFPREFIX}/tex/latex/other/images
 @dirrm share/examples/xdvipresent
 @dirrm share/doc/html/xdvipresent/
-@unexec %D/bin/texconfig rehash
diff -r 4aa0c6206fe3 -r 575dbd7515cf mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Sun Jan 08 13:50:53 2006 +0000
+++ b/mk/defaults/mk.conf       Sun Jan 08 14:00:11 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.108 2006/01/05 23:29:04 wiz Exp $
+# $NetBSD: mk.conf,v 1.109 2006/01/08 14:00:11 tonio Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -1628,10 +1628,10 @@
 # Possible: 7.3, 9.1
 # Default: 9.1 in 2.0 and later, 7.3 otherwise
 
-TEX_DEFAULT?=  teTeX2
+TEX_DEFAULT?=  teTeX3
 # Specify the user's favorite latex implementation
 # Possible values: teTeX1, teTeX2, teTeX3
-# Default: teTeX2
+# Default: teTeX3
 
 #TEXMFSITE=
 # Used in TeXfamily package which depends on teTeX package to specify
diff -r 4aa0c6206fe3 -r 575dbd7515cf mk/tex.buildlink3.mk
--- a/mk/tex.buildlink3.mk      Sun Jan 08 13:50:53 2006 +0000
+++ b/mk/tex.buildlink3.mk      Sun Jan 08 14:00:11 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: tex.buildlink3.mk,v 1.8 2005/12/05 22:07:07 rillig Exp $
+# $NetBSD: tex.buildlink3.mk,v 1.9 2006/01/08 14:00:11 tonio Exp $
 #
 # A Makefile fragment for TeX and LaTeX packages
 #
 #      * Determine the version of teTeX to be used.
-#     Modify TEX_DEFAULT to change the default version (default to teTeX2)
+#     Modify TEX_DEFAULT to change the default version (default to teTeX3)
 #
 #      * tex files are installed...
 #              teTeX[1-2]
@@ -34,7 +34,7 @@
 #   Possible values:
 #     teTeX1, teTeX2, teTeX3
 #   Default value:
-#     teTeX2
+#     teTeX3
 #
 # Variables tex packages can provide:
 #
@@ -112,23 +112,26 @@
 .if ${TEX_TYPE} == "teTeX3"
 _TEX_DEPENDENCY=       ${BUILDLINK_DEPENDS.teTeX3}
 _TEX_PKGSRCDIR=        ${BUILDLINK_PKGSRCDIR.teTeX3}
-#PKG_TEXMFPREFIX=      ${PREFIX}/share/texmf-dist
-PKG_TEXMFPREFIX=       ${PREFIX}/share/texmf
-#PKG_LOCALTEXMFPREFIX= ${PREFIX}/share/texmf-local
-PKG_LOCALTEXMFPREFIX=  ${PREFIX}/share/texmf
 .elif ${TEX_TYPE} == "teTeX2"
 _TEX_DEPENDENCY=       ${BUILDLINK_DEPENDS.teTeX2}
 _TEX_PKGSRCDIR=        ${BUILDLINK_PKGSRCDIR.teTeX2}
-PKG_TEXMFPREFIX=       ${PREFIX}/share/texmf
-PKG_LOCALTEXMFPREFIX=  ${PREFIX}/share/texmf
 .elif ${TEX_TYPE} == "teTeX1"
 _TEX_DEPENDENCY=       ${BUILDLINK_DEPENDS.teTeX1}
 _TEX_PKGSRCDIR=        ${BUILDLINK_PKGSRCDIR.teTeX1}
-PKG_TEXMFPREFIX=       ${PREFIX}/share/texmf
-PKG_LOCALTEXMFPREFIX=  ${PREFIX}/share/texmf
 .endif
 
+.endif # TEX_BUILDLINK3_MK
+
+.if ${TEX_TYPE} == "none"
+PKG_FAIL_REASON=       \
+       "${_TEX_TYPE} is not an acceptable TeX version for ${PKGNAME}."
+.else
 PLIST_SUBST+=  TEX_TYPE=${TEX_TYPE:Q}
+.if (${TEX_DEPMETHOD} == "build")
+BUILD_DEPENDS+=        ${_TEX_DEPENDENCY}:${_TEX_PKGSRCDIR}
+.else
+TEX_DEPMETHOD:= run
+.  include "${_TEX_PKGSRCDIR}/buildlink3.mk"
 PLIST_SUBST+=  PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX:C|^${PREFIX}/||}
 PLIST_SUBST+=  PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:C|^${PREFIX}/||}
 
@@ -138,16 +141,5 @@
                        { gsub(/${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, "$${PKG_LOCALTEXMFPREFIX}"); \
                        print; next; }
 
-.endif # TEX_BUILDLINK3_MK
-
-.if ${TEX_TYPE} == "none"
-PKG_FAIL_REASON=       \
-       "${_TEX_TYPE} is not an acceptable TeX version for ${PKGNAME}."
-.else
-.if (${TEX_DEPMETHOD} == "build")
-BUILD_DEPENDS+=        ${_TEX_DEPENDENCY}:${_TEX_PKGSRCDIR}
-.else
-TEX_DEPMETHOD:= run
-.  include "${_TEX_PKGSRCDIR}/buildlink3.mk"
 .endif
 .endif
diff -r 4aa0c6206fe3 -r 575dbd7515cf print/dvipdfmx/Makefile
--- a/print/dvipdfmx/Makefile   Sun Jan 08 13:50:53 2006 +0000
+++ b/print/dvipdfmx/Makefile   Sun Jan 08 14:00:11 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:52 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/08 14:00:11 tonio Exp $
 
 DISTNAME=      dvipdfmx-20050627
 PKGNAME=       ${DISTNAME:S/-/-0.0.0./}
+PKGREVISION=   1
 CATEGORIES=    print converters
 MASTER_SITES=  http://project.ktug.or.kr/dvipdfmx/snapshot/release/
 
diff -r 4aa0c6206fe3 -r 575dbd7515cf print/dvipng/Makefile
--- a/print/dvipng/Makefile     Sun Jan 08 13:50:53 2006 +0000
+++ b/print/dvipng/Makefile     Sun Jan 08 14:00:11 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2005/11/08 20:46:18 tonio Exp $
+# $NetBSD: Makefile,v 1.17 2006/01/08 14:00:11 tonio Exp $
 
 DISTNAME=      dvipng-1.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    textproc converters
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=dvipng/}
 
diff -r 4aa0c6206fe3 -r 575dbd7515cf print/ja-ptex-bin/Makefile
--- a/print/ja-ptex-bin/Makefile        Sun Jan 08 13:50:53 2006 +0000
+++ b/print/ja-ptex-bin/Makefile        Sun Jan 08 14:00:11 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:53 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/08 14:00:12 tonio Exp $
 
 DISTNAME=      ptex-src-${PTEX_VERS}
 PKGNAME=       ja-ptex-bin-${PTEX_VERS}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    print japanese
 MASTER_SITES=  ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ \
                ftp://ring.gr.jp/pub/text/TeX/ascii-ptex/tetex/
diff -r 4aa0c6206fe3 -r 575dbd7515cf print/ja-ptex-share/Makefile
--- a/print/ja-ptex-share/Makefile      Sun Jan 08 13:50:53 2006 +0000
+++ b/print/ja-ptex-share/Makefile      Sun Jan 08 14:00:11 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/08 14:00:12 tonio Exp $
 
 DISTNAME=      ptex-texmf-2.1
 PKGNAME=       ja-ptex-share-2.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    print japanese
 MASTER_SITES=  ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ \
                ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/jvf/ \
diff -r 4aa0c6206fe3 -r 575dbd7515cf print/ja-vfxdvik/Makefile
--- a/print/ja-vfxdvik/Makefile Sun Jan 08 13:50:53 2006 +0000
+++ b/print/ja-vfxdvik/Makefile Sun Jan 08 14:00:11 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:53 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/08 14:00:12 tonio Exp $
 
 DISTNAME=      xdvik-${XDVIK_ORIGINAL_VERS}
 PKGNAME=       ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS}
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    japanese print
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=xdvi/} # not xdvik
 
@@ -19,10 +19,12 @@
 
 .if defined(USE_TEXFAMILY)
 DEPENDS+=      TeXfamily>=1.2.1:../../print/texfamily
-TEX_ACCEPTED=  teTeX1
+#TEX_ACCEPTED= teTeX1
+.include "../../print/teTeX1-bin/buildlink3.mk"
 .else
 DEPENDS+=      ja-ptex-bin>=3.1.2:../../print/ja-ptex-bin
-TEX_ACCEPTED=  teTeX2
+#TEX_ACCEPTED= teTeX2
+.include "../../print/teTeX-bin/buildlink3.mk"
 .endif
 
 XDVI_DIR=      ${WRKDIR}/${DISTNAME}/texk/xdvik
@@ -72,7 +74,6 @@
 do-install:
        cd ${XDVI_DIR} && ${MAKE_PROGRAM} install
 
-.include "../../mk/tex.buildlink3.mk"
 .include "../../www/libwww/buildlink3.mk"
 .include "../../print/ja-vflib-lib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff -r 4aa0c6206fe3 -r 575dbd7515cf print/teTeX-bin/buildlink3.mk
--- a/print/teTeX-bin/buildlink3.mk     Sun Jan 08 13:50:53 2006 +0000
+++ b/print/teTeX-bin/buildlink3.mk     Sun Jan 08 14:00:11 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/11/14 21:57:00 tonio Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/01/08 14:00:12 tonio Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 TETEX_BIN_BUILDLINK3_MK:=      ${TETEX_BIN_BUILDLINK3_MK}+
@@ -17,5 +17,7 @@
Prev by Date: [pkgsrc/trunk]: pkgsrc/mail/milter-greylist Update "milter-greylist" package ...
Next by Date: [pkgsrc/trunk]: pkgsrc/net/arla Use SUBST framework.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mail/milter-greylist Update "milter-greylist" package ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/net/arla Use SUBST framework.
Indexes:
Home | Main Index | Thread Index | Old Index