CVS commit: pkgsrc/print/web2c

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun May 13 13:01:02 UTC 2018

Modified Files:
        pkgsrc/print/web2c: Makefile distinfo
Added Files:
        pkgsrc/print/web2c/patches: patch-pdftexdir_pdftoepdf-newpoppler.cc
            patch-pdftexdir_pdftosrc-newpoppler.cc
Removed Files:
        pkgsrc/print/web2c/patches: patch-pdftexdir_pdftoepdf.cc
            patch-pdftexdir_pdftosrc.cc

Log Message:
web2c: update to 2018

texlive 2018 version


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/print/web2c/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/print/web2c/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc \
    pkgsrc/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/print/web2c/patches/patch-pdftexdir_pdftoepdf.cc \
    pkgsrc/print/web2c/patches/patch-pdftexdir_pdftosrc.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/web2c/Makefile
diff -u pkgsrc/print/web2c/Makefile:1.70 pkgsrc/print/web2c/Makefile:1.71
--- pkgsrc/print/web2c/Makefile:1.70    Sat Apr 28 20:19:12 2018
+++ pkgsrc/print/web2c/Makefile Sun May 13 13:01:02 2018
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.70 2018/04/28 20:19:12 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2018/05/13 13:01:02 markd Exp $
 
-DISTNAME=      texlive-20170524-source
-PKGNAME=       web2c-2017
-PKGREVISION=   10
+DISTNAME=      texlive-20180414-source
+PKGNAME=       web2c-2018
 CATEGORIES=    print
-MASTER_SITES=  ftp://tug.org/historic/systems/texlive/2017/
+MASTER_SITES=  ftp://tug.org/historic/systems/texlive/2018/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    minskim%NetBSD.org@localhost
@@ -29,6 +28,7 @@ CONFIG_SUB_OVERRIDE+= ${WRKDIR}/${DISTNA
 PKGCONFIG_OVERRIDE=    synctexdir/synctex.pc.in
 
 CONFIGURE_ARGS+=       --disable-luatex
+CONFIGURE_ARGS+=       --disable-luatex53
 CONFIGURE_ARGS+=       --disable-luajittex
 CONFIGURE_ARGS+=       --disable-mflua
 CONFIGURE_ARGS+=       --disable-mfluajit
@@ -51,11 +51,17 @@ 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-zziplib
 LIBTOOL_OVERRIDE=      ../*/libtool */libtool
 
 CONFIGURE_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
+
+.include "../../archivers/zziplib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"

Index: pkgsrc/print/web2c/distinfo
diff -u pkgsrc/print/web2c/distinfo:1.25 pkgsrc/print/web2c/distinfo:1.26
--- pkgsrc/print/web2c/distinfo:1.25    Sun Apr 29 20:58:29 2018
+++ pkgsrc/print/web2c/distinfo Sun May 13 13:01:02 2018
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25 2018/04/29 20:58:29 ryoon Exp $
+$NetBSD: distinfo,v 1.26 2018/05/13 13:01:02 markd Exp $
 
-SHA1 (texlive-20170524-source.tar.xz) = 1c1383ddb1b871c6b8ce49a4ae3c1a33d454a7b6
-RMD160 (texlive-20170524-source.tar.xz) = a8430c19fe1727cf308fe03e5838105260c0d71e
-SHA512 (texlive-20170524-source.tar.xz) = 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
-Size (texlive-20170524-source.tar.xz) = 63483372 bytes
+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-am) = b7b81b1161a2117e756b25b80f9a676575267bdd
-SHA1 (patch-pdftexdir_pdftoepdf.cc) = 24ff0639b236c87aa24b4ffb8f90520d9a4e092f
-SHA1 (patch-pdftexdir_pdftosrc.cc) = d951a2c83adfc28e58e6963f38e4ce5f35fc5bb8
+SHA1 (patch-pdftexdir_pdftoepdf-newpoppler.cc) = 6d778c1b493d1f498c07ea49a41a9f15d3f8d570
+SHA1 (patch-pdftexdir_pdftosrc-newpoppler.cc) = 6601ac14720cc36321d3da70359218182f98915b

Added files:

Index: pkgsrc/print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc
diff -u /dev/null pkgsrc/print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc:1.1
--- /dev/null   Sun May 13 13:01:02 2018
+++ pkgsrc/print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc  Sun May 13 13:01:02 2018
@@ -0,0 +1,44 @@
+$NetBSD: patch-pdftexdir_pdftoepdf-newpoppler.cc,v 1.1 2018/05/13 13:01:02 markd Exp $
+
+Build with poppler 0.64
+
+--- pdftexdir/pdftoepdf-newpoppler.cc.orig     2018-04-04 04:08:11.000000000 +0000
++++ pdftexdir/pdftoepdf-newpoppler.cc
+@@ -275,7 +275,7 @@ static int getNewObjectNumber(Ref ref)
+ 
+ static void copyObject(Object *);
+ 
+-static void copyName(char *s)
++static void copyName(const char *s)
+ {
+     pdf_puts("/");
+     for (; *s != 0; s++) {
+@@ -418,7 +418,7 @@ static void copyFont(char *tag, Object *
+         && fontdescRef.isRef()
+         && fontdesc.isDict()
+         && embeddableFont(&fontdesc)
+-        && (fontmap = lookup_fontmap(basefont.getName())) != NULL) {
++        && (fontmap = lookup_fontmap((char *)basefont.getName())) != NULL) {
+         // round /StemV value, since the PDF input is a float
+         // (see Font Descriptors in PDF reference), but we only store an
+         // integer, since we don't want to change the struct.
+@@ -427,7 +427,7 @@ static void copyFont(char *tag, Object *
+         charset = fontdesc.dictLookup("CharSet");
+         if (!charset.isNull() &&
+             charset.isString() && is_subsetable(fontmap))
+-            epdf_mark_glyphs(fd, charset.getString()->getCString());
++            epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
+         else
+             embed_whole_font(fd);
+         addFontDesc(fontdescRef.getRef(), fd);
+@@ -554,8 +554,8 @@ static void copyObject(Object * obj)
+     Object obj1;
+     int i, l, c;
+     Ref ref;
+-    char *p;
+-    GString *s;
++    const char *p;
++    const GString *s;
+     if (obj->isBool()) {
+         pdf_printf("%s", obj->getBool()? "true" : "false");
+     } else if (obj->isInt()) {
Index: pkgsrc/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc
diff -u /dev/null pkgsrc/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc:1.1
--- /dev/null   Sun May 13 13:01:02 2018
+++ pkgsrc/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc   Sun May 13 13:01:02 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-pdftexdir_pdftosrc-newpoppler.cc,v 1.1 2018/05/13 13:01:02 markd Exp $
+
+Build with poppler 0.64
+
+--- pdftexdir/pdftosrc-newpoppler.cc.orig      2017-10-17 21:52:13.000000000 +0000
++++ pdftexdir/pdftosrc-newpoppler.cc
+@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
+     Stream *s;
+     Object srcStream, srcName, catalogDict;
+     FILE *outfile;
+-    char *outname;
++    const char *outname;
+     int objnum = 0, objgen = 0;
+     bool extract_xref_table = false;
+     int c;