aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/apache-commons-lang3/Makefile2
-rw-r--r--java/apache-commons-lang3/distinfo6
-rw-r--r--java/apache-commons-logging/Makefile19
-rw-r--r--java/java3d/Makefile25
-rw-r--r--java/java3d/files/patch-freebsd8
-rw-r--r--java/openjdk23/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp44
6 files changed, 36 insertions, 68 deletions
diff --git a/java/apache-commons-lang3/Makefile b/java/apache-commons-lang3/Makefile
index c1de09382f20..ea5c7c3365a6 100644
--- a/java/apache-commons-lang3/Makefile
+++ b/java/apache-commons-lang3/Makefile
@@ -1,5 +1,5 @@
PORTNAME= commons-lang3
-PORTVERSION= 3.17.0
+PORTVERSION= 3.19.0
CATEGORIES= java devel
MASTER_SITES= APACHE_COMMONS_BINARIES/lang
PKGNAMEPREFIX= apache-
diff --git a/java/apache-commons-lang3/distinfo b/java/apache-commons-lang3/distinfo
index ebffd6f800e1..6fd59ec747ef 100644
--- a/java/apache-commons-lang3/distinfo
+++ b/java/apache-commons-lang3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1731006452
-SHA256 (commons-lang3-3.17.0-bin.tar.gz) = 08b93712bed7f48725d93c44d70c71e7e661af390f22f0f3e6ba61e3af3cea36
-SIZE (commons-lang3-3.17.0-bin.tar.gz) = 9772415
+TIMESTAMP = 1758843772
+SHA256 (commons-lang3-3.19.0-bin.tar.gz) = 062a46647eb3eacd8628f49d814e140a306120cfa8d1c07dfd0c974492c8003a
+SIZE (commons-lang3-3.19.0-bin.tar.gz) = 10366523
diff --git a/java/apache-commons-logging/Makefile b/java/apache-commons-logging/Makefile
index 3ed1106b8be9..1050f090e52d 100644
--- a/java/apache-commons-logging/Makefile
+++ b/java/apache-commons-logging/Makefile
@@ -1,5 +1,6 @@
PORTNAME= commons-logging
DISTVERSION= 1.3.5
+PORTREVISION= 1
CATEGORIES= java devel
MASTER_SITES= APACHE_COMMONS_BINARIES
PKGNAMEPREFIX= apache-
@@ -10,9 +11,15 @@ COMMENT= Generic logging wrapper library
WWW= https://commons.apache.org/proper/commons-logging/
LICENSE= APACHE20
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USES= java
+EXTRACT_AFTER_ARGS= --exclude ._* \
+ --exclude .DS_Store \
+ --exclude ${PORTNAME}-${DISTVERSION}-*.jar \
+ --no-same-owner --no-same-permissions
+
NO_ARCH= yes
NO_BUILD= yes
@@ -20,15 +27,19 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
JARFILE= ${PORTNAME}-${DISTVERSION}.jar
-PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar \
- %%JAVAJARDIR%%/${JARFILE}
+PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar \
+ ${JAVAJARDIR}/${JARFILE}
PORTDOCS= *
OPTIONS_DEFINE= DOCS
do-install:
${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}
- ${LN} -sf ${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
- (cd ${WRKSRC}/apidocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+ ${RLN} ${STAGEDIR}${JAVAJARDIR}/${JARFILE} \
+ ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
+
+do-install-DOCS-on:
+ (cd ${WRKSRC} && ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR} && \
+ ${INSTALL_DATA} NOTICE.txt RELEASE-NOTES.txt ${STAGEDIR}${DOCSDIR})
.include <bsd.port.mk>
diff --git a/java/java3d/Makefile b/java/java3d/Makefile
index a917ead6a2a3..8875e3748e5e 100644
--- a/java/java3d/Makefile
+++ b/java/java3d/Makefile
@@ -1,6 +1,6 @@
PORTNAME= java3d
PORTVERSION= 1.5.2
-PORTREVISION= 9
+PORTREVISION= 11
CATEGORIES= java graphics games devel
MASTER_SITES= https://sites.google.com/site/daemonwizard/
@@ -18,9 +18,8 @@ BROKEN_armv7= fails to compile: build.xml: Compile failed; see the compiler err
USES= compiler:c11 gl java:ant,run tar:bzip2 xorg
JAVA_VERSION= 8
USE_GL= gl
-USE_XORG= xt
+USE_XORG= x11 xext xt
JAVA_VENDOR= openjdk
-LLD_UNSAFE= yes
NO_SHLIB_REQUIRES_GLOB= libjawt.so libjvm.so
PLIST_SUB+= JAVA_HOME=${JAVA_HOME:S/^${PREFIX}\///} ARCH=${ARCH}
@@ -37,18 +36,20 @@ post-patch:
${WRKSRC}/j3d-core/src/native/ogl/build-freebsd.xml
do-build:
- cd ${WRKSRC}/vecmath && ${SETENV} ${MAKE_ENV} ${ANT} dist
+ cd ${WRKSRC}/vecmath && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${ANT} dist
cd ${WRKSRC}/j3d-core \
- && ${SETENV} ${MAKE_ENV} ${ANT} -Dbuild.type=fcs \
- -Dis${OPSYS}=yes \
- -Dports.localbase=${LOCALBASE} \
- jar-opt
+ && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${ANT} \
+ -Dbuild.type=fcs \
+ -Dis${OPSYS}=yes \
+ -Dports.localbase=${LOCALBASE} \
+ jar-opt
post-build-DOCS-on:
cd ${WRKSRC}/j3d-core \
- && ${SETENV} ${MAKE_ENV} ${ANT} -Dbuild.type=fcs \
- -Dis${OPSYS}=yes \
- docs-public
+ && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${ANT} \
+ -Dbuild.type=fcs \
+ -Dis${OPSYS}=yes \
+ docs-public
do-install:
@${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/ext
@@ -58,7 +59,7 @@ do-install:
${WRKSRC}/j3d-core/build/default/opt/lib/ext/j3dutils.jar \
${STAGEDIR}${JAVA_HOME}/jre/lib/ext
@${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH}
- ${INSTALL} \
+ ${INSTALL_LIB} \
${WRKSRC}/j3d-core/build/default/opt/native/libj3dcore-ogl.so \
${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH}
diff --git a/java/java3d/files/patch-freebsd b/java/java3d/files/patch-freebsd
index e11a2df2c13c..7e5635a72e8e 100644
--- a/java/java3d/files/patch-freebsd
+++ b/java/java3d/files/patch-freebsd
@@ -130,8 +130,8 @@ diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/s
+ </exec>
+
+ <!-- Create the library file-->
-+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
-+ <arg line="DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -G -z defs -L${ports.localbase}/lib -lGL -lX11 -lXext -lm -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm -o libj3dcore-ogl.so"/>
++ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
++ <arg line="DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -shared -z defs -L${ports.localbase}/lib -lGL -lX11 -lXext -lm -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm -o libj3dcore-ogl.so"/>
+ </exec>
+
+ </target>
@@ -143,8 +143,8 @@ diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/s
+ </exec>
+
+ <!-- Create the wrapper library -->
-+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
-+ <arg line="CgWrapper.o -G -z defs -L/usr/X11R6/lib64 -ldl -lCg -lCgGL -lpthread -lGL -lX11 -lXext -lm -lnsl -lc -o libj3dcore-ogl-cg.so"/>
++ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
++ <arg line="CgWrapper.o -shared -z defs -L/usr/X11R6/lib64 -ldl -lCg -lCgGL -lpthread -lGL -lX11 -lXext -lm -lnsl -lc -o libj3dcore-ogl-cg.so"/>
+ </exec>
+
+ </target>
diff --git a/java/openjdk23/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp b/java/openjdk23/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp
deleted file mode 100644
index dda6fd26cce0..000000000000
--- a/java/openjdk23/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp.orig 2024-04-11 22:23:08 UTC
-+++ src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp
-@@ -61,6 +61,7 @@
- # include <sys/types.h>
- # include <sys/mman.h>
- # include <pthread.h>
-+# include <pthread_np.h>
- # include <signal.h>
- # include <errno.h>
- # include <dlfcn.h>
-@@ -432,6 +433,33 @@ size_t os::Posix::default_stack_size(os::ThreadType th
- // Default stack size (compiler thread needs larger stack).
- size_t s = (thr_type == os::compiler_thread ? 4 * M : 1024 * K);
- return s;
-+}
-+
-+void os::current_stack_base_and_size(address* base, size_t* size) {
-+ address bottom;
-+ pthread_attr_t attr;
-+
-+ int rslt = pthread_attr_init(&attr);
-+
-+ // JVM needs to know exact stack location, abort if it fails
-+ if (rslt != 0)
-+ fatal("pthread_attr_init failed with error = %d", rslt);
-+
-+ rslt = pthread_attr_get_np(pthread_self(), &attr);
-+
-+ if (rslt != 0)
-+ fatal("pthread_attr_get_np failed with error = %d", rslt);
-+
-+ if (pthread_attr_getstackaddr(&attr, (void **)&bottom) != 0 ||
-+ pthread_attr_getstacksize(&attr, size) != 0) {
-+ fatal("Can not locate current stack attributes!");
-+ }
-+
-+ *base = bottom + *size;
-+
-+ pthread_attr_destroy(&attr);
-+ assert(os::current_stack_pointer() >= bottom &&
-+ os::current_stack_pointer() < *base, "just checking");
- }
-
- /////////////////////////////////////////////////////////////////////////////
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 00:46:29 +0000