Date: Fri, 30 Nov 2012 03:27:04 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307990 - head/games/minecraft-server Message-ID: <201211300327.qAU3R4Yb007627@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Fri Nov 30 03:27:04 2012 New Revision: 307990 URL: http://svnweb.freebsd.org/changeset/ports/307990 Log: - Update to 1.4.5 - Convert to new options framework [1] - Whitespace cleanup [1] - Trim Makefile header [1] PR: ports/173288 (based on) Submitted by: maintainer Approved by: maintainer timeout (2 weeks) [1] Feature safe: yes Modified: head/games/minecraft-server/Makefile (contents, props changed) head/games/minecraft-server/distinfo (contents, props changed) head/games/minecraft-server/pkg-plist (contents, props changed) Modified: head/games/minecraft-server/Makefile ============================================================================== --- head/games/minecraft-server/Makefile Fri Nov 30 03:04:12 2012 (r307989) +++ head/games/minecraft-server/Makefile Fri Nov 30 03:27:04 2012 (r307990) @@ -1,20 +1,16 @@ -# New ports collection makefile for: minecraft-client -# Date created: 12 November 2011 -# Whom: Martin Kropfinger -# +# Created by: Martin Kropfinger # $FreeBSD$ -# PORTNAME= minecraft-server -PORTVERSION= 1.2.3 -PORTREVISION= 1 +PORTVERSION= 1.4.5 CATEGORIES= games java MASTER_SITES= http://s3.amazonaws.com/MinecraftDownload/launcher/ \ http://denkrobat.de/minecraft/ \ - http://www.minecraftwiki.net/images/f/f7/:icon + 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 MAINTAINER= freebsd@rakor-net.de @@ -22,12 +18,11 @@ COMMENT= Server for the block building g RUN_DEPENDS= tmux:${PORTSDIR}/sysutils/tmux -OPTIONS= X11 "Build with X11 support" On +OPTIONS_DEFINE= X11 +OPTIONS_DEFAULT=X11 ETCDIR= ${PREFIX}/etc/minecraft -.include <bsd.port.options.mk> - WRKSRC= ${WRKDIR} NO_BUILD= yes USE_JAVA= yes @@ -46,11 +41,18 @@ CONFIG_FILES= banned-ips.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 +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MX11} +DESKTOP_ENTRIES="Minecraft-Server" \ + "Block building game (server)" \ + "${PORTNAME}" \ + "${PORTNAME}" \ + "Application;Game;" \ + false .endif -.if !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MX11} PLIST_SUB+= X11="" .else PLIST_SUB+= X11="@comment " @@ -59,18 +61,18 @@ PLIST_SUB+= X11="@comment " do-install: ${MKDIR} ${DATADIR} (${INSTALL_DATA} "${DISTDIR}/minecraft_server.jar" ${DATADIR}/) -.if !defined(WITHOUT_X11) - (${INSTALL_DATA} "${DISTDIR}/Bookshelf.png" ${DATADIR}/) +.if ${PORT_OPTIONS:MX11} + (${INSTALL_DATA} "${DISTDIR}/Bookshelf.png" ${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} + 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) + 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} ${PREFIX}/bin/ .endif ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-nogui ${PREFIX}/bin/ Modified: head/games/minecraft-server/distinfo ============================================================================== --- head/games/minecraft-server/distinfo Fri Nov 30 03:04:12 2012 (r307989) +++ head/games/minecraft-server/distinfo Fri Nov 30 03:27:04 2012 (r307990) @@ -1,4 +1,4 @@ -SHA256 (minecraft_server.jar) = 7251feae7527569de15eb10e79839d2d254fe5095d0fe46d29034fc90a3514d1 -SIZE (minecraft_server.jar) = 1345637 -SHA256 (Bookshelf.png) = fe5e7f0bbbbe284379cb5e7aed8d539b727a3039f7fe8c64a179e4fc2a0e1821 -SIZE (Bookshelf.png) = 9674 +SHA256 (minecraft-server/1.4.5/minecraft_server.jar) = b8af871d6b0a03dd2fe65ee9238bb52c60dd5e30d3ded0f37a9eb860e5df206d +SIZE (minecraft-server/1.4.5/minecraft_server.jar) = 2047972 +SHA256 (minecraft-server/1.4.5/Bookshelf.png) = fe5e7f0bbbbe284379cb5e7aed8d539b727a3039f7fe8c64a179e4fc2a0e1821 +SIZE (minecraft-server/1.4.5/Bookshelf.png) = 9674 Modified: head/games/minecraft-server/pkg-plist ============================================================================== --- head/games/minecraft-server/pkg-plist Fri Nov 30 03:04:12 2012 (r307989) +++ head/games/minecraft-server/pkg-plist Fri Nov 30 03:27:04 2012 (r307990) @@ -1,6 +1,5 @@ @stopdaemon minecraft %%DATADIR%%/minecraft_server.jar -%%X11%%%%DATADIR%%/Bookshelf.png %%X11%%bin/minecraft-server bin/minecraft-server-nogui @exec mkdir -p %D/etc/minecraft @@ -24,5 +23,6 @@ bin/minecraft-server-nogui @exec if [ ! -f %D/etc/minecraft/banned-ips.txt ] ; then cp -p %D/%F %B/banned-ips.txt; fi %%DATADIR%%/banned-players.txt.sample @exec if [ ! -f %D/etc/minecraft/banned-players.txt ] ; then cp -p %D/%F %B/banned-players.txt; fi +%%X11%%share/pixmaps/minecraft-server.png @dirrmtry %%DATADIR%% @dirrmtry etc/minecraft
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211300327.qAU3R4Yb007627>