Cleanup DIST* variables.

When appropriate:
- Try to use DISTVERSION{SUF,PRE}FIX
- Replace PORTNAME-PORTVERSION by DISTNAME
- Convert MASTER_SITES to use macros
- Other light cleanup

With hat:	portmgr
Sponsored by:	Absolight

16 files changed, 19 insertions, 31 deletions

diff --git a/java/jaf/Makefile b/java/jaf/Makefile
index ae88f32ba0d0..2dda06213716 100644
--- a/java/jaf/Makefile
+++ b/java/jaf/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	jaf
-PORTVERSION=	1.1.1
+DISTVERSION=	1_1_1
 CATEGORIES=	java devel
 MASTER_SITES=	#
-DISTNAME=	${PORTNAME}-${PORTVERSION:S,.,_,g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JavaBeansTM Activation Framework
diff --git a/java/jai/Makefile b/java/jai/Makefile
index de3e25544bdd..94d4ab90a8b2 100644
--- a/java/jai/Makefile
+++ b/java/jai/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	jai
-PORTVERSION=	1.1.3
+DISTVERSION=	1_1_3
 PORTREVISION=	1
 CATEGORIES=	java graphics
 MASTER_SITES=	http://download.java.net/media/${PORTNAME}/builds/release/${PORTVERSION:S/./_/g}/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}-lib
+DISTNAME=	${PORTNAME}-${DISTVERSION}-lib
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	High performance image processing libraries for Java
@@ -15,7 +15,7 @@ USES=		cpe zip
 CPE_VENDOR=	oracle
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./_/g}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile
index 8f9e00448763..0b2ad9ac5dc0 100644
--- a/java/jakarta-commons-beanutils/Makefile
+++ b/java/jakarta-commons-beanutils/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-beanutils
 PORTVERSION=	1.9.2
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-cli/Makefile b/java/jakarta-commons-cli/Makefile
index f2b8ef5da209..ac7e378d596c 100644
--- a/java/jakarta-commons-cli/Makefile
+++ b/java/jakarta-commons-cli/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	commons-cli
 PORTVERSION=	1.2
 PORTEPOCH=	1
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_BINARIES}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
diff --git a/java/jakarta-commons-codec/Makefile b/java/jakarta-commons-codec/Makefile
index 9380d448a577..e4f9eb640802 100644
--- a/java/jakarta-commons-codec/Makefile
+++ b/java/jakarta-commons-codec/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	commons-codec
 PORTVERSION=	1.10
 CATEGORIES=	java converters
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-collections/Makefile b/java/jakarta-commons-collections/Makefile
index c3f8e6b713ee..7b30a7b67b6b 100644
--- a/java/jakarta-commons-collections/Makefile
+++ b/java/jakarta-commons-collections/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-collections
 PORTVERSION=	3.2.1
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-dbcp/Makefile b/java/jakarta-commons-dbcp/Makefile
index 2ab2131a11cb..b30529daa2c1 100644
--- a/java/jakarta-commons-dbcp/Makefile
+++ b/java/jakarta-commons-dbcp/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-dbcp
 PORTVERSION=	1.4
 CATEGORIES=	java databases
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-discovery/Makefile b/java/jakarta-commons-discovery/Makefile
index e3b33dda7f1d..3720edc4c3a3 100644
--- a/java/jakarta-commons-discovery/Makefile
+++ b/java/jakarta-commons-discovery/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-discovery
 PORTVERSION=	0.5
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_BINARIES}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
diff --git a/java/jakarta-commons-lang/Makefile b/java/jakarta-commons-lang/Makefile
index 92a68a299471..c9099b278dde 100644
--- a/java/jakarta-commons-lang/Makefile
+++ b/java/jakarta-commons-lang/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-lang
 PORTVERSION=	2.6
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-logging/Makefile b/java/jakarta-commons-logging/Makefile
index 86bae8541e39..6dd6ea6a0dd6 100644
--- a/java/jakarta-commons-logging/Makefile
+++ b/java/jakarta-commons-logging/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-logging
 PORTVERSION=	1.1.3
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_BINARIES}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
diff --git a/java/jakarta-commons-pool/Makefile b/java/jakarta-commons-pool/Makefile
index e42c516fd00e..1dabad7964da 100644
--- a/java/jakarta-commons-pool/Makefile
+++ b/java/jakarta-commons-pool/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-pool
 PORTVERSION=	1.6
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-primitives/Makefile b/java/jakarta-commons-primitives/Makefile
index 2e4628fe7f1a..d2b42ac33f1a 100644
--- a/java/jakarta-commons-primitives/Makefile
+++ b/java/jakarta-commons-primitives/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	commons-primitives
 PORTVERSION=	1.0
 PORTREVISION=	3
 CATEGORIES=	java
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-struts/Makefile b/java/jakarta-struts/Makefile
index 7419df60ff57..30cadebdd462 100644
--- a/java/jakarta-struts/Makefile
+++ b/java/jakarta-struts/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	struts
 PORTVERSION=	1.2.9
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=struts/binaries
+MASTER_SITES=	APACHE/${PORTNAME}/binaries
 PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
diff --git a/java/jflex/Makefile b/java/jflex/Makefile
index 9a547fe4c12a..8668287c4df3 100644
--- a/java/jflex/Makefile
+++ b/java/jflex/Makefile
@@ -6,10 +6,10 @@ PORTVERSION=	1.4.2
 CATEGORIES=	java devel
 MASTER_SITES=	http://www.jflex.de/:jflexde \
 		http://jflex.sourceforge.net/jar/devel/:jflexsf
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz:jflexde \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:jflexde \
 		JFlex.jar:jflexsf \
 		java_cup.jar:jflexsf
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	eg@fbsd.lt
 COMMENT=	The Fast Lexical Analyser Generator for Java[tm]
diff --git a/java/jrosetta/Makefile b/java/jrosetta/Makefile
index dad58709ccbc..423d3c08b817 100644
--- a/java/jrosetta/Makefile
+++ b/java/jrosetta/Makefile
@@ -25,7 +25,7 @@ COMPILE_DESC=	Download and compile source instead of binaries
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCOMPILE}
-DISTFILES=	${PORTNAME}-${PORTVERSION}-sources.jar:source
+DISTFILES=	${DISTNAME}-sources.jar:source
 
 BUILD_DEPENDS=	mvn:${PORTSDIR}/devel/maven3
 JAVA_BUILD=	yes
diff --git a/java/junit/Makefile b/java/junit/Makefile
index 9b5c5da4f201..c611eb9183e1 100644
--- a/java/junit/Makefile
+++ b/java/junit/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	junit
 PORTVERSION=	4.12
 CATEGORIES=	java devel
 MASTER_SITES=	http://repo1.maven.org/maven2/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
-DISTFILES=	${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}-${PORTVERSION}-sources.jar
+DISTFILES=	${DISTNAME}.jar ${DISTNAME}-sources.jar
 EXTRACT_ONLY=
 
 MAINTAINER=	danilo@FreeBSD.org