summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2012-07-13 14:13:59 +0000
committerminskim <minskim@pkgsrc.org>2012-07-13 14:13:59 +0000
commitd8ea864e5295246dec453199ac03ce201dc6934a (patch)
tree3c59fda91394788de11b63219456a1528cacfd93
parent9a48484e0e4a336383328febbd2509aeb35ff5ba (diff)
downloadpkgsrc-d8ea864e5295246dec453199ac03ce201dc6934a.tar.gz
Update xetex to 0.9998.
Patches provided by Mathias Drochner and modified by me. This fixes PR 46698. Changes: * xetex.ch: XeTeX uses 256 math font families. * XeTeX_ext.c, pdfimage.cpp, am/xetex.am: Always use poppler.
-rw-r--r--print/xetex/Makefile15
-rw-r--r--print/xetex/distinfo9
-rw-r--r--print/xetex/patches/patch-texk_web2c_xetexdir_xetex.ch14
3 files changed, 13 insertions, 25 deletions
diff --git a/print/xetex/Makefile b/print/xetex/Makefile
index bd915c66b9d..a4a7807170c 100644
--- a/print/xetex/Makefile
+++ b/print/xetex/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2012/07/09 01:51:34 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2012/07/13 14:13:59 minskim Exp $
-DISTNAME= texlive-20110705-source
-PKGNAME= xetex-0.9997.5
-PKGREVISION= 3
+DISTNAME= texlive-20120701-source
+PKGNAME= xetex-0.9998
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
+MASTER_SITES= ftp://tug.org/historic/systems/texlive/2012/
EXTRACT_SUFX= .tar.xz
MAINTAINER= minskim@NetBSD.org
@@ -29,9 +28,11 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c
CONFIGURE_ARGS+= --disable-aleph --disable-etex --disable-pdftex \
--disable-luatex --disable-mf --disable-mf-nowin \
- --disable-mp --disable-ptex --disable-eptex \
+ --disable-mp \
+ --disable-ptex --disable-eptex --disable-uptex --disable-euptex \
--disable-web-progs \
--enable-web2c --enable-xetex
+CONFIGURE_ARGS+= --with-system-poppler
CONFIGURE_ARGS+= \
--with-fontconfig-includes=${BUILDLINK_PREFIX.fontconfig}/include \
--with-fontconfig-libdir=${BUILDLINK_PREFIX.fontconfig}/lib
@@ -78,6 +79,8 @@ CONFIGURE_ENV+= kpse_cv_have_Carbon=no
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../print/kpathsea/buildlink3.mk"
+.include "../../print/poppler/buildlink3.mk"
+.include "../../print/poppler-includes/buildlink3.mk"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xetex ${DESTDIR}${PREFIX}/bin
diff --git a/print/xetex/distinfo b/print/xetex/distinfo
index a3969b26402..bbd1ee208bf 100644
--- a/print/xetex/distinfo
+++ b/print/xetex/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2012/07/09 01:51:34 minskim Exp $
+$NetBSD: distinfo,v 1.9 2012/07/13 14:13:59 minskim Exp $
-SHA1 (texlive-20110705-source.tar.xz) = 7a47cfe847801c86c98da8ade181baf97339f6e4
-RMD160 (texlive-20110705-source.tar.xz) = fbcad494cc4717a0238ab2624f259270fce9332b
-Size (texlive-20110705-source.tar.xz) = 131207904 bytes
-SHA1 (patch-texk_web2c_xetexdir_xetex.ch) = 7165868d56f2e23f60f3f80fbb69769784f61f53
+SHA1 (texlive-20120701-source.tar.xz) = e41ef31eba27891f3434e01638d3559cc6958016
+RMD160 (texlive-20120701-source.tar.xz) = df09b657919a3f203309645028803098f52bbac9
+Size (texlive-20120701-source.tar.xz) = 131904044 bytes
SHA1 (patch-xetexdir_XeTeX__ext.c) = 0776f085c3d37c20de42e889e2a996d9d76ce1af
diff --git a/print/xetex/patches/patch-texk_web2c_xetexdir_xetex.ch b/print/xetex/patches/patch-texk_web2c_xetexdir_xetex.ch
deleted file mode 100644
index 3c33c7024b6..00000000000
--- a/print/xetex/patches/patch-texk_web2c_xetexdir_xetex.ch
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-texk_web2c_xetexdir_xetex.ch,v 1.2 2012/03/22 09:05:46 tron Exp $
-
-Work with zlib 1.2.6. From http://trac.macports.org/changeset/89696
-
---- xetexdir/xetex.ch.orig 2012-03-12 03:24:10.533956184 +0000
-+++ xetexdir/xetex.ch
-@@ -6944,7 +6944,6 @@ if (x<>69069)or feof(fmt_file) then goto
- @y
- undump_int(x);
- if (x<>69069) then goto bad_fmt;
--if not w_eof(fmt_file) then goto bad_fmt
- @z
-
- @x