Update to 0.9.7

Bump PORTEPOCH, because PORTVERSION decreased.

PR:		68252
Submitted by:	Bill Cadwallader <hurbold@yahoo.com>

10 files changed, 50 insertions, 64 deletions

diff --git a/net-p2p/verlihub/Makefile b/net-p2p/verlihub/Makefile
index a55285b2f158..5534901638dd 100644
--- a/net-p2p/verlihub/Makefile
+++ b/net-p2p/verlihub/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	verlihub
-PORTVERSION=	0.9.7r5
-PORTREVISION=	1
+PORTVERSION=	0.9.7
+PORTREVISION=	
+PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	verlihub
-DISTNAME=	verlihub-0.9.7-RC5
+MASTER_SITE_SUBDIR= 	verlihub
 
 MAINTAINER=	hurbold@yahoo.com
 COMMENT=	Verlihub Linux/Unix Direct Connect Hub Software
@@ -24,14 +24,18 @@ USE_MYSQL=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=	15
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lssl -lcrypto"
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PORTDOCS=	configuring.txt help.sql using.txt features.html help.html params.php verlihub.html
 
 post-patch:
 	@${CAT} ${PKGDIR}/pkg-message | ${SED} 's|%%PREFIX%%|${PREFIX}|' > ${PKGMESSAGE}
+	@${REINPLACE_CMD} -e "s|/bin/bash|/usr/local/bin/bash|" ${WRKSRC}/scripts/install \
+	${WRKSRC}/scripts/regnick ${WRKSRC}/scripts/runhub ${WRKSRC}/scripts/trigger
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -54,8 +58,4 @@ post-install:
 USE_GCC=	3.3
 .endif
 
-.if ${PERL_LEVEL} < 500800
-IGNORE=		requires perl 5.8 or later. Install lang/perl5.8 and try again
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/net-p2p/verlihub/distinfo b/net-p2p/verlihub/distinfo
index 8774c07f6de6..fc77493ba159 100644
--- a/net-p2p/verlihub/distinfo
+++ b/net-p2p/verlihub/distinfo
@@ -1,2 +1,2 @@
-MD5 (verlihub-0.9.7-RC5.tar.gz) = 0ed37990a05804c04a21c4d2d14ab426
-SIZE (verlihub-0.9.7-RC5.tar.gz) = 432016
+MD5 (verlihub-0.9.7.tar.gz) = 769dc0eb03e7ea082b543eb9c1a5f7e0
+SIZE (verlihub-0.9.7.tar.gz) = 449498
diff --git a/net-p2p/verlihub/pkg-descr b/net-p2p/verlihub/pkg-descr
index a7ab8659d3fe..5ace8af925f1 100644
--- a/net-p2p/verlihub/pkg-descr
+++ b/net-p2p/verlihub/pkg-descr
@@ -1,11 +1,8 @@
 Verlihub is a Linux/Unix Direct Connect protocol server (Hub).
 It is written in c++, has relatively low CPU and RAM usage,
 and has many useful features. It also uses a MySQL Database.
-
-These are plugins that can be used to provide additional
-functionality not present in the Verlihub base. They work
-similarly to 'bots' which have been developed for other hub
-servers, without the need for uncompiled scripts.
+Additional functionality is available through a versatile
+'plugin' system.
  
 WWW: http://verlihub.sourceforge.net
 
diff --git a/net-p2p/verlihub/pkg-message b/net-p2p/verlihub/pkg-message
index 9bf2a685d492..1daaa20ed6e6 100644
--- a/net-p2p/verlihub/pkg-message
+++ b/net-p2p/verlihub/pkg-message
@@ -17,15 +17,9 @@ script:
 
 Follow the instructions given.
 
-You will need the files in %%PREFIX%%/share/examples/verlihub/config
-to run the hub. These should be put in the .verlihub directory that
-you created with the install script:
+You can copy or move the scripts to the .verlihub location:
 
-cp -R %%PREFIX%%/share/examples/verlihub/config/ /path/to/.verlihub
-
-You should also copy or move the scripts to the .verlihub location:
-
-cp -R %%PREFIX%%/share/examples/verlihub/scripts /path/to/.verlihub
+cp -R %%PREFIX%%/share/examples/verlihub/scripts/* /path/to/.verlihub
 
 Visit http://verlihub.sourceforge.net for the project's homepage
 or http://verlihub.no-ip.com for the project's forums.
diff --git a/net-p2p/verlihub/pkg-plist b/net-p2p/verlihub/pkg-plist
index d19d112a9ed6..a8fe487b1c1d 100644
--- a/net-p2p/verlihub/pkg-plist
+++ b/net-p2p/verlihub/pkg-plist
@@ -30,6 +30,7 @@ include/verlihub/ckicklist.h
 include/verlihub/ckick.h
 include/verlihub/cmeanfrequency.h
 include/verlihub/cmessagedc.h
+include/verlihub/cmutex.h
 include/verlihub/cmysql.h
 include/verlihub/cobj.h
 include/verlihub/config.h
@@ -47,6 +48,8 @@ include/verlihub/creguserinfo.h
 include/verlihub/cserverdc.h
 include/verlihub/csetuplist.h
 include/verlihub/ctempfunctionbase.h
+include/verlihub/cthread.h
+include/verlihub/cthreadwork.h
 include/verlihub/ctimeout.h
 include/verlihub/ctime.h
 include/verlihub/ctriggers.h
@@ -56,19 +59,18 @@ include/verlihub/cusercollection.h
 include/verlihub/cuser.h
 include/verlihub/cvhpluginmgr.h
 include/verlihub/cvhplugin.h
+include/verlihub/cworkerthread.h
 include/verlihub/dll.h
+include/verlihub/script_api.h
 include/verlihub/tcache.h
 include/verlihub/thasharray.h
 include/verlihub/tchashlistmap.h
+include/verlihub/tmysqlmemorylist.h
 include/verlihub/tpluginbase.h
 lib/libdiakritika_pi.a
 lib/libdiakritika_pi.la
 lib/libdiakritika_pi.so
 lib/libdiakritika_pi.so.0
-lib/libperl_pi.a
-lib/libperl_pi.la
-lib/libperl_pi.so
-lib/libperl_pi.so.0
 lib/libtest_pi.a
 lib/libtest_pi.la
 lib/libtest_pi.so
@@ -77,10 +79,10 @@ lib/libverlihub.a
 lib/libverlihub.la
 lib/libverlihub.so
 lib/libverlihub.so.0
-lib/libvhinterface.a
-lib/libvhinterface.la
-lib/libvhinterface.so
-lib/libvhinterface.so.0
+lib/libvhapi.a
+lib/libvhapi.la
+lib/libvhapi.so
+lib/libvhapi.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/scripts/trigger
 %%PORTDOCS%%%%EXAMPLESDIR%%/scripts/install
 %%PORTDOCS%%%%EXAMPLESDIR%%/scripts/regnick
diff --git a/net/verlihub/Makefile b/net/verlihub/Makefile
index a55285b2f158..5534901638dd 100644
--- a/net/verlihub/Makefile
+++ b/net/verlihub/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	verlihub
-PORTVERSION=	0.9.7r5
-PORTREVISION=	1
+PORTVERSION=	0.9.7
+PORTREVISION=	
+PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	verlihub
-DISTNAME=	verlihub-0.9.7-RC5
+MASTER_SITE_SUBDIR= 	verlihub
 
 MAINTAINER=	hurbold@yahoo.com
 COMMENT=	Verlihub Linux/Unix Direct Connect Hub Software
@@ -24,14 +24,18 @@ USE_MYSQL=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=	15
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lssl -lcrypto"
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PORTDOCS=	configuring.txt help.sql using.txt features.html help.html params.php verlihub.html
 
 post-patch:
 	@${CAT} ${PKGDIR}/pkg-message | ${SED} 's|%%PREFIX%%|${PREFIX}|' > ${PKGMESSAGE}
+	@${REINPLACE_CMD} -e "s|/bin/bash|/usr/local/bin/bash|" ${WRKSRC}/scripts/install \
+	${WRKSRC}/scripts/regnick ${WRKSRC}/scripts/runhub ${WRKSRC}/scripts/trigger
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -54,8 +58,4 @@ post-install:
 USE_GCC=	3.3
 .endif
 
-.if ${PERL_LEVEL} < 500800
-IGNORE=		requires perl 5.8 or later. Install lang/perl5.8 and try again
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/net/verlihub/distinfo b/net/verlihub/distinfo
index 8774c07f6de6..fc77493ba159 100644
--- a/net/verlihub/distinfo
+++ b/net/verlihub/distinfo
@@ -1,2 +1,2 @@
-MD5 (verlihub-0.9.7-RC5.tar.gz) = 0ed37990a05804c04a21c4d2d14ab426
-SIZE (verlihub-0.9.7-RC5.tar.gz) = 432016
+MD5 (verlihub-0.9.7.tar.gz) = 769dc0eb03e7ea082b543eb9c1a5f7e0
+SIZE (verlihub-0.9.7.tar.gz) = 449498
diff --git a/net/verlihub/pkg-descr b/net/verlihub/pkg-descr
index a7ab8659d3fe..5ace8af925f1 100644
--- a/net/verlihub/pkg-descr
+++ b/net/verlihub/pkg-descr
@@ -1,11 +1,8 @@
 Verlihub is a Linux/Unix Direct Connect protocol server (Hub).
 It is written in c++, has relatively low CPU and RAM usage,
 and has many useful features. It also uses a MySQL Database.
-
-These are plugins that can be used to provide additional
-functionality not present in the Verlihub base. They work
-similarly to 'bots' which have been developed for other hub
-servers, without the need for uncompiled scripts.
+Additional functionality is available through a versatile
+'plugin' system.
  
 WWW: http://verlihub.sourceforge.net
 
diff --git a/net/verlihub/pkg-message b/net/verlihub/pkg-message
index 9bf2a685d492..1daaa20ed6e6 100644
--- a/net/verlihub/pkg-message
+++ b/net/verlihub/pkg-message
@@ -17,15 +17,9 @@ script:
 
 Follow the instructions given.
 
-You will need the files in %%PREFIX%%/share/examples/verlihub/config
-to run the hub. These should be put in the .verlihub directory that
-you created with the install script:
+You can copy or move the scripts to the .verlihub location:
 
-cp -R %%PREFIX%%/share/examples/verlihub/config/ /path/to/.verlihub
-
-You should also copy or move the scripts to the .verlihub location:
-
-cp -R %%PREFIX%%/share/examples/verlihub/scripts /path/to/.verlihub
+cp -R %%PREFIX%%/share/examples/verlihub/scripts/* /path/to/.verlihub
 
 Visit http://verlihub.sourceforge.net for the project's homepage
 or http://verlihub.no-ip.com for the project's forums.
diff --git a/net/verlihub/pkg-plist b/net/verlihub/pkg-plist
index d19d112a9ed6..a8fe487b1c1d 100644
--- a/net/verlihub/pkg-plist
+++ b/net/verlihub/pkg-plist
@@ -30,6 +30,7 @@ include/verlihub/ckicklist.h
 include/verlihub/ckick.h
 include/verlihub/cmeanfrequency.h
 include/verlihub/cmessagedc.h
+include/verlihub/cmutex.h
 include/verlihub/cmysql.h
 include/verlihub/cobj.h
 include/verlihub/config.h
@@ -47,6 +48,8 @@ include/verlihub/creguserinfo.h
 include/verlihub/cserverdc.h
 include/verlihub/csetuplist.h
 include/verlihub/ctempfunctionbase.h
+include/verlihub/cthread.h
+include/verlihub/cthreadwork.h
 include/verlihub/ctimeout.h
 include/verlihub/ctime.h
 include/verlihub/ctriggers.h
@@ -56,19 +59,18 @@ include/verlihub/cusercollection.h
 include/verlihub/cuser.h
 include/verlihub/cvhpluginmgr.h
 include/verlihub/cvhplugin.h
+include/verlihub/cworkerthread.h
 include/verlihub/dll.h
+include/verlihub/script_api.h
 include/verlihub/tcache.h
 include/verlihub/thasharray.h
 include/verlihub/tchashlistmap.h
+include/verlihub/tmysqlmemorylist.h
 include/verlihub/tpluginbase.h
 lib/libdiakritika_pi.a
 lib/libdiakritika_pi.la
 lib/libdiakritika_pi.so
 lib/libdiakritika_pi.so.0
-lib/libperl_pi.a
-lib/libperl_pi.la
-lib/libperl_pi.so
-lib/libperl_pi.so.0
 lib/libtest_pi.a
 lib/libtest_pi.la
 lib/libtest_pi.so
@@ -77,10 +79,10 @@ lib/libverlihub.a
 lib/libverlihub.la
 lib/libverlihub.so
 lib/libverlihub.so.0
-lib/libvhinterface.a
-lib/libvhinterface.la
-lib/libvhinterface.so
-lib/libvhinterface.so.0
+lib/libvhapi.a
+lib/libvhapi.la
+lib/libvhapi.so
+lib/libvhapi.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/scripts/trigger
 %%PORTDOCS%%%%EXAMPLESDIR%%/scripts/install
 %%PORTDOCS%%%%EXAMPLESDIR%%/scripts/regnick