Date: Tue, 23 Apr 2013 18:44:51 GMT From: "r4721@tormail.org" <r4721@tormail.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/178089: [patch] update games/lwjgl to 2.9.0 Message-ID: <201304231844.r3NIipXN060178@red.freebsd.org> Resent-Message-ID: <201304231850.r3NIo05X076552@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 178089
>Category: ports
>Synopsis: [patch] update games/lwjgl to 2.9.0
>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: Tue Apr 23 18:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: r4721@tormail.org
>Release:
>Organization:
>Environment:
>Description:
updates games/lwjgl to latest version. vendor has added initial support for
freebsd, so not using the linux build file any more.
removed files:
D games/lwjgl/files/patch-platform_build__linux_ant__build.xml
added files:
A games/lwjgl/files/patch-platform_build__bsd_ant__build.xml
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: games/lwjgl/Makefile
===================================================================
--- games/lwjgl/Makefile (revision 316307)
+++ games/lwjgl/Makefile (working copy)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= lwjgl
-DISTVERSION= 2.8.5
+DISTVERSION= 2.9.0
CATEGORIES= games java
MASTER_SITES= SF/java-game-lib/Official%20Releases/${PORTNAME:U}%20${PORTVERSION}/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -55,7 +55,7 @@
post-patch:
@${REINPLACE_CMD} -e 's,PREFIX,${PREFIX},g' \
-e '/executable/s/gcc/${CC}/g' \
- ${WRKSRC}/platform_build/linux_ant/build.xml
+ ${WRKSRC}/platform_build/bsd_ant/build.xml
do-install:
@${ECHO_MSG} -n ">> Install JAR files in ${JAVAJARDIR}/${PORTNAME}/ ..."
@@ -66,10 +66,10 @@
@${ECHO_MSG} " [ DONE ]"
@${MKDIR} ${PREFIX}/lib/${PORTNAME}${PORTVERSION}
.if ${ARCH} == i386
- @${INSTALL_DATA} ${WRKSRC}/libs/linux/lib${PORTNAME}.so ${PREFIX}/lib/${PORTNAME}${PORTVERSION}
+ @${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}.so ${PREFIX}/lib/${PORTNAME}${PORTVERSION}
.endif
.if ${ARCH} == amd64
- @${INSTALL_DATA} ${WRKSRC}/libs/linux/lib${PORTNAME}64.so ${PREFIX}/lib/${PORTNAME}${PORTVERSION}
+ @${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}64.so ${PREFIX}/lib/${PORTNAME}${PORTVERSION}
.endif
.include <bsd.port.post.mk>
Index: games/lwjgl/distinfo
===================================================================
--- games/lwjgl/distinfo (revision 316307)
+++ games/lwjgl/distinfo (working copy)
@@ -1,4 +1,4 @@
-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
+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
Index: games/lwjgl/files/patch-build.xml
===================================================================
--- games/lwjgl/files/patch-build.xml (revision 316307)
+++ games/lwjgl/files/patch-build.xml (working copy)
@@ -8,23 +8,3 @@
<!-- ================================================================== -->
<!-- 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>
Index: games/lwjgl/files/patch-platform_build__bsd_ant__build.xml
===================================================================
--- games/lwjgl/files/patch-platform_build__bsd_ant__build.xml (revision 0)
+++ games/lwjgl/files/patch-platform_build__bsd_ant__build.xml (working copy)
@@ -0,0 +1,13 @@
+--- 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">
Index: games/lwjgl/files/patch-platform_build__linux_ant__build.xml
===================================================================
--- games/lwjgl/files/patch-platform_build__linux_ant__build.xml (revision 316307)
+++ games/lwjgl/files/patch-platform_build__linux_ant__build.xml (working copy)
@@ -1,68 +0,0 @@
---- 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"/>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304231844.r3NIipXN060178>