diff options
Diffstat (limited to 'java')
-rw-r--r-- | java/dbvis/Makefile | 8 | ||||
-rw-r--r-- | java/dbvis/distinfo | 6 | ||||
-rw-r--r-- | java/intellij-fsnotifier/Makefile | 4 | ||||
-rw-r--r-- | java/intellij-fsnotifier/files/extrapatch-cmake_target__definitions.cmake | 12 | ||||
-rw-r--r-- | java/openjdk17/Makefile | 12 | ||||
-rw-r--r-- | java/openjdk24/files/patch-make_autoconf_flags-cflags.m4 | 19 | ||||
-rw-r--r-- | java/wildfly/Makefile | 19 | ||||
-rw-r--r-- | java/wildfly/distinfo | 6 |
8 files changed, 48 insertions, 38 deletions
diff --git a/java/dbvis/Makefile b/java/dbvis/Makefile index 75996b2d32a2..64d715d384f1 100644 --- a/java/dbvis/Makefile +++ b/java/dbvis/Makefile @@ -1,5 +1,5 @@ PORTNAME= dbvis -DISTVERSION= 25.2.2 +DISTVERSION= 25.2.3 CATEGORIES= java databases MASTER_SITES= https://www.dbvis.com/product_download/${PORTNAME}-${DISTVERSION}/media/ \ https://storage.googleapis.com/${PORTNAME}-download/product_download/${PORTNAME}-${DISTVERSION}/media/ @@ -27,9 +27,9 @@ PLIST_FILES= bin/dbvis do-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} \ "! ( -name dbvis -o -name dbviscmd.sh -o -name dbvisgui.sh )") - ${INSTALL_SCRIPT} ${WRKSRC}/dbvis ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/dbviscmd.sh ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/dbvisgui.sh ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/dbvis \ + ${WRKSRC}/dbviscmd.sh \ + ${WRKSRC}/dbvisgui.sh ${STAGEDIR}${DATADIR} ${RLN} ${STAGEDIR}${DATADIR}/dbvis ${STAGEDIR}${PREFIX}/bin/dbvis post-install: diff --git a/java/dbvis/distinfo b/java/dbvis/distinfo index d5a281643c7a..1cf6c83cc1a5 100644 --- a/java/dbvis/distinfo +++ b/java/dbvis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1752525252 -SHA256 (dbvis_linux_25_2_2.tar.gz) = e9e59e38b40dd97f4d4f4067dc632a2a4255a455fd3925b1911116ec1f437a84 -SIZE (dbvis_linux_25_2_2.tar.gz) = 116830510 +TIMESTAMP = 1757727757 +SHA256 (dbvis_linux_25_2_3.tar.gz) = c5b6e24b3977402fed938d3be17d1dbd94edf117b7f89183990bb6cd0f5b81f4 +SIZE (dbvis_linux_25_2_3.tar.gz) = 117141268 diff --git a/java/intellij-fsnotifier/Makefile b/java/intellij-fsnotifier/Makefile index f7c6f2e227b0..441f8dbdf053 100644 --- a/java/intellij-fsnotifier/Makefile +++ b/java/intellij-fsnotifier/Makefile @@ -24,4 +24,8 @@ CMAKE_ARGS+= -DVERSION=${PORTVERSION} PLIST_SUB+= PORTVERSION=${PORTVERSION} +.if exists(/usr/include/sys/inotify.h) +EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-cmake_target__definitions.cmake +.endif + .include <bsd.port.mk> diff --git a/java/intellij-fsnotifier/files/extrapatch-cmake_target__definitions.cmake b/java/intellij-fsnotifier/files/extrapatch-cmake_target__definitions.cmake new file mode 100644 index 000000000000..bffb0ce63f8c --- /dev/null +++ b/java/intellij-fsnotifier/files/extrapatch-cmake_target__definitions.cmake @@ -0,0 +1,12 @@ +FreeBSD 15+ has native inotify implementation + +--- cmake/target_definitions.cmake.orig 2023-07-24 21:16:54 UTC ++++ cmake/target_definitions.cmake +@@ -19,7 +19,6 @@ foreach(_lib _type IN ZIP_LISTS LIBS TYPES) + add_library(fsnotifier_staticlib STATIC ${HEADERS} ${SOURCES}) + foreach(_lib _type IN ZIP_LISTS LIBS TYPES) + target_link_libraries(${_lib} PUBLIC +- ${INOTIFY_LIBRARY_DIRS}/${CMAKE_${_type}_LIBRARY_PREFIX}${INOTIFY_LIBRARIES}${CMAKE_${_type}_LIBRARY_SUFFIX} + Threads::Threads) + target_include_directories(${_lib} PUBLIC ${INOTIFY_INCLUDE_DIRS}) + set_target_properties(${_lib} PROPERTIES OUTPUT_NAME fsnotifier) diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile index 9549ff9b0984..1af63a2554c8 100644 --- a/java/openjdk17/Makefile +++ b/java/openjdk17/Makefile @@ -1,7 +1,7 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -39,6 +39,9 @@ GH_PROJECT= jdk17u NO_CCACHE= yes +# Suppress passing -j to do-build target via Mk/bsd.port.mk +# In the JDK build the number of parallel jobs is passed in via configure --with-jobs=N +_MAKE_JOBS= MAKE_ENV= LANG="C" \ LC_ALL="C" \ CLASSPATH="" \ @@ -48,7 +51,6 @@ MAKE_ENV= LANG="C" \ CXX=${CXX} \ CPP=${CPP} \ MAKEFLAGS="" -MAKE_JOBS_UNSAFE= yes JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/} JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} @@ -89,6 +91,7 @@ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ --with-giflib-include=${LOCALBASE}/include \ --with-giflib-lib=${LOCALBASE}/lib \ --with-harfbuzz=system \ + --with-jobs=${MAKE_JOBS_NUMBER} \ --with-libpng=system \ --with-zlib=system \ --with-lcms=system \ @@ -113,6 +116,11 @@ JDK_BUILD_TYPE= release .include <bsd.port.pre.mk> +# portsfallout.com shows flapping builds on 13.5 and 14.2 +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1403000 +MAKE_JOBS_UNSAFE= yes +.endif + BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk17 ${LOCALBASE}/bootstrap-openjdk17 # do we have valid native jdk installed? diff --git a/java/openjdk24/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk24/files/patch-make_autoconf_flags-cflags.m4 index 5156c18515da..81bc372519f5 100644 --- a/java/openjdk24/files/patch-make_autoconf_flags-cflags.m4 +++ b/java/openjdk24/files/patch-make_autoconf_flags-cflags.m4 @@ -1,13 +1,12 @@ ---- make/autoconf/flags-cflags.m4.orig 2020-01-08 09:12:31 UTC +--- make/autoconf/flags-cflags.m4.orig 2025-09-16 10:24:48 UTC +++ make/autoconf/flags-cflags.m4 -@@ -770,6 +770,10 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP], - # for all archs except arm and ppc, prevent gcc to omit frame pointer - $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer" +@@ -780,6 +780,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP], + # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI. + $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=power8 -mtune=power10" fi -+ elif test "x$OPENJDK_TARGET_OS_ENV" = xbsd.freebsd; then -+ if test "x$FLAGS_CPU" = xppc64; then -+ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5" -+ fi ++ if test "x$FLAGS_CPU" = xppc64; then ++ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5" ++ fi fi - - elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then + if test "x$OPENJDK_TARGET_OS" = xaix; then + $1_CFLAGS_CPU="-mcpu=pwr8" diff --git a/java/wildfly/Makefile b/java/wildfly/Makefile index 03f0558cf788..9aaf495b062d 100644 --- a/java/wildfly/Makefile +++ b/java/wildfly/Makefile @@ -1,5 +1,5 @@ PORTNAME= wildfly -DISTVERSION= 37.0.0 +DISTVERSION= 37.0.1 CATEGORIES= java www MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${WILDFLY_VERSION}/ DISTNAME= wildfly-${WILDFLY_VERSION} @@ -70,24 +70,11 @@ do-install: ${MV} ${STAGEDIR}${PREFIX}/${PORTNAME}/${FILE} \ ${STAGEDIR}${PREFIX}/${PORTNAME}/${FILE}.sample .endfor - ${FIND} -s ${STAGEDIR}${PREFIX}/${PORTNAME} -not -type d | ${SORT} | \ + @${FIND} -s ${STAGEDIR}${PREFIX}/${PORTNAME} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \ ${SED} -E -e '/sample$$/ s#^#@sample #' | \ ${SED} -E -e '/bin\/.*sh$$/ s#^#@(,,755) #'>> ${TMPPLIST} - ${FIND} -s ${STAGEDIR}${PORTNAME} -type d | ${SORT} | \ + @${FIND} -s ${STAGEDIR}${PREFIX}/${PORTNAME} -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST} - ${ECHO_CMD} "@dir wildfly/.galleon/hashes/.installation" >> ${TMPPLIST} - ${ECHO_CMD} "@dir wildfly/.galleon/hashes/.well-known/acme-challenge" >> ${TMPPLIST} - ${ECHO_CMD} "@dir wildfly/.galleon/hashes/domain/tmp/auth" >> ${TMPPLIST} - ${ECHO_CMD} "@dir wildfly/.galleon/hashes/standalone/lib/ext" >> ${TMPPLIST} - ${ECHO_CMD} "@dir wildfly/.galleon/hashes/standalone/tmp/auth" >> ${TMPPLIST} - ${ECHO_CMD} "@dir wildfly/.galleon/hashes/standalone/tmp/embedded-server/auth" >> ${TMPPLIST} - ${ECHO_CMD} "@dir wildfly/.galleon/hashes/standalone/tmp/embedded-server/vfs/temp" >> ${TMPPLIST} - ${ECHO_CMD} "@dir wildfly/.well-known/acme-challenge" >> ${TMPPLIST} - ${ECHO_CMD} "@dir wildfly/domain/tmp/auth" >> ${TMPPLIST} - ${ECHO_CMD} "@dir wildfly/standalone/lib/ext" >> ${TMPPLIST} - ${ECHO_CMD} "@dir wildfly/standalone/tmp/auth" >> ${TMPPLIST} - ${ECHO_CMD} "@dir wildfly/standalone/tmp/embedded-server/auth" >> ${TMPPLIST} - ${ECHO_CMD} "@dir wildfly/standalone/tmp/embedded-server/vfs/temp" >> ${TMPPLIST} .include <bsd.port.mk> diff --git a/java/wildfly/distinfo b/java/wildfly/distinfo index 8d71a1ae3f85..c10a353f8699 100644 --- a/java/wildfly/distinfo +++ b/java/wildfly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1754684078 -SHA256 (wildfly-37.0.0.Final.tar.gz) = b48985ad8408f53b8bc7e52d0e1031fcad9ff062aa2cc583ca5fe4d2efbef82d -SIZE (wildfly-37.0.0.Final.tar.gz) = 257390551 +TIMESTAMP = 1757773594 +SHA256 (wildfly-37.0.1.Final.tar.gz) = d89d844112709c970b243884c3c3a2ba569e1ba43e590d70b236a1405c27cb82 +SIZE (wildfly-37.0.1.Final.tar.gz) = 257459781 |