Attachment 155779 Details for Bug 199564 – patch file

[patch] patch file

patch.diff (text/plain), 3.54 KB, created by Jonathan Price on 2015-04-20 20:02:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Price

Created: 2015-04-20 20:02:58 UTC

Size: 3.54 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 380864)
>+++ Makefile	(working copy)
>@@ -1,8 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=	minecraft-server
>-PORTVERSION=	1.8.1
>-PORTREVISION=	1
>+PORTVERSION=	1.8.4
>+PORTREVISION=	0
> CATEGORIES=	games java
> MASTER_SITES=	https://s3.amazonaws.com/Minecraft.Download/versions/${PORTVERSION}/
> DISTNAME=	minecraft_server.${PORTVERSION}.jar
>@@ -12,10 +12,15 @@
> MAINTAINER=	freebsd@jonathanprice.org
> COMMENT=	Dedicated server for the game Minecraft
> 
>-OPTIONS_DEFINE=	DAEMON
>-DAEMON_DESC=	Allows controlling via rc.d
>-OPTIONS_SUB=	yes
>+OPTIONS_SINGLE=		RUN
>+OPTIONS_SINGLE_RUN=	DAEMON STANDALONE
> 
>+DAEMON_DESC=		Run as a service
>+STANDALONE_DESC=	Run the .jar file directly
>+OPTIONS_SUB=		yes
>+
>+OPTIONS_DEFAULT=	STANDALONE
>+
> USERS=		mcserver
> GROUPS=		${USERS}
> 
>@@ -45,8 +50,10 @@
> 	${MKDIR} ${STAGEDIR}${ETCDIR}
> 	${MKDIR} ${STAGEDIR}/var/db/minecraft-server
> 	${MKDIR} ${STAGEDIR}/var/log/minecraft-server
>+.if ${PORT_OPTIONS:MSTANDALONE}
> 	${INSTALL_SCRIPT} ${FILESDIR}/minecraft-server ${STAGEDIR}${PREFIX}/bin
> 	${CP} ${FILESDIR}/java-args.txt ${STAGEDIR}${ETCDIR}
>+.endif
> .for file in ${CONFIG_FILES}
> 	${LN} -s ${ETCDIR}/${file} ${STAGEDIR}${PREFIX}/${PORTNAME}/${file}
> .endfor
>Index: distinfo
>===================================================================
>--- distinfo	(revision 380864)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (minecraft_server.1.8.1.jar) = ef5f5a1a1a78087859b18153acf97efc6ecb12540ac08d82b9c95024249b9845
>-SIZE (minecraft_server.1.8.1.jar) = 7903505
>+SHA256 (minecraft_server.1.8.4.jar) = 394a9d0d5bcd03272a58f036b8736a47d26d63b45a4e7c820629114876e72107
>+SIZE (minecraft_server.1.8.4.jar) = 9779346
>Index: files/minecraft-server
>===================================================================
>--- files/minecraft-server	(revision 380864)
>+++ files/minecraft-server	(working copy)
>@@ -6,4 +6,4 @@
> 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.1.jar nogui"
>+su -m mcserver -c "java $(cat /usr/local/etc/minecraft-server/java-args.txt) -jar minecraft_server.1.8.4.jar nogui"
>Index: files/minecraft.in
>===================================================================
>--- files/minecraft.in	(revision 380864)
>+++ files/minecraft.in	(working copy)
>@@ -35,7 +35,7 @@
> 	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.1.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.1.8.4.jar nogui'"
> 	fi
> }
> 
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 380864)
>+++ pkg-plist	(working copy)
>@@ -1,15 +1,15 @@
>-bin/minecraft-server
>+%%STANDALONE%%bin/minecraft-server
> @owner mcserver
> @group mcserver
> @dir minecraft-server
> @dir %%ETCDIR%%
>-%%ETCDIR%%/java-args.txt
>+%%STANDALONE%%%%ETCDIR%%/java-args.txt
> minecraft-server/banned-ips.json
> minecraft-server/banned-players.json
> minecraft-server/debug
> minecraft-server/eula.txt
> minecraft-server/logs
>-minecraft-server/minecraft_server.1.8.1.jar
>+minecraft-server/minecraft_server.1.8.4.jar
> minecraft-server/ops.json
> minecraft-server/server.properties
> minecraft-server/usercache.json

Actions: View | Diff

Attachments on bug 199564: 155779 | 155780 | 155781