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

Collapse All | Expand All

(-)Makefile (-10 / +9 lines)
Lines 1-8 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	minecraft-server
3
PORTNAME=	minecraft-server
4
PORTVERSION=	1.8
4
PORTVERSION=	1.8.1
5
PORTREVISION=	2
6
CATEGORIES=	games java
5
CATEGORIES=	games java
7
MASTER_SITES=	https://s3.amazonaws.com/Minecraft.Download/versions/${PORTVERSION}/
6
MASTER_SITES=	https://s3.amazonaws.com/Minecraft.Download/versions/${PORTVERSION}/
8
DISTNAME=	minecraft_server.${PORTVERSION}.jar
7
DISTNAME=	minecraft_server.${PORTVERSION}.jar
Lines 12-19 Link Here
12
MAINTAINER=	freebsd@jonathanprice.org
11
MAINTAINER=	freebsd@jonathanprice.org
13
COMMENT=	Dedicated server for the game Minecraft
12
COMMENT=	Dedicated server for the game Minecraft
14
13
15
ETCDIR=		${PREFIX}/etc/minecraft-server
16
17
USERS=		mcserver
14
USERS=		mcserver
18
GROUPS=		${USERS}
15
GROUPS=		${USERS}
19
16
Lines 24-29 Link Here
24
21
25
CONFIG_FILES=	banned-ips.json \
22
CONFIG_FILES=	banned-ips.json \
26
		banned-players.json \
23
		banned-players.json \
24
		eula.txt \
27
		ops.json \
25
		ops.json \
28
		server.properties \
26
		server.properties \
29
		usercache.json \
27
		usercache.json \
Lines 30-46 Link Here
30
		whitelist.json
28
		whitelist.json
31
29
32
do-install:
30
do-install:
33
	${MKDIR} ${STAGEDIR}${DATADIR}
31
	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
34
	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${STAGEDIR}${DATADIR}
32
	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${STAGEDIR}${PREFIX}/${PORTNAME}
35
	${MKDIR} ${STAGEDIR}${ETCDIR}
33
	${MKDIR} ${STAGEDIR}${ETCDIR}
36
	${MKDIR} ${STAGEDIR}/var/db/minecraft-server
34
	${MKDIR} ${STAGEDIR}/var/db/minecraft-server
37
	${MKDIR} ${STAGEDIR}/var/log/minecraft-server
35
	${MKDIR} ${STAGEDIR}/var/log/minecraft-server
38
	${INSTALL_SCRIPT} ${FILESDIR}/minecraft-server ${STAGEDIR}${PREFIX}/bin
36
	${INSTALL_SCRIPT} ${FILESDIR}/minecraft-server ${STAGEDIR}${PREFIX}/bin
37
	${CP} ${FILESDIR}/java-args.txt ${STAGEDIR}${ETCDIR}
39
.for file in ${CONFIG_FILES}
38
.for file in ${CONFIG_FILES}
40
	${LN} -s ${ETCDIR}/${file} ${STAGEDIR}${DATADIR}/${file}
39
	${LN} -s ${ETCDIR}/${file} ${STAGEDIR}${PREFIX}/${PORTNAME}/${file}
41
.endfor
40
.endfor
42
	${LN} -sf /var/log/minecraft-server ${STAGEDIR}${DATADIR}/logs
41
	${LN} -sf /var/log/minecraft-server ${STAGEDIR}${PREFIX}/${PORTNAME}/logs
43
	${LN} -sf /var/log/minecraft-server/debug ${STAGEDIR}${DATADIR}/debug
42
	${LN} -sf /var/log/minecraft-server/debug ${STAGEDIR}${PREFIX}/${PORTNAME}/debug
44
	${LN} -sf /var/db/minecraft-server ${STAGEDIR}/${DATADIR}/world
43
	${LN} -sf /var/db/minecraft-server ${STAGEDIR}${PREFIX}/${PORTNAME}/world
45
44
46
.include <bsd.port.mk>
45
.include <bsd.port.mk>
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (minecraft_server.1.8.jar) = 40e23f3823d6f0e3cbadc491cedb55b8ba53f8ab516b68182ddd1536babeb291
1
SHA256 (minecraft_server.1.8.1.jar) = ef5f5a1a1a78087859b18153acf97efc6ecb12540ac08d82b9c95024249b9845
2
SIZE (minecraft_server.1.8.jar) = 10375504
2
SIZE (minecraft_server.1.8.1.jar) = 7903505
(-)files/java-args.txt (+1 lines)
Line 0 Link Here
1
-Xmx1024M -Xms1024M
(-)files/minecraft-server (-2 / +2 lines)
Lines 5-9 Link Here
5
	exit 1
