View | Details | Raw Unified | Return to bug 279204 | Differences between
and this patch

Collapse All | Expand All

(-)b/games/minecraft-server/Makefile (-5 / +6 lines)
Lines 1-7 Link Here
1
PORTNAME=	minecraft-server
1
PORTNAME=	minecraft-server
2
PORTVERSION=	1.20.4
2
DISTVERSION=	1.20.6
3
CATEGORIES=	games java
3
CATEGORIES=	games java
4
MASTER_SITES=	https://piston-data.mojang.com/v1/objects/8dd1a28015f51b1803213892b50b7b4fc76e594d/
4
MASTER_SITES=	https://piston-data.mojang.com/v1/objects/145ff0858209bcfc164859ba735d4199aafa1eea/
5
DISTNAME=	server
5
DISTNAME=	server
6
EXTRACT_SUFX=	.jar
6
EXTRACT_SUFX=	.jar
7
DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
7
DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
Lines 17-28 LICENSE_TEXT= The license can be viewed at: https://account.mojang.com/documents Link Here
17
LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
17
LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
18
18
19
USE_JAVA=	yes
19
USE_JAVA=	yes
20
JAVA_VERSION=	17
20
JAVA_VERSION=	21
21
21
22
NO_ARCH=	yes
22
NO_ARCH=	yes
23
NO_BUILD=	yes
23
NO_BUILD=	yes
24
SUB_FILES=	minecraft-server pkg-deinstall pkg-message
24
SUB_FILES=	minecraft-server pkg-deinstall pkg-message
25
SUB_LIST=	VERSION=${PORTVERSION}
25
SUB_LIST=	JAVA_VERSION=${JAVA_VERSION} VERSION=${PORTVERSION}
26
26
27
USERS=		mcserver
27
USERS=		mcserver
28
GROUPS=		${USERS}
28
GROUPS=		${USERS}
Lines 49-60 do-install: Link Here
49
	${MKDIR} ${STAGEDIR}${ETCDIR}
49
	${MKDIR} ${STAGEDIR}${ETCDIR}
50
	${MKDIR} ${STAGEDIR}/var/db/minecraft-server
50
	${MKDIR} ${STAGEDIR}/var/db/minecraft-server
51
	${MKDIR} ${STAGEDIR}/var/log/minecraft-server
51
	${MKDIR} ${STAGEDIR}/var/log/minecraft-server
52
	${MKDIR} ${STAGEDIR}/var/log/minecraft-server/debug
52
.for file in ${CONFIG_FILES}
53
.for file in ${CONFIG_FILES}
53
	${LN} -s ${ETCDIR}/${file} ${STAGEDIR}${PREFIX}/${PORTNAME}/${file}
54
	${LN} -s ${ETCDIR}/${file} ${STAGEDIR}${PREFIX}/${PORTNAME}/${file}
54
.endfor
55
.endfor
56
	${LN} -sf /var/db/minecraft-server ${STAGEDIR}${PREFIX}/${PORTNAME}/world
55
	${LN} -sf /var/log/minecraft-server ${STAGEDIR}${PREFIX}/${PORTNAME}/logs
57
	${LN} -sf /var/log/minecraft-server ${STAGEDIR}${PREFIX}/${PORTNAME}/logs
56
	${LN} -sf /var/log/minecraft-server/debug ${STAGEDIR}${PREFIX}/${PORTNAME}/debug
58
	${LN} -sf /var/log/minecraft-server/debug ${STAGEDIR}${PREFIX}/${PORTNAME}/debug
57
	${LN} -sf /var/db/minecraft-server ${STAGEDIR}${PREFIX}/${PORTNAME}/world
58
59
59
post-install-STANDALONE-on:
60
post-install-STANDALONE-on:
60
	${INSTALL_SCRIPT} ${WRKDIR}/minecraft-server \
61
	${INSTALL_SCRIPT} ${WRKDIR}/minecraft-server \
(-)b/games/minecraft-server/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1708874498
1
TIMESTAMP = 1716300294
2
SHA256 (minecraft-server-1.20.4/server.jar) = c03fa6f39daa69ddf413c965a3a83084db746a7a138ce535a693293b5472d363
2
SHA256 (minecraft-server-1.20.6/server.jar) = c6d01d018ca782e506f0ec60652d47fd565078be9122b625c1681bc86c29c7ec
3
SIZE (minecraft-server-1.20.4/server.jar) = 49150256
3
SIZE (minecraft-server-1.20.6/server.jar) = 51420480
(-)b/games/minecraft-server/files/minecraft-server.in (-1 / +4 lines)
Lines 5-10 if [ "$(id -u)" != "0" ]; then Link Here
5
	exit 1
5
	exit 1
6
fi
6
fi
7
7
8
export JAVA_VERSION=17
8
if [ -z "${JAVA_VERSION}" ]; then
9
	JAVA_VERSION=%%JAVA_VERSION%%
