Attachment #84967 for bug #121041

View | Details | Raw Unified | Return to bug 121041
Collapse All | Expand All




	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/&,}

Lines 9-16 Link Here

(-)/usr/ports/databases/jakarta-commons-dbutils/Makefile (-2 / +2 lines)
9	PORTVERSION= 1.1	9	PORTVERSION= 1.1
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= databases java	11	CATEGORIES= databases java
12	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	12	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
13	MASTER_SITE_SUBDIR= commons/dbutils/source	13	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
14	PKGNAMEPREFIX= jakarta-	14	PKGNAMEPREFIX= jakarta-
15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
16		16

Lines 9-16 Link Here

(-)/usr/ports/devel/jakarta-commons-chain/Makefile (-2 / +2 lines)
9	PORTVERSION= 1.1	9	PORTVERSION= 1.1
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= devel java	11	CATEGORIES= devel java
12	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	12	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
13	MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/source	13	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
14	PKGNAMEPREFIX= jakarta-	14	PKGNAMEPREFIX= jakarta-
15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
16		16

Lines 8-15 Link Here

(-)/usr/ports/devel/jakarta-commons-daemon/Makefile (-2 / +2 lines)
8	PORTNAME= commons-daemon	8	PORTNAME= commons-daemon
9	PORTVERSION= 1.0.1	9	PORTVERSION= 1.0.1
10	CATEGORIES= devel java	10	CATEGORIES= devel java
11	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	11	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
12	MASTER_SITE_SUBDIR= commons/daemon/source	12	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
13	PKGNAMEPREFIX= jakarta-	13	PKGNAMEPREFIX= jakarta-
14	DISTNAME= daemon-${PORTVERSION}	14	DISTNAME= daemon-${PORTVERSION}
15		15

Lines 8-15 Link Here

(-)/usr/ports/devel/jakarta-commons-io/Makefile (-2 / +2 lines)
8	PORTNAME= commons-io	8	PORTNAME= commons-io
9	PORTVERSION= 1.3.2	9	PORTVERSION= 1.3.2
10	CATEGORIES= devel java	10	CATEGORIES= devel java
11	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	11	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
12	MASTER_SITE_SUBDIR= commons/io/source	12	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
13	PKGNAMEPREFIX= jakarta-	13	PKGNAMEPREFIX= jakarta-
14	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	14	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
15		15

Lines 9-16 Link Here

(-)/usr/ports/java/jakarta-commons-beanutils/Makefile (-2 / +2 lines)
9	PORTVERSION= 1.7.0	9	PORTVERSION= 1.7.0
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= java devel	11	CATEGORIES= java devel
12	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	12	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
13	MASTER_SITE_SUBDIR= commons/beanutils/source/	13	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
14	PKGNAMEPREFIX= jakarta-	14	PKGNAMEPREFIX= jakarta-
15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
16		16

Lines 10-17 Link Here

(-)/usr/ports/java/jakarta-commons-cli/Makefile (-2 / +2 lines)
10	PORTREVISION= 1	10	PORTREVISION= 1
11	PORTEPOCH= 1	11	PORTEPOCH= 1
12	CATEGORIES= java devel	12	CATEGORIES= java devel
13	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	13	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
14	MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/source	14	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
15	PKGNAMEPREFIX= jakarta-	15	PKGNAMEPREFIX= jakarta-
16	DISTNAME= cli-${PORTVERSION}-src	16	DISTNAME= cli-${PORTVERSION}-src
17		17

Lines 9-16 Link Here

(-)/usr/ports/java/jakarta-commons-codec/Makefile (-2 / +2 lines)
9	PORTVERSION= 1.3	9	PORTVERSION= 1.3
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= java converters	11	CATEGORIES= java converters
12	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	12	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
13	MASTER_SITE_SUBDIR= commons/codec/source	13	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
14	PKGNAMEPREFIX= jakarta-	14	PKGNAMEPREFIX= jakarta-
15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
16		16

Lines 9-16 Link Here

(-)/usr/ports/java/jakarta-commons-collections/Makefile (-2 / +2 lines)
9	PORTVERSION= 3.2	9	PORTVERSION= 3.2
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= java devel	11	CATEGORIES= java devel
12	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	12	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
13	MASTER_SITE_SUBDIR= commons/collections/source/	13	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
14	PKGNAMEPREFIX= jakarta-	14	PKGNAMEPREFIX= jakarta-
15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
16		16

Lines 9-16 Link Here

