diff options
| author | obache <obache> | 2012-08-14 11:36:25 +0000 |
|---|---|---|
| committer | obache <obache> | 2012-08-14 11:36:25 +0000 |
| commit | 28ee550e367b2aacc337e7b0287bfaf17466273b (patch) | |
| tree | 600149ec5fb7cbaf4064770f619a955b0cf0f083 /print/luatex | |
| parent | 10a6bbbd4cfdc7cd76724e85927caadba53b1a31 (diff) | |
| download | pkgsrc-28ee550e367b2aacc337e7b0287bfaf17466273b.tar.gz | |
Instead of pass down LUA_ROOT as CFLAGS, replace its definition in the source,
avoid to specify nasty C string macro in the command line.
Diffstat (limited to 'print/luatex')
| -rw-r--r-- | print/luatex/Makefile | 8 | ||||
| -rw-r--r-- | print/luatex/distinfo | 4 | ||||
| -rw-r--r-- | print/luatex/patches/patch-ac | 13 |
3 files changed, 14 insertions, 11 deletions
diff --git a/print/luatex/Makefile b/print/luatex/Makefile index 726aa3d6781..42ff7ce02de 100644 --- a/print/luatex/Makefile +++ b/print/luatex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/08/13 11:25:56 drochner Exp $ +# $NetBSD: Makefile,v 1.16 2012/08/14 11:36:25 obache Exp $ DISTNAME= luatex-beta-0.70.1 PKGNAME= ${DISTNAME:S/-beta//:S/-source//} @@ -104,7 +104,11 @@ CONFIGURE_ARGS+=--with-system-poppler \ --with-poppler-libdir=${BUILDLINK_PREFIX.poppler}/lib CONFIGURE_DIRS+=. texk/web2c MAKE_FLAGS+= LIBTOOL=${LIBTOOL:Q} -CFLAGS+= -DLUA_ROOT=\"${PREFIX}/\" + +SUBST_CLASSES+= prefix +SUBST_STAGE.prefix= post-configure +SUBST_FILES.prefix= texk/web2c/luatexdir/lua51/luaconf.h +SUBST_VARS.prefix= PREFIX INSTALLATION_DIRS+= bin diff --git a/print/luatex/distinfo b/print/luatex/distinfo index f8312403879..a3014f46a3f 100644 --- a/print/luatex/distinfo +++ b/print/luatex/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.9 2012/07/10 22:35:10 minskim Exp $ +$NetBSD: distinfo,v 1.10 2012/08/14 11:36:25 obache Exp $ SHA1 (luatex-beta-0.70.1.tar.bz2) = 063bd698daab38ac6b04b45c820a15a0423aaab5 RMD160 (luatex-beta-0.70.1.tar.bz2) = dfa3710bb48ba5d73ae5e41746d7c1a3a965f619 Size (luatex-beta-0.70.1.tar.bz2) = 8181155 bytes SHA1 (patch-aa) = 738c8bd631db36671d2c4eb48a360b7a16186c64 SHA1 (patch-ab) = ee8ad45e980e655702925a164ee0ce6dd1689366 -SHA1 (patch-ac) = 23d6c26c4ded11267f05730119c250a831cd53ff +SHA1 (patch-ac) = 52211165bd6d05e4f8ce4d6280f5091280623d75 SHA1 (patch-ad) = 8147f70d64516a08cbca5cd79d92b00894c702ed SHA1 (patch-texk_web2c_luatexdir_luatex.c) = 2b5e37e3c0fa1d42fc5782eec562bbc0040d1404 diff --git a/print/luatex/patches/patch-ac b/print/luatex/patches/patch-ac index f46f4f1d1c5..5e3b9ef12d0 100644 --- a/print/luatex/patches/patch-ac +++ b/print/luatex/patches/patch-ac @@ -1,18 +1,17 @@ -$NetBSD: patch-ac,v 1.1 2010/09/13 04:12:48 minskim Exp $ +$NetBSD: patch-ac,v 1.2 2012/08/14 11:36:25 obache Exp $ ---- texk/web2c/luatexdir/lua51/luaconf.h.orig 2010-09-09 09:10:53.000000000 +0000 +--- texk/web2c/luatexdir/lua51/luaconf.h.orig 2011-05-19 05:38:38.000000000 +0000 +++ texk/web2c/luatexdir/lua51/luaconf.h -@@ -100,7 +100,9 @@ +@@ -100,7 +100,7 @@ ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" #else -+#ifndef LUA_ROOT - #define LUA_ROOT "/usr/local/" -+#endif +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "@PREFIX@/" #define LUA_LDIR LUA_ROOT "share/lua/5.1/" #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" #define LUA_PATH_DEFAULT \ -@@ -189,7 +191,7 @@ +@@ -189,7 +189,7 @@ #define LUAI_DATA /* empty */ #elif defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \ |