4 files changed, 23 insertions, 21 deletions

diff --git a/games/lwjgl/Makefile b/games/lwjgl/Makefile
index 873a4e26c92c..e69885d77911 100644
--- a/games/lwjgl/Makefile
+++ b/games/lwjgl/Makefile
@@ -2,17 +2,16 @@
 # $FreeBSD$
 
 PORTNAME=	lwjgl
-DISTVERSION=	2.9.0
+DISTVERSION=	2.9.1
 CATEGORIES=	games java
 MASTER_SITES=	SF/java-game-lib/Official%20Releases/${PORTNAME:U}%20${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-source-${DISTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	games@FreeBSD.org
 COMMENT=	Lightweight Java Game Library
 
-LICENSE=	BSD
-LICENSE_FILE=	${WRKSRC}/${DISTNAME}/doc/LICENSE
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${JAVALIBDIR}/jutils/jutils.jar:${PORTSDIR}/games/jutils \
 		${JAVALIBDIR}/jinput/jinput.jar:${PORTSDIR}/games/jinput
@@ -23,10 +22,10 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 
 USES=		dos2unix zip:infozip
+DOS2UNIX_REGEX= .*.[^jp][^an][^rg]$
 USE_JAVA=	yes
 USE_LDCONFIG=	yes
-DOS2UNIX_REGEX=	.*.[^j][^a][^r]$
-JAVA_VERSION=	1.6+
+JAVA_VERSION=	1.7+
 JAVA_OS=	native
 JAVA_VENDOR=	openjdk
 USE_ANT=	yes
@@ -52,21 +51,24 @@ PLIST_FILES+=	lib/${PORTNAME}${PORTVERSION}/lib${PORTNAME}64.so
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,PREFIX,${PREFIX},g' \
-		-e '/executable/s/gcc/${CC}/g' \
+	@${REINPLACE_CMD} -e 's|PREFIX|${PREFIX}|g' \
+		-e '/executable/s/cc/${CC}/g' \
 		${WRKSRC}/platform_build/bsd_ant/build.xml
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}
 .for _jar in ${PLIST_FILES:M*.jar}
-	${INSTALL_DATA} ${WRKSRC}/libs/${_jar:T} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/libs/${_jar:T} \
+		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION}
 .if ${ARCH} == i386
-	${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION}
+	${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}.so \
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION}
 .endif
 .if ${ARCH} == amd64
-	${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}64.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION}
+	${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}64.so \
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/games/lwjgl/distinfo b/games/lwjgl/distinfo
index 1b76dfd4b28e..b2dafcd990c3 100644
--- a/games/lwjgl/distinfo
+++ b/games/lwjgl/distinfo
@@ -1,4 +1,4 @@
-SHA256 (lwjgl-2.9.0.zip) = b7baed854d8798048d5a96cff3b58bb050c9bf105c151ff5be461677cd5d7b7f
-SIZE (lwjgl-2.9.0.zip) = 5786081
-SHA256 (lwjgl-source-2.9.0.zip) = 8c7d978ee1c3c5d4a3f8fc8f9774cc9f1b3a371f95ed48bebd4bde8f7fe648ca
-SIZE (lwjgl-source-2.9.0.zip) = 2975604
+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
diff --git a/games/lwjgl/files/patch-build.xml b/games/lwjgl/files/patch-build.xml
index 925153835cff..ceb09bb87295 100644
--- a/games/lwjgl/files/patch-build.xml
+++ b/games/lwjgl/files/patch-build.xml
@@ -1,5 +1,5 @@
---- build.xml.orig
-+++ build.xml
+--- ./build.xml.orig	2014-04-04 18:45:10.000000000 +0200
++++ ./build.xml	2014-04-04 18:52:45.323108911 +0200
 @@ -7,7 +7,6 @@
  	<import file="platform_build/build-applet.xml"/>
  	<import file="platform_build/build-webstart.xml"/>
diff --git a/games/lwjgl/files/patch-platform_build__bsd_ant__build.xml b/games/lwjgl/files/patch-platform_build__bsd_ant__build.xml
index f6c8403978c1..ffef04830904 100644
--- a/games/lwjgl/files/patch-platform_build__bsd_ant__build.xml
+++ b/games/lwjgl/files/patch-platform_build__bsd_ant__build.xml
@@ -1,11 +1,11 @@
---- platform_build/bsd_ant/build.xml.orig
-+++ platform_build/bsd_ant/build.xml
+--- ./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
 @@ -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/X11R6/lib -L/usr/X11/lib -L/usr/local/lib -lm -lX11 -lXext -lXcursor -lXrandr -pthread -L${java.home}/lib/i386 -ljawt" />
--    <property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -L/usr/local/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -pthread -L${java.home}/lib/amd64 -ljawt" />
+-    <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="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>