View | Details | Raw Unified | Return to bug 173839
Collapse All | Expand All

(-)games/lwjgl/distinfo (-2 / +4 lines)
Lines 1-2 Link Here
1
SHA256 (lwjgl-source-2.7.1.zip) = f6805e7ec4f00198b772063d0df5e2063f44ce839f615677b9bc68ad037644b6
1
SHA256 (lwjgl-2.8.5.zip) = 680e4c9f84ca89fad844820019a9134c4643a00a44e3d6a02defb3d38700492c
2
SIZE (lwjgl-source-2.7.1.zip) = 2149031
2
SIZE (lwjgl-2.8.5.zip) = 5550071
3
SHA256 (lwjgl-source-2.8.5.zip) = b52f8885fb5a2cb9cd2528a9492164fccdf63031fbafb2ac96fd0f271fcbb130
4
SIZE (lwjgl-source-2.8.5.zip) = 2969449
(-)games/lwjgl/files/patch-platform_build__build-applet.xml (-21 lines)
Lines 1-21 Link Here
1
Obtained from http://foo.poildetroll.net/minecraft/lwjgl-2.7.1-freebsd.diff
2
3
4
--- ./platform_build/build-applet.xml.orig	2011-02-06 19:22:46.000000000 +0000
5
+++ ./platform_build/build-applet.xml	2012-03-26 18:14:03.104373501 +0000
6
@@ -1,7 +1,7 @@
7
 <project name="applet">
8
 
9
 	<!-- Create our packer task -->
10
-	<taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>
11
+	<!-- <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> -->
12
 
13
 	<target name="applet">
14
 		<antcall target="-applet">
15
@@ -144,4 +144,4 @@
16
 			<param name="output" value="applet/advance/solaris_natives.jar.lzma"/>
17
 		</antcall>
18
 	</target>
19
-</project>
20
\ No newline at end of file
21
+</project>
(-)games/lwjgl/files/patch-src__java__org__lwjgl__MacOSXSysImplementation.java (-23 lines)
Lines 1-23 Link Here
1
Obtained from http://foo.poildetroll.net/minecraft/lwjgl-2.7.1-freebsd.diff
2
3
4
--- ./src/java/org/lwjgl/MacOSXSysImplementation.java.orig	2011-02-06 19:23:32.000000000 +0000
5
+++ ./src/java/org/lwjgl/MacOSXSysImplementation.java	2012-03-26 18:14:03.135376460 +0000
6
@@ -33,7 +33,7 @@
7
 
8
 import java.awt.Toolkit;
9
 
10
-import com.apple.eio.FileManager;
11
+// import com.apple.eio.FileManager;
12
 
13
 /**
14
  *
15
@@ -55,7 +55,7 @@
16
 
17
 	public boolean openURL(String url) {
18
 		try {
19
-			FileManager.openURL(url);
20
+			// FileManager.openURL(url);
21
 			return true;
22
 		} catch (Exception e) {
23
 			LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e);
(-)games/lwjgl/files/patch-src__java__org__lwjgl__opengl__MacOSXDisplay.java (-32 lines)
Lines 1-32 Link Here
1
Obtained from http://foo.poildetroll.net/minecraft/lwjgl-2.7.1-freebsd.diff
2
3
4
--- ./src/java/org/lwjgl/opengl/MacOSXDisplay.java.orig	2011-02-06 19:23:26.000000000 +0000
5
+++ ./src/java/org/lwjgl/opengl/MacOSXDisplay.java	2012-03-26 18:14:03.153375501 +0000
6
@@ -54,9 +54,9 @@
7
 import org.lwjgl.LWJGLException;
8
 import org.lwjgl.LWJGLUtil;
9
 
10
-import com.apple.eawt.Application;
11
-import com.apple.eawt.ApplicationAdapter;
12
-import com.apple.eawt.ApplicationEvent;
13
+// import com.apple.eawt.Application;
14
+// import com.apple.eawt.ApplicationAdapter;
15
+// import com.apple.eawt.ApplicationEvent;
16
 
17
 import static org.lwjgl.opengl.GL11.*;
18
 
19
@@ -79,11 +79,11 @@
20
 		try {
21
 			AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
22
 				public Object run() throws Exception {
23
-					Application.getApplication().addApplicationListener(new ApplicationAdapter() {
24
+/*					Application.getApplication().addApplicationListener(new ApplicationAdapter() {
25
 						public void handleQuit(ApplicationEvent event) {
26
 							doHandleQuit();
27
 						}
28
-					});
29
+					}); */
30
 					return null;
31
 				}
32
 			});
(-)games/lwjgl/files/patch-build.xml (-56 / +11 lines)
Lines 1-59 Link Here
1
Obtained from http://foo.poildetroll.net/minecraft/lwjgl-2.7.1-freebsd.diff
1
--- build.xml.orig
2
2
+++ build.xml
3
3
@@ -7,7 +7,6 @@
4
--- ./build.xml.orig	2011-02-06 19:23:40.000000000 +0000
4
 	<import file="platform_build/build-applet.xml"/>
5
+++ ./build.xml	2012-03-26 18:14:03.079373854 +0000
5
 	<import file="platform_build/build-webstart.xml"/>
6
@@ -246,7 +246,7 @@
6
 	<import file="platform_build/build-maven.xml"/>
7
 			<class name="org.lwjgl.opengl.WindowsContextImplementation" />
7
-	<import file="eclipse-update/org.lwjgl.build/build-updatesite.xml"/>
8
 		</javah>
9
 
8
 
10
-		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
9
 	<!-- ================================================================== -->
11
+		<!-- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
10
 	<!-- Everything below this line is targets.								-->
12
 			<class name="org.lwjgl.MacOSXSysImplementation" />
11
@@ -463,7 +462,10 @@
13
 			<class name="org.lwjgl.opengl.MacOSXMouseEventQueue" />
14
 			<class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" />
15
@@ -254,7 +254,7 @@
16
 			<class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" />
17
 			<class name="org.lwjgl.opengl.MacOSXDisplay" />
18
 			<class name="org.lwjgl.opengl.MacOSXContextImplementation" />
19
-		</javah>
20
+		</javah> -->
21
 
22
 		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes">
23
 			<class name="org.lwjgl.opengl.AWTSurfaceLock" />
24
@@ -293,13 +293,13 @@
25
 				</tokenfilter>
26
 			</filterchain>
27
 		</loadfile>
28
-		<loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
29
+		<!-- <loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
30
 			<filterchain>
31
 				<tokenfilter>
32
 	    		<containsstring contains="JNI_VERSION ="/>
33
 				</tokenfilter>
34
 			</filterchain>
35
-		</loadfile>
36
+		</loadfile> -->
37
 		<loadfile srcfile="${lwjgl.src.native}/windows/org_lwjgl_WindowsSysImplementation.h" property="lwjgl.native.windows.version">
38
 			<filterchain>
39
 				<tokenfilter>
40
@@ -314,13 +314,13 @@
41
 				</tokenfilter>
42
 			</filterchain>
43
 		</loadfile>
44
-		<loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
45
+		<!-- <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
46
 			<filterchain>
47
 				<tokenfilter>
48
 	    		<containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/>
49
 				</tokenfilter>
50
 			</filterchain>
51
-		</loadfile>
52
+		</loadfile> -->
53
 		<echo>
54
 			lwjgl.java.windows.version = ${lwjgl.java.windows.version}
55
 			lwjgl.native.windows.version = ${lwjgl.native.windows.version}
56
@@ -380,7 +380,10 @@
57
 		<antcall target="-compile_native_win32" />
12
 		<antcall target="-compile_native_win32" />
58
 
13
 
59
 		<condition property="lwjgl.platform.linux">
14
 		<condition property="lwjgl.platform.linux">
Lines 65-71 Link Here
65
 		</condition>
20
 		</condition>
66
 		<antcall target="-compile_native_linux" />
21
 		<antcall target="-compile_native_linux" />
67
 
22
 
68
@@ -493,6 +496,7 @@
23
@@ -604,6 +606,7 @@
69
 		<condition property="native_path" value="libs/linux">
24
 		<condition property="native_path" value="libs/linux">
70
 			<or>
25
 			<or>
71
 				<os name="Linux" />
26
 				<os name="Linux" />
(-)games/lwjgl/files/patch-platform_build__linux_ant__build.xml (-23 / +16 lines)
Lines 1-16 Link Here
1
Obtained from http://foo.poildetroll.net/minecraft/lwjgl-2.7.1-freebsd.diff
1
--- platform_build/linux_ant/build.xml.orig
2
2
+++ platform_build/linux_ant/build.xml
3
4
--- ./platform_build/linux_ant/build.xml.orig	2011-02-06 19:22:44.000000000 +0000
5
+++ ./platform_build/linux_ant/build.xml	2012-03-26 18:14:03.120371531 +0000
6
@@ -4,8 +4,8 @@
3
@@ -4,8 +4,8 @@
7
 	<property name="native" location="../../src/native"/>
