diff options
| author | wiz <wiz> | 2012-07-31 18:44:03 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2012-07-31 18:44:03 +0000 |
| commit | 67613248ba3bd7923aaebd6dd462a48c8e88b1a5 (patch) | |
| tree | e85831dfead7c01696aa0368d6a53d6827aebb29 /print/xetex | |
| parent | 26c2ebc383e533ef60f01aa2c7d683aa9eb96498 (diff) | |
| download | pkgsrc-67613248ba3bd7923aaebd6dd462a48c8e88b1a5.tar.gz | |
Stop WRKSRC/CONFIGURE_DIRS abuse.
WRKSRC should be the toplevel, while CONFIGURE_DIRS can be used
for sub-hierarchies. Make it so.
Diffstat (limited to 'print/xetex')
| -rw-r--r-- | print/xetex/Makefile | 16 | ||||
| -rw-r--r-- | print/xetex/distinfo | 4 | ||||
| -rw-r--r-- | print/xetex/patches/patch-texk_web2c_xetexdir_XeTeX__ext.c (renamed from print/xetex/patches/patch-xetexdir_XeTeX__ext.c) | 8 |
3 files changed, 13 insertions, 15 deletions
diff --git a/print/xetex/Makefile b/print/xetex/Makefile index a4a7807170c..6724975b7aa 100644 --- a/print/xetex/Makefile +++ b/print/xetex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/07/13 14:13:59 minskim Exp $ +# $NetBSD: Makefile,v 1.12 2012/07/31 18:44:03 wiz Exp $ DISTNAME= texlive-20120701-source PKGNAME= xetex-0.9998 @@ -24,8 +24,6 @@ GNU_CONFIGURE= yes USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_TOOLS+= gmake lex perl pkg-config yacc -WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c - CONFIGURE_ARGS+= --disable-aleph --disable-etex --disable-pdftex \ --disable-luatex --disable-mf --disable-mf-nowin \ --disable-mp \ @@ -50,11 +48,11 @@ 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/graphite \ - ${WRKDIR}/${DISTNAME}/libs/icu \ - ${WRKDIR}/${DISTNAME}/libs/xpdf \ - ${WRKDIR}/${DISTNAME}/libs/obsdcompat \ - ${WRKDIR}/${DISTNAME}/texk/web2c +CONFIGURE_DIRS= libs/graphite +CONFIGURE_DIRS+= libs/icu +CONFIGURE_DIRS+= libs/xpdf +CONFIGURE_DIRS+= libs/obsdcompat +CONFIGURE_DIRS+= texk/web2c EVAL_PREFIX+= XDVIPDFMX_PREFIX=xdvipdfmx @@ -83,6 +81,6 @@ CONFIGURE_ENV+= kpse_cv_have_Carbon=no .include "../../print/poppler-includes/buildlink3.mk" do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/xetex ${DESTDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/texk/web2c/xetex ${DESTDIR}${PREFIX}/bin .include "../../mk/bsd.pkg.mk" diff --git a/print/xetex/distinfo b/print/xetex/distinfo index fa1d8e3db85..1e1d9b8394d 100644 --- a/print/xetex/distinfo +++ b/print/xetex/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2012/07/31 18:35:47 wiz Exp $ +$NetBSD: distinfo,v 1.11 2012/07/31 18:44:03 wiz 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-xetexdir_XeTeX__ext.c) = cd10bf03cf3a31f39a9b01cba5a45f47947cc8e5 +SHA1 (patch-texk_web2c_xetexdir_XeTeX__ext.c) = a83e842b567db6acb35cfab5303a7e96845fa953 diff --git a/print/xetex/patches/patch-xetexdir_XeTeX__ext.c b/print/xetex/patches/patch-texk_web2c_xetexdir_XeTeX__ext.c index 4ebf2c88495..2717a9c2300 100644 --- a/print/xetex/patches/patch-xetexdir_XeTeX__ext.c +++ b/print/xetex/patches/patch-texk_web2c_xetexdir_XeTeX__ext.c @@ -1,10 +1,10 @@ -$NetBSD: patch-xetexdir_XeTeX__ext.c,v 1.2 2012/07/31 18:35:47 wiz Exp $ +$NetBSD: patch-texk_web2c_xetexdir_XeTeX__ext.c,v 1.1 2012/07/31 18:44:03 wiz Exp $ Prepare for patching in absolute pkgsrc path to xdvipdfmx binary. ---- xetexdir/XeTeX_ext.c.orig 2011-02-25 11:49:36.000000000 +0000 -+++ xetexdir/XeTeX_ext.c -@@ -182,7 +182,7 @@ const UInt32 byteMark = 0x00000080UL; +--- texk/web2c/xetexdir/XeTeX_ext.c.orig 2012-03-19 08:34:01.000000000 +0000 ++++ texk/web2c/xetexdir/XeTeX_ext.c +@@ -173,7 +173,7 @@ const UInt32 byteMark = 0x00000080UL; /* if the user specifies a paper size or output driver program */ const char *papersize; |