- Update to 0.9.8e-r2

PR:		ports/140704
Submitted by:	Mikle Davidkin <skylord@vt.net.ru> (maintainer)

21 files changed, 81 insertions, 58 deletions

diff --git a/net-p2p/verlihub-plugins-chatroom/Makefile b/net-p2p/verlihub-plugins-chatroom/Makefile
index 51d7f28f4c77..395b3dc01bb7 100644
--- a/net-p2p/verlihub-plugins-chatroom/Makefile
+++ b/net-p2p/verlihub-plugins-chatroom/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	chatroom
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
+MASTER_SITES=	SF/verlihub/VH_Chatroom/${DISTVERSION}
 
-MAINTAINER=	skylord@vt.net.ru
+MAINTAINER=	me@skylord.ru
 
 PLUGIN_DESC=	Chatroom
 
diff --git a/net-p2p/verlihub-plugins-chatroom/distinfo b/net-p2p/verlihub-plugins-chatroom/distinfo
index 42e748ccd1f5..d2db7ec8b1dd 100644
--- a/net-p2p/verlihub-plugins-chatroom/distinfo
+++ b/net-p2p/verlihub-plugins-chatroom/distinfo
@@ -1,3 +1,3 @@
-MD5 (chatroom.tar.gz) = f3773e78512c3e56a71be2249df0c0f7
-SHA256 (chatroom.tar.gz) = bba9ce7841245c13d8d4138c85158a161cfd262beffb940d848bc163cdc17b82
-SIZE (chatroom.tar.gz) = 339122
+MD5 (chatroom-1.1.tar.gz) = f3773e78512c3e56a71be2249df0c0f7
+SHA256 (chatroom-1.1.tar.gz) = bba9ce7841245c13d8d4138c85158a161cfd262beffb940d848bc163cdc17b82
+SIZE (chatroom-1.1.tar.gz) = 339122
diff --git a/net-p2p/verlihub-plugins-floodprotect/Makefile b/net-p2p/verlihub-plugins-floodprotect/Makefile
index f64aeea920f6..8715c2738332 100644
--- a/net-p2p/verlihub-plugins-floodprotect/Makefile
+++ b/net-p2p/verlihub-plugins-floodprotect/Makefile
@@ -7,14 +7,16 @@
 
 PORTNAME=	floodprotect
 PORTVERSION=	1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
+MASTER_SITES=	SF/verlihub/OldFiles
 
-MAINTAINER=	skylord@vt.net.ru
+MAINTAINER=	me@skylord.ru
 
 PLUGIN_NAME=	floodprot
 PLUGIN_DESC=	Floodprotect
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins"
+DISTNAME=	${PLUGIN_NAME}
 .include <bsd.port.post.mk>
diff --git a/net-p2p/verlihub-plugins-forbid/Makefile b/net-p2p/verlihub-plugins-forbid/Makefile
index fdba2aa4a80b..f031f45d8b77 100644
--- a/net-p2p/verlihub-plugins-forbid/Makefile
+++ b/net-p2p/verlihub-plugins-forbid/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	forbid
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
+MASTER_SITES=	SF/verlihub/VH_Forbid/${DISTVERSION}
 
-MAINTAINER=	skylord@vt.net.ru
+MAINTAINER=	me@skylord.ru
 
 PLUGIN_DESC=	ForbiddenWords
 
