From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 22 17:40:00 2012 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BB39EC17 for ; Thu, 22 Nov 2012 17:40:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 8DEC38FC14 for ; Thu, 22 Nov 2012 17:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qAMHe0tc002372 for ; Thu, 22 Nov 2012 17:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qAMHe0Zr002371; Thu, 22 Nov 2012 17:40:00 GMT (envelope-from gnats) Resent-Date: Thu, 22 Nov 2012 17:40:00 GMT Resent-Message-Id: <201211221740.qAMHe0Zr002371@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "4721@hushmail.com" <4721@hushmail.com> Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1DE57BB4 for ; Thu, 22 Nov 2012 17:34:14 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id EB6778FC0C for ; Thu, 22 Nov 2012 17:34:13 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qAMHYD5C011862 for ; Thu, 22 Nov 2012 17:34:13 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id qAMHYDb9011860; Thu, 22 Nov 2012 17:34:13 GMT (envelope-from nobody) Message-Id: <201211221734.qAMHYDb9011860@red.freebsd.org> Date: Thu, 22 Nov 2012 17:34:13 GMT From: "4721@hushmail.com" <4721@hushmail.com> To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/173839: [patch] upgrade graphics/lwjgl to 2.8.5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2012 17:40:00 -0000 >Number: 173839 >Category: ports >Synopsis: [patch] upgrade graphics/lwjgl to 2.8.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 17:40:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: 4721@hushmail.com >Release: >Organization: >Environment: >Description: removed files: D games/lwjgl/files/patch-platform_build__build-applet.xml D games/lwjgl/files/patch-src__java__org__lwjgl__MacOSXSysImplementation.java D games/lwjgl/files/patch-src__java__org__lwjgl__opengl__MacOSXDisplay.java * update port to latest version * remove several unnecessary patches by fixing build failure in a better way * add LICENSE * obey PREFIX >How-To-Repeat: >Fix: Patch attached with submission follows: Index: games/lwjgl/distinfo =================================================================== --- games/lwjgl/distinfo (revision 307410) +++ games/lwjgl/distinfo (working copy) @@ -1,2 +1,4 @@ -SHA256 (lwjgl-source-2.7.1.zip) = f6805e7ec4f00198b772063d0df5e2063f44ce839f615677b9bc68ad037644b6 -SIZE (lwjgl-source-2.7.1.zip) = 2149031 +SHA256 (lwjgl-2.8.5.zip) = 680e4c9f84ca89fad844820019a9134c4643a00a44e3d6a02defb3d38700492c +SIZE (lwjgl-2.8.5.zip) = 5550071 +SHA256 (lwjgl-source-2.8.5.zip) = b52f8885fb5a2cb9cd2528a9492164fccdf63031fbafb2ac96fd0f271fcbb130 +SIZE (lwjgl-source-2.8.5.zip) = 2969449 Index: games/lwjgl/files/patch-platform_build__build-applet.xml =================================================================== --- games/lwjgl/files/patch-platform_build__build-applet.xml (revision 307410) +++ games/lwjgl/files/patch-platform_build__build-applet.xml (working copy) @@ -1,21 +0,0 @@ -Obtained from http://foo.poildetroll.net/minecraft/lwjgl-2.7.1-freebsd.diff - - ---- ./platform_build/build-applet.xml.orig 2011-02-06 19:22:46.000000000 +0000 -+++ ./platform_build/build-applet.xml 2012-03-26 18:14:03.104373501 +0000 -@@ -1,7 +1,7 @@ - - - -- -+ - - - -@@ -144,4 +144,4 @@ - - - -- -\ No newline at end of file -+ Index: games/lwjgl/files/patch-src__java__org__lwjgl__MacOSXSysImplementation.java =================================================================== --- games/lwjgl/files/patch-src__java__org__lwjgl__MacOSXSysImplementation.java (revision 307410) +++ games/lwjgl/files/patch-src__java__org__lwjgl__MacOSXSysImplementation.java (working copy) @@ -1,23 +0,0 @@ -Obtained from http://foo.poildetroll.net/minecraft/lwjgl-2.7.1-freebsd.diff - - ---- ./src/java/org/lwjgl/MacOSXSysImplementation.java.orig 2011-02-06 19:23:32.000000000 +0000 -+++ ./src/java/org/lwjgl/MacOSXSysImplementation.java 2012-03-26 18:14:03.135376460 +0000 -@@ -33,7 +33,7 @@ - - import java.awt.Toolkit; - --import com.apple.eio.FileManager; -+// import com.apple.eio.FileManager; - - /** - * -@@ -55,7 +55,7 @@ - - public boolean openURL(String url) { - try { -- FileManager.openURL(url); -+ // FileManager.openURL(url); - return true; - } catch (Exception e) { - LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e); Index: games/lwjgl/files/patch-src__java__org__lwjgl__opengl__MacOSXDisplay.java =================================================================== --- games/lwjgl/files/patch-src__java__org__lwjgl__opengl__MacOSXDisplay.java (revision 307410) +++ games/lwjgl/files/patch-src__java__org__lwjgl__opengl__MacOSXDisplay.java (working copy) @@ -1,32 +0,0 @@ -Obtained from http://foo.poildetroll.net/minecraft/lwjgl-2.7.1-freebsd.diff - - ---- ./src/java/org/lwjgl/opengl/MacOSXDisplay.java.orig 2011-02-06 19:23:26.000000000 +0000 -+++ ./src/java/org/lwjgl/opengl/MacOSXDisplay.java 2012-03-26 18:14:03.153375501 +0000 -@@ -54,9 +54,9 @@ - import org.lwjgl.LWJGLException; - import org.lwjgl.LWJGLUtil; - --import com.apple.eawt.Application; --import com.apple.eawt.ApplicationAdapter; --import com.apple.eawt.ApplicationEvent; -+// import com.apple.eawt.Application; -+// import com.apple.eawt.ApplicationAdapter; -+// import com.apple.eawt.ApplicationEvent; - - import static org.lwjgl.opengl.GL11.*; - -@@ -79,11 +79,11 @@ - try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws Exception { -- Application.getApplication().addApplicationListener(new ApplicationAdapter() { -+/* Application.getApplication().addApplicationListener(new ApplicationAdapter() { - public void handleQuit(ApplicationEvent event) { - doHandleQuit(); - } -- }); -+ }); */ - return null; - } - }); Index: games/lwjgl/files/patch-build.xml =================================================================== --- games/lwjgl/files/patch-build.xml (revision 307410) +++ games/lwjgl/files/patch-build.xml (working copy) @@ -1,59 +1,14 @@ -Obtained from http://foo.poildetroll.net/minecraft/lwjgl-2.7.1-freebsd.diff - - ---- ./build.xml.orig 2011-02-06 19:23:40.000000000 +0000 -+++ ./build.xml 2012-03-26 18:14:03.079373854 +0000 -@@ -246,7 +246,7 @@ - - +--- build.xml.orig ++++ build.xml +@@ -7,7 +7,6 @@ + + + +- -- -+ - - - -@@ -293,13 +293,13 @@ - - - -- -+ - - - -@@ -314,13 +314,13 @@ - - - -- -+ - - lwjgl.java.windows.version = ${lwjgl.java.windows.version} - lwjgl.native.windows.version = ${lwjgl.native.windows.version} -@@ -380,7 +380,10 @@ + + +@@ -463,7 +462,10 @@ @@ -65,7 +20,7 @@ -@@ -493,6 +496,7 @@ +@@ -604,6 +606,7 @@ Index: games/lwjgl/files/patch-platform_build__linux_ant__build.xml =================================================================== --- games/lwjgl/files/patch-platform_build__linux_ant__build.xml (revision 307410) +++ games/lwjgl/files/patch-platform_build__linux_ant__build.xml (working copy) @@ -1,16 +1,13 @@ -Obtained from http://foo.poildetroll.net/minecraft/lwjgl-2.7.1-freebsd.diff - - ---- ./platform_build/linux_ant/build.xml.orig 2011-02-06 19:22:44.000000000 +0000 -+++ ./platform_build/linux_ant/build.xml 2012-03-26 18:14:03.120371531 +0000 +--- platform_build/linux_ant/build.xml.orig ++++ platform_build/linux_ant/build.xml @@ -4,8 +4,8 @@ - - -+ -+ ++ ++ @@ -43,33 +40,29 @@ -@@ -69,11 +76,14 @@ - - - -+ +@@ -72,10 +79,12 @@ + + -+ + ++ - - -@@ -95,11 +105,14 @@ - - - -+ + + +@@ -104,10 +113,12 @@ + + -+ + ++ - - + + Index: games/lwjgl/Makefile =================================================================== --- games/lwjgl/Makefile (revision 307410) +++ games/lwjgl/Makefile (working copy) @@ -1,19 +1,18 @@ -# New ports collection makefile for: jinput -# Date created: Mar 25 2012 -# Whom: loader -# # $FreeBSD$ -# PORTNAME= lwjgl -DISTVERSION= 2.7.1 +DISTVERSION= 2.8.5 CATEGORIES= games java MASTER_SITES= SF/java-game-lib/Official%20Releases/${PORTNAME:U}%20${PORTVERSION}/ -DISTNAME= ${PORTNAME}-source-${DISTVERSION} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + ${PORTNAME}-source-${DISTVERSION}${EXTRACT_SUFX} MAINTAINER= loader@freebsdmall.com COMMENT= The Lightweight Java Game Library +LICENSE= BSD +LICENSE_FILE= ${WRKSRC}/${DISTNAME}/doc/LICENSE + BUILD_DEPENDS= ${JAVALIBDIR}/jutils/jutils.jar:${PORTSDIR}/games/jutils \ ${JAVALIBDIR}/jinput/jinput.jar:${PORTSDIR}/games/jinput \ ${LOCALBASE}/include/X11/extensions/xf86vmode.h:${PORTSDIR}/x11/libXxf86vm \ @@ -33,11 +32,12 @@ USE_JAVA= yes USE_LDCONFIG= yes USE_DOS2UNIX= yes +DOS2UNIX_REGEX= .*.[^j][^a][^r]$ JAVA_VERSION= 1.6+ JAVA_OS= native JAVA_VENDOR= openjdk USE_ANT= yes -MAKE_ENV+= CLASSPATH=${JAVALIBDIR}/jutils/jutils.jar:${JAVALIBDIR}/jinput/jinput.jar +MAKE_ENV+= CLASSPATH=${JAVALIBDIR}/jutils/jutils.jar:${JAVALIBDIR}/jinput/jinput.jar:${WRKSRC}/${DISTNAME}/jar/ ALL_TARGET= jars compile_native PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}/${PORTNAME}.jar \ @@ -57,6 +57,9 @@ PLIST_FILES+= lib/${PORTNAME}${PORTVERSION}/lib${PORTNAME}64.so .endif +post-patch: + ${REINPLACE_CMD} -e 's,PREFIX,${PREFIX},g' ${WRKSRC}/platform_build/linux_ant/build.xml + do-install: @${ECHO_MSG} -n ">> Install JAR files in ${JAVAJARDIR}/${PORTNAME}/ ..." @${MKDIR} ${JAVAJARDIR}/${PORTNAME} >Release-Note: >Audit-Trail: >Unformatted: