svn commit: r370977 - in head/games/minecraft-server: . files

[John Marino]

Author: marino
Date: Thu Oct 16 08:06:31 2014
New Revision: 370977
URL: https://svnweb.freebsd.org/changeset/ports/370977
QAT: https://qat.redports.org/buildarchive/r370977/

Log:
  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)

Modified:
  head/games/minecraft-server/Makefile
  head/games/minecraft-server/files/minecraft-server
  head/games/minecraft-server/files/pkg-deinstall.in
  head/games/minecraft-server/files/pkg-message.in
  head/games/minecraft-server/pkg-plist

Modified: head/games/minecraft-server/Makefile
==============================================================================
--- head/games/minecraft-server/Makefile	Thu Oct 16 07:43:27 2014	(r370976)
+++ head/games/minecraft-server/Makefile	Thu Oct 16 08:06:31 2014	(r370977)
@@ -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

Modified: head/games/minecraft-server/files/minecraft-server
==============================================================================
--- head/games/minecraft-server/files/minecraft-server	Thu Oct 16 07:43:27 2014	(r370976)
+++ head/games/minecraft-server/files/minecraft-server	Thu Oct 16 08:06:31 2014	(r370977)
@@ -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"

Modified: head/games/minecraft-server/files/pkg-deinstall.in
==============================================================================
--- head/games/minecraft-server/files/pkg-deinstall.in	Thu Oct 16 07:43:27 2014	(r370976)
+++ head/games/minecraft-server/files/pkg-deinstall.in	Thu Oct 16 08:06:31 2014	(r370977)
@@ -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%%"

Modified: head/games/minecraft-server/files/pkg-message.in
==============================================================================
--- head/games/minecraft-server/files/pkg-message.in	Thu Oct 16 07:43:27 2014	(r370976)
+++ head/games/minecraft-server/files/pkg-message.in	Thu Oct 16 08:06:31 2014	(r370977)
@@ -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,

Modified: head/games/minecraft-server/pkg-plist
==============================================================================
--- head/games/minecraft-server/pkg-plist	Thu Oct 16 07:43:27 2014	(r370976)
+++ head/games/minecraft-server/pkg-plist	Thu Oct 16 08:06:31 2014	(r370977)
@@ -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