Date: Fri, 10 Oct 2014 12:58:03 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370574 - in head/games/minecraft-server: . files Message-ID: <201410101258.s9ACw3Nv060130@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Fri Oct 10 12:58:03 2014 New Revision: 370574 URL: https://svnweb.freebsd.org/changeset/ports/370574 QAT: https://qat.redports.org/buildarchive/r370574/ Log: games/minecraft-server: Upgrade version 1.4.6 => 1.8 Assign maintainship to submitter PR: 192191 Submitted by: Jonathan Price Added: head/games/minecraft-server/files/minecraft-server (contents, props changed) Deleted: head/games/minecraft-server/files/banned-ips.txt.sample head/games/minecraft-server/files/banned-players.txt.sample head/games/minecraft-server/files/minecraft.in head/games/minecraft-server/files/ops.txt.sample head/games/minecraft-server/files/server.properties.sample head/games/minecraft-server/files/white-list.txt.sample Modified: head/games/minecraft-server/Makefile head/games/minecraft-server/distinfo head/games/minecraft-server/files/pkg-deinstall.in head/games/minecraft-server/files/pkg-message.in head/games/minecraft-server/pkg-descr head/games/minecraft-server/pkg-plist Modified: head/games/minecraft-server/Makefile ============================================================================== --- head/games/minecraft-server/Makefile Fri Oct 10 12:46:46 2014 (r370573) +++ head/games/minecraft-server/Makefile Fri Oct 10 12:58:03 2014 (r370574) @@ -1,85 +1,46 @@ -# Created by: Martin Kropfinger # $FreeBSD$ PORTNAME= minecraft-server -PORTVERSION= 1.4.7 -PORTREVISION= 1 +PORTVERSION= 1.8 CATEGORIES= games java -MASTER_SITES= http://assets.minecraft.net/${PORTVERSION:S|.|_|g}/ \ - http://media-mcw.cursecdn.com/f/f7/:icon -DISTNAME= minecraft_server -DISTFILES= minecraft_server.jar \ - Bookshelf.png:icon -DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} -EXTRACT_ONLY= #empty +MASTER_SITES= https://s3.amazonaws.com/Minecraft.Download/versions/${PORTVERSION}/ +DISTNAME= minecraft_server.${PORTVERSION}.jar +EXTRACT_SUFX= +EXTRACT_ONLY= -MAINTAINER= ports@FreeBSD.org -COMMENT= Server for the block building game +MAINTAINER= freebsd@jonathanprice.org +COMMENT= Dedicated server for the game Minecraft -RUN_DEPENDS= tmux:${PORTSDIR}/sysutils/tmux +ETCDIR= ${PREFIX}/etc/minecraft-server -OPTIONS_DEFINE= X11 -OPTIONS_DEFAULT=X11 +USERS= mcserver +GROUPS= ${USERS} -ETCDIR= ${PREFIX}/etc/minecraft - -WRKSRC= ${WRKDIR} NO_BUILD= yes USE_JAVA= yes -USERS?= mcserver -GROUPS?= ${USERS} -USE_RC_SUBR= minecraft -SUB_FILES= pkg-deinstall \ - pkg-message - -SUB_LIST+= USERS=${USERS} \ - GROUPS=${GROUPS} - -CONFIG_FILES= banned-ips.txt \ - banned-players.txt \ - ops.txt \ - server.properties \ - white-list.txt +SUB_FILES= pkg-message \ + pkg-deinstall -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MX11} -DESKTOP_ENTRIES="Minecraft-Server" \ - "Block building game (server)" \ - "${PREFIX}/share/pixmaps/minecraft-server.png" \ - "${PORTNAME}" \ - "Game;Java;" \ - false -.endif - -.if ${PORT_OPTIONS:MX11} -PLIST_SUB+= X11="" -.else -PLIST_SUB+= X11="@comment " -.endif +CONFIG_FILES= banned-ips.json \ + banned-players.json \ + ops.json \ + server.properties \ + usercache.json \ + whitelist.json do-install: ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/minecraft_server.jar ${STAGEDIR}${DATADIR}/ -.if ${PORT_OPTIONS:MX11} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Bookshelf.png ${STAGEDIR}${PREFIX}/share/pixmaps/minecraft-server.png -.endif - echo "#!/bin/sh" > ${WRKDIR}/${PORTNAME} - echo "if ! test -d ~/.minecraft-server ; then" >> ${WRKDIR}/${PORTNAME} - echo " mkdir ~/.minecraft-server" >> ${WRKDIR}/${PORTNAME} - echo "fi" >> ${WRKDIR}/${PORTNAME} - echo "cd ~/.minecraft-server" >> ${WRKDIR}/${PORTNAME} - ${CP} ${WRKDIR}/${PORTNAME} ${WRKDIR}/${PORTNAME}-nogui - echo "java -Xmx1024M -Xms1024M -jar ${DATADIR}/minecraft_server.jar" >> ${WRKDIR}/${PORTNAME} - echo "java -Xmx1024M -Xms1024M -jar ${DATADIR}/minecraft_server.jar nogui" >> ${WRKDIR}/${PORTNAME}-nogui -.if ${PORT_OPTIONS:MX11} - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ -.endif - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-nogui ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${ETCDIR} + ${MKDIR} ${STAGEDIR}/var/db/minecraft-server + ${MKDIR} ${STAGEDIR}/var/log/minecraft-server + ${INSTALL_SCRIPT} ${FILESDIR}/minecraft-server ${STAGEDIR}${PREFIX}/bin .for file in ${CONFIG_FILES} - ${INSTALL_DATA} ${FILESDIR}/${file}.sample ${STAGEDIR}${ETCDIR} - ${CHMOD} 644 ${STAGEDIR}${ETCDIR}/${file}.sample + ${TOUCH} ${STAGEDIR}${ETCDIR}/${file} + ${LN} -s ${ETCDIR}/${file} ${STAGEDIR}${DATADIR}/${file} .endfor + ${LN} -sf /var/log/minecraft-server ${STAGEDIR}${DATADIR}/logs + ${LN} -sf /var/log/minecraft-server/debug ${STAGEDIR}${DATADIR}/debug + ${LN} -sf /var/db/minecraft-server ${STAGEDIR}/${DATADIR}/world .include <bsd.port.mk> Modified: head/games/minecraft-server/distinfo ============================================================================== --- head/games/minecraft-server/distinfo Fri Oct 10 12:46:46 2014 (r370573) +++ head/games/minecraft-server/distinfo Fri Oct 10 12:58:03 2014 (r370574) @@ -1,4 +1,2 @@ -SHA256 (minecraft-server/1.4.7/minecraft_server.jar) = 96b7512aead2fb20ddf780d7dd74208d77f209e16058ea8944150179e65b4dd3 -SIZE (minecraft-server/1.4.7/minecraft_server.jar) = 2061638 -SHA256 (minecraft-server/1.4.7/Bookshelf.png) = fe5e7f0bbbbe284379cb5e7aed8d539b727a3039f7fe8c64a179e4fc2a0e1821 -SIZE (minecraft-server/1.4.7/Bookshelf.png) = 9674 +SHA256 (minecraft_server.1.8.jar) = 40e23f3823d6f0e3cbadc491cedb55b8ba53f8ab516b68182ddd1536babeb291 +SIZE (minecraft_server.1.8.jar) = 10375504 Added: head/games/minecraft-server/files/minecraft-server ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/minecraft-server/files/minecraft-server Fri Oct 10 12:58:03 2014 (r370574) @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ "$(id -u)" != "0" ]; then + echo "$0 must be run as root" 1>&2 + exit 1 +fi + +cd /usr/local/share/minecraft-server +su -m mcserver -c "java -Xmx1024M -Xms1024M -jar minecraft_server.1.7.10.jar nogui" Modified: head/games/minecraft-server/files/pkg-deinstall.in ============================================================================== --- head/games/minecraft-server/files/pkg-deinstall.in Fri Oct 10 12:46:46 2014 (r370573) +++ head/games/minecraft-server/files/pkg-deinstall.in Fri Oct 10 12:58:03 2014 (r370574) @@ -4,18 +4,8 @@ if [ "$2" != "POST-DEINSTALL" ]; then exit 0 fi -if [ -d %%DATADIR%% ]; then - echo "There are some files (like your world and your server.log)" - echo "left in %%DATADIR%%." - echo "Use 'rm -rf %%DATADIR%%' to delete them." - echo -fi - -if [ -d %%ETCDIR%% ]; then - echo "There are some changed config files left in %%ETCDIR%%." - echo "Use 'rm -rf %%ETCDIR%%' to delete them." - echo -fi - -exit 0 - +echo +echo "NOTE: Your world has not been deleted. It is still in" +echo "/var/db/minecraft-server. If you no longer want the world, you will" +echo "need to manually delete it." +echo "Also, you may want to delete any remaining files in %%DATADIR%%" Modified: head/games/minecraft-server/files/pkg-message.in ============================================================================== --- head/games/minecraft-server/files/pkg-message.in Fri Oct 10 12:46:46 2014 (r370573) +++ head/games/minecraft-server/files/pkg-message.in Fri Oct 10 12:58:03 2014 (r370574) @@ -1,40 +1,12 @@ -************************************************** -Daemon: - The user %%USERS%% has been added to your system. +When you first run minecraft-server, it will create the file +%%DATADIR%%/eula.txt - To run the server automativally with the system - add the following line to your /etc/rc.conf: +You need to read the EULA, and then set: +eula=true - minecraft_enable="YES" - - Serverfiles will be in - %%PREFIX%%/share/minecraft-server - - Configuration can be done using the config-files - or as OP using the Client. Config files are in - %%PREFIX%%/etc/minecraft - - If you have trouble starting or stopping the - server try to delete an unclean server.log.lck: - - %%PREFIX%%/etc/rc.d/minecraft clean - - If you don't like your generated world it can - be deleted (do generate a new one next time - the server starts) using: - - %%PREFIX%%/etc/rc.d/minecraft killworld - - You can delete the server.log (so it's not - getting to fat) using: - - %%PREFIX%%/etc/rc.d/minecraft clearlog - -Unprivileged users: - Running a server as unprivilieged user try - minecraft-server{-nogui} - - The serverfiles will be in - ~/.minecraft-server - -************************************************** +- To run the server, run %%PREFIX%%/bin/minecraft-server +- Configuration files can be found at %%ETCDIR%% +- Log files can be found at /var/log/minecraft-server/ +- World files can be found at /var/db/minecraft-server +- Debug output files can be found at /var/log/minecraft-server/debug/ +- To edit java's parameters, edit %%PREFIX%%/bin/minecraft-server Modified: head/games/minecraft-server/pkg-descr ============================================================================== --- head/games/minecraft-server/pkg-descr Fri Oct 10 12:46:46 2014 (r370573) +++ head/games/minecraft-server/pkg-descr Fri Oct 10 12:58:03 2014 (r370574) @@ -1,4 +1,3 @@ -This is the server for the popular block building game Minecraft. -There is a nongui-version and a gui-version. +This is the dedicated server for the popular block building game Minecraft. WWW: http://www.minecraft.net/ Modified: head/games/minecraft-server/pkg-plist ============================================================================== --- head/games/minecraft-server/pkg-plist Fri Oct 10 12:46:46 2014 (r370573) +++ head/games/minecraft-server/pkg-plist Fri Oct 10 12:58:03 2014 (r370574) @@ -1,16 +1,23 @@ -@stopdaemon minecraft -%%X11%%bin/minecraft-server -bin/minecraft-server-nogui +bin/minecraft-server @owner mcserver @group mcserver -@sample %%ETCDIR%%/banned-ips.txt.sample -@sample %%ETCDIR%%/banned-players.txt.sample -@sample %%ETCDIR%%/ops.txt.sample -@sample %%ETCDIR%%/server.properties.sample -@sample %%ETCDIR%%/white-list.txt.sample -%%DATADIR%%/minecraft_server.jar +%%ETCDIR%%/banned-ips.json +%%ETCDIR%%/banned-players.json +%%ETCDIR%%/ops.json +%%ETCDIR%%/server.properties +%%ETCDIR%%/usercache.json +%%ETCDIR%%/whitelist.json +%%DATADIR%%/banned-ips.json +%%DATADIR%%/banned-players.json +%%DATADIR%%/debug +%%DATADIR%%/logs +%%DATADIR%%/minecraft_server.1.8.jar +%%DATADIR%%/ops.json +%%DATADIR%%/server.properties +%%DATADIR%%/usercache.json +%%DATADIR%%/whitelist.json +%%DATADIR%%/world +@dir /var/db/minecraft-server +@dir /var/log/minecraft-server @owner @group -%%X11%%share/pixmaps/minecraft-server.png -@dirrmtry %%DATADIR%% -@dirrmtry %%ETCDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410101258.s9ACw3Nv060130>