Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Nov 2012 18:00:45 GMT
From:      "4721@hushmail.com" <4721@hushmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/173842: [patch] upgrade games/minecraft-client to 1.4.5
Message-ID:  <201211221800.qAMI0jt5047768@red.freebsd.org>
Resent-Message-ID: <201211221810.qAMIA0Ka003265@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         173842
>Category:       ports
>Synopsis:       [patch] upgrade games/minecraft-client to 1.4.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 22 18:10:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     4721@hushmail.com
>Release:        
>Organization:
>Environment:
>Description:
* update port to 1.4.5
* handle dependency upgrades better
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: games/minecraft-client/distinfo
===================================================================
--- games/minecraft-client/distinfo	(revision 307410)
+++ games/minecraft-client/distinfo	(working copy)
@@ -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
Index: games/minecraft-client/pkg-plist
===================================================================
--- games/minecraft-client/pkg-plist	(revision 307410)
+++ games/minecraft-client/pkg-plist	(working copy)
@@ -1,4 +1,4 @@
-share/minecraft-client/minecraft.jar
-share/minecraft-client/Grass.png
+%%DATADIR%%/minecraft.jar
+share/pixmaps/minecraft-client.png
 bin/minecraft-client
-@dirrm share/minecraft-client
+@dirrm %%DATADIR%%
Index: games/minecraft-client/Makefile
===================================================================
--- games/minecraft-client/Makefile	(revision 307410)
+++ games/minecraft-client/Makefile	(working copy)
@@ -1,24 +1,21 @@
-# New ports collection makefile for:   minecraft-client
-# Date created:        12 November 2011
-# Whom:                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
+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 <bsd.port.options.mk>
@@ -28,13 +25,19 @@
 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
 
 .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,8 +57,8 @@
 	${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
-	${ECHO_CMD} "${ECHO_MSG} \"\""                                          >> ${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
 	${ECHO_CMD} "NATIVES=\"\$${MINECRAFT_DIR}/bin/natives\""            >> ${WRKDIR}/minecraft-client
@@ -74,7 +77,7 @@
 	${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 +87,11 @@
 	${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
@@ -103,7 +107,7 @@
 .endif
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} "${DISTDIR}/minecraft.jar" ${DATADIR}/
-	${INSTALL_DATA} "${DISTDIR}/Grass.png" ${DATADIR}/
+	${INSTALL_DATA} "${DISTDIR}/Grass.png" ${PREFIX}/share/pixmaps/minecraft-client.png
 	${INSTALL_SCRIPT} "${WRKDIR}/minecraft-client" ${PREFIX}/bin/
 
 .include <bsd.port.mk>


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211221800.qAMI0jt5047768>