devel: Add lua-bit32, this replaces lua-bitlib with a newer version

lua-bitlib has a confusing name that doesn't match the name of the actual
Lua module, to the extent that I packaged this without realizing it had
already been packaged. :(

bit32 is the native Lua 5.2+ bit manipulation library.

This package contains bit32 distributed as a module for use by all
Lua versions.

10 files changed, 56 insertions, 43 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 4170d0e7779..18ab4c235cc 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3172 2020/07/11 12:56:17 nia Exp $
+# $NetBSD: Makefile,v 1.3173 2020/07/11 13:58:10 nia Exp $
 #
 
 COMMENT=	Development utilities
@@ -851,7 +851,7 @@ SUBDIR+=	lua-ansicolors
 SUBDIR+=	lua-argparse
 SUBDIR+=	lua-basexx
 SUBDIR+=	lua-binaryheap
-SUBDIR+=	lua-bitlib
+SUBDIR+=	lua-bit32
 SUBDIR+=	lua-busted
 SUBDIR+=	lua-cliargs
 SUBDIR+=	lua-compat53
diff --git a/devel/lua-bit32/DESCR b/devel/lua-bit32/DESCR
new file mode 100644
index 00000000000..6489473078e
--- /dev/null
+++ b/devel/lua-bit32/DESCR
@@ -0,0 +1,4 @@
+bit32 is the native Lua 5.2+ bit manipulation library.
+
+This package contains bit32 distributed as a module for use by all
+Lua versions.
diff --git a/devel/lua-bit32/Makefile b/devel/lua-bit32/Makefile
new file mode 100644
index 00000000000..a88f08d8b87
--- /dev/null
+++ b/devel/lua-bit32/Makefile
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile,v 1.1 2020/07/11 13:58:11 nia Exp $
+
+# Keep versioning in sync with the luarocks rockspec.
+DISTNAME=	lua-compat53-0.9
+PKGNAME=	${LUA_PKGPREFIX}-bit32-5.3.5
+CATEGORIES=	devel lua
+MASTER_SITES=	${MASTER_SITE_GITHUB:=keplerproject/}
+GITHUB_PROJECT=	lua-compat-5.3
+GITHUB_TAG=	v${DISTNAME:S/^lua-compat53-//1}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://luarocks.org/modules/siffiejoe/bit32
+COMMENT=	Lua 5.2 bit manipulation library
+LICENSE=	mit
+
+CONFLICTS+=	${LUA_PKGPREFIX}-bitlib-[0-9]*
+SUPERSEDES+=	${LUA_PKGPREFIX}-bitlib-[0-9]*
+
+INSTALLATION_DIRS+=	${LUA_CDIR}
+
+pre-build:
+	${CP} -f ${FILESDIR}/Makefile ${WRKSRC}/Makefile
+
+do-install:
+	${INSTALL_LIB} ${WRKSRC}/bit32.so \
+		${DESTDIR}${PREFIX}/${LUA_CDIR}/bit32.so
+
+do-test:
+	cd ${WRKSRC}/tests && LUA_CPATH=${WRKSRC}/?.so \
+	    ${LUA_INTERPRETER} test-bit32.lua
+
+.include "../../lang/lua/module.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/lua-bit32/PLIST b/devel/lua-bit32/PLIST
new file mode 100644
index 00000000000..e3e88c3758c
--- /dev/null
+++ b/devel/lua-bit32/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2020/07/11 13:58:11 nia Exp $
+${LUA_CDIR}/bit32.so
diff --git a/devel/lua-bit32/distinfo b/devel/lua-bit32/distinfo
new file mode 100644
index 00000000000..5de8bd487cc
--- /dev/null
+++ b/devel/lua-bit32/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2020/07/11 13:58:11 nia Exp $
+
+SHA1 (lua-compat53-0.9.tar.gz) = e1f2f8052dacb30295c768969547423c882bf3ee
+RMD160 (lua-compat53-0.9.tar.gz) = ae80f773f517885dad3e64863aaf9b56d40d535c
+SHA512 (lua-compat53-0.9.tar.gz) = bec15b6e95cb5cc775785515eba1f094e453059a0ba1eefa433d328b823378b7f48d9c7a34080ad77478cffb2008bead93418f809793afa6021e6046562acc58
+Size (lua-compat53-0.9.tar.gz) = 53599 bytes
diff --git a/devel/lua-bit32/files/Makefile b/devel/lua-bit32/files/Makefile
new file mode 100644
index 00000000000..7253fb90da7
--- /dev/null
+++ b/devel/lua-bit32/files/Makefile
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2020/07/11 13:58:11 nia Exp $
+
+all: bit32.so
+
+.c.o:
+	$(CC) $(CFLAGS) -DLUA_COMPAT_BITLIB -fPIC -c $<
+
+bit32.so: lbitlib.o
+	$(CC) $(LDFLAGS) -shared -o $@ lbitlib.o
diff --git a/devel/lua-bitlib/DESCR b/devel/lua-bitlib/DESCR
deleted file mode 100644
index 431d652995a..00000000000
--- a/devel/lua-bitlib/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-bit32 is the native Lua 5.2 bit manipulation library, in the version
-from Lua 5.3; it is compatible with Lua 5.1, 5.2 and 5.3.
diff --git a/devel/lua-bitlib/Makefile b/devel/lua-bitlib/Makefile
deleted file mode 100644
index 59237c77673..00000000000
--- a/devel/lua-bitlib/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2020/07/02 10:26:16 nia Exp $
-
-DISTNAME=		bitlib-5.3.0
-PKGNAME=		${LUA_PKGPREFIX}-${DISTNAME}
-PKGREVISION=		1
-CATEGORIES=		devel lua
-MASTER_SITES=		${MASTER_SITE_GITHUB:=keplerproject/}
-GITHUB_PROJECT=		lua-compat-5.2
-GITHUB_TAG=		${DISTNAME}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		https://github.com/keplerproject/lua-compat-5.2
-COMMENT=		Lua 5.2 bit manipulation library
-LICENSE=		mit
-
-LUA_VERSIONS_ACCEPTED=	51
-
-NO_CONFIGURE=		yes
-USE_LIBTOOL=		yes
-
-INSTALLATION_DIRS+=	${LUA_CDIR}
-
-do-build:
-	${LIBTOOL} --tag=CC --mode=compile ${CC} ${CFLAGS} -fPIC -I ${WRKSRC}/c-api -c -o ${WRKSRC}/bit32.lo ${WRKSRC}/lbitlib.c
-	${LIBTOOL} --tag=CC --mode=link ${CC} ${LDFLAGS} -rpath ${PREFIX}/${LUA_CDIR} -shared -module -avoid-version -export-dynamic -o ${WRKSRC}/bit32.la ${WRKSRC}/bit32.lo
-
-do-install:
-	${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/bit32.la ${DESTDIR}${PREFIX}/${LUA_CDIR}
-
-.include "../../lang/lua/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/lua-bitlib/PLIST b/devel/lua-bitlib/PLIST
deleted file mode 100644
index b8cb0856ca4..00000000000
--- a/devel/lua-bitlib/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2019/09/05 18:54:37 maya Exp $
-${LUA_CDIR}/bit32.la
diff --git a/devel/lua-bitlib/distinfo b/devel/lua-bitlib/distinfo
deleted file mode 100644
index 4281ac6de8a..00000000000
--- a/devel/lua-bitlib/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1 2018/11/20 17:26:20 maya Exp $
-
-SHA1 (bitlib-5.3.0.tar.gz) = 995834b630a64c31fb77b08b5f75b950d31918c5
-RMD160 (bitlib-5.3.0.tar.gz) = cf09dee8e2e18c8f0ae11e1886db1713b7edfef1
-SHA512 (bitlib-5.3.0.tar.gz) = 234807e201197bc27720864a328f5b63a9fe8bf88bf1fb64cd178532c0745a330b23455fcff0e50d365034f3e43af3c835de7f10a685275da66a7a1ca873e90a
-Size (bitlib-5.3.0.tar.gz) = 21884 bytes