Attachment 230157 Details for Bug 260452 – git diff patch v2

[patch] git diff patch v2

minecraft-server-20211215-v2.diff (text/plain), 2.10 KB, created by Jonathan Price on 2021-12-15 22:05:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Price

Created: 2021-12-15 22:05:57 UTC

Size: 2.10 KB

patch

obsolete

>diff --git a/games/minecraft-server/Makefile b/games/minecraft-server/Makefile
>index 7059ef1e7fe8..580585f60577 100644
>--- a/games/minecraft-server/Makefile
>+++ b/games/minecraft-server/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	minecraft-server
>-PORTVERSION=	1.17.1
>+PORTVERSION=	1.18.1
> CATEGORIES=	games java
>-MASTER_SITES=	https://launcher.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/
>+MASTER_SITES=	https://launcher.mojang.com/v1/objects/125e5adf40c659fd3bce3e66e67a16bb49ecc1b9/
> DISTNAME=	server
> EXTRACT_SUFX=	.jar
> DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
>@@ -29,6 +29,7 @@ GROUPS=		${USERS}
> 
> NO_BUILD=	yes
> USE_JAVA=	yes
>+JAVA_VERSION=	17
> SUB_FILES=	minecraft-server pkg-deinstall pkg-message
> SUB_LIST=	VERSION=${PORTVERSION}
> PLIST_SUB=	VERSION=${PORTVERSION}
>diff --git a/games/minecraft-server/distinfo b/games/minecraft-server/distinfo
>index 7531f96bd4ab..4bdaff9f1088 100644
>--- a/games/minecraft-server/distinfo
>+++ b/games/minecraft-server/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1626387031
>-SHA256 (minecraft-server-1.17.1/server.jar) = e8c211b41317a9f5a780c98a89592ecb72eb39a6e475d4ac9657e5bc9ffaf55f
>-SIZE (minecraft-server-1.17.1/server.jar) = 43626592
>+TIMESTAMP = 1639124790
>+SHA256 (minecraft-server-1.18.1/server.jar) = ebcd120ad81480b968a548df6ffb83b88075e95195c8ff63d461c9df4df5dbdf
>+SIZE (minecraft-server-1.18.1/server.jar) = 46324407
>diff --git a/games/minecraft-server/files/minecraft.in b/games/minecraft-server/files/minecraft.in
>index 4745899af7e1..734ed2b86602 100644
>--- a/games/minecraft-server/files/minecraft.in
>+++ b/games/minecraft-server/files/minecraft.in
>@@ -48,7 +48,7 @@ minecraft_start()
> 		fi
> 		echo "Starting ${name}."
> 		cd %%PREFIX%%/minecraft-server
>-		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/server.jar nogui'"
>+		su mcserver -c "%%LOCALBASE%%/bin/tmux new-session -s minecraft -d '%%LOCALBASE%%/openjdk17/bin/java  -Xmx${minecraft_memx} -Xms${minecraft_mems} ${minecraft_args} -jar %%PREFIX%%/minecraft-server/server.jar nogui'"
> 	fi
> }
>

Flags:

freebsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 260452: 230155 | 230157 | 230159 | 230186 | 230187