(-)/usr/ports/java/jakarta-commons-dbcp/Makefile (-2 / +2 lines)
9	PORTVERSION= 1.2.1	9	PORTVERSION= 1.2.1
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= java	11	CATEGORIES= java
12	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	12	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
13	MASTER_SITE_SUBDIR= commons/dbcp/source	13	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
14	PKGNAMEPREFIX= jakarta-	14	PKGNAMEPREFIX= jakarta-
15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
16	DIST_SUBDIR= jakarta	16	DIST_SUBDIR= jakarta

Lines 8-15 Link Here

(-)/usr/ports/java/jakarta-commons-httpclient/Makefile (-2 / +2 lines)
8	PORTNAME= commons-httpclient	8	PORTNAME= commons-httpclient
9	DISTVERSION= 3.1	9	DISTVERSION= 3.1
10	CATEGORIES= java www	10	CATEGORIES= java www
11	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	11	MASTER_SITES= ${MASTER_SITE_APACHE}
12	MASTER_SITE_SUBDIR= httpcomponents/${PORTNAME}-3.x/source	12	MASTER_SITE_SUBDIR= httpcomponents/${PORTNAME}/source
13	PKGNAMEPREFIX= jakarta-	13	PKGNAMEPREFIX= jakarta-
14	DISTNAME= ${PORTNAME}-${DISTVERSION}-src	14	DISTNAME= ${PORTNAME}-${DISTVERSION}-src
15		15

Lines 9-16 Link Here

(-)/usr/ports/java/jakarta-commons-lang/Makefile (-2 / +2 lines)
9	PORTVERSION= 2.3	9	PORTVERSION= 2.3
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= java devel	11	CATEGORIES= java devel
12	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	12	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
13	MASTER_SITE_SUBDIR= commons/lang/source	13	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
14	PKGNAMEPREFIX= jakarta-	14	PKGNAMEPREFIX= jakarta-
15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
16		16

Lines 9-16 Link Here

(-)/usr/ports/java/jakarta-commons-pool/Makefile (-2 / +2 lines)
9	PORTVERSION= 1.3	9	PORTVERSION= 1.3
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= java devel	11	CATEGORIES= java devel
12	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	12	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
13	MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/source	13	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
14	PKGNAMEPREFIX= jakarta-	14	PKGNAMEPREFIX= jakarta-
15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
16		16

Lines 9-16 Link Here

(-)/usr/ports/java/jakarta-commons-primitives/Makefile (-2 / +2 lines)
9	PORTVERSION= 1.0	9	PORTVERSION= 1.0
10	PORTREVISION= 2	10	PORTREVISION= 2
11	CATEGORIES= java	11	CATEGORIES= java
12	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	12	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
13	MASTER_SITE_SUBDIR= commons/primitives/source	13	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
14	PKGNAMEPREFIX= jakarta-	14	PKGNAMEPREFIX= jakarta-
15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
16		16

Lines 9-16 Link Here

(-)/usr/ports/math/jakarta-commons-math/Makefile (-2 / +2 lines)
9	PORTVERSION= 1.1	9	PORTVERSION= 1.1
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= math java	11	CATEGORIES= math java
12	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	12	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
13	MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/source	13	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
14	PKGNAMEPREFIX= jakarta-	14	PKGNAMEPREFIX= jakarta-
15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
16		16

Lines 9-16 Link Here

(-)/usr/ports/net/jakarta-commons-net/Makefile (-2 / +2 lines)
9	PORTVERSION= 1.4.1	9	PORTVERSION= 1.4.1
10	PORTREVISION= 2	10	PORTREVISION= 2
11	CATEGORIES= net java	11	CATEGORIES= net java
12	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	12	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
13	MASTER_SITE_SUBDIR= commons/net/source	13	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
14	PKGNAMEPREFIX= jakarta-	14	PKGNAMEPREFIX= jakarta-
15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
16		16

Lines 9-16 Link Here

(-)/usr/ports/textproc/jakarta-commons-digester/Makefile (-2 / +2 lines)
9	PORTVERSION= 1.7	9	PORTVERSION= 1.7
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= textproc java devel	11	CATEGORIES= textproc java devel
12	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	12	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
13	MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/source	13	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
14	PKGNAMEPREFIX= jakarta-	14	PKGNAMEPREFIX= jakarta-
15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	15	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
16		16

Lines 9-16 Link Here

(-)/usr/ports/devel/jakarta-commons-configuration/Makefile (-2 / +2 lines)
9	PORTVERSION= 1.3	9	PORTVERSION= 1.3
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= devel java	11	CATEGORIES= devel java
12	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	12	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_BINARIES}
13	MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/binaries/	13	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
14	PKGNAMEPREFIX= jakarta-	14	PKGNAMEPREFIX= jakarta-
15		15
16	MAINTAINER= hq@FreeBSD.org	16	MAINTAINER= hq@FreeBSD.org

