summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorknu <knu@FreeBSD.org>2002-08-26 08:57:22 +0000
committerknu <knu@FreeBSD.org>2002-08-26 08:57:22 +0000
commita5e089c18f19e183e9d13337c6bc7dc24d768f7e (patch)
treeb54ea5add2bfc1f01743c7532a123dab3d4c3ee5
parent4129d2abd89967938efec36cb3cad568e33682b4 (diff)
downloadFreeBSD-ports-a5e089c18f19e183e9d13337c6bc7dc24d768f7e.zip
FreeBSD-ports-a5e089c18f19e183e9d13337c6bc7dc24d768f7e.tar.gz
- Use %SUBDIR% instead of embedding ${PORTVERSION} in MASTER_SITES
entries. - Use the MASTER_SITES-:fu to cut bogus combinations of MASTER_SITES and DISTFILES. - Now that RingServer mirrors OpenOffice.org, add it to MASTER_SITES. Approved by: mbr (MAINTAINER)
-rw-r--r--editors/openoffice-1.0/Makefile13
-rw-r--r--editors/openoffice.org-1.0/Makefile13
-rw-r--r--editors/openoffice/Makefile13
-rw-r--r--japanese/openoffice-1.0/Makefile2
-rw-r--r--japanese/openoffice/Makefile2
5 files changed, 26 insertions, 17 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index 91a4fae..6f6fff2 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -9,12 +9,15 @@ PORTNAME= openoffice
PORTVERSION= 1.0.1
PORTREVISION= 3
CATEGORIES+= editors
-MASTER_SITES+= http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
- ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
- http://sf1.mirror.openoffice.org/miscellaneous/helpcontent/
-DISTFILES+= OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z
+MASTER_SITES+= http://sf1.mirror.openoffice.org/%SUBDIR%/ \
+ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
+ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
+ http://sf1.mirror.openoffice.org/miscellaneous/helpcontent/:help
+MASTER_SITE_SUBDIR= ${PORTVERSION}
+DISTFILES+= OOo_${PORTVERSION}_source.tar.bz2 \
+ gpc231.tar.Z:gpc
.if defined(L10NHELP)
-DISTFILES+= ${L10NHELP}
+DISTFILES+= ${L10NHELP:S/$/:help/}
.endif
SORT?= /usr/bin/sort
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 91a4fae..6f6fff2 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -9,12 +9,15 @@ PORTNAME= openoffice
PORTVERSION= 1.0.1
PORTREVISION= 3
CATEGORIES+= editors
-MASTER_SITES+= http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
- ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
- http://sf1.mirror.openoffice.org/miscellaneous/helpcontent/
-DISTFILES+= OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z
+MASTER_SITES+= http://sf1.mirror.openoffice.org/%SUBDIR%/ \
+ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
+ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
+ http://sf1.mirror.openoffice.org/miscellaneous/helpcontent/:help
+MASTER_SITE_SUBDIR= ${PORTVERSION}
+DISTFILES+= OOo_${PORTVERSION}_source.tar.bz2 \
+ gpc231.tar.Z:gpc
.if defined(L10NHELP)
-DISTFILES+= ${L10NHELP}
+DISTFILES+= ${L10NHELP:S/$/:help/}
.endif
SORT?= /usr/bin/sort
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index 91a4fae..6f6fff2 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -9,12 +9,15 @@ PORTNAME= openoffice
PORTVERSION= 1.0.1
PORTREVISION= 3
CATEGORIES+= editors
-MASTER_SITES+= http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
- ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
- http://sf1.mirror.openoffice.org/miscellaneous/helpcontent/
-DISTFILES+= OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z
+MASTER_SITES+= http://sf1.mirror.openoffice.org/%SUBDIR%/ \
+ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
+ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
+ http://sf1.mirror.openoffice.org/miscellaneous/helpcontent/:help
+MASTER_SITE_SUBDIR= ${PORTVERSION}
+DISTFILES+= OOo_${PORTVERSION}_source.tar.bz2 \
+ gpc231.tar.Z:gpc
.if defined(L10NHELP)
-DISTFILES+= ${L10NHELP}
+DISTFILES+= ${L10NHELP:S/$/:help/}
.endif
SORT?= /usr/bin/sort
diff --git a/japanese/openoffice-1.0/Makefile b/japanese/openoffice-1.0/Makefile
index 0935f05..6b5c0cf 100644
--- a/japanese/openoffice-1.0/Makefile
+++ b/japanese/openoffice-1.0/Makefile
@@ -13,6 +13,6 @@ LANG_CONFIGURE_ARG= JAPN
MASTERDIR= ${.CURDIR}/../../editors/openoffice
RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho.ttf:${PORTSDIR}/japanese/kochi-ttfonts
MASTER_SITES+= ftp://ftp.kddlabs.co.jp/office/openoffice/ \
- ftp://ftp.sfc.wide.ad.jp/pub/OpenOffice/
+ ftp://ftp.sfc.wide.ad.jp/pub/OpenOffice/:help
L10NHELP= helpcontent
.include "${MASTERDIR}/Makefile"
diff --git a/japanese/openoffice/Makefile b/japanese/openoffice/Makefile
index 0935f05..6b5c0cf 100644
--- a/japanese/openoffice/Makefile
+++ b/japanese/openoffice/Makefile
@@ -13,6 +13,6 @@ LANG_CONFIGURE_ARG= JAPN
MASTERDIR= ${.CURDIR}/../../editors/openoffice
RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho.ttf:${PORTSDIR}/japanese/kochi-ttfonts
MASTER_SITES+= ftp://ftp.kddlabs.co.jp/office/openoffice/ \
- ftp://ftp.sfc.wide.ad.jp/pub/OpenOffice/
+ ftp://ftp.sfc.wide.ad.jp/pub/OpenOffice/:help
L10NHELP= helpcontent
.include "${MASTERDIR}/Makefile"
OpenPOWER on IntegriCloud