Update xetex to 0.9999.3

Changes:
* Fix bug with extensible accents resulting in invalid glyph id some times.
* Fix alternate index in multiple alternates features to be start from zero
  like pre-0.9999 XeTeX.
* Document multiple alternates syntax in the reference documentation.
* Fix regression in \XeTeXOT* primitives with fonts where the number of
  languages in a given script is not the same in both GSUB and GPOS tables.
* Add a workaround for a bug in clang headers to allow building with it on Mac.
* Fix regression in loading PNG files on Mac.
* Fix multiple regression with vertical text layout.
* Update to HarfBuzz 0.9.15 fixing a couple of regressions with Arabic non
  spacing marks and Hangul jamo.
* Various build fixes for third party libraries.
* XeTeX reference is now included in the release tarball.
* Fix loading font files on PPC Mac OS 10.5 (and potentially other versions of
  Mac).
* Fix handling of ‘script’ and ‘language’ font options to be treated again as
  OpenType not ISO tags, so that passing version 2 Indic script tags works
  (though this is generally not needed as HarfBuzz will always use version 2
  shaping if the font has it, regardless of the tag used).
* Fix loading JPEG images that do not specify a resolution.
* When printing multi-byte characters to log or terminal avoid inserting new
  lines in the middle of the characters, and count the characters not the bytes
  when calculating line length.
* Update to HarfBuzz 0.9.14, a couple of Indic and Hangul shaping bugs.
* Port OpenType layout from ICU LayoutEngine to HarfBuzz.
* Port Graphite layout to from SilGraphite to HarfBuzz and Graphite2.
* Port AAT font layout and font searching on Mac from the deprecated ATS/ATSUI
  to Core Text, and image support on Mac from QuickTime to ImageIO framework.
  XeTeX can be finally built on 64-bit Mac! Work contributed by Jiang Jiang.

3 files changed, 16 insertions, 48 deletions

diff --git a/print/xetex/Makefile b/print/xetex/Makefile
index 1b5c3496743..84d293c68bc 100644
--- a/print/xetex/Makefile
+++ b/print/xetex/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2013/08/22 09:21:58 prlw1 Exp $
+# $NetBSD: Makefile,v 1.27 2013/12/03 22:25:34 minskim Exp $
 
-DISTNAME=	texlive-20120701-source
-PKGNAME=	xetex-0.9998
-PKGREVISION=	12
+DISTNAME=	texlive-20130530-source
+PKGNAME=	xetex-0.9999.3
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2013/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
@@ -15,8 +14,9 @@ CONFLICTS+=	web2c<=7.5.7
 DEPENDS+=	xdvipdfmx-[0-9]*:../../print/xdvipdfmx
 
 EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
-			${DISTNAME}/libs/graphite ${DISTNAME}/libs/icu \
-			${DISTNAME}/libs/xpdf ${DISTNAME}/libs/obsdcompat \
+			${DISTNAME}/libs/graphite2 \
+			${DISTNAME}/libs/harfbuzz \
+			${DISTNAME}/libs/xpdf \
 			${DISTNAME}/texk/web2c
 
 GNU_CONFIGURE=	yes
@@ -39,18 +39,16 @@ CONFIGURE_ARGS+=	--with-system-kpathsea \
 CONFIGURE_ARGS+=	--with-system-zlib \
 	--with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include \
 	--with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
-CONFIGURE_ARGS+=	--with-system-libpng \
-	--with-libpng-includes=${BUILDLINK_PREFIX.libpng}/include \
-	--with-libpng-libdir=${BUILDLINK_PREFIX.libpng}/lib
+CONFIGURE_ARGS+=	--with-system-libpng
 CONFIGURE_ARGS+=	--with-system-freetype2
 CONFIGURE_ARGS+=	--with-system-teckit \
 	--with-teckit-includes=${BUILDLINK_PREFIX.TECkit}/include/teckit \
 	--with-teckit-libdir=${BUILDLINK_PREFIX.TECkit}/lib
+CONFIGURE_ARGS+=	--with-system-icu
 
-CONFIGURE_DIRS=		libs/graphite
-CONFIGURE_DIRS+=	libs/icu
+CONFIGURE_DIRS=		libs/graphite2
+CONFIGURE_DIRS+=	libs/harfbuzz
 CONFIGURE_DIRS+=	libs/xpdf