5
	exit 1
6
fi
6
fi
7
7
8
cd /usr/local/share/minecraft-server
8
cd /usr/local/minecraft-server
9
su -m mcserver -c "java -Xmx1024M -Xms1024M -jar minecraft_server.1.8.jar nogui"
9
su -m mcserver -c "java $(cat /usr/local/etc/minecraft-server/java-args.txt) -jar minecraft_server.1.8.1.jar nogui"
(-)files/pkg-deinstall.in (-4 / +5 lines)
Lines 5-11 Link Here
5
fi
5
fi
6
6
7
echo
7
echo
8
echo "NOTE: Your world has not been deleted. It is still in"
8
echo "NOTE: The game world has not been deleted. It is still in"
9
echo "/var/db/minecraft-server. If you no longer want the world, you will"
9
echo "/var/db/minecraft-server. If it is no longer required, it will"
10
echo "need to manually delete it."
10
echo "need to be manually deleted."
11
echo "Also, you may want to delete any remaining files in %%DATADIR%% and %%ETCDIR%%"
11
echo "Also, you may wish to delete any remaining files in" 
12
echo "%%PREFIX%%/minecraft-server and %%ETCDIR%%"
(-)files/pkg-message.in (-7 / +10 lines)
Lines 1-17 Link Here
1
When you first run minecraft-server, it will create the file
1
When you first run minecraft-server, it will populate the file
2
%%DATADIR%%/eula.txt
2
%%ETCDIR%%/eula.txt
3
3
4
You need to read the EULA, and then set:
4
It is required to read the EULA, and then set:
5
eula=true
5
eula=true
6
6
7
- To run the server, run %%PREFIX%%/bin/minecraft-server
7
- To run the server, run %%PREFIX%%/bin/minecraft-server
8
- Configuration files can be found at %%ETCDIR%%
8
- Configuration files can be found at %%ETCDIR%%
9
- Log files can be found at /var/log/minecraft-server/
9
- Log and debug output files can be found at /var/log/minecraft-server/
10
- World files can be found at /var/db/minecraft-server
10
- World files can be found at /var/db/minecraft-server
11
- Debug output files can be found at /var/log/minecraft-server/debug/
11
- To edit java's parameters, edit %%ETCDIR%%/java-args.txt
12
- To edit java's parameters, edit %%PREFIX%%/bin/minecraft-server
13
12
14
NOTE:
13
NOTE:
15
Users upgrading from version < 1.8 are advised to run the server to
14
Users upgrading from version < 1.8 are advised to run the server to
16
generate new config files, and then modify them based on their existing
15
generate new config files, and then modify them based on their existing
17
configuration, as most files are now JSON instead of txt. Also,
16
configuration, as most files are now JSON instead of txt.
17
18
Users upgrading from from 1.8 will need to re-accept the EULA. They
19
may also wish to delete %%DATADIR%% as it is 
20
no longer used.
(-)pkg-plist (-12 / +14 lines)
Lines 1-18 Link Here
1
bin/minecraft-server
2
@owner mcserver
1
@owner mcserver
3
@group mcserver
2
@group mcserver
4
@dir %%DATADIR%%
3
@dir minecraft-server
5
@dir %%ETCDIR%%
4
@dir %%ETCDIR%%
6
%%DATADIR%%/banned-ips.json
5
%%ETCDIR%%/java-args.txt
7
%%DATADIR%%/banned-players.json
6
bin/minecraft-server
8
%%DATADIR%%/debug
7
minecraft-server/banned-ips.json
9
%%DATADIR%%/logs
8
minecraft-server/banned-players.json
10
%%DATADIR%%/minecraft_server.1.8.jar
9
minecraft-server/debug
11
%%DATADIR%%/ops.json
10
minecraft-server/eula.txt
12
%%DATADIR%%/server.properties
11
minecraft-server/logs
13
%%DATADIR%%/usercache.json
12
minecraft-server/minecraft_server.1.8.1.jar
14
%%DATADIR%%/whitelist.json
13
minecraft-server/ops.json
15
%%DATADIR%%/world
14
minecraft-server/server.properties
15
minecraft-server/usercache.json
16
minecraft-server/whitelist.json
17
minecraft-server/world
16
@dir /var/db/minecraft-server
18
@dir /var/db/minecraft-server
17
@dir /var/log/minecraft-server
19
@dir /var/log/minecraft-server
18
@owner
20
@owner

Return to bug 196169