pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print web2c: update to 2019
details: https://anonhg.NetBSD.org/pkgsrc/rev/b1d64bd0f35f
branches: trunk
changeset: 323658:b1d64bd0f35f
user: adam <adam%pkgsrc.org@localhost>
date: Tue May 14 13:23:10 2019 +0000
description:
web2c: update to 2019
sync with other texlive packages
diffstat:
print/texlive/Makefile.common | 3 +-
print/web2c/Makefile | 55 +-
print/web2c/PLIST | 20 +-
print/web2c/distinfo | 23 +-
print/web2c/patches/patch-Makefile.in | 10 +-
print/web2c/patches/patch-am | 22 -
print/web2c/patches/patch-man_Makefile.in | 23 +
print/web2c/patches/patch-pdftexdir_pdftex-common.h | 4 +-
print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc | 249 ----------
print/web2c/patches/patch-pdftexdir_pdftoepdf-poppler0.75.0.cc | 111 ++++
print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc | 41 +-
print/web2c/patches/patch-pdftexdir_writeenc.c | 4 +-
print/web2c/patches/patch-pdftexdir_writet1.c | 18 -
13 files changed, 224 insertions(+), 359 deletions(-)
diffs (truncated from 771 to 300 lines):
diff -r f5d4873b74bb -r b1d64bd0f35f print/texlive/Makefile.common
--- a/print/texlive/Makefile.common Tue May 14 12:54:52 2019 +0000
+++ b/print/texlive/Makefile.common Tue May 14 13:23:10 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2019/05/09 09:47:34 adam Exp $
+# $NetBSD: Makefile.common,v 1.2 2019/05/14 13:23:10 adam Exp $
# used by converters/dvi2tty/Makefile
# used by fonts/afm2pl/Makefile
# used by fonts/gsftopkk/Makefile
@@ -18,6 +18,7 @@
# used by print/seetexk/Makefile
# used by print/tex4ht/Makefile
# used by print/vlna/Makefile
+# used by print/web2c/Makefile
# used by print/xdvik/Makefile
# used by print/xetex/Makefile
# used by print/xpdfopen/Makefile
diff -r f5d4873b74bb -r b1d64bd0f35f print/web2c/Makefile
--- a/print/web2c/Makefile Tue May 14 12:54:52 2019 +0000
+++ b/print/web2c/Makefile Tue May 14 13:23:10 2019 +0000
@@ -1,34 +1,25 @@
-# $NetBSD: Makefile,v 1.85 2019/05/09 13:57:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.86 2019/05/14 13:23:10 adam Exp $
+
+.include "../../print/texlive/Makefile.common"
-DISTNAME= texlive-20180414-source
-PKGNAME= web2c-2018
-PKGREVISION= 13
+PKGNAME= web2c-2019
CATEGORIES= print
-MASTER_SITES= ftp://tug.org/historic/systems/texlive/2018/
-EXTRACT_SUFX= .tar.xz
-MAINTAINER= minskim%NetBSD.org@localhost
HOMEPAGE= http://www.tug.org/web2c/
COMMENT= TeX implementation translating WEB to C
DEPENDS+= kpathsea>=6.2.1:../../print/kpathsea
DEPENDS+= ptexenc>=1.3.4:../../print/ptexenc
-EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \
- ${DISTNAME}/texk/web2c
-
-GNU_CONFIGURE= yes
-GNU_CONFIGURE_STRICT= no # texk/web2c/web2c doesn't know the options
+EXTRACT_ELEMENTS+= ${DISTNAME}/texk/web2c
-INFO_FILES= yes
-USE_LANGUAGES= c c++11
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake lex yacc pkg-config
-WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c
+USE_LANGUAGES= c c++11
+USE_TOOLS+= gmake lex yacc
+GNU_CONFIGURE_STRICT= no # texk/web2c/web2c doesn't know the options
+PKGCONFIG_OVERRIDE= synctexdir/synctex.pc.in
-CONFIG_GUESS_OVERRIDE+= ${WRKDIR}/${DISTNAME}/build-aux/config.guess
-CONFIG_SUB_OVERRIDE+= ${WRKDIR}/${DISTNAME}/build-aux/config.sub
-PKGCONFIG_OVERRIDE= synctexdir/synctex.pc.in
+INFO_FILES= yes
+WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c
CONFIGURE_ARGS+= --disable-luatex
CONFIGURE_ARGS+= --disable-luatex53
@@ -41,28 +32,28 @@
CONFIGURE_ARGS+= --with-system-kpathsea
CONFIGURE_ARGS+= --with-system-libpng
CONFIGURE_ARGS+= --with-system-cairo
-CONFIGURE_ARGS+= --with-system-gmp \
- --with-gmp-includes=${BUILDLINK_PREFIX.gmp}/include \
- --with-gmp-libdir=${BUILDLINK_PREFIX.gmp}/lib
-CONFIGURE_ARGS+= --with-system-mpfr \
- --with-mpfr-includes=${BUILDLINK_PREFIX.mpfr}/include \
- --with-mpfr-libdir=${BUILDLINK_PREFIX.mpfr}/lib
+CONFIGURE_ARGS+= --with-system-gmp
+CONFIGURE_ARGS+= --with-gmp-includes=${BUILDLINK_PREFIX.gmp}/include
+CONFIGURE_ARGS+= --with-gmp-libdir=${BUILDLINK_PREFIX.gmp}/lib
+CONFIGURE_ARGS+= --with-system-mpfr
+CONFIGURE_ARGS+= --with-mpfr-includes=${BUILDLINK_PREFIX.mpfr}/include
+CONFIGURE_ARGS+= --with-mpfr-libdir=${BUILDLINK_PREFIX.mpfr}/lib
CONFIGURE_ARGS+= --with-system-pixman
CONFIGURE_ARGS+= --with-system-poppler
CONFIGURE_ARGS+= --with-system-xpdf
CONFIGURE_ARGS+= --with-system-ptexenc
-CONFIGURE_ARGS+= --with-system-zlib \
- --with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include \
- --with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
+CONFIGURE_ARGS+= --with-system-zlib
+CONFIGURE_ARGS+= --with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include
+CONFIGURE_ARGS+= --with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
CONFIGURE_ARGS+= --with-system-zziplib
LIBTOOL_OVERRIDE= ../*/libtool */libtool
CONFIGURE_DIRS= ${WRKDIR}/${DISTNAME}/texk/web2c
-INSTALL_DIRS= ${WRKDIR}/${DISTNAME}/texk/web2c
+INSTALL_DIRS= ${WRKDIR}/${DISTNAME}/texk/web2c
pre-configure:
- cp ${WRKSRC}/pdftexdir/pdftoepdf-newpoppler.cc ${WRKSRC}/pdftexdir/pdftoepdf.cc
- cp ${WRKSRC}/pdftexdir/pdftosrc-newpoppler.cc ${WRKSRC}/pdftexdir/pdftosrc.cc
+ ${CP} ${WRKSRC}/pdftexdir/pdftoepdf-poppler0.75.0.cc ${WRKSRC}/pdftexdir/pdftoepdf.cc
+ ${CP} ${WRKSRC}/pdftexdir/pdftosrc-newpoppler.cc ${WRKSRC}/pdftexdir/pdftosrc.cc
.include "../../archivers/zziplib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff -r f5d4873b74bb -r b1d64bd0f35f print/web2c/PLIST
--- a/print/web2c/PLIST Tue May 14 12:54:52 2019 +0000
+++ b/print/web2c/PLIST Tue May 14 13:23:10 2019 +0000
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.13 2016/06/16 04:06:20 markd Exp $
+@comment $NetBSD: PLIST,v 1.14 2019/05/14 13:23:10 adam Exp $
bin/aleph
bin/bibtex
bin/ctangle
bin/ctie
+bin/ctwill
+bin/ctwill-refsort
+bin/ctwill-twinx
bin/cweave
bin/dvicopy
bin/dvitomp
@@ -45,6 +48,9 @@
bin/ppltotf
bin/ptex
bin/ptftopl
+bin/r-mpost
+bin/r-pmpost
+bin/r-upmpost
bin/synctex
bin/tangle
bin/tex
@@ -67,6 +73,7 @@
bin/wovp2ovf
include/synctex/synctex_parser.h
include/synctex/synctex_parser_utils.h
+include/synctex/synctex_version.h
info/web2c.info
lib/libsynctex.la
lib/pkgconfig/synctex.pc
@@ -74,11 +81,16 @@
man/man1/bibtex.1
man/man1/ctangle.1
man/man1/ctie.1
+man/man1/ctwill-refsort.1
+man/man1/ctwill-twinx.1
+man/man1/ctwill.1
man/man1/cweave.1
man/man1/cweb.1
man/man1/dvicopy.1
man/man1/dvitomp.1
man/man1/dvitype.1
+man/man1/eptex.1
+man/man1/euptex.1
man/man1/gftodvi.1
man/man1/gftopk.1
man/man1/gftype.1
@@ -107,12 +119,18 @@
man/man1/pktype.1
man/man1/pltotf.1
man/man1/pooltype.1
+man/man1/ppltotf.1
+man/man1/ptex.1
+man/man1/ptftopl.1
man/man1/synctex.1
man/man1/tangle.1
man/man1/tex.1
man/man1/tftopl.1
man/man1/tie.1
man/man1/ttf2afm.1
+man/man1/uppltotf.1
+man/man1/uptex.1
+man/man1/uptftopl.1
man/man1/vftovp.1
man/man1/vptovf.1
man/man1/weave.1
diff -r f5d4873b74bb -r b1d64bd0f35f print/web2c/distinfo
--- a/print/web2c/distinfo Tue May 14 12:54:52 2019 +0000
+++ b/print/web2c/distinfo Tue May 14 13:23:10 2019 +0000
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.33 2019/05/10 19:19:09 ryoon Exp $
+$NetBSD: distinfo,v 1.34 2019/05/14 13:23:10 adam Exp $
-SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
-RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
-SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
-Size (texlive-20180414-source.tar.xz) = 49770944 bytes
-SHA1 (patch-Makefile.in) = 28e7ad00f3796b49f92c5cc3eb3c94bdf38b1364
-SHA1 (patch-am) = b7b81b1161a2117e756b25b80f9a676575267bdd
-SHA1 (patch-pdftexdir_pdftex-common.h) = 59f32828de5dd032307467d83e43f21382a39330
-SHA1 (patch-pdftexdir_pdftoepdf-newpoppler.cc) = aff81fbdeb0cfee1f52d98e53507a227ac899ba6
-SHA1 (patch-pdftexdir_pdftosrc-newpoppler.cc) = 91b94d9f77edd349c9b0bd1a5c20c190f1a3e5c1
-SHA1 (patch-pdftexdir_writeenc.c) = daf41fec97d3d3e46063d8cf4c559d96e1ec69bf
-SHA1 (patch-pdftexdir_writet1.c) = 7d00d5d5d3f884bc1f9946cb3fbcaa7f224df9de
+SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
+RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
+SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+Size (texlive-20190410-source.tar.xz) = 53783408 bytes
+SHA1 (patch-Makefile.in) = ec3cc8f935d7365c90aabcd68be431eb706d970e
+SHA1 (patch-man_Makefile.in) = 8d0cbcd73f113135ea400c0491a4c0cbd0b07c73
+SHA1 (patch-pdftexdir_pdftex-common.h) = 0f82056b5431c0a4718ab8609967f2ec9aeca3a9
+SHA1 (patch-pdftexdir_pdftoepdf-poppler0.75.0.cc) = fed92e4cc1fa8086eb70dd44726371e1df64f79f
+SHA1 (patch-pdftexdir_pdftosrc-newpoppler.cc) = ce79bc0fc98756493adb1b57724ccb7f7b2821aa
+SHA1 (patch-pdftexdir_writeenc.c) = d2dfedf140c2c2c9143bc701291c09d3a8d3f3a4
diff -r f5d4873b74bb -r b1d64bd0f35f print/web2c/patches/patch-Makefile.in
--- a/print/web2c/patches/patch-Makefile.in Tue May 14 12:54:52 2019 +0000
+++ b/print/web2c/patches/patch-Makefile.in Tue May 14 13:23:10 2019 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-Makefile.in,v 1.1 2018/05/15 06:11:45 minskim Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2019/05/14 13:23:10 adam Exp $
Remove a race condition. $(nodist_libmplibbackends_a_SOURCES) should't
be compiled before mplib.h is created.
---- Makefile.in.orig 2018-03-20 22:58:40.000000000 +0000
+--- Makefile.in.orig 2019-02-20 21:54:28.000000000 +0000
+++ Makefile.in
-@@ -17349,7 +17349,7 @@ svgout-tangle: ctangle$(EXEEXT) mplibdir
- $(nodist_libmplibcore_a_SOURCES): $(svgout_c_h) $(pngout_c_h)
+@@ -18394,7 +18394,7 @@ $(nodist_libmplibcore_a_SOURCES): $(mpma
- $(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND)
+ $(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND)
+ $(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND)
-$(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
+$(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) mplib.h $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
$(etex_OBJECTS): $(etex_prereq)
diff -r f5d4873b74bb -r b1d64bd0f35f print/web2c/patches/patch-am
--- a/print/web2c/patches/patch-am Tue May 14 12:54:52 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-am,v 1.7 2016/06/16 04:06:20 markd Exp $
-
---- man/Makefile.in.orig 2016-03-07 18:22:26.000000000 +0000
-+++ man/Makefile.in
-@@ -433,7 +433,7 @@ x_tool_libs = @x_tool_libs@
- man_sources = $(bootstrap_man_sources) $(am__append_1) $(am__append_2) \
- $(am__append_4) $(am__append_7) $(am__append_8) \
- $(am__append_9) $(am__append_11) $(am__append_13) \
-- $(am__append_14) $(am__append_16) $(misc_man_sources)
-+ $(am__append_14) $(am__append_16)
- EXTRA_DIST = $(bootstrap_man_sources) $(web_man_sources) tex.man \
- mf.man mpost.man etex.man $(pdftex_man_sources) luatex.man \
- $(otangle_man_sources) aleph.man $(misc_man_sources) spell.add
-@@ -441,7 +441,7 @@ bootstrap_man_sources = ctie.man cweb.ma
-
- # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
- man1_links = cweb:ctangle cweb:cweave $(am__append_3) $(am__append_5) \
-- $(am__append_6) $(am__append_10) $(am__append_12) \
-+ $(am__append_6) $(am__append_12) \
- $(am__append_15) $(am__append_17)
- web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \
- gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \
diff -r f5d4873b74bb -r b1d64bd0f35f print/web2c/patches/patch-man_Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/web2c/patches/patch-man_Makefile.in Tue May 14 13:23:10 2019 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-man_Makefile.in,v 1.1 2019/05/14 13:23:10 adam Exp $
+
+--- man/Makefile.in.orig 2019-03-30 10:13:17.000000000 +0000
++++ man/Makefile.in
+@@ -443,8 +443,7 @@ x_tool_libs = @x_tool_libs@
+ man_sources = $(bootstrap_man_sources) $(am__append_1) $(am__append_2) \
+ $(am__append_4) $(am__append_7) $(am__append_8) \
+ $(am__append_9) $(am__append_11) $(am__append_13) \
+- $(am__append_15) $(am__append_16) $(am__append_18) \
+- $(misc_man_sources)
++ $(am__append_15) $(am__append_16) $(am__append_18)
+ EXTRA_DIST = $(bootstrap_man_sources) $(web_man_sources) tex.man \
+ mf.man mpost.man etex.man $(pdftex_man_sources) ptex.man \
+ ppltotf.man ptftopl.man luatex.man xetex.man \
+@@ -454,7 +453,7 @@ bootstrap_man_sources = ctie.man cweb.ma
+ # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
+ man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-refsort \
+ ctwill:ctwill-twinx $(am__append_3) $(am__append_5) \
+- $(am__append_6) $(am__append_10) $(am__append_12) \
++ $(am__append_6) $(am__append_12) \
+ $(am__append_14) $(am__append_17) $(am__append_19)
+ web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \
+ gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \
diff -r f5d4873b74bb -r b1d64bd0f35f print/web2c/patches/patch-pdftexdir_pdftex-common.h
--- a/print/web2c/patches/patch-pdftexdir_pdftex-common.h Tue May 14 12:54:52 2019 +0000
+++ b/print/web2c/patches/patch-pdftexdir_pdftex-common.h Tue May 14 13:23:10 2019 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-pdftexdir_pdftex-common.h,v 1.1 2018/12/04 13:01:44 ryoon Exp $
+$NetBSD: patch-pdftexdir_pdftex-common.h,v 1.2 2019/05/14 13:23:10 adam Exp $
+
+Fix buildling.
--- pdftexdir/pdftex-common.h.orig 2016-11-25 18:24:37.000000000 +0000
+++ pdftexdir/pdftex-common.h
diff -r f5d4873b74bb -r b1d64bd0f35f print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc
--- a/print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc Tue May 14 12:54:52 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,249 +0,0 @@
-$NetBSD: patch-pdftexdir_pdftoepdf-newpoppler.cc,v 1.5 2019/05/10 19:19:09 ryoon Exp $
-
---- pdftexdir/pdftoepdf-newpoppler.cc.orig 2018-04-04 04:08:11.000000000 +0000
-+++ pdftexdir/pdftoepdf-newpoppler.cc
Home |
Main Index |
Thread Index |
Old Index