10
fi
11
export JAVA_VERSION
9
cd %%PREFIX%%/minecraft-server
12
cd %%PREFIX%%/minecraft-server
10
su -m mcserver -c "%%LOCALBASE%%/bin/java $(cat %%PREFIX%%/etc/minecraft-server/java-args.txt) -jar server.jar nogui"
13
su -m mcserver -c "%%LOCALBASE%%/bin/java $(cat %%PREFIX%%/etc/minecraft-server/java-args.txt) -jar server.jar nogui"
(-)b/games/minecraft-server/files/minecraft.in (-1 / +1 lines)
Lines 28-34 console_cmd="${name}_console" Link Here
28
status_cmd="${name}_status"
28
status_cmd="${name}_status"
29
kill_cmd="${name}_kill"
29
kill_cmd="${name}_kill"
30
30
31
export JAVA_VERSION=17
31
export JAVA_VERSION=${minecraft_java_version:-"%%JAVA_VERSION%%"}
32
32
33
is_running()
33
is_running()
34
{
34
{
(-)b/games/minecraft-server/files/pkg-deinstall.in (-1 / +1 lines)
Lines 12-15 echo "NOTE: The game world has not been deleted. It is still in" Link Here
12
echo "/var/db/minecraft-server. If it is no longer required, it will"
12
echo "/var/db/minecraft-server. If it is no longer required, it will"
13
echo "need to be manually deleted."
13
echo "need to be manually deleted."
14
echo "Also, you may wish to delete any remaining files in"
14
echo "Also, you may wish to delete any remaining files in"
15
echo "%%PREFIX%%/minecraft-server and %%ETCDIR%%"
15
echo "%%PREFIX%%/minecraft-server, %%ETCDIR%% and /var/log/minecraft-server"
(-)b/games/minecraft-server/files/pkg-message.in (+7 lines)
Lines 13-24 It is required to read the EULA, and then set eula=true Link Here
13
Without daemon option:
13
Without daemon option:
14
- To run the server, run %%PREFIX%%/bin/minecraft-server
14
- To run the server, run %%PREFIX%%/bin/minecraft-server
15
- To edit java's parameters, edit %%ETCDIR%%/java-args.txt
15
- To edit java's parameters, edit %%ETCDIR%%/java-args.txt
16
- To run with a specific version of Java, set environment variable JAVA_VERSION,
17
  for example:
18
    export JAVA_VERSION=22
19
    %%PREFIX%%/bin/minecraft-server
20
  or:
21
    JAVA_VERSION=22 %%PREFIX%%/bin/minecraft-server
16
22
17
With daemon option:
23
With daemon option:
18
- The service has been installed with the name 'minecraft'
24
- The service has been installed with the name 'minecraft'
19
- To adjust maximum memory usage (-Xmx), use minecraft_memx= in /etc/rc.conf
25
- To adjust maximum memory usage (-Xmx), use minecraft_memx= in /etc/rc.conf
20
- To adjust initial memory usage (-Xms), use minecraft_mems= in /etc/rc.conf
26
- To adjust initial memory usage (-Xms), use minecraft_mems= in /etc/rc.conf
21
- To add other java parameters, use minecraft_args= in /etc/rc.conf
27
- To add other java parameters, use minecraft_args= in /etc/rc.conf
28
- To run with a specific version of Java, use minecraft_java_version= in /etc/rc.conf
22
- To see the interactive console, type service minecraft console
29
- To see the interactive console, type service minecraft console
23
EOM
30
EOM
24
}
31
}
(-)b/games/minecraft-server/pkg-plist (-13 / +15 lines)
Lines 17-31 minecraft-server/world Link Here
17
@dir minecraft-server
17
@dir minecraft-server
18
@dir /var/db/minecraft-server
18
@dir /var/db/minecraft-server
19
@dir /var/log/minecraft-server
19
@dir /var/log/minecraft-server
20
@rmtry minecraft-server/libraries/com/github/oshi/oshi-core/6.4.5/oshi-core-6.4.5.jar
20
@dir /var/log/minecraft-server/debug
21
@rmtry minecraft-server/libraries/com/github/oshi/oshi-core/6.4.10/oshi-core-6.4.10.jar
21
@rmtry minecraft-server/libraries/com/google/code/gson/gson/2.10.1/gson-2.10.1.jar
22
@rmtry minecraft-server/libraries/com/google/code/gson/gson/2.10.1/gson-2.10.1.jar
22
@rmtry minecraft-server/libraries/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar
23
@rmtry minecraft-server/libraries/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar
23
@rmtry minecraft-server/libraries/com/google/guava/guava/32.1.2-jre/guava-32.1.2-jre.jar
24
@rmtry minecraft-server/libraries/com/google/guava/guava/32.1.2-jre/guava-32.1.2-jre.jar
24
@rmtry minecraft-server/libraries/com/mojang/authlib/6.0.52/authlib-6.0.52.jar
25
@rmtry minecraft-server/libraries/com/mojang/authlib/6.0.54/authlib-6.0.54.jar
25
@rmtry minecraft-server/libraries/com/mojang/brigadier/1.2.9/brigadier-1.2.9.jar
26
@rmtry minecraft-server/libraries/com/mojang/brigadier/1.2.9/brigadier-1.2.9.jar
26
@rmtry minecraft-server/libraries/com/mojang/datafixerupper/6.0.8/datafixerupper-6.0.8.jar
27
@rmtry minecraft-server/libraries/com/mojang/datafixerupper/7.0.14/datafixerupper-7.0.14.jar
27
@rmtry minecraft-server/libraries/com/mojang/logging/1.1.1/logging-1.1.1.jar
28
@rmtry minecraft-server/libraries/com/mojang/logging/1.2.7/logging-1.2.7.jar
28
@rmtry minecraft-server/libraries/commons-io/commons-io/2.13.0/commons-io-2.13.0.jar
29
@rmtry minecraft-server/libraries/commons-io/commons-io/2.15.1/commons-io-2.15.1.jar
29
@rmtry minecraft-server/libraries/io/netty/netty-buffer/4.1.97.Final/netty-buffer-4.1.97.Final.jar
30
@rmtry minecraft-server/libraries/io/netty/netty-buffer/4.1.97.Final/netty-buffer-4.1.97.Final.jar
30
@rmtry minecraft-server/libraries/io/netty/netty-codec/4.1.97.Final/netty-codec-4.1.97.Final.jar
31
@rmtry minecraft-server/libraries/io/netty/netty-codec/4.1.97.Final/netty-codec-4.1.97.Final.jar
31
@rmtry minecraft-server/libraries/io/netty/netty-common/4.1.97.Final/netty-common-4.1.97.Final.jar
32
@rmtry minecraft-server/libraries/io/netty/netty-common/4.1.97.Final/netty-common-4.1.97.Final.jar
Lines 37-51 minecraft-server/world Link Here
37
@rmtry minecraft-server/libraries/io/netty/netty-transport-native-epoll/4.1.97.Final/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar
38
@rmtry minecraft-server/libraries/io/netty/netty-transport-native-epoll/4.1.97.Final/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar
38
@rmtry minecraft-server/libraries/io/netty/netty-transport-native-unix-common/4.1.97.Final/netty-transport-native-unix-common-4.1.97.Final.jar
39
@rmtry minecraft-server/libraries/io/netty/netty-transport-native-unix-common/4.1.97.Final/netty-transport-native-unix-common-4.1.97.Final.jar
39
@rmtry minecraft-server/libraries/it/unimi/dsi/fastutil/8.5.12/fastutil-8.5.12.jar
40
@rmtry minecraft-server/libraries/it/unimi/dsi/fastutil/8.5.12/fastutil-8.5.12.jar
40
@rmtry minecraft-server/libraries/net/java/dev/jna/jna/5.13.0/jna-5.13.0.jar
41
@rmtry minecraft-server/libraries/net/java/dev/jna/jna/5.14.0/jna-5.14.0.jar
41
@rmtry minecraft-server/libraries/net/java/dev/jna/jna-platform/5.13.0/jna-platform-5.13.0.jar
42
@rmtry minecraft-server/libraries/net/java/dev/jna/jna-platform/5.14.0/jna-platform-5.14.0.jar
42
@rmtry minecraft-server/libraries/net/sf/jopt-simple/jopt-simple/5.0.4/jopt-simple-5.0.4.jar
43
@rmtry minecraft-server/libraries/net/sf/jopt-simple/jopt-simple/5.0.4/jopt-simple-5.0.4.jar
43
@rmtry minecraft-server/libraries/org/apache/commons/commons-lang3/3.13.0/commons-lang3-3.13.0.jar
44
@rmtry minecraft-server/libraries/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.jar
44
@rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-api/2.19.0/log4j-api-2.19.0.jar
45
@rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-api/2.22.1/log4j-api-2.22.1.jar
45
@rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-core/2.19.0/log4j-core-2.19.0.jar
46
@rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-core/2.22.1/log4j-core-2.22.1.jar
46
@rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-slf4j2-impl/2.19.0/log4j-slf4j2-impl-2.19.0.jar
47
@rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-slf4j2-impl/2.22.1/log4j-slf4j2-impl-2.22.1.jar
47
@rmtry minecraft-server/libraries/org/joml/joml/1.10.5/joml-1.10.5.jar
48
@rmtry minecraft-server/libraries/org/joml/joml/1.10.5/joml-1.10.5.jar
48
@rmtry minecraft-server/libraries/org/slf4j/slf4j-api/2.0.7/slf4j-api-2.0.7.jar
49
@rmtry minecraft-server/libraries/org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.jar
49
@rmtry minecraft-server/versions/1.20.4/server-1.20.4.jar
50
@rmtry minecraft-server/libraries/org/lz4/lz4-java/1.8.0/lz4-java-1.8.0.jar
51
@rmtry minecraft-server/versions/1.20.6/server-1.20.6.jar
50
@owner
52
@owner
51
@group
53
@group

Return to bug 279204