MASTER_SITES cleanup.

- Replace ${MASTER_SITE_FOO} with FOO.
- Merge MASTER_SITE_SUBDIR into MASTER_SITES when possible. (This means 99.9%
  of the time.)
- Remove occurrences of MASTER_SITE_LOCAL when no subdirectory was present and
  no hint of what it should be was present.
- Fix some logic.
- And generally, make things more simple and easy to understand.

While there, add magic values to the FESTIVAL, GENTOO, GIMP, GNUPG, QT and
SAMBA macros.

Also, replace some EXTRACT_SUFX occurences with USES=tar:*.

Checked by:	make fetch-urlall-list
With hat:	portmgr
Sponsored by:	Absolight

1 files changed, 4 insertions, 6 deletions

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