aboutsummaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
Diffstat (limited to 'converters')
-rw-r--r--converters/Makefile1
-rw-r--r--converters/lua-iconv/Makefile6
-rw-r--r--converters/lua-json/Makefile5
-rw-r--r--converters/lua51-iconv/Makefile37
-rw-r--r--converters/lua51-iconv/distinfo2
-rw-r--r--converters/lua51-iconv/pkg-descr3
6 files changed, 5 insertions, 49 deletions
diff --git a/converters/Makefile b/converters/Makefile
index 505d19f029a4..5ba0c0c8f6e3 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -49,7 +49,6 @@
SUBDIR += linux-c7-fribidi
SUBDIR += lua-iconv
SUBDIR += lua-json
- SUBDIR += lua51-iconv
SUBDIR += mimelib
SUBDIR += mmencode
SUBDIR += mpack
diff --git a/converters/lua-iconv/Makefile b/converters/lua-iconv/Makefile
index c1248f454de1..80834db15a2b 100644
--- a/converters/lua-iconv/Makefile
+++ b/converters/lua-iconv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= iconv
PORTVERSION= 7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= converters
MASTER_SITES= GHC
PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}
@@ -13,13 +13,11 @@ MAINTAINER= vanilla@FreeBSD.org
COMMENT= Iconv binding for Lua 5
BROKEN= unfetchable
-DEPRECATED= Broken for more than 6 months
-EXPIRATION_DATE= 2020-05-05
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= pkgconfig iconv lua
+USES= pkgconfig iconv lua:module
USE_GITHUB= yes
GH_ACCOUNT= ittner
diff --git a/converters/lua-json/Makefile b/converters/lua-json/Makefile
index b6aae5c87861..a881f987fc42 100644
--- a/converters/lua-json/Makefile
+++ b/converters/lua-json/Makefile
@@ -3,17 +3,18 @@
PORTNAME= json
PORTVERSION= 1.3.4
+PORTREVISION= 1
CATEGORIES= converters
PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= JSON parser/creator for Lua
-RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}lpeg>=0.8.1:devel/lua-lpeg
+RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}lpeg>=0.8.1:devel/lua-lpeg@${LUA_FLAVOR}
MAKE_ARGS= INSTALL_CMOD=${LUA_MODLIBDIR} INSTALL_LMOD=${LUA_MODSHAREDIR}
NO_ARCH= yes
-USES= lua:run
+USES= lua:run,module
GH_ACCOUNT= harningt
GH_PROJECT= lua${PORTNAME}
diff --git a/converters/lua51-iconv/Makefile b/converters/lua51-iconv/Makefile
deleted file mode 100644
index 755db5753d1a..000000000000
--- a/converters/lua51-iconv/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Created by: vanilla@
-# $FreeBSD$
-
-PORTNAME= iconv
-PORTVERSION= 7
-PORTREVISION= 2
-CATEGORIES= converters
-MASTER_SITES= GHC
-PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}
-DISTNAME= lua-${PORTNAME}-${PORTVERSION}
-
-MAINTAINER= feld@FreeBSD.org
-COMMENT= Iconv binding for Lua 5
-
-BROKEN= unfetchable
-DEPRECATED= Broken for more than 6 months
-EXPIRATION_DATE= 2020-05-05
-
-USES= pkgconfig iconv lua:51
-
-USE_GITHUB= yes
-GH_ACCOUNT= ittner
-GH_PROJECT= lua-${PORTNAME}
-
-PLIST_FILES= %%LUA_MODLIBDIR%%/iconv.so
-CFLAGS+= `pkgconf --cflags lua-${LUA_VER}` -I${LOCALBASE}/include
-MAKE_ARGS= LUABIN=${LUA_CMD} CFLAGS="${CFLAGS}"
-LDFLAGS= -shared ${ICONV_LIB} -L${LOCALBASE}/lib
-CFLAGS_aarch64= -fPIC
-CFLAGS_amd64= -fPIC
-CFLAGS_i386= -fPIC
-
-do-install:
- @${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
- ${INSTALL_LIB} ${WRKSRC}/iconv.so ${STAGEDIR}${LUA_MODLIBDIR}
-
-.include <bsd.port.mk>
diff --git a/converters/lua51-iconv/distinfo b/converters/lua51-iconv/distinfo
deleted file mode 100644
index 56330757c184..000000000000
--- a/converters/lua51-iconv/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (lua-iconv-7.tar.gz) = c1db1915c754b5cfe7e45af61467bc6dfa4f0037d281ccbce6b53c974e2faf09
-SIZE (lua-iconv-7.tar.gz) = 7693
diff --git a/converters/lua51-iconv/pkg-descr b/converters/lua51-iconv/pkg-descr
deleted file mode 100644
index e521ca40c1cc..000000000000
--- a/converters/lua51-iconv/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-LuaIconv is a Lua binding to iconv library.
-
-WWW: http://luaforge.net/projects/lua-iconv/