diff --git a/net-p2p/verlihub-plugins-forbid/distinfo b/net-p2p/verlihub-plugins-forbid/distinfo
index bd48f6342bd8..c632c28fcb1b 100644
--- a/net-p2p/verlihub-plugins-forbid/distinfo
+++ b/net-p2p/verlihub-plugins-forbid/distinfo
@@ -1,3 +1,3 @@
-MD5 (forbid.tar.gz) = 92d8d81077a918dd5375ef343c9a5bd7
-SHA256 (forbid.tar.gz) = 6770f74b7d19c49d6547392ff4afd0c2ab4ec7884c947ad48259e4ab85c49b79
-SIZE (forbid.tar.gz) = 291291
+MD5 (forbid-1.3.tar.gz) = 92d8d81077a918dd5375ef343c9a5bd7
+SHA256 (forbid-1.3.tar.gz) = 6770f74b7d19c49d6547392ff4afd0c2ab4ec7884c947ad48259e4ab85c49b79
+SIZE (forbid-1.3.tar.gz) = 291291
diff --git a/net-p2p/verlihub-plugins-iplog/Makefile b/net-p2p/verlihub-plugins-iplog/Makefile
index 69779efd9145..16ac88210425 100644
--- a/net-p2p/verlihub-plugins-iplog/Makefile
+++ b/net-p2p/verlihub-plugins-iplog/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	iplog
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
+MASTER_SITES=	SF/verlihub/VH_IPLog/${DISTVERSION}
 
-MAINTAINER=	skylord@vt.net.ru
+MAINTAINER=	me@skylord.ru
 
 PLUGIN_DESC=	IPLog
 
diff --git a/net-p2p/verlihub-plugins-iplog/distinfo b/net-p2p/verlihub-plugins-iplog/distinfo
index 3ab067e99adb..c2dab048b46d 100644
--- a/net-p2p/verlihub-plugins-iplog/distinfo
+++ b/net-p2p/verlihub-plugins-iplog/distinfo
@@ -1,3 +1,3 @@
-MD5 (iplog.tar.gz) = d94bdf7fc7c3e23811de442f48aca6aa
-SHA256 (iplog.tar.gz) = 3941e028472e054245b37bf85d7912cd84753a6cbf16a141e16b8884ab1f38a5
-SIZE (iplog.tar.gz) = 404685
+MD5 (iplog-1.1.tar.gz) = d94bdf7fc7c3e23811de442f48aca6aa
+SHA256 (iplog-1.1.tar.gz) = 3941e028472e054245b37bf85d7912cd84753a6cbf16a141e16b8884ab1f38a5
+SIZE (iplog-1.1.tar.gz) = 404685
diff --git a/net-p2p/verlihub-plugins-isp/Makefile b/net-p2p/verlihub-plugins-isp/Makefile
index e2f1f404ad95..6a0fdcc18f9f 100644
--- a/net-p2p/verlihub-plugins-isp/Makefile
+++ b/net-p2p/verlihub-plugins-isp/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	isp
-PORTVERSION=	0.9
-PORTREVISION=	1
+PORTVERSION=	1.1
 CATEGORIES=	net-p2p
+MASTER_SITES=	SF/verlihub/VH_ISP/${DISTVERSION}
 
-MAINTAINER=	skylord@vt.net.ru
+MAINTAINER=	me@skylord.ru
 
 PLUGIN_DESC=	ISP
 
diff --git a/net-p2p/verlihub-plugins-isp/distinfo b/net-p2p/verlihub-plugins-isp/distinfo
index 06451be200d1..983e1bfa47e7 100644
--- a/net-p2p/verlihub-plugins-isp/distinfo
+++ b/net-p2p/verlihub-plugins-isp/distinfo
@@ -1,3 +1,3 @@
-MD5 (isp.tar.gz) = 539caa419421b20ca1351108641d6acb
-SHA256 (isp.tar.gz) = 7107a177601dc019f2c1e4edcbc6cdb9e886312ebb4b61df8f4eb609d810ce81
-SIZE (isp.tar.gz) = 233355
+MD5 (isp-1.1.tar.gz) = 320f862ec78accdf55c73cc0657a0270
+SHA256 (isp-1.1.tar.gz) = 708c16da22cf8f6146364625bc1b80209cb01ad88d621fca94fa357aa0a35a73
+SIZE (isp-1.1.tar.gz) = 233836
diff --git a/net-p2p/verlihub-plugins-luascript/Makefile b/net-p2p/verlihub-plugins-luascript/Makefile
index e93ea87b114c..cd3b19388976 100644
--- a/net-p2p/verlihub-plugins-luascript/Makefile
+++ b/net-p2p/verlihub-plugins-luascript/Makefile
@@ -6,30 +6,45 @@
 #
 
 PORTNAME=	luascript
