From owner-svn-ports-head@freebsd.org Tue Dec 11 08:25:48 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B6F71326360; Tue, 11 Dec 2018 08:25:48 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3BA248AA18; Tue, 11 Dec 2018 08:25:48 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0EB0B2CF4C; Tue, 11 Dec 2018 08:25:48 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBB8PloF019214; Tue, 11 Dec 2018 08:25:47 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBB8PlRR019213; Tue, 11 Dec 2018 08:25:47 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201812110825.wBB8PlRR019213@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Tue, 11 Dec 2018 08:25:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487226 - in head/print: tex-luatex tex-xetex X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/print: tex-luatex tex-xetex X-SVN-Commit-Revision: 487226 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3BA248AA18 X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.977,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2018 08:25:48 -0000 Author: tcberner Date: Tue Dec 11 08:25:47 2018 New Revision: 487226 URL: https://svnweb.freebsd.org/changeset/ports/487226 Log: print/tex-xetex, print/tex-luatex: prepare for poppler upgrade There are many api changes inside poppler, and our TeX distribution is ancient. For now, switch these to use their bundled version of poppler. PR: 233452 Modified: head/print/tex-luatex/Makefile head/print/tex-xetex/Makefile Modified: head/print/tex-luatex/Makefile ============================================================================== --- head/print/tex-luatex/Makefile Tue Dec 11 07:56:33 2018 (r487225) +++ head/print/tex-luatex/Makefile Tue Dec 11 08:25:47 2018 (r487226) @@ -2,7 +2,7 @@ PORTNAME= luatex PORTVERSION= 0.80.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= print MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/ PKGNAMEPREFIX= tex- @@ -16,7 +16,6 @@ MAINTAINER= hrs@FreeBSD.org COMMENT= Extended version of pdfTeX using Lua LIB_DEPENDS= libpng.so:graphics/png \ - libpoppler.so:graphics/poppler \ libmpfr.so:math/mpfr \ libzzip.so:devel/zziplib @@ -31,6 +30,7 @@ EXTRACT_FILES= build-aux \ libs/xpdf \ libs/lua52 \ libs/luajit \ + libs/poppler \ texk/web2c EXTRACT_AFTER_ARGS_TEXMF=| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \ --strip-components 1 --no-same-permission --no-same-owner \ @@ -66,7 +66,7 @@ EXCLUDE_ENGINES=aleph etex pdftex mf mf-nowin \ CONFIGURE_ARGS= ${EXCLUDE_ENGINES:S/^/--disable-/} \ --enable-luatex \ --enable-luajittex \ - --with-system-poppler \ + --without-system-poppler \ --with-system-zlib \ --with-system-zziplib .for L in cairo gmp kpathsea libpng mpfr pixman ptexenc @@ -84,7 +84,7 @@ post-extract: ${LN} -s -f ${LOCALBASE}/${TEXMFDISTDIR}/web2c kpathsea pre-configure: - for D in libs/xpdf; do \ + for D in libs/xpdf libs/poppler; do \ cd ${WRKDIR}/${DISTNAME}/$$D && \ ${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \ ${CONFIGURE_ARGS}; \ Modified: head/print/tex-xetex/Makefile ============================================================================== --- head/print/tex-xetex/Makefile Tue Dec 11 07:56:33 2018 (r487225) +++ head/print/tex-xetex/Makefile Tue Dec 11 08:25:47 2018 (r487226) @@ -2,7 +2,7 @@ PORTNAME= xetex PORTVERSION= 0.99992 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= print MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/ PKGNAMEPREFIX= tex- @@ -21,7 +21,6 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libpng.so:graphics/png \ - libpoppler.so:graphics/poppler \ libTECkit.so:textproc/teckit USES= compiler:c++11-lib pkgconfig tar:xz @@ -32,6 +31,7 @@ USE_GNOME= cairo TEXHASHDIRS= ${TEXMFDISTDIR} ${TEXMFVARDIR} EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} EXTRACT_FILES= build-aux \ + libs/poppler \ libs/xpdf \ texk/web2c EXTRACT_AFTER_ARGS_TEXMF= \ @@ -66,7 +66,7 @@ CONFIGURE_ARGS= ${EXCLUDE_ENGINES:S/^/--disable-/} \ --with-graphite2-includes=${LOCALBASE}/include/graphite2 \ --with-graphite2-libdir=${LOCALBASE}/lib \ --with-system-harfbuzz \ - --with-system-poppler \ + --without-system-poppler \ --with-system-teckit \ --with-teckit-includes=${LOCALBASE}/include/teckit \ --with-teckit-libdir=${LOCALBASE}/lib \ @@ -82,7 +82,7 @@ MAKE_JOBS_UNSAFE= yes TEX_FORMATS= xetex pre-configure: - for D in libs/xpdf; do \ + for D in libs/xpdf libs/poppler; do \ cd ${WRKDIR}/${DISTNAME}/$$D && \ ${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \ ${CONFIGURE_ARGS}; \