Index: head/games/minecraft-server/Makefile =================================================================== --- head/games/minecraft-server/Makefile (revision 293018) +++ head/games/minecraft-server/Makefile (revision 293019) @@ -1,91 +1,92 @@ # New ports collection makefile for: minecraft-client # Date created: 12 November 2011 # Whom: Martin Kropfinger # # $FreeBSD$ # PORTNAME= minecraft-server PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= games java MASTER_SITES= http://s3.amazonaws.com/MinecraftDownload/launcher/ \ http://denkrobat.de/minecraft/ \ http://www.minecraftwiki.net/images/f/f7/:icon DISTNAME= minecraft_server DISTFILES= minecraft_server.jar \ Bookshelf.png:icon EXTRACT_ONLY= #empty MAINTAINER= freebsd@rakor-net.de COMMENT= Server for the block building game RUN_DEPENDS= tmux:${PORTSDIR}/sysutils/tmux OPTIONS= X11 "Build with X11 support" On ETCDIR= ${PREFIX}/etc/minecraft .include 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 .if !defined(WITHOUT_X11) DESKTOP_ENTRIES="Minecraft-Server" "Block building game (server)" "${DATADIR}/Bookshelf.png" "minecraft-server" "Application;Game;" false .endif .if !defined(WITHOUT_X11) PLIST_SUB+= X11="" .else PLIST_SUB+= X11="@comment " .endif do-install: ${MKDIR} ${DATADIR} (${INSTALL_DATA} "${DISTDIR}/minecraft_server.jar" ${DATADIR}/) .if !defined(WITHOUT_X11) (${INSTALL_DATA} "${DISTDIR}/Bookshelf.png" ${DATADIR}/) .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 !defined(WITHOUT_X11) ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/ .endif ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-nogui ${PREFIX}/bin/ ${MKDIR} ${ETCDIR} .for file in ${CONFIG_FILES} ${INSTALL_DATA} ${FILESDIR}/${file}.sample ${DATADIR} if [ ! -f ${ETCDIR}/${file} ]; then \ ${CP} -p ${DATADIR}/${file}.sample ${ETCDIR}/${file} ; \ fi ${CHMOD} 644 ${DATADIR}/${file}* ${ETCDIR}/${file} ${LN} -s ${ETCDIR}/${file} ${DATADIR}/${file} .endfor ${CHOWN} -R ${USERS}:${GROUPS} ${DATADIR} ${CHOWN} -R ${USERS}:${GROUPS} ${ETCDIR} post-install: ${CAT} ${PKGMESSAGE} .include Property changes on: head/games/minecraft-server/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/games/minecraft-server/files/minecraft.in =================================================================== --- head/games/minecraft-server/files/minecraft.in (revision 293018) +++ head/games/minecraft-server/files/minecraft.in (revision 293019) @@ -1,120 +1,120 @@ #!/bin/sh # # PROVIDE: minecraft # REQUIRE: LOGIN # KEYWORD: shutdown . /etc/rc.subr name="minecraft" rcvar=minecraft_enable load_rc_config $name extra_commands="clean killworld clearlog" start_cmd="${name}_start" stop_cmd="${name}_stop" clean_cmd="${name}_clean" killworld_cmd="${name}_killworld" clearlog_cmd="${name}_clearlog" eval "${rcvar}=\${${rcvar}:-'NO'}" minecraft_start() { if [ -e %%DATADIR%%/server.log.lck ]; then echo "Server already running." else echo "Starting Minecraft-Server..." cd %%DATADIR%% - /usr/bin/su %%USERS%% -c "%%PREFIX%%/bin/tmux new-session -d -s minecraft \"java -Xmx1024M -Xms1024M -jar %%DATADIR%%/minecraft_server.jar nogui\"" + /usr/bin/su %%USERS%% -c "%%LOCALBASE%%/bin/tmux new-session -d -s minecraft \"%%LOCALBASE%%/bin/java -Xmx1024M -Xms1024M -jar %%DATADIR%%/minecraft_server.jar nogui\"" i=0 while [ $i -lt 15 ]; do i=$(($i + 1)) if [ -e %%DATADIR%%/server.log.lck ]; then echo "Minecraft-Server running." break else sleep 1 fi done if [ $i -ge 10 ]; then - echo "ERROR: Server could not be startet." - /usr/bin/su %%USERS%% -c "%%PREFIX%%/bin/tmux kill-session -t minecraft" + echo "ERROR: Server could not be started." + /usr/bin/su %%USERS%% -c "%%LOCALBASE%%/bin/tmux kill-session -t minecraft" fi fi } minecraft_stop(){ if [ -e %%DATADIR%%/server.log.lck ]; then echo "Halting Minecraft-Server." - /usr/bin/su %%USERS%% -c "%%PREFIX%%/bin/tmux send -t minecraft:0.0 stop \"Enter\"" + /usr/bin/su %%USERS%% -c "%%LOCALBASE%%/bin/tmux send -t minecraft:0.0 stop \"Enter\"" i=0 while [ $i -lt 15 ]; do i=$(($i + 1)) if [ -e %%DATADIR%%/server.log.lck ]; then sleep 1 else - echo "Minecraft-Server haltet." + echo "Minecraft-Server halted." break fi done if [ $i -ge 10 ];then - echo "ERROR: Server could not be haltet." + echo "ERROR: Server could not be halted." fi else echo "Minecraft-Server not running." fi } minecraft_clean(){ echo "Giving a stop to the server..." minecraft_stop echo "Cleaning..." if [ -e %%DATADIR%%/server.log.lck ]; then rm %%DATADIR%%/server.log.lck echo "Cleaning done." else echo "Nothing to do. No unclean sessions." fi } minecraft_killworld(){ echo "Trying to delete World" if [ -e %%DATADIR%%/server.log.lck ]; then echo "Server seems to be running. Stop server before deletion." else rm -rf %%DATADIR%%/world if [ -d %%DATADIR%%/world ]; then echo "ERROR: World could not be deleted" else echo "World deleted. Next serverstart will generate a new one" fi fi } minecraft_clearlog(){ echo "Trying to delete server.log" if [ -e %%DATADIR%%/server.log.lck ]; then echo "Server seems to be running. Stop server before deletion." else if [ -e %%DATADIR%%/server.log ]; then rm %%DATADIR%%/server.log if [ -e %%DATADIR%%/server.log ]; then echo "ERROR: server.log could not be deleted" else echo "server.log deleted." fi else echo "No server.log found" fi fi } run_rc_command "$1" Property changes on: head/games/minecraft-server/files/minecraft.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property