- Fix the build of verlihub-plugins-luascript: careless patching with sed(1)

  resulted in wrong HAVE_LUA_5_0 (instead of correct HAVE_LUA_5_1) macro to
  be defined in generated `config.h' header file
- Stagify and cleanup all verlihub-plugins* ports while I'm at here

18 files changed, 27 insertions, 43 deletions

diff --git a/net-p2p/verlihub-plugins-chatroom/Makefile b/net-p2p/verlihub-plugins-chatroom/Makefile
index cb8c99698315..fd7c67ccdb7a 100644
--- a/net-p2p/verlihub-plugins-chatroom/Makefile
+++ b/net-p2p/verlihub-plugins-chatroom/Makefile
@@ -1,4 +1,4 @@
-# Created by: Skylord
+# Created by: Mikle Davidkin <skylord@vt.net.ru>
 # $FreeBSD$
 
 PORTNAME=	chatroom
@@ -11,7 +11,6 @@ MAINTAINER=	me@skylord.ru
 
 PLUGIN_DESC=	Chatroom
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins"
 .include <bsd.port.post.mk>
diff --git a/net-p2p/verlihub-plugins-chatroom/pkg-descr b/net-p2p/verlihub-plugins-chatroom/pkg-descr
index 9d12d573d0e8..8f384f4a6003 100644
--- a/net-p2p/verlihub-plugins-chatroom/pkg-descr
+++ b/net-p2p/verlihub-plugins-chatroom/pkg-descr
@@ -5,5 +5,5 @@ It is written in c++, has relatively low CPU and RAM usage,
 and has many useful features. It also uses a MySQL Database.
 Additional functionality is available through a versatile
 'plugin' system.
- 
+
 WWW: http://www.verlihub-project.org/
diff --git a/net-p2p/verlihub-plugins-floodprotect/Makefile b/net-p2p/verlihub-plugins-floodprotect/Makefile
index bab34c29e9a8..b3c2ab22ee5f 100644
--- a/net-p2p/verlihub-plugins-floodprotect/Makefile
+++ b/net-p2p/verlihub-plugins-floodprotect/Makefile
@@ -1,4 +1,4 @@
-# Created by: Skylord
+# Created by: Mikle Davidkin <skylord@vt.net.ru>
 # $FreeBSD$
 
 PORTNAME=	floodprotect
@@ -12,7 +12,6 @@ MAINTAINER=	me@skylord.ru
 PLUGIN_NAME=	floodprot
 PLUGIN_DESC=	Floodprotect
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins"
 DISTNAME=	${PLUGIN_NAME}
diff --git a/net-p2p/verlihub-plugins-floodprotect/pkg-descr b/net-p2p/verlihub-plugins-floodprotect/pkg-descr
index 88e95560c993..dc3bdb56cda5 100644
--- a/net-p2p/verlihub-plugins-floodprotect/pkg-descr
+++ b/net-p2p/verlihub-plugins-floodprotect/pkg-descr
@@ -5,5 +5,5 @@ It is written in c++, has relatively low CPU and RAM usage,
 and has many useful features. It also uses a MySQL Database.
 Additional functionality is available through a versatile
 'plugin' system.
- 
+
 WWW: http://www.verlihub-project.org/
diff --git a/net-p2p/verlihub-plugins-forbid/Makefile b/net-p2p/verlihub-plugins-forbid/Makefile
index 1a6580ac4089..14a0d5332166 100644
--- a/net-p2p/verlihub-plugins-forbid/Makefile
+++ b/net-p2p/verlihub-plugins-forbid/Makefile
@@ -1,4 +1,4 @@
-# Created by: Skylord
+# Created by: Mikle Davidkin <skylord@vt.net.ru>
 # $FreeBSD$
 
 PORTNAME=	forbid
@@ -11,7 +11,6 @@ MAINTAINER=	me@skylord.ru
 
 PLUGIN_DESC=	ForbiddenWords
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins"
 .include <bsd.port.post.mk>
diff --git a/net-p2p/verlihub-plugins-forbid/pkg-descr b/net-p2p/verlihub-plugins-forbid/pkg-descr
index 929ee4202664..bb8358983592 100644
--- a/net-p2p/verlihub-plugins-forbid/pkg-descr
+++ b/net-p2p/verlihub-plugins-forbid/pkg-descr
@@ -5,5 +5,5 @@ It is written in c++, has relatively low CPU and RAM usage,
 and has many useful features. It also uses a MySQL Database.
 Additional functionality is available through a versatile
 'plugin' system.
- 
+
 WWW: http://www.verlihub-project.org/
diff --git a/net-p2p/verlihub-plugins-iplog/Makefile b/net-p2p/verlihub-plugins-iplog/Makefile
index f2cc59195194..c18660f24829 100644
--- a/net-p2p/verlihub-plugins-iplog/Makefile
+++ b/net-p2p/verlihub-plugins-iplog/Makefile
@@ -1,4 +1,4 @@
-# Created by: Skylord
+# Created by: Mikle Davidkin <skylord@vt.net.ru>
 # $FreeBSD$
 
 PORTNAME=	iplog
@@ -11,7 +11,6 @@ MAINTAINER=	me@skylord.ru
 
 PLUGIN_DESC=	IPLog
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins"
 .include <bsd.port.post.mk>
diff --git a/net-p2p/verlihub-plugins-iplog/pkg-descr b/net-p2p/verlihub-plugins-iplog/pkg-descr
index d054c6fdc2b5..6c2275073a9f 100644
--- a/net-p2p/verlihub-plugins-iplog/pkg-descr
+++ b/net-p2p/verlihub-plugins-iplog/pkg-descr
@@ -5,5 +5,5 @@ It is written in c++, has relatively low CPU and RAM usage,
 and has many useful features. It also uses a MySQL Database.
 Additional functionality is available through a versatile
 'plugin' system.
- 
+
 WWW: http://www.verlihub-project.org/
diff --git a/net-p2p/verlihub-plugins-isp/Makefile b/net-p2p/verlihub-plugins-isp/Makefile
index 1eb79bff21de..c414d2d7560b 100644
--- a/net-p2p/verlihub-plugins-isp/Makefile
+++ b/net-p2p/verlihub-plugins-isp/Makefile
@@ -1,4 +1,4 @@
-# Created by: Skylord
+# Created by: Mikle Davidkin <skylord@vt.net.ru>
 # $FreeBSD$
 
 PORTNAME=	isp
@@ -12,7 +12,6 @@ PLUGIN_DESC=	ISP
 
 PLIST_FILES=	share/verlihub/default_pi_isp.sql
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins"
 .include <bsd.port.post.mk>
diff --git a/net-p2p/verlihub-plugins-isp/pkg-descr b/net-p2p/verlihub-plugins-isp/pkg-descr
index e3ea5529dbc4..d0b524b20c6e 100644
--- a/net-p2p/verlihub-plugins-isp/pkg-descr
+++ b/net-p2p/verlihub-plugins-isp/pkg-descr
@@ -5,5 +5,5 @@ It is written in c++, has relatively low CPU and RAM usage,
 and has many useful features. It also uses a MySQL Database.
 Additional functionality is available through a versatile
 'plugin' system.
- 
+
 WWW: http://www.verlihub-project.org/
diff --git a/net-p2p/verlihub-plugins-luascript/Makefile b/net-p2p/verlihub-plugins-luascript/Makefile
index deb8099011b1..e0e4be422e47 100644
--- a/net-p2p/verlihub-plugins-luascript/Makefile
+++ b/net-p2p/verlihub-plugins-luascript/Makefile
@@ -1,4 +1,4 @@
-# Created by: Skylord
+# Created by: Mikle Davidkin <skylord@vt.net.ru>
 # $FreeBSD$
 
 PORTNAME=	luascript
@@ -9,8 +9,6 @@ MASTER_SITES=	SF/verlihub/VH_Lua/${DISTVERSION}
 
 MAINTAINER=	me@skylord.ru
 
-BROKEN=		Fails to build
-
 PLUGIN_NAME=	lua
 PLUGIN_DESC=	LuaScript
 
@@ -21,15 +19,14 @@ CXXFLAGS+=	${LDFLAGS}
 CPPFLAGS+=	-I${LUA_INCDIR}
 LDFLAGS+=	-L${LUA_LIBDIR}
 
-OPTIONS_DEFINE=	SOCKET
-SOCKET_DESC=	Build with LuaSocket support
-
 PLIST_FILES=	share/verlihub/scripts/ptokax.lua.inc \
 		share/verlihub/scripts/ptokaxtest.lua \
 		share/verlihub/scripts/script.lua
 PLIST_DIRS=	share/verlihub/scripts
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	SOCKET
+SOCKET_DESC=	Build with LuaSocket support
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSOCKET}
@@ -44,7 +41,7 @@ post-patch::
 		-e 's|-lluamime|${LUA_MODLIBDIR}/mime/core.so|g' \
 		${WRKSRC}/configure
 .endif
-	@${REINPLACE_CMD} -e 's|llua50|llua-${LUA_VER}|g' \
+	@${REINPLACE_CMD} -e 's|llua5\.1|llua-${LUA_VER}|g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.pre.mk>
diff --git a/net-p2p/verlihub-plugins-luascript/pkg-descr b/net-p2p/verlihub-plugins-luascript/pkg-descr
index 56c1010425f6..bf26d1ea8eb7 100644
--- a/net-p2p/verlihub-plugins-luascript/pkg-descr
+++ b/net-p2p/verlihub-plugins-luascript/pkg-descr
@@ -5,5 +5,5 @@ It is written in c++, has relatively low CPU and RAM usage,
 and has many useful features. It also uses a MySQL Database.
 Additional functionality is available through a versatile
 'plugin' system.
- 
+
 WWW: http://www.verlihub-project.org/
diff --git a/net-p2p/verlihub-plugins-messanger/Makefile b/net-p2p/verlihub-plugins-messanger/Makefile
index ace7379fb0b3..052a38712226 100644
--- a/net-p2p/verlihub-plugins-messanger/Makefile
+++ b/net-p2p/verlihub-plugins-messanger/Makefile
@@ -1,4 +1,4 @@
-# Created by: Skylord
+# Created by: Mikle Davidkin <skylord@vt.net.ru>
 # $FreeBSD$
 
 PORTNAME=	messanger
@@ -11,7 +11,6 @@ MAINTAINER=	me@skylord.ru
 
 PLUGIN_DESC=	Messanger
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins"
 .include <bsd.port.post.mk>
diff --git a/net-p2p/verlihub-plugins-messanger/pkg-descr b/net-p2p/verlihub-plugins-messanger/pkg-descr
index fbd024094bcf..dc2909eade5d 100644
--- a/net-p2p/verlihub-plugins-messanger/pkg-descr
+++ b/net-p2p/verlihub-plugins-messanger/pkg-descr
@@ -5,5 +5,5 @@ It is written in c++, has relatively low CPU and RAM usage,
 and has many useful features. It also uses a MySQL Database.
 Additional functionality is available through a versatile
 'plugin' system.
- 
+
 WWW: http://www.verlihub-project.org/
diff --git a/net-p2p/verlihub-plugins-stats/Makefile b/net-p2p/verlihub-plugins-stats/Makefile
index 073b25f87d13..681dc55e615f 100644
--- a/net-p2p/verlihub-plugins-stats/Makefile
+++ b/net-p2p/verlihub-plugins-stats/Makefile
@@ -1,4 +1,4 @@
-# Created by: Skylord
+# Created by: Mikle Davidkin <skylord@vt.net.ru>
 # $FreeBSD$
 
 PORTNAME=	stats
@@ -11,7 +11,6 @@ MAINTAINER=	me@skylord.ru
 
 PLUGIN_DESC=	Statistics
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins"
 .include <bsd.port.post.mk>
diff --git a/net-p2p/verlihub-plugins-stats/pkg-descr b/net-p2p/verlihub-plugins-stats/pkg-descr
index aa8032422dd7..902b3eeb69e8 100644
--- a/net-p2p/verlihub-plugins-stats/pkg-descr
+++ b/net-p2p/verlihub-plugins-stats/pkg-descr
@@ -5,5 +5,5 @@ It is written in c++, has relatively low CPU and RAM usage,
 and has many useful features. It also uses a MySQL Database.
 Additional functionality is available through a versatile
 'plugin' system.
- 
+
 WWW: http://www.verlihub-project.org/
diff --git a/net-p2p/verlihub-plugins/Makefile b/net-p2p/verlihub-plugins/Makefile
index 3be4f06df302..3abea31e308d 100644
--- a/net-p2p/verlihub-plugins/Makefile
+++ b/net-p2p/verlihub-plugins/Makefile
@@ -1,4 +1,4 @@
-# Created by: Skylord
+# Created by: Mikle Davidkin <skylord@vt.net.ru>
 # $FreeBSD$
 
 PORTNAME=	verlihub
@@ -24,9 +24,6 @@ RUN_DEPENDS=	\
 		${LOCALBASE}/lib/libstats_pi.so:${PORTSDIR}/net-p2p/verlihub-plugins-stats
 
 NO_BUILD=	yes
-
-NO_STAGE=	yes
-do-install:
-	@${DO_NADA}
+NO_INSTALL=	yes
 
 .include <bsd.port.mk>
diff --git a/net-p2p/verlihub-plugins/Makefile.plugins b/net-p2p/verlihub-plugins/Makefile.plugins
index a6ecbf02a22d..df19a5204080 100644
--- a/net-p2p/verlihub-plugins/Makefile.plugins
+++ b/net-p2p/verlihub-plugins/Makefile.plugins
@@ -31,15 +31,12 @@ post-patch::
 	@${REINPLACE_CMD} -e 's,echo aout,echo elf,' ${WRKSRC}/configure
 
 post-build::
-	@${SED} -e 's,%%PLUGIN_DESC%%,${PLUGIN_DESC},' < ${PKGMESSAGE_TEMPLATE} \
-		> ${PKGMESSAGE}
+	@${SED} -e 's,%%PLUGIN_DESC%%,${PLUGIN_DESC},' < \
+		${PKGMESSAGE_TEMPLATE} > ${PKGMESSAGE}
 
 post-install::
-	@${MKDIR} ${PREFIX}/etc/verlihub/plugins
-	@${LN} -sf ${PREFIX}/lib/lib${PLUGIN_NAME}_pi.so \
-		${PREFIX}/etc/verlihub/plugins/lib${PLUGIN_NAME}_pi.so
-	@if [ -f ${PKGMESSAGE} ]; then \
-	   ${CAT} ${PKGMESSAGE}; \
-	 fi
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/verlihub/plugins
+	${LN} -sf ../../../lib/lib${PLUGIN_NAME}_pi.so \
+		${STAGEDIR}${PREFIX}/etc/verlihub/plugins
 	@${ECHO_CMD} '@unexec rmdir %D/etc/verlihub/plugins 2>/dev/null || true' >> ${TMPPLIST}
 	@${ECHO_CMD} '@unexec rmdir %D/etc/verlihub 2>/dev/null || true' >> ${TMPPLIST}