4
 	<property name="native" location="../../src/native"/>
8
 	<property name="libname32" value="liblwjgl.so"/>
5
 	<property name="libname32" value="liblwjgl.so"/>
9
 	<property name="libname64" value="liblwjgl64.so"/>
6
 	<property name="libname64" value="liblwjgl64.so"/>
10
-	<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" />
7
-	<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" />
11
-	<property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" />
8
-	<property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" />
12
+	<property name="libs32" value="-L/usr/lib -L/usr/local/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" />
9
+	<property name="libs32" value="-LPREFIX/lib -lm -lX11 -lXext -lXcursor -lXrandr -pthread -L${java.home}/lib/i386 -ljawt" />
13
+	<property name="libs64" value="-L/usr/lib -L/usr/local/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" />
10
+	<property name="libs64" value="-LPREFIX/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -pthread -L${java.home}/lib/amd64 -ljawt" />
14
 	<property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
11
 	<property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
15
 
12
 
16
 	<target name="clean">
13
 	<target name="clean">
Lines 43-75 Link Here
43
     	</condition>
40
     	</condition>
44
 
41
 
45
     	<antcall target="compile32"/>
42
     	<antcall target="compile32"/>
46
@@ -69,11 +76,14 @@
43
@@ -72,10 +79,12 @@
47
 			<arg line="${cflags32} ${cflags_pthread}"/>
48
 			<arg value="-I${java.home}/include"/>
49
 			<arg value="-I${java.home}/include/linux"/>
50
+			<arg value="-I${java.home}/include/freebsd"/>
51
 			<arg value="-I${java.home}/../include"/>
44
 			<arg value="-I${java.home}/../include"/>
52
 			<arg value="-I${java.home}/../include/linux"/>
45
 			<arg value="-I${java.home}/../include/linux"/>
53
 			<arg value="-I${java.home}/../include/solaris"/>
46
 			<arg value="-I${java.home}/../include/solaris"/>
54
+			<arg value="-I${java.home}/../include/freebsd"/>
47
+			<arg value="-I${java.home}/../include/freebsd"/>
55
 			<arg value="-I${native}/common"/>
48
 			<arg value="-I${native}/common"/>
49
 		    <arg value="-I${native}/common/opengl"/>
56
 			<arg value="-I${native}/linux"/>
50
 			<arg value="-I${native}/linux"/>
57
+			<arg value="-I/usr/local/include"/>
51
 		    <arg value="-I${native}/linux/opengl"/>
52
+		    <arg value="-IPREFIX/include"/>
58
 			<mapper type="glob" from="*.c" to="*.o"/>
53
 			<mapper type="glob" from="*.c" to="*.o"/>
59
 			<fileset dir="${native}/linux" includes="*.c"/>
54
 		    <fileset dir="${native}/common" includes="*.c"/>
60
 			<fileset dir="${native}/generated" includes="*.c"/>
55
 		    <fileset dir="${native}/common/opengl" includes="*.c"/>
61
@@ -95,11 +105,14 @@
56
@@ -104,10 +113,12 @@
62
 			<arg line="${cflags64} ${cflags_pthread}"/>
63
 			<arg value="-I${java.home}/include"/>
64
 			<arg value="-I${java.home}/include/linux"/>
65
+			<arg value="-I${java.home}/include/freebsd"/>
66
 			<arg value="-I${java.home}/../include"/>
57
 			<arg value="-I${java.home}/../include"/>
67
 			<arg value="-I${java.home}/../include/linux"/>
58
 			<arg value="-I${java.home}/../include/linux"/>
68
 			<arg value="-I${java.home}/../include/solaris"/>
59
 			<arg value="-I${java.home}/../include/solaris"/>
69
+			<arg value="-I${java.home}/../include/freebsd"/>
60
+			<arg value="-I${java.home}/../include/freebsd"/>
70
 			<arg value="-I${native}/common"/>
61
 			<arg value="-I${native}/common"/>
62
 		    <arg value="-I${native}/common/opengl"/>
71
 			<arg value="-I${native}/linux"/>
63
 			<arg value="-I${native}/linux"/>
72
+			<arg value="-I/usr/local/include"/>
64
 		    <arg value="-I${native}/linux/opengl"/>
65
+		    <arg value="-IPREFIX/include"/>
73
 			<mapper type="glob" from="*.c" to="*.o"/>
66
 			<mapper type="glob" from="*.c" to="*.o"/>
74
 			<fileset dir="${native}/linux" includes="*.c"/>
67
 		    <fileset dir="${native}/common" includes="*.c"/>
