4 files changed, 31 insertions, 33 deletions

diff --git a/net-p2p/verlihub/Makefile b/net-p2p/verlihub/Makefile
index f67b8ecf3c04..c664e54b2f06 100644
--- a/net-p2p/verlihub/Makefile
+++ b/net-p2p/verlihub/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	verlihub
-PORTVERSION=	0.9.7
-PORTREVISION=	
+PORTVERSION=	0.9.8.a
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= 	verlihub
+MASTER_SITE_SUBDIR=	verlihub
+DISTNAME=	verlihub-0.9.8a
 
 MAINTAINER=	hurbold@yahoo.com
 COMMENT=	Verlihub Linux/Unix Direct Connect Hub Software
@@ -24,18 +24,14 @@ USE_MYSQL=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_INC_LIBTOOL_VER=	15
-USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lssl -lcrypto"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
 
 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)
@@ -43,13 +39,8 @@ post-install:
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/docs/${i} ${DOCSDIR}
 .endfor
-	${INSTALL_SCRIPT} ${WRKSRC}/verlihub_config ${LOCALBASE}/bin
-	${MKDIR} ${EXAMPLESDIR}/scripts
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/trigger ${EXAMPLESDIR}/scripts
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/install ${EXAMPLESDIR}/scripts
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/regnick ${EXAMPLESDIR}/scripts
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/runhub ${EXAMPLESDIR}/scripts
 .endif
+
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
@@ -58,4 +49,8 @@ post-install:
 USE_GCC=	3.3
 .endif
 
+.if ${OSVERSION} >= 502126
+BROKEN=		Does not compile with gcc 3.4
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/net-p2p/verlihub/distinfo b/net-p2p/verlihub/distinfo
index fc77493ba159..df9bc61a55f5 100644
--- a/net-p2p/verlihub/distinfo
+++ b/net-p2p/verlihub/distinfo
@@ -1,2 +1,2 @@
-MD5 (verlihub-0.9.7.tar.gz) = 769dc0eb03e7ea082b543eb9c1a5f7e0
-SIZE (verlihub-0.9.7.tar.gz) = 449498
+MD5 (verlihub-0.9.8a.tar.gz) = 7b92ac6805da999ef4a08e405129f82a
+SIZE (verlihub-0.9.8a.tar.gz) = 461010
diff --git a/net-p2p/verlihub/pkg-message b/net-p2p/verlihub/pkg-message
index 1daaa20ed6e6..2409001e9e2d 100644
--- a/net-p2p/verlihub/pkg-message
+++ b/net-p2p/verlihub/pkg-message
@@ -1,11 +1,8 @@
 --------------------------------------------------------------------
 
 Documentation has been installed in %%PREFIX%%/share/doc
-Sample files have been installed in %%PREFIX%%/share/examples
-These include the scripts necessary to start running Verlihub and some sample
-configuration files.
-The executable has been installed in %%PREFIX%%/bin
-A script to link Verlihub plugins has been installed in %%PREFIX%%/bin
+
+Scripts and the executable have been installed in %%PREFIX%%/bin
 
 This port requires a working mysql server installation, either
 locally or remotely.
@@ -13,15 +10,12 @@ locally or remotely.
 Once you have a properly-running mysql server, please run the install
 script:
 
-%%PREFIX%%/share/examples/verlihub/scripts/install
+%%PREFIX%%/bin/vh_install
 
 Follow the instructions given.
 
-You can copy or move the scripts to the .verlihub location:
-
-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.
+or http://verlihub.no-ip.com for the project's forums. The verlihub
+manual is available online at http://www.danomac.org/verlihub
 
 -------------------------------------------------------------------
diff --git a/net-p2p/verlihub/pkg-plist b/net-p2p/verlihub/pkg-plist
index a8fe487b1c1d..af3f7c2b4c2f 100644
--- a/net-p2p/verlihub/pkg-plist
+++ b/net-p2p/verlihub/pkg-plist
@@ -1,11 +1,18 @@
 bin/verlihub
 bin/verlihub_config
+bin/vh_getcfg
+bin/vh_getdb
+bin/vh_install
+bin/vh_regnick
+bin/vh_runhub
+bin/vh_trigger
 include/verlihub/cantiflood.h
 include/verlihub/casyncconn.h
 include/verlihub/casyncsocketserver.h
 include/verlihub/cbanlist.h
 include/verlihub/cban.h
 include/verlihub/ccallbacklist.h
+include/verlihub/cchatconsole.h
 include/verlihub/ccmdr.h
 include/verlihub/ccommand.h
 include/verlihub/cconfigbase.h
@@ -18,6 +25,7 @@ include/verlihub/cconnchoose.h
 include/verlihub/cconnpoll.h
 include/verlihub/cconnselect.h
 include/verlihub/cdbconf.h
+include/verlihub/cdccommand.h
 include/verlihub/cdcconf.h
 include/verlihub/cdcconsole.h
 include/verlihub/cdcproto.h
@@ -61,16 +69,23 @@ include/verlihub/cvhpluginmgr.h
 include/verlihub/cvhplugin.h
 include/verlihub/cworkerthread.h
 include/verlihub/dll.h
+include/verlihub/make_time.h
 include/verlihub/script_api.h
 include/verlihub/tcache.h
 include/verlihub/thasharray.h
 include/verlihub/tchashlistmap.h
+include/verlihub/tlistconsole.h
+include/verlihub/tlistplugin.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/libplug_pi.a
+lib/libplug_pi.la
+lib/libplug_pi.so
+lib/libplug_pi.so.0
 lib/libtest_pi.a
 lib/libtest_pi.la
 lib/libtest_pi.so
@@ -83,10 +98,4 @@ 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
-%%PORTDOCS%%%%EXAMPLESDIR%%/scripts/runhub
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/scripts
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm include/verlihub