diff options
| author | fhajny <fhajny@pkgsrc.org> | 2009-12-15 12:43:04 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2009-12-15 12:43:04 +0000 |
| commit | 9b219fe5ed595b3bd4c5500109f1762bb1793cdc (patch) | |
| tree | 60ce687be5f07352e128e4b4b156fb27a0ba342b /textproc/lua-expat/patches/patch-ac | |
| parent | d736b60e24bb98018636f8081d8a4550cb0835b4 (diff) | |
| download | pkgsrc-9b219fe5ed595b3bd4c5500109f1762bb1793cdc.tar.gz | |
Updated lua-expat to 1.1.0.
Changes in 1.1.0:
* Adapted to work on both Lua 5.0 and Lua 5.1
* Updated to use Expat 2.0.0
Changes in 1.0.2:
* Minor bugfix, lom correct module name is lxp.lom
Changes in 1.0.1:
* Minor changes for compatibility with Expat version 1.95.8
pkgsrc changes:
* Changed installation scheme to use the lang/lua/module.mk framework
Diffstat (limited to 'textproc/lua-expat/patches/patch-ac')
| -rw-r--r-- | textproc/lua-expat/patches/patch-ac | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/textproc/lua-expat/patches/patch-ac b/textproc/lua-expat/patches/patch-ac new file mode 100644 index 00000000000..8a57c86db38 --- /dev/null +++ b/textproc/lua-expat/patches/patch-ac @@ -0,0 +1,41 @@ +$NetBSD: patch-ac,v 1.1 2009/12/15 12:43:04 fhajny Exp $ + +Standard lua locations, compiler fixes + +--- config.orig 2006-06-08 20:41:48.000000000 +0000 ++++ config +@@ -1,12 +1,12 @@ + # Installation directories + # System's libraries directory (where binary libraries are installed) +-LUA_LIBDIR= /usr/local/lib/lua/5.0 ++LUA_LIBDIR= $(PREFIX) + # System's lua directory (where Lua libraries are installed) +-LUA_DIR= /usr/local/share/lua/5.0 ++LUA_DIR?= $(PREFIX) + # Lua includes directory +-LUA_INC= /usr/local/include ++LUA_INC?= $(PREFIX)/include + # Expat includes directory +-EXPAT_INC= /usr/local/include ++EXPAT_INC?= $(PREFIX)/include + + # OS dependent + LIB_OPTION= -shared #for Linux +@@ -17,7 +17,7 @@ LIBNAME= $T.so.$V + # (according to Lua 5.1 definition: + # first version digit * 100 + second version digit + # e.g. Lua 5.0.2 => 500, Lua 5.1 => 501, Lua 5.1.1 => 501) +-LUA_VERSION_NUM= 500 ++LUA_VERSION_NUM?= 501 + COMPAT_DIR= ../compat/src + + # Compilation parameters +@@ -31,6 +31,6 @@ CWARNS = -Wall -pedantic \ + -Wshadow \ + -Wwrite-strings + +-CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \ ++CFLAGS += -O2 -I$(LUA_INC) \ + -I$(COMPAT_DIR) -I$(EXPAT_INC) +-CC = gcc ++CC? = gcc |