kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 1.2.0.20130831 (hg current)

Browse source 
* Fix build with lua 5.2.
* Examples are not provided anymore, remove MESSAGE.

Changelog:
unknown.
This commit is contained in:
ryoon 2013-09-01 04:48:21 +00:00
parent 0b7544ca51
commit 28a25002cc
7 changed files with 37 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
textproc/lua-expat/MESSAGE
View file

@ -1,8 +0,0 @@
===========================================================================
$NetBSD: MESSAGE,v 1.3 2009/12/15 12:43:04 fhajny Exp $
The examples have been installed in:
${PREFIX}/share/examples/lua
===========================================================================

25
textproc/lua-expat/Makefile
View file

@ -1,34 +1,29 @@
# $NetBSD: Makefile,v 1.18 2013/08/15 06:32:06 obache Exp $
# $NetBSD: Makefile,v 1.19 2013/09/01 04:48:21 ryoon Exp $
#
DISTNAME= luaexpat-1.2.0
PKGNAME= ${DISTNAME:S/lua/lua-/}
PKGREVISION= 1
DISTNAME= lua-expat-1f41c74ce686
PKGNAME= ${LUA_PKGPREFIX}-expat-1.2.0.20130831
CATEGORIES= textproc
MASTER_SITES= http://matthewwild.co.uk/projects/luaexpat/
MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://matthewwild.co.uk/projects/projects
HOMEPAGE= http://matthewwild.co.uk/projects/luaexpat/
COMMENT= XML parser for LUA based on expat
LICENSE= mit
USE_TOOLS+= gmake
MAKE_FILE= makefile
CFLAGS+= -fPIC
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_CDIR=${PREFIX}/${LUA_CDIR}
MAKE_FLAGS+= LUA_LDIR=${PREFIX}/${LUA_LDIR}
MAKE_FLAGS+= LUA_INC=-I${BUILDLINK_PREFIX.lua}/include
MAKE_FLAGS+= EXPAT_INC=-I${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_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
INSTALLATION_DIRS= ${LUA_CDIR} ${LUA_LDIR}/lxp
.include "../../textproc/expat/buildlink3.mk"
.include "../../lang/lua/module.mk"

7
textproc/lua-expat/PLIST
View file

@ -1,4 +1,3 @@
@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
@comment $NetBSD: PLIST,v 1.3 2013/09/01 04:48:21 ryoon Exp $
lib/lua/5.2/lxp.so
share/lua/5.2/lxp/lom.lua

11
textproc/lua-expat/distinfo
View file

@ -1,7 +1,6 @@
$NetBSD: distinfo,v 1.5 2011/06/04 23:13:40 schnoebe Exp $
$NetBSD: distinfo,v 1.6 2013/09/01 04:48:21 ryoon Exp $
SHA1 (luaexpat-1.2.0.tar.gz) = 76f036e6fb928a3e5f3c3ba1b854e5fef8e1b28f
RMD160 (luaexpat-1.2.0.tar.gz) = e92fb3447b3cd17bdd03ebfdaf000a1f001c59f2
Size (luaexpat-1.2.0.tar.gz) = 28621 bytes
SHA1 (patch-aa) = dd908d36c310b3a17a7e2319dc4f969a903f9402
SHA1 (patch-ac) = 61d9bb455ef189d6ceb5dd71b06f7218da29e2f9
SHA1 (lua-expat-1f41c74ce686.tar.gz) = 06027ced5a8c54beeea78ff3eafb3179eb1cba6f
RMD160 (lua-expat-1f41c74ce686.tar.gz) = 4fb772cac21af31d43b34a742b2f4b81117f047f
Size (lua-expat-1f41c74ce686.tar.gz) = 28917 bytes
SHA1 (patch-Makefile) = f9a31f0b0964fcafbf01f0e3bbb45ce97a4a708d

19
textproc/lua-expat/patches/patch-Makefile Normal file
View file

@ -0,0 +1,19 @@
$NetBSD: patch-Makefile,v 1.1 2013/09/01 04:48:21 ryoon Exp $
* Remove -D option of install, BSD install does not support it.
--- Makefile.orig 2013-05-29 22:02:24.000000000 +0000
+++ Makefile
@@ -27,8 +27,8 @@ src/$(LIBNAME):
$(CC) $(CF) $(LF) -o $@ src/$(T)lib.c
install:
- $(INSTALL_PROGRAM) -D src/$(LIBNAME) $(DESTDIR)$(LUA_CDIR)/$(LIBNAME)
- $(INSTALL_PROGRAM) -D src/$T/lom.lua $(DESTDIR)$(LUA_LDIR)/$T/lom.lua
+ $(INSTALL_PROGRAM) src/$(LIBNAME) $(DESTDIR)$(LUA_CDIR)/$(LIBNAME)
+ $(INSTALL_PROGRAM) src/$T/lom.lua $(DESTDIR)$(LUA_LDIR)/$T/lom.lua
clean:
- $(RM) src/$(LIBNAME) $(OBJS)
\ No newline at end of file
+ $(RM) src/$(LIBNAME) $(OBJS)

17
textproc/lua-expat/patches/patch-aa
View file

@ -1,17 +0,0 @@
$NetBSD: patch-aa,v 1.3 2009/12/15 12:43:04 fhajny Exp $
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)
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
$(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c

41
textproc/lua-expat/patches/patch-ac
View file

@ -1,41 +0,0 @@
$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