Fri Jul 13 14:13:59 2012 UTC ()
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.


(minskim)
diff -r1.10 -r1.11 pkgsrc/print/xetex/Makefile
diff -r1.8 -r1.9 pkgsrc/print/xetex/distinfo
diff -r1.2 -r0 pkgsrc/print/xetex/patches/patch-texk_web2c_xetexdir_xetex.ch
cvs diff -r1.10 -r1.11 pkgsrc/print/xetex/Makefile (expand / switch to unified diff)

--- pkgsrc/print/xetex/Makefile 2012/07/09 01:51:34 1.10
+++ pkgsrc/print/xetex/Makefile 2012/07/13 14:13:59 1.11
@@ -1,47 +1,48 @@ @@ -1,47 +1,48 @@
1# $NetBSD: Makefile,v 1.10 2012/07/09 01:51:34 minskim Exp $ 1# $NetBSD: Makefile,v 1.11 2012/07/13 14:13:59 minskim Exp $
2 2
3DISTNAME= texlive-20110705-source 3DISTNAME= texlive-20120701-source
4PKGNAME= xetex-0.9997.5 4PKGNAME= xetex-0.9998
5PKGREVISION= 3 
6CATEGORIES= print 5CATEGORIES= print
7MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/} 6MASTER_SITES= ftp://tug.org/historic/systems/texlive/2012/
8EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
9 8
10MAINTAINER= minskim@NetBSD.org 9MAINTAINER= minskim@NetBSD.org
11HOMEPAGE= http://www.tug.org/xetex/ 10HOMEPAGE= http://www.tug.org/xetex/
12COMMENT= TeX system with Unicode and modern font technologies 11COMMENT= TeX system with Unicode and modern font technologies
13 12
14CONFLICTS+= web2c<=7.5.7 13CONFLICTS+= web2c<=7.5.7
15DEPENDS+= xdvipdfmx-[0-9]*:../../print/xdvipdfmx 14DEPENDS+= xdvipdfmx-[0-9]*:../../print/xdvipdfmx
16 15
17EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \ 16EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \
18 ${DISTNAME}/libs/graphite ${DISTNAME}/libs/icu \ 17 ${DISTNAME}/libs/graphite ${DISTNAME}/libs/icu \
19 ${DISTNAME}/libs/xpdf ${DISTNAME}/libs/obsdcompat \ 18 ${DISTNAME}/libs/xpdf ${DISTNAME}/libs/obsdcompat \
20 ${DISTNAME}/texk/web2c 19 ${DISTNAME}/texk/web2c
21 20
22PKG_DESTDIR_SUPPORT= user-destdir 21PKG_DESTDIR_SUPPORT= user-destdir
23 22
24GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
25USE_LANGUAGES= c c++ 24USE_LANGUAGES= c c++
26USE_LIBTOOL= yes 25USE_LIBTOOL= yes
27USE_TOOLS+= gmake lex perl pkg-config yacc 26USE_TOOLS+= gmake lex perl pkg-config yacc
28WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c 27WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c
29 28
30CONFIGURE_ARGS+= --disable-aleph --disable-etex --disable-pdftex \ 29CONFIGURE_ARGS+= --disable-aleph --disable-etex --disable-pdftex \
31 --disable-luatex --disable-mf --disable-mf-nowin \ 30 --disable-luatex --disable-mf --disable-mf-nowin \
32 --disable-mp --disable-ptex --disable-eptex \ 31 --disable-mp \
 32 --disable-ptex --disable-eptex --disable-uptex --disable-euptex \
33 --disable-web-progs \ 33 --disable-web-progs \
34 --enable-web2c --enable-xetex 34 --enable-web2c --enable-xetex
 35CONFIGURE_ARGS+= --with-system-poppler
35CONFIGURE_ARGS+= \ 36CONFIGURE_ARGS+= \
36 --with-fontconfig-includes=${BUILDLINK_PREFIX.fontconfig}/include \ 37 --with-fontconfig-includes=${BUILDLINK_PREFIX.fontconfig}/include \
37 --with-fontconfig-libdir=${BUILDLINK_PREFIX.fontconfig}/lib 38 --with-fontconfig-libdir=${BUILDLINK_PREFIX.fontconfig}/lib
38CONFIGURE_ARGS+= --with-system-kpathsea \ 39CONFIGURE_ARGS+= --with-system-kpathsea \
39 --with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \ 40 --with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
40 --with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib 41 --with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib
41CONFIGURE_ARGS+= --with-system-zlib \ 42CONFIGURE_ARGS+= --with-system-zlib \
42 --with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include \ 43 --with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include \
43 --with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib 44 --with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
44CONFIGURE_ARGS+= --with-system-libpng \ 45CONFIGURE_ARGS+= --with-system-libpng \
45 --with-libpng-includes=${BUILDLINK_PREFIX.libpng}/include \ 46 --with-libpng-includes=${BUILDLINK_PREFIX.libpng}/include \
46 --with-libpng-libdir=${BUILDLINK_PREFIX.libpng}/lib 47 --with-libpng-libdir=${BUILDLINK_PREFIX.libpng}/lib
47CONFIGURE_ARGS+= --with-system-freetype2 48CONFIGURE_ARGS+= --with-system-freetype2
@@ -68,18 +69,20 @@ INSTALLATION_DIRS+= bin @@ -68,18 +69,20 @@ INSTALLATION_DIRS+= bin
68.include "../../mk/bsd.prefs.mk" 69.include "../../mk/bsd.prefs.mk"
69 70
70# ATSUI is deprecated in Mac OS X Snow Leopard 71# ATSUI is deprecated in Mac OS X Snow Leopard
71.if !empty(MACHINE_PLATFORM:MDarwin-1[0-9]*) 72.if !empty(MACHINE_PLATFORM:MDarwin-1[0-9]*)
72CONFIGURE_ENV+= kpse_cv_have_Carbon=no 73CONFIGURE_ENV+= kpse_cv_have_Carbon=no
73.endif 74.endif
74 75
75.include "../../converters/TECkit/buildlink3.mk" 76.include "../../converters/TECkit/buildlink3.mk"
76.include "../../devel/zlib/buildlink3.mk" 77.include "../../devel/zlib/buildlink3.mk"
77.include "../../fonts/fontconfig/buildlink3.mk" 78.include "../../fonts/fontconfig/buildlink3.mk"
78.include "../../graphics/freetype2/buildlink3.mk" 79.include "../../graphics/freetype2/buildlink3.mk"
79.include "../../graphics/png/buildlink3.mk" 80.include "../../graphics/png/buildlink3.mk"
80.include "../../print/kpathsea/buildlink3.mk" 81.include "../../print/kpathsea/buildlink3.mk"
 82.include "../../print/poppler/buildlink3.mk"
 83.include "../../print/poppler-includes/buildlink3.mk"
81 84
82do-install: 85do-install:
83 ${INSTALL_PROGRAM} ${WRKSRC}/xetex ${DESTDIR}${PREFIX}/bin 86 ${INSTALL_PROGRAM} ${WRKSRC}/xetex ${DESTDIR}${PREFIX}/bin
84 87
85.include "../../mk/bsd.pkg.mk" 88.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/print/xetex/distinfo (expand / switch to unified diff)

--- pkgsrc/print/xetex/distinfo 2012/07/09 01:51:34 1.8
+++ pkgsrc/print/xetex/distinfo 2012/07/13 14:13:59 1.9
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.8 2012/07/09 01:51:34 minskim Exp $ 1$NetBSD: distinfo,v 1.9 2012/07/13 14:13:59 minskim Exp $
2 2
3SHA1 (texlive-20110705-source.tar.xz) = 7a47cfe847801c86c98da8ade181baf97339f6e4 3SHA1 (texlive-20120701-source.tar.xz) = e41ef31eba27891f3434e01638d3559cc6958016
4RMD160 (texlive-20110705-source.tar.xz) = fbcad494cc4717a0238ab2624f259270fce9332b 4RMD160 (texlive-20120701-source.tar.xz) = df09b657919a3f203309645028803098f52bbac9
5Size (texlive-20110705-source.tar.xz) = 131207904 bytes 5Size (texlive-20120701-source.tar.xz) = 131904044 bytes
6SHA1 (patch-texk_web2c_xetexdir_xetex.ch) = 7165868d56f2e23f60f3f80fbb69769784f61f53 
7SHA1 (patch-xetexdir_XeTeX__ext.c) = 0776f085c3d37c20de42e889e2a996d9d76ce1af 6SHA1 (patch-xetexdir_XeTeX__ext.c) = 0776f085c3d37c20de42e889e2a996d9d76ce1af
File Deleted: pkgsrc/print/xetex/patches/Attic/patch-texk_web2c_xetexdir_xetex.ch