Page MenuHomeFreeBSD
Files F109968956

D21045.id65474.diff
No OneTemporary
Actions

D21045.id65474.diff
View Options

Index: games/lwjgl/Makefile
===================================================================
--- games/lwjgl/Makefile
+++ games/lwjgl/Makefile
@@ -2,11 +2,8 @@
# $FreeBSD$
PORTNAME= lwjgl
-DISTVERSION= 2.9.3
+DISTVERSION= 2.9.4.20161208
CATEGORIES= games java
-MASTER_SITES= SF/java-game-lib/Official%20Releases/${PORTNAME:tu}%20${PORTVERSION}/
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- ${PORTNAME}-source-${DISTVERSION}${EXTRACT_SUFX}
MAINTAINER= freebsd@skinc.ru
COMMENT= Lightweight Java Game Library
@@ -14,43 +11,39 @@
LICENSE= BSD3CLAUSE
ONLY_FOR_ARCHS= amd64 i386 powerpc64
-.if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
-BROKEN_i386= ld: error: can't create dynamic relocation R_386_32 against local symbol in readonly segment
-.endif
-BUILD_DEPENDS= ${JAVALIBDIR}/jutils/jutils.jar:games/jutils \
- ${JAVALIBDIR}/jinput/jinput.jar:games/jinput
+BUILD_DEPENDS= ${JAVAJARDIR}/jutils/jutils.jar:games/jutils \
+ ${JAVAJARDIR}/jinput/jinput.jar:games/jinput
RUN_DEPENDS:= ${BUILD_DEPENDS}
-WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
-EXTRACT_AFTER_ARGS= -d ${WRKSRC}
+USES= dos2unix xorg
+USE_GITHUB= yes
+GH_ACCOUNT= LWJGL
+GH_TAGNAME= 2df01dd
-USES= dos2unix zip xorg
-DOS2UNIX_REGEX= .*.[^jp][^an][^rg]$
+DOS2UNIX_REGEX= .*.[^jp][^an][^rg]$
USE_JAVA= yes
USE_LDCONFIG= yes
-JAVA_OS= native
-JAVA_VENDOR= openjdk
USE_ANT= yes
USE_XORG= xcursor xrandr xxf86vm
-MAKE_ENV+= CLASSPATH=${JAVALIBDIR}/jutils/jutils.jar:${JAVALIBDIR}/jinput/jinput.jar:${WRKSRC}/${DISTNAME}/jar/
+MAKE_ENV+= CLASSPATH=${JAVAJARDIR}/jutils/jutils.jar:${JAVAJARDIR}/jinput/jinput.jar:${WRKSRC}/${DISTNAME}/jar/
ALL_TARGET= jars compile_native
-PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}/${PORTNAME}.jar \
- %%JAVAJARDIR%%/${PORTNAME}/${PORTNAME}_test.jar \
- %%JAVAJARDIR%%/${PORTNAME}/${PORTNAME}_util.jar \
- %%JAVAJARDIR%%/${PORTNAME}/${PORTNAME}_util_applet.jar
-PLIST_DIRS= %%JAVAJARDIR%%/${PORTNAME} \
- lib/${PORTNAME}${PORTVERSION}
+PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}/${PORTNAME}.jar \
+ ${JAVAJARDIR}/${PORTNAME}/${PORTNAME}_test.jar \
+ ${JAVAJARDIR}/${PORTNAME}/${PORTNAME}_util.jar \
+ ${JAVAJARDIR}/${PORTNAME}/${PORTNAME}_util_applet.jar
+PLIST_DIRS= ${JAVAJARDIR}/${PORTNAME} \
+ lib/${PORTNAME}
.include <bsd.port.pre.mk>
.if ${ARCH} == i386
-PLIST_FILES+= lib/${PORTNAME}${PORTVERSION}/lib${PORTNAME}.so
+PLIST_FILES+= lib/${PORTNAME}/lib${PORTNAME}.so
.endif
.if ${ARCH} == amd64 || ${ARCH} == powerpc64
-PLIST_FILES+= lib/${PORTNAME}${PORTVERSION}/lib${PORTNAME}64.so
+PLIST_FILES+= lib/${PORTNAME}/lib${PORTNAME}64.so
.endif
.if ${ARCH} == powerpc64
@@ -72,14 +65,14 @@
${INSTALL_DATA} ${WRKSRC}/libs/${_jar:T} \
${STAGEDIR}${JAVAJARDIR}/${PORTNAME}
.endfor
- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION}
+ @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
.if ${ARCH} == i386
${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}.so \
- ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION}
+ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
.endif
.if ${ARCH} == amd64 || ${ARCH} == powerpc64
${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}64.so \
- ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION}
+ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
.endif
.include <bsd.port.post.mk>
Index: games/lwjgl/distinfo
===================================================================
--- games/lwjgl/distinfo
+++ games/lwjgl/distinfo
@@ -1,4 +1,3 @@
-SHA256 (lwjgl-2.9.3.zip) = 4354432ca5da11d3ec57a09228918b995f3de2761c975e68fa27a5fe0fb62f4c
-SIZE (lwjgl-2.9.3.zip) = 7805314
-SHA256 (lwjgl-source-2.9.3.zip) = 098696a3752321979e6b1dc798c694d4d3daf64a71217ee8d7b04123b5b18a5a
-SIZE (lwjgl-source-2.9.3.zip) = 3183783
+TIMESTAMP = 1576013211
+SHA256 (LWJGL-lwjgl-2.9.4.20161208-2df01dd_GH0.tar.gz) = a4d03e9244a9e253abcfe7ee75d4413bd3db1fd8c38e67eedbd0c6c313c4e504
+SIZE (LWJGL-lwjgl-2.9.4.20161208-2df01dd_GH0.tar.gz) = 15052370
Index: games/lwjgl/files/patch-platform_build__bsd_ant__build.xml
===================================================================
--- games/lwjgl/files/patch-platform_build__bsd_ant__build.xml
+++ games/lwjgl/files/patch-platform_build__bsd_ant__build.xml
@@ -1,6 +1,5 @@
---- platform_build/bsd_ant/build.xml.orig 2015-12-19 18:22:18 UTC
+--- platform_build/bsd_ant/build.xml.orig 2019-12-10 20:24:26
+++ platform_build/bsd_ant/build.xml
-
@@ -4,8 +4,8 @@
<property name="native" location="../../src/native"/>
<property name="libname32" value="liblwjgl.so"/>
@@ -12,3 +11,12 @@
<property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
<target name="clean">
+@@ -39,7 +39,7 @@
+ <os name="SunOS" />
+ </condition>
+
+- <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/>
++ <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -z notext -o ${libname32} ${libs32} ${xf86vm_lib}"/>
+ <property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/>
+
+ <condition property="build.32bit.only">
Index: games/lwjgl/pkg-descr
===================================================================
--- games/lwjgl/pkg-descr
+++ games/lwjgl/pkg-descr
@@ -1,3 +1,3 @@
The Lightweight Java Game Library
-WWW: http://www.lwjgl.org
+WWW: http://legacy.lwjgl.org
Index: games/minecraft-client/Makefile
===================================================================
--- games/minecraft-client/Makefile
+++ games/minecraft-client/Makefile
@@ -3,7 +3,7 @@
PORTNAME= minecraft-client
PORTVERSION= 1.7.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games java
MASTER_SITES= https://s3.amazonaws.com/Minecraft.Download/launcher/:minecraft \
https://media-mcw.cursecdn.com/c/c5/:icon
Index: games/minecraft-client/files/minecraft-runtime
===================================================================
--- games/minecraft-client/files/minecraft-runtime
+++ games/minecraft-client/files/minecraft-runtime
@@ -1,6 +1,6 @@
#!/bin/sh
-LWJGL_JLP_OVRD="/usr/local/lib/lwjgl2.9.3"
+LWJGL_JLP_OVRD="/usr/local/lib/lwjgl"
LWJGL_OVRD="/usr/local/share/java/classes/lwjgl/lwjgl.jar"
LWJGL_UTIL_OVRD="/usr/local/share/java/classes/lwjgl/lwjgl_util.jar"
Index: games/multimc/Makefile
===================================================================
--- games/multimc/Makefile
+++ games/multimc/Makefile
@@ -2,6 +2,7 @@
PORTNAME= multimc
DISTVERSION= 0.6.7
+PORTREVISION= 1
CATEGORIES= games java
MAINTAINER= me@tsundoku.ne.jp
@@ -27,7 +28,7 @@
CMAKE_OFF= MultiMC_UPDATER
CXXFLAGS+= -Wno-inconsistent-missing-override \
-Wno-delete-non-virtual-dtor \
- -DLWJGL_DIR='\"${LOCALBASE}/lib/lwjgl2.9.3\"'
+ -DLWJGL_DIR='\"${LOCALBASE}/lib/lwjgl\"'
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libMultiMC_*.so

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 12, 9:25 PM (19 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16616712
Default Alt Text
D21045.id65474.diff (6 KB)

Event Timeline