Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Jan 2013 19:30:01 GMT
From:      dfilter@FreeBSD.ORG (dfilter service)
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/174701: commit references a PR
Message-ID:  <201301161930.r0GJU1a1053501@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/174701; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/174701: commit references a PR
Date: Wed, 16 Jan 2013 19:24:27 +0000 (UTC)

 Author: crees
 Date: Wed Jan 16 19:24:14 2013
 New Revision: 310515
 URL: http://svnweb.freebsd.org/changeset/ports/310515
 
 Log:
   * update port to latest version
   * handle updates to symlinked files better
   * add help notice for upgrades
   * handle libopenal.so/libopenal64.so in startup script
   
   PR:		ports/174701
   Submitted by:	4721
   Approved by:	maintainer timeout (freebsd@rakor-net.de, 50 days)
 
 Modified:
   head/games/minecraft-client/Makefile
   head/games/minecraft-client/distinfo
 
 Modified: head/games/minecraft-client/Makefile
 ==============================================================================
 --- head/games/minecraft-client/Makefile	Wed Jan 16 19:16:09 2013	(r310514)
 +++ head/games/minecraft-client/Makefile	Wed Jan 16 19:24:14 2013	(r310515)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	minecraft-client
 -PORTVERSION=	1.4.5
 +PORTVERSION=	1.4.6
  CATEGORIES=	games java
  MASTER_SITES=	http://s3.amazonaws.com/MinecraftDownload/launcher/:minecraft \
  		http://media-mcw.cursecdn.com/c/c5/:icon
 @@ -58,6 +58,9 @@ do-install:
  	${ECHO_CMD} "${ECHO_MSG} \"find ~/.minecraft/bin -type l -print0 | \
  			${XARGS} -0 ${RM} -v\""                                 >> ${WRKDIR}/minecraft-client
  	${ECHO_CMD} "${ECHO_MSG} \"\""                                          >> ${WRKDIR}/minecraft-client
 +	${ECHO_CMD} "${ECHO_MSG} \"After deleting symlinks, you will have to\"" >> ${WRKDIR}/minecraft-client
 +	${ECHO_CMD} "${ECHO_MSG} \"force update to get replacements of all\""   >> ${WRKDIR}/minecraft-client
 +	${ECHO_CMD} "${ECHO_MSG} \"files that are normally used via symlinks.\"">> ${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
 @@ -76,7 +79,8 @@ 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} -o ! -L \$${BIN}/\$${j} ]" >> ${WRKDIR}/minecraft-client
 +	${ECHO_CMD} "  if [ \( -f \$${BIN}/\$${j} -a ! -L \$${BIN}/\$${j} \) -o \
 +			\( -L \$${BIN}/\$${j} -a ! -f \$${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
 @@ -88,7 +92,8 @@ do-install:
  	${ECHO_CMD} "lwjgl64=\"\$${NATIVES}/liblwjgl64.so\""                >> ${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
 +			\( -L \$${lwjgl} -a ! -f \$${lwjgl} -a \
 +			-L \$${lwjgl64} -a ! -f \$${lwjgl64} \) ]; then" >> ${WRKDIR}/minecraft-client
  	${ECHO_CMD} "  LIBLWJGL=\$$(${FIND} ${LOCALBASE}/lib/lwjgl* \
  			-name 'liblwjgl*.so' | ${HEAD} -n 1)"               >> ${WRKDIR}/minecraft-client
  	${ECHO_CMD} "  LWJGLSO=\$$(${ECHO} \$${LIBJGL} | ${GREP} \"64\")"   >> ${WRKDIR}/minecraft-client
 @@ -100,6 +105,17 @@ do-install:
  	${ECHO_CMD} "    ${LN} -snf liblwjgl64.so \$${lwgjl}"               >> ${WRKDIR}/minecraft-client
  	${ECHO_CMD} "  fi"                                                  >> ${WRKDIR}/minecraft-client
  	${ECHO_CMD} "fi"                                                    >> ${WRKDIR}/minecraft-client
 +	${ECHO_CMD} ""                                                      >> ${WRKDIR}/minecraft-client
 +	${ECHO_CMD} "libopenal=\"\$${NATIVES}/libopenal.so\""               >> ${WRKDIR}/minecraft-client
 +	${ECHO_CMD} "libopenal64=\"\$${NATIVES}/libopenal64.so\""           >> ${WRKDIR}/minecraft-client
 +	${ECHO_CMD} "if [ \( -f \$${libopenal} -a ! -L \$${libopenal} -a \
 +			-f \$${libopenal64} -a ! -L \$${libopenal64} \) -o \
 +			\( -L \$${libopenal} -a ! -f \$${libopenal} -a \
 +			-L \$${libopenal64} -a ! -f \$${libopenal64} \) ]; then"  >> ${WRKDIR}/minecraft-client
 +	${ECHO_CMD} "  ${LN} -snf ${LOCALBASE}/lib/libopenal.so \$${libopenal}"   >> ${WRKDIR}/minecraft-client
 +	${ECHO_CMD} "  ${LN} -snf ${LOCALBASE}/lib/libopenal.so \$${libopenal64}" >> ${WRKDIR}/minecraft-client
 +	${ECHO_CMD} "fi"                                                    >> ${WRKDIR}/minecraft-client
 +	${ECHO_CMD} ""                                                      >> ${WRKDIR}/minecraft-client
  	${ECHO_CMD} "exec java \$${JAVA_OPT} -jar ${DATADIR}/minecraft.jar" >> ${WRKDIR}/minecraft-client
  .else
  	${ECHO_CMD} "exec java -Xmx1024M -Xms1024M -jar ${DATADIR}/minecraft.jar" >>  ${WRKDIR}/minecraft-client
 
 Modified: head/games/minecraft-client/distinfo
 ==============================================================================
 --- head/games/minecraft-client/distinfo	Wed Jan 16 19:16:09 2013	(r310514)
 +++ head/games/minecraft-client/distinfo	Wed Jan 16 19:24:14 2013	(r310515)
 @@ -1,4 +1,4 @@
 -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
 +SHA256 (minecraft-client/1.4.6/minecraft.jar) = 92db974aa759a3f17f3cd61550fa5010e335c57dd813dad9e39b9cc013420a49
 +SIZE (minecraft-client/1.4.6/minecraft.jar) = 81938
 +SHA256 (minecraft-client/1.4.6/Grass.png) = 438c0f63e379e92af1b5b2e06cc5e3365ee272810af65ebc102304bce4fa8c4b
 +SIZE (minecraft-client/1.4.6/Grass.png) = 12586
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 



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