Attachment #133606 for bug #178089

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




# $FreeBSD$

PORTNAME=	lwjgl
DISTVERSION=	2.9.0
CATEGORIES=	games java
MASTER_SITES=	SF/java-game-lib/Official%20Releases/${PORTNAME:U}%20${PORTVERSION}/
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \

post-patch:
	@${REINPLACE_CMD} -e 's,PREFIX,${PREFIX},g' \
		-e '/executable/s/gcc/${CC}/g' \
		${WRKSRC}/platform_build/bsd_ant/build.xml

do-install:
	@${ECHO_MSG} -n ">> Install JAR files in ${JAVAJARDIR}/${PORTNAME}/ ..."

	@${ECHO_MSG} " [ DONE ]"
	@${MKDIR} ${PREFIX}/lib/${PORTNAME}${PORTVERSION}
.if ${ARCH} == i386
	@${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}.so ${PREFIX}/lib/${PORTNAME}${PORTVERSION}
.endif
.if ${ARCH} == amd64
	@${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}64.so ${PREFIX}/lib/${PORTNAME}${PORTVERSION}
.endif

.include <bsd.port.post.mk>

Lines 1-4 Link Here

(-)games/lwjgl/distinfo (-4 / +4 lines)
1	SHA256 (lwjgl-2.8.5.zip) = 680e4c9f84ca89fad844820019a9134c4643a00a44e3d6a02defb3d38700492c	1	SHA256 (lwjgl-2.9.0.zip) = b7baed854d8798048d5a96cff3b58bb050c9bf105c151ff5be461677cd5d7b7f
2	SIZE (lwjgl-2.8.5.zip) = 5550071	2	SIZE (lwjgl-2.9.0.zip) = 5786081
3	SHA256 (lwjgl-source-2.8.5.zip) = b52f8885fb5a2cb9cd2528a9492164fccdf63031fbafb2ac96fd0f271fcbb130	3	SHA256 (lwjgl-source-2.9.0.zip) = 8c7d978ee1c3c5d4a3f8fc8f9774cc9f1b3a371f95ed48bebd4bde8f7fe648ca
4	SIZE (lwjgl-source-2.8.5.zip) = 2969449	4	SIZE (lwjgl-source-2.9.0.zip) = 2975604




 
 	<!-- ================================================================== -->
 	<!-- Everything below this line is targets.								-->
@@ -463,7 +462,10 @@
 		<antcall target="-compile_native_win32" />
 
 		<condition property="lwjgl.platform.linux">
-			<os name="Linux" />
+			<or>
+				<os name="Linux" />
+				<os name="FreeBSD" />
+			</or>
 		</condition>
 		<antcall target="-compile_native_linux" />
 
@@ -604,6 +606,7 @@
 		<condition property="native_path" value="libs/linux">
 			<or>
 				<os name="Linux" />
+				<os name="FreeBSD" />
 				<os name="SunOS" />
 			</or>
 		</condition>




--- platform_build/bsd_ant/build.xml.orig
+++ 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/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="-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">




--- platform_build/linux_ant/build.xml.orig
+++ platform_build/linux_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/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" />
-	<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" />
+	<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">
@@ -46,6 +46,7 @@
     		<not>
 	    		<or>
 					<equals arg1="${hwplatform}" arg2="x86_64"/>
+					<equals arg1="${hwplatform}" arg2="amd64"/>
 					<equals arg1="${hwplatform}" arg2="i86pc"/>
 				</or>
     		</not>
@@ -53,10 +54,16 @@
 
     	<!-- On linux, the 64 bit jre doesn't have the 32 bit libs -->
     	<condition property="build.64bit.only">
-    		<and>
-    			<os name="Linux"/>
-    			<equals arg1="${hwplatform}" arg2="x86_64"/>
-    		</and>
+		<or>
+			<and>
+				<os name="Linux"/>
+				<equals arg1="${hwplatform}" arg2="x86_64"/>
+			</and>
+			<and>
+				<os name="FreeBSD"/>
+				<equals arg1="${hwplatform}" arg2="amd64"/>
+			</and>
+		</or>
     	</condition>
 
     	<antcall target="compile32"/>
@@ -72,10 +79,12 @@
 			<arg value="-I${java.home}/../include"/>
 			<arg value="-I${java.home}/../include/linux"/>
 			<arg value="-I${java.home}/../include/solaris"/>
