Use LUA_PKGPREFIX. Many Lua packages already do, but not these.

7 files changed, 15 insertions, 13 deletions

diff --git a/databases/lua-sqlite3/Makefile b/databases/lua-sqlite3/Makefile
index d3486b09df8..c400be16001 100644
--- a/databases/lua-sqlite3/Makefile
+++ b/databases/lua-sqlite3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2013/10/19 09:07:01 adam Exp $
+# $NetBSD: Makefile,v 1.3 2013/10/30 06:03:38 dholland Exp $
 
 DISTNAME=	lua-sqlite3-0.4.1
+PKGNAME=	${LUA_PKGPREFIX}-sqlite3-0.4.1
 PKGREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.mroth.net/lua-sqlite3/
diff --git a/devel/lua-filesystem/Makefile b/devel/lua-filesystem/Makefile
index 8f0f04a1439..61d1bce844c 100644
--- a/devel/lua-filesystem/Makefile
+++ b/devel/lua-filesystem/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2013/09/13 12:09:37 fhajny Exp $
+# $NetBSD: Makefile,v 1.6 2013/10/30 06:03:37 dholland Exp $
 #
 
 DISTNAME=		luafilesystem-1.6.2
-PKGNAME=		${DISTNAME:S/lua/lua-/}
+PKGNAME=		${DISTNAME:S/lua/${LUA_PKGPREFIX}-/}
 PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://github.com/downloads/keplerproject/luafilesystem/
diff --git a/devel/lua-gi/Makefile b/devel/lua-gi/Makefile
index d86d8765571..675424396d3 100644
--- a/devel/lua-gi/Makefile
+++ b/devel/lua-gi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2013/07/25 13:05:18 degroote Exp $
+# $NetBSD: Makefile,v 1.3 2013/10/30 06:03:37 dholland Exp $
 #
 
 DISTNAME=	lgi-${VERSION}
-PKGNAME=	lua-gi-${VERSION}
+PKGNAME=	${LUA_PKGPREFIX}-gi-${VERSION}
 VERSION=	0.7.1
 CATEGORIES=	devel
 MASTER_SITES=	-https://codeload.github.com/pavouk/lgi/tar.gz/${VERSION}
diff --git a/devel/lua-lpeg/Makefile b/devel/lua-lpeg/Makefile
index 84ca20b8c02..69a8856e8b0 100644
--- a/devel/lua-lpeg/Makefile
+++ b/devel/lua-lpeg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2013/08/15 06:32:05 obache Exp $
+# $NetBSD: Makefile,v 1.4 2013/10/30 06:03:37 dholland Exp $
 #
 
 DISTNAME=	lpeg-0.12
-PKGNAME=	${DISTNAME:S/lpeg/lua-lpeg/}
+PKGNAME=	${DISTNAME:S/lpeg/${LUA_PKGPREFIX}-lpeg/}
 PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.inf.puc-rio.br/~roberto/lpeg/
@@ -30,7 +30,7 @@ SUBST_MESSAGE.interp=	Fixing Lua include path.
 SUBST_FILES.interp=	test.lua
 SUBST_SED.interp=	-e 's|^\#!.*|\#!${PREFIX}/bin/lua|'
 
-LPEG_HTML_DIR=		share/doc/${PKGBASE}
+LPEG_HTML_DIR=		share/doc/lua-lpeg
 INSTALLATION_DIRS+=	${LUA_CDIR} ${LUA_LDIR} ${LPEG_HTML_DIR}
 
 do-install:
diff --git a/devel/lua-penlight/Makefile b/devel/lua-penlight/Makefile
index b4e48bfea88..6dcc743d80c 100644
--- a/devel/lua-penlight/Makefile
+++ b/devel/lua-penlight/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2013/07/14 20:28:19 alnsn Exp $
+# $NetBSD: Makefile,v 1.4 2013/10/30 06:03:37 dholland Exp $
 #
 
 DISTNAME=	${PL_VERSION}
-PKGNAME=	lua-penlight-${PL_VERSION}
+PKGNAME=	${LUA_PKGPREFIX}-penlight-${PL_VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/stevedonovan/Penlight/archive/
 
diff --git a/security/lua-sec/Makefile b/security/lua-sec/Makefile
index 370165f576f..900bb7a39c8 100644
--- a/security/lua-sec/Makefile
+++ b/security/lua-sec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/09/13 12:17:19 fhajny Exp $
+# $NetBSD: Makefile,v 1.6 2013/10/30 06:03:38 dholland Exp $
 #
 
 DISTNAME=		luasec-0.4.1
@@ -14,7 +14,7 @@ LICENSE=		mit
 
 .include "../../mk/bsd.prefs.mk"
 
-DEPENDS+=		lua-socket>=2.0:../../net/lua-socket
+DEPENDS+=		${LUA_PKGPREFIX}-socket>=2.0:../../net/lua-socket
 
 USE_TOOLS+=		gmake
 
diff --git a/www/lua-curl/Makefile b/www/lua-curl/Makefile
index 0e29bc0cf3e..c885cc038b8 100644
--- a/www/lua-curl/Makefile
+++ b/www/lua-curl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2013/09/17 12:03:42 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2013/10/30 06:03:38 dholland Exp $
 #
 
 DISTNAME=	lua-curl-0.2
+PKGNAME=	${LUA_PKGPREFIX}-curl-0.2
 PKGREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://luaforge.net/frs/download.php/2634/