From owner-svn-ports-head@FreeBSD.ORG Sun Dec 9 00:36:50 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 947C8487; Sun, 9 Dec 2012 00:36:50 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6D0178FC12; Sun, 9 Dec 2012 00:36:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB90aoPG050997; Sun, 9 Dec 2012 00:36:50 GMT (envelope-from jhale@svn.freebsd.org) Received: (from jhale@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB90angu050994; Sun, 9 Dec 2012 00:36:49 GMT (envelope-from jhale@svn.freebsd.org) Message-Id: <201212090036.qB90angu050994@svn.freebsd.org> From: "Jason E. Hale" Date: Sun, 9 Dec 2012 00:36:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308500 - 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.14 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: Sun, 09 Dec 2012 00:36:50 -0000 Author: jhale Date: Sun Dec 9 00:36:49 2012 New Revision: 308500 URL: http://svnweb.freebsd.org/changeset/ports/308500 Log: - Update to 1.4.5 - Make NATIVE_LIBS option default to avoid Linux JDK - Improve startup script to better handle updates to games/lwjgl - Store unversioned distfiles in a versioned DIST_SUBDIR - Fix JAVA_VENDOR typo - Install icon in a better location - Whitespace cleanup - Trim Makefile header PR: ports/173842 Submitted by: 4721@hushmail.com Approved by: maintainer timeout (2 weeks) Feature safe: yes Modified: head/games/minecraft-client/Makefile (contents, props changed) head/games/minecraft-client/distinfo (contents, props changed) head/games/minecraft-client/pkg-plist (contents, props changed) Modified: head/games/minecraft-client/Makefile ============================================================================== --- head/games/minecraft-client/Makefile Sun Dec 9 00:26:02 2012 (r308499) +++ head/games/minecraft-client/Makefile Sun Dec 9 00:36:49 2012 (r308500) @@ -1,40 +1,42 @@ -# New ports collection makefile for: minecraft-client -# Date created: 12 November 2011 -# Whom: Martin Kropfinger -# +# Created by: Martin Kropfinger # $FreeBSD$ -# PORTNAME= minecraft-client -PORTVERSION= 1.0.0 +PORTVERSION= 1.4.5 CATEGORIES= games java MASTER_SITES= http://s3.amazonaws.com/MinecraftDownload/launcher/:minecraft \ - http://www.minecraftwiki.net/images/c/c5/:icon + http://media-mcw.cursecdn.com/c/c5/:icon DISTNAME= minecraft DISTFILES= minecraft.jar:minecraft \ - Grass.png:icon + Grass.png:icon +DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} EXTRACT_ONLY= MAINTAINER= freebsd@rakor-net.de COMMENT= Client for the block building game OPTIONS_DEFINE= NATIVE_LIBS +OPTIONS_DEFAULT= NATIVE_LIBS NATIVE_LIBS_DESC= Enable native libs support -.include - WRKSRC= ${WRKDIR} NO_BUILD= yes USE_JAVA= yes JAVA_VERSION= 1.6 -DESKTOP_ENTRIES= "Minecraft" "Block building game" "${DATADIR}/Grass.png" "minecraft-client" "Application;Game;" false +DESKTOP_ENTRIES="Minecraft" \ + "Block building game" \ + "${PORTNAME}" \ + "${PORTNAME}" \ + "Application;Game;" \ + false + +.include .if ${PORT_OPTIONS:MNATIVE_LIBS} USE_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_VENDER= openjdk +JAVA_VENDOR= openjdk .else JAVA_OS= linux JAVA_VENDOR= sun @@ -54,7 +56,7 @@ do-install: ${ECHO_CMD} "${ECHO_MSG} \" the symlinks before doing any upgrade: \"" >> ${WRKDIR}/minecraft-client ${ECHO_CMD} "${ECHO_MSG} \"\"" >> ${WRKDIR}/minecraft-client ${ECHO_CMD} "${ECHO_MSG} \"find ~/.minecraft/bin -type l -print0 | \ - xargs -0 rm -v\"" >> ${WRKDIR}/minecraft-client + ${XARGS} -0 ${RM} -v\"" >> ${WRKDIR}/minecraft-client ${ECHO_CMD} "${ECHO_MSG} \"\"" >> ${WRKDIR}/minecraft-client ${ECHO_CMD} "MINECRAFT_DIR=\"\$${HOME}/.minecraft\"" >> ${WRKDIR}/minecraft-client ${ECHO_CMD} "BIN=\"\$${MINECRAFT_DIR}/bin\"" >> ${WRKDIR}/minecraft-client @@ -74,7 +76,7 @@ do-install: ${ECHO_CMD} "" >> ${WRKDIR}/minecraft-client ${ECHO_CMD} "for j in jinput.jar lwjgl.jar lwjgl_util.jar" >> ${WRKDIR}/minecraft-client ${ECHO_CMD} "do" >> ${WRKDIR}/minecraft-client - ${ECHO_CMD} " if [ -f \$${BIN}/\$${j} -a ! -L \$${BIN}/\$${j} ]" >> ${WRKDIR}/minecraft-client + ${ECHO_CMD} " if [ ! -f \$${BIN}/\$${j} -o ! -L \$${BIN}/\$${j} ]" >> ${WRKDIR}/minecraft-client ${ECHO_CMD} " then" >> ${WRKDIR}/minecraft-client ${ECHO_CMD} " target=\$$(${BASENAME} \$${j} .jar)" >> ${WRKDIR}/minecraft-client ${ECHO_CMD} " eval target=\\\$$\$${target}" >> ${WRKDIR}/minecraft-client @@ -84,10 +86,11 @@ do-install: ${ECHO_CMD} "" >> ${WRKDIR}/minecraft-client ${ECHO_CMD} "lwjgl=\"\$${NATIVES}/liblwjgl.so\"" >> ${WRKDIR}/minecraft-client ${ECHO_CMD} "lwjgl64=\"\$${NATIVES}/liblwjgl64.so\"" >> ${WRKDIR}/minecraft-client - ${ECHO_CMD} "if [ -f \$${lwjgl} -a ! -L \$${lwjgl} -a \ - -f \$${lwjgl64} -a ! -L \$${lwjgl64} ]; then" >> ${WRKDIR}/minecraft-client + ${ECHO_CMD} "if [ \( -f \$${lwjgl} -a ! -L \$${lwjgl} -a \ + -f \$${lwjgl64} -a ! -L \$${lwjgl64} \) -o \ + \( ! -f \$${lwjgl} -a ! -f \$${lwjgl64} \) ]; then" >> ${WRKDIR}/minecraft-client ${ECHO_CMD} " LIBLWJGL=\$$(${FIND} ${LOCALBASE}/lib/lwjgl* \ - -name 'liblwjgl*.so' | ${HEAD} -n 1)" >> ${WRKDIR}/minecraft-client + -name 'liblwjgl*.so' | ${HEAD} -n 1)" >> ${WRKDIR}/minecraft-client ${ECHO_CMD} " LWJGLSO=\$$(${ECHO} \$${LIBJGL} | ${GREP} \"64\")" >> ${WRKDIR}/minecraft-client ${ECHO_CMD} " if [ \"x\$${LIBWJGLSO}\" = \"x\" ]; then" >> ${WRKDIR}/minecraft-client ${ECHO_CMD} " ${LN} -snf \$${LIBLWJGL} \$${lwjgl}" >> ${WRKDIR}/minecraft-client @@ -102,8 +105,8 @@ do-install: ${ECHO_CMD} "exec java -Xmx1024M -Xms1024M -jar ${DATADIR}/minecraft.jar" >> ${WRKDIR}/minecraft-client .endif ${MKDIR} ${DATADIR} - ${INSTALL_DATA} "${DISTDIR}/minecraft.jar" ${DATADIR}/ - ${INSTALL_DATA} "${DISTDIR}/Grass.png" ${DATADIR}/ - ${INSTALL_SCRIPT} "${WRKDIR}/minecraft-client" ${PREFIX}/bin/ + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/minecraft.jar ${DATADIR}/ + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Grass.png ${PREFIX}/share/pixmaps/minecraft-client.png + ${INSTALL_SCRIPT} ${WRKDIR}/minecraft-client ${PREFIX}/bin/ .include Modified: head/games/minecraft-client/distinfo ============================================================================== --- head/games/minecraft-client/distinfo Sun Dec 9 00:26:02 2012 (r308499) +++ head/games/minecraft-client/distinfo Sun Dec 9 00:36:49 2012 (r308500) @@ -1,4 +1,4 @@ -SHA256 (minecraft.jar) = d275a1895b5d18e5a913d637d941cc1df83097add76103c2e02e4e513ceb982a -SIZE (minecraft.jar) = 89406 -SHA256 (Grass.png) = 438c0f63e379e92af1b5b2e06cc5e3365ee272810af65ebc102304bce4fa8c4b -SIZE (Grass.png) = 12586 +SHA256 (minecraft-client/1.4.5/minecraft.jar) = 92db974aa759a3f17f3cd61550fa5010e335c57dd813dad9e39b9cc013420a49 +SIZE (minecraft-client/1.4.5/minecraft.jar) = 81938 +SHA256 (minecraft-client/1.4.5/Grass.png) = 438c0f63e379e92af1b5b2e06cc5e3365ee272810af65ebc102304bce4fa8c4b +SIZE (minecraft-client/1.4.5/Grass.png) = 12586 Modified: head/games/minecraft-client/pkg-plist ============================================================================== --- head/games/minecraft-client/pkg-plist Sun Dec 9 00:26:02 2012 (r308499) +++ head/games/minecraft-client/pkg-plist Sun Dec 9 00:36:49 2012 (r308500) @@ -1,4 +1,4 @@ -share/minecraft-client/minecraft.jar -share/minecraft-client/Grass.png bin/minecraft-client -@dirrm share/minecraft-client +%%DATADIR%%/minecraft.jar +share/pixmaps/minecraft-client.png +@dirrm %%DATADIR%%