games/minecraft-server: Upgrade version 1.8.1 => 1.8.4

PR:		199564
Submitted by:	maintainer

5 files changed, 18 insertions, 12 deletions

diff --git a/games/minecraft-server/Makefile b/games/minecraft-server/Makefile
index 62629264db24..4ecfdef2d810 100644
--- a/games/minecraft-server/Makefile
+++ b/games/minecraft-server/Makefile
@@ -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
diff --git a/games/minecraft-server/distinfo b/games/minecraft-server/distinfo
index 11dbeae6548f..aa6fcc252fbf 100644
--- a/games/minecraft-server/distinfo
+++ b/games/minecraft-server/distinfo
@@ -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
diff --git a/games/minecraft-server/files/minecraft-server b/games/minecraft-server/files/minecraft-server
index 4eeb7228a74e..9bcd31859341 100644
--- a/games/minecraft-server/files/minecraft-server
+++ b/games/minecraft-server/files/minecraft-server
@@ -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"
diff --git a/games/minecraft-server/files/minecraft.in b/games/minecraft-server/files/minecraft.in
index 415f32339fd1..db4b6911b73f 100644
--- a/games/minecraft-server/files/minecraft.in
+++ b/games/minecraft-server/files/minecraft.in
@@ -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
 }
 
diff --git a/games/minecraft-server/pkg-plist b/games/minecraft-server/pkg-plist
index 6a65cc08cbd4..120e34db96fc 100644
--- a/games/minecraft-server/pkg-plist
+++ b/games/minecraft-server/pkg-plist
@@ -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