3 files changed, 18 insertions, 24 deletions

diff --git a/audio/ventrilo-server/Makefile b/audio/ventrilo-server/Makefile
index f22f8bed2cbb..2378dbb27c02 100644
--- a/audio/ventrilo-server/Makefile
+++ b/audio/ventrilo-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ventrilo
-PORTVERSION=	2.3.1
+PORTVERSION=	3.0.2
 CATEGORIES=	audio net
 MASTER_SITES=	# http://www.ventrilo.com/download.php
 PKGNAMESUFFIX=	-server
@@ -15,32 +15,25 @@ DISTNAME=	ventrilo_srv-${PORTVERSION}-FreeBSD-i386
 MAINTAINER=	amistry@am-productions.biz
 COMMENT=	Server side of the Ventrilo group voice chat system
 
-FETCH_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
-LIB_DEPENDS=	c.4:${PORTSDIR}/misc/compat4x
+LIB_DEPENDS=	stdc\\+\\+.3:${PORTSDIR}/misc/compat4x \
+		m.2:${PORTSDIR}/misc/compat4x \
+		c.4:${PORTSDIR}/misc/compat4x
 
-BROKEN=		bad checksum
+.include <bsd.port.pre.mk>
 
-ONLY_FOR_ARCHS=	i386
+IA32_BINARY_PORT=	yes
 NO_BUILD=	yes
 RESTRICTED=	Redistribution of pre-compiled binaries is not permitted
-NO_CDROM=	Redistribution of pre-compiled binaries is not permitted
 INSTALL_DIR=	${PREFIX}/ventrilo-server
 USE_RC_SUBR=	${PORTNAME}${PKGNAMESUFFIX}.sh
 VENT_USER=	${PORTNAME}
-FETCH_CMD=	${LOCALBASE}/bin/wget
+WRKSRC=	${WRKDIR}/ventsrv
 SUB_FILES=	pkg-message
 
-.include <bsd.port.pre.mk>
-
-do-fetch:
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-	${FETCH_CMD} --post-data "Download=Download" "http://download1.ventrilo.com/dl.php?server_freebsd_i386&2332415189" -O "${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}"
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+IGNORE=	distfile can only be fetched if you accept the license. Go to http://www.ventrilo.com/dlprod.php?id=105 and put ${DISTFILES} into ${DISTDIR}
 .endif
 
-do-extract:
-	@${MKDIR} ${WRKSRC}
-	@${TAR} -C ${WRKSRC} -zxf ${DISTDIR}/${DISTFILES}
-
 do-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
@@ -66,4 +59,5 @@ post-deinstall:
 		${SH} ${PKGDEINSTALL} ${PORTNAME} POST-DEINSTALL
 
 PKGDEINSTALL=	${PKGINSTALL}
+
 .include <bsd.port.post.mk>
diff --git a/audio/ventrilo-server/distinfo b/audio/ventrilo-server/distinfo
index 2b1a9a162151..f8c4e43bc2a5 100644
--- a/audio/ventrilo-server/distinfo
+++ b/audio/ventrilo-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (ventrilo_srv-2.3.1-FreeBSD-i386.tar.gz) = 5f521245c5fef2ff96f4218e718c7906
-SHA256 (ventrilo_srv-2.3.1-FreeBSD-i386.tar.gz) = f949899a8d82ba99c56278d26af095925bced646b50ab49fe386b7d5c50d1590
-SIZE (ventrilo_srv-2.3.1-FreeBSD-i386.tar.gz) = 119690
+MD5 (ventrilo_srv-3.0.2-FreeBSD-i386.tar.gz) = 418f879ec38e9155f6c0fc97e22541c9
+SHA256 (ventrilo_srv-3.0.2-FreeBSD-i386.tar.gz) = b6ddba417cf4194f2d3a7fb01fdb8f4aec8d5da316085eda7cf7e2e0e1c3b5f5
+SIZE (ventrilo_srv-3.0.2-FreeBSD-i386.tar.gz) = 148042
diff --git a/audio/ventrilo-server/files/ventrilo-server.sh.in b/audio/ventrilo-server/files/ventrilo-server.sh.in
index 52daf01d966b..de565ccd1085 100644
--- a/audio/ventrilo-server/files/ventrilo-server.sh.in
+++ b/audio/ventrilo-server/files/ventrilo-server.sh.in
@@ -3,13 +3,9 @@
 # $FreeBSD$
 
 # PROVIDE: ventrilo
-# REQUIRE: NETWORKING
+# REQUIRE: DAEMON
 # KEYWORD: shutdown
 
-[ -z "${ventrilo_enable}" ] && ventrilo_enable="NO"
-[ -z "${ventrilo_port}" ] && ventrilo_port="3784"
-[ -z "${ventrilo_srv}" ] && ventrilo_srv="localhost"
-
 . %%RC_SUBR%%
 
 prefix=%%PREFIX%%
@@ -27,6 +23,10 @@ rcvar=`set_rcvar`
 
 load_rc_config $name
 
+: ${ventrilo_enable="NO"}
+: ${ventrilo_port="3784"}
+: ${ventrilo_srv="localhost"}
+
 ventrilo_info()
 {
 	if [ "$1" != "" ]; then