Update lua-expat to 1.3.0.

- Lua 5.2 support (thanks Tomás Guisasola Gorham)
- support for the XmlDecl handler
- add parser:getcurrentbytecount() (XML_GetCurrentByteCount)
- ability to disable CharacterData merging
- Makefile improvements (thanks Vadim Misbakh-Soloviov)

3 files changed, 13 insertions, 15 deletions

diff --git a/textproc/lua-expat/Makefile b/textproc/lua-expat/Makefile
index 73bdc6fb20c..322038d94fd 100644
--- a/textproc/lua-expat/Makefile
+++ b/textproc/lua-expat/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2013/09/01 04:48:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.20 2014/04/07 19:39:17 fhajny Exp $
 #
 
-DISTNAME=	lua-expat-1f41c74ce686
-PKGNAME=	${LUA_PKGPREFIX}-expat-1.2.0.20130831
+DISTNAME=	luaexpat-1.3.0
+PKGNAME=	${DISTNAME:S/lua/${LUA_PKGPREFIX}-/}
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITES=	https://matthewwild.co.uk/projects/luaexpat/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://matthewwild.co.uk/projects/luaexpat/
diff --git a/textproc/lua-expat/distinfo b/textproc/lua-expat/distinfo
index a4b45b8e055..9bfb59378de 100644
--- a/textproc/lua-expat/distinfo
+++ b/textproc/lua-expat/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2013/09/01 04:48:21 ryoon Exp $
+$NetBSD: distinfo,v 1.7 2014/04/07 19:39:17 fhajny Exp $
 
-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
+SHA1 (luaexpat-1.3.0.tar.gz) = e56bbf2e980ffb3f82629270221bdf98f3bd757b
+RMD160 (luaexpat-1.3.0.tar.gz) = 1ccd4303dd71f5d6d8207479e34051fd09ba2d43
+Size (luaexpat-1.3.0.tar.gz) = 29567 bytes
+SHA1 (patch-Makefile) = 5110d3a8201bec9b857d4d9270431df922927da4
diff --git a/textproc/lua-expat/patches/patch-Makefile b/textproc/lua-expat/patches/patch-Makefile
index 971cefbcc11..5c547f54e12 100644
--- a/textproc/lua-expat/patches/patch-Makefile
+++ b/textproc/lua-expat/patches/patch-Makefile
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile,v 1.1 2013/09/01 04:48:21 ryoon Exp $
+$NetBSD: patch-Makefile,v 1.2 2014/04/07 19:39:17 fhajny Exp $
 
 * Remove -D option of install, BSD install does not support it.
 
---- Makefile.orig	2013-05-29 22:02:24.000000000 +0000
+--- Makefile.orig	2014-04-02 23:30:37.000000000 +0000
 +++ Makefile
 @@ -27,8 +27,8 @@ src/$(LIBNAME):
- 	$(CC) $(CF) $(LF) -o $@ src/$(T)lib.c
+ 	$(CC) $(CF) -o $@ src/$(T)lib.c $(LF)
  
  install:
 -	$(INSTALL_PROGRAM) -D src/$(LIBNAME) $(DESTDIR)$(LUA_CDIR)/$(LIBNAME)
@@ -14,6 +14,4 @@ $NetBSD: patch-Makefile,v 1.1 2013/09/01 04:48:21 ryoon Exp $
 +	$(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)
+ 	$(RM) src/$(LIBNAME) $(OBJS)