diff --git a/print/texlive/base/Makefile b/print/texlive/base/Makefile index 33d16a9906b..01fe2f58c18 100755 --- a/print/texlive/base/Makefile +++ b/print/texlive/base/Makefile @@ -1,11 +1,17 @@ -# $OpenBSD: Makefile,v 1.99 2018/04/10 20:43:51 edd Exp $ +# $OpenBSD: Makefile,v 1.100 2018/07/01 08:59:32 espie Exp $ -COMMENT = base binaries for TeXLive typesetting distribution +COMMENT-main = base binaries for TeXLive typesetting distribution +COMMENT-mktexlsr = mktexlsr for TeXLive typesetting distribution DISTNAME = texlive-${DIST_V}-source PKGNAME = texlive_base-${V} WRKDIST = ${WRKDIR}/texlive-${DIST_V}-source -REVISION = 0 + +REVISION-main = 1 + +MULTI_PACKAGES = -main -mktexlsr +PKGNAME-mktexlsr = texlive_mktexlsr-${V} +PKGNAME-main = ${PKGNAME} DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \ texlive-${DIST_V}-extra${EXTRACT_SUFX} @@ -15,16 +21,20 @@ SHARED_LIBS += ptexenc 5.1 # 4.4 SHARED_LIBS += synctex 1.0 # 19.0 SHARED_LIBS += texlua52 0.0 # 7.4 -WANTLIB += ${COMPILER_LIBCXX} ICE SM X11 Xau Xaw Xdmcp Xext Xi -WANTLIB += Xmu Xpm Xrender Xt avahi-client avahi-common c cairo -WANTLIB += cups cupsimage dbus-1 expat ffi fontconfig freetype -WANTLIB += gd glib-2.0 gmp gnutls graphite2 gs harfbuzz harfbuzz-icu -WANTLIB += hogweed iconv icudata icui18n icuio icuuc idn2 ijs -WANTLIB += intl jbig2dec jpeg lcms2 m nettle p11-kit paper pcre -WANTLIB += pixman-1 png potrace tasn1 tiff unistring webp xcb -WANTLIB += xcb-render xcb-shm z zzip +WANTLIB-main += ${COMPILER_LIBCXX} ICE SM X11 Xau Xaw Xdmcp Xext Xi +WANTLIB-main += Xmu Xpm Xrender Xt avahi-client avahi-common c cairo +WANTLIB-main += cups cupsimage dbus-1 expat ffi fontconfig freetype +WANTLIB-main += gd glib-2.0 gmp gnutls graphite2 gs harfbuzz harfbuzz-icu +WANTLIB-main += hogweed iconv icudata icui18n icuio icuuc idn2 ijs +WANTLIB-main += intl jbig2dec jpeg lcms2 m nettle p11-kit paper pcre +WANTLIB-main += pixman-1 png potrace tasn1 tiff unistring webp xcb +WANTLIB-main += xcb-render xcb-shm z zzip -RUN_DEPENDS = print/ghostscript/gnu \ +WANTLIB-main += kpathsea + +WANTLIB-mktexlsr = c + +RUN_DEPENDS-main = print/ghostscript/gnu \ print/detex \ print/dvi2tty \ print/ps2eps \ @@ -32,7 +42,7 @@ RUN_DEPENDS = print/ghostscript/gnu \ print/t1utils \ texlive_texmf-buildset-${V}:print/texlive/texmf,-buildset -LIB_DEPENDS = converters/libiconv \ +LIB_DEPENDS-main = converters/libiconv \ graphics/png \ graphics/gd \ graphics/cairo \ @@ -42,7 +52,8 @@ LIB_DEPENDS = converters/libiconv \ print/libpaper \ archivers/zziplib \ graphics/potrace \ - print/ghostscript/gnu + print/ghostscript/gnu \ + ${BASE_PKGPATH},-mktexlsr MODULES = textproc/intltool perl @@ -79,7 +90,7 @@ CFLAGS += -fPIC .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || \ ${MACHINE} == "powerpc" || ${MACHINE} == "sparc64" BUILD_DEPENDS += lang/clisp -RUN_DEPENDS += lang/clisp +RUN_DEPENDS-main += lang/clisp CONFIGURE_ARGS += --enable-xindy \ --disable-xindy-rules PKG_ARGS += -Dxindy=1 diff --git a/print/texlive/base/pkg/DESCR b/print/texlive/base/pkg/DESCR-main similarity index 100% rename from print/texlive/base/pkg/DESCR rename to print/texlive/base/pkg/DESCR-main diff --git a/print/texlive/base/pkg/DESCR-mktexlsr b/print/texlive/base/pkg/DESCR-mktexlsr new file mode 100644 index 00000000000..875250b35d0 --- /dev/null +++ b/print/texlive/base/pkg/DESCR-mktexlsr @@ -0,0 +1,6 @@ +TeX Live is an easy way to get up and running with TeX. It provides a +comprehensive TeX system which includes all the major TeX-related +programs, macro packages, and fonts that are free software, including +support for many languages around the world. + +This package contains mktexlsr and afferent utilities diff --git a/print/texlive/base/pkg/PFRAG.xindy b/print/texlive/base/pkg/PFRAG.xindy deleted file mode 100644 index ffd1f3e9c06..00000000000 --- a/print/texlive/base/pkg/PFRAG.xindy +++ /dev/null @@ -1,5 +0,0 @@ -@comment $OpenBSD: PFRAG.xindy,v 1.3 2011/11/23 12:00:45 edd Exp $ -@bin bin/tex2xindy -bin/texindy -bin/xindy -bin/xindy.mem diff --git a/print/texlive/base/pkg/PFRAG.xindy-main b/print/texlive/base/pkg/PFRAG.xindy-main new file mode 100644 index 00000000000..da517d361e8 --- /dev/null +++ b/print/texlive/base/pkg/PFRAG.xindy-main @@ -0,0 +1,5 @@ +@comment $OpenBSD: PFRAG.xindy-main,v 1.1 2018/07/01 08:59:32 espie Exp $ +@bin bin/tex2xindy +bin/texindy +bin/xindy +bin/xindy.mem diff --git a/print/texlive/base/pkg/PLIST b/print/texlive/base/pkg/PLIST-main similarity index 81% rename from print/texlive/base/pkg/PLIST rename to print/texlive/base/pkg/PLIST-main index e7a5cbb19f0..53825d19382 100644 --- a/print/texlive/base/pkg/PLIST +++ b/print/texlive/base/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.33 2018/01/30 20:35:38 edd Exp $ +@comment $OpenBSD: PLIST-main,v 1.1 2018/07/01 08:59:32 espie Exp $ @conflict teTeX_base-* @conflict pdfjam-* @conflict ht-<2 @@ -6,6 +6,7 @@ @pkgpath print/teTeX/base @pkgpath print/pdfjam @pkgpath print/teTeX/base,-fmt +@pkgpath print/texlive/base %%xindy%% bin/a2ping bin/a5toa4 @@ -146,13 +147,9 @@ bin/kanji-config-updmap-sys bin/kanji-config-updmap-user bin/kanji-fontmap-creator bin/komkindex -@bin bin/kpseaccess bin/kpsepath -@bin bin/kpsereadlink -@bin bin/kpsestat bin/kpsetool bin/kpsewhere -@bin bin/kpsewhich bin/kpsexpand @bin bin/lacheck bin/lamed @@ -210,7 +207,6 @@ bin/mkofm bin/mkpic bin/mkt1font bin/mktexfmt -bin/mktexlsr bin/mktexmf bin/mktexpk bin/mktextfm @@ -395,53 +391,6 @@ bin/xelatex bin/xhlatex bin/xmltex bin/yplan -include/kpathsea/ -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/cnf.h -include/kpathsea/concatn.h -include/kpathsea/config.h -include/kpathsea/debug.h -include/kpathsea/expand.h -include/kpathsea/getopt.h -include/kpathsea/hash.h -include/kpathsea/knj.h -include/kpathsea/kpathsea.h -include/kpathsea/lib.h -include/kpathsea/line.h -include/kpathsea/magstep.h -include/kpathsea/mingw32.h -include/kpathsea/paths.h -include/kpathsea/pathsearch.h -include/kpathsea/proginit.h -include/kpathsea/progname.h -include/kpathsea/readable.h -include/kpathsea/simpletypes.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/types.h -include/kpathsea/variable.h -include/kpathsea/version.h -include/kpathsea/win32lib.h include/ptexenc/ include/ptexenc/ptexenc.h include/ptexenc/unicode.h @@ -454,9 +403,6 @@ include/texlua52/lua.h include/texlua52/lua.hpp include/texlua52/luaconf.h include/texlua52/lualib.h -lib/libkpathsea.a -lib/libkpathsea.la -@lib lib/libkpathsea.so.${LIBkpathsea_VERSION} lib/libptexenc.a lib/libptexenc.la @lib lib/libptexenc.so.${LIBptexenc_VERSION} @@ -466,11 +412,10 @@ lib/libsynctex.la lib/libtexlua52.a lib/libtexlua52.la @lib lib/libtexlua52.so.${LIBtexlua52_VERSION} -lib/pkgconfig/kpathsea.pc lib/pkgconfig/ptexenc.pc lib/pkgconfig/synctex.pc lib/pkgconfig/texlua52.pc -@exec mktexlsr > /dev/null 2>&1 +@tag mktexlsr @unexec-delete rm -f %D/share/texmf-dist/ls-R @unexec-delete rm -f %D/share/texmf-var/ls-R @unexec-delete rm -f %D/share/texmf-var/luatex-cache/context/0399a8df3aef8d154781d0a9c2b8e28d/trees/* diff --git a/print/texlive/base/pkg/PLIST-mktexlsr b/print/texlive/base/pkg/PLIST-mktexlsr new file mode 100644 index 00000000000..e32bf40df09 --- /dev/null +++ b/print/texlive/base/pkg/PLIST-mktexlsr @@ -0,0 +1,64 @@ +@comment $OpenBSD: PLIST-mktexlsr,v 1.1 2018/07/01 08:59:32 espie Exp $ +@conflict teTeX_base-* +@conflict pdfjam-* +@conflict ht-<2 +@conflict texlive_texmf-buildset-<2017 +@conflict texlive_base-<2017p1 +@define-tag mktexlsr at-end %D/bin/mktexlsr >/dev/null 2>&1 +@define-tag mktexlsr-local at-end %D/bin/mktexlsr %D/share/texmf-local >/dev/null 2>&1 +@bin bin/kpseaccess +@bin bin/kpsereadlink +@bin bin/kpsestat +@bin bin/kpsewhich +bin/mktexlsr +include/kpathsea/ +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/cnf.h +include/kpathsea/concatn.h +include/kpathsea/config.h +include/kpathsea/debug.h +include/kpathsea/expand.h +include/kpathsea/getopt.h +include/kpathsea/hash.h +include/kpathsea/knj.h +include/kpathsea/kpathsea.h +include/kpathsea/lib.h +include/kpathsea/line.h +include/kpathsea/magstep.h +include/kpathsea/mingw32.h +include/kpathsea/paths.h +include/kpathsea/pathsearch.h +include/kpathsea/proginit.h +include/kpathsea/progname.h +include/kpathsea/readable.h +include/kpathsea/simpletypes.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/types.h +include/kpathsea/variable.h +include/kpathsea/version.h +include/kpathsea/win32lib.h +lib/libkpathsea.a +lib/libkpathsea.la +@lib lib/libkpathsea.so.${LIBkpathsea_VERSION} +lib/pkgconfig/kpathsea.pc diff --git a/print/texlive/base/pkg/README b/print/texlive/base/pkg/README-main similarity index 98% rename from print/texlive/base/pkg/README rename to print/texlive/base/pkg/README-main index 8bcd59fe38a..0c2056cf0cc 100644 --- a/print/texlive/base/pkg/README +++ b/print/texlive/base/pkg/README-main @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.17 2018/01/30 20:35:38 edd Exp $ +$OpenBSD: README-main,v 1.1 2018/07/01 08:59:32 espie Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD diff --git a/print/texlive/texmf/Makefile b/print/texlive/texmf/Makefile index cf85394eb00..5658b080559 100644 --- a/print/texlive/texmf/Makefile +++ b/print/texlive/texmf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.50 2018/06/24 15:14:25 espie Exp $ +# $OpenBSD: Makefile,v 1.51 2018/07/01 08:59:32 espie Exp $ COMMENT-context = texlive texmf for conTeXt COMMENT-docs = texlive documentation @@ -23,9 +23,11 @@ PKGNAME-docs = texlive_texmf-docs-${V} PKGNAME-context = texlive_texmf-context-${V} PKGNAME-buildset = texlive_texmf-buildset-${V} -REVISION-main = 0 -REVISION-full = 0 -REVISION-buildset = 0 +REVISION-main = 1 +REVISION-full = 1 +REVISION-buildset = 1 +REVISION-context = 0 +REVISION-docs = 0 NO_BUILD = Yes NO_TEST = Yes @@ -42,15 +44,16 @@ MODRUBY_RUNDEP = No MODPY_BUILDDEP = No MODPY_RUNDEP = No -RUN_DEPENDS-main += texlive_base-${V}:print/texlive/base \ +RUN_DEPENDS-main += texlive_base-${V}p1:print/texlive/base,-main \ ${FULLPKGNAME-buildset}:print/texlive/texmf,-buildset RUN_DEPENDS-full = ${FULLPKGNAME-main}:print/texlive/texmf,-main \ ${MODPY_RUN_DEPENDS} \ ${_MODLUA_RUNDEPENDS} RUN_DEPENDS-context += ${FULLPKGNAME-full}:print/texlive/texmf,-full \ ${MODRUBY_RUNDEPENDS} -RUN_DEPENDS-docs += texlive_base-${V}:print/texlive/base \ +RUN_DEPENDS-docs += texlive_base-${V}p1:print/texlive/base,-main \ x11/p5-Tk +RUN_DEPENDS-buildset += texlive_mktexlsr-${V}:print/texlive/base,-mktexlsr MULTI_PACKAGES = -context -docs -full -main -buildset diff --git a/print/texlive/texmf/pkg/PLIST-buildset b/print/texlive/texmf/pkg/PLIST-buildset index 9d0b50508de..2f5a5f8c831 100644 --- a/print/texlive/texmf/pkg/PLIST-buildset +++ b/print/texlive/texmf/pkg/PLIST-buildset @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-buildset,v 1.9 2018/04/11 13:40:41 edd Exp $ +@comment $OpenBSD: PLIST-buildset,v 1.10 2018/07/01 08:59:32 espie Exp $ @conflict teTeX_texmf-* @conflict texlive_base-<2017 @conflict texlive_texmf-docs-<2017 @@ -6163,4 +6163,4 @@ share/texmf-var/web2c/xetex/cont-en.fmt share/texmf-var/web2c/xetex/pdfcsplain.fmt share/texmf-var/web2c/xetex/xelatex.fmt share/texmf-var/web2c/xetex/xetex.fmt -@exec-update if [ -e "%D/bin/mktexlsr" ]; then %D/bin/mktexlsr > /dev/null 2>&1; fi +@tag mktexlsr diff --git a/print/texlive/texmf/pkg/PLIST-context b/print/texlive/texmf/pkg/PLIST-context index f9c9a4b19d5..1aaf3e9b790 100644 --- a/print/texlive/texmf/pkg/PLIST-context +++ b/print/texlive/texmf/pkg/PLIST-context @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-context,v 1.10 2018/04/11 13:40:41 edd Exp $ +@comment $OpenBSD: PLIST-context,v 1.11 2018/07/01 08:59:32 espie Exp $ @conflict teTeX_texmf-* @conflict texlive_base-<2017 @conflict texlive_texmf-docs-<2017 @@ -3128,5 +3128,4 @@ share/texmf-dist/tex/latex/context/ppchtex/m-ch-nl.sty share/texmf-dist/tex/latex/context/ppchtex/m-pictex.sty @unexec rm -Rf %D/share/texmf-var/luatex-cache/trees @exec %D/bin/mtxrun --generate > /dev/null 2>&1 -@exec %D/bin/mktexlsr > /dev/null 2>&1 -@unexec-delete %D/bin/mktexlsr > /dev/null 2>&1 +@tag mktexlsr diff --git a/print/texlive/texmf/pkg/PLIST-docs b/print/texlive/texmf/pkg/PLIST-docs index dfdc732bb7e..f9b86b4fbc7 100644 --- a/print/texlive/texmf/pkg/PLIST-docs +++ b/print/texlive/texmf/pkg/PLIST-docs @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-docs,v 1.19 2018/04/11 13:40:41 edd Exp $ +@comment $OpenBSD: PLIST-docs,v 1.20 2018/07/01 08:59:32 espie Exp $ @conflict teTeX_texmf-doc-* @conflict texlive_base-<2017 @conflict texlive_texmf-minimal-<2017 @@ -19705,5 +19705,4 @@ share/texmf-dist/doc/xetex/xetexref/xetex-reference.tex share/texmf-dist/scripts/ share/texmf-dist/scripts/texlive/ share/texmf-dist/scripts/texlive/NEWS -@exec %D/bin/mktexlsr > /dev/null 2>&1 -@unexec-delete %D/bin/mktexlsr > /dev/null 2>&1 +@tag mktexlsr diff --git a/print/texlive/texmf/pkg/PLIST-full b/print/texlive/texmf/pkg/PLIST-full index bbcc05f67db..8f8692c9e22 100644 --- a/print/texlive/texmf/pkg/PLIST-full +++ b/print/texlive/texmf/pkg/PLIST-full @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-full,v 1.23 2018/04/11 13:40:41 edd Exp $ +@comment $OpenBSD: PLIST-full,v 1.24 2018/07/01 08:59:32 espie Exp $ @conflict teTeX_texmf-* @conflict texlive_base-<2017 @conflict texlive_texmf-docs-<2017 @@ -71805,5 +71805,4 @@ share/texmf-dist/xindy/modules/tex/inputenc/latin1.xdy share/texmf-dist/xindy/modules/tex/inputenc/latin2.xdy share/texmf-dist/xindy/modules/tex/inputenc/latin3.xdy share/texmf-dist/xindy/modules/tex/inputenc/utf8.xdy -@exec %D/bin/mktexlsr > /dev/null 2>&1 -@unexec-delete %D/bin/mktexlsr > /dev/null 2>&1 +@tag mktexlsr diff --git a/print/texlive/texmf/pkg/PLIST-main b/print/texlive/texmf/pkg/PLIST-main index 0774ead2af2..80dddec1f08 100644 --- a/print/texlive/texmf/pkg/PLIST-main +++ b/print/texlive/texmf/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.24 2018/04/11 13:40:41 edd Exp $ +@comment $OpenBSD: PLIST-main,v 1.25 2018/07/01 08:59:32 espie Exp $ @conflict teTeX_texmf-* @conflict texlive_base-<2017 @conflict texlive_texmf-docs-<2017 @@ -31009,5 +31009,4 @@ share/texmf-dist/tex4ht/xtpipes/xtpipes.dtd share/texmf-dist/ttf2pk/ share/texmf-dist/ttf2pk/VPS.rpl share/texmf-dist/ttf2pk/ttf2pk.cfg -@exec %D/bin/mktexlsr > /dev/null 2>&1 -@unexec-delete %D/bin/mktexlsr > /dev/null 2>&1 +@tag mktexlsr