diff options
| author | fenner <fenner@FreeBSD.org> | 2005-10-25 18:36:49 +0000 |
|---|---|---|
| committer | fenner <fenner@FreeBSD.org> | 2005-10-25 18:36:49 +0000 |
| commit | 1a22253ec2e83b04600088d6780aecc92bc03e76 (patch) | |
| tree | c89a2912fa180c89ddc652bb5bd1fb8f571477da /editors/openoffice.org-1.1 | |
| parent | 66f15dbe2c0b81655b67725002dfed9711f065f5 (diff) | |
| download | FreeBSD-ports-1a22253ec2e83b04600088d6780aecc92bc03e76.zip FreeBSD-ports-1a22253ec2e83b04600088d6780aecc92bc03e76.tar.gz | |
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)
Diffstat (limited to 'editors/openoffice.org-1.1')
| -rw-r--r-- | editors/openoffice.org-1.1/Makefile | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index ee9755f..2f43dad 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 |
