From owner-svn-ports-head@FreeBSD.ORG Fri May 1 12:34:05 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E1764ADD; Fri, 1 May 2015 12:34:05 +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 C46DF1208; Fri, 1 May 2015 12:34:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t41CY5td018837; Fri, 1 May 2015 12:34:05 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t41CY45A018831; Fri, 1 May 2015 12:34:04 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201505011234.t41CY45A018831@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Fri, 1 May 2015 12:34:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385109 - in head/games/minecraft-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-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 May 2015 12:34:06 -0000 Author: marino Date: Fri May 1 12:34:03 2015 New Revision: 385109 URL: https://svnweb.freebsd.org/changeset/ports/385109 Log: games/minecraft-server: Upgrade version 1.8.1 => 1.8.4 PR: 199564 Submitted by: maintainer Modified: head/games/minecraft-server/Makefile head/games/minecraft-server/distinfo head/games/minecraft-server/files/minecraft-server head/games/minecraft-server/files/minecraft.in head/games/minecraft-server/pkg-plist Modified: head/games/minecraft-server/Makefile ============================================================================== --- head/games/minecraft-server/Makefile Fri May 1 12:28:11 2015 (r385108) +++ head/games/minecraft-server/Makefile Fri May 1 12:34:03 2015 (r385109) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= minecraft-server -PORTVERSION= 1.8.1 -PORTREVISION= 1 +PORTVERSION= 1.8.4 CATEGORIES= games java MASTER_SITES= https://s3.amazonaws.com/Minecraft.Download/versions/${PORTVERSION}/ DISTNAME= minecraft_server.${PORTVERSION}.jar @@ -12,9 +11,14 @@ EXTRACT_ONLY= MAINTAINER= freebsd@jonathanprice.org COMMENT= Dedicated server for the game Minecraft -OPTIONS_DEFINE= DAEMON -DAEMON_DESC= Allows controlling via rc.d -OPTIONS_SUB= yes +OPTIONS_SINGLE= RUN +OPTIONS_SINGLE_RUN= DAEMON STANDALONE + +DAEMON_DESC= Run as a service +STANDALONE_DESC= Run the .jar file directly +OPTIONS_SUB= yes + +OPTIONS_DEFAULT= STANDALONE USERS= mcserver GROUPS= ${USERS} @@ -45,8 +49,10 @@ do-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${MKDIR} ${STAGEDIR}/var/db/minecraft-server ${MKDIR} ${STAGEDIR}/var/log/minecraft-server +.if ${PORT_OPTIONS:MSTANDALONE} ${INSTALL_SCRIPT} ${FILESDIR}/minecraft-server ${STAGEDIR}${PREFIX}/bin ${CP} ${FILESDIR}/java-args.txt ${STAGEDIR}${ETCDIR} +.endif .for file in ${CONFIG_FILES} ${LN} -s ${ETCDIR}/${file} ${STAGEDIR}${PREFIX}/${PORTNAME}/${file} .endfor Modified: head/games/minecraft-server/distinfo ============================================================================== --- head/games/minecraft-server/distinfo Fri May 1 12:28:11 2015 (r385108) +++ head/games/minecraft-server/distinfo Fri May 1 12:34:03 2015 (r385109) @@ -1,2 +1,2 @@ -SHA256 (minecraft_server.1.8.1.jar) = ef5f5a1a1a78087859b18153acf97efc6ecb12540ac08d82b9c95024249b9845 -SIZE (minecraft_server.1.8.1.jar) = 7903505 +SHA256 (minecraft_server.1.8.4.jar) = 394a9d0d5bcd03272a58f036b8736a47d26d63b45a4e7c820629114876e72107 +SIZE (minecraft_server.1.8.4.jar) = 9779346 Modified: head/games/minecraft-server/files/minecraft-server ============================================================================== --- head/games/minecraft-server/files/minecraft-server Fri May 1 12:28:11 2015 (r385108) +++ head/games/minecraft-server/files/minecraft-server Fri May 1 12:34:03 2015 (r385109) @@ -6,4 +6,4 @@ if [ "$(id -u)" != "0" ]; then fi cd /usr/local/minecraft-server -su -m mcserver -c "java $(cat /usr/local/etc/minecraft-server/java-args.txt) -jar minecraft_server.1.8.1.jar nogui" +su -m mcserver -c "java $(cat /usr/local/etc/minecraft-server/java-args.txt) -jar minecraft_server.1.8.4.jar nogui" Modified: head/games/minecraft-server/files/minecraft.in ============================================================================== --- head/games/minecraft-server/files/minecraft.in Fri May 1 12:28:11 2015 (r385108) +++ head/games/minecraft-server/files/minecraft.in Fri May 1 12:34:03 2015 (r385109) @@ -35,7 +35,7 @@ minecraft_start() else echo "Starting ${name}." cd %%PREFIX%%/minecraft-server - su mcserver -c "%%LOCALBASE%%/bin/tmux new-session -s minecraft -d '%%LOCALBASE%%/bin/java -Xmx${minecraft_mem} -Xms${minecraft_mem} ${minecraft_args} -jar %%PREFIX%%/minecraft-server/minecraft_server.1.8.1.jar nogui'" + su mcserver -c "%%LOCALBASE%%/bin/tmux new-session -s minecraft -d '%%LOCALBASE%%/bin/java -Xmx${minecraft_mem} -Xms${minecraft_mem} ${minecraft_args} -jar %%PREFIX%%/minecraft-server/minecraft_server.1.8.4.jar nogui'" fi } Modified: head/games/minecraft-server/pkg-plist ============================================================================== --- head/games/minecraft-server/pkg-plist Fri May 1 12:28:11 2015 (r385108) +++ head/games/minecraft-server/pkg-plist Fri May 1 12:34:03 2015 (r385109) @@ -1,15 +1,15 @@ -bin/minecraft-server +%%STANDALONE%%bin/minecraft-server @owner mcserver @group mcserver @dir minecraft-server @dir %%ETCDIR%% -%%ETCDIR%%/java-args.txt +%%STANDALONE%%%%ETCDIR%%/java-args.txt minecraft-server/banned-ips.json minecraft-server/banned-players.json minecraft-server/debug minecraft-server/eula.txt minecraft-server/logs -minecraft-server/minecraft_server.1.8.1.jar +minecraft-server/minecraft_server.1.8.4.jar minecraft-server/ops.json minecraft-server/server.properties minecraft-server/usercache.json