pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print/xetex Update xetex to 0.9995.2, which is a part ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d17b95b784a4
branches:  trunk
changeset: 569392:d17b95b784a4
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sat Jan 16 03:21:45 2010 +0000

description:
Update xetex to 0.9995.2, which is a part of TeX Live 2009.

This version includes more primitives that the LaTeX3 team asked for.
    - New primitives that the LaTeX3 team asked for.

diffstat:

 print/xetex/Makefile         |  71 +++++++++++++++++++++----------------------
 print/xetex/distinfo         |  18 ++--------
 print/xetex/patches/patch-aa |  19 -----------
 print/xetex/patches/patch-ab |  28 -----------------
 print/xetex/patches/patch-ac |   9 -----
 print/xetex/patches/patch-ad |  18 -----------
 print/xetex/patches/patch-ae |   9 -----
 print/xetex/patches/patch-af |  26 ----------------
 print/xetex/patches/patch-ag |  33 --------------------
 print/xetex/patches/patch-ah |  10 ------
 print/xetex/patches/patch-ai |  12 -------
 print/xetex/patches/patch-ak |  13 --------
 12 files changed, 39 insertions(+), 227 deletions(-)

diffs (truncated from 343 to 300 lines):

diff -r a88740e9c172 -r d17b95b784a4 print/xetex/Makefile
--- a/print/xetex/Makefile      Sat Jan 16 03:19:32 2010 +0000
+++ b/print/xetex/Makefile      Sat Jan 16 03:21:45 2010 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2009/06/09 21:31:04 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2010/01/16 03:21:45 minskim Exp $
 
-DISTNAME=      texlive-20080816-source
-PKGNAME=       xetex-0.999.6
-PKGREVISION=   1
+DISTNAME=      texlive-20091011-source
+PKGNAME=       xetex-0.9995.2
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
-EXTRACT_SUFX=  .tar.lzma
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    minskim%NetBSD.org@localhost
 HOMEPAGE=      http://www.tug.org/xetex/
@@ -13,16 +12,9 @@
 
 CONFLICTS+=    web2c<=7.5.7
 
-EXTRACT_ELEMENTS=      ${DISTNAME}/config \
-                       ${DISTNAME}/libs/icu-xetex \
-                       ${DISTNAME}/libs/md5 \
-                       ${DISTNAME}/libs/slnunicode \
+EXTRACT_ELEMENTS=      ${DISTNAME}/build-aux \
+                       ${DISTNAME}/libs/icu \
                        ${DISTNAME}/libs/xpdf ${DISTNAME}/libs/obsdcompat \
-                       ${DISTNAME}/texk/make \
-                       ${DISTNAME}/texk/config.guess \
-                       ${DISTNAME}/texk/config.sub \
-                       ${DISTNAME}/texk/install.sh \
-                       ${DISTNAME}/texk/mkinstalldirs \
                        ${DISTNAME}/texk/web2c
 
 PKG_DESTDIR_SUPPORT=   user-destdir
@@ -33,35 +25,42 @@
 USE_TOOLS+=    gmake lex perl yacc
 WRKSRC=                ${WRKDIR}/${DISTNAME}/texk/web2c
 
-CONFIGURE_ARGS+=       --without-etex --without-omega --without-alepf \
-                       --without-pdfetex --without-luatex
-CONFIGURE_ARGS+=       --with-system-freetype2 \
-                       --with-freetype2-include=${BUILDLINK_PREFIX.freetype2}/include \
-                       --with-freetype2-libdir=${BUILDLINK_PREFIX.freetype2}/lib
-CONFIGURE_ARGS+=       --with-fontconfig=${BUILDLINK_PREFIX.fontconfig}
-CONFIGURE_ARGS+=       --with-system-pnglib \
-                       --with-pnglib-include=${BUILDLINK_PREFIX.png}/include \
-                       --with-pnglib-libdir=${BUILDLINK_PREFIX.png}/lib
+CONFIGURE_ARGS+=       --disable-aleph --disable-etex --disable-pdftex \
+                       --disable-luatex --disable-mf disable-mf-nowin \
+                       --disable-mp --disable-web-progs
+CONFIGURE_ARGS+= \
+       --with-fontconfig-includes=${BUILDLINK_PREFIX.fontconfig}/include \
+       --with-fontconfig-libdir=${BUILDLINK_PREFIX.fontconfig}/lib
+CONFIGURE_ARGS+=       --with-system-kpathsea \
+       --with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
+       --with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib
 CONFIGURE_ARGS+=       --with-system-zlib \
-                       --with-zlib-include=${BUILDLINK_PREFIX.zlib}/include \
-                       --with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
-CONFIGURE_ARGS+=       --enable-static
+       --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-graphite \
+       --with-graphite-includes=${BUILDLINK_PREFIX.silgraphite}/include \
+       --with-graphite-libdir=${BUILDLINK_PREFIX.silgraphite}/lib
+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_DIRS=        ${WRKDIR}/${DISTNAME}/libs/icu-xetex \
+CONFIGURE_DIRS=        ${WRKDIR}/${DISTNAME}/libs/icu \
                ${WRKDIR}/${DISTNAME}/libs/xpdf \
                ${WRKDIR}/${DISTNAME}/libs/obsdcompat \
                ${WRKDIR}/${DISTNAME}/texk/web2c
 
-MAKE_ENV+=     KPATHSEA_PREFIX=${BUILDLINK_PREFIX.kpathsea}
-MAKE_FLAGS+=   LIBTOOL=${LIBTOOL:Q}
-MAKE_FLAGS+=   TECKITFLAGS=-I${BUILDLINK_PREFIX.TECkit}/include/teckit \
-               LDTECKIT="-L${BUILDLINK_PREFIX.TECkit}/lib -lTECkit" \
-               TECKITDEP="" \
-               GRAPHITESRCDIR=${BUILDLINK_PREFIX.silgraphite} \
-               LDGRAPHITE="-L${BUILDLINK_PREFIX.silgraphite}/lib -lgraphite" \
-               GRAPHITEDEP=""
+INSTALLATION_DIRS+=    bin
+
+.include "../../mk/bsd.prefs.mk"
 
-INSTALLATION_DIRS+=    bin
+# 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
 
 .include "../../converters/TECkit/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff -r a88740e9c172 -r d17b95b784a4 print/xetex/distinfo
--- a/print/xetex/distinfo      Sat Jan 16 03:19:32 2010 +0000
+++ b/print/xetex/distinfo      Sat Jan 16 03:21:45 2010 +0000
@@ -1,15 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/07/12 21:22:46 minskim Exp $
+$NetBSD: distinfo,v 1.3 2010/01/16 03:21:45 minskim Exp $
 
-SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d
-RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38
-Size (texlive-20080816-source.tar.lzma) = 23175835 bytes
-SHA1 (patch-aa) = d3a3c38638a699b5cb9b4e6da7b53f3ab57ba3f8
-SHA1 (patch-ab) = 06a46cdac3ce4731dda8940848a2c4493f703502
-SHA1 (patch-ac) = 7e604596d3c9c5095937b2bdd094371127f6f05f
-SHA1 (patch-ad) = 07de363d6f9ff6d272c2cb36b8cad3ea9a2b7b5a
-SHA1 (patch-ae) = f700b735a9b0fdd5ae25a556798334f3d05739e1
-SHA1 (patch-af) = af78a42510c7b060340ab770e9065a90c7d06e5f
-SHA1 (patch-ag) = d04526f55500e13757acd9e2a320b2c6737edd3b
-SHA1 (patch-ah) = b518352ae6b2839b2790550b422f1c2860821350
-SHA1 (patch-ai) = db189319b667a4bf9fab175e9bf31cb4e378ed5a
-SHA1 (patch-ak) = 83f2a49f6ee2ceca164940a194e8d559553c7c2e
+SHA1 (texlive-20091011-source.tar.xz) = 82fc9fcdb82c63a00f4b08a51733c761cbda897d
+RMD160 (texlive-20091011-source.tar.xz) = 81b86cd93e629d6b1b3d7918848dd76babc0d5a9
+Size (texlive-20091011-source.tar.xz) = 29683728 bytes
diff -r a88740e9c172 -r d17b95b784a4 print/xetex/patches/patch-aa
--- a/print/xetex/patches/patch-aa      Sat Jan 16 03:19:32 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/04/11 21:35:19 minskim Exp $
-
---- ../make/tkpathsea.mk.orig  2008-05-29 13:59:08.000000000 -0700
-+++ ../make/tkpathsea.mk
-@@ -4,10 +4,9 @@ makeargs = $(MFLAGS) CC='$(CC)' CFLAGS='
- 
- # This is wrong: the library doesn't depend on kpsewhich.c or
- # acconfig.h.  But what to do?
--$(kpathsea): $(kpathsea_srcdir)/*.c $(kpathsea_srcdir)/*.h \
--           $(top_srcdir)/../make/paths.mk
--      cd $(kpathsea_dir) && $(MAKE) $(makeargs)
-+$(kpathsea):
-+      true
- 
--$(kpathsea_dir)/paths.h: $(kpathsea_srcdir)/texmf.cnf
--      cd $(kpathsea_dir) && $(MAKE) $(makeargs)
-+$(kpathsea_dir)/paths.h:
-+      true
- # End of tkpathsea.mk.
diff -r a88740e9c172 -r d17b95b784a4 print/xetex/patches/patch-ab
--- a/print/xetex/patches/patch-ab      Sat Jan 16 03:19:32 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/04/11 21:35:19 minskim Exp $
-
---- ../make/common.mk.orig     2007-01-20 03:03:18.000000000 -0800
-+++ ../make/common.mk
-@@ -17,7 +17,7 @@ LIBTOOL = $(SHELL) $(kpathsea_parent)/li
- # You can change [X]CPPFLAGS, [X]CFLAGS, or [X]DEFS, but
- # please don't change ALL_CPPFLAGS or ALL_CFLAGS.
- # prog_cflags is set by subdirectories of web2c.
--ALL_CPPFLAGS = $(DEFS) -I. -I$(srcdir) -I$(kpathsea_parent) \
-+ALL_CPPFLAGS = $(DEFS) -I. -I$(srcdir) -I$(KPATHSEA_PREFIX)/include \
-   -I$(kpathsea_srcdir_parent) $(prog_cflags) $(CPPFLAGS)
- ALL_CFLAGS = $(ALL_CPPFLAGS) $(CFLAGS)
- ALL_CXXFLAGS = $(ALL_CPPFLAGS) $(CXXFLAGS)
-@@ -51,11 +51,11 @@ UNINSTALL_LIBTOOL_LIBS = $(LIBTOOL) --mo
- UNINSTALL_LIBTOOL_PROG = $(LIBTOOL) --mode=uninstall $(RM)
- 
- # We use these for many things.
--kpathsea_parent = ..
-+kpathsea_parent = $(KPATHSEA_PREFIX)/include
- kpathsea_dir = $(kpathsea_parent)/kpathsea
- kpathsea_srcdir_parent = $(top_srcdir)/..
--kpathsea_srcdir = $(kpathsea_srcdir_parent)/kpathsea
--kpathsea = $(kpathsea_dir)/libkpathsea.la
-+kpathsea_srcdir = $(KPATHSEA_PREFIX)/include/kpathsea
-+kpathsea = $(KPATHSEA_PREFIX)/lib/libkpathsea.la
- 
- @MAINT@ifeq ($(CC), gcc)
- @MAINT@XDEFS = -Wpointer-arith $(warn_more)
diff -r a88740e9c172 -r d17b95b784a4 print/xetex/patches/patch-ac
--- a/print/xetex/patches/patch-ac      Sat Jan 16 03:19:32 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/04/11 21:35:19 minskim Exp $
-
---- lib/Makefile.in.orig       2008-01-30 06:56:21.000000000 -0800
-+++ lib/Makefile.in
-@@ -30,4 +30,3 @@ Makefile: Makefile.in ../config.status
- 
- kpse_include ../make/clean.mk
- kpse_include ../make/rdepend.mk
--kpse_include lib/depend.mk
diff -r a88740e9c172 -r d17b95b784a4 print/xetex/patches/patch-ad
--- a/print/xetex/patches/patch-ad      Sat Jan 16 03:19:32 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2009/07/12 21:22:46 minskim Exp $
-
---- web2c/Makefile.in.orig     2008-04-15 16:20:46.000000000 -0700
-+++ web2c/Makefile.in
-@@ -38,7 +38,7 @@ $(LEX_OUTPUT_ROOT).c: web2c.l
- fixwrites: fixwrites.o kps.o
-       $(build_link_command) fixwrites.o kps.o
- splitup: splitup.o kps.o
--      $(build_link_command) splitup.o kps.o
-+      $(kpathsea_link) splitup.o kps.o $(kpathsea)
- regfix: regfix.o kps.o
-       $(build_link_command) regfix.o kps.o
- makecpool: makecpool.o 
-@@ -71,4 +71,3 @@ clean::
-       rm -f y_tab.c y_tab.h y.out* yacc.* $(LEX_OUTPUT_ROOT).c
- 
- kpse_include ../make/rdepend.mk
--kpse_include web2c/depend.mk
diff -r a88740e9c172 -r d17b95b784a4 print/xetex/patches/patch-ae
--- a/print/xetex/patches/patch-ae      Sat Jan 16 03:19:32 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/04/11 21:35:19 minskim Exp $
-
---- window/Makefile.in.orig    2008-01-30 06:56:21.000000000 -0800
-+++ window/Makefile.in
-@@ -35,4 +35,3 @@ distclean::
-       rm -f x11.c
- 
- kpse_include ../make/rdepend.mk
--kpse_include window/depend.mk
diff -r a88740e9c172 -r d17b95b784a4 print/xetex/patches/patch-af
--- a/print/xetex/patches/patch-af      Sat Jan 16 03:19:32 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/04/11 21:35:19 minskim Exp $
-
---- mpware/Makefile.in.orig    2008-01-30 06:56:21.000000000 -0800
-+++ mpware/Makefile.in
-@@ -46,11 +46,11 @@ Makefile: Makefile.in ../config.status
- 
- install: install-exec install-data
- install-exec: $(programs)
--      $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) $(scriptdir)
--      $(INSTALL_PROGRAM) newer $(bindir)/newer
--      $(INSTALL_LIBTOOL_PROG) dmp $(bindir)
--      $(INSTALL_LIBTOOL_PROG) mpto $(bindir)
--      $(INSTALL_LIBTOOL_PROG) makempx $(bindir)
-+      $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(scriptdir)
-+      $(INSTALL_PROGRAM) newer $(DESTDIR)$(bindir)/newer
-+      $(INSTALL_LIBTOOL_PROG) dmp $(DESTDIR)$(bindir)
-+      $(INSTALL_LIBTOOL_PROG) mpto $(DESTDIR)$(bindir)
-+      $(INSTALL_LIBTOOL_PROG) makempx $(DESTDIR)$(bindir)
- install-data:
- 
- kpse_include ../make/tkpathsea.mk
-@@ -60,4 +60,3 @@ mostlyclean::
-       rm -f testex1 testex2
- 
- kpse_include ../make/rdepend.mk
--kpse_include mpware/depend.mk
diff -r a88740e9c172 -r d17b95b784a4 print/xetex/patches/patch-ag
--- a/print/xetex/patches/patch-ag      Sat Jan 16 03:19:32 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2009/04/11 21:35:19 minskim Exp $
-
---- ../make/man.mk.orig        2006-01-17 13:41:51.000000000 -0800
-+++ ../make/man.mk
-@@ -29,7 +29,7 @@ txt: $(manfiles:.1=.txt)
- # At present, all but VERSION should be unused.
- sedscript:
-       cp /dev/null sedscript
--      for f in $(kpathsea_dir)/paths.h; do \
-+      for f in $(KPATHSEA_PREFIX)/include/kpathsea/paths.h; do \
-         sed -n -e '/^#define/s/#define[       ][      ]*\([A-Z_a-z][A-Z_a-z]*\)[      ][      ]*\(.*\)/s%@\1@%\2%/p' \
-               $$f \
-         | sed -e 's/"//g' -e 's/[     ]*\/\*[^*]*\*\///g' >>sedscript;\
-@@ -51,16 +51,16 @@ sedscript:
-       echo 's%@LOCALMODES@%$(localmodes)%'    >>sedscript
- 
- install-man: manfiles
--      $(top_srcdir)/../mkinstalldirs $(man1dir)
-+      $(top_srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir)
-       for nameone in $(manfiles); do                                  \
-           name=`basename $${nameone} .1`;                             \
--          $(INSTALL_DATA) $${name}.1 $(man1dir)/$${name}.$(manext);   \
-+          $(INSTALL_DATA) $${name}.1 $(DESTDIR)$(man1dir)/$${name}.$(manext); \
-         done
- 
- uninstall-man:
-       for nameone in $(manfiles); do                                  \
-         name=`basename $${nameone} .1`;                               \
--        rm -f $(man1dir)/$${name}.$(manext);                          \
-+        rm -f $(DESTDIR)$(man1dir)/$${name}.$(manext);                                \
-       done
- 
- install-data: install-man
diff -r a88740e9c172 -r d17b95b784a4 print/xetex/patches/patch-ah
--- a/print/xetex/patches/patch-ah      Sat Jan 16 03:19:32 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@



Home | Main Index | Thread Index | Old Index