MASTER_SITE_* update for openoffice
Bill Fenner
fenner at FreeBSD.org
Mon Oct 10 15:53:39 PDT 2005
I noticed that the openoffice-* ports were using an incorrect
syntax for MASTER_SITE setting. With the current
settings, the distfile survey says:
editors/openoffice.org-1.0: 6 files fetchable out of 6 (11 ok, 23 bad, 0 skipped)
editors/openoffice.org-1.1: 5 files fetchable out of 5 (15 ok, 20 bad, 0 skipped)
editors/openoffice.org-1.1-devel: 5 files fetchable out of 5 (11 ok, 19 bad, 0 skipped)
editors/openoffice.org-2.0: 3 files fetchable out of 3 (4 ok, 12 bad, 0 skipped)
editors/openoffice.org-2.0-devel: 3 files fetchable out of 3 (4 ok, 12 bad, 0 skipped)
With the following patch, that becomes:
editors/openoffice.org-1.0: 6 files fetchable out of 6 (28 ok, 3 bad, 3 skipped)
editors/openoffice.org-1.1: 5 files fetchable out of 5 (28 ok, 3 bad, 3 skipped)
editors/openoffice.org-1.1-devel: 5 files fetchable out of 5 (24 ok, 2 bad, 3 skipped)
editors/openoffice.org-2.0: 3 files fetchable out of 3 (13 ok, 0 bad, 3 skipped)
editors/openoffice.org-2.0-devel: 3 files fetchable out of 3 (13 ok, 0 bad, 3 skipped)
(i.e., across the board increase of "ok" and decrease of "bad" - the "skipped"
are transient problems)
I'd like to commit the following patch to fix these problems.
Thanks,
Bill
Index: openoffice.org-1.0/Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/openoffice.org-1.0/Makefile,v
retrieving revision 1.203
diff -u -r1.203 Makefile
--- openoffice.org-1.0/Makefile 2 Sep 2005 03:19:46 -0000 1.203
+++ openoffice.org-1.0/Makefile 10 Oct 2005 20:35:41 -0000
@@ -9,14 +9,18 @@
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
Index: openoffice.org-1.1/Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/openoffice.org-1.1/Makefile,v
retrieving revision 1.200
diff -u -r1.200 Makefile
--- openoffice.org-1.1/Makefile 22 Sep 2005 03:20:13 -0000 1.200
+++ openoffice.org-1.1/Makefile 10 Oct 2005 20:39:54 -0000
@@ -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 @@
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
Index: openoffice.org-1.1-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/openoffice.org-1.1-devel/Makefile,v
retrieving revision 1.192
diff -u -r1.192 Makefile
--- openoffice.org-1.1-devel/Makefile 22 Sep 2005 03:20:13 -0000 1.192
+++ openoffice.org-1.1-devel/Makefile 10 Oct 2005 20:37:36 -0000
@@ -10,16 +10,21 @@
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
Index: openoffice.org-2.0/Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/openoffice.org-2.0/Makefile,v
retrieving revision 1.207
diff -u -r1.207 Makefile
--- openoffice.org-2.0/Makefile 4 Oct 2005 03:59:41 -0000 1.207
+++ openoffice.org-2.0/Makefile 10 Oct 2005 20:41:01 -0000
@@ -11,7 +11,8 @@
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.0RC1_source.tar.bz2 gpc231.tar.Z:gpc
EXTRACT_ONLY= OOo_2.0RC1_source.tar.bz2
Index: openoffice.org-2.0-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/openoffice.org-2.0-devel/Makefile,v
retrieving revision 1.210
diff -u -r1.210 Makefile
--- openoffice.org-2.0-devel/Makefile 22 Sep 2005 04:15:38 -0000 1.210
+++ openoffice.org-2.0-devel/Makefile 10 Oct 2005 20:40:32 -0000
@@ -11,7 +11,8 @@
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
More information about the freebsd-openoffice
mailing list