From 3e5d9c7f1f1157e7628eec768809c4e039f25942 Mon Sep 17 00:00:00 2001
From: Bill Fenner <fenner@FreeBSD.org>
Date: Tue, 25 Oct 2005 18:36:49 +0000
Subject: Fix ${MASTER_SITE_foo} usage.  - Use the proper syntax for grouping
 when using ${MASTER_SITE_foo}  - Don't use ${MASTER_SITE_LOCAL} with no local
 user subdir.

Approved by:	MAINTAINER timeout (2 weeks)
---
 editors/openoffice-3-devel/Makefile         |  3 ++-
 editors/openoffice-3/Makefile               |  3 ++-
 editors/openoffice.org-1.0/Makefile         | 14 +++++++++-----
 editors/openoffice.org-1.1-devel/Makefile   | 13 +++++++++----
 editors/openoffice.org-1.1/Makefile         | 15 ++++++++++-----
 editors/openoffice.org-2-RC/Makefile        |  3 ++-
 editors/openoffice.org-2-devel/Makefile     |  3 ++-
 editors/openoffice.org-2.0-devel/Makefile   |  3 ++-
 editors/openoffice.org-2.0/Makefile         |  3 ++-
 editors/openoffice.org-2/Makefile           |  3 ++-
 editors/openoffice.org-3-RC/Makefile        |  3 ++-
 editors/openoffice.org-3-devel/Makefile     |  3 ++-
 editors/openoffice.org-3/Makefile           |  3 ++-
 editors/openoffice.org-vcltesttool/Makefile |  3 ++-
 14 files changed, 50 insertions(+), 25 deletions(-)

(limited to 'editors')

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index e492019e2bb2..fcddd167f4e6 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -11,7 +11,8 @@ CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
+		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
+MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 56651100a5fb..a74c10c9cdb7 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -11,7 +11,8 @@ CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
+		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
+MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_2.0RC3_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_2.0RC3_source.tar.bz2
 
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index c93721104376..ff5e6d459513 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -9,14 +9,18 @@ PORTNAME=	openoffice.org
 PORTVERSION=	1.0.3
 PORTREVISION=	5
 CATEGORIES+=	editors
-MASTER_SITES+=  ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${PORTVERSION}/&,} \
-		${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:moz \
+MASTER_SITES+=  ${MASTER_SITE_RINGSERVER} \
+		${MASTER_SITE_LOCAL:S/$/:moz/} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}src/:mozsrc \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent-1.0/&,}:help \
+		${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
+		${MASTER_SITE_RINGSERVER:S/$/:help/} \
 		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent-1.0/:help \
 		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent-1.0/:help \
-		${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:ru
+		${MASTER_SITE_LOCAL:S/$/:ru/}
+MASTER_SITE_SUBDIR= misc/openoffice/stable/${PORTVERSION} \
+		maho/openoffice.org/:moz,ru \
+		mozilla/releases/mozilla${MOZILLA_VERSION}/src/:mozsrc \
+		misc/openoffice/contrib/helpcontent-1.0/:help
 DISTFILES+=	OOo_${RELEASE_NR}_source.tar.gz gpc231.tar.Z:gpc patch-translation-ru-1.0.3.bz2:ru
 EXTRACT_ONLY=	OOo_${RELEASE_NR}_source.tar.gz
 
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index ae929e2775d3..a4ce26e884a6 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -10,16 +10,21 @@ PORTVERSION=	1.1.5.${SNAPDATE}
 CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
-		${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:moz \
+		${MASTER_SITE_LOCAL:S/$/:moz/} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}src/:mozsrc \
+		${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
 		http://openoffice.lunarshells.com/sources/helpcontent/:help \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent-1.0/&,}:help3 \
+		${MASTER_SITE_RINGSERVER:S/$/:help/} \
+		${MASTER_SITE_RINGSERVER:S/$/:help3/} \
 		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
 		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
 		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
 		ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Files/:help2
+MASTER_SITE_SUBDIR=	maho/openoffice.org/:moz \
+		mozilla/releases/mozilla${MOZILLA_VERSION}/src/:mozsrc \
+		misc/openoffice/contrib/helpcontent/:help \
+		misc/openoffice/contrib/helpcontent-1.0/:help3 \
+
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}.${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}.${SNAPDATE}_source.tar.bz2
 
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index ee9755fd56ed..2f43dad7bcfb 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -8,9 +8,9 @@
 PORTNAME=	openoffice.org
 PORTVERSION=	1.1.5
 CATEGORIES+=	editors
-MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/1.1.5/&,} \
-		${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:moz \
-		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla1.0/src/&,}:mozsrc \
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER} \
+		${MASTER_SITE_LOCAL:S/$/:moz/} \
+		${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
 		ftp://ftp.kddlabs.co.jp/office/openoffice/stable/1.1.5/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/stable/1.1.5/ \
 		ftp://ftp.tu-chemnitz.de/pub/openoffice/stable/1.1.5/ \
@@ -18,12 +18,17 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/1.1.5/
 		http://ftp.gwdg.de/pub/misc/openoffice/stable/1.1.5/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		http://openoffice.lunarshells.com/sources/helpcontent/:help \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent-1.0/&,}:help3 \
+		${MASTER_SITE_RINGSERVER:S/$/:help/} \
+		${MASTER_SITE_RINGSERVER:S/$/:help3/} \
 		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
 		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
 		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
 		ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Files/:help2
+MASTER_SITE_SUBDIR=	misc/openoffice/stable/1.1.5 \
+		maho/openoffice.org/:moz \
+		mozilla/releases/mozilla1.0/src/:mozsrc \
+		misc/openoffice/contrib/helpcontent/:help \
+		misc/openoffice/contrib/helpcontent-1.0/:help3
 DISTFILES+=	OOo_${RELEASE_NR}_src.tar.gz gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}_src.tar.gz
 
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 56651100a5fb..a74c10c9cdb7 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -11,7 +11,8 @@ CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
+		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
+MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_2.0RC3_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_2.0RC3_source.tar.bz2
 
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index e492019e2bb2..fcddd167f4e6 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -11,7 +11,8 @@ CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
+		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
+MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index e492019e2bb2..fcddd167f4e6 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -11,7 +11,8 @@ CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
+		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
+MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 56651100a5fb..a74c10c9cdb7 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -11,7 +11,8 @@ CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
+		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
+MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_2.0RC3_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_2.0RC3_source.tar.bz2
 
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 56651100a5fb..a74c10c9cdb7 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -11,7 +11,8 @@ CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
+		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
+MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_2.0RC3_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_2.0RC3_source.tar.bz2
 
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 56651100a5fb..a74c10c9cdb7 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -11,7 +11,8 @@ CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
+		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
+MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_2.0RC3_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_2.0RC3_source.tar.bz2
 
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index e492019e2bb2..fcddd167f4e6 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -11,7 +11,8 @@ CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
+		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
+MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 56651100a5fb..a74c10c9cdb7 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -11,7 +11,8 @@ CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
+		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
+MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_2.0RC3_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_2.0RC3_source.tar.bz2
 
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index e492019e2bb2..fcddd167f4e6 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -11,7 +11,8 @@ CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
+		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
+MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
-- 
cgit v1.2.3