Attachment 122460 Details for Bug 165666 – patch.txt

patch.txt

patch.txt (text/plain; charset=us-ascii), 6.50 KB, created by Jason Helfman on 2012-03-06 22:26:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Helfman

Created: 2012-03-06 22:26:14 UTC

Size: 6.50 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/games/minecraft-server/Makefile,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile
>--- Makefile	12 Jan 2012 23:27:33 -0000	1.4
>+++ Makefile	6 Mar 2012 22:24:53 -0000
>@@ -6,10 +6,10 @@
> #
> 
> PORTNAME=	minecraft-server
>-PORTVERSION=	1.1.0
>+PORTVERSION=	1.2.3
> CATEGORIES=	games java
>-MASTER_SITES=	http://s3.amazonaws.com/MinecraftDownload/launcher/ \
>-		http://denkrobat.de/minecraft/:minecraft \
>+MASTER_SITES=	http://denkrobat.de/minecraft/:minecraft \
>+		http://s3.amazonaws.com/MinecraftDownload/launcher/ \
> 		http://www.minecraftwiki.net/images/f/f7/:icon
> DISTNAME=	minecraft_server
> DISTFILES=	minecraft_server.jar:minecraft \
>@@ -68,48 +68,16 @@
> .endif
> 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-nogui ${PREFIX}/bin/
> 	${MKDIR} ${ETCDIR}
>-	${INSTALL_DATA} ${FILESDIR}/server.properties.sample ${DATADIR}/server.properties.sample
>-	${INSTALL_DATA} ${FILESDIR}/ops.txt.sample ${DATADIR}/ops.txt.sample
>-	${INSTALL_DATA} ${FILESDIR}/white-list.txt.sample ${DATADIR}/white-list.txt.sample
>-	${INSTALL_DATA} ${FILESDIR}/banned-ips.txt.sample ${DATADIR}/banned-ips.txt.sample
>-	${INSTALL_DATA} ${FILESDIR}/banned-players.txt.sample ${DATADIR}/banned-players.txt.sample
>-	if [ ! -f ${ETCDIR}/server.properties ]; then \
>-		${CP} -p ${DATADIR}/server.properties.sample ${ETCDIR}/server.properties ; \
>+.for file in server.properties ops.txt white-list.txt banned-ips.txt banned-players.txt
>+	${INSTALL_DATA} ${FILESDIR}/${file}.sample ${DATADIR}
>+	if [ ! -f ${ETCDIR}/${file} ]; then \
>+		${CP} -p ${DATADIR}/${file}.sample ${ETCDIR}/${file} ; \
> 	fi
>-	if [ ! -f ${ETCDIR}/ops.txt ]; then \
>-		${CP} -p ${DATADIR}/ops.txt.sample ${ETCDIR}/ops.txt ; \
>-	fi
>-	if [ ! -f ${ETCDIR}/white-list.txt ]; then \
>-		${CP} -p ${DATADIR}/white-list.txt.sample ${ETCDIR}/white-list.txt ; \
>-	fi
>-	if [ ! -f ${ETCDIR}/banned-ips.txt ]; then \
>-		${CP} -p ${DATADIR}/banned-ips.txt.sample ${ETCDIR}/banned-ips.txt ; \
>-	fi
>-	if [ ! -f ${ETCDIR}/banned-players.txt ]; then \
>-		${CP} -p ${DATADIR}/banned-players.txt.sample ${ETCDIR}/banned-players.txt ; \
>-	fi
>-	${LN} -s ${ETCDIR}/server.properties ${DATADIR}/server.properties
>-	${LN} -s ${ETCDIR}/ops.txt ${DATADIR}/ops.txt
>-	${LN} -s ${ETCDIR}/white-list.txt ${DATADIR}/white-list.txt
>-	${LN} -s ${ETCDIR}/banned-ips.txt ${DATADIR}/banned-ips.txt
>-	${LN} -s ${ETCDIR}/banned-players.txt ${DATADIR}/banned-players.txt
>+	${CHMOD} 644 ${DATADIR}/${file}* ${ETCDIR}/${file}
>+	${LN} -s ${ETCDIR}/${file} ${DATADIR}/${file}
>+.endfor
> 	${CHOWN} -R ${USERS}:${GROUPS} ${DATADIR}
> 	${CHOWN} -R ${USERS}:${GROUPS} ${ETCDIR}
>-	${CHMOD} -R 644 ${DATADIR}/banned-ips.txt
>-	${CHMOD} -R 644 ${DATADIR}/banned-players.txt
>-	${CHMOD} -R 644 ${DATADIR}/ops.txt
>-	${CHMOD} -R 644 ${DATADIR}/white-list.txt
>-	${CHMOD} -R 644 ${DATADIR}/server.properties
>-	${CHMOD} -R 644 ${DATADIR}/banned-ips.txt.sample
>-	${CHMOD} -R 644 ${DATADIR}/banned-players.txt.sample
>-	${CHMOD} -R 644 ${DATADIR}/ops.txt.sample
>-	${CHMOD} -R 644 ${DATADIR}/white-list.txt.sample
>-	${CHMOD} -R 644 ${DATADIR}/server.properties.sample
>-	${CHMOD} -R 644 ${ETCDIR}/banned-ips.txt
>-	${CHMOD} -R 644 ${ETCDIR}/banned-players.txt
>-	${CHMOD} -R 644 ${ETCDIR}/ops.txt
>-	${CHMOD} -R 644 ${ETCDIR}/white-list.txt
>-	${CHMOD} -R 644 ${ETCDIR}/server.properties
> 
> post-install:
> 	${CAT} ${PKGMESSAGE}
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/games/minecraft-server/pkg-plist,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-plist
>--- pkg-plist	12 Jan 2012 13:14:45 -0000	1.2
>+++ pkg-plist	6 Mar 2012 22:24:53 -0000
>@@ -1,28 +1,28 @@
> @stopdaemon minecraft
>-share/minecraft-server/minecraft_server.jar
>-%%X11%%share/minecraft-server/Bookshelf.png
>+%%DATADIR%%/minecraft_server.jar
>+%%X11%%%%DATADIR%%/Bookshelf.png
> %%X11%%bin/minecraft-server
> bin/minecraft-server-nogui
> @exec mkdir -p %D/etc/minecraft
>-@unexec if cmp -s %D/share/minecraft-server/ops.txt.sample %D/etc/minecraft/ops.txt; then rm -f %D/etc/minecraft/ops.txt; fi
>-@unexec if cmp -s %D/share/minecraft-server/banned-ips.txt.sample %D/etc/minecraft/banned-ips.txt; then rm -f %D/etc/minecraft/banned-ips.txt; fi
>-@unexec if cmp -s %D/share/minecraft-server/banned-players.txt.sample %D/etc/minecraft/banned-players.txt; then rm -f %D/etc/minecraft/banned-players.txt; fi
>-@unexec if cmp -s %D/share/minecraft-server/white-list.txt.sample %D/etc/minecraft/white-list.txt; then rm -f %D/etc/minecraft/white-list.txt; fi
>-@unexec if cmp -s %D/share/minecraft-server/server.properties.sample %D/etc/minecraft/server.properties; then rm -f %D/etc/minecraft/server.properties; fi
>-share/minecraft-server/server.properties
>-share/minecraft-server/ops.txt
>-share/minecraft-server/white-list.txt
>-share/minecraft-server/banned-ips.txt
>-share/minecraft-server/banned-players.txt
>-share/minecraft-server/server.properties.sample
>+@unexec if cmp -s %D/%%DATADIR%%/ops.txt.sample %D/etc/minecraft/ops.txt; then rm -f %D/etc/minecraft/ops.txt; fi
>+@unexec if cmp -s %D/%%DATADIR%%/banned-ips.txt.sample %D/etc/minecraft/banned-ips.txt; then rm -f %D/etc/minecraft/banned-ips.txt; fi
>+@unexec if cmp -s %D/%%DATADIR%%/banned-players.txt.sample %D/etc/minecraft/banned-players.txt; then rm -f %D/etc/minecraft/banned-players.txt; fi
>+@unexec if cmp -s %D/%%DATADIR%%/white-list.txt.sample %D/etc/minecraft/white-list.txt; then rm -f %D/etc/minecraft/white-list.txt; fi
>+@unexec if cmp -s %D/%%DATADIR%%/server.properties.sample %D/etc/minecraft/server.properties; then rm -f %D/etc/minecraft/server.properties; fi
>+%%DATADIR%%/server.properties
>+%%DATADIR%%/ops.txt
>+%%DATADIR%%/white-list.txt
>+%%DATADIR%%/banned-ips.txt
>+%%DATADIR%%/banned-players.txt
>+%%DATADIR%%/server.properties.sample
> @exec if [ ! -f %D/etc/minecraft/server.properties ] ; then cp -p %D/%F %B/server.properties; fi
>-share/minecraft-server/ops.txt.sample
>+%%DATADIR%%/ops.txt.sample
> @exec if [ ! -f %D/etc/minecraft/ops.txt ] ; then cp -p %D/%F %B/ops.txt; fi
>-share/minecraft-server/white-list.txt.sample
>+%%DATADIR%%/white-list.txt.sample
> @exec if [ ! -f %D/etc/minecraft/white-list.txt ] ; then cp -p %D/%F %B/white-list.txt; fi
>-share/minecraft-server/banned-ips.txt.sample
>+%%DATADIR%%/banned-ips.txt.sample
> @exec if [ ! -f %D/etc/minecraft/banned-ips.txt ] ; then cp -p %D/%F %B/banned-ips.txt; fi
>-share/minecraft-server/banned-players.txt.sample
>+%%DATADIR%%/banned-players.txt.sample
> @exec if [ ! -f %D/etc/minecraft/banned-players.txt ] ; then cp -p %D/%F %B/banned-players.txt; fi
>-@dirrmtry share/minecraft-server
>+@dirrmtry %%DATADIR%%
> @dirrmtry etc/minecraft

Actions: View

Attachments on bug 165666: 122459 | 122460