-CONFIGURE_DIRS+=	libs/obsdcompat
 CONFIGURE_DIRS+=	texk/web2c
 
 EVAL_PREFIX+=	XDVIPDFMX_PREFIX=xdvipdfmx
@@ -63,13 +61,6 @@ SUBST_SED.paths=	-e 's,@XDVIPDFMX@,${XDVIPDFMX_PREFIX}/bin/xdvipdfmx,g'
 
 INSTALLATION_DIRS+=	bin
 
-.include "../../mk/bsd.prefs.mk"
-
-# ATSUI is deprecated in Mac OS X Snow Leopard
-.if !empty(MACHINE_PLATFORM:MDarwin-1[0-9]*)
-CONFIGURE_ENV+=	kpse_cv_have_Carbon=no
-.endif
-
 CFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE_EXTENDED=0
 
 .include "../../converters/TECkit/buildlink3.mk"
@@ -80,6 +71,7 @@ CFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE_EXTENDED=0
 .include "../../print/kpathsea/buildlink3.mk"
 .include "../../print/poppler/buildlink3.mk"
 .include "../../print/poppler-includes/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/texk/web2c/xetex ${DESTDIR}${PREFIX}/bin
diff --git a/print/xetex/distinfo b/print/xetex/distinfo
index 774fc6c7b5b..b675a6c22b0 100644
--- a/print/xetex/distinfo
+++ b/print/xetex/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.13 2012/08/22 19:46:58 dholland Exp $
+$NetBSD: distinfo,v 1.14 2013/12/03 22:25:34 minskim Exp $
 
-SHA1 (texlive-20120701-source.tar.xz) = e41ef31eba27891f3434e01638d3559cc6958016
-RMD160 (texlive-20120701-source.tar.xz) = df09b657919a3f203309645028803098f52bbac9
-Size (texlive-20120701-source.tar.xz) = 131904044 bytes
-SHA1 (patch-libs_icu_icu-49_1_configure) = fdb232e4b5ccf0a34ea48964352831cdd0f884ee
+SHA1 (texlive-20130530-source.tar.xz) = 42f0a6fa3f49435991182f14e01276b2ee3fce61
+RMD160 (texlive-20130530-source.tar.xz) = 2d779ae5de979be86a9258b224dfc15cbcd76b18
+Size (texlive-20130530-source.tar.xz) = 179963948 bytes
 SHA1 (patch-texk_web2c_xetexdir_XeTeX__ext.c) = a83e842b567db6acb35cfab5303a7e96845fa953
diff --git a/print/xetex/patches/patch-libs_icu_icu-49_1_configure b/print/xetex/patches/patch-libs_icu_icu-49_1_configure
deleted file mode 100644
index e95a8e58a24..00000000000
--- a/print/xetex/patches/patch-libs_icu_icu-49_1_configure
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-libs_icu_icu-49_1_configure,v 1.2 2012/08/22 19:46:58 dholland Exp $
-
-Disable -ffunction-sections -fdata-sections and accompanying
---gc-sections on netbsd because --gc-sections doesn't work with the
-netbsd-4 and netbsd-5 linker. See PR 46698 and PR 40401. Thanks to
-Anthony Mallet for tracking the problem down.
-
-At some point this patch should probably be made less blunt, and/or
-upstream should fix it to test if the options work instead of going by
-OS type.
-
---- libs/icu/icu-49.1/configure~	2012-03-21 15:06:23.000000000 +0000
-+++ libs/icu/icu-49.1/configure
-@@ -5259,6 +5259,9 @@ $as_echo_n "checking whether we can use 
-             OLD_LDFLAGS="${LDFLAGS}"
- 
-             case "${host}" in
-+	    *-netbsd*)
-+		# --gc-sections does not work on netbsd-4 and netbsd-5
-+		;;
-             *-linux*|i*86-*-*bsd*|i*86-pc-gnu)
-                 if test "$ac_cv_c_compiler_gnu" = yes; then
-                     CPPFLAGS="${CPPFLAGS} -ffunction-sections -fdata-sections"