diff options
23 files changed, 54 insertions, 44 deletions
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index a73f05ee1678..da0890a7cc91 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -83,6 +83,16 @@ MASTER_SITE_APACHE+= \ ftp://ftp.saix.net/pub/apache/dist/%SUBDIR%/ .endif +.if !defined(IGNORE_MASTER_SITE_APACHE_COMMONS_BINARIES) +MASTER_SITE_APACHE_COMMONS_BINARIES+= \ + ${MASTER_SITE_APACHE:S,%SUBDIR%,commons/&/binaries,} +.endif + +.if !defined(IGNORE_MASTER_SITE_APACHE_COMMONS_SOURCE) +MASTER_SITE_APACHE_COMMONS_SOURCE+= \ + ${MASTER_SITE_APACHE:S,%SUBDIR%,commons/&/source,} +.endif + .if !defined(IGNORE_MASTER_SITE_APACHE_HTTPD) MASTER_SITE_APACHE_HTTPD+= \ ${MASTER_SITE_APACHE:S,%SUBDIR%,httpd/&,} diff --git a/databases/jakarta-commons-dbutils/Makefile b/databases/jakarta-commons-dbutils/Makefile index 9225d6f95048..c6665773ddd2 100644 --- a/databases/jakarta-commons-dbutils/Makefile +++ b/databases/jakarta-commons-dbutils/Makefile @@ -9,8 +9,8 @@ PORTNAME= commons-dbutils PORTVERSION= 1.1 PORTREVISION= 1 CATEGORIES= databases java -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= commons/dbutils/source +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/devel/jakarta-commons-chain/Makefile b/devel/jakarta-commons-chain/Makefile index da533d6709c5..55e9f0a80c46 100644 --- a/devel/jakarta-commons-chain/Makefile +++ b/devel/jakarta-commons-chain/Makefile @@ -9,8 +9,8 @@ PORTNAME= commons-chain PORTVERSION= 1.1 PORTREVISION= 1 CATEGORIES= devel java -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/source +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/devel/jakarta-commons-configuration/Makefile b/devel/jakarta-commons-configuration/Makefile index 5be14752dfef..d5f465df9484 100644 --- a/devel/jakarta-commons-configuration/Makefile +++ b/devel/jakarta-commons-configuration/Makefile @@ -9,8 +9,8 @@ PORTNAME= commons-configuration PORTVERSION= 1.3 PORTREVISION= 1 CATEGORIES= devel java -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/binaries/ +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_BINARIES} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- MAINTAINER= hq@FreeBSD.org diff --git a/devel/jakarta-commons-daemon/Makefile b/devel/jakarta-commons-daemon/Makefile index b40dc8b6da5e..70af8d2c3cad 100644 --- a/devel/jakarta-commons-daemon/Makefile +++ b/devel/jakarta-commons-daemon/Makefile @@ -8,8 +8,8 @@ PORTNAME= commons-daemon PORTVERSION= 1.0.1 CATEGORIES= devel java -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= commons/daemon/source +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- DISTNAME= daemon-${PORTVERSION} diff --git a/devel/jakarta-commons-io/Makefile b/devel/jakarta-commons-io/Makefile index 5bb41cf0bcd3..4a0ae2ed2255 100644 --- a/devel/jakarta-commons-io/Makefile +++ b/devel/jakarta-commons-io/Makefile @@ -8,8 +8,8 @@ PORTNAME= commons-io PORTVERSION= 1.3.2 CATEGORIES= devel java -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= commons/io/source +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/devel/jakarta-commons-jxpath/Makefile b/devel/jakarta-commons-jxpath/Makefile index f88b99c47e56..5509780bf1f7 100644 --- a/devel/jakarta-commons-jxpath/Makefile +++ b/devel/jakarta-commons-jxpath/Makefile @@ -9,8 +9,8 @@ PORTNAME= commons-jxpath PORTVERSION= 1.2 PORTREVISION= 1 CATEGORIES= devel www java -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/binaries +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_BINARIES} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- MAINTAINER= nemoliu@FreeBSD.org diff --git a/devel/jakarta-commons-modeler/Makefile b/devel/jakarta-commons-modeler/Makefile index 5f88203971ab..da3edd0866c3 100644 --- a/devel/jakarta-commons-modeler/Makefile +++ b/devel/jakarta-commons-modeler/Makefile @@ -8,8 +8,8 @@ PORTNAME= commons-modeler PORTVERSION= 2.0.1 CATEGORIES= devel java -MASTER_SITES= ${MASTER_SITE_APACHE} -MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/binaries +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_BINARIES} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- MAINTAINER= nemoliu@FreeBSD.org diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile index aef7c1133223..14b4470912bb 100644 --- a/java/jakarta-commons-beanutils/Makefile +++ b/java/jakarta-commons-beanutils/Makefile @@ -9,8 +9,8 @@ PORTNAME= commons-beanutils PORTVERSION= 1.7.0 PORTREVISION= 1 CATEGORIES= java devel -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= commons/beanutils/source/ +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/java/jakarta-commons-cli/Makefile b/java/jakarta-commons-cli/Makefile index ad78a69aa5d5..3360ddf62891 100644 --- a/java/jakarta-commons-cli/Makefile +++ b/java/jakarta-commons-cli/Makefile @@ -10,8 +10,8 @@ PORTVERSION= 1.0 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= java devel -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/source +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- DISTNAME= cli-${PORTVERSION}-src diff --git a/java/jakarta-commons-codec/Makefile b/java/jakarta-commons-codec/Makefile index 51ae48503ba5..31bc156507f8 100644 --- a/java/jakarta-commons-codec/Makefile +++ b/java/jakarta-commons-codec/Makefile @@ -9,8 +9,8 @@ PORTNAME= commons-codec PORTVERSION= 1.3 PORTREVISION= 1 CATEGORIES= java converters -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= commons/codec/source +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/java/jakarta-commons-collections/Makefile b/java/jakarta-commons-collections/Makefile index fde6204cdd5f..2bb826c5f3ef 100644 --- a/java/jakarta-commons-collections/Makefile +++ b/java/jakarta-commons-collections/Makefile @@ -9,8 +9,8 @@ PORTNAME= commons-collections PORTVERSION= 3.2 PORTREVISION= 1 CATEGORIES= java devel -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= commons/collections/source/ +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/java/jakarta-commons-dbcp/Makefile b/java/jakarta-commons-dbcp/Makefile index d0e154f6e769..4deadd3ee49c 100644 --- a/java/jakarta-commons-dbcp/Makefile +++ b/java/jakarta-commons-dbcp/Makefile @@ -9,8 +9,8 @@ PORTNAME= commons-dbcp PORTVERSION= 1.2.1 PORTREVISION= 1 CATEGORIES= java -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= commons/dbcp/source +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- DISTNAME= ${PORTNAME}-${PORTVERSION}-src DIST_SUBDIR= jakarta diff --git a/java/jakarta-commons-discovery/Makefile b/java/jakarta-commons-discovery/Makefile index 160ea5be180c..0c7174dd5713 100644 --- a/java/jakarta-commons-discovery/Makefile +++ b/java/jakarta-commons-discovery/Makefile @@ -9,8 +9,8 @@ PORTNAME= commons-discovery PORTVERSION= 0.4 PORTREVISION= 1 CATEGORIES= java devel -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/binaries +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_BINARIES} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- MAINTAINER= ports@FreeBSD.org diff --git a/java/jakarta-commons-httpclient/Makefile b/java/jakarta-commons-httpclient/Makefile index 074dff99ab82..0dd0dc4b7919 100644 --- a/java/jakarta-commons-httpclient/Makefile +++ b/java/jakarta-commons-httpclient/Makefile @@ -8,8 +8,8 @@ PORTNAME= commons-httpclient DISTVERSION= 3.1 CATEGORIES= java www -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= httpcomponents/${PORTNAME}-3.x/source +MASTER_SITES= ${MASTER_SITE_APACHE} +MASTER_SITE_SUBDIR= httpcomponents/${PORTNAME}/source PKGNAMEPREFIX= jakarta- DISTNAME= ${PORTNAME}-${DISTVERSION}-src diff --git a/java/jakarta-commons-lang/Makefile b/java/jakarta-commons-lang/Makefile index ad8c554e2c03..aacb2bb39239 100644 --- a/java/jakarta-commons-lang/Makefile +++ b/java/jakarta-commons-lang/Makefile @@ -9,8 +9,8 @@ PORTNAME= commons-lang PORTVERSION= 2.3 PORTREVISION= 1 CATEGORIES= java devel -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= commons/lang/source +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/java/jakarta-commons-logging/Makefile b/java/jakarta-commons-logging/Makefile index 27831b117b28..c29189bf5899 100644 --- a/java/jakarta-commons-logging/Makefile +++ b/java/jakarta-commons-logging/Makefile @@ -9,8 +9,8 @@ PORTNAME= commons-logging PORTVERSION= 1.1 PORTREVISION= 1 CATEGORIES= java devel -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/binaries +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_BINARIES} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- MAINTAINER= hq@FreeBSD.org diff --git a/java/jakarta-commons-pool/Makefile b/java/jakarta-commons-pool/Makefile index e58694ee22cd..0da71b67c9dd 100644 --- a/java/jakarta-commons-pool/Makefile +++ b/java/jakarta-commons-pool/Makefile @@ -9,8 +9,8 @@ PORTNAME= commons-pool PORTVERSION= 1.3 PORTREVISION= 1 CATEGORIES= java devel -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/source +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/java/jakarta-commons-primitives/Makefile b/java/jakarta-commons-primitives/Makefile index e60ba764338c..f2515d2380ca 100644 --- a/java/jakarta-commons-primitives/Makefile +++ b/java/jakarta-commons-primitives/Makefile @@ -9,8 +9,8 @@ PORTNAME= commons-primitives PORTVERSION= 1.0 PORTREVISION= 2 CATEGORIES= java -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= commons/primitives/source +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/lang/jakarta-commons-jelly/Makefile b/lang/jakarta-commons-jelly/Makefile index 1ed47306eb16..9f4c731f1c71 100644 --- a/lang/jakarta-commons-jelly/Makefile +++ b/lang/jakarta-commons-jelly/Makefile @@ -8,8 +8,8 @@ PORTNAME= commons-jelly PORTVERSION= 1.0 PORTREVISION= 1 CATEGORIES= lang devel java -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/binaries +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_BINARIES} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- MAINTAINER= hq@FreeBSD.org diff --git a/math/jakarta-commons-math/Makefile b/math/jakarta-commons-math/Makefile index 559413680be7..4f290832dd7d 100644 --- a/math/jakarta-commons-math/Makefile +++ b/math/jakarta-commons-math/Makefile @@ -9,8 +9,8 @@ PORTNAME= commons-math PORTVERSION= 1.1 PORTREVISION= 1 CATEGORIES= math java -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/source +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/net/jakarta-commons-net/Makefile b/net/jakarta-commons-net/Makefile index 739f628cbb93..68380a4095d2 100644 --- a/net/jakarta-commons-net/Makefile +++ b/net/jakarta-commons-net/Makefile @@ -9,8 +9,8 @@ PORTNAME= commons-net PORTVERSION= 1.4.1 PORTREVISION= 2 CATEGORIES= net java -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= commons/net/source +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/textproc/jakarta-commons-digester/Makefile b/textproc/jakarta-commons-digester/Makefile index 409aaeead91d..872377830b0b 100644 --- a/textproc/jakarta-commons-digester/Makefile +++ b/textproc/jakarta-commons-digester/Makefile @@ -9,8 +9,8 @@ PORTNAME= commons-digester PORTVERSION= 1.7 PORTREVISION= 1 CATEGORIES= textproc java devel -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} -MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/source +MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE} +MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,} PKGNAMEPREFIX= jakarta- DISTNAME= ${PORTNAME}-${PORTVERSION}-src |