diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/Makefile | 1 | ||||
| -rw-r--r-- | java/mx4j/Makefile | 33 | ||||
| -rw-r--r-- | java/mx4j/distinfo | 2 | ||||
| -rw-r--r-- | java/mx4j/pkg-descr | 10 | ||||
| -rw-r--r-- | java/openjfx14/Makefile | 4 | ||||
| -rw-r--r-- | java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_WebCore_xml_XSLTProcessor.h | 14 | ||||
| -rw-r--r-- | java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_WebCore_xml_XSLTProcessorLibxslt.cpp | 14 |
7 files changed, 29 insertions, 49 deletions
diff --git a/java/Makefile b/java/Makefile index 432e6794f049..829261f9440b 100644 --- a/java/Makefile +++ b/java/Makefile @@ -75,7 +75,6 @@ SUBDIR += linux-oracle-jre18 SUBDIR += linux-oracle-serverjre10 SUBDIR += mmake - SUBDIR += mx4j SUBDIR += netbeans SUBDIR += netrexx SUBDIR += netty diff --git a/java/mx4j/Makefile b/java/mx4j/Makefile deleted file mode 100644 index 705cc062fbae..000000000000 --- a/java/mx4j/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -PORTNAME= mx4j -PORTVERSION= 3.0.2 -PORTREVISION= 1 -CATEGORIES= java devel -MASTER_SITES= SF/${PORTNAME}/MX4J%20Binary/${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Open Source implementation of the Java Management Extensions (JMX) -WWW= https://mx4j.sourceforge.net - -DEPRECATED= Abandoned upstream, no activity since 2010 -EXPIRATION_DATE=2025-06-30 - -USES= java - -NO_BUILD= yes - -JARFILES= mx4j-examples.jar mx4j-impl.jar mx4j-jmx.jar \ - mx4j-remote.jar mx4j-rimpl.jar mx4j-rjmx.jar \ - mx4j-soap.war mx4j-tools.jar mx4j.jar - -PLIST_FILES= ${JARFILES:S,^,%%JAVAJARDIR%%/,} -PORTDOCS= * -PORTEXAMPLES= * - -OPTIONS_DEFINE= DOCS EXAMPLES - -do-install: - (cd ${WRKSRC}/lib && ${INSTALL_DATA} ${JARFILES} ${STAGEDIR}${JAVAJARDIR}) - (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) - (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) - -.include <bsd.port.mk> diff --git a/java/mx4j/distinfo b/java/mx4j/distinfo deleted file mode 100644 index ba556f0e5baa..000000000000 --- a/java/mx4j/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mx4j-3.0.2.tar.gz) = 282bd68e517aba3d0f5bbf76f90c3c09e446c529e7796467ab7de65398bb1115 -SIZE (mx4j-3.0.2.tar.gz) = 4555894 diff --git a/java/mx4j/pkg-descr b/java/mx4j/pkg-descr deleted file mode 100644 index 786e7ee0509e..000000000000 --- a/java/mx4j/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -MX4J is a project to build an Open Source implementation of the -Java(TM) Management Extensions (JMX) and of the JMX Remote API -(JSR 160) specifications, and to build tools relating to JMX. - -JMX is an optional package for J2SE that provides a standard -way to manage applications. It can also be used to wrap legacy -systems and provide a standard interface to the outside world, -enabling the development of web services. JMX allows developers -to write more modular and loosely coupled system components and -reduce the complexity of large, interoperating systems. diff --git a/java/openjfx14/Makefile b/java/openjfx14/Makefile index f59a0ef4239d..13cbd11ceaa5 100644 --- a/java/openjfx14/Makefile +++ b/java/openjfx14/Makefile @@ -1,6 +1,6 @@ PORTNAME= openjfx DISTVERSION= 14.0.2.1+1 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= java x11-toolkits devel MASTER_SITES= https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.7.1/:core \ https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.7.1/:grouping \ @@ -23,8 +23,6 @@ WWW= https://openjdk.java.net/projects/openjfx/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= Fails to build with libxml2 2.13+, error: no matching constructor for initialization of 'XMLDocumentParserScope' - ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le BUILD_DEPENDS= zip:archivers/zip \ diff --git a/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_WebCore_xml_XSLTProcessor.h b/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_WebCore_xml_XSLTProcessor.h new file mode 100644 index 000000000000..cc2e056db3e0 --- /dev/null +++ b/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_WebCore_xml_XSLTProcessor.h @@ -0,0 +1,14 @@ +--- modules/javafx.web/src/main/native/Source/WebCore/xml/XSLTProcessor.h.orig 2020-07-17 10:21:33 UTC ++++ modules/javafx.web/src/main/native/Source/WebCore/xml/XSLTProcessor.h +@@ -62,7 +62,11 @@ class XSLTProcessor : public RefCounted<XSLTProcessor> + + void reset(); + ++#if LIBXML_VERSION >= 21200 ++ static void parseErrorFunc(void* userData, const xmlError*); ++#else + static void parseErrorFunc(void* userData, xmlError*); ++#endif + static void genericErrorFunc(void* userData, const char* msg, ...); + + // Only for libXSLT callbacks diff --git a/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_WebCore_xml_XSLTProcessorLibxslt.cpp b/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_WebCore_xml_XSLTProcessorLibxslt.cpp new file mode 100644 index 000000000000..d74934a317b2 --- /dev/null +++ b/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_WebCore_xml_XSLTProcessorLibxslt.cpp @@ -0,0 +1,14 @@ +--- modules/javafx.web/src/main/native/Source/WebCore/xml/XSLTProcessorLibxslt.cpp.orig 2020-07-17 10:21:33 UTC ++++ modules/javafx.web/src/main/native/Source/WebCore/xml/XSLTProcessorLibxslt.cpp +@@ -60,7 +60,11 @@ void XSLTProcessor::genericErrorFunc(void*, const char + // It would be nice to do something with this error message. + } + ++#if LIBXML_VERSION >= 21200 ++void XSLTProcessor::parseErrorFunc(void* userData, const xmlError* error) ++#else + void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error) ++#endif + { + PageConsoleClient* console = static_cast<PageConsoleClient*>(userData); + if (!console) |