Update to 1.3.0.

PR:		188230
Submitted by:	dar

6 files changed, 22 insertions, 80 deletions

diff --git a/textproc/luaexpat/Makefile b/textproc/luaexpat/Makefile
index 159bc700a18a..c843b8fb84f2 100644
--- a/textproc/luaexpat/Makefile
+++ b/textproc/luaexpat/Makefile
@@ -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 based on the Expat library
 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>
diff --git a/textproc/luaexpat/distinfo b/textproc/luaexpat/distinfo
index 842edb1280ee..1ee03c75366b 100644
--- a/textproc/luaexpat/distinfo
+++ b/textproc/luaexpat/distinfo
@@ -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
diff --git a/textproc/luaexpat/files/patch-Makefile b/textproc/luaexpat/files/patch-Makefile
new file mode 100644
index 000000000000..f2dc00fab21b
--- /dev/null
+++ b/textproc/luaexpat/files/patch-Makefile
@@ -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)
diff --git a/textproc/luaexpat/files/patch-config b/textproc/luaexpat/files/patch-config
deleted file mode 100644
index 54f48eec42c0..000000000000
--- a/textproc/luaexpat/files/patch-config
+++ /dev/null
@@ -1,41 +0,0 @@
---- config.orig	2006-06-09 00:41:48.000000000 +0400
-+++ config	2009-07-15 22:46:59.000000000 +0400
-@@ -1,15 +1,15 @@
- # Installation directories
- # System's libraries directory (where binary libraries are installed)
--LUA_LIBDIR= /usr/local/lib/lua/5.0
-+LUA_LIBDIR= ${LUA_MODLIBDIR}
- # System's lua directory (where Lua libraries are installed)
--LUA_DIR= /usr/local/share/lua/5.0
-+LUA_DIR= ${LUA_MODSHAREDIR}
- # Lua includes directory
--LUA_INC= /usr/local/include
-+LUA_INC= ${LUA_INCDIR}
- # Expat includes directory
--EXPAT_INC= /usr/local/include
-+EXPAT_INC= ${LOCALBASE}/include
- 
- # OS dependent
--LIB_OPTION= -shared #for Linux
-+LIB_OPTION= -L${LOCALBASE}/lib -shared #for Linux
- #LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
- 
- LIBNAME= $T.so.$V
-@@ -18,7 +18,7 @@
- # 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
--COMPAT_DIR= ../compat/src
-+COMPAT_DIR= ${LUA_MODLIBDIR}
- 
- # Compilation parameters
- CWARNS = -Wall -pedantic \
-@@ -31,6 +31,6 @@
-         -Wshadow \
-         -Wwrite-strings
- 
--CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \
-+CFLAGS += $(CWARNS) -ansi -O2 -I$(LUA_INC) \
-    -I$(COMPAT_DIR) -I$(EXPAT_INC)
--CC = gcc
-+CC? = gcc
diff --git a/textproc/luaexpat/files/patch-makefile b/textproc/luaexpat/files/patch-makefile
deleted file mode 100644
index 995146166475..000000000000
--- a/textproc/luaexpat/files/patch-makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-
-$FreeBSD$
-
---- makefile.orig
-+++ makefile
-@@ -4,10 +4,6 @@
- 
- include $(CONFIG)
- 
--ifeq "$(LUA_VERSION_NUM)" "500"
--COMPAT_O= $(COMPAT_DIR)/compat-5.1.o
--endif
--
- OBJS= src/lxplib.o $(COMPAT_O)
- lib: src/$(LIBNAME)
- 
-@@ -18,11 +14,11 @@
- 	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
- 
- install:
--	mkdir -p $(LUA_LIBDIR)
--	cp src/$(LIBNAME) $(LUA_LIBDIR)
--	cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
--	mkdir -p $(LUA_DIR)/$T
--	cp src/$T/lom.lua $(LUA_DIR)/$T
-+	mkdir -p $(DESTDIR)$(LUA_LIBDIR)
-+	cp src/$(LIBNAME) $(DESTDIR)$(LUA_LIBDIR)
-+	cd $(DESTDIR)$(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
-+	mkdir -p $(DESTDIR)$(LUA_DIR)/$T
-+	cp src/$T/lom.lua $(DESTDIR)$(LUA_DIR)/$T
- 
- clean:
- 	rm -f src/$(LIBNAME) $(OBJS)
diff --git a/textproc/luaexpat/pkg-plist b/textproc/luaexpat/pkg-plist
index 5540b92fca15..ca4e9c5fbeac 100644
--- a/textproc/luaexpat/pkg-plist
+++ b/textproc/luaexpat/pkg-plist
@@ -1,4 +1,3 @@
 %%LUA_MODLIBDIR%%/lxp.so
-%%LUA_MODLIBDIR%%/lxp.so.1.2.0
 %%LUA_MODSHAREDIR%%/lxp/lom.lua
-@dirrm share/lua/5.1/lxp
+@dirrm %%LUA_MODSHAREDIR%%/lxp