git: c72f31cdb879 - main - games/minecraft-server: update 1.20.6 → 1.21

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c72f31cdb87994254dc6522451028353863d5395

commit c72f31cdb87994254dc6522451028353863d5395
Author:     Alexandre Labarre <freebsd.tug890@passmail.net>
AuthorDate: 2024-06-26 15:07:42 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-06-26 15:07:42 +0000

    games/minecraft-server: update 1.20.6 → 1.21
    
    Changes:
    https://www.minecraft.net/en-us/article/minecraft-java-edition-1-21
    
    PR:             279771
    Approved by:    Jonathan Price <freebsd@jonathanprice.org> (maintainer)
---
 games/minecraft-server/Makefile  | 10 +++++-----
 games/minecraft-server/distinfo  |  6 +++---
 games/minecraft-server/pkg-plist |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/games/minecraft-server/Makefile b/games/minecraft-server/Makefile
index c709fe3e1c27..8a4d0e6e0432 100644
--- a/games/minecraft-server/Makefile
+++ b/games/minecraft-server/Makefile
@@ -1,10 +1,10 @@
 PORTNAME=	minecraft-server
-DISTVERSION=	1.20.6
+DISTVERSION=	1.21
 CATEGORIES=	games java
-MASTER_SITES=	https://piston-data.mojang.com/v1/objects/145ff0858209bcfc164859ba735d4199aafa1eea/
+MASTER_SITES=	https://piston-data.mojang.com/v1/objects/450698d1863ab5180c25d7c804ef0fe6369dd1ba/
 DISTNAME=	server
 EXTRACT_SUFX=	.jar
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
+DIST_SUBDIR=	${PORTNAME}-${DISTVERSION}
 EXTRACT_ONLY=
 
 MAINTAINER=	freebsd@jonathanprice.org
@@ -22,12 +22,12 @@ JAVA_VERSION=	21
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	minecraft-server pkg-deinstall pkg-message
-SUB_LIST=	JAVA_VERSION=${JAVA_VERSION} VERSION=${PORTVERSION}
+SUB_LIST=	JAVA_VERSION=${JAVA_VERSION} VERSION=${DISTVERSION}
 
 USERS=		mcserver
 GROUPS=		${USERS}
 
-PLIST_SUB=	VERSION=${PORTVERSION}
+PLIST_SUB=	VERSION=${DISTVERSION}
 
 CONFIG_FILES=	banned-ips.json banned-players.json eula.txt ops.json \
 		server.properties usercache.json whitelist.json
diff --git a/games/minecraft-server/distinfo b/games/minecraft-server/distinfo
index eda4c31b11d3..e16c583ca9cb 100644
--- a/games/minecraft-server/distinfo
+++ b/games/minecraft-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1716300294
-SHA256 (minecraft-server-1.20.6/server.jar) = c6d01d018ca782e506f0ec60652d47fd565078be9122b625c1681bc86c29c7ec
-SIZE (minecraft-server-1.20.6/server.jar) = 51420480
+TIMESTAMP = 1718473623
+SHA256 (minecraft-server-1.21/server.jar) = c96394da86f9d9f9ef7ca2d2ee1f2f0980c29b7aa5c94b43c02c50435dbcf53f
+SIZE (minecraft-server-1.21/server.jar) = 51623779
diff --git a/games/minecraft-server/pkg-plist b/games/minecraft-server/pkg-plist
index 1782fab03eda..2393dbd63bad 100644
--- a/games/minecraft-server/pkg-plist
+++ b/games/minecraft-server/pkg-plist
@@ -24,7 +24,7 @@ minecraft-server/world
 @rmtry minecraft-server/libraries/com/google/guava/guava/32.1.2-jre/guava-32.1.2-jre.jar
 @rmtry minecraft-server/libraries/com/mojang/authlib/6.0.54/authlib-6.0.54.jar
 @rmtry minecraft-server/libraries/com/mojang/brigadier/1.2.9/brigadier-1.2.9.jar
-@rmtry minecraft-server/libraries/com/mojang/datafixerupper/7.0.14/datafixerupper-7.0.14.jar
+@rmtry minecraft-server/libraries/com/mojang/datafixerupper/8.0.16/datafixerupper-8.0.16.jar
 @rmtry minecraft-server/libraries/com/mojang/logging/1.2.7/logging-1.2.7.jar
 @rmtry minecraft-server/libraries/commons-io/commons-io/2.15.1/commons-io-2.15.1.jar
 @rmtry minecraft-server/libraries/io/netty/netty-buffer/4.1.97.Final/netty-buffer-4.1.97.Final.jar
@@ -48,6 +48,6 @@ minecraft-server/world
 @rmtry minecraft-server/libraries/org/joml/joml/1.10.5/joml-1.10.5.jar
 @rmtry minecraft-server/libraries/org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.jar
 @rmtry minecraft-server/libraries/org/lz4/lz4-java/1.8.0/lz4-java-1.8.0.jar
-@rmtry minecraft-server/versions/1.20.6/server-1.20.6.jar
+@rmtry minecraft-server/versions/%%VERSION%%/server-%%VERSION%%.jar
 @owner
 @group