Attachment 129315 Details for Bug 173288 – minecraft-server.diff

[patch] minecraft-server.diff

minecraft-server.diff (text/x-patch; charset="ISO-8859-1"), 4.58 KB, created by Jason E. Hale on 2012-11-11 11:31:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason E. Hale

Created: 2012-11-11 11:31:22 UTC

Size: 4.58 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 307277)
>+++ Makefile	(working copy)
>@@ -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.2
> 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 @@
> 
> 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 @@
> 		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 @@
> 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/
>Index: distinfo
>===================================================================
>--- distinfo	(revision 307277)
>+++ distinfo	(working copy)
>@@ -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.2/minecraft_server.jar) = 16bc7305231d5ceba8b81e43cca8bdcd19cc6d92a488ed270baa5ab827b0fa40
>+SIZE (minecraft-server/1.4.2/minecraft_server.jar) = 2018455
>+SHA256 (minecraft-server/1.4.2/Bookshelf.png) = fe5e7f0bbbbe284379cb5e7aed8d539b727a3039f7fe8c64a179e4fc2a0e1821
>+SIZE (minecraft-server/1.4.2/Bookshelf.png) = 9674
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 307277)
>+++ pkg-plist	(working copy)
>@@ -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 @@
> @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

Actions: View | Diff

Attachments on bug 173288: 129314 | 129315