Index: head/games/minecraft-server/Makefile
===================================================================
--- head/games/minecraft-server/Makefile	(revision 370976)
+++ head/games/minecraft-server/Makefile	(revision 370977)
@@ -1,46 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	minecraft-server
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	games java
 MASTER_SITES=	https://s3.amazonaws.com/Minecraft.Download/versions/${PORTVERSION}/
 DISTNAME=	minecraft_server.${PORTVERSION}.jar
 EXTRACT_SUFX=
 EXTRACT_ONLY=
 
 MAINTAINER=	freebsd@jonathanprice.org
 COMMENT=	Dedicated server for the game Minecraft
 
 ETCDIR=		${PREFIX}/etc/minecraft-server
 
 USERS=		mcserver
 GROUPS=		${USERS}
 
 NO_BUILD=	yes
 USE_JAVA=	yes
 SUB_FILES=	pkg-message \
 		pkg-deinstall
 
 CONFIG_FILES=	banned-ips.json \
 		banned-players.json \
 		ops.json \
 		server.properties \
 		usercache.json \
 		whitelist.json
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}/var/db/minecraft-server
 	${MKDIR} ${STAGEDIR}/var/log/minecraft-server
 	${INSTALL_SCRIPT} ${FILESDIR}/minecraft-server ${STAGEDIR}${PREFIX}/bin
 .for file in ${CONFIG_FILES}
-	${TOUCH} ${STAGEDIR}${ETCDIR}/${file}
 	${LN} -s ${ETCDIR}/${file} ${STAGEDIR}${DATADIR}/${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
 
 .include <bsd.port.mk>
Index: head/games/minecraft-server/files/minecraft-server
===================================================================
--- head/games/minecraft-server/files/minecraft-server	(revision 370976)
+++ head/games/minecraft-server/files/minecraft-server	(revision 370977)
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 if [ "$(id -u)" != "0" ]; then
 	echo "$0 must be run as root" 1>&2
 	exit 1
 fi
 
 cd /usr/local/share/minecraft-server
-su -m mcserver -c "java -Xmx1024M -Xms1024M -jar minecraft_server.1.7.10.jar nogui"
+su -m mcserver -c "java -Xmx1024M -Xms1024M -jar minecraft_server.1.8.jar nogui"
Index: head/games/minecraft-server/files/pkg-deinstall.in
===================================================================
--- head/games/minecraft-server/files/pkg-deinstall.in	(revision 370976)
+++ head/games/minecraft-server/files/pkg-deinstall.in	(revision 370977)
@@ -1,11 +1,11 @@
 #!/bin/sh
 
 if [ "$2" != "POST-DEINSTALL" ]; then
     exit 0
 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%%"
+echo "Also, you may want to delete any remaining files in %%DATADIR%% and %%ETCDIR%%"
Index: head/games/minecraft-server/files/pkg-message.in
===================================================================
--- head/games/minecraft-server/files/pkg-message.in	(revision 370976)
+++ head/games/minecraft-server/files/pkg-message.in	(revision 370977)
@@ -1,12 +1,17 @@
 When you first run minecraft-server, it will create the file
 %%DATADIR%%/eula.txt
 
 You need 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/
 - 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
+
+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,
Index: head/games/minecraft-server/pkg-plist
===================================================================
--- head/games/minecraft-server/pkg-plist	(revision 370976)
+++ head/games/minecraft-server/pkg-plist	(revision 370977)
@@ -1,23 +1,17 @@
 bin/minecraft-server
 @owner mcserver
 @group mcserver
-%%ETCDIR%%/banned-ips.json
-%%ETCDIR%%/banned-players.json
-%%ETCDIR%%/ops.json
-%%ETCDIR%%/server.properties
-%%ETCDIR%%/usercache.json
-%%ETCDIR%%/whitelist.json
 %%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
 @dir /var/db/minecraft-server
 @dir /var/log/minecraft-server
 @owner
 @group