31 files changed, 158 insertions, 190 deletions

diff --git a/devel/lua-filename/Makefile b/devel/lua-filename/Makefile
index 7b97eb46dc89..c885a92d2c12 100644
--- a/devel/lua-filename/Makefile
+++ b/devel/lua-filename/Makefile
@@ -5,23 +5,25 @@
 # $FreeBSD$
 #
 
-PORTNAME=	lua50-filename
+PORTNAME=	filename
 PORTVERSION=	1.2
 CATEGORIES=	devel
 MASTER_SITES=	http://cvs.bsdinstaller.org/cgi-bin/cvsweb.cgi/installer/src/lib/lua/filename/
+PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 DISTFILES=	filename.lua?rev=${PORTVERSION}
-EXTRACT_ONLY=
+EXTRACT_ONLY=	#
 
 MAINTAINER=	andrew+ports@fubar.geek.nz
 COMMENT=	Filename-manipulating functions for Lua 5.0.x
 
-RUN_DEPENDS=	${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua50
-
-NO_WRKSUBDIR=	yes
+USE_LUA=	5.0
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
+
+PLIST_FILES=	%%LUA_MODSHAREDIR%%/filename.lua
 
 do-install:
-	${MKDIR} ${PREFIX}/share/lua/5.0
-	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${PREFIX}/share/lua/5.0/${DISTFILES:C/\?.*$//}
+	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} \
+		${LUA_MODSHAREDIR}/${DISTFILES:C/\?.*$//}
 
 .include <bsd.port.mk>
diff --git a/devel/lua-filename/pkg-descr b/devel/lua-filename/pkg-descr
index 1235fd14c6ba..ce9fcc2f3ddb 100644
--- a/devel/lua-filename/pkg-descr
+++ b/devel/lua-filename/pkg-descr
@@ -1,3 +1,3 @@
-Package of routines for manipulating filenames.
-Also contains convenience functions for querying the
-status of files in the filesystem named by those filenames.
+Package of routines for manipulating filenames. Also contains convenience
+functions for querying the status of files in the filesystem named by those
+filenames.
diff --git a/devel/lua-filename/pkg-plist b/devel/lua-filename/pkg-plist
index af8e59d4d461..e69de29bb2d1 100644
--- a/devel/lua-filename/pkg-plist
+++ b/devel/lua-filename/pkg-plist
@@ -1,3 +0,0 @@
-share/lua/5.0/filename.lua
-@dirrmtry share/lua/5.0
-@dirrmtry share/lua
diff --git a/devel/lua-gettext/Makefile b/devel/lua-gettext/Makefile
index 2a0edadba437..83fabe59eb6d 100644
--- a/devel/lua-gettext/Makefile
+++ b/devel/lua-gettext/Makefile
@@ -9,22 +9,21 @@ PORTNAME=	gettext
 PORTVERSION=	1.5
 CATEGORIES=	devel
 MASTER_SITES=	http://cvs.bsdinstaller.org/cgi-bin/cvsweb.cgi/installer/src/lib/lua/gettext/
-PKGNAMEPREFIX=	lua50-
+PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 DISTFILES=	lua_gettext.c?rev=${CVER} gettext.lua?rev=${LVER}
 
 MAINTAINER=	andrew+ports@fubar.geek.nz
 COMMENT=	Gettext ibinding for Lua 5.0.x
 
-BUILD_DEPENDS=	${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua50
-RUN_DEPENDS=	${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua50
-
+USE_LUA=	5.0
 USE_GETTEXT=	yes
 
-LIBDIR=		${PREFIX}/lib/lua/5.0
-
 CVER=		1.15
 LVER=		${PORTVERSION}
 
+PLIST_FILES=	%%LUA_MODSHAREDIR%%/gettext.lua \
+		%%LUA_MODLIBDIR%%/lgettext.so
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 .for file in ${DISTFILES}
@@ -33,10 +32,7 @@ do-extract:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/lua/5.0
-	${MKDIR} ${PREFIX}/share/lua/5.0
-	${INSTALL_DATA} ${WRKSRC}/gettext.lua ${PREFIX}/share/lua/5.0/
-	${MKDIR} ${PREFIX}/lib/lua/5.0
-	${INSTALL_PROGRAM} ${WRKSRC}/lgettext.so ${PREFIX}/lib/lua/5.0/
+	${INSTALL_DATA} ${WRKSRC}/gettext.lua ${LUA_MODSHAREDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lgettext.so ${LUA_MODLIBDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/lua-gettext/files/Makefile b/devel/lua-gettext/files/Makefile
index 2c9a05d63bf4..d04118bfa4d1 100644
--- a/devel/lua-gettext/files/Makefile
+++ b/devel/lua-gettext/files/Makefile
@@ -5,7 +5,7 @@ SHLIB_NAME=	lgettext.so
 
 SRCS=		lua_gettext.c
 
-CFLAGS+=	-I${PREFIX}/include
-LDFLAGS+=	-L${PREFIX}/lib -lintl
+CFLAGS+=	-I${LOCALBASE}/include -I${LUA_INCDIR}
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 .include <bsd.lib.mk>
diff --git a/devel/lua-gettext/pkg-plist b/devel/lua-gettext/pkg-plist
index ac660e2fdd80..e69de29bb2d1 100644
--- a/devel/lua-gettext/pkg-plist
+++ b/devel/lua-gettext/pkg-plist
@@ -1,6 +0,0 @@
-lib/lua/5.0/lgettext.so
-share/lua/5.0/gettext.lua
-@dirrmtry lib/lua/5.0
-@dirrmtry lib/lua
-@dirrmtry share/lua/5.0
-@dirrmtry share/lua
diff --git a/devel/lua-posix/Makefile b/devel/lua-posix/Makefile
index 238bcaf406ba..37ec1872664c 100644
--- a/devel/lua-posix/Makefile
+++ b/devel/lua-posix/Makefile
@@ -5,23 +5,24 @@
 # $FreeBSD$
 #
 
-PORTNAME=	lua50-posix
+PORTNAME=	posix
 PORTVERSION=	5.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/5.0/
+PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 DISTFILES=	lposix.tar.gz
 
 MAINTAINER=	andrew+ports@fubar.geek.nz
 COMMENT=	A POSIX layer for Lua
 
-BUILD_DEPENDS=	${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua50
-
+USE_LUA=	5.0
 WRKSRC=		${WRKDIR}/posix
 
+PLIST_FILES=	%%LUA_MODSHAREDIR%%/posix.lua \
+		%%LUA_MODLIBDIR%%/lposix.so
+
 do-install:
-	@ ${MKDIR} ${PREFIX}/share/lua/5.0
-	@ ${INSTALL_DATA} ${WRKSRC}/posix.lua ${PREFIX}/share/lua/5.0
-	@ ${MKDIR} ${PREFIX}/lib/lua/5.0
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/lposix.so ${PREFIX}/lib/lua/5.0
+	@${INSTALL_DATA} ${WRKSRC}/posix.lua ${LUA_MODSHAREDIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/lposix.so ${LUA_MODLIBDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/lua-posix/files/patch-Makefile b/devel/lua-posix/files/patch-Makefile
index 8c8f05bddff7..b0eb70640eb4 100644
--- a/devel/lua-posix/files/patch-Makefile
+++ b/devel/lua-posix/files/patch-Makefile
@@ -1,20 +1,30 @@
---- Makefile.orig	Mon Mar 27 12:25:04 2006
-+++ Makefile	Mon Mar 27 12:43:24 2006
-@@ -1,7 +1,7 @@
+--- Makefile.orig	Wed Nov  5 21:26:49 2003
++++ Makefile	Mon Aug  7 00:38:38 2006
+@@ -1,13 +1,13 @@
  # makefile for POSIX library for Lua
  
  # change these to reflect your Lua installation
 -LUA= /tmp/lhf/lua-5.0
+-LUAINC= $(LUA)/include
+-LUALIB= $(LUA)/lib
+-LUABIN= $(LUA)/bin
 +LUA= ${PREFIX}
- LUAINC= $(LUA)/include
- LUALIB= $(LUA)/lib
- LUABIN= $(LUA)/bin
++LUAINC= $(LUA_INCDIR)
++LUALIB= $(LUA_LIBDIR)
++LUABIN= $(LUA_BINDIR)
+ 
+ # no need to change anything below here
+-CFLAGS= -fPIC $(INCS) $(WARN) -O2 $G
++CFLAGS+= -fPIC $(INCS) $(WARN) -O2 $G
+ WARN= -pedantic -Wall
+ INCS= -I$(LUAINC)
+ 
 @@ -21,7 +21,7 @@
  all:	test
  
  test:	$T
 -	$(LUABIN)/lua -l$(MYNAME) test.lua
-+	LD_PRELOAD=${PREFIX}/lib/liblua.so:${PREFIX}/lib/liblualib.so $(LUABIN)/lua -l$(MYNAME) test.lua
++	LD_PRELOAD=${LUA_LIBDIR}/liblua.so:${LUA_LIBDIR}/liblualib.so $(LUABIN)/lua -l$(MYNAME) test.lua
  
  $T:	$(OBJS)
  	$(CC) -o $@ -shared $(OBJS)
diff --git a/devel/lua-posix/pkg-plist b/devel/lua-posix/pkg-plist
index 036b7a2881f3..e69de29bb2d1 100644
--- a/devel/lua-posix/pkg-plist
+++ b/devel/lua-posix/pkg-plist
@@ -1,6 +0,0 @@
-share/lua/5.0/posix.lua
-lib/lua/5.0/lposix.so
-@dirrmtry share/lua/5.0
-@dirrmtry share/lua
-@dirrmtry lib/lua/5.0
-@dirrmtry lib/lua
diff --git a/devel/lua-pty/Makefile b/devel/lua-pty/Makefile
index 9ed7a77557a7..b80cb3f86806 100644
--- a/devel/lua-pty/Makefile
+++ b/devel/lua-pty/Makefile
@@ -10,18 +10,20 @@ PORTVERSION=	1.25
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR= philip
-PKGNAMEPREFIX=	lua50-
+PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 DISTFILES=	pty.lua?rev=1.2 pty.c?rev=1.25
 
 MAINTAINER=	andrew+ports@fubar.geek.nz
 COMMENT=	Pty (pseudo-terminal) bindings for Lua 5.0.x
 
-BUILD_DEPENDS=	${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua50 \
-		${NONEXISTENT}:${PORTSDIR}/devel/lua50-compat51:extract
-RUN_DEPENDS=	${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua50 \
-		${LOCALBASE}/share/lua/5.0/compat-5.1.lua:${PORTSDIR}/devel/lua50-compat51
+USE_LUA=	5.0
+LUA_COMPS=	lua compat51
 
-COMPAT_SRC=	`(cd ${PORTSDIR}/devel/lua50-compat51 && make -V WRKSRC)`
+COMPAT_SRC!=	`(cd ${PORTSDIR}/devel/lua50-compat51 && ${MAKE} -V WRKSRC)`
+MAKE_ENV=	COMPATDIR="${COMPAT_SRC}"
+
+PLIST_FILES=	%%LUA_MODSHAREDIR%%/pty.lua \
+		%%LUA_MODLIBDIR%%/lpty.so
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
@@ -30,13 +32,8 @@ do-extract:
 .endfor
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|%%COMPATDIR%%|${COMPAT_SRC}|" ${WRKSRC}/Makefile
-
 do-install:
-	${MKDIR} ${PREFIX}/lib/lua/5.0
-	${INSTALL_PROGRAM} ${WRKSRC}/lpty.so ${PREFIX}/lib/lua/5.0
-	${MKDIR} ${PREFIX}/share/lua/5.0
-	${INSTALL_DATA} ${WRKSRC}/pty.lua ${PREFIX}/share/lua/5.0
+	${INSTALL_PROGRAM} ${WRKSRC}/lpty.so ${LUA_MODLIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/pty.lua ${LUA_MODSHAREDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/lua-pty/files/Makefile b/devel/lua-pty/files/Makefile
index 99df27729cd8..e6a0fb23c49f 100644
--- a/devel/lua-pty/files/Makefile
+++ b/devel/lua-pty/files/Makefile
@@ -3,9 +3,9 @@
 SHLIB=		pty
 SHLIB_NAME=	lpty.so
 
-SRCS=		pty.c %%COMPATDIR%%/compat-5.1.c
+SRCS=		pty.c ${COMPATDIR}/compat-5.1.c
 
-CFLAGS+=	-I${PREFIX}/include
+CFLAGS+=	-I${LUA_INCDIR}
 LDFLAGS+=	-L/usr/lib -lutil
 
 .include <bsd.lib.mk>
diff --git a/devel/lua50-app/Makefile b/devel/lua50-app/Makefile
index ea99ea2fe84d..1cd45b312b5f 100644
--- a/devel/lua50-app/Makefile
+++ b/devel/lua50-app/Makefile
@@ -9,24 +9,22 @@ PORTNAME=	app
 PORTVERSION=	1.70
 CATEGORIES=	devel
 MASTER_SITES=	http://cvs.bsdinstaller.org/cgi-bin/cvsweb.cgi/installer/src/lib/lua/app/
-PKGNAMEPREFIX=	lua50-
+PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 DISTFILES=	app.lua?rev=${PORTVERSION}
-EXTRACT_ONLY=
+EXTRACT_ONLY=	#
 
 MAINTAINER=	andrew+ports@fubar.geek.nz
 COMMENT=	App framework for Lua 5.0.x
 
-BUILD_DEPENDS=	${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua50
-RUN_DEPENDS=	${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua50 \
-		${LOCALBASE}/share/lua/5.0/posix.lua:${PORTSDIR}/devel/lua50-posix \
-		${LOCALBASE}/share/lua/5.0/filename.lua:${PORTSDIR}/devel/lua50-filename \
-		${LOCALBASE}/share/lua/5.0/pty.lua:${PORTSDIR}/devel/lua50-pty
-
-NO_WRKSUBDIR=	yes
+USE_LUA=	5.0
+LUA_COMPS=	filename posix pty
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
+
+PLIST_FILES=	%%LUA_MODSHAREDIR%%/app.lua
 
 do-install:
-	${MKDIR} ${PREFIX}/share/lua/5.0
-	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${PREFIX}/share/lua/5.0/${DISTFILES:C/\?.*$//}
+	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} \
+		${LUA_MODSHAREDIR}/${DISTFILES:C/\?.*$//}
 
 .include <bsd.port.mk>
diff --git a/devel/lua50-app/pkg-plist b/devel/lua50-app/pkg-plist
index b99520e61d1b..e69de29bb2d1 100644
--- a/devel/lua50-app/pkg-plist
+++ b/devel/lua50-app/pkg-plist
@@ -1,3 +0,0 @@
-share/lua/5.0/app.lua
-@dirrmtry share/lua/5.0
-@dirrmtry share/lua
diff --git a/devel/lua50-compat51/Makefile b/devel/lua50-compat51/Makefile
index a4b7d5a7b8dc..3c4b46315e56 100644
--- a/devel/lua50-compat51/Makefile
+++ b/devel/lua50-compat51/Makefile
@@ -5,31 +5,31 @@
 # $FreeBSD$
 #
 
-PORTNAME=	lua50-compat51
+PORTNAME=	compat
 PORTVERSION=	${CVER}.${CREV}
 CATEGORIES=	devel
 MASTER_SITES=	http://luaforge.net/frs/download.php/1410/
-DISTNAME=	compat-${CVER}${CREV}.tar.gz
+PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 
 MAINTAINER=	andrew+ports@fubar.geek.nz
 COMMENT=	Lua 5.1 package compatibility layer for Lua 5.0.x
 
-BUILD_DEPENDS=	${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua50
+USE_LUA=	5.0
+WRKSRC=		${WRKDIR}/compat-${CVER}${CREV}
 
-CONFLICTS=	luasocket-2.0
+MAKE_ENV=	CVER="${CVER}"
+PLIST_FILES=	%%LUA_MODSHAREDIR%%/compat-${CVER}.lua \
+		%%LUA_MODLIBDIR%%/lcompat-${CVER}.so
 
-# Update these values when there is a new release
+# Update these values when there is a new release.
 CVER=		5.1
 CREV=		r5
 
-WRKSRC=		${WRKDIR}/compat-${CVER}${CREV}
-LIBDIR=		${PREFIX}/lib
-
 post-extract:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 do-install:
-	${MKDIR} ${PREFIX}/share/lua/5.0
-	${INSTALL_DATA} ${WRKSRC}/compat-5.1.lua ${PREFIX}/share/lua/5.0
+	${INSTALL_DATA} ${WRKSRC}/compat-${CVER}.lua ${LUA_MODSHAREDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lcompat-${CVER}.so ${LUA_MODLIBDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/lua50-compat51/distinfo b/devel/lua50-compat51/distinfo
index 0ebef78581ca..30d3a11b502e 100644
--- a/devel/lua50-compat51/distinfo
+++ b/devel/lua50-compat51/distinfo
@@ -1,3 +1,3 @@
-MD5 (compat-5.1r5.tar.gz.tar.gz) = 30d50d173ab236e96c4b969347163eb7
-SHA256 (compat-5.1r5.tar.gz.tar.gz) = 93262ad793552c338b825e6b67c903063aa07625952ef643d126ae60949c8ab6
-SIZE (compat-5.1r5.tar.gz.tar.gz) = 2977
+MD5 (compat-5.1.r5.tar.gz) = 30d50d173ab236e96c4b969347163eb7
+SHA256 (compat-5.1.r5.tar.gz) = 93262ad793552c338b825e6b67c903063aa07625952ef643d126ae60949c8ab6
+SIZE (compat-5.1.r5.tar.gz) = 2977
diff --git a/devel/lua50-compat51/files/Makefile b/devel/lua50-compat51/files/Makefile
index 3f62c9d29785..229ab6e7c892 100644
--- a/devel/lua50-compat51/files/Makefile
+++ b/devel/lua50-compat51/files/Makefile
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
-LIB=		lua-compat-5.1
+SHLIB=		compat-${CVER}
+SHLIB_NAME=	lcompat-${CVER}.so
 
-SRCS=		compat-5.1.c
+SRCS=		compat-${CVER}.c
 
-CFLAGS+=	-I${PREFIX}/include
+CFLAGS+=	-I${LUA_INCDIR}
 
 .include <bsd.lib.mk>
diff --git a/devel/lua50-compat51/pkg-plist b/devel/lua50-compat51/pkg-plist
index e33a638ee2e3..e69de29bb2d1 100644
--- a/devel/lua50-compat51/pkg-plist
+++ b/devel/lua50-compat51/pkg-plist
@@ -1,3 +0,0 @@
-share/lua/5.0/compat-5.1.lua
-@dirrmtry share/lua/5.0
-@dirrmtry share/lua
diff --git a/devel/lua50-dfui/Makefile b/devel/lua50-dfui/Makefile
index 6901938edb6f..340e3779d5fd 100644
--- a/devel/lua50-dfui/Makefile
+++ b/devel/lua50-dfui/Makefile
@@ -10,29 +10,28 @@ PORTVERSION=	0.1.20050901
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	philip
-PKGNAMEPREFIX=	lua50-
+PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 DISTNAME=	lua-dfui-0.1.20050901
 
 MAINTAINER=	andrew+ports@fubar.geek.nz
 COMMENT=	DFUI binding for Lua 5.0.x
 
-BUILD_DEPENDS=	${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua50 \
-		${NONEXISTENT}:${PORTSDIR}/devel/lua50-compat51:extract
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/lua50-compat51:extract
 LIB_DEPENDS=	dfui4.4:${PORTSDIR}/devel/libdfui
-RUN_DEPENDS=	${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua50 \
-		${LOCALBASE}/share/lua/5.0/compat-5.1.lua:${PORTSDIR}/devel/lua50-compat51 \
-		${LOCALBASE}/share/lua/5.0/posix.lua:${PORTSDIR}/devel/lua50-posix
 
 USE_BZIP2=	yes
+USE_LUA=	5.0
+LUA_COMPS=	compat51 posix
 WRKSRC=		${WRKDIR}/lua-dfui-${PORTVERSION}
 
-COMPAT_SRC=	`(cd ${PORTSDIR}/devel/lua50-compat51 && make -V WRKSRC)`
-MAKE_ENV=	COMPAT=${COMPAT_SRC}
+COMPAT_SRC=	`(cd ${PORTSDIR}/devel/lua50-compat51 && ${MAKE} -V WRKSRC)`
+MAKE_ENV=	COMPAT="${COMPAT_SRC}"
+
+PLIST_FILES=	%%LUA_MODLIBDIR%%/ldfui.so \
+		%%LUA_MODSHAREDIR%%/dfui.lua
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/lua/5.0
-	${INSTALL_PROGRAM} ${WRKSRC}/ldfui.so ${PREFIX}/lib/lua/5.0
-	${MKDIR} ${PREFIX}/share/lua/5.0
-	${INSTALL_DATA} ${WRKSRC}/dfui.lua ${PREFIX}/share/lua/5.0
+	${INSTALL_PROGRAM} ${WRKSRC}/ldfui.so ${LUA_MODLIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/dfui.lua ${LUA_MODSHAREDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/lua50-dfui/files/patch-Makefile b/devel/lua50-dfui/files/patch-Makefile
index 6aea08024f70..22b843452367 100644
--- a/devel/lua50-dfui/files/patch-Makefile
+++ b/devel/lua50-dfui/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Apr 18 13:49:53 2006
-+++ Makefile	Tue Apr 18 13:54:23 2006
+--- Makefile.orig	Mon Apr 17 21:40:11 2006
++++ Makefile	Mon Aug  7 13:22:22 2006
 @@ -1,11 +1,6 @@
  # Makefile for luadfui.
  # $Id: Makefile,v 1.13 2005/08/26 22:44:37 cpressey Exp $
@@ -18,13 +18,13 @@
  CFLAGS+=	${WARNS} -fPIC
 -CFLAGS+=	-I${LUA}/include -I${COMPAT} -I../../libdfui
 -CFLAGS+=	-I/usr/local/include -I/usr/pkg/include
-+CFLAGS+=	-I${COMPAT} -I${PREFIX}/include/dfui4
-+CFLAGS+=	-I${PREFIX}/include
++CFLAGS+=	-I${COMPAT} -I${LOCALBASE}/include/dfui4
++CFLAGS+=	-I${LUA_INCDIR}
  CFLAGS+=	${EXTRA_CFLAGS}
 -LDFLAGS+=	-L../../libdfui -L../../libaura -L${LUA}/lib/
 -LDFLAGS+=	-L/usr/local/lib -L/usr/pkg/lib
 -LDFLAGS+=	-ldfui -laura -lm -llua50 -llualib50
-+LDFLAGS+=	-L${PREFIX}/lib
++LDFLAGS+=	-L${LOCALBASE}/lib -L${LUA_LIBDIR}
 +LDFLAGS+=	-ldfui4 -laura3 -lm -llua -llualib
  
  all: ${LIB}
diff --git a/devel/lua50-dfui/pkg-plist b/devel/lua50-dfui/pkg-plist
index 3d7f51fde599..e69de29bb2d1 100644
--- a/devel/lua50-dfui/pkg-plist
+++ b/devel/lua50-dfui/pkg-plist
@@ -1,6 +0,0 @@
-lib/lua/5.0/ldfui.so
-share/lua/5.0/dfui.lua
-@dirrmtry lib/lua/5.0
-@dirrmtry lib/lua
-@dirrmtry share/lua/5.0
-@dirrmtry share/lua
diff --git a/devel/lua50-filename/Makefile b/devel/lua50-filename/Makefile
index 7b97eb46dc89..c885a92d2c12 100644
--- a/devel/lua50-filename/Makefile
+++ b/devel/lua50-filename/Makefile
@@ -5,23 +5,25 @@
 # $FreeBSD$
 #
 
-PORTNAME=	lua50-filename
+PORTNAME=	filename
 PORTVERSION=	1.2
 CATEGORIES=	devel
 MASTER_SITES=	http://cvs.bsdinstaller.org/cgi-bin/cvsweb.cgi/installer/src/lib/lua/filename/
+PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 DISTFILES=	filename.lua?rev=${PORTVERSION}
-EXTRACT_ONLY=
+EXTRACT_ONLY=	#
 
 MAINTAINER=	andrew+ports@fubar.geek.nz
 COMMENT=	Filename-manipulating functions for Lua 5.0.x
 
-RUN_DEPENDS=	${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua50
-
-NO_WRKSUBDIR=	yes
+USE_LUA=	5.0
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
+
+PLIST_FILES=	%%LUA_MODSHAREDIR%%/filename.lua
 
 do-install:
-	${MKDIR} ${PREFIX}/share/lua/5.0
-	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${PREFIX}/share/lua/5.0/${DISTFILES:C/\?.*$//}
+	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} \
+		${LUA_MODSHAREDIR}/${DISTFILES:C/\?.*$//}
 
 .include <bsd.port.mk>
diff --git a/devel/lua50-filename/pkg-descr b/devel/lua50-filename/pkg-descr
index 1235fd14c6ba..ce9fcc2f3ddb 100644
--- a/devel/lua50-filename/pkg-descr
+++ b/devel/lua50-filename/pkg-descr
@@ -1,3 +1,3 @@
-Package of routines for manipulating filenames.
-Also contains convenience functions for querying the
-status of files in the filesystem named by those filenames.
+Package of routines for manipulating filenames. Also contains convenience
+functions for querying the status of files in the filesystem named by those
+filenames.
diff --git a/devel/lua50-filename/pkg-plist b/devel/lua50-filename/pkg-plist
index af8e59d4d461..e69de29bb2d1 100644
--- a/devel/lua50-filename/pkg-plist
+++ b/devel/lua50-filename/pkg-plist
@@ -1,3 +0,0 @@
-share/lua/5.0/filename.lua
-@dirrmtry share/lua/5.0
-@dirrmtry share/lua
diff --git a/devel/lua50-gettext/Makefile b/devel/lua50-gettext/Makefile
index 2a0edadba437..83fabe59eb6d 100644
--- a/devel/lua50-gettext/Makefile
+++ b/devel/lua50-gettext/Makefile
@@ -9,22 +9,21 @@ PORTNAME=	gettext
 PORTVERSION=	1.5
 CATEGORIES=	devel
 MASTER_SITES=	http://cvs.bsdinstaller.org/cgi-bin/cvsweb.cgi/installer/src/lib/lua/gettext/
-PKGNAMEPREFIX=	lua50-
+PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 DISTFILES=	lua_gettext.c?rev=${CVER} gettext.lua?rev=${LVER}
 
 MAINTAINER=	andrew+ports@fubar.geek.nz
 COMMENT=	Gettext ibinding for Lua 5.0.x
 
-BUILD_DEPENDS=	${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua50
-RUN_DEPENDS=	${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua50
-
+USE_LUA=	5.0
 USE_GETTEXT=	yes
 
-LIBDIR=		${PREFIX}/lib/lua/5.0
-
 CVER=		1.15
 LVER=		${PORTVERSION}
 
+PLIST_FILES=	%%LUA_MODSHAREDIR%%/gettext.lua \
+		%%LUA_MODLIBDIR%%/lgettext.so
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 .for file in ${DISTFILES}
@@ -33,10 +32,7 @@ do-extract:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/lua/5.0
-	${MKDIR} ${PREFIX}/share/lua/5.0
-	${INSTALL_DATA} ${WRKSRC}/gettext.lua ${PREFIX}/share/lua/5.0/
-	${MKDIR} ${PREFIX}/lib/lua/5.0
-	${INSTALL_PROGRAM} ${WRKSRC}/lgettext.so ${PREFIX}/lib/lua/5.0/
+	${INSTALL_DATA} ${WRKSRC}/gettext.lua ${LUA_MODSHAREDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lgettext.so ${LUA_MODLIBDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/lua50-gettext/files/Makefile b/devel/lua50-gettext/files/Makefile
index 2c9a05d63bf4..d04118bfa4d1 100644
--- a/devel/lua50-gettext/files/Makefile
+++ b/devel/lua50-gettext/files/Makefile
@@ -5,7 +5,7 @@ SHLIB_NAME=	lgettext.so
 
 SRCS=		lua_gettext.c
 
-CFLAGS+=	-I${PREFIX}/include
-LDFLAGS+=	-L${PREFIX}/lib -lintl
+CFLAGS+=	-I${LOCALBASE}/include -I${LUA_INCDIR}
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 .include <bsd.lib.mk>
diff --git a/devel/lua50-gettext/pkg-plist b/devel/lua50-gettext/pkg-plist
index ac660e2fdd80..e69de29bb2d1 100644
--- a/devel/lua50-gettext/pkg-plist
+++ b/devel/lua50-gettext/pkg-plist
@@ -1,6 +0,0 @@
-lib/lua/5.0/lgettext.so
-share/lua/5.0/gettext.lua
-@dirrmtry lib/lua/5.0
-@dirrmtry lib/lua
-@dirrmtry share/lua/5.0
-@dirrmtry share/lua
diff --git a/devel/lua50-posix/Makefile b/devel/lua50-posix/Makefile
index 238bcaf406ba..37ec1872664c 100644
--- a/devel/lua50-posix/Makefile
+++ b/devel/lua50-posix/Makefile
@@ -5,23 +5,24 @@
 # $FreeBSD$
 #
 
-PORTNAME=	lua50-posix
+PORTNAME=	posix
 PORTVERSION=	5.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/5.0/
+PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 DISTFILES=	lposix.tar.gz
 
 MAINTAINER=	andrew+ports@fubar.geek.nz
 COMMENT=	A POSIX layer for Lua
 
-BUILD_DEPENDS=	${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua50
-
+USE_LUA=	5.0
 WRKSRC=		${WRKDIR}/posix
 
+PLIST_FILES=	%%LUA_MODSHAREDIR%%/posix.lua \
+		%%LUA_MODLIBDIR%%/lposix.so
+
 do-install:
-	@ ${MKDIR} ${PREFIX}/share/lua/5.0
-	@ ${INSTALL_DATA} ${WRKSRC}/posix.lua ${PREFIX}/share/lua/5.0
-	@ ${MKDIR} ${PREFIX}/lib/lua/5.0
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/lposix.so ${PREFIX}/lib/lua/5.0
+	@${INSTALL_DATA} ${WRKSRC}/posix.lua ${LUA_MODSHAREDIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/lposix.so ${LUA_MODLIBDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/lua50-posix/files/patch-Makefile b/devel/lua50-posix/files/patch-Makefile
index 8c8f05bddff7..b0eb70640eb4 100644
--- a/devel/lua50-posix/files/patch-Makefile
+++ b/devel/lua50-posix/files/patch-Makefile
@@ -1,20 +1,30 @@
---- Makefile.orig	Mon Mar 27 12:25:04 2006
-+++ Makefile	Mon Mar 27 12:43:24 2006
-@@ -1,7 +1,7 @@
+--- Makefile.orig	Wed Nov  5 21:26:49 2003
++++ Makefile	Mon Aug  7 00:38:38 2006
+@@ -1,13 +1,13 @@
  # makefile for POSIX library for Lua
  
  # change these to reflect your Lua installation
 -LUA= /tmp/lhf/lua-5.0
+-LUAINC= $(LUA)/include
+-LUALIB= $(LUA)/lib
+-LUABIN= $(LUA)/bin
 +LUA= ${PREFIX}
- LUAINC= $(LUA)/include
- LUALIB= $(LUA)/lib
- LUABIN= $(LUA)/bin
++LUAINC= $(LUA_INCDIR)
++LUALIB= $(LUA_LIBDIR)
++LUABIN= $(LUA_BINDIR)
+ 
+ # no need to change anything below here
+-CFLAGS= -fPIC $(INCS) $(WARN) -O2 $G
++CFLAGS+= -fPIC $(INCS) $(WARN) -O2 $G
+ WARN= -pedantic -Wall
+ INCS= -I$(LUAINC)
+ 
 @@ -21,7 +21,7 @@
  all:	test
  
  test:	$T
 -	$(LUABIN)/lua -l$(MYNAME) test.lua
-+	LD_PRELOAD=${PREFIX}/lib/liblua.so:${PREFIX}/lib/liblualib.so $(LUABIN)/lua -l$(MYNAME) test.lua
++	LD_PRELOAD=${LUA_LIBDIR}/liblua.so:${LUA_LIBDIR}/liblualib.so $(LUABIN)/lua -l$(MYNAME) test.lua
  
  $T:	$(OBJS)
  	$(CC) -o $@ -shared $(OBJS)
diff --git a/devel/lua50-posix/pkg-plist b/devel/lua50-posix/pkg-plist
index 036b7a2881f3..e69de29bb2d1 100644
--- a/devel/lua50-posix/pkg-plist
+++ b/devel/lua50-posix/pkg-plist
@@ -1,6 +0,0 @@
-share/lua/5.0/posix.lua
-lib/lua/5.0/lposix.so
-@dirrmtry share/lua/5.0
-@dirrmtry share/lua
-@dirrmtry lib/lua/5.0
-@dirrmtry lib/lua
diff --git a/devel/lua50-pty/Makefile b/devel/lua50-pty/Makefile
index 9ed7a77557a7..b80cb3f86806 100644
--- a/devel/lua50-pty/Makefile
+++ b/devel/lua50-pty/Makefile
@@ -10,18 +10,20 @@ PORTVERSION=	1.25
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR= philip
-PKGNAMEPREFIX=	lua50-
+PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 DISTFILES=	pty.lua?rev=1.2 pty.c?rev=1.25
 
 MAINTAINER=	andrew+ports@fubar.geek.nz
 COMMENT=	Pty (pseudo-terminal) bindings for Lua 5.0.x
 
-BUILD_DEPENDS=	${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua50 \
-		${NONEXISTENT}:${PORTSDIR}/devel/lua50-compat51:extract
-RUN_DEPENDS=	${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua50 \
-		${LOCALBASE}/share/lua/5.0/compat-5.1.lua:${PORTSDIR}/devel/lua50-compat51
+USE_LUA=	5.0
+LUA_COMPS=	lua compat51
 
-COMPAT_SRC=	`(cd ${PORTSDIR}/devel/lua50-compat51 && make -V WRKSRC)`
+COMPAT_SRC!=	`(cd ${PORTSDIR}/devel/lua50-compat51 && ${MAKE} -V WRKSRC)`
+MAKE_ENV=	COMPATDIR="${COMPAT_SRC}"
+
+PLIST_FILES=	%%LUA_MODSHAREDIR%%/pty.lua \
+		%%LUA_MODLIBDIR%%/lpty.so
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
@@ -30,13 +32,8 @@ do-extract:
 .endfor
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|%%COMPATDIR%%|${COMPAT_SRC}|" ${WRKSRC}/Makefile
-
 do-install:
-	${MKDIR} ${PREFIX}/lib/lua/5.0
-	${INSTALL_PROGRAM} ${WRKSRC}/lpty.so ${PREFIX}/lib/lua/5.0
-	${MKDIR} ${PREFIX}/share/lua/5.0
-	${INSTALL_DATA} ${WRKSRC}/pty.lua ${PREFIX}/share/lua/5.0
+	${INSTALL_PROGRAM} ${WRKSRC}/lpty.so ${LUA_MODLIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/pty.lua ${LUA_MODSHAREDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/lua50-pty/files/Makefile b/devel/lua50-pty/files/Makefile
index 99df27729cd8..e6a0fb23c49f 100644
--- a/devel/lua50-pty/files/Makefile
+++ b/devel/lua50-pty/files/Makefile
@@ -3,9 +3,9 @@
 SHLIB=		pty
 SHLIB_NAME=	lpty.so
 
-SRCS=		pty.c %%COMPATDIR%%/compat-5.1.c
+SRCS=		pty.c ${COMPATDIR}/compat-5.1.c
 
-CFLAGS+=	-I${PREFIX}/include
+CFLAGS+=	-I${LUA_INCDIR}
 LDFLAGS+=	-L/usr/lib -lutil
 
 .include <bsd.lib.mk>