games/minecraft-server: fix issues that resulted from recent upgrade

  * Fix version reference in server script
  * Remove blank sample files
  * Add note in pkg-message how to upgrade from version 1.4.6
  * Note in pkg-deinstall files files might exist in $ETCDIR as well
    (even though pkg also mentions this)

PR:		194312
Reported by:	Helge Oldach
Final fix by:	maintainer (Jonathan Price)

5 files changed, 8 insertions, 9 deletions

diff --git a/games/minecraft-server/Makefile b/games/minecraft-server/Makefile
index cbf5412dcf90..30ee333f5400 100644
--- a/games/minecraft-server/Makefile
+++ b/games/minecraft-server/Makefile
@@ -2,6 +2,7 @@
 
 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
@@ -36,7 +37,6 @@ do-install:
 	${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
diff --git a/games/minecraft-server/files/minecraft-server b/games/minecraft-server/files/minecraft-server
index 23fea4abc092..d5582e7cceab 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/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"
diff --git a/games/minecraft-server/files/pkg-deinstall.in b/games/minecraft-server/files/pkg-deinstall.in
index 27bcf133fba6..4e7609b3d839 100644
--- a/games/minecraft-server/files/pkg-deinstall.in
+++ b/games/minecraft-server/files/pkg-deinstall.in
@@ -8,4 +8,4 @@ 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%%"
diff --git a/games/minecraft-server/files/pkg-message.in b/games/minecraft-server/files/pkg-message.in
index 946b37c8a2ba..c719e16ac7a1 100644
--- a/games/minecraft-server/files/pkg-message.in
+++ b/games/minecraft-server/files/pkg-message.in
@@ -10,3 +10,8 @@ eula=true
 - 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,
diff --git a/games/minecraft-server/pkg-plist b/games/minecraft-server/pkg-plist
index fc735b34fc3d..bbd5d1c63616 100644
--- a/games/minecraft-server/pkg-plist
+++ b/games/minecraft-server/pkg-plist
@@ -1,12 +1,6 @@
 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