From 2ddcd49b228b803a3f135a2b3f2a702e5b135cc9 Mon Sep 17 00:00:00 2001 From: fhajny Date: Tue, 15 Dec 2009 12:43:04 +0000 Subject: 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 --- textproc/lua-expat/MESSAGE | 7 +----- textproc/lua-expat/Makefile | 25 +++++++++++++-------- textproc/lua-expat/PLIST | 5 +++-- textproc/lua-expat/distinfo | 12 +++++----- textproc/lua-expat/patches/patch-aa | 45 ++++++++++++------------------------- textproc/lua-expat/patches/patch-ab | 13 ----------- textproc/lua-expat/patches/patch-ac | 41 +++++++++++++++++++++++++++++++++ 7 files changed, 81 insertions(+), 67 deletions(-) delete mode 100644 textproc/lua-expat/patches/patch-ab create mode 100644 textproc/lua-expat/patches/patch-ac (limited to 'textproc/lua-expat') diff --git a/textproc/lua-expat/MESSAGE b/textproc/lua-expat/MESSAGE index 198779a85cc..6b7c6cb2a90 100644 --- a/textproc/lua-expat/MESSAGE +++ b/textproc/lua-expat/MESSAGE @@ -1,10 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.2 2009/07/09 01:53:28 agc Exp $ - -To use luaexpat in your lua programs you must set this environment -variable: - - LUA_INIT = "loadlib('${PREFIX}/lib/liblualxp.so','luaopen_lxp')();" +$NetBSD: MESSAGE,v 1.3 2009/12/15 12:43:04 fhajny Exp $ The examples have been installed in: diff --git a/textproc/lua-expat/Makefile b/textproc/lua-expat/Makefile index e095eef659a..4789f2c5e13 100644 --- a/textproc/lua-expat/Makefile +++ b/textproc/lua-expat/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.13 2009/07/07 21:10:16 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2009/12/15 12:43:04 fhajny Exp $ # -DISTNAME= luaexpat-1.0a -PKGNAME= ${DISTNAME:S/lua/lua-/} -PKGREVISION= 5 +DISTNAME= luaexpat-1.1 +PKGNAME= ${DISTNAME:S/lua/lua-/}.0 CATEGORIES= textproc -MASTER_SITES= http://www.keplerproject.org/luaexpat/ +MASTER_SITES= http://luaforge.net/frs/download.php/2469/ MAINTAINER= pancake@phreaker.net HOMEPAGE= http://www.keplerproject.org/luaexpat/ COMMENT= XML parser for LUA based on expat +LICENSE= mit PKG_DESTDIR_SUPPORT= user-destdir @@ -18,12 +18,19 @@ MAKE_FILE= makefile CFLAGS+= -fPIC -INSTALLATION_DIRS= lib share/examples/lua +MAKE_FLAGS+= LUA_DIR=${BUILDLINK_PREFIX.lua} +MAKE_FLAGS+= LUA_INC=${BUILDLINK_PREFIX.lua}/include +MAKE_FLAGS+= EXPAT_INC=${BUILDLINK_PREFIX.expat}/include +MAKE_FLAGS+= LUA_VERSION_NUM=${LUA_VERSION_MAJOR}0${LUA_VERSION_MINOR} +BUILD_TARGET= lib + +INSTALLATION_DIRS= ${LUA_CDIR} ${LUA_LDIR} share/examples/lua do-install: - ${INSTALL_DATA} ${WRKSRC}/liblxp.so ${DESTDIR}${PREFIX}/lib/liblualxp.so - ${INSTALL_DATA} ${WRKSRC}/test.lua ${DESTDIR}${PREFIX}/share/examples/lua/lxp.lua + ${INSTALL_LIB} ${WRKSRC}/src/lxp.so.${PKGVERSION} ${DESTDIR}${PREFIX}/${LUA_CDIR}/lxp.so + ${INSTALL_DATA} ${WRKSRC}/src/lxp/lom.lua ${DESTDIR}${PREFIX}/${LUA_LDIR}/lom.lua + ${INSTALL_DATA} ${WRKSRC}/tests/test.lua ${DESTDIR}${PREFIX}/share/examples/lua/lxp.lua .include "../../textproc/expat/buildlink3.mk" -.include "../../lang/lua/buildlink3.mk" +.include "../../lang/lua/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/lua-expat/PLIST b/textproc/lua-expat/PLIST index ed58c87a4ff..eab694963cf 100644 --- a/textproc/lua-expat/PLIST +++ b/textproc/lua-expat/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/05 13:57:53 xtraeme Exp $ -lib/liblualxp.so +@comment $NetBSD: PLIST,v 1.2 2009/12/15 12:43:04 fhajny Exp $ +${LUA_CDIR}/lxp.so +${LUA_LDIR}/lom.lua share/examples/lua/lxp.lua diff --git a/textproc/lua-expat/distinfo b/textproc/lua-expat/distinfo index f6569db5dd4..a41ae0d0244 100644 --- a/textproc/lua-expat/distinfo +++ b/textproc/lua-expat/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 14:48:44 agc Exp $ +$NetBSD: distinfo,v 1.4 2009/12/15 12:43:04 fhajny Exp $ -SHA1 (luaexpat-1.0a.tar.gz) = f9393bf4cc1f41b34336b4f2e14fdbf7adf06c55 -RMD160 (luaexpat-1.0a.tar.gz) = 4c094a003606add4e09a58b882fd6b6350d44f4c -Size (luaexpat-1.0a.tar.gz) = 16460 bytes -SHA1 (patch-aa) = d43302660e93f44082a0b249490298db02d6f32d -SHA1 (patch-ab) = 3e083f15ef99fc6e0931416f092093ed821f4927 +SHA1 (luaexpat-1.1.tar.gz) = ea359bdbd346ee378c47179a17ac3ee410be5c9d +RMD160 (luaexpat-1.1.tar.gz) = f661c0e7f22363f51862187e96306498addea9d9 +Size (luaexpat-1.1.tar.gz) = 27907 bytes +SHA1 (patch-aa) = dd908d36c310b3a17a7e2319dc4f969a903f9402 +SHA1 (patch-ac) = 61d9bb455ef189d6ceb5dd71b06f7218da29e2f9 diff --git a/textproc/lua-expat/patches/patch-aa b/textproc/lua-expat/patches/patch-aa index ea961946a19..f286078e8fd 100644 --- a/textproc/lua-expat/patches/patch-aa +++ b/textproc/lua-expat/patches/patch-aa @@ -1,34 +1,17 @@ -$NetBSD: patch-aa,v 1.2 2004/08/27 06:29:10 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2009/12/15 12:43:04 fhajny Exp $ ---- makefile.orig 2004-01-29 22:54:22.000000000 +0000 -+++ makefile 2004-01-29 22:58:13.000000000 +0000 -@@ -1,5 +1,5 @@ - # Compilation parameters --CC = gcc -+#CC= gcc - CWARNS = -Wall -pedantic \ - -Waggregate-return \ - -Wcast-align \ -@@ -11,8 +11,8 @@ - -Wwrite-strings - - --CFLAGS = $(CONFIG) $(CWARNS) -ansi -g -O2 -I/usr/local/include/lua5 \ -- -L./expat/xmlparse -+CFLAGS+= $(CONFIG) -O2 -I${PREFIX}/include \ -+ -L${PREFIX}/lib - - VERSION= 1.0a - PKG = luaexpat-$(VERSION) -@@ -23,9 +23,10 @@ - test.lua \ - index.html manual.html lua.png - -+all: liblxp.so +Fix environment for true /bin/sh, LDFLAGS + +--- makefile.orig 2006-06-08 20:41:48.000000000 +0000 ++++ makefile +@@ -12,7 +12,9 @@ OBJS= src/lxplib.o $(COMPAT_O) + lib: src/$(LIBNAME) - liblxp.so : lxplib.o -- ld -o liblxp.so -shared lxplib.o -lexpat -+ ld -o liblxp.so -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -shared lxplib.o -lexpat + src/$(LIBNAME) : $(OBJS) +- export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) -lexpat ++ MACOSX_DEPLOYMENT_TARGET="10.3" ++ export MACOSX_DEPLOYMENT_TARGET ++ $(CC) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) $(LDFLAGS) -lexpat -llua - liblxp.dylib : lxplib.o - gcc -o liblxp.dylib -dynamiclib lxplib.o -lexpat -llua.5.0 -llualib.5.0 + $(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c + $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c diff --git a/textproc/lua-expat/patches/patch-ab b/textproc/lua-expat/patches/patch-ab deleted file mode 100644 index 1c4cd29c76a..00000000000 --- a/textproc/lua-expat/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/04/05 13:57:53 xtraeme Exp $ - ---- lxplib.c.orig 2004-01-29 22:56:49.000000000 +0000 -+++ lxplib.c 2004-01-29 22:56:56.000000000 +0000 -@@ -9,7 +9,7 @@ - #include - #include - --#include -+#include - - #include - #include 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 -- cgit v1.2.3