75
 			<fileset dir="${native}/generated" includes="*.c"/>
68
 		    <fileset dir="${native}/common/opengl" includes="*.c"/>
(-)games/lwjgl/Makefile (-8 / +11 lines)
Lines 1-19 Link Here
1
# New ports collection makefile for:   jinput
2
# Date created:                        Mar 25 2012
3
# Whom:                                loader <loader@freebsdmall.com>
4
#
5
# $FreeBSD$
1
# $FreeBSD$
6
#
7
2
8
PORTNAME=	lwjgl
3
PORTNAME=	lwjgl
9
DISTVERSION=	2.7.1
4
DISTVERSION=	2.8.5
10
CATEGORIES=	games java
5
CATEGORIES=	games java
11
MASTER_SITES=	SF/java-game-lib/Official%20Releases/${PORTNAME:U}%20${PORTVERSION}/
6
MASTER_SITES=	SF/java-game-lib/Official%20Releases/${PORTNAME:U}%20${PORTVERSION}/
12
DISTNAME=	${PORTNAME}-source-${DISTVERSION}
7
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
8
		${PORTNAME}-source-${DISTVERSION}${EXTRACT_SUFX}
13
9
14
MAINTAINER=	loader@freebsdmall.com
10
MAINTAINER=	loader@freebsdmall.com
15
COMMENT=	The Lightweight Java Game Library
11
COMMENT=	The Lightweight Java Game Library
16
12
13
LICENSE=	BSD
14
LICENSE_FILE=	${WRKSRC}/${DISTNAME}/doc/LICENSE
15
17
BUILD_DEPENDS=	${JAVALIBDIR}/jutils/jutils.jar:${PORTSDIR}/games/jutils \
16
BUILD_DEPENDS=	${JAVALIBDIR}/jutils/jutils.jar:${PORTSDIR}/games/jutils \
18
		${JAVALIBDIR}/jinput/jinput.jar:${PORTSDIR}/games/jinput \
17
		${JAVALIBDIR}/jinput/jinput.jar:${PORTSDIR}/games/jinput \
19
		${LOCALBASE}/include/X11/extensions/xf86vmode.h:${PORTSDIR}/x11/libXxf86vm \
18
		${LOCALBASE}/include/X11/extensions/xf86vmode.h:${PORTSDIR}/x11/libXxf86vm \
Lines 33-43 Link Here
33
USE_JAVA=	yes
32
USE_JAVA=	yes
34
USE_LDCONFIG=	yes
33
USE_LDCONFIG=	yes
35
USE_DOS2UNIX=	yes
34
USE_DOS2UNIX=	yes
35
DOS2UNIX_REGEX=	.*.[^j][^a][^r]$
36
JAVA_VERSION=	1.6+
36
JAVA_VERSION=	1.6+
37
JAVA_OS=	native
37
JAVA_OS=	native
38
JAVA_VENDOR=	openjdk
38
JAVA_VENDOR=	openjdk
39
USE_ANT=	yes
39
USE_ANT=	yes
40
MAKE_ENV+=	CLASSPATH=${JAVALIBDIR}/jutils/jutils.jar:${JAVALIBDIR}/jinput/jinput.jar
40
MAKE_ENV+=	CLASSPATH=${JAVALIBDIR}/jutils/jutils.jar:${JAVALIBDIR}/jinput/jinput.jar:${WRKSRC}/${DISTNAME}/jar/
41
ALL_TARGET=	jars compile_native
41
ALL_TARGET=	jars compile_native
42
42
43
PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}/${PORTNAME}.jar \
43
PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}/${PORTNAME}.jar \
Lines 57-62 Link Here
57
PLIST_FILES+=	lib/${PORTNAME}${PORTVERSION}/lib${PORTNAME}64.so
57
PLIST_FILES+=	lib/${PORTNAME}${PORTVERSION}/lib${PORTNAME}64.so
58
.endif
58
.endif
59
59
60
post-patch:
61
	${REINPLACE_CMD} -e 's,PREFIX,${PREFIX},g' ${WRKSRC}/platform_build/linux_ant/build.xml
62
60
do-install:
63
do-install:
61
	@${ECHO_MSG} -n ">> Install JAR files in ${JAVAJARDIR}/${PORTNAME}/ ..."
64
	@${ECHO_MSG} -n ">> Install JAR files in ${JAVAJARDIR}/${PORTNAME}/ ..."
62
	@${MKDIR} ${JAVAJARDIR}/${PORTNAME}
65
	@${MKDIR} ${JAVAJARDIR}/${PORTNAME}

Return to bug 173839