diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/apache-commons-logging/Makefile | 19 | ||||
| -rw-r--r-- | java/icedtea-web/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk23/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp | 44 |
3 files changed, 16 insertions, 49 deletions
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/icedtea-web/Makefile b/java/icedtea-web/Makefile index 2e0794d89210..f399f03d3d2c 100644 --- a/java/icedtea-web/Makefile +++ b/java/icedtea-web/Makefile @@ -1,7 +1,7 @@ PORTNAME= icedtea-web PORTVERSION= 1.8.8 DISTVERSIONPREFIX= icedtea-web- -PORTREVISION= 28 +PORTREVISION= 29 CATEGORIES= java www MAINTAINER= java@FreeBSD.org 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"); - } - - ///////////////////////////////////////////////////////////////////////////// |