diff options
| -rw-r--r-- | MOVED | 3 | ||||
| -rw-r--r-- | editors/libreoffice/Makefile | 4 | ||||
| -rw-r--r-- | editors/openoffice-4/Makefile | 4 | ||||
| -rw-r--r-- | editors/openoffice-devel/Makefile | 4 | ||||
| -rw-r--r-- | java/Makefile | 6 | ||||
| -rw-r--r-- | java/apache-commons-codec/Makefile (renamed from java/jakarta-commons-codec/Makefile) | 2 | ||||
| -rw-r--r-- | java/apache-commons-codec/distinfo (renamed from java/jakarta-commons-codec/distinfo) | 0 | ||||
| -rw-r--r-- | java/apache-commons-codec/pkg-descr (renamed from java/jakarta-commons-codec/pkg-descr) | 2 | ||||
| -rw-r--r-- | java/apache-commons-dbcp/Makefile (renamed from java/jakarta-commons-dbcp/Makefile) | 2 | ||||
| -rw-r--r-- | java/apache-commons-dbcp/distinfo (renamed from java/jakarta-commons-dbcp/distinfo) | 0 | ||||
| -rw-r--r-- | java/apache-commons-dbcp/pkg-descr (renamed from java/jakarta-commons-dbcp/pkg-descr) | 2 | ||||
| -rw-r--r-- | java/apache-commons-httpclient/Makefile (renamed from java/jakarta-commons-httpclient/Makefile) | 6 | ||||
| -rw-r--r-- | java/apache-commons-httpclient/distinfo (renamed from java/jakarta-commons-httpclient/distinfo) | 0 | ||||
| -rw-r--r-- | java/apache-commons-httpclient/files/patch-build.xml (renamed from java/jakarta-commons-httpclient/files/patch-build.xml) | 0 | ||||
| -rw-r--r-- | java/apache-commons-httpclient/pkg-descr (renamed from java/jakarta-commons-httpclient/pkg-descr) | 2 | ||||
| -rw-r--r-- | www/httpclient/Makefile | 2 | ||||
| -rw-r--r-- | www/jmeter/Makefile | 4 |
17 files changed, 23 insertions, 20 deletions
@@ -13617,3 +13617,6 @@ devel/rubygem-numerizer01|devel/rubygem-numerizer|2019-12-28|Has expired: use de databases/phpmyadmin-devel|databases/phpmyadmin5|2019-12-29|Move to phpmyadmin5 sysutils/bareos-docs||2019-12-29|PDF is not available anymore. Bareos documentation can be found at https://docs.bareos.org/ databases/php-memcache|databases/pecl-memcache|2019-12-30|Development from websupport.sk is the official PECL repository now +java/jakarta-commons-codec|java/apache-commons-codec|2019-12-30|Renamed upstream +java/jakarta-commons-dbcp|java/apache-commons-dbcp|2019-12-30|Renamed upstream +java/jakarta-commons-httpclient|java/apache-commons-httpclient|2019-12-30|Renamed upstream diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 4fd545fcaae5..9bbcc25c29ef 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -157,8 +157,8 @@ GTK3_USES= ${GTK_USES} GTK3_VARS= ${GTK_VARS} JAVA_BUILD_DEPENDS= ant:devel/apache-ant \ - ${JAVAJARDIR}/commons-codec.jar:java/jakarta-commons-codec \ - ${JAVAJARDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient \ + ${JAVAJARDIR}/commons-codec.jar:java/apache-commons-codec \ + ${JAVAJARDIR}/commons-httpclient.jar:java/apache-commons-httpclient \ ${JAVAJARDIR}/commons-lang.jar:java/apache-commons-lang \ ${JAVAJARDIR}/commons-logging.jar:java/apache-commons-logging \ ${JAVAJARDIR}/junit.jar:java/junit \ diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 9c09cfe84010..617725b9803d 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -181,8 +181,8 @@ WIKI_PUBLISHER_CONFIGURE_WITH= \ commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \ commons-logging-jar=${JAVALIBDIR}/commons-logging.jar WIKI_PUBLISHER_JAR_DEPENDS= \ - ${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec \ - ${JAVALIBDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient \ + ${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec \ + ${JAVALIBDIR}/commons-httpclient.jar:java/apache-commons-httpclient \ ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging WIKI_PUBLISHER_BUILD_DEPENDS= ${WIKI_PUBLISHER_JAR_DEPENDS} WIKI_PUBLISHER_RUN_DEPENDS= ${WIKI_PUBLISHER_JAR_DEPENDS} diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 53da47ba8d59..a87a2b532789 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -210,8 +210,8 @@ WIKI_PUBLISHER_CONFIGURE_WITH= \ commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \ commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar WIKI_PUBLISHER_JAR_DEPENDS= \ - ${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec \ - ${JAVALIBDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient + ${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec \ + ${JAVALIBDIR}/commons-httpclient.jar:java/apache-commons-httpclient WIKI_PUBLISHER_BUILD_DEPENDS= ${WIKI_PUBLISHER_JAR_DEPENDS} WIKI_PUBLISHER_RUN_DEPENDS= ${WIKI_PUBLISHER_JAR_DEPENDS} diff --git a/java/Makefile b/java/Makefile index 905412e8a621..0534fbaa45f5 100644 --- a/java/Makefile +++ b/java/Makefile @@ -5,7 +5,10 @@ SUBDIR += apache-bcel SUBDIR += apache-commons-cli + SUBDIR += apache-commons-codec SUBDIR += apache-commons-collections + SUBDIR += apache-commons-dbcp + SUBDIR += apache-commons-httpclient SUBDIR += apache-commons-lang SUBDIR += apache-commons-lang3 SUBDIR += apache-commons-logging @@ -44,10 +47,7 @@ SUBDIR += jad SUBDIR += jai SUBDIR += jakarta-commons-beanutils - SUBDIR += jakarta-commons-codec - SUBDIR += jakarta-commons-dbcp SUBDIR += jakarta-commons-discovery - SUBDIR += jakarta-commons-httpclient SUBDIR += jakarta-oro SUBDIR += jakarta-regexp SUBDIR += jasmin diff --git a/java/jakarta-commons-codec/Makefile b/java/apache-commons-codec/Makefile index 4bca71a2b034..ae091a53070b 100644 --- a/java/jakarta-commons-codec/Makefile +++ b/java/apache-commons-codec/Makefile @@ -4,7 +4,7 @@ PORTNAME= commons-codec PORTVERSION= 1.13 CATEGORIES= java converters MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- +PKGNAMEPREFIX= apache- DISTNAME= ${PORTNAME}-${PORTVERSION}-bin MAINTAINER= ale@FreeBSD.org diff --git a/java/jakarta-commons-codec/distinfo b/java/apache-commons-codec/distinfo index ab606c63fe3c..ab606c63fe3c 100644 --- a/java/jakarta-commons-codec/distinfo +++ b/java/apache-commons-codec/distinfo diff --git a/java/jakarta-commons-codec/pkg-descr b/java/apache-commons-codec/pkg-descr index 0598c457ac90..c3b17a96cc20 100644 --- a/java/jakarta-commons-codec/pkg-descr +++ b/java/apache-commons-codec/pkg-descr @@ -1,4 +1,4 @@ Commons Codec provides implementations of common encoders and decoders such as Base64, Hex, various phonetic encodings, and URLs. -WWW: http://jakarta.apache.org/commons/codec/ +WWW: https://commons.apache.org/codec/ diff --git a/java/jakarta-commons-dbcp/Makefile b/java/apache-commons-dbcp/Makefile index 5c30d066c512..0675b5a1a0d6 100644 --- a/java/jakarta-commons-dbcp/Makefile +++ b/java/apache-commons-dbcp/Makefile @@ -5,7 +5,7 @@ PORTNAME= commons-dbcp PORTVERSION= 2.7.0 CATEGORIES= java databases MASTER_SITES= APACHE_COMMONS_BINARIES -PKGNAMEPREFIX= jakarta- +PKGNAMEPREFIX= apache- DISTNAME= ${PORTNAME}2-${PORTVERSION}-bin MAINTAINER= ale@FreeBSD.org diff --git a/java/jakarta-commons-dbcp/distinfo b/java/apache-commons-dbcp/distinfo index 66f4f22db77d..66f4f22db77d 100644 --- a/java/jakarta-commons-dbcp/distinfo +++ b/java/apache-commons-dbcp/distinfo diff --git a/java/jakarta-commons-dbcp/pkg-descr b/java/apache-commons-dbcp/pkg-descr index 065a6b6d695a..d469dc623d96 100644 --- a/java/jakarta-commons-dbcp/pkg-descr +++ b/java/apache-commons-dbcp/pkg-descr @@ -20,4 +20,4 @@ The DBCP Component The commons-dbcp package relies on code in the commons-pool package to provide the underlying object pool mechanisms that it utilizes. -WWW: http://commons.apache.org/dbcp/ +WWW: https://commons.apache.org/dbcp/ diff --git a/java/jakarta-commons-httpclient/Makefile b/java/apache-commons-httpclient/Makefile index 2a63aeb6aaad..e89bea5ba5ea 100644 --- a/java/jakarta-commons-httpclient/Makefile +++ b/java/apache-commons-httpclient/Makefile @@ -6,7 +6,7 @@ DISTVERSION= 3.1 PORTREVISION= 2 CATEGORIES= java www MASTER_SITES= APACHE/httpcomponents/${PORTNAME}/source -PKGNAMEPREFIX= jakarta- +PKGNAMEPREFIX= apache- DISTNAME= ${PORTNAME}-${DISTVERSION}-src MAINTAINER= ale@FreeBSD.org @@ -15,9 +15,9 @@ COMMENT= Package implementing the client side of the HTTP standard LICENSE= APACHE20 BUILD_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging -BUILD_DEPENDS+= ${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec +BUILD_DEPENDS+= ${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging -RUN_DEPENDS+= ${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec +RUN_DEPENDS+= ${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec OPTIONS_DEFINE= DOCS diff --git a/java/jakarta-commons-httpclient/distinfo b/java/apache-commons-httpclient/distinfo index d6a8d51ce9ab..d6a8d51ce9ab 100644 --- a/java/jakarta-commons-httpclient/distinfo +++ b/java/apache-commons-httpclient/distinfo diff --git a/java/jakarta-commons-httpclient/files/patch-build.xml b/java/apache-commons-httpclient/files/patch-build.xml index 98ba3dfbfef7..98ba3dfbfef7 100644 --- a/java/jakarta-commons-httpclient/files/patch-build.xml +++ b/java/apache-commons-httpclient/files/patch-build.xml diff --git a/java/jakarta-commons-httpclient/pkg-descr b/java/apache-commons-httpclient/pkg-descr index e597cfa2b350..d55e7a9793c5 100644 --- a/java/jakarta-commons-httpclient/pkg-descr +++ b/java/apache-commons-httpclient/pkg-descr @@ -8,4 +8,4 @@ HTTP-aware client applications such as web browsers, web service clients, or systems that leverage or extend the HTTP protocol for distributed communication. -WWW: http://jakarta.apache.org/commons/httpclient/ +WWW: https://hc.apache.org/httpclient-3.x/ diff --git a/www/httpclient/Makefile b/www/httpclient/Makefile index 55a6877bd6c9..c4a914bd0543 100644 --- a/www/httpclient/Makefile +++ b/www/httpclient/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${JAVALIBDIR}/httpcore.jar:www/httpcore \ ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \ - ${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec + ${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec OPTIONS_DEFINE= DOCS diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile index 4cec73e326eb..03f715804ee9 100644 --- a/www/jmeter/Makefile +++ b/www/jmeter/Makefile @@ -17,9 +17,9 @@ LICENSE= APACHE20 # the 3rd-party ones: RUN_DEPENDS= \ ${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework \ - ${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec \ + ${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec \ ${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections \ - ${JAVALIBDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient \ + ${JAVALIBDIR}/commons-httpclient.jar:java/apache-commons-httpclient \ ${JAVALIBDIR}/commons-io.jar:devel/apache-commons-io \ ${JAVALIBDIR}/commons-lang.jar:java/apache-commons-lang \ ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \ |