From owner-freebsd-openoffice Sat Aug 24 17:26:28 2002 Delivered-To: freebsd-openoffice@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5ADFB37B400 for ; Sat, 24 Aug 2002 17:26:25 -0700 (PDT) Received: from mail.musha.org (daemon.musha.org [210.189.104.8]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86C4743E65 for ; Sat, 24 Aug 2002 17:26:24 -0700 (PDT) (envelope-from knu@iDaemons.org) Received: from archon.local.idaemons.org (archon.local.idaemons.org [192.168.1.32]) by mail.musha.org (Postfix) with ESMTP id 716AB519B2 for ; Sun, 25 Aug 2002 09:26:22 +0900 (JST) Date: Sun, 25 Aug 2002 09:26:23 +0900 Message-ID: <86hehj4wcw.wl@archon.local.idaemons.org> From: "Akinori MUSHA" To: openoffice@FreeBSD.org Subject: MASTER_SITES patch User-Agent: Wanderlust/2.9.14 (Unchained Melody) EMIKO/1.14.1 (Choanoflagellata) LIMIT/1.14.7 (Fujiidera) APEL/10.3 Emacs/21.2 (i386--freebsd) MULE/5.0 (SAKAKI) Organization: Associated I. Daemons X-PGP-Public-Key: finger knu@FreeBSD.org X-PGP-Fingerprint: 081D 099C 1705 861D 4B70 B04A 920B EFC7 9FD9 E1EE MIME-Version: 1.0 (generated by EMIKO 1.14.1 - "Choanoflagellata") Content-Type: text/plain; charset=US-ASCII Sender: owner-freebsd-openoffice@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Hi, Please review the attached patch and (allow me to) commit if it's okay. - Use %SUBDIR% instead of embedding ${PORTVERSION} in MASTER_SITES entries. (This promises future flexibility) - Use the MASTER_SITES-:fu to cut bogus combinations of MASTER_SITES and DISTFILES. (This reduces unwanted repeated errors and traffic) - Now that RingServer mirrors OpenOffice.org, add it to MASTER_SITES. (This reduces traffic from/in the Far East) Regards, -- / /__ __ Akinori.org / MUSHA.org / ) ) ) ) / FreeBSD.org / Ruby-lang.org Akinori MUSHA aka / (_ / ( (__( @ iDaemons.org / and.or.jp "When I leave I don't know what I'm hoping to find When I leave I don't know what I'm leaving behind.." Index: editors/openoffice/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/openoffice/Makefile,v retrieving revision 1.116 diff -u -r1.116 Makefile --- editors/openoffice/Makefile 19 Aug 2002 14:03:54 -0000 1.116 +++ editors/openoffice/Makefile 25 Aug 2002 00:06:03 -0000 @@ -9,12 +9,15 @@ 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}:help .endif SORT?= /usr/bin/sort Index: japanese/openoffice/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/openoffice/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- japanese/openoffice/Makefile 21 Aug 2002 21:37:19 -0000 1.6 +++ japanese/openoffice/Makefile 25 Aug 2002 00:11:06 -0000 @@ -13,6 +13,6 @@ 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" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-openoffice" in the body of the message