Attachment 161861 Details for Bug 203664 – Patch File

[patch] Patch File

patch.diff (text/plain), 2.89 KB, created by Jonathan Price on 2015-10-09 20:00:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Price

Created: 2015-10-09 20:00:56 UTC

Size: 2.89 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 398262)
>+++ Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	minecraft-server
> PORTVERSION=	1.8.8
>+PORTREVISION=	1
> CATEGORIES=	games java
> MASTER_SITES=	https://s3.amazonaws.com/Minecraft.Download/versions/${PORTVERSION}/
> DISTNAME=	minecraft_server.${PORTVERSION}.jar
>Index: files/minecraft.in
>===================================================================
>--- files/minecraft.in	(revision 398262)
>+++ files/minecraft.in	(working copy)
>@@ -7,7 +7,8 @@
> #
> # rc.conf variables:
> # minecraft_enable (Default: NO)
>-# minecraft_mem (Default: 1024M)
>+# minecraft_mems (Default: 1024M)
>+# minecraft_memx (Default: 1024M)
> # minecraft_args (Default: "")
> . /etc/rc.subr
> 
>@@ -17,7 +18,8 @@
> 
> load_rc_config $name
> 
>-minecraft_mem=${minecraft_mem:-"1024M"}
>+minecraft_mems=${minecraft_mems:-"1024M"}
>+minecraft_memx=${minecraft_memx:-"1024M"}
> minecraft_args=${minecraft_args:-""}
> 
> extra_commands="console status kill"
>@@ -37,10 +39,13 @@
> {
> 	if is_running; then
> 		echo "${name} is already running."
>+	elif [ ${minecraft_mems%?} -gt ${minecraft_memx%?} ]; then
>+		echo "ERROR: minecraft_mems is set greater than minecraft_memx."
>+		echo "ERROR: Set minecraft_memx to be equal or greater than minecraft_mems in rc.conf."
> 	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.%%VERSION%%.jar nogui'"
>+		su mcserver -c "%%LOCALBASE%%/bin/tmux new-session -s minecraft -d '%%LOCALBASE%%/bin/java -Xmx${minecraft_memx} -Xms${minecraft_mems} ${minecraft_args} -jar %%PREFIX%%/minecraft-server/minecraft_server.%%VERSION%%.jar nogui'"
> 	fi
> }
> 
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 398262)
>+++ files/pkg-message.in	(working copy)
>@@ -3,9 +3,9 @@
> 
> It is required to read the EULA, and then set eula=true
> 
>-- Configuration files can be found at %%ETCDIR%%
>+- Configuration files can be found at %%ETCDIR%%/
> - Log and debug output files can be found at /var/log/minecraft-server/
>-- World files can be found at /var/db/minecraft-server
>+- World files can be found at /var/db/minecraft-server/
> 
> Without daemon option:
> - To run the server, run %%PREFIX%%/bin/minecraft-server
>@@ -13,7 +13,8 @@
> 
> With daemon option:
> - The service has been installed with the name 'minecraft'
>-- To adjust memory usage, use MINECRAFT_MEM= in /etc/rc.conf
>+- To adjust maximum memory usage (-Xmx), use MINECRAFT_MEMX= in /etc/rc.conf
>+- To adjust initial memory usage (-Xms), use MINECRAFT_MEMS= in /etc/rc.conf
> - To add other java parameters, use MINECRAFT_ARGS= in /etc/rc.conf
> - To see the interactive console, type service minecraft console
>

Flags:

freebsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 203664: 161861 | 161862 | 161863 | 162045