From owner-svn-ports-all@FreeBSD.ORG Wed Jun 4 06:36:55 2014 Return-Path: Delivered-To: svn-ports-all@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 1C488D1A; Wed, 4 Jun 2014 06:36:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F11002AAF; Wed, 4 Jun 2014 06:36:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s546asng014055; Wed, 4 Jun 2014 06:36:54 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s546asJN014052; Wed, 4 Jun 2014 06:36:54 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201406040636.s546asJN014052@svn.freebsd.org> From: Martin Wilke Date: Wed, 4 Jun 2014 06:36:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356438 - in head/audio/teamspeak3-server: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2014 06:36:55 -0000 Author: miwi Date: Wed Jun 4 06:36:54 2014 New Revision: 356438 URL: http://svnweb.freebsd.org/changeset/ports/356438 QAT: https://qat.redports.org/buildarchive/r356438/ Log: - Stage support PR: 190474 Submitted by: maintainer Modified: head/audio/teamspeak3-server/Makefile head/audio/teamspeak3-server/files/pkg-message.in head/audio/teamspeak3-server/pkg-plist Modified: head/audio/teamspeak3-server/Makefile ============================================================================== --- head/audio/teamspeak3-server/Makefile Wed Jun 4 06:28:56 2014 (r356437) +++ head/audio/teamspeak3-server/Makefile Wed Jun 4 06:36:54 2014 (r356438) @@ -3,6 +3,7 @@ PORTNAME= teamspeak3-server PORTVERSION= 3.0.10.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= audio net MASTER_SITES= http://dl.4players.de/ts/releases/${PORTVERSION}/ \ @@ -18,37 +19,35 @@ LICENSE_NAME= TeamSpeak 3.x End User Lic LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell +LIB_DEPENDS= libiconv.so.3:${PORTSDIR}/converters/libiconv + .ifdef (BATCH) IGNORE= license ${LICENSE} needs confirmation, but BATCH is defined .endif -USES= iconv -NO_STAGE= yes -USE_LDCONFIG= ${PREFIX}/lib/teamspeak/server +NO_BUILD= yes +USE_LDCONFIG= ${LIBDIR} USE_RC_SUBR= teamspeak SUB_FILES= pkg-message +USE_GCC= yes RESTRICTED= No redistribution ONLY_FOR_ARCHS= amd64 i386 -NO_BUILD= yes - USERS= teamspeak GROUPS= teamspeak CONFLICTS= teamspeak_server-[0-9]* PLIST_SUB+= DBDIR=${DBDIR} \ + ETCDIR=${ETCDIR} \ LOGDIR=${LOGDIR} \ - USERS=${USERS} \ - GROUPS=${GROUPS} \ BINGRP=${BINGRP} SUB_LIST+= DBDIR=${DBDIR} \ + ETCDIR=${ETCDIR} \ LOGDIR=${LOGDIR} -OPTIONS_DEFINE= DOCS - .include .if ${ARCH} == "i386" @@ -62,7 +61,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}_freebsd-${ DBDIR= /var/db/teamspeak ETCDIR= ${PREFIX}/etc/teamspeak LIBDIR= ${PREFIX}/lib/teamspeak/server -LIBEXECDIR= ${PREFIX}/libexec/ +LIBEXECDIR= ${PREFIX}/libexec LOGDIR= /var/log/teamspeak SHAREDIR= ${PREFIX}/share/teamspeak/server PORTDOCS= ts3_serverquery_manual.pdf \ @@ -72,24 +71,26 @@ PORTDOCS= ts3_serverquery_manual.pdf \ server_upgrade.txt do-install: - @${MKDIR} ${LIBDIR} ${SHAREDIR} - @${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${SHAREDIR} - @${INSTALL_DATA} ${WRKSRC}/LICENSE ${SHAREDIR} - @${INSTALL_LIB} ${WRKSRC}/*.so ${LIBDIR} + @${MKDIR} ${STAGEDIR}${SHAREDIR} + @${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${SHAREDIR} + @${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${SHAREDIR} + @(cd ${WRKSRC} && ${COPYTREE_SHARE} "sql serverquerydocs" ${STAGEDIR}${SHAREDIR}) + + @${MKDIR} ${STAGEDIR}${LIBDIR} + @${INSTALL_LIB} ${WRKSRC}/*.so ${STAGEDIR}${LIBDIR} + @${INSTALL_PROGRAM} ${WRKSRC}/ts3server_freebsd_${TEAMSPEAK_ARCH} \ - ${LIBEXECDIR}/teamspeak_server - @(cd ${WRKSRC} && ${COPYTREE_SHARE} "sql serverquerydocs" ${SHAREDIR}) -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} -. for DOCFILE in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/${DOCFILE} ${DOCSDIR} -. endfor -.endif + ${STAGEDIR}${LIBEXECDIR}/teamspeak_server + + @${MKDIR} ${STAGEDIR}${DOCSDIR} +. for DOCFILE in ${PORTDOCS} + @${INSTALL_DATA} ${WRKSRC}/doc/${DOCFILE} ${STAGEDIR}${DOCSDIR} +. endfor post-install: - @${INSTALL} -d -o ${USERS} -g ${GROUPS} ${DBDIR} - @${INSTALL} -d -o ${USERS} -g ${BINGRP} ${LOGDIR} - @${MKDIR} ${ETCDIR} + @${INSTALL} -d ${STAGEDIR}${DBDIR} + @${INSTALL} -d ${STAGEDIR}${LOGDIR} + @${MKDIR} ${STAGEDIR}${ETCDIR} @${CAT} ${WRKDIR}/pkg-message .include Modified: head/audio/teamspeak3-server/files/pkg-message.in ============================================================================== --- head/audio/teamspeak3-server/files/pkg-message.in Wed Jun 4 06:28:56 2014 (r356437) +++ head/audio/teamspeak3-server/files/pkg-message.in Wed Jun 4 06:36:54 2014 (r356438) @@ -12,4 +12,4 @@ To see the admin token after the first s into the logs in %%LOGDIR%% TeamSpeak DNS server (tsdns) is not handled by this port. If you -need id, please download and install it manually. +need it, please download and install it manually. Modified: head/audio/teamspeak3-server/pkg-plist ============================================================================== --- head/audio/teamspeak3-server/pkg-plist Wed Jun 4 06:28:56 2014 (r356437) +++ head/audio/teamspeak3-server/pkg-plist Wed Jun 4 06:36:54 2014 (r356438) @@ -251,9 +251,11 @@ share/teamspeak/server/sql/update_permis @dirrm share/teamspeak/server @dirrmtry share/teamspeak @dirrmtry %%ETCDIR%% +@owner teamspeak +@group teamspeak @dirrmtry %%DBDIR%% +@group %%BINGRP%% @dirrmtry %%LOGDIR%% -@comment installation with correct permissions -@exec install -d -o %%USERS%% -g %%GROUPS%% %%DBDIR%% -@exec install -d -o %%USERS%% -g %%BINGRP%% %%LOGDIR%% -@exec mkdir -p %D/%%ETCDIR%% +@comment pkg_tools compatibility +@exec install -d -o teamspeak -g teamspeak %D/%%DBDIR%% +@exec install -d -o teamspeak -g %%BINGRP%% %D/%%LOGDIR%%