Index: Mk/bsd.sites.mk =================================================================== RCS file: /usr/home/ncvs/ports/Mk/bsd.sites.mk,v retrieving revision 1.436 diff -u -r1.436 bsd.sites.mk --- Mk/bsd.sites.mk 7 Feb 2008 16:13:41 -0000 1.436 +++ Mk/bsd.sites.mk 24 Feb 2008 04:53:53 -0000 @@ -83,6 +83,16 @@ 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/&,} Index: /usr/ports/databases/jakarta-commons-dbutils/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/databases/jakarta-commons-dbutils/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- /usr/ports/databases/jakarta-commons-dbutils/Makefile 19 May 2007 20:01:05 -0000 1.5 +++ /usr/ports/databases/jakarta-commons-dbutils/Makefile 24 Feb 2008 04:38:52 -0000 @@ -9,8 +9,8 @@ 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 Index: /usr/ports/devel/jakarta-commons-chain/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/devel/jakarta-commons-chain/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- /usr/ports/devel/jakarta-commons-chain/Makefile 19 May 2007 20:02:54 -0000 1.3 +++ /usr/ports/devel/jakarta-commons-chain/Makefile 24 Feb 2008 04:38:52 -0000 @@ -9,8 +9,8 @@ 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 Index: /usr/ports/devel/jakarta-commons-daemon/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/devel/jakarta-commons-daemon/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- /usr/ports/devel/jakarta-commons-daemon/Makefile 29 Jul 2007 01:15:26 -0000 1.2 +++ /usr/ports/devel/jakarta-commons-daemon/Makefile 24 Feb 2008 04:38:52 -0000 @@ -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} Index: /usr/ports/devel/jakarta-commons-io/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/devel/jakarta-commons-io/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- /usr/ports/devel/jakarta-commons-io/Makefile 14 Dec 2007 06:24:47 -0000 1.8 +++ /usr/ports/devel/jakarta-commons-io/Makefile 24 Feb 2008 04:38:52 -0000 @@ -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 Index: /usr/ports/java/jakarta-commons-beanutils/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/java/jakarta-commons-beanutils/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- /usr/ports/java/jakarta-commons-beanutils/Makefile 19 May 2007 20:12:48 -0000 1.11 +++ /usr/ports/java/jakarta-commons-beanutils/Makefile 24 Feb 2008 04:40:36 -0000 @@ -9,8 +9,8 @@ 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 Index: /usr/ports/java/jakarta-commons-cli/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/java/jakarta-commons-cli/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- /usr/ports/java/jakarta-commons-cli/Makefile 19 May 2007 20:12:48 -0000 1.12 +++ /usr/ports/java/jakarta-commons-cli/Makefile 24 Feb 2008 04:38:52 -0000 @@ -10,8 +10,8 @@ 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 Index: /usr/ports/java/jakarta-commons-codec/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/java/jakarta-commons-codec/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- /usr/ports/java/jakarta-commons-codec/Makefile 19 May 2007 20:12:48 -0000 1.3 +++ /usr/ports/java/jakarta-commons-codec/Makefile 24 Feb 2008 04:38:52 -0000 @@ -9,8 +9,8 @@ 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 Index: /usr/ports/java/jakarta-commons-collections/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/java/jakarta-commons-collections/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- /usr/ports/java/jakarta-commons-collections/Makefile 19 May 2007 20:12:49 -0000 1.11 +++ /usr/ports/java/jakarta-commons-collections/Makefile 24 Feb 2008 04:38:52 -0000 @@ -9,8 +9,8 @@ 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 Index: /usr/ports/java/jakarta-commons-dbcp/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/java/jakarta-commons-dbcp/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- /usr/ports/java/jakarta-commons-dbcp/Makefile 19 May 2007 20:12:50 -0000 1.8 +++ /usr/ports/java/jakarta-commons-dbcp/Makefile 24 Feb 2008 04:38:52 -0000 @@ -9,8 +9,8 @@ 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 Index: /usr/ports/java/jakarta-commons-httpclient/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/java/jakarta-commons-httpclient/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- /usr/ports/java/jakarta-commons-httpclient/Makefile 28 Oct 2007 08:05:21 -0000 1.6 +++ /usr/ports/java/jakarta-commons-httpclient/Makefile 24 Feb 2008 04:46:34 -0000 @@ -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 Index: /usr/ports/java/jakarta-commons-lang/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/java/jakarta-commons-lang/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- /usr/ports/java/jakarta-commons-lang/Makefile 19 May 2007 20:12:51 -0000 1.14 +++ /usr/ports/java/jakarta-commons-lang/Makefile 24 Feb 2008 04:38:52 -0000 @@ -9,8 +9,8 @@ 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 Index: /usr/ports/java/jakarta-commons-pool/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/java/jakarta-commons-pool/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- /usr/ports/java/jakarta-commons-pool/Makefile 19 May 2007 20:12:52 -0000 1.10 +++ /usr/ports/java/jakarta-commons-pool/Makefile 24 Feb 2008 04:38:52 -0000 @@ -9,8 +9,8 @@ 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 Index: /usr/ports/java/jakarta-commons-primitives/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/java/jakarta-commons-primitives/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- /usr/ports/java/jakarta-commons-primitives/Makefile 19 May 2007 20:12:52 -0000 1.5 +++ /usr/ports/java/jakarta-commons-primitives/Makefile 24 Feb 2008 04:38:52 -0000 @@ -9,8 +9,8 @@ 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 Index: /usr/ports/math/jakarta-commons-math/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/math/jakarta-commons-math/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- /usr/ports/math/jakarta-commons-math/Makefile 19 May 2007 20:15:04 -0000 1.3 +++ /usr/ports/math/jakarta-commons-math/Makefile 24 Feb 2008 04:38:52 -0000 @@ -9,8 +9,8 @@ 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 Index: /usr/ports/net/jakarta-commons-net/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/net/jakarta-commons-net/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- /usr/ports/net/jakarta-commons-net/Makefile 19 May 2007 20:18:33 -0000 1.8 +++ /usr/ports/net/jakarta-commons-net/Makefile 24 Feb 2008 04:38:52 -0000 @@ -9,8 +9,8 @@ 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 Index: /usr/ports/textproc/jakarta-commons-digester/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/textproc/jakarta-commons-digester/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- /usr/ports/textproc/jakarta-commons-digester/Makefile 19 May 2007 20:24:00 -0000 1.4 +++ /usr/ports/textproc/jakarta-commons-digester/Makefile 24 Feb 2008 04:38:52 -0000 @@ -9,8 +9,8 @@ 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 Index: /usr/ports/devel/jakarta-commons-configuration/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/devel/jakarta-commons-configuration/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- /usr/ports/devel/jakarta-commons-configuration/Makefile 19 May 2007 20:02:55 -0000 1.4 +++ /usr/ports/devel/jakarta-commons-configuration/Makefile 24 Feb 2008 04:51:20 -0000 @@ -9,8 +9,8 @@ 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 Index: /usr/ports/devel/jakarta-commons-jxpath/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/devel/jakarta-commons-jxpath/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- /usr/ports/devel/jakarta-commons-jxpath/Makefile 19 May 2007 20:02:55 -0000 1.4 +++ /usr/ports/devel/jakarta-commons-jxpath/Makefile 24 Feb 2008 04:51:20 -0000 @@ -9,8 +9,8 @@ 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 Index: /usr/ports/devel/jakarta-commons-modeler/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/devel/jakarta-commons-modeler/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- /usr/ports/devel/jakarta-commons-modeler/Makefile 20 Feb 2008 08:57:25 -0000 1.5 +++ /usr/ports/devel/jakarta-commons-modeler/Makefile 24 Feb 2008 04:51:20 -0000 @@ -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 Index: /usr/ports/java/jakarta-commons-discovery/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/java/jakarta-commons-discovery/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- /usr/ports/java/jakarta-commons-discovery/Makefile 19 May 2007 20:12:50 -0000 1.5 +++ /usr/ports/java/jakarta-commons-discovery/Makefile 24 Feb 2008 04:51:20 -0000 @@ -9,8 +9,8 @@ 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 Index: /usr/ports/java/jakarta-commons-logging/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/java/jakarta-commons-logging/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- /usr/ports/java/jakarta-commons-logging/Makefile 19 May 2007 20:12:52 -0000 1.12 +++ /usr/ports/java/jakarta-commons-logging/Makefile 24 Feb 2008 04:51:20 -0000 @@ -9,8 +9,8 @@ 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 Index: /usr/ports/lang/jakarta-commons-jelly/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/lang/jakarta-commons-jelly/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- /usr/ports/lang/jakarta-commons-jelly/Makefile 19 May 2007 20:13:41 -0000 1.2 +++ /usr/ports/lang/jakarta-commons-jelly/Makefile 24 Feb 2008 04:51:20 -0000 @@ -8,8 +8,8 @@ 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