-PORTVERSION=	1.6
-PORTREVISION=	1
+PORTVERSION=	1.8.1
 CATEGORIES=	net-p2p
+PKGNAMEPREFIX=	verlihub-plugins-
+MASTER_SITES=	SF/verlihub/VH_Lua/${DISTVERSION}
 
-MAINTAINER=	skylord@vt.net.ru
-
-BROKEN=		does not compile
+MAINTAINER=	me@skylord.ru
 
 PLUGIN_NAME=	lua
 PLUGIN_DESC=	LuaScript
 
 USE_LUA=	5.1
+
+WRKSRC=		${WRKDIR}/${DISTNAME}
 CONFIGURE_ENV=	CXXFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS=	-I${LUA_INCDIR}
 LDFLAGS=	-L${LUA_LIBDIR}
 
-PLIST_FILES=	share/verlihub/scripts/google.lua \
-		share/verlihub/scripts/lua4to5.lua.inc \
-		share/verlihub/scripts/ptokax.lua.inc \
+OPTIONS=	SOCKET "Build with LuaSocket support" Off
+
+PLIST_FILES=	share/verlihub/scripts/ptokax.lua.inc \
 		share/verlihub/scripts/ptokaxtest.lua \
-		share/verlihub/scripts/script.lua \
-		share/verlihub/scripts/trivia.lua
+		share/verlihub/scripts/script.lua
 PLIST_DIRS=	share/verlihub/scripts
 
+.include <bsd.port.options.mk>
+
+.if defined(WITH_SOCKET)
+LUA_COMPS+=	socket:lib
+CONFIGURE_ARGS+=	--with-luasocket
+
+post-patch::
+	@${REINPLACE_CMD} -e 's|-lluasocket|${LUA_MODLIBDIR}/socket/core.so|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lluamime|${LUA_MODLIBDIR}/mime/core.so|g' ${WRKSRC}/configure
+.endif
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins"
+
+post-patch::
+	@${REINPLACE_CMD} -e 's|for libpath in /|for libpath in ${PREFIX} /|g' ${WRKSRC}/config_lua
+
 .include <bsd.port.post.mk>
diff --git a/net-p2p/verlihub-plugins-luascript/distinfo b/net-p2p/verlihub-plugins-luascript/distinfo
index fb3e3f27751b..3a041cd41eee 100644
--- a/net-p2p/verlihub-plugins-luascript/distinfo
+++ b/net-p2p/verlihub-plugins-luascript/distinfo
@@ -1,3 +1,3 @@
-MD5 (lua.tar.gz) = 949a765e56f8531a37c181c94df41fa0
-SHA256 (lua.tar.gz) = 9e79c46cefd5d83297a2c369ec98d3d12a2f05b9e2d7ebb44f59da4d46b00c3b
-SIZE (lua.tar.gz) = 492324
+MD5 (lua-1.8.1.tar.gz) = 1c7f71106e6a0897b3ae99aa412ca680
+SHA256 (lua-1.8.1.tar.gz) = 212497706b69de53189e6bc1945698fb9c08bf167bb473b6e65c5afb1cc8e384
+SIZE (lua-1.8.1.tar.gz) = 425122
diff --git a/net-p2p/verlihub-plugins-messanger/Makefile b/net-p2p/verlihub-plugins-messanger/Makefile
index 363fdab3c7a4..00b8eb5de160 100644
--- a/net-p2p/verlihub-plugins-messanger/Makefile
+++ b/net-p2p/verlihub-plugins-messanger/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	messanger
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
+MASTER_SITES=	SF/verlihub/VH_Messanger/${DISTVERSION}
 
