git: ba33b2293367 - main - textproc/luaexpat: Update to 1.4.1

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Sun, 22 May 2022 05:17:37 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ba33b2293367000602c9dad83e0bb322bc107c2d

commit ba33b2293367000602c9dad83e0bb322bc107c2d
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-05-22 04:27:30 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-05-22 05:11:38 +0000

    textproc/luaexpat: Update to 1.4.1
    
    - Update MASTER_SITES
    - Update WWW
    - While I'm here, update pkg-descr
    
    PR:             263978
    Reported by:    Thomas Morper <thomas@beingboiled.info>
---
 textproc/luaexpat/Makefile             | 13 +++++++------
 textproc/luaexpat/distinfo             |  5 +++--
 textproc/luaexpat/files/patch-Makefile |  8 ++++++--
 textproc/luaexpat/pkg-descr            | 18 +++++++++---------
 textproc/luaexpat/pkg-plist            |  2 ++
 5 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/textproc/luaexpat/Makefile b/textproc/luaexpat/Makefile
index 60d656237f77..3fe3ada9a1c0 100644
--- a/textproc/luaexpat/Makefile
+++ b/textproc/luaexpat/Makefile
@@ -1,14 +1,12 @@
 # Created by: Andrew Lewis <freeghb@gmail.com>
 
 PORTNAME=	luaexpat
-PORTVERSION=	1.3.0
-PORTREVISION=	5
+PORTVERSION=	1.4.1
 CATEGORIES=	textproc
-MASTER_SITES=	https://matthewwild.co.uk/projects/luaexpat/
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	SAX XML parser based on Expat library
+COMMENT=	SAX XML parser based on the Expat library
 
 LICENSE=	MIT
 
@@ -16,10 +14,13 @@ LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		gmake lua:module
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	lunarmodules
+
 ALL_TARGET=	lib
 CFLAGS+=	-fPIC
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ARGS=	COMMON_CFLAGS="-Wall"
-MAKE_ENV=	EXPAT_INC=-I${LOCALBASE}/include LUA_CDIR=${LUA_MODLIBDIR} LUA_INC=-I${LUA_INCDIR} LUA_LDIR=${LUA_MODSHAREDIR}
+MAKE_ARGS=	COMMON_CFLAGS=-Wall
+MAKE_ENV=	EXPAT_INC=-I${LOCALBASE}/include LUA_CDIR=${LUA_MODLIBDIR} LUA_INC=-I${LUA_INCDIR} LUA_LDIR=${LUA_MODSHAREDIR} LUA_V=${LUA_VER}
 
 .include <bsd.port.mk>
diff --git a/textproc/luaexpat/distinfo b/textproc/luaexpat/distinfo
index 1ee03c75366b..8cbbae800ad0 100644
--- a/textproc/luaexpat/distinfo
+++ b/textproc/luaexpat/distinfo
@@ -1,2 +1,3 @@
-SHA256 (luaexpat-1.3.0.tar.gz) = d060397960d87b2c89cf490f330508b7def1a0677bdc120531c571609fc57dc3
-SIZE (luaexpat-1.3.0.tar.gz) = 29567
+TIMESTAMP = 1653151296
+SHA256 (lunarmodules-luaexpat-1.4.1_GH0.tar.gz) = d528060d45865b44bef7215ef8a440165b668f363a4af53358389f0315a8593c
+SIZE (lunarmodules-luaexpat-1.4.1_GH0.tar.gz) = 52159
diff --git a/textproc/luaexpat/files/patch-Makefile b/textproc/luaexpat/files/patch-Makefile
index c6f135d16d82..31c565b875cd 100644
--- a/textproc/luaexpat/files/patch-Makefile
+++ b/textproc/luaexpat/files/patch-Makefile
@@ -1,15 +1,19 @@
---- Makefile.orig	2014-04-02 23:30:37 UTC
+--- Makefile.orig	2022-04-01 08:20:20 UTC
 +++ Makefile
-@@ -27,8 +27,10 @@ src/$(LIBNAME):
+@@ -27,10 +27,12 @@ src/$(LIBNAME):
  	$(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
+-	$(INSTALL_PROGRAM) -D src/$T/totable.lua $(DESTDIR)$(LUA_LDIR)/$T/totable.lua
+-	$(INSTALL_PROGRAM) -D src/$T/threat.lua $(DESTDIR)$(LUA_LDIR)/$T/threat.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
++	$(INSTALL_PROGRAM) src/$T/totable.lua $(DESTDIR)$(LUA_LDIR)/$T/totable.lua
++	$(INSTALL_PROGRAM) src/$T/threat.lua $(DESTDIR)$(LUA_LDIR)/$T/threat.lua
  
  clean:
  	$(RM) src/$(LIBNAME) $(OBJS)
diff --git a/textproc/luaexpat/pkg-descr b/textproc/luaexpat/pkg-descr
index 322a7b4993a7..6de168aec9ed 100644
--- a/textproc/luaexpat/pkg-descr
+++ b/textproc/luaexpat/pkg-descr
@@ -1,15 +1,15 @@
 LuaExpat is a SAX XML parser based on the Expat library. SAX is the Simple API
 for XML and allows programs to:
-
-* process a XML document incrementally, thus being able to handle huge
-  documents without memory penalties;
-* register handler functions which are called by the parser during the
+- process a XML document incrementally, thus being able to handle huge documents
+  without memory penalties;
+- register handler functions which are called by the parser during the
   processing of the document, handling the document elements or text.
 
 With an event-based API like SAX the XML document can be fed to the parser in
-chunks, and the parsing begins as soon as the parser receives the first
-document chunk. LuaExpat reports parsing events (such as the start and end of
-elements) directly to the application through callbacks. The parsing of huge
-documents can benefit from this piecemeal operation.
+chunks, and the parsing begins as soon as the parser receives the first document
+chunk. LuaExpat reports parsing events (such as the start and end of elements)
+directly to the application through callbacks. The parsing of huge documents can
+benefit from this piecemeal operation.
 
-WWW: https://www.keplerproject.org/luaexpat/
+WWW: https://lunarmodules.github.io/luaexpat/
+WWW: https://github.com/lunarmodules/luaexpat
diff --git a/textproc/luaexpat/pkg-plist b/textproc/luaexpat/pkg-plist
index 1957ead18ad6..0c507687f33a 100644
--- a/textproc/luaexpat/pkg-plist
+++ b/textproc/luaexpat/pkg-plist
@@ -1,2 +1,4 @@
 %%LUA_MODLIBDIR%%/lxp.so
 %%LUA_MODSHAREDIR%%/lxp/lom.lua
+%%LUA_MODSHAREDIR%%/lxp/threat.lua
+%%LUA_MODSHAREDIR%%/lxp/totable.lua