Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 31 May 2015 13:57:06 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r388089 - in head/games/minecraft-server: . files
Message-ID:  <201505311357.t4VDv6vg060633@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Sun May 31 13:57:05 2015
New Revision: 388089
URL: https://svnweb.freebsd.org/changeset/ports/388089

Log:
  - Update to version 1.8.6 [1]
  - Parametrize PORTVERSION occurances in pkg-plist and scripts
  - Make sure paths are correct in minecraft-server script by
    using PREFIX sub
  
  PR:		200539 [1]
  Submitted by:	Jonathan Price <freebsd@jonathanprice.org> (maintainer) [1]

Added:
  head/games/minecraft-server/files/minecraft-server.in
     - copied, changed from r387931, head/games/minecraft-server/files/minecraft-server
Deleted:
  head/games/minecraft-server/files/minecraft-server
Modified:
  head/games/minecraft-server/Makefile
  head/games/minecraft-server/distinfo
  head/games/minecraft-server/files/minecraft.in   (contents, props changed)
  head/games/minecraft-server/pkg-plist

Modified: head/games/minecraft-server/Makefile
==============================================================================
--- head/games/minecraft-server/Makefile	Sun May 31 13:37:20 2015	(r388088)
+++ head/games/minecraft-server/Makefile	Sun May 31 13:57:05 2015	(r388089)
@@ -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}

Modified: head/games/minecraft-server/distinfo
==============================================================================
--- head/games/minecraft-server/distinfo	Sun May 31 13:37:20 2015	(r388088)
+++ head/games/minecraft-server/distinfo	Sun May 31 13:57:05 2015	(r388089)
@@ -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

Copied and modified: head/games/minecraft-server/files/minecraft-server.in (from r387931, head/games/minecraft-server/files/minecraft-server)
==============================================================================
--- head/games/minecraft-server/files/minecraft-server	Sat May 30 12:12:02 2015	(r387931, copy source)
+++ head/games/minecraft-server/files/minecraft-server.in	Sun May 31 13:57:05 2015	(r388089)
@@ -5,5 +5,5 @@ if [ "$(id -u)" != "0" ]; then
 	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"
+cd %%PREFIX%%/minecraft-server
+su -m mcserver -c "java $(cat %%PREFIX%%/etc/minecraft-server/java-args.txt) -jar minecraft_server.%%VERSION%%.jar nogui"

Modified: head/games/minecraft-server/files/minecraft.in
==============================================================================
--- head/games/minecraft-server/files/minecraft.in	Sun May 31 13:37:20 2015	(r388088)
+++ head/games/minecraft-server/files/minecraft.in	Sun May 31 13:57:05 2015	(r388089)
@@ -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
 }
 

Modified: head/games/minecraft-server/pkg-plist
==============================================================================
--- head/games/minecraft-server/pkg-plist	Sun May 31 13:37:20 2015	(r388088)
+++ head/games/minecraft-server/pkg-plist	Sun May 31 13:57:05 2015	(r388089)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505311357.t4VDv6vg060633>