6 files changed, 19 insertions, 16 deletions

diff --git a/games/minecraft-server/Makefile b/games/minecraft-server/Makefile
index 4ecfdef2d810..50f223811924 100644
--- a/games/minecraft-server/Makefile
+++ b/games/minecraft-server/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	minecraft-server
-PORTVERSION=	1.8.4
+PORTVERSION=	1.8.6
 CATEGORIES=	games java
 MASTER_SITES=	https://s3.amazonaws.com/Minecraft.Download/versions/${PORTVERSION}/
 DISTNAME=	minecraft_server.${PORTVERSION}.jar
@@ -25,8 +25,11 @@ GROUPS=		${USERS}
 
 NO_BUILD=	yes
 USE_JAVA=	yes
-SUB_FILES=	pkg-message \
+SUB_FILES=	minecraft-server \
+		pkg-message \
 		pkg-deinstall
+SUB_LIST=	VERSION=${PORTVERSION}
+PLIST_SUB=	VERSION=${PORTVERSION}
 
 CONFIG_FILES=	banned-ips.json \
 		banned-players.json \
@@ -50,7 +53,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}/var/db/minecraft-server
 	${MKDIR} ${STAGEDIR}/var/log/minecraft-server
 .if ${PORT_OPTIONS:MSTANDALONE}
-	${INSTALL_SCRIPT} ${FILESDIR}/minecraft-server ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/minecraft-server ${STAGEDIR}${PREFIX}/bin
 	${CP} ${FILESDIR}/java-args.txt ${STAGEDIR}${ETCDIR}
 .endif
 .for file in ${CONFIG_FILES}
diff --git a/games/minecraft-server/distinfo b/games/minecraft-server/distinfo
index aa6fcc252fbf..5015e713184a 100644
--- a/games/minecraft-server/distinfo
+++ b/games/minecraft-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (minecraft_server.1.8.4.jar) = 394a9d0d5bcd03272a58f036b8736a47d26d63b45a4e7c820629114876e72107
-SIZE (minecraft_server.1.8.4.jar) = 9779346
+SHA256 (minecraft_server.1.8.6.jar) = 7fc66b2b54f0f4d65fdd6d6484a50f432c144ef02072d3435d5660f120f58e0d
+SIZE (minecraft_server.1.8.6.jar) = 9780573
diff --git a/games/minecraft-server/files/minecraft-server b/games/minecraft-server/files/minecraft-server
deleted file mode 100644
index 9bcd31859341..000000000000
--- a/games/minecraft-server/files/minecraft-server
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$(id -u)" != "0" ]; then
-	echo "$0 must be run as root" 1>&2
-	exit 1
-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.4.jar nogui"
diff --git a/games/minecraft-server/files/minecraft-server.in b/games/minecraft-server/files/minecraft-server.in
new file mode 100644
index 000000000000..570c7c57cc24
--- /dev/null
+++ b/games/minecraft-server/files/minecraft-server.in
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$(id -u)" != "0" ]; then
+	echo "$0 must be run as root" 1>&2
+	exit 1
+fi
+
+cd %%PREFIX%%/minecraft-server
+su -m mcserver -c "java $(cat %%PREFIX%%/etc/minecraft-server/java-args.txt) -jar minecraft_server.%%VERSION%%.jar nogui"
diff --git a/games/minecraft-server/files/minecraft.in b/games/minecraft-server/files/minecraft.in
index db4b6911b73f..2bd7806997ea 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.4.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.%%VERSION%%.jar nogui'"
 	fi
 }
 
diff --git a/games/minecraft-server/pkg-plist b/games/minecraft-server/pkg-plist
index 120e34db96fc..02007fc18c01 100644
--- a/games/minecraft-server/pkg-plist
+++ b/games/minecraft-server/pkg-plist
@@ -9,7 +9,7 @@ minecraft-server/banned-players.json
 minecraft-server/debug
 minecraft-server/eula.txt
 minecraft-server/logs
-minecraft-server/minecraft_server.1.8.4.jar
+minecraft-server/minecraft_server.%%VERSION%%.jar
 minecraft-server/ops.json
 minecraft-server/server.properties
 minecraft-server/usercache.json