Sun Sep 1 04:48:21 2013 UTC ()
Update to 1.2.0.20130831 (hg current)

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

Changelog:
unknown.


(ryoon)
diff -r1.3 -r0 pkgsrc/textproc/lua-expat/MESSAGE
diff -r1.18 -r1.19 pkgsrc/textproc/lua-expat/Makefile
diff -r1.2 -r1.3 pkgsrc/textproc/lua-expat/PLIST
diff -r1.5 -r1.6 pkgsrc/textproc/lua-expat/distinfo
diff -r0 -r1.1 pkgsrc/textproc/lua-expat/patches/patch-Makefile
diff -r1.3 -r0 pkgsrc/textproc/lua-expat/patches/patch-aa
diff -r1.1 -r0 pkgsrc/textproc/lua-expat/patches/patch-ac

File Deleted: pkgsrc/textproc/lua-expat/Attic/MESSAGE

cvs diff -r1.18 -r1.19 pkgsrc/textproc/lua-expat/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/lua-expat/Makefile 2013/08/15 06:32:06 1.18
+++ pkgsrc/textproc/lua-expat/Makefile 2013/09/01 04:48:21 1.19
@@ -1,35 +1,30 @@ @@ -1,35 +1,30 @@
1# $NetBSD: Makefile,v 1.18 2013/08/15 06:32:06 obache Exp $ 1# $NetBSD: Makefile,v 1.19 2013/09/01 04:48:21 ryoon Exp $
2# 2#
3 3
4DISTNAME= luaexpat-1.2.0 4DISTNAME= lua-expat-1f41c74ce686
5PKGNAME= ${DISTNAME:S/lua/lua-/} 5PKGNAME= ${LUA_PKGPREFIX}-expat-1.2.0.20130831
6PKGREVISION= 1 
7CATEGORIES= textproc 6CATEGORIES= textproc
8MASTER_SITES= http://matthewwild.co.uk/projects/luaexpat/ 7MASTER_SITES= ${MASTER_SITE_LOCAL}
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://matthewwild.co.uk/projects/projects 10HOMEPAGE= http://matthewwild.co.uk/projects/luaexpat/
12COMMENT= XML parser for LUA based on expat 11COMMENT= XML parser for LUA based on expat
13LICENSE= mit 12LICENSE= mit
14 13
15USE_TOOLS+= gmake 14USE_TOOLS+= gmake
16MAKE_FILE= makefile 
17 15
18CFLAGS+= -fPIC 16CFLAGS+= -fPIC
19 17
20MAKE_FLAGS+= LUA_DIR=${BUILDLINK_PREFIX.lua} 18MAKE_FLAGS+= LUA_DIR=${BUILDLINK_PREFIX.lua}
21MAKE_FLAGS+= LUA_INC=${BUILDLINK_PREFIX.lua}/include 19MAKE_FLAGS+= LUA_CDIR=${PREFIX}/${LUA_CDIR}
22MAKE_FLAGS+= EXPAT_INC=${BUILDLINK_PREFIX.expat}/include 20MAKE_FLAGS+= LUA_LDIR=${PREFIX}/${LUA_LDIR}
 21MAKE_FLAGS+= LUA_INC=-I${BUILDLINK_PREFIX.lua}/include
 22MAKE_FLAGS+= EXPAT_INC=-I${BUILDLINK_PREFIX.expat}/include
23MAKE_FLAGS+= LUA_VERSION_NUM=${LUA_VERSION_MAJOR}0${LUA_VERSION_MINOR} 23MAKE_FLAGS+= LUA_VERSION_NUM=${LUA_VERSION_MAJOR}0${LUA_VERSION_MINOR}
24BUILD_TARGET= lib 24BUILD_TARGET= lib
25 25
26INSTALLATION_DIRS= ${LUA_CDIR} ${LUA_LDIR} share/examples/lua 26INSTALLATION_DIRS= ${LUA_CDIR} ${LUA_LDIR}/lxp
27 
28do-install: 
29 ${INSTALL_LIB} ${WRKSRC}/src/lxp.so.${PKGVERSION} ${DESTDIR}${PREFIX}/${LUA_CDIR}/lxp.so 
30 ${INSTALL_DATA} ${WRKSRC}/src/lxp/lom.lua ${DESTDIR}${PREFIX}/${LUA_LDIR}/lom.lua 
31 ${INSTALL_DATA} ${WRKSRC}/tests/test.lua ${DESTDIR}${PREFIX}/share/examples/lua/lxp.lua 
32 27
33.include "../../textproc/expat/buildlink3.mk" 28.include "../../textproc/expat/buildlink3.mk"
34.include "../../lang/lua/module.mk" 29.include "../../lang/lua/module.mk"
35.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"

cvs diff -r1.2 -r1.3 pkgsrc/textproc/lua-expat/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/lua-expat/PLIST 2009/12/15 12:43:04 1.2
+++ pkgsrc/textproc/lua-expat/PLIST 2013/09/01 04:48:21 1.3
@@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
1@comment $NetBSD: PLIST,v 1.2 2009/12/15 12:43:04 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.3 2013/09/01 04:48:21 ryoon Exp $
2${LUA_CDIR}/lxp.so 2lib/lua/5.2/lxp.so
3${LUA_LDIR}/lom.lua 3share/lua/5.2/lxp/lom.lua
4share/examples/lua/lxp.lua 

cvs diff -r1.5 -r1.6 pkgsrc/textproc/lua-expat/distinfo (expand / switch to unified diff)

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

File Added: pkgsrc/textproc/lua-expat/patches/patch-Makefile
$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)

File Deleted: pkgsrc/textproc/lua-expat/patches/Attic/patch-aa

File Deleted: pkgsrc/textproc/lua-expat/patches/Attic/patch-ac