From owner-svn-ports-head@FreeBSD.ORG Thu Apr 17 23:14:25 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 35563DE2; Thu, 17 Apr 2014 23:14:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1523B1FD4; Thu, 17 Apr 2014 23:14:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3HNEOwJ003634; Thu, 17 Apr 2014 23:14:24 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3HNEOik003631; Thu, 17 Apr 2014 23:14:24 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201404172314.s3HNEOik003631@svn.freebsd.org> From: John Marino Date: Thu, 17 Apr 2014 23:14:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351506 - head/games/minecraft-client X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2014 23:14:25 -0000 Author: marino Date: Thu Apr 17 23:14:24 2014 New Revision: 351506 URL: http://svnweb.freebsd.org/changeset/ports/351506 QAT: https://qat.redports.org/buildarchive/r351506/ Log: games/minecraft-client: Unbreak run by using official launcher The method of selectively loading specific versions in Minecraft stopped working in the 1.5.x series. From 1.6.0 and later, the official launcher must be used. The launcher itself does not change often (last time was July 2013). The jar files are downloaded into $HOME/.minecraft directory, so every user gets their own copy which is not removed when the port is uninstalled. The new launcher also downloads lwjgl files, so the dependency on games/lwjgl is redundant, as well as openal-soft. This allows the port to be simplified and to always install the native version. The port version doesn't really matter anymore. I will set it to 1.7.9 right now as this is the latest available version. PR: ports/188473 Approved by: marino@. It does mirror the maintainers original intent, but he did not weigh in on the PR. The game was broken. Simplified by: marino@ Modified: head/games/minecraft-client/Makefile head/games/minecraft-client/distinfo head/games/minecraft-client/pkg-plist Modified: head/games/minecraft-client/Makefile ============================================================================== --- head/games/minecraft-client/Makefile Thu Apr 17 22:24:55 2014 (r351505) +++ head/games/minecraft-client/Makefile Thu Apr 17 23:14:24 2014 (r351506) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= minecraft-client -PORTVERSION= 1.7.5 +PORTVERSION= 1.7.9 CATEGORIES= games java -MASTER_SITES= http://s3.amazonaws.com/Minecraft.Download/versions/${PORTVERSION}/:minecraft \ +MASTER_SITES= http://s3.amazonaws.com/Minecraft.Download/launcher/:minecraft \ http://media-mcw.cursecdn.com/c/c5/:icon -DISTFILES= ${PORTVERSION}.jar:minecraft \ +DISTFILES= Minecraft.jar:minecraft \ Grass.png:icon DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} EXTRACT_ONLY= @@ -14,13 +14,11 @@ EXTRACT_ONLY= MAINTAINER= janik@hikarihq.com COMMENT= Client for the block building game -OPTIONS_DEFINE= NATIVE_LIBS -OPTIONS_DEFAULT= NATIVE_LIBS -NATIVE_LIBS_DESC= Enable native libs support - WRKSRC= ${WRKDIR} NO_BUILD= yes USE_JAVA= yes +JAVA_OS= native +JAVA_VENDOR= openjdk JAVA_VERSION= 1.7+ DESKTOP_ENTRIES="Minecraft" \ "Block building game" \ @@ -29,43 +27,16 @@ DESKTOP_ENTRIES="Minecraft" \ "Game;Java;" \ false -.include - -.if ${PORT_OPTIONS:MNATIVE_LIBS} -USES+= openal:soft -BUILD_DEPENDS+= ${JAVALIBDIR}/lwjgl/lwjgl_util.jar:${PORTSDIR}/games/lwjgl -RUN_DEPENDS+= ${JAVALIBDIR}/lwjgl/lwjgl_util.jar:${PORTSDIR}/games/lwjgl -JAVA_OS= native -JAVA_VENDOR= openjdk -PLIST_SUB+= NATIVE="" -.else -JAVA_OS= linux -JAVA_VENDOR= sun -PLIST_SUB+= NATIVE="@comment " -.endif - do-install: - @${ECHO_CMD} "#!/bin/sh" > ${WRKDIR}/minecraft-client - @${ECHO_CMD} "export JAVA_HOME=${JAVA_HOME}" >> ${WRKDIR}/minecraft-client - @${ECHO_CMD} "exec ${JAVA} -Xmx1024M -Xms1024M -jar ${DATADIR}/Minecraft.jar" >> ${WRKDIR}/minecraft-client @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${PORTVERSION}.jar \ + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Minecraft.jar \ ${STAGEDIR}${DATADIR}/Minecraft.jar ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Grass.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/minecraft-client.png -.if ${PORT_OPTIONS:MNATIVE_LIBS} - @${MKDIR} ${WRKSRC}/native-libs - @${CP} ${PREFIX}/lib/lwjgl*/liblwjgl*.so ${WRKSRC}/native-libs - @${CP} ${PREFIX}/lib/libopenal.so ${WRKSRC}/native-libs - @${JAR} cvf ${WRKSRC}/lwjgl-native-libs.jar -C ${WRKSRC}/native-libs . - ${INSTALL_DATA} -m 644 ${WRKSRC}/lwjgl-native-libs.jar \ - ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${FILESDIR}/${PORTNAME} ${WRKDIR} - ${REINPLACE_CMD} \ - -e 's|=JAVA_HOME|=${JAVA_HOME}|' \ + ${SED} -e 's|=JAVA_HOME|=${JAVA_HOME}|' \ -e 's|PREFIX|${PREFIX}|' \ - -e 's|JAVA_CMD|${JAVA}|' ${WRKDIR}/minecraft-client -.endif + -e 's|JAVA_CMD|${JAVA}|' ${FILESDIR}/minecraft-client \ + > ${WRKDIR}/minecraft-client ${INSTALL_SCRIPT} ${WRKDIR}/minecraft-client ${STAGEDIR}${PREFIX}/bin .include Modified: head/games/minecraft-client/distinfo ============================================================================== --- head/games/minecraft-client/distinfo Thu Apr 17 22:24:55 2014 (r351505) +++ head/games/minecraft-client/distinfo Thu Apr 17 23:14:24 2014 (r351506) @@ -1,4 +1,4 @@ -SHA256 (minecraft-client/1.7.5/1.7.5.jar) = 5f83b944b59c48ea7fa8f92fefd491ecb6d1e8d6c9b412fc849f6457c8cee27b -SIZE (minecraft-client/1.7.5/1.7.5.jar) = 5225771 -SHA256 (minecraft-client/1.7.5/Grass.png) = 438c0f63e379e92af1b5b2e06cc5e3365ee272810af65ebc102304bce4fa8c4b -SIZE (minecraft-client/1.7.5/Grass.png) = 12586 +SHA256 (minecraft-client/1.7.9/Minecraft.jar) = e8d90b2637b141b556670d8460d317aadb6e4f2e644e519995c428800b25f212 +SIZE (minecraft-client/1.7.9/Minecraft.jar) = 280212 +SHA256 (minecraft-client/1.7.9/Grass.png) = 438c0f63e379e92af1b5b2e06cc5e3365ee272810af65ebc102304bce4fa8c4b +SIZE (minecraft-client/1.7.9/Grass.png) = 12586 Modified: head/games/minecraft-client/pkg-plist ============================================================================== --- head/games/minecraft-client/pkg-plist Thu Apr 17 22:24:55 2014 (r351505) +++ head/games/minecraft-client/pkg-plist Thu Apr 17 23:14:24 2014 (r351506) @@ -1,5 +1,4 @@ bin/minecraft-client -%%NATIVE%%%%DATADIR%%/lwjgl-native-libs.jar %%DATADIR%%/Minecraft.jar share/pixmaps/minecraft-client.png @dirrm %%DATADIR%%