CVS commit: pkgsrc/print/web2c

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Sep  9 17:06:51 UTC 2017

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

Log Message:
Switch to internal poppler due to reports of crashes from the last change.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/print/web2c/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/print/web2c/distinfo
cvs rdiff -u -r1.1 -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.63 pkgsrc/print/web2c/Makefile:1.64
--- pkgsrc/print/web2c/Makefile:1.63    Wed Sep  6 16:49:47 2017
+++ pkgsrc/print/web2c/Makefile Sat Sep  9 17:06:51 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2017/09/06 16:49:47 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2017/09/09 17:06:51 tnn Exp $
 
 DISTNAME=      texlive-20170524-source
 PKGNAME=       web2c-2017
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    print
 MASTER_SITES=  ftp://tug.org/historic/systems/texlive/2017/
 EXTRACT_SUFX=  .tar.xz
@@ -15,6 +15,8 @@ DEPENDS+=     kpathsea>=6.2.1:../../print/kp
 DEPENDS+=      ptexenc>=1.3.4:../../print/ptexenc
 
 EXTRACT_ELEMENTS=      ${DISTNAME}/build-aux \
+                       ${DISTNAME}/libs/poppler \
+                       ${DISTNAME}/libs/xpdf \
                        ${DISTNAME}/texk/web2c
 
 GNU_CONFIGURE= yes
@@ -45,15 +47,17 @@ CONFIGURE_ARGS+=    --with-system-mpfr \
                        --with-mpfr-includes=${BUILDLINK_PREFIX.mpfr}/include \
                        --with-mpfr-libdir=${BUILDLINK_PREFIX.mpfr}/lib
 CONFIGURE_ARGS+=       --with-system-pixman
-CONFIGURE_ARGS+=       --with-system-poppler
+#CONFIGURE_ARGS+=      --with-system-poppler
+#CONFIGURE_ARGS+=      --with-system-xpdf
 CONFIGURE_ARGS+=       --with-system-ptexenc
-CONFIGURE_ARGS+=       --with-system-xpdf
 CONFIGURE_ARGS+=       --with-system-zlib \
                        --with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include \
                        --with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
 LIBTOOL_OVERRIDE=      ../*/libtool */libtool
 
-CONFIGURE_DIRS=        ${WRKDIR}/${DISTNAME}/texk/web2c
+CONFIGURE_DIRS=                ${WRKDIR}/${DISTNAME}/texk/web2c
+CONFIGURE_DIRS+=       ${WRKDIR}/${DISTNAME}/libs/poppler
+CONFIGURE_DIRS+=       ${WRKDIR}/${DISTNAME}/libs/xpdf
 INSTALL_DIRS=  ${WRKDIR}/${DISTNAME}/texk/web2c
 
 .include "../../devel/zlib/buildlink3.mk"
@@ -61,8 +65,8 @@ INSTALL_DIRS= ${WRKDIR}/${DISTNAME}/texk
 .include "../../graphics/png/buildlink3.mk"
 .include "../../math/mpfr/buildlink3.mk"
 .include "../../print/kpathsea/buildlink3.mk"
-.include "../../print/poppler/buildlink3.mk"
-.include "../../print/poppler-includes/buildlink3.mk"
+#.include "../../print/poppler/buildlink3.mk"
+#.include "../../print/poppler-includes/buildlink3.mk"
 .include "../../print/ptexenc/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/web2c/distinfo
diff -u pkgsrc/print/web2c/distinfo:1.22 pkgsrc/print/web2c/distinfo:1.23
--- pkgsrc/print/web2c/distinfo:1.22    Thu Sep  7 14:15:52 2017
+++ pkgsrc/print/web2c/distinfo Sat Sep  9 17:06:51 2017
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.22 2017/09/07 14:15:52 tnn Exp $
+$NetBSD: distinfo,v 1.23 2017/09/09 17:06:51 tnn 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 (patch-am) = b7b81b1161a2117e756b25b80f9a676575267bdd
-SHA1 (patch-pdftexdir_pdftoepdf.cc) = a9e138d9c286152150550af9f58279310039b114
-SHA1 (patch-pdftexdir_pdftosrc.cc) = 8eb487c63a6e31d0584f36ba411d97f7dfebaa82