+			<arg value="-I${java.home}/../include/freebsd"/>
 			<arg value="-I${native}/common"/>
 		    <arg value="-I${native}/common/opengl"/>
 			<arg value="-I${native}/linux"/>
 		    <arg value="-I${native}/linux/opengl"/>
+		    <arg value="-IPREFIX/include"/>
 			<mapper type="glob" from="*.c" to="*.o"/>
 		    <fileset dir="${native}/common" includes="*.c"/>
 		    <fileset dir="${native}/common/opengl" includes="*.c"/>
@@ -104,10 +113,12 @@
 			<arg value="-I${java.home}/../include"/>
 			<arg value="-I${java.home}/../include/linux"/>
 			<arg value="-I${java.home}/../include/solaris"/>
+			<arg value="-I${java.home}/../include/freebsd"/>
 			<arg value="-I${native}/common"/>
 		    <arg value="-I${native}/common/opengl"/>
 			<arg value="-I${native}/linux"/>
 		    <arg value="-I${native}/linux/opengl"/>
+		    <arg value="-IPREFIX/include"/>
 			<mapper type="glob" from="*.c" to="*.o"/>
 		    <fileset dir="${native}/common" includes="*.c"/>
 		    <fileset dir="${native}/common/opengl" includes="*.c"/>

Return to bug 178089

Lines 2-8 Link Here

