From 2174df6d2559b98c91c85aae07a2d54c93f61dc8 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Mon, 26 Aug 2002 08:57:22 +0000 Subject: - 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) --- editors/openoffice-1.0/Makefile | 13 ++++++++----- editors/openoffice.org-1.0/Makefile | 13 ++++++++----- editors/openoffice/Makefile | 13 ++++++++----- japanese/openoffice-1.0/Makefile | 2 +- japanese/openoffice/Makefile | 2 +- 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 91a4fae39428..6f6fff2834a2 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 91a4fae39428..6f6fff2834a2 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 91a4fae39428..6f6fff2834a2 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 0935f05e585d..6b5c0cf51fbc 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 0935f05e585d..6b5c0cf51fbc 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" -- cgit v1.2.3