-MAINTAINER=	skylord@vt.net.ru
+MAINTAINER=	me@skylord.ru
 
 PLUGIN_DESC=	Messanger
 
diff --git a/net-p2p/verlihub-plugins-messanger/distinfo b/net-p2p/verlihub-plugins-messanger/distinfo
index 554e8ec465ed..6a065198aebd 100644
--- a/net-p2p/verlihub-plugins-messanger/distinfo
+++ b/net-p2p/verlihub-plugins-messanger/distinfo
@@ -1,3 +1,3 @@
-MD5 (messanger.tar.gz) = b8adb29fdc80247a8ca52f52bc5b6a5b
-SHA256 (messanger.tar.gz) = 7d17cf4e731ae7754c763fc4e6cf5df70bed4393c9f2214840fd20f7ecd2a93d
-SIZE (messanger.tar.gz) = 243196
+MD5 (messanger-1.2.tar.gz) = b8adb29fdc80247a8ca52f52bc5b6a5b
+SHA256 (messanger-1.2.tar.gz) = 7d17cf4e731ae7754c763fc4e6cf5df70bed4393c9f2214840fd20f7ecd2a93d
+SIZE (messanger-1.2.tar.gz) = 243196
diff --git a/net-p2p/verlihub-plugins-stats/Makefile b/net-p2p/verlihub-plugins-stats/Makefile
index e26e2f82a5b7..5984242b84dc 100644
--- a/net-p2p/verlihub-plugins-stats/Makefile
+++ b/net-p2p/verlihub-plugins-stats/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	stats
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
+MASTER_SITES=	SF/verlihub/VH_Stats/${DISTVERSION}
 
-MAINTAINER=	skylord@vt.net.ru
+MAINTAINER=	me@skylord.ru
 
 PLUGIN_DESC=	Statistics
 
diff --git a/net-p2p/verlihub-plugins-stats/distinfo b/net-p2p/verlihub-plugins-stats/distinfo
index 636779da9fc1..8ca0ae011194 100644
--- a/net-p2p/verlihub-plugins-stats/distinfo
+++ b/net-p2p/verlihub-plugins-stats/distinfo
@@ -1,3 +1,3 @@
-MD5 (stats.tar.gz) = 2aacad97f65873a2f30c19e873fde948
-SHA256 (stats.tar.gz) = 4a6f5e8e8383424718122c0049e39afa33e2175fe53de533faef0400e31429e8
-SIZE (stats.tar.gz) = 221046
+MD5 (stats-1.1.tar.gz) = 2aacad97f65873a2f30c19e873fde948
+SHA256 (stats-1.1.tar.gz) = 4a6f5e8e8383424718122c0049e39afa33e2175fe53de533faef0400e31429e8
+SIZE (stats-1.1.tar.gz) = 221046
diff --git a/net-p2p/verlihub-plugins/Makefile.plugins b/net-p2p/verlihub-plugins/Makefile.plugins
index 616cd3496514..d3166268a30f 100644
--- a/net-p2p/verlihub-plugins/Makefile.plugins
+++ b/net-p2p/verlihub-plugins/Makefile.plugins
@@ -6,14 +6,15 @@
 PLUGIN_NAME?=	${PORTNAME}
 
 PKGNAMEPREFIX=	verlihub-plugins-
-MASTER_SITES=	SF/verlihub/OldFiles
-DISTNAME=	${PLUGIN_NAME}
+DISTNAME=	${PLUGIN_NAME}-${PORTVERSION}
+WRKSRC?=	${WRKDIR}/${PLUGIN_NAME}
 
 COMMENT?=	${PLUGIN_DESC} plugin for the VerliHub - a Direct Connect protocol server
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/verlihub:${PORTSDIR}/net-p2p/verlihub
 RUN_DEPENDS+=	${LOCALBASE}/bin/verlihub:${PORTSDIR}/net-p2p/verlihub
 
