web2c: update to 2018

texlive 2018 version

6 files changed, 77 insertions, 546 deletions

diff --git a/print/web2c/Makefile b/print/web2c/Makefile
index efbdc4347f6..ca5f56c2ec1 100644
--- a/print/web2c/Makefile
+++ b/print/web2c/Makefile
@@ -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
@@ -29,6 +28,7 @@ CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
 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"
diff --git a/print/web2c/distinfo b/print/web2c/distinfo
index 44cf2116caf..fd2c7aff142 100644
--- a/print/web2c/distinfo
+++ b/print/web2c/distinfo
@@ -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
diff --git a/print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc b/print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc
new file mode 100644
index 00000000000..1a76ac2bd1b
--- /dev/null
+++ b/print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc
@@ -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()) {
diff --git a/print/web2c/patches/patch-pdftexdir_pdftoepdf.cc b/print/web2c/patches/patch-pdftexdir_pdftoepdf.cc
deleted file mode 100644
index a13adfba446..00000000000
--- a/print/web2c/patches/patch-pdftexdir_pdftoepdf.cc
+++ /dev/null
@@ -1,435 +0,0 @@
-$NetBSD: patch-pdftexdir_pdftoepdf.cc,v 1.4 2018/04/29 20:58:29 ryoon Exp $
-
-Allow recent poppler - from ArchLinux
-
---- pdftexdir/pdftoepdf.cc.orig	2016-11-25 18:09:21.000000000 +0000
-+++ pdftexdir/pdftoepdf.cc
-@@ -84,31 +84,6 @@ extern integer zround(double);
- #define MASK_SUPPRESS_PTEX_PAGENUMBER 0x04
- #define MASK_SUPPRESS_PTEX_INFODICT   0x08
- 
--// PdfObject encapsulates the xpdf Object type,
--// and properly frees its resources on destruction.
--// Use obj-> to access members of the Object,
--// and &obj to get a pointer to the object.
--// It is no longer necessary to call Object::free explicitely.
--
--class PdfObject {
--  public:
--    PdfObject() {               // nothing
--    } ~PdfObject() {
--        iObject.free();
--    }
--    Object *operator->() {
--        return &iObject;
--    }
--    Object *operator&() {
--        return &iObject;
--    }
--  private:                     // no copying or assigning
--    PdfObject(const PdfObject &);
--    void operator=(const PdfObject &);
--  public:
--    Object iObject;
--};
--
- // When copying the Resources of the selected page, all objects are copied
- // recusively top-down. Indirect objects however are not fetched during
- // copying, but get a new object number from pdfTeX and then will be
-@@ -212,18 +187,6 @@ static void delete_document(PdfDocument 
-     delete pdf_doc;
- }
- 
--// Replacement for
--//      Object *initDict(Dict *dict1){ initObj(objDict); dict = dict1; return this; }
--
--static void initDictFromDict(PdfObject & obj, Dict * dict)
--{
--    obj->initDict(xref);
--    for (int i = 0, l = dict->getLength(); i < l; i++) {
--        Object obj1;
--        obj->dictAdd(copyString(dict->getKey(i)), dict->getValNF(i, &obj1));
--    }
--}
--
- // --------------------------------------------------------------------
- 
- static int addEncoding(GfxFont * gfont)
-@@ -320,10 +283,10 @@ static void copyName(char *s)
- 
- static void copyDictEntry(Object * obj, int i)
- {
--    PdfObject obj1;
-+    Object obj1;
-     copyName(obj->dictGetKey(i));
-     pdf_puts(" ");
--    obj->dictGetValNF(i, &obj1);
-+    obj1 = obj->dictGetValNF(i);
-     copyObject(&obj1);
-     pdf_puts("\n");
- }
-@@ -376,17 +339,17 @@ static void copyStream(Stream * str)
- static void copyProcSet(Object * obj)
- {
-     int i, l;
--    PdfObject procset;
-+    Object procset;
-     if (!obj->isArray())
-         pdftex_fail("PDF inclusion: invalid ProcSet array type <%s>",
-                     obj->getTypeName());
-     pdf_puts("/ProcSet [ ");
-     for (i = 0, l = obj->arrayGetLength(); i < l; ++i) {
--        obj->arrayGetNF(i, &procset);
--        if (!procset->isName())
-+        procset = obj->arrayGetNF(i);
-+        if (!procset.isName())
-             pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>",
--                        procset->getTypeName());
--        copyName(procset->getName());
-+                        procset.getTypeName());
-+        copyName(const_cast<char*>(procset.getName()));
-         pdf_puts(" ");
-     }
-     pdf_puts("]\n");
-@@ -394,10 +357,29 @@ static void copyProcSet(Object * obj)
- 
- #define REPLACE_TYPE1C true
- 
-+static bool embeddableFont(Object * fontdesc)
-+{
-+    Object fontfile, ffsubtype;
-+
-+    if (!fontdesc->isDict())
-+        return false;
-+    fontfile = fontdesc->dictLookup("FontFile");
-+    if (fontfile.isStream())
-+        return true;
-+    if (REPLACE_TYPE1C) {
-+        fontfile = fontdesc->dictLookup("FontFile3");
-+        if (!fontfile.isStream())
-+            return false;
-+        ffsubtype = fontfile.streamGetDict()->lookup("Subtype");
-+        return ffsubtype.isName() && !strcmp(ffsubtype.getName(), "Type1C");
-+    }
-+    return false;
-+}
-+
- static void copyFont(char *tag, Object * fontRef)
- {
--    PdfObject fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
--        fontfile, ffsubtype, stemV;
-+    Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
-+        stemV;
-     GfxFont *gfont;
-     fd_entry *fd;
-     fm_entry *fontmap;
-@@ -413,33 +395,39 @@ static void copyFont(char *tag, Object *
-     }
-     // Only handle included Type1 (and Type1C) fonts; anything else will be copied.
-     // Type1C fonts are replaced by Type1 fonts, if REPLACE_TYPE1C is true.
--    if (!fixedinclusioncopyfont && fontRef->fetch(xref, &fontdict)->isDict()
--        && fontdict->dictLookup("Subtype", &subtype)->isName()
--        && !strcmp(subtype->getName(), "Type1")
--        && fontdict->dictLookup("BaseFont", &basefont)->isName()
--        && fontdict->dictLookupNF("FontDescriptor", &fontdescRef)->isRef()
--        && fontdescRef->fetch(xref, &fontdesc)->isDict()
--        && (fontdesc->dictLookup("FontFile", &fontfile)->isStream()
--            || (REPLACE_TYPE1C
--                && fontdesc->dictLookup("FontFile3", &fontfile)->isStream()
--                && fontfile->streamGetDict()->lookup("Subtype",
--                                                     &ffsubtype)->isName()
--                && !strcmp(ffsubtype->getName(), "Type1C")))
--        && (fontmap = lookup_fontmap(basefont->getName())) != NULL) {
-+    fontdict = fontRef->fetch(xref);
-+    fontdesc = Object(objNull);
-+    if (fontdict.isDict()) {
-+        subtype = fontdict.dictLookup("Subtype");
-+        basefont = fontdict.dictLookup("BaseFont");
-+        fontdescRef = fontdict.dictLookupNF("FontDescriptor");
-+        if (fontdescRef.isRef()) {
-+            fontdesc = fontdescRef.fetch(xref);
-+        }
-+    }
-+    if (!fixedinclusioncopyfont && fontdict.isDict()
-+        && subtype.isName()
-+        && !strcmp(subtype.getName(), "Type1")
-+        && basefont.isName()
-+        && fontdescRef.isRef()
-+        && fontdesc.isDict()
-+        && embeddableFont(&fontdesc)
-+        && (fontmap = lookup_fontmap(const_cast<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.
--        fontdesc->dictLookup("StemV", &stemV);
--        fd = epdf_create_fontdescriptor(fontmap, zround(stemV->getNum()));
--        if (fontdesc->dictLookup("CharSet", &charset) &&
--            charset->isString() && is_subsetable(fontmap))
--            epdf_mark_glyphs(fd, charset->getString()->getCString());
-+        stemV = fontdesc.dictLookup("StemV");
-+        fd = epdf_create_fontdescriptor(fontmap, zround(stemV.getNum()));
-+        charset = fontdesc.dictLookup("CharSet");
-+        if (!charset.isNull() &&
-+            charset.isString() && is_subsetable(fontmap))
-+            epdf_mark_glyphs(fd, const_cast<char*>(charset.getString()->getCString()));
-         else
-             embed_whole_font(fd);
--        addFontDesc(fontdescRef->getRef(), fd);
-+        addFontDesc(fontdescRef.getRef(), fd);
-         copyName(tag);
-         gfont = GfxFont::makeFont(xref, tag, fontRef->getRef(),
--                                  fontdict->getDict());
-+                                  fontdict.getDict());
-         pdf_printf(" %d 0 R ", addFont(fontRef->getRef(), fd,
-                                        addEncoding(gfont)));
-     } else {
-@@ -451,24 +439,24 @@ static void copyFont(char *tag, Object *
- 
- static void copyFontResources(Object * obj)
- {
--    PdfObject fontRef;
-+    Object fontRef;
-     int i, l;
-     if (!obj->isDict())
-         pdftex_fail("PDF inclusion: invalid font resources dict type <%s>",
-                     obj->getTypeName());
-     pdf_puts("/Font << ");
-     for (i = 0, l = obj->dictGetLength(); i < l; ++i) {
--        obj->dictGetValNF(i, &fontRef);
--        if (fontRef->isRef())
-+        fontRef = obj->dictGetValNF(i);
-+        if (fontRef.isRef())
-             copyFont(obj->dictGetKey(i), &fontRef);
--        else if (fontRef->isDict()) {   // some programs generate pdf with embedded font object
-+        else if (fontRef.isDict()) {   // some programs generate pdf with embedded font object
-             copyName(obj->dictGetKey(i));
-             pdf_puts(" ");
-             copyObject(&fontRef);
-         }
-         else
-             pdftex_fail("PDF inclusion: invalid font in reference type <%s>",
--                        fontRef->getTypeName());
-+                        fontRef.getTypeName());
-     }
-     pdf_puts(">>\n");
- }
-@@ -557,7 +545,7 @@ static char *convertNumToPDF(double n)
- 
- static void copyObject(Object * obj)
- {
--    PdfObject obj1;
-+    Object obj1;
-     int i, l, c;
-     Ref ref;
-     char *p;
-@@ -571,7 +559,7 @@ static void copyObject(Object * obj)
-     } else if (obj->isNum()) {
-         pdf_printf("%s", convertNumToPDF(obj->getNum()));
-     } else if (obj->isString()) {
--        s = obj->getString();
-+        s = const_cast<GooString*>(obj->getString());
-         p = s->getCString();
-         l = s->getLength();
-         if (strlen(p) == (unsigned int) l) {
-@@ -595,14 +583,14 @@ static void copyObject(Object * obj)
-             pdf_puts(">");
-         }
-     } else if (obj->isName()) {
--        copyName(obj->getName());
-+        copyName(const_cast<char*>(obj->getName()));
-     } else if (obj->isNull()) {
-         pdf_puts("null");
-     } else if (obj->isArray()) {
-         pdf_puts("[");
-         for (i = 0, l = obj->arrayGetLength(); i < l; ++i) {
--            obj->arrayGetNF(i, &obj1);
--            if (!obj1->isName())
-+            obj1 = obj->arrayGetNF(i);
-+            if (!obj1.isName())
-                 pdf_puts(" ");
-             copyObject(&obj1);
-         }
-@@ -612,9 +600,8 @@ static void copyObject(Object * obj)
-         copyDict(obj);
-         pdf_puts(">>");
-     } else if (obj->isStream()) {
--        initDictFromDict(obj1, obj->streamGetDict());
-         pdf_puts("<<\n");
--        copyDict(&obj1);
-+        copyDict(obj->getStream()->getDictObject());
-         pdf_puts(">>\n");
-         pdf_puts("stream\n");
-         copyStream(obj->getStream()->getUndecodedStream());
-@@ -638,9 +625,8 @@ static void writeRefs()
-     InObj *r;
-     for (r = inObjList; r != 0; r = r->next) {
-         if (!r->written) {
--            Object obj1;
-             r->written = 1;
--            xref->fetch(r->ref.num, r->ref.gen, &obj1);
-+            Object obj1 = xref->fetch(r->ref.num, r->ref.gen);
-             if (r->type == objFont) {
-                 assert(!obj1.isStream());
-                 pdfbeginobj(r->num, 2);         // \pdfobjcompresslevel = 2 is for this
-@@ -656,7 +642,6 @@ static void writeRefs()
-                 pdf_puts("\n");
-                 pdfendobj();
-             }
--            obj1.free();
-         }
-     }
- }
-@@ -839,8 +824,8 @@ void write_epdf(void)
-     Page *page;
-     Ref *pageRef;
-     Dict *pageDict;
--    PdfObject contents, obj1, obj2, pageObj, dictObj;
--    PdfObject groupDict;
-+    Object contents, obj1, obj2, pageObj, dictObj;
-+    Object groupDict;
-     bool writeSepGroup = false;
-     Object info;
-     char *key;
-@@ -867,8 +852,8 @@ void write_epdf(void)
-     encodingList = 0;
-     page = pdf_doc->doc->getCatalog()->getPage(epdf_selected_page);
-     pageRef = pdf_doc->doc->getCatalog()->getPageRef(epdf_selected_page);
--    xref->fetch(pageRef->num, pageRef->gen, &pageObj);
--    pageDict = pageObj->getDict();
-+    pageObj = xref->fetch(pageRef->num, pageRef->gen);
-+    pageDict = pageObj.getDict();
-     rotate = page->getRotate();
-     PDFRectangle *pagebox;
-     // write the Page header
-@@ -886,7 +871,7 @@ void write_epdf(void)
-         pdf_printf("/%s.PageNumber %i\n", pdfkeyprefix, (int) epdf_selected_page);
-     }
-     if ((suppress_ptex_info & MASK_SUPPRESS_PTEX_INFODICT) == 0) {
--        pdf_doc->doc->getDocInfoNF(&info);
-+        info = pdf_doc->doc->getDocInfoNF();
-         if (info.isRef()) {
-             // the info dict must be indirect (PDF Ref p. 61)
-             pdf_printf("/%s.InfoDict ", pdfkeyprefix);
-@@ -942,14 +927,14 @@ void write_epdf(void)
-     pdf_puts(stripzeros(s));
- 
-     // Metadata validity check (as a stream it must be indirect)
--    pageDict->lookupNF("Metadata", &dictObj);
--    if (!dictObj->isNull() && !dictObj->isRef())
-+    dictObj = pageDict->lookupNF("Metadata");
-+    if (!dictObj.isNull() && !dictObj.isRef())
-         pdftex_warn("PDF inclusion: /Metadata must be indirect object");
- 
-     // copy selected items in Page dictionary except Resources & Group
-     for (i = 0; pageDictKeys[i] != NULL; i++) {
--        pageDict->lookupNF(pageDictKeys[i], &dictObj);
--        if (!dictObj->isNull()) {
-+        dictObj = pageDict->lookupNF(pageDictKeys[i]);
-+        if (!dictObj.isNull()) {
-             pdf_newline();
-             pdf_printf("/%s ", pageDictKeys[i]);
-             copyObject(&dictObj); // preserves indirection
-@@ -957,8 +942,8 @@ void write_epdf(void)
-     } 
- 
-     // handle page group
--    pageDict->lookupNF("Group", &dictObj);
--    if (!dictObj->isNull()) {
-+    dictObj = pageDict->lookupNF("Group");
-+    if (!dictObj.isNull()) {
-         if (pdfpagegroupval == 0) { 
-             // another pdf with page group was included earlier on the
-             // same page; copy the Group entry as is.  See manual for
-@@ -972,11 +957,11 @@ void write_epdf(void)
-             copyObject(&dictObj);
-         } else {
-             // write Group dict as a separate object, since the Page dict also refers to it
--            pageDict->lookup("Group", &dictObj);
--            if (!dictObj->isDict())
-+            dictObj = pageDict->lookup("Group");
-+            if (!dictObj.isDict())
-                 pdftex_fail("PDF inclusion: /Group dict missing");
-             writeSepGroup = true;
--            initDictFromDict(groupDict, page->getGroup());
-+            groupDict = Object(page->getGroup());
-             pdf_printf("/Group %ld 0 R\n", (long)pdfpagegroupval);
-         }
-     }
-@@ -989,14 +974,14 @@ void write_epdf(void)
-         pdftex_warn
-             ("PDF inclusion: /Resources missing. 'This practice is not recommended' (PDF Ref)");
-     } else {
--        initDictFromDict(obj1, page->getResourceDict());
-+        Object *obj1 = page->getResourceDictObject();
-         if (!obj1->isDict())
-             pdftex_fail("PDF inclusion: invalid resources dict type <%s>",
-                         obj1->getTypeName());
-         pdf_newline();
-         pdf_puts("/Resources <<\n");
-         for (i = 0, l = obj1->dictGetLength(); i < l; ++i) {
--            obj1->dictGetVal(i, &obj2);
-+            obj2 = obj1->dictGetVal(i);
-             key = obj1->dictGetKey(i);
-             if (strcmp("Font", key) == 0)
-                 copyFontResources(&obj2);
-@@ -1009,8 +994,8 @@ void write_epdf(void)
-     }
- 
-     // write the page contents
--    page->getContents(&contents);
--    if (contents->isStream()) {
-+    contents = page->getContents();
-+    if (contents.isStream()) {
- 
-         // Variant A: get stream and recompress under control
-         // of \pdfcompresslevel
-@@ -1021,36 +1006,35 @@ void write_epdf(void)
- 
-         // Variant B: copy stream without recompressing
-         //
--        contents->streamGetDict()->lookup("F", &obj1);
--        if (!obj1->isNull()) {
-+        obj1 = contents.streamGetDict()->lookup("F");
-+        if (!obj1.isNull()) {
-             pdftex_fail("PDF inclusion: Unsupported external stream");
-         }
--        contents->streamGetDict()->lookup("Length", &obj1);
--        assert(!obj1->isNull());
-+        obj1 = contents.streamGetDict()->lookup("Length");
-+        assert(!obj1.isNull());
-         pdf_puts("/Length ");
-         copyObject(&obj1);
-         pdf_puts("\n");
--        contents->streamGetDict()->lookup("Filter", &obj1);
--        if (!obj1->isNull()) {
-+        obj1 = contents.streamGetDict()->lookup("Filter");
-+        if (!obj1.isNull()) {
-             pdf_puts("/Filter ");
-             copyObject(&obj1);
-             pdf_puts("\n");
--            contents->streamGetDict()->lookup("DecodeParms", &obj1);
--            if (!obj1->isNull()) {
-+            obj1 = contents.streamGetDict()->lookup("DecodeParms");
-+            if (!obj1.isNull()) {
-                 pdf_puts("/DecodeParms ");
-                 copyObject(&obj1);
-                 pdf_puts("\n");
-             }
-         }
-         pdf_puts(">>\nstream\n");
--        copyStream(contents->getStream()->getUndecodedStream());
-+        copyStream(contents.getStream()->getUndecodedStream());
-         pdfendstream();
--    } else if (contents->isArray()) {
-+    } else if (contents.isArray()) {
-         pdfbeginstream();
--        for (i = 0, l = contents->arrayGetLength(); i < l; ++i) {
--            Object contentsobj;
--            copyStream((contents->arrayGet(i, &contentsobj))->getStream());
--            contentsobj.free();
-+        for (i = 0, l = contents.arrayGetLength(); i < l; ++i) {
-+            Object contentsobj = contents.arrayGet(i);
-+            copyStream(contentsobj.getStream());
-             if (i < l - 1)
-                 pdf_newline();  // add a newline after each stream except the last
-         }
diff --git a/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc b/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc
new file mode 100644
index 00000000000..3b026f7c4c6
--- /dev/null
+++ b/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc
@@ -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;
diff --git a/print/web2c/patches/patch-pdftexdir_pdftosrc.cc b/print/web2c/patches/patch-pdftexdir_pdftosrc.cc
deleted file mode 100644
index 40c099e33b1..00000000000
--- a/print/web2c/patches/patch-pdftexdir_pdftosrc.cc
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-pdftexdir_pdftosrc.cc,v 1.4 2018/04/29 20:58:29 ryoon Exp $
-
-Allow recent poppler - from ArchLinux
-
---- pdftexdir/pdftosrc.cc.orig	2016-11-25 18:09:21.000000000 +0000
-+++ pdftexdir/pdftosrc.cc
-@@ -86,31 +86,29 @@ int main(int argc, char *argv[])
-             objgen = atoi(argv[3]);
-     }
-     xref = doc->getXRef();
--    catalogDict.initNull();
--    xref->getCatalog(&catalogDict);
-+    catalogDict = xref->getCatalog();
-     if (!catalogDict.isDict("Catalog")) {
-         fprintf(stderr, "No Catalog found\n");
-         exit(1);
-     }
--    srcStream.initNull();
-+    srcStream = Object(objNull);
-     if (objnum == 0) {
--        catalogDict.dictLookup("SourceObject", &srcStream);
-+        srcStream = catalogDict.dictLookup("SourceObject");
-         static char const_SourceFile[] = "SourceFile";
-         if (!srcStream.isStream(const_SourceFile)) {
-             fprintf(stderr, "No SourceObject found\n");
-             exit(1);
-         }
--        srcName.initNull();
--        srcStream.getStream()->getDict()->lookup("SourceName", &srcName);
-+        srcName = srcStream.getStream()->getDict()->lookup("SourceName");
-         if (!srcName.isString()) {
-             fprintf(stderr, "No SourceName found\n");
-             exit(1);
-         }
--        outname = srcName.getString()->getCString();
-+        outname = const_cast<char*>(srcName.getString()->getCString());
-         // We cannot free srcName, as objname shares its string.
-         // srcName.free();
-     } else if (objnum > 0) {
--        xref->fetch(objnum, objgen, &srcStream);
-+        srcStream = xref->fetch(objnum, objgen);
-         if (!srcStream.isStream()) {
-             fprintf(stderr, "Not a Stream object\n");
-             exit(1);
-@@ -159,29 +157,26 @@ int main(int argc, char *argv[])
-                 int localOffset = 0;
-                 Guint firstOffset;
- 
--                assert(xref->fetch(e->offset, 0, &objStr)->isStream());
--                nObjects = objStr.streamGetDict()->lookup("N", &obj1)->getInt();
--                obj1.free();
--                first = objStr.streamGetDict()->lookup("First", &obj1)->getInt();
--                obj1.free();
-+                objStr = xref->fetch(e->offset, 0);
-+                assert(objStr.isStream());
-+                obj1 = objStr.streamGetDict()->lookup("N");
-+                nObjects = obj1.getInt();
-+                obj1 = objStr.streamGetDict()->lookup("First");
-+                first = obj1.getInt();
-                 firstOffset = objStr.getStream()->getBaseStream()->getStart() + first;
- 
-                 // parse the header: object numbers and offsets
-                 objStr.streamReset();
--                obj1.initNull();
--                str = new EmbedStream(objStr.getStream(), &obj1, gTrue, first);
-+                str = new EmbedStream(objStr.getStream(), Object(objNull), gTrue, first);
-                 parser = new Parser(xref, new Lexer(xref, str), gFalse);
-                 for (n = 0; n < nObjects; ++n) {
--                    parser->getObj(&obj1);
--                    parser->getObj(&obj2);
-+                    obj1 = parser->getObj();
-+                    obj2 = parser->getObj();
-                     if (n == e->gen)
-                         localOffset = obj2.getInt();
--                    obj1.free();
--                    obj2.free();
-                 }
-                 while (str->getChar() != EOF) ;
-                 delete parser;
--                objStr.free();
- 
-                 fprintf(outfile, "%.10lu 00000 n\n",
-                         (long unsigned)(firstOffset + localOffset));
-@@ -192,7 +187,6 @@ int main(int argc, char *argv[])
-         s->reset();
-         while ((c = s->getChar()) != EOF)
-             fputc(c, outfile);
--        srcStream.free();
-     }
-     if (objnum == 0)
-         fprintf(stderr, "Source file extracted to %s\n", outname);
-@@ -201,7 +195,6 @@ int main(int argc, char *argv[])
-     else
-         fprintf(stderr, "Cross-reference table extracted to %s\n", outname);
-     fclose(outfile);
--    catalogDict.free();
-     delete doc;
-     delete globalParams;
- }