aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/bootstrap-openjdk/Makefile3
-rw-r--r--java/classpath/Makefile10
-rw-r--r--java/eclipse-cdt/Makefile3
-rw-r--r--java/eclipse-windowbuilder/Makefile2
-rw-r--r--java/jakarta-bcel/Makefile3
-rw-r--r--java/jakarta-commons-httpclient/Makefile3
-rw-r--r--java/jakarta-regexp/Makefile3
-rw-r--r--java/java-zoneinfo/Makefile2
-rw-r--r--java/openjdk6/Makefile5
-rw-r--r--java/openjdk7/Makefile2
-rw-r--r--java/proguard/Makefile3
-rw-r--r--java/rubygem-rjb/Makefile2
12 files changed, 16 insertions, 25 deletions
diff --git a/java/bootstrap-openjdk/Makefile b/java/bootstrap-openjdk/Makefile
index ad98c303568f..4eb5ad65a26b 100644
--- a/java/bootstrap-openjdk/Makefile
+++ b/java/bootstrap-openjdk/Makefile
@@ -4,8 +4,7 @@ PORTNAME= ${JDK_NAME}
PORTVERSION= ${DISTVERSION_${ARCH}}
PORTREVISION= 1
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jkim
+MASTER_SITES= LOCAL/jkim
PKGNAMEPREFIX= bootstrap-
DISTNAME= ${JDK_PORT}-${ARCH}-${PORTVERSION}
diff --git a/java/classpath/Makefile b/java/classpath/Makefile
index b5f04e18f179..34ebf83c9204 100644
--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@@ -5,10 +5,9 @@ PORTNAME= classpath
PORTVERSION= 0.99
PORTREVISION= 1
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_GNU} \
- ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME:S|$|:src|}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src
+MASTER_SITES= GNU \
+ SAVANNAH
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= java@FreeBSD.org
@@ -48,8 +47,7 @@ QT4_DESC= Enable Qt AWT peer
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MECJ}
-MASTER_SITES+= ${MASTER_SITE_ECLIPSE:S|$|:ecj|}
-MASTER_SITE_SUBDIR+= R-${ECJ_VERSION}-${ECJ_DROPDATE}/:ecj
+MASTER_SITES+= ECLIPSE/R-${ECJ_VERSION}-${ECJ_DROPDATE}:ecj
DISTFILES+= ${ECJ_JAR}:ecj
ECJ_VERSION= 3.8.1
ECJ_DROPDATE= 201209141540
diff --git a/java/eclipse-cdt/Makefile b/java/eclipse-cdt/Makefile
index 973277b36745..52e6459949e8 100644
--- a/java/eclipse-cdt/Makefile
+++ b/java/eclipse-cdt/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ${PLUGIN}
PORTVERSION= 6.0.2
PORTREVISION= 3
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_ECLIPSE}
-MASTER_SITE_SUBDIR=tools/${PLUGIN}/releases/${ECLIPSE_CODENAME}/dist
+MASTER_SITES= ECLIPSE/tools/${PLUGIN}/releases/${ECLIPSE_CODENAME}/dist
PKGNAMEPREFIX= eclipse-
DISTNAME= ${PLUGIN}-master-${PORTVERSION}
diff --git a/java/eclipse-windowbuilder/Makefile b/java/eclipse-windowbuilder/Makefile
index e3f1a6a76462..0cb553abbc17 100644
--- a/java/eclipse-windowbuilder/Makefile
+++ b/java/eclipse-windowbuilder/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.6.1
PORTREVISION= 1
CATEGORIES= java devel
MASTER_SITES= ${MASTER_SITE_ECLIPSE:S,/eclipse/downloads/drops/,/windowbuilder/WB/release/,} \
- ${MASTER_SITE_LOCAL:S,%SUBDIR%/,ale/:native,}
+ LOCAL/ale:native
MASTER_SITE_SUBDIR= R201309271200
PKGNAMEPREFIX= eclipse-
DISTFILES= WB_v${PORTVERSION}_UpdateSite_for_Eclipse4.3.zip \
diff --git a/java/jakarta-bcel/Makefile b/java/jakarta-bcel/Makefile
index 47812f858405..23d307c839d8 100644
--- a/java/jakarta-bcel/Makefile
+++ b/java/jakarta-bcel/Makefile
@@ -4,8 +4,7 @@ PORTNAME= bcel
PORTVERSION= 5.2
PORTREVISION= 2
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR= ${PORTNAME}/binaries
+MASTER_SITES= APACHE_JAKARTA/${PORTNAME}/binaries
PKGNAMEPREFIX= jakarta-
MAINTAINER= java@FreeBSD.org
diff --git a/java/jakarta-commons-httpclient/Makefile b/java/jakarta-commons-httpclient/Makefile
index 9d8bed1818d4..32ee3bef3c42 100644
--- a/java/jakarta-commons-httpclient/Makefile
+++ b/java/jakarta-commons-httpclient/Makefile
@@ -5,8 +5,7 @@ PORTNAME= commons-httpclient
DISTVERSION= 3.1
PORTREVISION= 1
CATEGORIES= java www
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= httpcomponents/${PORTNAME}/source
+MASTER_SITES= APACHE/httpcomponents/${PORTNAME}/source
PKGNAMEPREFIX= jakarta-
DISTNAME= ${PORTNAME}-${DISTVERSION}-src
diff --git a/java/jakarta-regexp/Makefile b/java/jakarta-regexp/Makefile
index 77701aca2dd9..742eb46f4b9f 100644
--- a/java/jakarta-regexp/Makefile
+++ b/java/jakarta-regexp/Makefile
@@ -5,8 +5,7 @@ PORTNAME= jakarta-regexp
PORTVERSION= 1.5
PORTREVISION= 3
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR= regexp/binaries
+MASTER_SITES= APACHE_JAKARTA/regexp/binaries
MAINTAINER= ports@FreeBSD.org
COMMENT= Regular expressions for Java
diff --git a/java/java-zoneinfo/Makefile b/java/java-zoneinfo/Makefile
index 71f768dc4bd7..b5cfde5df547 100644
--- a/java/java-zoneinfo/Makefile
+++ b/java/java-zoneinfo/Makefile
@@ -4,7 +4,7 @@
PORTNAME= zoneinfo
DISTVERSION= 2015b
CATEGORIES= java misc
-MASTER_SITES= ${MASTER_SITE_LOCAL:S|%SUBDIR%|glewis/javazi|}
+MASTER_SITES= LOCAL/glewis/javazi
PKGNAMEPREFIX= java-
DISTNAME= javazi-${DISTVERSION}
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index b0fda78d5873..f5c71b2fadbe 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -6,11 +6,10 @@ PORTVERSION= b34
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= java devel
-MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \
+MASTER_SITES= APACHE/ant/binaries/:ant \
http://download.java.net/openjdk/jtreg/promoted/4.1/b05/:jtreg \
https://java.net/downloads/openjdk6/ \
- LOCAL
-MASTER_SITE_SUBDIR= jkim
+ LOCAL/jkim
DISTNAME= openjdk-6-src-${PORTVERSION}-${OPENJDK_BUILDDATE}
DISTFILES= ${ANTFILE}:ant \
${DISTNAME}${EXTRACT_SUFX}
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 553aa1d49a9c..70abe05fd47b 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MIN
http://icedtea.classpath.org/download/drops/:jaxws \
https://java.net/downloads/jax-ws/JDK7/:jaf \
http://icedtea.classpath.org/download/drops/:jaf \
- ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,}
+ APACHE/ant/binaries/:ant
DISTFILES= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \
${ANT_DISTFILE}${EXTRACT_SUFX}:ant
EXTRACT_ONLY= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \
diff --git a/java/proguard/Makefile b/java/proguard/Makefile
index d33ceef94ad1..256c3d0efdf7 100644
--- a/java/proguard/Makefile
+++ b/java/proguard/Makefile
@@ -4,8 +4,7 @@
PORTNAME= proguard
PORTVERSION= 5.2.1
CATEGORIES= java devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION:C/.1$//}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:C/.1$//}
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
diff --git a/java/rubygem-rjb/Makefile b/java/rubygem-rjb/Makefile
index 6a83f923e14d..237f283114a2 100644
--- a/java/rubygem-rjb/Makefile
+++ b/java/rubygem-rjb/Makefile
@@ -4,7 +4,7 @@
PORTNAME= rjb
PORTVERSION= 1.5.3
CATEGORIES= java ruby
-MASTER_SITES= ${MASTER_SITE_RUBYGEMS}
+MASTER_SITES= RG
MAINTAINER= arved@FreeBSD.org
COMMENT= Call Java Code from Ruby