Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -13053,3 +13053,16 @@ x11/xtrap||2019-10-01|Deprecated upstream security/softhsm|security/softhsm2|2019-10-04|Has expired: End-of-life announced, update to softhsm2 ASAP. net/asterisk15|net/asterisk16|2019-10-04|Has expired: Asterisk 15.x will reach EOL on 2019-10-03. Please migrate to net/asterisk16 +databases/jakarta-commons-dbutils|databases/apache-commons-dbutils|2019-10-05|Renamed upstream +devel/jakarta-commons-configuration|devel/apache-commons-configuration|2019-10-05|Renamed upstream +devel/jakarta-commons-io|devel/apache-commons-io|2019-10-05|Renamed upstream +devel/jakarta-commons-jxpath|devel/apache-commons-jxpath|2019-10-05|Renamed upstream +devel/jakarta-commons-modeler|devel/apache-commons-modeler|2019-10-05|Renamed upstream +java/jakarta-commons-cli|apache-commons-cli|2019-10-05|Renamed upstream +java/jakarta-commons-collections|java/apache-commons-collections|2019-10-05|Renamed upstream +java/jakarta-commons-lang|apache-commons-lang|2019-10-05|Renamed upstream +java/jakarta-commons-logging|java/apache-commons-logging|2019-10-05|Renamed upstream +java/jakarta-commons-primitives|java/apache-commons-primitives|2019-10-05|Renamed upstream +lang/jakarta-commons-jelly|lang/apache-commons-jelly|2019-10-05|Renamed upstream +net/jakarta-commons-net|net/apache-commons-net|2019-10-05|Renamed upstream +textproc/jakarta-commons-digester|textproc/apache-commons-digester|2019-10-05|Renamed upstream Index: databases/Makefile =================================================================== --- databases/Makefile +++ databases/Makefile @@ -15,6 +15,7 @@ SUBDIR += adodb SUBDIR += adodb5 SUBDIR += akonadi + SUBDIR += apache-commons-dbutils SUBDIR += apq SUBDIR += apq-mysql SUBDIR += apq-odbc @@ -113,7 +114,6 @@ SUBDIR += ipa_sdb SUBDIR += iplike SUBDIR += isql-viewer - SUBDIR += jakarta-commons-dbutils SUBDIR += jasperreports SUBDIR += jdb SUBDIR += jdbc-oracle11g Index: databases/apache-commons-dbutils/Makefile =================================================================== --- databases/apache-commons-dbutils/Makefile +++ databases/apache-commons-dbutils/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.7 CATEGORIES= databases java MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- +PKGNAMEPREFIX= apache- DISTNAME= ${PORTNAME}-${PORTVERSION}-bin MAINTAINER= ports@FreeBSD.org Index: databases/jakarta-commons-dbutils/Makefile =================================================================== --- databases/jakarta-commons-dbutils/Makefile +++ databases/jakarta-commons-dbutils/Makefile @@ -1,37 +0,0 @@ -# Created by: Michael Winking -# $FreeBSD$ - -PORTNAME= commons-dbutils -PORTVERSION= 1.7 -CATEGORIES= databases java -MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- -DISTNAME= ${PORTNAME}-${PORTVERSION}-bin - -MAINTAINER= ports@FreeBSD.org -COMMENT= JDBC helper library - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -USE_JAVA= yes -JAVA_VERSION= 1.6+ -NO_BUILD= yes -NO_ARCH= yes - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar - -PORTDOCS= * - -OPTIONS_DEFINE= DOCS - -do-install: - ${INSTALL_DATA} ${WRKSRC}/commons-dbutils-1.7.jar \ - ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC}/apidocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} - -.include Index: databases/jakarta-commons-dbutils/distinfo =================================================================== --- databases/jakarta-commons-dbutils/distinfo +++ databases/jakarta-commons-dbutils/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1500903515 -SHA256 (commons-dbutils-1.7-bin.tar.gz) = 853d6f1f6765a8a8e9810c394da4b1f9be52f91b9feaee0e234f3357886aee4f -SIZE (commons-dbutils-1.7-bin.tar.gz) = 760360 Index: databases/jakarta-commons-dbutils/pkg-descr =================================================================== --- databases/jakarta-commons-dbutils/pkg-descr +++ databases/jakarta-commons-dbutils/pkg-descr @@ -1,6 +0,0 @@ -DbUtils is a small set of classes designed to make working with JDBC easier. -JDBC resource cleanup code is mundane, error prone work so these classes -abstract out all of the cleanup tasks from your code leaving you with what -you really wanted to do with JDBC in the first place: query and update data. - -WWW: http://jakarta.apache.org/commons/dbutils/ Index: devel/Makefile =================================================================== --- devel/Makefile +++ devel/Makefile @@ -124,6 +124,10 @@ SUBDIR += antlr3 SUBDIR += antlr4 SUBDIR += apache-ant + SUBDIR += apache-commons-configuration + SUBDIR += apache-commons-io + SUBDIR += apache-commons-jxpath + SUBDIR += apache-commons-modeler SUBDIR += apache-rat SUBDIR += aphpbreakdown SUBDIR += aphpunit @@ -1026,11 +1030,7 @@ SUBDIR += itext SUBDIR += ivykis SUBDIR += iz - SUBDIR += jakarta-commons-configuration SUBDIR += jakarta-commons-daemon - SUBDIR += jakarta-commons-io - SUBDIR += jakarta-commons-jxpath - SUBDIR += jakarta-commons-modeler SUBDIR += jam SUBDIR += jansson SUBDIR += java-findbugs Index: devel/apache-commons-configuration/Makefile =================================================================== --- devel/apache-commons-configuration/Makefile +++ devel/apache-commons-configuration/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.10 CATEGORIES= devel java MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- +PKGNAMEPREFIX= apache- DISTNAME= ${PORTNAME}-${PORTVERSION}-bin MAINTAINER= ports@FreeBSD.org @@ -15,7 +15,7 @@ RUN_DEPENDS= ${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \ ${JAVALIBDIR}/commons-lang.jar:java/jakarta-commons-lang \ - ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging + ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: devel/apache-commons-configuration/pkg-descr =================================================================== --- devel/apache-commons-configuration/pkg-descr +++ devel/apache-commons-configuration/pkg-descr @@ -7,12 +7,17 @@ * Properties files * XML documents + * Windows INI files + * Property list files (plist) * JNDI * JDBC Datasource + * System properties + * Applet parameters + * Servlet parameters Different configuration sources can be mixed using a ConfigurationFactory and CompositeConfiguration. Additional sources of configuration parameters can be created by using custom configuration objects. This customization can be achieved by extending AbstractConfiguration. -WWW: http://jakarta.apache.org/commons/configuration/ +WWW: http://commons.apache.org/proper/commons-configuration/ Index: devel/apache-commons-io/Makefile =================================================================== --- devel/apache-commons-io/Makefile +++ devel/apache-commons-io/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 2.6 CATEGORIES= devel java MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- +PKGNAMEPREFIX= apache- DISTNAME= ${PORTNAME}-${PORTVERSION}-bin MAINTAINER= makc@FreeBSD.org Index: devel/apache-commons-jxpath/Makefile =================================================================== --- devel/apache-commons-jxpath/Makefile +++ devel/apache-commons-jxpath/Makefile @@ -5,8 +5,10 @@ PORTVERSION= 1.3 CATEGORIES= devel www java MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- +PKGNAMEPREFIX= apache- DISTNAME= ${PORTNAME}-${PORTVERSION}-bin + +LICENSE= APACHE20 MAINTAINER= ports@FreeBSD.org COMMENT= Utilities for manipulating Java Beans using the XPath syntax Index: devel/apache-commons-jxpath/pkg-descr =================================================================== --- devel/apache-commons-jxpath/pkg-descr +++ devel/apache-commons-jxpath/pkg-descr @@ -3,4 +3,4 @@ graphs of objects of all kinds: JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof. -WWW: http://jakarta.apache.org/commons/jxpath/ +WWW: http://commons.apache.org/proper/commons-jxpath/ Index: devel/apache-commons-modeler/Makefile =================================================================== --- devel/apache-commons-modeler/Makefile +++ devel/apache-commons-modeler/Makefile @@ -3,13 +3,14 @@ PORTNAME= commons-modeler PORTVERSION= 2.0.1 -PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- +PKGNAMEPREFIX= apache- MAINTAINER= ports@FreeBSD.org COMMENT= Mechanisms to create Model MBeans compatible with JMX specification + +LICENSE= APACHE20 USE_JAVA= yes JAVA_VERSION= 1.6+ Index: devel/apache-commons-modeler/pkg-descr =================================================================== --- devel/apache-commons-modeler/pkg-descr +++ devel/apache-commons-modeler/pkg-descr @@ -15,4 +15,4 @@ Model MBean to be supported. In addition, Modeler provides a factory mechanism to create the actual Model MBean instances themselves. -WWW: http://jakarta.apache.org/commons/modeler/ +WWW: https://commons.apache.org/dormant/commons-modeler/ Index: devel/charva/Makefile =================================================================== --- devel/charva/Makefile +++ devel/charva/Makefile @@ -3,7 +3,7 @@ PORTNAME= charva PORTVERSION= 1.1.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel java MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME} @@ -12,7 +12,7 @@ COMMENT= Java Windowing Toolkit for Text Terminals BUILD_DEPENDS= gmake:devel/gmake -RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging +RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging BROKEN_armv6= fails to compile: build.xml: compilation failed BROKEN_armv7= fails to compile: build.xml: compilation failed Index: devel/jakarta-commons-configuration/Makefile =================================================================== --- devel/jakarta-commons-configuration/Makefile +++ devel/jakarta-commons-configuration/Makefile @@ -1,39 +0,0 @@ -# Created by: Herve Quiroz -# $FreeBSD$ - -PORTNAME= commons-configuration -PORTVERSION= 1.10 -CATEGORIES= devel java -MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- -DISTNAME= ${PORTNAME}-${PORTVERSION}-bin - -MAINTAINER= ports@FreeBSD.org -COMMENT= Java package for the reading of configuration/preferences files - -LICENSE= APACHE20 - -RUN_DEPENDS= ${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \ - ${JAVALIBDIR}/commons-lang.jar:java/jakarta-commons-lang \ - ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -OPTIONS_DEFINE= DOCS - -USE_JAVA= yes -JAVA_VERSION= 1.6+ -NO_BUILD= yes - -PORTDOCS= * -PLIST_FILES+= %%JAVAJARDIR%%/${PORTNAME}.jar - -do-install: - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar \ - ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar - cd ${WRKSRC}/apidocs && ${FIND} . -type d -exec ${MKDIR} \ - ${STAGEDIR}${DOCSDIR}/{} \; - cd ${WRKSRC}/apidocs && ${FIND} . -type f -exec ${INSTALL_DATA} {} \ - ${STAGEDIR}${DOCSDIR}/{} \; - -.include Index: devel/jakarta-commons-configuration/distinfo =================================================================== --- devel/jakarta-commons-configuration/distinfo +++ devel/jakarta-commons-configuration/distinfo @@ -1,2 +0,0 @@ -SHA256 (commons-configuration-1.10-bin.tar.gz) = 02ae2071d761a571d4d7e13a79dac2bf1dd8d915227fbcf852f883baa06b1e03 -SIZE (commons-configuration-1.10-bin.tar.gz) = 3307649 Index: devel/jakarta-commons-configuration/pkg-descr =================================================================== --- devel/jakarta-commons-configuration/pkg-descr +++ devel/jakarta-commons-configuration/pkg-descr @@ -1,18 +0,0 @@ -Commons Configuration provides a generic configuration interface which enables -an application to read configuration data from a variety of sources. Commons -Configuration provides typed access to single, and multi-valued configuration -parameters. - -Configuration parameters may be loaded from the following sources: - - * Properties files - * XML documents - * JNDI - * JDBC Datasource - -Different configuration sources can be mixed using a ConfigurationFactory and -CompositeConfiguration. Additional sources of configuration parameters can be -created by using custom configuration objects. This customization can be -achieved by extending AbstractConfiguration. - -WWW: http://jakarta.apache.org/commons/configuration/ Index: devel/jakarta-commons-io/Makefile =================================================================== --- devel/jakarta-commons-io/Makefile +++ devel/jakarta-commons-io/Makefile @@ -1,42 +0,0 @@ -# Created by: Michael Winking -# $FreeBSD$ - -PORTNAME= commons-io -PORTVERSION= 2.6 -CATEGORIES= devel java -MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- -DISTNAME= ${PORTNAME}-${PORTVERSION}-bin - -MAINTAINER= makc@FreeBSD.org -COMMENT= Collection of I/O utilities for Java - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -USE_JAVA= 1.7+ - -NO_ARCH= yes -NO_BUILD= yes - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -PLIST_FILES= ${JAVAJARDIR}/${JARFILE_VER} \ - ${JAVAJARDIR}/${JARFILE} -PORTDOCS= * - -JARFILE= ${PORTNAME}.jar -JARFILE_VER= ${PORTNAME}-${PORTVERSION}.jar - -OPTIONS_DEFINE= DOCS - -do-install: - ${INSTALL_DATA} ${WRKSRC}/${JARFILE_VER} ${STAGEDIR}${JAVAJARDIR} - ${LN} -sf ${JARFILE_VER} ${STAGEDIR}${JAVAJARDIR}/${JARFILE} - -do-install-DOCS-on: - (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) - (cd ${WRKSRC} && ${INSTALL_DATA} NOTICE.txt \ - RELEASE-NOTES.txt ${STAGEDIR}${DOCSDIR}) - -.include Index: devel/jakarta-commons-io/distinfo =================================================================== --- devel/jakarta-commons-io/distinfo +++ devel/jakarta-commons-io/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1566334278 -SHA256 (commons-io-2.6-bin.tar.gz) = b6ba5fb49c5f6406dbabec2b77205c032b0b2ade6c217d20a9819a121fdaf3db -SIZE (commons-io-2.6-bin.tar.gz) = 2241513 Index: devel/jakarta-commons-io/pkg-descr =================================================================== --- devel/jakarta-commons-io/pkg-descr +++ devel/jakarta-commons-io/pkg-descr @@ -1,9 +0,0 @@ -Commons IO is a library of utilities to assist with developing IO functionality. - -There are three main areas included: - - * Utility classes - with static methods to perform common tasks - * Filters - various implementations of file filters - * Streams - useful stream, reader and writer implementations - -WWW: http://commons.apache.org/proper/commons-io/ Index: devel/jakarta-commons-jxpath/Makefile =================================================================== --- devel/jakarta-commons-jxpath/Makefile +++ devel/jakarta-commons-jxpath/Makefile @@ -1,29 +0,0 @@ -# Created by: Nemo Liu -# $FreeBSD$ - -PORTNAME= commons-jxpath -PORTVERSION= 1.3 -CATEGORIES= devel www java -MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- -DISTNAME= ${PORTNAME}-${PORTVERSION}-bin - -MAINTAINER= ports@FreeBSD.org -COMMENT= Utilities for manipulating Java Beans using the XPath syntax - -USE_JAVA= yes -JAVA_VERSION= 1.6+ -NO_BUILD= yes - -PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar -PORTDOCS= * - -OPTIONS_DEFINE= DOCS - -do-install: - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}-${PORTVERSION}.jar \ - ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar - (cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/apidocs && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) - -.include Index: devel/jakarta-commons-jxpath/distinfo =================================================================== --- devel/jakarta-commons-jxpath/distinfo +++ devel/jakarta-commons-jxpath/distinfo @@ -1,2 +0,0 @@ -SHA256 (commons-jxpath-1.3-bin.tar.gz) = 3eaebe66f81b9dd58f523e763329a443ac56bba95c0b2ab9a3861179d8944973 -SIZE (commons-jxpath-1.3-bin.tar.gz) = 3062527 Index: devel/jakarta-commons-jxpath/pkg-descr =================================================================== --- devel/jakarta-commons-jxpath/pkg-descr +++ devel/jakarta-commons-jxpath/pkg-descr @@ -1,6 +0,0 @@ -The org.apache.commons.jxpath package defines a simple interpreter of an -expression language called XPath. JXPath applies XPath expressions to -graphs of objects of all kinds: JavaBeans, Maps, Servlet contexts, DOM -etc, including mixtures thereof. - -WWW: http://jakarta.apache.org/commons/jxpath/ Index: devel/jakarta-commons-modeler/Makefile =================================================================== --- devel/jakarta-commons-modeler/Makefile +++ devel/jakarta-commons-modeler/Makefile @@ -1,30 +0,0 @@ -# Created by: Nemo Liu -# $FreeBSD$ - -PORTNAME= commons-modeler -PORTVERSION= 2.0.1 -PORTREVISION= 1 -CATEGORIES= devel java -MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- - -MAINTAINER= ports@FreeBSD.org -COMMENT= Mechanisms to create Model MBeans compatible with JMX specification - -USE_JAVA= yes -JAVA_VERSION= 1.6+ -NO_BUILD= yes - -PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar -PORTDOCS= * - -OPTIONS_DEFINE= DOCS - -do-install: - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar \ - ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar - (cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}) - (cd ${WRKSRC} && ${INSTALL_DATA} LICENSE.txt NOTICE.txt \ - RELEASE-NOTES.txt ${STAGEDIR}${DOCSDIR}) - -.include Index: devel/jakarta-commons-modeler/distinfo =================================================================== --- devel/jakarta-commons-modeler/distinfo +++ devel/jakarta-commons-modeler/distinfo @@ -1,2 +0,0 @@ -SHA256 (commons-modeler-2.0.1.tar.gz) = c5aea7f3eb2443635023e158618f8a03d9ac404b37d1b54bbe7f3d17440b4798 -SIZE (commons-modeler-2.0.1.tar.gz) = 764950 Index: devel/jakarta-commons-modeler/pkg-descr =================================================================== --- devel/jakarta-commons-modeler/pkg-descr +++ devel/jakarta-commons-modeler/pkg-descr @@ -1,18 +0,0 @@ -java Management Extensions (JMX) is an API that facilitates building management -applications that can configure, and perform operations on, a server applica --tion. In general, each manageable component of the server application is re --presented by a Management Bean (or MBean, for short). JMX defines three types -of MBeans, of which Model MBeans are the most flexible. Model MBeans provide a -way to define MBeans for many different components, without having to write a -specific MBean implementation class for each one. - -However, this power comes at a price. It is necessary to set up a substantial -amount of metadata about each MBean, including the attributes it should expose -(similar to JavaBeans properties), the operations it should make available (si --milar to calling methods of a Java object via reflection), and other related -information. The Modeler component is designed to make this process fairly pain --less -- the required metadata is configured from an XML description of each -Model MBean to be supported. In addition, Modeler provides a factory mechanism -to create the actual Model MBean instances themselves. - -WWW: http://jakarta.apache.org/commons/modeler/ Index: editors/openoffice-devel/Makefile =================================================================== --- editors/openoffice-devel/Makefile +++ editors/openoffice-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP} -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \ @@ -232,8 +232,8 @@ .endif .if ${PORT_OPTIONS:MREPORT_BUILDER} || ${PORT_OPTIONS:MWIKI_PUBLISHER} -BUILD_DEPENDS+= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging -RUN_DEPENDS+= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging +BUILD_DEPENDS+= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging +RUN_DEPENDS+= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging CONFIGURE_ARGS+= --with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar .else CONFIGURE_ARGS+= --without-commons-logging Index: java/Makefile =================================================================== --- java/Makefile +++ java/Makefile @@ -3,6 +3,11 @@ COMMENT = Java language support + SUBDIR += apache-commons-cli + SUBDIR += apache-commons-collections + SUBDIR += apache-commons-lang + SUBDIR += apache-commons-logging + SUBDIR += apache-commons-primitives SUBDIR += aparapi SUBDIR += avis SUBDIR += berkeley-db @@ -39,17 +44,12 @@ SUBDIR += jai SUBDIR += jakarta-bcel SUBDIR += jakarta-commons-beanutils - SUBDIR += jakarta-commons-cli SUBDIR += jakarta-commons-codec - SUBDIR += jakarta-commons-collections SUBDIR += jakarta-commons-dbcp SUBDIR += jakarta-commons-discovery SUBDIR += jakarta-commons-httpclient - SUBDIR += jakarta-commons-lang SUBDIR += jakarta-commons-lang3 - SUBDIR += jakarta-commons-logging SUBDIR += jakarta-commons-pool - SUBDIR += jakarta-commons-primitives SUBDIR += jakarta-oro SUBDIR += jakarta-regexp SUBDIR += jasmin Index: java/apache-commons-cli/Makefile =================================================================== --- java/apache-commons-cli/Makefile +++ java/apache-commons-cli/Makefile @@ -3,10 +3,9 @@ PORTNAME= commons-cli PORTVERSION= 1.4 -PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- +PKGNAMEPREFIX= apache- DISTNAME= ${PORTNAME}-${PORTVERSION}-bin MAINTAINER= ports@FreeBSD.org Index: java/apache-commons-cli/pkg-descr =================================================================== --- java/apache-commons-cli/pkg-descr +++ java/apache-commons-cli/pkg-descr @@ -1,4 +1,4 @@ -The Jakarta Commons CLI library provides a simple and easy to use +The Apache Commons CLI library provides a simple and easy to use API for working with the command line arguments and options. -WWW: http://jakarta.apache.org/commons/cli/ +WWW: http://commons.apache.org/proper/commons-cli/ Index: java/apache-commons-collections/Makefile =================================================================== --- java/apache-commons-collections/Makefile +++ java/apache-commons-collections/Makefile @@ -5,16 +5,19 @@ PORTVERSION= 3.2.1 CATEGORIES= java devel MASTER_SITES= APACHE_COMMONS_SOURCE -PKGNAMEPREFIX= jakarta- +PKGNAMEPREFIX= apache- DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= makc@FreeBSD.org COMMENT= Classes that extend/augment the Java Collections Framework +LICENSE= APACHE20 + +USES= dos2unix + USE_JAVA= yes -JAVA_VERSION= 1.6+ +JAVA_VERSION= 8+ USE_ANT= yes -USES= dos2unix DOS2UNIX_GLOB= Multi*.java Test*.java ALL_TARGET= jar Index: java/apache-commons-collections/distinfo =================================================================== --- java/apache-commons-collections/distinfo +++ java/apache-commons-collections/distinfo @@ -1,2 +1,3 @@ +TIMESTAMP = 1570206793 SHA256 (commons-collections-3.2.1-src.tar.gz) = 9a4a800cb7ecdaf3b6f608cd608682b88b506f1b1c4b727d15471ae3329fc63d SIZE (commons-collections-3.2.1-src.tar.gz) = 609930 Index: java/apache-commons-collections/files/patch-jdk8 =================================================================== --- java/apache-commons-collections/files/patch-jdk8 +++ java/apache-commons-collections/files/patch-jdk8 @@ -1,6 +1,6 @@ ---- src/java/org/apache/commons/collections/MultiHashMap.java +--- src/java/org/apache/commons/collections/MultiHashMap.java.orig 2019-10-04 16:36:43 UTC +++ src/java/org/apache/commons/collections/MultiHashMap.java -@@ -331,21 +331,21 @@ public class MultiHashMap extends HashMap implements MultiMap { +@@ -331,21 +331,21 @@ public class MultiHashMap extends HashMap implements M * @param item the value to remove * @return the value removed (which was passed in), null if nothing removed */ @@ -26,8 +26,7 @@ } /** - ---- src/java/org/apache/commons/collections/MultiMap.java +--- src/java/org/apache/commons/collections/MultiMap.java.orig 2019-10-04 16:36:43 UTC +++ src/java/org/apache/commons/collections/MultiMap.java @@ -66,7 +66,7 @@ public interface MultiMap extends Map { * @throws ClassCastException if the key or value is of an invalid type @@ -47,8 +46,7 @@ /** * Gets a collection containing all the values in the map. - ---- src/java/org/apache/commons/collections/map/MultiKeyMap.java +--- src/java/org/apache/commons/collections/map/MultiKeyMap.java.orig 2019-10-04 16:36:43 UTC +++ src/java/org/apache/commons/collections/map/MultiKeyMap.java @@ -197,7 +197,7 @@ public class MultiKeyMap * @param key2 the second key @@ -76,10 +74,9 @@ } /** - ---- src/java/org/apache/commons/collections/map/MultiValueMap.java +--- src/java/org/apache/commons/collections/map/MultiValueMap.java.orig 2019-10-04 16:36:43 UTC +++ src/java/org/apache/commons/collections/map/MultiValueMap.java -@@ -153,19 +153,19 @@ public class MultiValueMap extends AbstractMapDecorator implements MultiMap { +@@ -153,19 +153,19 @@ public class MultiValueMap extends AbstractMapDecorato * @param value the value to remove * @return the value removed (which was passed in), null if nothing removed */ @@ -103,10 +100,9 @@ } /** - ---- src/test/org/apache/commons/collections/TestMultiHashMap.java +--- src/test/org/apache/commons/collections/TestMultiHashMap.java.orig 2019-10-04 16:36:43 UTC +++ src/test/org/apache/commons/collections/TestMultiHashMap.java -@@ -464,11 +464,11 @@ public class TestMultiHashMap extends AbstractTestMap { +@@ -464,11 +464,11 @@ public class TestMultiHashMap extends AbstractTestMap map.put("A", "AA"); map.put("A", "AB"); map.put("A", "AC"); @@ -123,10 +119,9 @@ assertEquals(new MultiHashMap(), map); } - ---- src/test/org/apache/commons/collections/map/TestMultiKeyMap.java +--- src/test/org/apache/commons/collections/map/TestMultiKeyMap.java.orig 2019-10-04 16:36:43 UTC +++ src/test/org/apache/commons/collections/map/TestMultiKeyMap.java -@@ -315,10 +315,10 @@ public class TestMultiKeyMap extends AbstractTestIterableMap { +@@ -315,10 +315,10 @@ public class TestMultiKeyMap extends AbstractTestItera switch (key.size()) { case 2: assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1))); @@ -139,6 +134,3 @@ assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1))); break; case 3: --- -2.5.0 - Index: java/apache-commons-collections/pkg-descr =================================================================== --- java/apache-commons-collections/pkg-descr +++ java/apache-commons-collections/pkg-descr @@ -1,12 +1,11 @@ A suite of classes that extend or augment the Java Collections Framework. -There are certain holes left unfilled by Sun's implementations, and the -Jakarta-Commons Collections Component strives to fulfill them. Among the -features of this package are: +Commons-Collections seek to build upon the JDK classes by providing new interfaces, implementations and utilities. There are many features, +including: Special-purpose implementations of Lists and Maps for fast access Adapter classes from Java1-style containers (arrays, enumerations) to Java 2-style collections. Methods to test or create typical set-theory properties of collections such as union, intersection, and closure. -WWW: http://jakarta.apache.org/commons/collections/ +WWW: http://commons.apache.org/proper/commons-collections/ Index: java/apache-commons-lang/Makefile =================================================================== --- java/apache-commons-lang/Makefile +++ java/apache-commons-lang/Makefile @@ -5,11 +5,11 @@ PORTVERSION= 2.6 CATEGORIES= java devel MASTER_SITES= APACHE_COMMONS_SOURCE -PKGNAMEPREFIX= jakarta- +PKGNAMEPREFIX= apache- DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org -COMMENT= Jakarta library with helper utilities for the java.lang API +COMMENT= Apache library with helper utilities for the java.lang API LICENSE= APACHE20 Index: java/apache-commons-lang/pkg-descr =================================================================== --- java/apache-commons-lang/pkg-descr +++ java/apache-commons-lang/pkg-descr @@ -10,4 +10,4 @@ nested-Exceptions and a series of utlities dedicated to help with building methods, such as hashCode, toString and equals. -WWW: http://jakarta.apache.org/commons/lang/ +WWW: http://commons.apache.org/proper/commons-lang/ Index: java/apache-commons-logging/Makefile =================================================================== --- java/apache-commons-logging/Makefile +++ java/apache-commons-logging/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.2 CATEGORIES= java devel MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- +PKGNAMEPREFIX= apache- DISTNAME= ${PORTNAME}-${PORTVERSION}-bin MAINTAINER= makc@FreeBSD.org Index: java/apache-commons-logging/distinfo =================================================================== --- java/apache-commons-logging/distinfo +++ java/apache-commons-logging/distinfo @@ -1,2 +1,3 @@ +TIMESTAMP = 1570207571 SHA256 (commons-logging-1.2-bin.tar.gz) = 3f758805c7290d9c6d22d1451587c9f7232744aef4c984e88aa683cdea0587bd SIZE (commons-logging-1.2-bin.tar.gz) = 315429 Index: java/apache-commons-logging/pkg-descr =================================================================== --- java/apache-commons-logging/pkg-descr +++ java/apache-commons-logging/pkg-descr @@ -1,4 +1,4 @@ -Jakarta Commons Logging library. +Apache Commons Logging library. There is a great need for debugging and logging information inside of Commons components such as HTTPClient and DBCP. However, there are many logging APIs @@ -9,4 +9,4 @@ and run-time dependencies on any particular logging package, and contributors may write Log implementations for the library of their choice. -WWW: http://jakarta.apache.org/commons/logging/ +WWW: http://commons.apache.org/proper/commons-logging/ Index: java/apache-commons-primitives/Makefile =================================================================== --- java/apache-commons-primitives/Makefile +++ java/apache-commons-primitives/Makefile @@ -3,14 +3,15 @@ PORTNAME= commons-primitives PORTVERSION= 1.0 -PORTREVISION= 3 CATEGORIES= java MASTER_SITES= APACHE_COMMONS_SOURCE -PKGNAMEPREFIX= jakarta- +PKGNAMEPREFIX= apache- DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= Library supporting Java primitive types + +LICENSE= APACHE20 USE_JAVA= yes JAVA_VERSION= 1.6+ Index: java/apache-commons-primitives/pkg-descr =================================================================== --- java/apache-commons-primitives/pkg-descr +++ java/apache-commons-primitives/pkg-descr @@ -1,4 +1,4 @@ -Apache Jakarta Commons Primitives provides a collection of types and utilities +Apache Commons Primitives provides a collection of types and utilities optimized for working with Java primitives (boolean, byte, char, double, float, int, long, short). Generally, the Commons-Primitives classes are faster, smaller and easier to work with than their purely Object based alternatives. @@ -6,4 +6,4 @@ Currently Commons Primitives is primarily composed of implementations of the java.util collections adapted for the primitive types. -WWW: http://jakarta.apache.org/commons/primitives +WWW: http://commons.apache.org/dormant/commons-primitives/ Index: java/jakarta-commons-beanutils/Makefile =================================================================== --- java/jakarta-commons-beanutils/Makefile +++ java/jakarta-commons-beanutils/Makefile @@ -3,6 +3,7 @@ PORTNAME= commons-beanutils PORTVERSION= 1.9.2 +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= APACHE_COMMONS_SOURCE PKGNAMEPREFIX= jakarta- @@ -13,10 +14,10 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \ - ${JAVALIBDIR}/commons-collections.jar:java/jakarta-commons-collections -RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \ - ${JAVALIBDIR}/commons-collections.jar:java/jakarta-commons-collections +BUILD_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \ + ${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections +RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \ + ${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections USES= dos2unix USE_JAVA= yes Index: java/jakarta-commons-cli/Makefile =================================================================== --- java/jakarta-commons-cli/Makefile +++ java/jakarta-commons-cli/Makefile @@ -1,40 +0,0 @@ -# Created by: Ernst de Haan -# $FreeBSD$ - -PORTNAME= commons-cli -PORTVERSION= 1.4 -PORTEPOCH= 1 -CATEGORIES= java devel -MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- -DISTNAME= ${PORTNAME}-${PORTVERSION}-bin - -MAINTAINER= ports@FreeBSD.org -COMMENT= Java library for command line arguments and options - -LICENSE= APACHE20 - -USE_JAVA= yes -JAVA_VERSION= 1.6+ -NO_BUILD= yes - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -JARFILE= ${PORTNAME}-${PORTVERSION}.jar -DESTJARFILE= ${PORTNAME}.jar -PLIST_FILES= %%JAVAJARDIR%%/${DESTJARFILE} -PORTDOCS= * - -OPTIONS_DEFINE= DOCS - -do-install: - ${INSTALL_DATA} ${WRKSRC}/${JARFILE} \ - ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE} - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR}) - (cd ${WRKSRC} && ${INSTALL_DATA} LICENSE.txt NOTICE.txt \ - RELEASE-NOTES.txt ${STAGEDIR}${DOCSDIR}) - -.include Index: java/jakarta-commons-cli/distinfo =================================================================== --- java/jakarta-commons-cli/distinfo +++ java/jakarta-commons-cli/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1489478273 -SHA256 (commons-cli-1.4-bin.tar.gz) = e9f134cd94c13a77b87648871140104338a3b90320658c1860b73f4d5732a793 -SIZE (commons-cli-1.4-bin.tar.gz) = 505547 Index: java/jakarta-commons-cli/pkg-descr =================================================================== --- java/jakarta-commons-cli/pkg-descr +++ java/jakarta-commons-cli/pkg-descr @@ -1,4 +0,0 @@ -The Jakarta Commons CLI library provides a simple and easy to use -API for working with the command line arguments and options. - -WWW: http://jakarta.apache.org/commons/cli/ Index: java/jakarta-commons-collections/Makefile =================================================================== --- java/jakarta-commons-collections/Makefile +++ java/jakarta-commons-collections/Makefile @@ -1,40 +0,0 @@ -# Created by: Ernst de Haan -# $FreeBSD$ - -PORTNAME= commons-collections -PORTVERSION= 3.2.1 -CATEGORIES= java devel -MASTER_SITES= APACHE_COMMONS_SOURCE -PKGNAMEPREFIX= jakarta- -DISTNAME= ${PORTNAME}-${PORTVERSION}-src - -MAINTAINER= makc@FreeBSD.org -COMMENT= Classes that extend/augment the Java Collections Framework - -USE_JAVA= yes -JAVA_VERSION= 1.6+ -USE_ANT= yes -USES= dos2unix -DOS2UNIX_GLOB= Multi*.java Test*.java - -ALL_TARGET= jar -PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar -OTHERDOCS= DEVELOPERS-GUIDE.html LICENSE.txt PROPOSAL.html README.txt RELEASE-NOTES.html -PORTDOCS= apidocs ${OTHERDOCS} - -OPTIONS_DEFINE= DOCS - -DOCS_ALL_TARGET= javadoc - -do-install: - @${MKDIR} ${STAGEDIR}${JAVAJARDIR} - ${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}-${PORTVERSION}.jar \ - ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/build/docs && \ - ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR}) - ${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} - -.include Index: java/jakarta-commons-collections/distinfo =================================================================== --- java/jakarta-commons-collections/distinfo +++ java/jakarta-commons-collections/distinfo @@ -1,2 +0,0 @@ -SHA256 (commons-collections-3.2.1-src.tar.gz) = 9a4a800cb7ecdaf3b6f608cd608682b88b506f1b1c4b727d15471ae3329fc63d -SIZE (commons-collections-3.2.1-src.tar.gz) = 609930 Index: java/jakarta-commons-collections/files/patch-jdk8 =================================================================== --- java/jakarta-commons-collections/files/patch-jdk8 +++ java/jakarta-commons-collections/files/patch-jdk8 @@ -1,144 +0,0 @@ ---- src/java/org/apache/commons/collections/MultiHashMap.java -+++ src/java/org/apache/commons/collections/MultiHashMap.java -@@ -331,21 +331,21 @@ public class MultiHashMap extends HashMap implements MultiMap { - * @param item the value to remove - * @return the value removed (which was passed in), null if nothing removed - */ -- public Object remove(Object key, Object item) { -+ public boolean remove(Object key, Object item) { - Collection valuesForKey = getCollection(key); - if (valuesForKey == null) { -- return null; -+ return false; - } - boolean removed = valuesForKey.remove(item); - if (removed == false) { -- return null; -+ return false; - } - // remove the list if it is now empty - // (saves space, and allows equals to work) - if (valuesForKey.isEmpty()){ - remove(key); - } -- return item; -+ return true; - } - - /** - ---- src/java/org/apache/commons/collections/MultiMap.java -+++ src/java/org/apache/commons/collections/MultiMap.java -@@ -66,7 +66,7 @@ public interface MultiMap extends Map { - * @throws ClassCastException if the key or value is of an invalid type - * @throws NullPointerException if the key or value is null and null is invalid - */ -- public Object remove(Object key, Object item); -+ public boolean remove(Object key, Object item); - - //----------------------------------------------------------------------- - /** -@@ -144,7 +144,7 @@ public interface MultiMap extends Map { - * @throws ClassCastException if the key is of an invalid type - * @throws NullPointerException if the key is null and null keys are invalid - */ -- Object remove(Object key); -+ //boolean remove(Object key); - - /** - * Gets a collection containing all the values in the map. - ---- src/java/org/apache/commons/collections/map/MultiKeyMap.java -+++ src/java/org/apache/commons/collections/map/MultiKeyMap.java -@@ -197,7 +197,7 @@ public class MultiKeyMap - * @param key2 the second key - * @return the value mapped to the removed key, null if key not in map - */ -- public Object remove(Object key1, Object key2) { -+ public boolean remove(Object key1, Object key2) { - int hashCode = hash(key1, key2); - int index = map.hashIndex(hashCode, map.data.length); - AbstractHashedMap.HashEntry entry = map.data[index]; -@@ -206,12 +206,14 @@ public class MultiKeyMap - if (entry.hashCode == hashCode && isEqualKey(entry, key1, key2)) { - Object oldValue = entry.getValue(); - map.removeMapping(entry, index, previous); -- return oldValue; -+ //return oldValue; -+ return true; - } - previous = entry; - entry = entry.next; - } -- return null; -+ //return null; -+ return false; - } - - /** - ---- src/java/org/apache/commons/collections/map/MultiValueMap.java -+++ src/java/org/apache/commons/collections/map/MultiValueMap.java -@@ -153,19 +153,19 @@ public class MultiValueMap extends AbstractMapDecorator implements MultiMap { - * @param value the value to remove - * @return the value removed (which was passed in), null if nothing removed - */ -- public Object remove(Object key, Object value) { -+ public boolean remove(Object key, Object value) { - Collection valuesForKey = getCollection(key); - if (valuesForKey == null) { -- return null; -+ return false; - } - boolean removed = valuesForKey.remove(value); - if (removed == false) { -- return null; -+ return false; - } - if (valuesForKey.isEmpty()) { - remove(key); - } -- return value; -+ return true; - } - - /** - ---- src/test/org/apache/commons/collections/TestMultiHashMap.java -+++ src/test/org/apache/commons/collections/TestMultiHashMap.java -@@ -464,11 +464,11 @@ public class TestMultiHashMap extends AbstractTestMap { - map.put("A", "AA"); - map.put("A", "AB"); - map.put("A", "AC"); -- assertEquals(null, map.remove("C", "CA")); -- assertEquals(null, map.remove("A", "AD")); -- assertEquals("AC", map.remove("A", "AC")); -- assertEquals("AB", map.remove("A", "AB")); -- assertEquals("AA", map.remove("A", "AA")); -+ assertEquals(false, map.remove("C", "CA")); -+ assertEquals(false, map.remove("A", "AD")); -+ assertEquals(true, map.remove("A", "AC")); -+ assertEquals(true, map.remove("A", "AB")); -+ assertEquals(true, map.remove("A", "AA")); - assertEquals(new MultiHashMap(), map); - } - - ---- src/test/org/apache/commons/collections/map/TestMultiKeyMap.java -+++ src/test/org/apache/commons/collections/map/TestMultiKeyMap.java -@@ -315,10 +315,10 @@ public class TestMultiKeyMap extends AbstractTestIterableMap { - switch (key.size()) { - case 2: - assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1))); -- assertEquals(value, multimap.remove(key.getKey(0), key.getKey(1))); -+ assertEquals(true, multimap.remove(key.getKey(0), key.getKey(1))); - assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1))); - assertEquals(size - 1, multimap.size()); -- assertEquals(null, multimap.remove(key.getKey(0), key.getKey(1))); -+ assertEquals(false, multimap.remove(key.getKey(0), key.getKey(1))); - assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1))); - break; - case 3: --- -2.5.0 - Index: java/jakarta-commons-collections/pkg-descr =================================================================== --- java/jakarta-commons-collections/pkg-descr +++ java/jakarta-commons-collections/pkg-descr @@ -1,12 +0,0 @@ -A suite of classes that extend or augment the Java Collections Framework. - -There are certain holes left unfilled by Sun's implementations, and the -Jakarta-Commons Collections Component strives to fulfill them. Among the -features of this package are: - -Special-purpose implementations of Lists and Maps for fast access Adapter -classes from Java1-style containers (arrays, enumerations) to Java 2-style -collections. Methods to test or create typical set-theory properties of -collections such as union, intersection, and closure. - -WWW: http://jakarta.apache.org/commons/collections/ Index: java/jakarta-commons-httpclient/Makefile =================================================================== --- java/jakarta-commons-httpclient/Makefile +++ java/jakarta-commons-httpclient/Makefile @@ -3,7 +3,7 @@ PORTNAME= commons-httpclient DISTVERSION= 3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java www MASTER_SITES= APACHE/httpcomponents/${PORTNAME}/source PKGNAMEPREFIX= jakarta- @@ -14,9 +14,9 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging +BUILD_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging BUILD_DEPENDS+= ${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec -RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging +RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging RUN_DEPENDS+= ${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec OPTIONS_DEFINE= DOCS Index: java/jakarta-commons-lang/Makefile =================================================================== --- java/jakarta-commons-lang/Makefile +++ java/jakarta-commons-lang/Makefile @@ -1,48 +0,0 @@ -# Created by: Ernst de Haan -# $FreeBSD$ - -PORTNAME= commons-lang -PORTVERSION= 2.6 -CATEGORIES= java devel -MASTER_SITES= APACHE_COMMONS_SOURCE -PKGNAMEPREFIX= jakarta- -DISTNAME= ${PORTNAME}-${PORTVERSION}-src - -MAINTAINER= ports@FreeBSD.org -COMMENT= Jakarta library with helper utilities for the java.lang API - -LICENSE= APACHE20 - -USE_JAVA= yes -JAVA_VERSION= 1.6+ -USE_ANT= yes -ALL_TARGET= jar - -JARFILE= ${PORTNAME}-${PORTVERSION}.jar -DESTJARFILE= ${PORTNAME}.jar -PLIST_FILES= %%JAVAJARDIR%%/${DESTJARFILE} -PORTDOCS= * - -OPTIONS_DEFINE= DOCS - -.include - -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= javadoc -.endif - -JDK_API!= (${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null || ${ECHO_CMD}) | ${TAIL} -n 1 - -.if ${JDK_API} != "" -MAKE_ARGS+= -Djdk.javadoc=${JDK_API} -.endif - -do-install: - ${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} \ - ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE} -.if ${PORT_OPTIONS:MDOCS} - (cd ${WRKSRC}/target/apidocs && ${COPYTREE_SHARE} . \ - ${STAGEDIR}${DOCSDIR}) -.endif - -.include Index: java/jakarta-commons-lang/distinfo =================================================================== --- java/jakarta-commons-lang/distinfo +++ java/jakarta-commons-lang/distinfo @@ -1,2 +0,0 @@ -SHA256 (commons-lang-2.6-src.tar.gz) = 05479771851be0af057032fa26ad90aa0c91c10e1fc4439558a1ffa6f053bcd7 -SIZE (commons-lang-2.6-src.tar.gz) = 564032 Index: java/jakarta-commons-lang/pkg-descr =================================================================== --- java/jakarta-commons-lang/pkg-descr +++ java/jakarta-commons-lang/pkg-descr @@ -1,13 +0,0 @@ -The standard Java libraries fail to provide enough methods for -manipulation of its core classes. The Lang Component provides -these extra methods. - -The Lang Component provides a host of helper utilities for the -java.lang API, notably String manipulation methods, basic -numerical methods, object reflection, creation and serialization, -and System properties. Additionally it contains an inheritable -enum type, an exception structure that supports multiple types of -nested-Exceptions and a series of utlities dedicated to help with -building methods, such as hashCode, toString and equals. - -WWW: http://jakarta.apache.org/commons/lang/ Index: java/jakarta-commons-logging/Makefile =================================================================== --- java/jakarta-commons-logging/Makefile +++ java/jakarta-commons-logging/Makefile @@ -1,35 +0,0 @@ -# Created by: Ernst de Haan -# $FreeBSD$ - -PORTNAME= commons-logging -PORTVERSION= 1.2 -CATEGORIES= java devel -MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- -DISTNAME= ${PORTNAME}-${PORTVERSION}-bin - -MAINTAINER= makc@FreeBSD.org -COMMENT= Generic logging wrapper library - -LICENSE= APACHE20 - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -OPTIONS_DEFINE= DOCS - -USE_JAVA= yes -JAVA_VERSION= 1.6+ -NO_BUILD= yes - -JARFILE= ${PORTNAME}-${PORTVERSION}.jar - -PORTDOCS= * -PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar \ - %%JAVAJARDIR%%/${JARFILE} - -do-install: - ${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${STAGEDIR}${JAVAJARDIR} - ${LN} -sf ${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar - (cd ${WRKSRC}/apidocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) - -.include Index: java/jakarta-commons-logging/distinfo =================================================================== --- java/jakarta-commons-logging/distinfo +++ java/jakarta-commons-logging/distinfo @@ -1,2 +0,0 @@ -SHA256 (commons-logging-1.2-bin.tar.gz) = 3f758805c7290d9c6d22d1451587c9f7232744aef4c984e88aa683cdea0587bd -SIZE (commons-logging-1.2-bin.tar.gz) = 315429 Index: java/jakarta-commons-logging/pkg-descr =================================================================== --- java/jakarta-commons-logging/pkg-descr +++ java/jakarta-commons-logging/pkg-descr @@ -1,12 +0,0 @@ -Jakarta Commons Logging library. - -There is a great need for debugging and logging information inside of Commons -components such as HTTPClient and DBCP. However, there are many logging APIs -out there and it is difficult to choose among them. - -The Logging package is an ultra-thin bridge between different logging -libraries. Commons components may use the Logging API to remove compile-time -and run-time dependencies on any particular logging package, and contributors -may write Log implementations for the library of their choice. - -WWW: http://jakarta.apache.org/commons/logging/ Index: java/jakarta-commons-primitives/Makefile =================================================================== --- java/jakarta-commons-primitives/Makefile +++ java/jakarta-commons-primitives/Makefile @@ -1,42 +0,0 @@ -# Created by: Herve Quiroz -# $FreeBSD$ - -PORTNAME= commons-primitives -PORTVERSION= 1.0 -PORTREVISION= 3 -CATEGORIES= java -MASTER_SITES= APACHE_COMMONS_SOURCE -PKGNAMEPREFIX= jakarta- -DISTNAME= ${PORTNAME}-${PORTVERSION}-src - -MAINTAINER= ports@FreeBSD.org -COMMENT= Library supporting Java primitive types - -USE_JAVA= yes -JAVA_VERSION= 1.6+ -USE_ANT= yes - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -ALL_TARGET= jar - -PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar -PORTDOCS= * - -OPTIONS_DEFINE= DOCS - -.include - -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= javadoc -.endif - -do-install: - ${INSTALL_DATA} ${WRKSRC}/target/${PORTNAME}-${PORTVERSION}.jar \ - ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/target/docs && ${COPYTREE_SHARE} api ${STAGEDIR}${DOCSDIR}) - ${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${STAGEDIR}${DOCSDIR} -.endif - -.include Index: java/jakarta-commons-primitives/distinfo =================================================================== --- java/jakarta-commons-primitives/distinfo +++ java/jakarta-commons-primitives/distinfo @@ -1,2 +0,0 @@ -SHA256 (commons-primitives-1.0-src.tar.gz) = 96927b484b8cac7e33612469099e7bbd7139cbc79666d5612a32c997fa671ac4 -SIZE (commons-primitives-1.0-src.tar.gz) = 172369 Index: java/jakarta-commons-primitives/pkg-descr =================================================================== --- java/jakarta-commons-primitives/pkg-descr +++ java/jakarta-commons-primitives/pkg-descr @@ -1,9 +0,0 @@ -Apache Jakarta Commons Primitives provides a collection of types and utilities -optimized for working with Java primitives (boolean, byte, char, double, float, -int, long, short). Generally, the Commons-Primitives classes are faster, -smaller and easier to work with than their purely Object based alternatives. - -Currently Commons Primitives is primarily composed of implementations of the -java.util collections adapted for the primitive types. - -WWW: http://jakarta.apache.org/commons/primitives Index: java/jakarta-oro/pkg-descr =================================================================== --- java/jakarta-oro/pkg-descr +++ java/jakarta-oro/pkg-descr @@ -7,4 +7,6 @@ the Jakarta Project by Daniel Savarese (www.savarese.org), the copyright holder of the ORO libraries. +As of 2010-09-01, the ORO project is retired. + WWW: http://jakarta.apache.org/oro/ Index: java/jakarta-regexp/pkg-descr =================================================================== --- java/jakarta-regexp/pkg-descr +++ java/jakarta-regexp/pkg-descr @@ -1,3 +1,5 @@ A 100% Pure Java Regular Expression package by Jonathan Locke. +As of 2011-04-17, the Regexp project is retired. + WWW: http://jakarta.apache.org/regexp/ Index: lang/Makefile =================================================================== --- lang/Makefile +++ lang/Makefile @@ -11,6 +11,7 @@ SUBDIR += alchemist.el SUBDIR += algol68g SUBDIR += angelscript + SUBDIR += apache-commons-jelly SUBDIR += arena SUBDIR += asis SUBDIR += asn1c @@ -152,7 +153,6 @@ SUBDIR += io-devel SUBDIR += itcl SUBDIR += itcl4 - SUBDIR += jakarta-commons-jelly SUBDIR += janet SUBDIR += jimtcl SUBDIR += jruby Index: lang/apache-commons-jelly/Makefile =================================================================== --- lang/apache-commons-jelly/Makefile +++ lang/apache-commons-jelly/Makefile @@ -3,13 +3,14 @@ PORTNAME= commons-jelly PORTVERSION= 1.0 -PORTREVISION= 3 CATEGORIES= lang devel java MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- +PKGNAMEPREFIX= apache- MAINTAINER= ports@FreeBSD.org COMMENT= XML based scripting engine + +LICENSE= APACHE20 USE_JAVA= yes JAVA_VERSION= 1.6+ Index: lang/apache-commons-jelly/distinfo =================================================================== --- lang/apache-commons-jelly/distinfo +++ lang/apache-commons-jelly/distinfo @@ -1,2 +1,3 @@ +TIMESTAMP = 1570225476 SHA256 (commons-jelly-1.0.tar.gz) = c945943c1ca8c05170d1a7eb7402363c6817819321e1b2ae749d4ee93f27061b SIZE (commons-jelly-1.0.tar.gz) = 3384141 Index: lang/apache-commons-jelly/pkg-descr =================================================================== --- lang/apache-commons-jelly/pkg-descr +++ lang/apache-commons-jelly/pkg-descr @@ -12,4 +12,4 @@ transform XML events. This leads to a powerful XML pipeline engine similar in some ways to Cocoon. -WWW: http://jakarta.apache.org/commons/jelly/index.html +WWW: http://commons.apache.org/proper/commons-jelly/index.html Index: lang/jakarta-commons-jelly/Makefile =================================================================== --- lang/jakarta-commons-jelly/Makefile +++ lang/jakarta-commons-jelly/Makefile @@ -1,39 +0,0 @@ -# Created by: Herve Quiroz -# $FreeBSD$ - -PORTNAME= commons-jelly -PORTVERSION= 1.0 -PORTREVISION= 3 -CATEGORIES= lang devel java -MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- - -MAINTAINER= ports@FreeBSD.org -COMMENT= XML based scripting engine - -USE_JAVA= yes -JAVA_VERSION= 1.6+ -NO_BUILD= yes - -DATADIR= ${JAVASHAREDIR}/${PORTNAME} -READMES= LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt - -SUB_FILES= jelly.sh -PLIST_FILES= bin/jelly -PLIST_DIRS= %%DATADIR%%/custom -PORTDOCS= * -PORTDATA= * - -OPTIONS_DEFINE= DOCS - -post-extract: - ${RM} ${WRKSRC}/bin/jelly.bat ${WRKSRC}/bin/jelly - -do-install: - (cd ${WRKSRC} && ${COPYTREE_SHARE} "custom lib bin" \ - ${STAGEDIR}${DATADIR}) - ${INSTALL_SCRIPT} ${WRKDIR}/jelly.sh ${STAGEDIR}${PREFIX}/bin/jelly - (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) - ${INSTALL_DATA} ${READMES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - -.include Index: lang/jakarta-commons-jelly/distinfo =================================================================== --- lang/jakarta-commons-jelly/distinfo +++ lang/jakarta-commons-jelly/distinfo @@ -1,2 +0,0 @@ -SHA256 (commons-jelly-1.0.tar.gz) = c945943c1ca8c05170d1a7eb7402363c6817819321e1b2ae749d4ee93f27061b -SIZE (commons-jelly-1.0.tar.gz) = 3384141 Index: lang/jakarta-commons-jelly/files/jelly.sh.in =================================================================== --- lang/jakarta-commons-jelly/files/jelly.sh.in +++ lang/jakarta-commons-jelly/files/jelly.sh.in @@ -1,15 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -JELLY_HOME="${JELLY_HOME:-"%%DATADIR%%"}" -CLASSPATH="${CLASSPATH}:${JELLY_HOME}/lib/forehead-1.0-beta-5.jar" -FOREHEAD_CONF="${FOREHEAD_CONF:-"${JELLY_HOME}/bin/forehead.conf"}" - -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" \ - -classpath "${CLASSPATH}" \ - -Dforehead.conf.file="${FOREHEAD_CONF}" \ - -Djelly.home="${JELLY_HOME}" \ - -Dtools.jar="${JAVA_HOME}/lib/tools.jar" \ - ${JELLY_OPTS} \ - com.werken.forehead.Forehead "$@" Index: lang/jakarta-commons-jelly/pkg-descr =================================================================== --- lang/jakarta-commons-jelly/pkg-descr +++ lang/jakarta-commons-jelly/pkg-descr @@ -1,15 +0,0 @@ -Jelly is an XML based scripting engine. The basic idea is that XML elements can -be bound to a Java Tag which is a Java bean that performs some function. - -Jelly is totally extendable via custom actions (in a similar way to JSP custom -tags) as well as cleanly integrating with scripting languages such as Jexl, -Velocity, pnuts, beanshell and via BSF (Bean Scripting Framework) languages -like JavaScript & JPython. - -Jelly uses an XMLOutput class which extends SAX ContentHandler to output XML -events. This makes Jelly ideal for XML content generation, SOAP scripting or -dynamic web site generation. A single Jelly tag can produce, consume, filter or -transform XML events. This leads to a powerful XML pipeline engine similar in -some ways to Cocoon. - -WWW: http://jakarta.apache.org/commons/jelly/index.html Index: mail/mime4j/Makefile =================================================================== --- mail/mime4j/Makefile +++ mail/mime4j/Makefile @@ -3,6 +3,7 @@ PORTNAME= mime4j PORTVERSION= 0.7.2 +PORTREVISION= 1 CATEGORIES= mail java MASTER_SITES= APACHE/james/${PORTNAME} DISTNAME= apache-${PORTNAME}-${PORTVERSION}-bin @@ -12,7 +13,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging +RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging OPTIONS_DEFINE= DOCS Index: math/scilab/Makefile =================================================================== --- math/scilab/Makefile +++ math/scilab/Makefile @@ -3,7 +3,7 @@ PORTNAME= scilab PORTVERSION= 5.5.2 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= math cad java MASTER_SITES= https://www.scilab.org/download/${PORTVERSION}/ DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} @@ -68,7 +68,7 @@ foprep:math/jeuclid \ ${JAVALIBDIR}/jhall.jar:java/javahelp \ ${JAVALIBDIR}/jrosetta-api.jar:java/jrosetta \ - ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \ + ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \ ${JAVALIBDIR}/jgraphx.jar:java/jgraphx \ ${JAVALIBDIR}/jlatexmath.jar:math/jlatexmath \ ${LOCALBASE}/share/java/ecj-4.5.jar:lang/gcc-ecj45 @@ -77,7 +77,7 @@ ${JAVALIBDIR}/jlatexmath-fop.jar:math/jlatexmath \ ${LOCALBASE}/share/java/batik/lib/batik-all.jar:graphics/batik \ ${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework \ - ${JAVALIBDIR}/commons-io.jar:devel/jakarta-commons-io \ + ${JAVALIBDIR}/commons-io.jar:devel/apache-commons-io \ ${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons # Code quality: _GUI_DEPENDS+= ${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \ Index: net/Makefile =================================================================== --- net/Makefile +++ net/Makefile @@ -20,6 +20,7 @@ SUBDIR += aluminum SUBDIR += anet SUBDIR += aoe + SUBDIR += apache-commons-net SUBDIR += apinger SUBDIR += appkonference SUBDIR += aprsc @@ -283,7 +284,6 @@ SUBDIR += isc-dhcp44-relay SUBDIR += isc-dhcp44-server SUBDIR += istgt - SUBDIR += jakarta-commons-net SUBDIR += java-beepcore SUBDIR += jcifs SUBDIR += jgroups Index: net/apache-commons-net/Makefile =================================================================== --- net/apache-commons-net/Makefile +++ net/apache-commons-net/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 3.6 CATEGORIES= net java MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- +PKGNAMEPREFIX= apache- DISTNAME= ${PORTNAME}-${PORTVERSION}-bin MAINTAINER= ports@FreeBSD.org Index: net/apache-commons-net/pkg-descr =================================================================== --- net/apache-commons-net/pkg-descr +++ net/apache-commons-net/pkg-descr @@ -1,4 +1,4 @@ -Jakarta Commons Net implements the client side of many basic Internet +Apache Commons Net implements the client side of many basic Internet protocols. The purpose of the library is to provide fundamental protocol access. @@ -18,4 +18,4 @@ * Discard * NTP/SNTP -WWW: http://jakarta.apache.org/commons/net/ +WWW: http://commons.apache.org/proper/commons-net/ Index: net/jakarta-commons-net/Makefile =================================================================== --- net/jakarta-commons-net/Makefile +++ net/jakarta-commons-net/Makefile @@ -1,41 +0,0 @@ -# Created by: Sergey Matveychuk -# $FreeBSD$ - -PORTNAME= commons-net -PORTVERSION= 3.6 -CATEGORIES= net java -MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- -DISTNAME= ${PORTNAME}-${PORTVERSION}-bin - -MAINTAINER= ports@FreeBSD.org -COMMENT= Collection of network protocol implementations for Java - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -USE_JAVA= yes -JAVA_VERSION= 1.6+ -NO_BUILD= yes -NO_ARCH= yes - -OPTIONS_DEFINE= DOCS - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -JARFILE= ${PORTNAME}-${PORTVERSION}.jar -DESTJARFILE= ${PORTNAME}.jar -PLIST_FILES= %%JAVAJARDIR%%/${DESTJARFILE} -PORTDOCS= * - -do-install: - ${INSTALL_DATA} ${WRKSRC}/${JARFILE} \ - ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE} - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR}) - (cd ${WRKSRC} && ${INSTALL_DATA} LICENSE.txt NOTICE.txt \ - RELEASE-NOTES.txt ${STAGEDIR}${DOCSDIR}) - -.include Index: net/jakarta-commons-net/distinfo =================================================================== --- net/jakarta-commons-net/distinfo +++ net/jakarta-commons-net/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1487567426 -SHA256 (commons-net-3.6-bin.tar.gz) = 81b7375e30caa7daa309e44894f9401d895d9d69383f5f2bf31a9100039aad18 -SIZE (commons-net-3.6-bin.tar.gz) = 1432913 Index: net/jakarta-commons-net/pkg-descr =================================================================== --- net/jakarta-commons-net/pkg-descr +++ net/jakarta-commons-net/pkg-descr @@ -1,21 +0,0 @@ -Jakarta Commons Net implements the client side of many basic Internet -protocols. The purpose of the library is to provide fundamental protocol -access. - -Supported protocols are: - - * FTP - * NNTP - * SMTP - * POP3 - * Telnet - * TFTP - * Finger - * Whois - * rexec/rcmd/rlogin - * Time (rdate) and Daytime - * Echo - * Discard - * NTP/SNTP - -WWW: http://jakarta.apache.org/commons/net/ Index: print/pdfbox/Makefile =================================================================== --- print/pdfbox/Makefile +++ print/pdfbox/Makefile @@ -3,6 +3,7 @@ PORTNAME= pdfbox PORTVERSION= 2.0.14 +PORTREVISION= 1 CATEGORIES= print textproc java MASTER_SITES= APACHE/pdfbox/${PORTVERSION} DISTFILES= ${JAR_NAMES:S/$/-${PORTVERSION}.jar/} @@ -14,8 +15,8 @@ LICENSE= APACHE20 RUN_DEPENDS= ${JAVALIBDIR}/bcmail.jar:java/bouncycastle15 \ - ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \ - ${JAVALIBDIR}/commons-io.jar:devel/jakarta-commons-io + ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \ + ${JAVALIBDIR}/commons-io.jar:devel/apache-commons-io JAR_NAMES= pdfbox fontbox preflight xmpbox pdfbox-tools pdfbox-debugger Index: security/xml-security/Makefile =================================================================== --- security/xml-security/Makefile +++ security/xml-security/Makefile @@ -3,6 +3,7 @@ PORTNAME= xml-security DISTVERSION= 1_5_5 +PORTREVISION= 1 CATEGORIES= security java MASTER_SITES= APACHE/santuario/java-library/${DISTVERSION} DISTNAME= ${PORTNAME}-src-${DISTVERSION} @@ -10,9 +11,9 @@ MAINTAINER= ale@FreeBSD.org COMMENT= Java library for XML Signature and Encryption -BUILD_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \ +BUILD_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \ ${JAVALIBDIR}/xalan.jar:textproc/xalan-j -RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging +RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging LICENSE= APACHE20 Index: textproc/Makefile =================================================================== --- textproc/Makefile +++ textproc/Makefile @@ -41,6 +41,7 @@ SUBDIR += amberfish SUBDIR += ansifilter SUBDIR += antiword + SUBDIR += apache-commons-digester SUBDIR += apache-poi SUBDIR += apache-solr SUBDIR += apertium @@ -304,7 +305,6 @@ SUBDIR += itstool SUBDIR += itstool22 SUBDIR += jade - SUBDIR += jakarta-commons-digester SUBDIR += jalingo SUBDIR += jarnal SUBDIR += java2html Index: textproc/apache-commons-digester/Makefile =================================================================== --- textproc/apache-commons-digester/Makefile +++ textproc/apache-commons-digester/Makefile @@ -3,6 +3,7 @@ PORTNAME= commons-digester PORTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= textproc java devel MASTER_SITES= APACHE_COMMONS_BINARIES PKGNAMEPREFIX= jakarta- @@ -34,8 +35,8 @@ .include JAR_DEPENDS= ${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \ - ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \ - ${JAVALIBDIR}/commons-collections.jar:java/jakarta-commons-collections \ + ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \ + ${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections \ ${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j do-install: Index: textproc/jakarta-commons-digester/Makefile =================================================================== --- textproc/jakarta-commons-digester/Makefile +++ textproc/jakarta-commons-digester/Makefile @@ -1,54 +0,0 @@ -# Created by: Herve Quiroz -# $FreeBSD$ - -PORTNAME= commons-digester -PORTVERSION= 2.1 -CATEGORIES= textproc java devel -MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- -DISTNAME= ${PORTNAME}-${PORTVERSION}-bin - -MAINTAINER= ports@FreeBSD.org -COMMENT= XML-to-Java-object mapping utility package - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -BUILD_DEPENDS= ${JAR_DEPENDS} -RUN_DEPENDS= ${JAR_DEPENDS} - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -NO_BUILD= yes -NO_ARCH= yes -USE_JAVA= yes -JAVA_VERSION= 1.6+ - -JARFILE= ${PORTNAME}.jar -PLIST_FILES= %%JAVAJARDIR%%/${JARFILE} - -OPTIONS_DEFINE= DOCS - -OTHERDOCS= LICENSE.txt NOTICE.txt RELEASE-NOTES.txt -PORTDOCS= * - -.include - -JAR_DEPENDS= ${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \ - ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \ - ${JAVALIBDIR}/commons-collections.jar:java/jakarta-commons-collections \ - ${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j - -do-install: - @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..." - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${JARFILE} - @${ECHO_MSG} " [ DONE ]" - -do-install-DOCS-on: - @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." - @cd ${WRKSRC}/apidocs \ - && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \ - && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \; - ${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ - @${ECHO_MSG} " [ DONE ]" - -.include Index: textproc/jakarta-commons-digester/distinfo =================================================================== --- textproc/jakarta-commons-digester/distinfo +++ textproc/jakarta-commons-digester/distinfo @@ -1,2 +0,0 @@ -SHA256 (commons-digester-2.1-bin.tar.gz) = c739162c5eafbbaecfe3ae9e3733221781def20c6603972a124b7ebb552a1af1 -SIZE (commons-digester-2.1-bin.tar.gz) = 2308650 Index: textproc/jakarta-commons-digester/pkg-descr =================================================================== --- textproc/jakarta-commons-digester/pkg-descr +++ textproc/jakarta-commons-digester/pkg-descr @@ -1,15 +0,0 @@ -The Digester package lets you configure an XML -> Java object mapping module, -which triggers certain actions called rules whenever a particular pattern of -nested XML elements is recognized. A rich set of predefined rules is available -for your use, or you can also create your own. Advanced features of Digester -include: - - - Ability to plug in your own pattern matching engine, if the standard one is - not sufficient for your requirements. - - Optional namespace-aware processing, so that you can define rules that are - relevant only to a particular XML namespace. - - Encapsulation of Rules into RuleSets that can be easily and conveniently - reused in more than one application that requires the same type of - processing - -WWW: http://jakarta.apache.org/commons/digester/ Index: www/httpclient/Makefile =================================================================== --- www/httpclient/Makefile +++ www/httpclient/Makefile @@ -3,6 +3,7 @@ PORTNAME= httpclient DISTVERSION= 4.5.10 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES= APACHE/httpcomponents/${PORTNAME}/binary DISTNAME= httpcomponents-client-${DISTVERSION}-bin @@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${JAVALIBDIR}/httpcore.jar:www/httpcore \ - ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \ + ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \ ${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec OPTIONS_DEFINE= DOCS Index: www/jmeter/Makefile =================================================================== --- www/jmeter/Makefile +++ www/jmeter/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-jmeter PORTVERSION= 2.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www benchmarks java MASTER_SITES= APACHE/jmeter/binaries @@ -20,10 +20,10 @@ ${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec \ ${JAVALIBDIR}/commons-collections.jar:java/jakarta-commons-collections \ ${JAVALIBDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient \ - ${JAVALIBDIR}/commons-io.jar:devel/jakarta-commons-io \ + ${JAVALIBDIR}/commons-io.jar:devel/apache-commons-io \ ${JAVALIBDIR}/commons-lang.jar:java/jakarta-commons-lang \ - ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \ - ${JAVALIBDIR}/commons-net.jar:net/jakarta-commons-net \ + ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \ + ${JAVALIBDIR}/commons-net.jar:net/apache-commons-net \ ${JAVALIBDIR}/httpclient.jar:www/httpclient \ ${JAVALIBDIR}/httpcore.jar:www/httpcore \ ${JAVALIBDIR}/httpmime.jar:www/httpclient \