svn commit: r404399 - in head/games/lwjgl: . files

[Jason Unovitch]

Author: junovitch
Date: Fri Dec 25 01:54:57 2015
New Revision: 404399
URL: https://svnweb.freebsd.org/changeset/ports/404399

Log:
  games/lwjgl: update 2.9.1 -> 2.9.3
  
  - Set JAVA_VERSION from 1.7 to 1.7+
  - Update a patch, fix other patch to be `make makepatch` compliant
  
  PR:		205435
  Submitted by:	Ilia Skalozubov <freebsd at skinc.ru>
  Approved by:	unmaintained

Modified:
  head/games/lwjgl/Makefile
  head/games/lwjgl/distinfo
  head/games/lwjgl/files/patch-build.xml
  head/games/lwjgl/files/patch-platform_build__bsd_ant__build.xml

Modified: head/games/lwjgl/Makefile
==============================================================================
--- head/games/lwjgl/Makefile	Fri Dec 25 01:31:09 2015	(r404398)
+++ head/games/lwjgl/Makefile	Fri Dec 25 01:54:57 2015	(r404399)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lwjgl
-DISTVERSION=	2.9.1
+DISTVERSION=	2.9.3
 CATEGORIES=	games java
 MASTER_SITES=	SF/java-game-lib/Official%20Releases/${PORTNAME:tu}%20${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -25,7 +25,7 @@ USES=		dos2unix zip
 DOS2UNIX_REGEX= .*.[^jp][^an][^rg]$
 USE_JAVA=	yes
 USE_LDCONFIG=	yes
-JAVA_VERSION=	1.7
+JAVA_VERSION=	1.7+
 JAVA_OS=	native
 JAVA_VENDOR=	openjdk
 USE_ANT=	yes

Modified: head/games/lwjgl/distinfo
==============================================================================
--- head/games/lwjgl/distinfo	Fri Dec 25 01:31:09 2015	(r404398)
+++ head/games/lwjgl/distinfo	Fri Dec 25 01:54:57 2015	(r404399)
@@ -1,4 +1,4 @@
-SHA256 (lwjgl-2.9.1.zip) = 52543c14469055c49327d3cbeb62dc7c615a966825bb9856c3c35e2560aebe77
-SIZE (lwjgl-2.9.1.zip) = 5837483
-SHA256 (lwjgl-source-2.9.1.zip) = b341e6dfa1a453e48b58cecb4c0c78b0dc21629a3c898bb3bdd6a912b0eaff87
-SIZE (lwjgl-source-2.9.1.zip) = 3073506
+SHA256 (lwjgl-2.9.3.zip) = 4354432ca5da11d3ec57a09228918b995f3de2761c975e68fa27a5fe0fb62f4c
+SIZE (lwjgl-2.9.3.zip) = 7805314
+SHA256 (lwjgl-source-2.9.3.zip) = 098696a3752321979e6b1dc798c694d4d3daf64a71217ee8d7b04123b5b18a5a
+SIZE (lwjgl-source-2.9.3.zip) = 3183783

Modified: head/games/lwjgl/files/patch-build.xml
==============================================================================
--- head/games/lwjgl/files/patch-build.xml	Fri Dec 25 01:31:09 2015	(r404398)
+++ head/games/lwjgl/files/patch-build.xml	Fri Dec 25 01:54:57 2015	(r404399)
@@ -1,5 +1,5 @@
---- ./build.xml.orig	2014-04-04 18:45:10.000000000 +0200
-+++ ./build.xml	2014-04-04 18:52:45.323108911 +0200
+--- build.xml.orig	2014-04-04 16:45:10 UTC
++++ build.xml
 @@ -7,7 +7,6 @@
  	<import file="platform_build/build-applet.xml"/>
  	<import file="platform_build/build-webstart.xml"/>

Modified: head/games/lwjgl/files/patch-platform_build__bsd_ant__build.xml
==============================================================================
--- head/games/lwjgl/files/patch-platform_build__bsd_ant__build.xml	Fri Dec 25 01:31:09 2015	(r404398)
+++ head/games/lwjgl/files/patch-platform_build__bsd_ant__build.xml	Fri Dec 25 01:54:57 2015	(r404399)
@@ -1,13 +1,14 @@
---- ./platform_build/bsd_ant/build.xml.orig	2014-04-04 18:45:10.411142656 +0200
-+++ ./platform_build/bsd_ant/build.xml	2014-04-04 18:51:47.021109774 +0200
+--- platform_build/bsd_ant/build.xml.orig	2015-12-19 18:22:18 UTC
++++ platform_build/bsd_ant/build.xml
+
 @@ -4,8 +4,8 @@
  	<property name="native" location="../../src/native"/>
  	<property name="libname32" value="liblwjgl.so"/>
  	<property name="libname64" value="liblwjgl64.so"/>
--    <property name="libs32" value="-L/usr/local/lib -lm -lX11 -lXext -lXcursor -lXrandr -pthread -L${java.home}/lib/i386 -ljawt" />
--    <property name="libs64" value="-L/usr/local/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -pthread -L${java.home}/lib/amd64 -ljawt" />
-+    <property name="libs32" value="-LPREFIX/lib -lm -lX11 -lXext -lXcursor -lXrandr -pthread -L${java.home}/lib/i386 -ljawt" />
-+    <property name="libs64" value="-LPREFIX/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -pthread -L${java.home}/lib/amd64 -ljawt" />
+-	<property name="libs32" value="-L/usr/X11R6/lib -L/usr/local/lib -lm -lX11 -lXext -lXcursor -lXrandr -pthread -L${java.home}/lib/i386 -ljawt" />
+-	<property name="libs64" value="-L/usr/X11R6/lib -L/usr/local/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -pthread -L${java.home}/lib/amd64 -ljawt" />
++	<property name="libs32" value="-LPREFIX/lib -lm -lX11 -lXext -lXcursor -lXrandr -pthread -L${java.home}/lib/i386 -ljawt" />
++	<property name="libs64" value="-LPREFIX/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -pthread -L${java.home}/lib/amd64 -ljawt" />
      <property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
  
  	<target name="clean">