Lines 9-16 Link Here

(-)/usr/ports/devel/jakarta-commons-jxpath/Makefile (-2 / +2 lines)
9	PORTVERSION= 1.2	9	PORTVERSION= 1.2
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= devel www java	11	CATEGORIES= devel www java
12	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	12	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_BINARIES}
13	MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/binaries	13	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
14	PKGNAMEPREFIX= jakarta-	14	PKGNAMEPREFIX= jakarta-
15		15
16	MAINTAINER= nemoliu@FreeBSD.org	16	MAINTAINER= nemoliu@FreeBSD.org

Lines 8-15 Link Here

(-)/usr/ports/devel/jakarta-commons-modeler/Makefile (-2 / +2 lines)
8	PORTNAME= commons-modeler	8	PORTNAME= commons-modeler
9	PORTVERSION= 2.0.1	9	PORTVERSION= 2.0.1
10	CATEGORIES= devel java	10	CATEGORIES= devel java
11	MASTER_SITES= ${MASTER_SITE_APACHE}	11	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_BINARIES}
12	MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/binaries	12	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
13	PKGNAMEPREFIX= jakarta-	13	PKGNAMEPREFIX= jakarta-
14		14
15	MAINTAINER= nemoliu@FreeBSD.org	15	MAINTAINER= nemoliu@FreeBSD.org

Lines 9-16 Link Here

(-)/usr/ports/java/jakarta-commons-discovery/Makefile (-2 / +2 lines)
9	PORTVERSION= 0.4	9	PORTVERSION= 0.4
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= java devel	11	CATEGORIES= java devel
12	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	12	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_BINARIES}
13	MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/binaries	13	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
14	PKGNAMEPREFIX= jakarta-	14	PKGNAMEPREFIX= jakarta-
15		15
16	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= ports@FreeBSD.org

Lines 9-16 Link Here

(-)/usr/ports/java/jakarta-commons-logging/Makefile (-2 / +2 lines)
9	PORTVERSION= 1.1	9	PORTVERSION= 1.1
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= java devel	11	CATEGORIES= java devel
12	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	12	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_BINARIES}
13	MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/binaries	13	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
14	PKGNAMEPREFIX= jakarta-	14	PKGNAMEPREFIX= jakarta-
15		15
16	MAINTAINER= hq@FreeBSD.org	16	MAINTAINER= hq@FreeBSD.org

Lines 8-15 Link Here

(-)/usr/ports/lang/jakarta-commons-jelly/Makefile (-2 / +2 lines)
8	PORTVERSION= 1.0	8	PORTVERSION= 1.0
9	PORTREVISION= 1	9	PORTREVISION= 1
10	CATEGORIES= lang devel java	10	CATEGORIES= lang devel java
11	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	11	MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_BINARIES}
12	MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/binaries	12	MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
13	PKGNAMEPREFIX= jakarta-	13	PKGNAMEPREFIX= jakarta-
14		14
15	MAINTAINER= hq@FreeBSD.org	15	MAINTAINER= hq@FreeBSD.org

Return to bug 121041

Lines 83-88 Link Here

(-)Mk/bsd.sites.mk (+10 lines)
83	ftp://ftp.saix.net/pub/apache/dist/%SUBDIR%/	83	ftp://ftp.saix.net/pub/apache/dist/%SUBDIR%/
84	.endif	84	.endif
85		85
		86	.if !defined(IGNORE_MASTER_SITE_APACHE_COMMONS_BINARIES)
		87	MASTER_SITE_APACHE_COMMONS_BINARIES+= \
		88	${MASTER_SITE_APACHE:S,%SUBDIR%,commons/&/binaries,}
		89	.endif
		90
		91	.if !defined(IGNORE_MASTER_SITE_APACHE_COMMONS_SOURCE)
		92	MASTER_SITE_APACHE_COMMONS_SOURCE+= \
		93	${MASTER_SITE_APACHE:S,%SUBDIR%,commons/&/source,}
		94	.endif
		95
86	.if !defined(IGNORE_MASTER_SITE_APACHE_HTTPD)	96	.if !defined(IGNORE_MASTER_SITE_APACHE_HTTPD)
87	MASTER_SITE_APACHE_HTTPD+= \	97	MASTER_SITE_APACHE_HTTPD+= \
88	${MASTER_SITE_APACHE:S,%SUBDIR%,httpd/&,}	98	${MASTER_SITE_APACHE:S,%SUBDIR%,httpd/&,}