From nobody@FreeBSD.org  Thu May 29 19:50:39 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 7184A6C2
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 29 May 2014 19:50:39 +0000 (UTC)
Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by mx1.freebsd.org (Postfix) with ESMTPS id 453EC212D
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 29 May 2014 19:50:39 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4TJodQf097760
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 29 May 2014 19:50:39 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4TJodEI097759;
	Thu, 29 May 2014 19:50:39 GMT
	(envelope-from nobody)
Message-Id: <201405291950.s4TJodEI097759@cgiserv.freebsd.org>
Date: Thu, 29 May 2014 19:50:39 GMT
From: Joseph Benden <joe@thrallingpenguin.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] Add staging support to audio/ventrilo-server
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         190383
>Category:       ports
>Synopsis:       [patch] Add staging support to audio/ventrilo-server
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 29 20:00:01 UTC 2014
>Closed-Date:    
>Last-Modified:  Thu May 29 20:55:24 UTC 2014
>Originator:     Joseph Benden
>Release:        FreeBSD 11
>Organization:
>Environment:
FreeBSD lucy 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r264887: Thu Apr 24 12:43:46 MST 2014     root@lucy:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Adds staging support to audio/ventrilo-server.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/audio/ventrilo-server/Makefile b/audio/ventrilo-server/Makefile
index 98d6547..010b11a 100644
--- a/audio/ventrilo-server/Makefile
+++ b/audio/ventrilo-server/Makefile
@@ -15,7 +15,6 @@ LIB_DEPENDS=	libstdc\\+\\+.so.3:${PORTSDIR}/misc/compat4x \
 		libm.so.2:${PORTSDIR}/misc/compat4x \
 		libc.so.4:${PORTSDIR}/misc/compat4x
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 IA32_BINARY_PORT=	yes
@@ -34,19 +33,13 @@ IGNORE=	distfile can only be fetched if you accept the license. Go to http://www
 .endif
 
 do-install:
-	@${MKDIR} ${INSTALL_DIR}
-	@${CHOWN} ${VENT_USER} ${INSTALL_DIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/ventrilo_srv ${INSTALL_DIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/ventrilo_status ${INSTALL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/ventrilo_srv.htm ${INSTALL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${INSTALL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/ventrilo_srv.ini ${PREFIX}/etc/ventrilo_srv.ini.sample
-	@if [ ! -f ${PREFIX}/etc/ventrilo_srv.ini ]; then \
-		${CP} -p ${PREFIX}/etc/ventrilo_srv.ini.sample ${PREFIX}/etc/ventrilo_srv.ini ; \
-		${CHMOD} 0640 ${PREFIX}/etc/ventrilo_srv.ini ; \
-		${CHGRP} ${VENT_USER} ${PREFIX}/etc/ventrilo_srv.ini ; \
-	fi
-	${LN} -s ${PREFIX}/etc/ventrilo_srv.ini ${INSTALL_DIR}/ventrilo_srv.ini
+	@${MKDIR} ${STAGEDIR}${INSTALL_DIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/ventrilo_srv ${STAGEDIR}${INSTALL_DIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/ventrilo_status ${STAGEDIR}${INSTALL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/ventrilo_srv.htm ${STAGEDIR}${INSTALL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${INSTALL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/ventrilo_srv.ini ${STAGEDIR}${PREFIX}/etc/ventrilo_srv.ini.sample
+	${LN} -s ${PREFIX}/etc/ventrilo_srv.ini ${STAGEDIR}${INSTALL_DIR}/ventrilo_srv.ini
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/audio/ventrilo-server/pkg-plist b/audio/ventrilo-server/pkg-plist
index a562a21..0db87ed 100644
--- a/audio/ventrilo-server/pkg-plist
+++ b/audio/ventrilo-server/pkg-plist
@@ -6,4 +6,5 @@ ventrilo-server/ventrilo_srv
 ventrilo-server/ventrilo_status
 ventrilo-server/ventrilo_srv.htm
 ventrilo-server/ventrilo_srv.ini
+@exec chown -R ventrilo %D/ventrilo-server
 @dirrm ventrilo-server


>Release-Note:
>Audit-Trail:
>Unformatted:
