Update to upstream version 1.8.1

PR:		196169
Submitted by:	freebsd@jonathanprice.org (maintainer)

7 files changed, 42 insertions, 36 deletions

diff --git a/games/minecraft-server/Makefile b/games/minecraft-server/Makefile
index 23516175d467..189e9f72fefc 100644
--- a/games/minecraft-server/Makefile
+++ b/games/minecraft-server/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	minecraft-server
-PORTVERSION=	1.8
-PORTREVISION=	2
+PORTVERSION=	1.8.1
 CATEGORIES=	games java
 MASTER_SITES=	https://s3.amazonaws.com/Minecraft.Download/versions/${PORTVERSION}/
 DISTNAME=	minecraft_server.${PORTVERSION}.jar
@@ -12,8 +11,6 @@ EXTRACT_ONLY=
 MAINTAINER=	freebsd@jonathanprice.org
 COMMENT=	Dedicated server for the game Minecraft
 
-ETCDIR=		${PREFIX}/etc/minecraft-server
-
 USERS=		mcserver
 GROUPS=		${USERS}
 
@@ -24,23 +21,25 @@ SUB_FILES=	pkg-message \
 
 CONFIG_FILES=	banned-ips.json \
 		banned-players.json \
+		eula.txt \
 		ops.json \
 		server.properties \
 		usercache.json \
 		whitelist.json
 
 do-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
+	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${STAGEDIR}${PREFIX}/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}/var/db/minecraft-server
 	${MKDIR} ${STAGEDIR}/var/log/minecraft-server
 	${INSTALL_SCRIPT} ${FILESDIR}/minecraft-server ${STAGEDIR}${PREFIX}/bin
+	${CP} ${FILESDIR}/java-args.txt ${STAGEDIR}${ETCDIR}
 .for file in ${CONFIG_FILES}
-	${LN} -s ${ETCDIR}/${file} ${STAGEDIR}${DATADIR}/${file}
+	${LN} -s ${ETCDIR}/${file} ${STAGEDIR}${PREFIX}/${PORTNAME}/${file}
 .endfor
-	${LN} -sf /var/log/minecraft-server ${STAGEDIR}${DATADIR}/logs
-	${LN} -sf /var/log/minecraft-server/debug ${STAGEDIR}${DATADIR}/debug
-	${LN} -sf /var/db/minecraft-server ${STAGEDIR}/${DATADIR}/world
+	${LN} -sf /var/log/minecraft-server ${STAGEDIR}${PREFIX}/${PORTNAME}/logs
+	${LN} -sf /var/log/minecraft-server/debug ${STAGEDIR}${PREFIX}/${PORTNAME}/debug
+	${LN} -sf /var/db/minecraft-server ${STAGEDIR}${PREFIX}/${PORTNAME}/world
 
 .include <bsd.port.mk>
diff --git a/games/minecraft-server/distinfo b/games/minecraft-server/distinfo
index 26b97479051c..11dbeae6548f 100644
--- a/games/minecraft-server/distinfo
+++ b/games/minecraft-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (minecraft_server.1.8.jar) = 40e23f3823d6f0e3cbadc491cedb55b8ba53f8ab516b68182ddd1536babeb291
-SIZE (minecraft_server.1.8.jar) = 10375504
+SHA256 (minecraft_server.1.8.1.jar) = ef5f5a1a1a78087859b18153acf97efc6ecb12540ac08d82b9c95024249b9845
+SIZE (minecraft_server.1.8.1.jar) = 7903505
diff --git a/games/minecraft-server/files/java-args.txt b/games/minecraft-server/files/java-args.txt
new file mode 100644
index 000000000000..394db9c9bac0
--- /dev/null
+++ b/games/minecraft-server/files/java-args.txt
@@ -0,0 +1 @@
+-Xmx1024M -Xms1024M
diff --git a/games/minecraft-server/files/minecraft-server b/games/minecraft-server/files/minecraft-server
index d5582e7cceab..4eeb7228a74e 100644
--- a/games/minecraft-server/files/minecraft-server
+++ b/games/minecraft-server/files/minecraft-server
@@ -5,5 +5,5 @@ if [ "$(id -u)" != "0" ]; then
 	exit 1
 fi
 
-cd /usr/local/share/minecraft-server
-su -m mcserver -c "java -Xmx1024M -Xms1024M -jar minecraft_server.1.8.jar nogui"
+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"
diff --git a/games/minecraft-server/files/pkg-deinstall.in b/games/minecraft-server/files/pkg-deinstall.in
index 4e7609b3d839..8640ee9d85ea 100644
--- a/games/minecraft-server/files/pkg-deinstall.in
+++ b/games/minecraft-server/files/pkg-deinstall.in
@@ -5,7 +5,8 @@ if [ "$2" != "POST-DEINSTALL" ]; then
 fi
 
 echo
-echo "NOTE: Your world has not been deleted. It is still in"
-echo "/var/db/minecraft-server. If you no longer want the world, you will"
-echo "need to manually delete it."
-echo "Also, you may want to delete any remaining files in %%DATADIR%% and %%ETCDIR%%"
+echo "NOTE: The game world has not been deleted. It is still in"
+echo "/var/db/minecraft-server. If it is no longer required, it will"
+echo "need to be manually deleted."
+echo "Also, you may wish to delete any remaining files in" 
+echo "%%PREFIX%%/minecraft-server and %%ETCDIR%%"
diff --git a/games/minecraft-server/files/pkg-message.in b/games/minecraft-server/files/pkg-message.in
index c719e16ac7a1..379a70b1731f 100644
--- a/games/minecraft-server/files/pkg-message.in
+++ b/games/minecraft-server/files/pkg-message.in
@@ -1,17 +1,20 @@
-When you first run minecraft-server, it will create the file
-%%DATADIR%%/eula.txt
+When you first run minecraft-server, it will populate the file
+%%ETCDIR%%/eula.txt
 
-You need to read the EULA, and then set:
+It is required to read the EULA, and then set:
 eula=true
 
 - To run the server, run %%PREFIX%%/bin/minecraft-server
 - Configuration files can be found at %%ETCDIR%%
-- Log files can be found at /var/log/minecraft-server/
+- Log and debug output files can be found at /var/log/minecraft-server/
 - World files can be found at /var/db/minecraft-server
-- Debug output files can be found at /var/log/minecraft-server/debug/
-- To edit java's parameters, edit %%PREFIX%%/bin/minecraft-server
+- To edit java's parameters, edit %%ETCDIR%%/java-args.txt
 
 NOTE:
 Users upgrading from version < 1.8 are advised to run the server to
 generate new config files, and then modify them based on their existing
-configuration, as most files are now JSON instead of txt. Also,
+configuration, as most files are now JSON instead of txt.
+
+Users upgrading from from 1.8 will need to re-accept the EULA. They
+may also wish to delete %%DATADIR%% as it is 
+no longer used.
diff --git a/games/minecraft-server/pkg-plist b/games/minecraft-server/pkg-plist
index a4ded433f55a..6a65cc08cbd4 100644
--- a/games/minecraft-server/pkg-plist
+++ b/games/minecraft-server/pkg-plist
@@ -1,18 +1,20 @@
 bin/minecraft-server
 @owner mcserver
 @group mcserver
-@dir %%DATADIR%%
+@dir minecraft-server
 @dir %%ETCDIR%%
-%%DATADIR%%/banned-ips.json
-%%DATADIR%%/banned-players.json
-%%DATADIR%%/debug
-%%DATADIR%%/logs
-%%DATADIR%%/minecraft_server.1.8.jar
-%%DATADIR%%/ops.json
-%%DATADIR%%/server.properties
-%%DATADIR%%/usercache.json
-%%DATADIR%%/whitelist.json
-%%DATADIR%%/world
+%%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/ops.json
+minecraft-server/server.properties
+minecraft-server/usercache.json
+minecraft-server/whitelist.json
+minecraft-server/world
 @dir /var/db/minecraft-server
 @dir /var/log/minecraft-server
 @owner