Attachment 152401 Details for Bug 197063 – New patch to fix port

[patch] New patch to fix port

newmc.patch (text/plain), 2.43 KB, created by A. Wilcox on 2015-01-31 01:13:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: A. Wilcox

Created: 2015-01-31 01:13:28 UTC

Size: 2.43 KB

patch

obsolete

>--- games/minecraft-client/Makefile.old	2014-11-11 03:59:46.000000000 -0600
>+++ games/minecraft-client/Makefile	2015-01-30 18:50:43.928984000 -0600
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	minecraft-client
> PORTVERSION=	1.8.1
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	games java
> MASTER_SITES=	http://s3.amazonaws.com/Minecraft.Download/launcher/:minecraft \
> 		http://media-mcw.cursecdn.com/c/c5/:icon
>@@ -22,7 +22,7 @@
> USE_JAVA=	yes
> JAVA_OS=	native
> JAVA_VENDOR=	openjdk
>-JAVA_VERSION=	1.8+
>+JAVA_VERSION=	1.7+
> DESKTOP_ENTRIES="Minecraft" \
> 		"Block building game" \
> 		"${PREFIX}/share/pixmaps/minecraft-client.png" \
>@@ -36,14 +36,15 @@
> 		${STAGEDIR}${DATADIR}/Minecraft.jar
> 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Grass.png \
> 		${STAGEDIR}${PREFIX}/share/pixmaps/minecraft-client.png
>-	${SED}  -e 's|=JAVA_HOME|=${JAVA_HOME}|' \
>-		-e 's|PREFIX|${PREFIX}|' \
>-		-e 's|JAVA_CMD|${JAVA}|' ${FILESDIR}/minecraft-client \
>+	${SED}  -e 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${FILESDIR}/minecraft-client \
> 		> ${WRKDIR}/minecraft-client
> 	${SED} -e 's|%%PREFIX%%|${PREFIX}|' ${FILESDIR}/Notifier.java \
> 		> ${WRKDIR}/Notifier.java
>+	${SED}  -e 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${FILESDIR}/minecraft-runtime \
>+		> ${WRKDIR}/minecraft-runtime
>+
> 	${INSTALL_SCRIPT} ${WRKDIR}/minecraft-client ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_SCRIPT} ${FILESDIR}/minecraft-runtime ${STAGEDIR}${DATADIR}
>+	${INSTALL_SCRIPT} ${WRKDIR}/minecraft-runtime ${STAGEDIR}${DATADIR}
> 	${INSTALL_DATA} ${WRKDIR}/Notifier.java ${STAGEDIR}${DATADIR}
> 
> .include <bsd.port.mk>
>--- games/minecraft-client/files/minecraft-client.old	2014-09-07 16:21:01.000000000 -0500
>+++ games/minecraft-client/files/minecraft-client	2015-01-30 17:13:59.341401000 -0600
>@@ -1,5 +1,5 @@
> #!/bin/sh
>-export JAVA_HOME=JAVA_HOME
>+export JAVA_HOME=%%JAVA_HOME%%
> 
> # The first time warn the user to set the runtime executable in place of java
> if [ ! -e "${HOME}/.minecraft/notified-runtime" ] ; then
>--- games/minecraft-client/files/minecraft-runtime.old	2014-11-11 03:59:46.000000000 -0600
>+++ games/minecraft-client/files/minecraft-runtime	2015-01-30 17:15:38.186773000 -0600
>@@ -4,7 +4,7 @@
> LWJGL_OVRD="/usr/local/share/java/classes/lwjgl/lwjgl.jar"
> LWJGL_UTIL_OVRD="/usr/local/share/java/classes/lwjgl/lwjgl_util.jar"
> 
>-export JAVA_HOME=/usr/local/openjdk8
>+export JAVA_HOME=%%JAVA_HOME%%
> 
> build_classpath() {
>     local IFS=":"
>@@ -41,4 +41,4 @@
>     esac
> done
> 
>-${JAVA_HOME}/jre/bin/java ${args}
>+${JAVA_HOME}/bin/java ${args}

Actions: View | Diff

Attachments on bug 197063: 152117 | 152401