+USE_GCC=	4.2+
 GNU_CONFIGURE=	yes
 USE_GCC=	4.2+
 
diff --git a/net-p2p/verlihub-plugins/pkg-message.plugins b/net-p2p/verlihub-plugins/pkg-message.plugins
index f072803beb0a..92b94fd40169 100644
--- a/net-p2p/verlihub-plugins/pkg-message.plugins
+++ b/net-p2p/verlihub-plugins/pkg-message.plugins
@@ -4,7 +4,6 @@ This port installs the %%PLUGIN_DESC%% VerliHub plugin.
 You need to restart your hub or manually load plugin with
 plugman commands.
 
-Visit http://www.verlihub-project.org/ for online manuals or 
-http://www.verlihubforums.com/ for the project's forums.
+Visit http://www.verlihub-project.org/ for online support.
 
 -------------------------------------------------------------------
diff --git a/net-p2p/verlihub/Makefile b/net-p2p/verlihub/Makefile
index 282ac94efe85..ab0e1d2b3411 100644
--- a/net-p2p/verlihub/Makefile
+++ b/net-p2p/verlihub/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	verlihub
-DISTVERSION=	0.9.8e-r1
+DISTVERSION=	0.9.8e-r2
 PORTEPOCH=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/${PORTNAME}/Verlihub/${DISTVERSION}
diff --git a/net-p2p/verlihub/distinfo b/net-p2p/verlihub/distinfo
index cf5ea56e4504..91fd2bc9e185 100644
--- a/net-p2p/verlihub/distinfo
+++ b/net-p2p/verlihub/distinfo
@@ -1,3 +1,3 @@
-MD5 (verlihub-0.9.8e-r1.tar.gz) = 663ef7254b79d382c3943e5c0409b640
-SHA256 (verlihub-0.9.8e-r1.tar.gz) = 1b3e981717f5e0c972778f48918ba54cb1a4b833426854c8e3eb295effc2c01d
-SIZE (verlihub-0.9.8e-r1.tar.gz) = 729317
+MD5 (verlihub-0.9.8e-r2.tar.gz) = bbf67b6714d26fc5389d880edba61511
+SHA256 (verlihub-0.9.8e-r2.tar.gz) = 3b5132eb3a78b486e2bfd09166dc3206c89bdc8dbfaf98805dfa803cd7574516
+SIZE (verlihub-0.9.8e-r2.tar.gz) = 743769
diff --git a/net-p2p/verlihub/files/patch-thublink b/net-p2p/verlihub/files/patch-thublink
index 6ac4036c56b7..14574852dbd6 100644
--- a/net-p2p/verlihub/files/patch-thublink
+++ b/net-p2p/verlihub/files/patch-thublink
@@ -200,9 +200,10 @@ diff -u -r1.235 cserverdc.cpp
  		return 0;
  	}
 +	return true;
- }
- 
- /** No descriptions */
+ 	#else
+ 	return 0;
+ 	#endif
+
 Index: casyncconn.h
 ===================================================================
 RCS file: /cvsroot/verlihub/verlihub/src/casyncconn.h,v
diff --git a/net-p2p/verlihub/files/pkg-message.in b/net-p2p/verlihub/files/pkg-message.in
index 4d95422f6067..47d1db1f235f 100644
--- a/net-p2p/verlihub/files/pkg-message.in
+++ b/net-p2p/verlihub/files/pkg-message.in
@@ -22,7 +22,7 @@ UPGRADE
 If you upgrade from version prior to 0.9.8e please note the 
 following:
 
-    - Database charset is now set explicitly to UTF8 - velihub
+    - Database charset is now set explicitly to UTF8 - verlihub
       will alter all tables during the first run. So if you have
       used custom charset you should deal with it (backup, i.e.)
       before the first run!