(-)games/lwjgl/Makefile (-4 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= lwjgl	4	PORTNAME= lwjgl
5	DISTVERSION= 2.8.5	5	DISTVERSION= 2.9.0
6	CATEGORIES= games java	6	CATEGORIES= games java
7	MASTER_SITES= SF/java-game-lib/Official%20Releases/${PORTNAME:U}%20${PORTVERSION}/	7	MASTER_SITES= SF/java-game-lib/Official%20Releases/${PORTNAME:U}%20${PORTVERSION}/
8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \	8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
Lines 55-61 Link Here
55	post-patch:	55	post-patch:
56	@${REINPLACE_CMD} -e 's,PREFIX,${PREFIX},g' \	56	@${REINPLACE_CMD} -e 's,PREFIX,${PREFIX},g' \
57	-e '/executable/s/gcc/${CC}/g' \	57	-e '/executable/s/gcc/${CC}/g' \
58	${WRKSRC}/platform_build/linux_ant/build.xml	58	${WRKSRC}/platform_build/bsd_ant/build.xml
59		59
60	do-install:	60	do-install:
61	@${ECHO_MSG} -n ">> Install JAR files in ${JAVAJARDIR}/${PORTNAME}/ ..."	61	@${ECHO_MSG} -n ">> Install JAR files in ${JAVAJARDIR}/${PORTNAME}/ ..."
Lines 66-75 Link Here
66	@${ECHO_MSG} " [ DONE ]"	66	@${ECHO_MSG} " [ DONE ]"
67	@${MKDIR} ${PREFIX}/lib/${PORTNAME}${PORTVERSION}	67	@${MKDIR} ${PREFIX}/lib/${PORTNAME}${PORTVERSION}
68	.if ${ARCH} == i386	68	.if ${ARCH} == i386
69	@${INSTALL_DATA} ${WRKSRC}/libs/linux/lib${PORTNAME}.so ${PREFIX}/lib/${PORTNAME}${PORTVERSION}	69	@${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}.so ${PREFIX}/lib/${PORTNAME}${PORTVERSION}
70	.endif	70	.endif
71	.if ${ARCH} == amd64	71	.if ${ARCH} == amd64
72	@${INSTALL_DATA} ${WRKSRC}/libs/linux/lib${PORTNAME}64.so ${PREFIX}/lib/${PORTNAME}${PORTVERSION}	72	@${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}64.so ${PREFIX}/lib/${PORTNAME}${PORTVERSION}
73	.endif	73	.endif
74		74
75	.include <bsd.port.post.mk>	75	.include <bsd.port.post.mk>

Lines 8-30 Link Here

(-)games/lwjgl/files/patch-build.xml (-20 lines)
8		8
9	<!-- ================================================================== -->	9	<!-- ================================================================== -->
10	<!-- Everything below this line is targets. -->	10	<!-- Everything below this line is targets. -->
11	@@ -463,7 +462,10 @@
12	<antcall target="-compile_native_win32" />
13
14	<condition property="lwjgl.platform.linux">
15	- <os name="Linux" />
16	+ <or>
17	+ <os name="Linux" />
18	+ <os name="FreeBSD" />
19	+ </or>
20	</condition>
21	<antcall target="-compile_native_linux" />
22
23	@@ -604,6 +606,7 @@
24	<condition property="native_path" value="libs/linux">
25	<or>
26	<os name="Linux" />
27	+ <os name="FreeBSD" />
28	<os name="SunOS" />
29	</or>
30	</condition>

Line 0 Link Here

(-)games/lwjgl/files/patch-platform_build__bsd_ant__build.xml (+13 lines)
	1	--- platform_build/bsd_ant/build.xml.orig
	2	+++ platform_build/bsd_ant/build.xml
	3	@@ -4,8 +4,8 @@
	4	<property name="native" location="../../src/native"/>
	5	<property name="libname32" value="liblwjgl.so"/>
	6	<property name="libname64" value="liblwjgl64.so"/>
	7	- <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" />
	8	- <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" />
	9	+ <property name="libs32" value="-LPREFIX/lib -lm -lX11 -lXext -lXcursor -lXrandr -pthread -L${java.home}/lib/i386 -ljawt" />
	10	+ <property name="libs64" value="-LPREFIX/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -pthread -L${java.home}/lib/amd64 -ljawt" />
	11	<property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
	12
	13	<target name="clean">

Lines 1-68 Link Here

(-)games/lwjgl/files/patch-platform_build__linux_ant__build.xml (-68 lines)
1	--- platform_build/linux_ant/build.xml.orig
2	+++ platform_build/linux_ant/build.xml
3	@@ -4,8 +4,8 @@
4	<property name="native" location="../../src/native"/>
5	<property name="libname32" value="liblwjgl.so"/>
6	<property name="libname64" value="liblwjgl64.so"/>
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" />
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" />
9	+ <property name="libs32" value="-LPREFIX/lib -lm -lX11 -lXext -lXcursor -lXrandr -pthread -L${java.home}/lib/i386 -ljawt" />
10	+ <property name="libs64" value="-LPREFIX/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -pthread -L${java.home}/lib/amd64 -ljawt" />
11	<property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
12
13	<target name="clean">
14	@@ -46,6 +46,7 @@
15	<not>
16	<or>
17	<equals arg1="${hwplatform}" arg2="x86_64"/>
18	+ <equals arg1="${hwplatform}" arg2="amd64"/>
19	<equals arg1="${hwplatform}" arg2="i86pc"/>
20	</or>
21	</not>
22	@@ -53,10 +54,16 @@
23
24	<!-- On linux, the 64 bit jre doesn't have the 32 bit libs -->
25	<condition property="build.64bit.only">
26	- <and>
27	- <os name="Linux"/>
28	- <equals arg1="${hwplatform}" arg2="x86_64"/>
29	- </and>
30	+ <or>
31	+ <and>
32	+ <os name="Linux"/>
33	+ <equals arg1="${hwplatform}" arg2="x86_64"/>
34	+ </and>
35	+ <and>
36	+ <os name="FreeBSD"/>
37	+ <equals arg1="${hwplatform}" arg2="amd64"/>
38	+ </and>
39	+ </or>
40	</condition>
41
42	<antcall target="compile32"/>
43	@@ -72,10 +79,12 @@
44	<arg value="-I${java.home}/../include"/>
45	<arg value="-I${java.home}/../include/linux"/>
46	<arg value="-I${java.home}/../include/solaris"/>
47	+ <arg value="-I${java.home}/../include/freebsd"/>
48	<arg value="-I${native}/common"/>
49	<arg value="-I${native}/common/opengl"/>
50	<arg value="-I${native}/linux"/>
51	<arg value="-I${native}/linux/opengl"/>
52	+ <arg value="-IPREFIX/include"/>
53	<mapper type="glob" from=".c" to=".o"/>
54	<fileset dir="${native}/common" includes="*.c"/>
55	<fileset dir="${native}/common/opengl" includes="*.c"/>
56	@@ -104,10 +113,12 @@
57	<arg value="-I${java.home}/../include"/>
58	<arg value="-I${java.home}/../include/linux"/>
59	<arg value="-I${java.home}/../include/solaris"/>
60	+ <arg value="-I${java.home}/../include/freebsd"/>
61	<arg value="-I${native}/common"/>
62	<arg value="-I${native}/common/opengl"/>
63	<arg value="-I${native}/linux"/>
64	<arg value="-I${native}/linux/opengl"/>
65	+ <arg value="-IPREFIX/include"/>
66	<mapper type="glob" from=".c" to=".o"/>
67	<fileset dir="${native}/common" includes="*.c"/>
68	<fileset dir="${native}/common/opengl" includes="*.c"/>