svn commit: r357225 - in head/textproc/luaexpat: . files

[David Thiel]

Author: lx
Date: Mon Jun  9 23:33:33 2014
New Revision: 357225
URL: http://svnweb.freebsd.org/changeset/ports/357225
QAT: https://qat.redports.org/buildarchive/r357225/

Log:
  Update to 1.3.0.
  
  PR:		188230
  Submitted by:	dar

Added:
  head/textproc/luaexpat/files/patch-Makefile   (contents, props changed)
Deleted:
  head/textproc/luaexpat/files/patch-config
  head/textproc/luaexpat/files/patch-makefile
Modified:
  head/textproc/luaexpat/Makefile
  head/textproc/luaexpat/distinfo
  head/textproc/luaexpat/pkg-plist

Modified: head/textproc/luaexpat/Makefile
==============================================================================
--- head/textproc/luaexpat/Makefile	Mon Jun  9 23:29:50 2014	(r357224)
+++ head/textproc/luaexpat/Makefile	Mon Jun  9 23:33:33 2014	(r357225)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	luaexpat
-PORTVERSION=	1.2.0
+PORTVERSION=	1.3.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://matthewwild.co.uk/projects/luaexpat/ \
 				http://redundancy.redundancy.org/mirror/
@@ -14,9 +14,11 @@ COMMENT=	LuaExpat is a SAX XML parser ba
 LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 
 USES=		gmake lua:51
-MAKEFILE=	makefile
+USE_LUA=	5.1-5.2
 ALL_TARGET=	lib
 
 CFLAGS+=	-fPIC
+LDFLAGS+=	-L${LOCALBASE}/lib
+MAKE_ENV=	LUA_CDIR=${LUA_MODLIBDIR} LUA_LDIR=${LUA_MODSHAREDIR} LUA_INC="-I${LUA_INCDIR}" EXPAT_INC="-I${LOCALBASE}/include"
 
 .include <bsd.port.mk>

Modified: head/textproc/luaexpat/distinfo
==============================================================================
--- head/textproc/luaexpat/distinfo	Mon Jun  9 23:29:50 2014	(r357224)
+++ head/textproc/luaexpat/distinfo	Mon Jun  9 23:33:33 2014	(r357225)
@@ -1,2 +1,2 @@
-SHA256 (luaexpat-1.2.0.tar.gz) = 2a7140e9c1923510639e87b60e85d7ddd0cd4e27561663bd9d4031ef90bae5ef
-SIZE (luaexpat-1.2.0.tar.gz) = 28621
+SHA256 (luaexpat-1.3.0.tar.gz) = d060397960d87b2c89cf490f330508b7def1a0677bdc120531c571609fc57dc3
+SIZE (luaexpat-1.3.0.tar.gz) = 29567

Added: head/textproc/luaexpat/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/luaexpat/files/patch-Makefile	Mon Jun  9 23:33:33 2014	(r357225)
@@ -0,0 +1,15 @@
+--- Makefile.orig	2014-04-02 16:30:37.000000000 -0700
++++ Makefile	2014-06-09 16:02:02.000000000 -0700
+@@ -27,8 +27,10 @@
+ 	$(CC) $(CF) -o $@ src/$(T)lib.c $(LF)
+ 
+ install:
+-	$(INSTALL_PROGRAM) -D src/$(LIBNAME) $(DESTDIR)$(LUA_CDIR)/$(LIBNAME)
+-	$(INSTALL_PROGRAM) -D src/$T/lom.lua $(DESTDIR)$(LUA_LDIR)/$T/lom.lua
++	mkdir -p $(DESTDIR)$(LUA_CDIR)
++	mkdir -p $(DESTDIR)$(LUA_LDIR)/$T
++	$(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)

Modified: head/textproc/luaexpat/pkg-plist
==============================================================================
--- head/textproc/luaexpat/pkg-plist	Mon Jun  9 23:29:50 2014	(r357224)
+++ head/textproc/luaexpat/pkg-plist	Mon Jun  9 23:33:33 2014	(r357225)
@@ -1,4 +1,3 @@
 %%LUA_MODLIBDIR%%/lxp.so
-%%LUA_MODLIBDIR%%/lxp.so.1.2.0
 %%LUA_MODSHAREDIR%%/lxp/lom.lua
- at dirrm share/lua/5.1/lxp
+ at dirrm %%LUA_MODSHAREDIR%%/lxp