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, 5 deletions

diff --git a/security/xml-security/Makefile b/security/xml-security/Makefile
index ca24b8021e7c..6e9982db4994 100644
--- a/security/xml-security/Makefile
+++ b/security/xml-security/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	xml-security
-PORTVERSION=	1.5.5
+DISTVERSION=	1_5_5
 CATEGORIES=	security java
-MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	santuario/java-library/${PORTVERSION:S/./_/g}
-DISTNAME=	${PORTNAME}-src-${PORTVERSION:S/./_/g}
+MASTER_SITES=	APACHE/santuario/java-library/${DISTVERSION}
+DISTNAME=	${PORTNAME}-src-${DISTVERSION}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Java library for XML Signature and Encryption
@@ -23,7 +22,7 @@ CPE_PRODUCT=	xml_security_for_java
 CPE_VENDOR=	apache
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./_/g}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 USE_ANT=	yes
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
 ALL_TARGET=	jar