ports/58943: [PATCH] apache.org changed their distribution sites significantly
Palle Girgensohn
girgen at pingpong.net
Wed Nov 5 02:50:20 UTC 2003
>Number: 58943
>Category: ports
>Synopsis: [PATCH] apache.org changed their distribution sites significantly
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 04 18:50:17 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Palle Girgensohn <girgen at pingpong.net>
>Release: FreeBSD 4.9-RELEASE i386
>Organization:
PING PONG
>Environment:
System: FreeBSD palle.girgensohn.se 4.7-RC FreeBSD 4.7-RC #0: Sun Sep 29 17:21:22 CEST 2002 root at palle.girgensohn.se:/usr/local/obj/usr/src/sys/STORDATAN i386
>Description:
Apache's distribution system has been completely modified. The layout
for almost all distributed files have been modified, for the
better. All sub-projects are now mirrored using the same mirror
system, so there's no need to have special URLs for xml, jakarta etc,
they're all mirrored all over the globe.
This patch fixes some ports that are broken due to this fact, and also
make use of the mirrors (for some ports, older distfiles are not
mirrored, see below).
A complete list of all the mirrors can be fetched from
<http://cvs.apache.org/viewcvs.cgi/site-tools/mirrors/mirrors.list?rev=HEAD>.
This is a moving target, to say the least, so lets settle with the
ones we've used so far...
I know I'm not supposed to put several ports into one PR, but since
modifying bsd.sites.mk breaks some ports unless they're changed as
well, I don't care about that :)
enclosed are patches for:
Mk/bsd.sites.mk use some of the mirrors, the same ones that where
there before. I added archives.apache.org, so we
don't break ports when the distribution gets
updated.
textproc/xalan-c Changed SUBDIR so it won't break. use both /source
and /binaries, since the docs are distributed as
"binaries" (ODD)
textproc/xerces-c This stuff is old, so set MASTERSITE to the achive site only
textproc/xerces-c2 SUBDIR changed from stable to source
www/apache13-fp port is broken right now it seems, since it uses
and old version of apache. not good, but set
MASTER_SITE_SUBDIR=old to fix it
(I will send some more ports' fixes separately.)
Cheers,
Palle
>How-To-Repeat:
>Fix:
Index: Mk/bsd.sites.mk
===================================================================
RCS file: /misc/ncvs/ports/Mk/bsd.sites.mk,v
retrieving revision 1.201
diff -u -u -r1.201 bsd.sites.mk
--- Mk/bsd.sites.mk 3 Nov 2003 08:12:59 -0000 1.201
+++ Mk/bsd.sites.mk 5 Nov 2003 01:16:25 -0000
@@ -43,54 +43,53 @@
ftp://ftp.chg.ru/pub/X11/windowmanagers/afterstep/%SUBDIR%/
MASTER_SITE_APACHE+= \
- http://nagoya.apache.org/dist/%SUBDIR%/
+ http://www.apache.org/dist/%SUBDIR%/ \
+ http://archive.apache.org/dist/%SUBDIR%/ \
+ ftp://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/%SUBDIR%/ \
+ ftp://ftp.planetmirror.com/pub/apache/dist/%SUBDIR%/ \
+ ftp://ftp.pop-mg.com.br/pub/apache/dist/%SUBDIR%/ \
+ ftp://ftp.gin.cz/pub/mirrors/www.apache.org/dist/%SUBDIR%/ \
+ ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.apache.org/dist/%SUBDIR%/ \
+ ftp://ftp.apache.de/mirrors/dev.apache.org/dist/%SUBDIR%/ \
+ ftp://ftp.cs.tu-berlin.de/pub/net/www/apache/%SUBDIR%/ \
+ ftp://mir1.ovh.net/ftp.apache.org/dist/%SUBDIR%/ \
+ ftp://ftp.forthnet.gr/pub/www/apache/dist/%SUBDIR%/ \
+ ftp://sunsite.srce.hr/mirrors/ftp.apache.org/apache/dist/%SUBDIR%/ \
+ ftp://xenia.sote.hu/pub/mirrors/www.apache.org/%SUBDIR%/ \
+ ftp://ftp.esat.net/mirrors/ftp.apache.org/%SUBDIR%/ \
+ ftp://ftp.heanet.ie/mirrors/www.apache.org/dist/%SUBDIR%/ \
+ ftp://ftp.rhnet.is/pub/apache/%SUBDIR%/ \
+ ftp://apache.theomnistore.com/mirror/apache/dist/%SUBDIR%/ \
+ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/&,} \
+ ftp://ftp.sogang.ac.kr/www/apache/dist/%SUBDIR%/ \
+ ftp://ftp.task.gda.pl/pub/www/apache/dist/%SUBDIR%/ \
+ ftp://sunsite.icm.edu.pl/pub/www/apache/dist/%SUBDIR%/ \
+ ftp://ftp.telepac.pt/pub/apache/dist/%SUBDIR%/ \
+ ftp://ftp.kappa.ro/pub/mirrors/ftp.apache.org/dist/%SUBDIR%/ \
+ ftp://apache.rinet.ru/pub/mirror/apache.org/dist/%SUBDIR%/ \
+ ftp://ftp.chg.ru/pub/WWW/apache/dist/%SUBDIR%/ \
+ ftp://ftp.sunet.se/pub/www/servers/apache/dist/%SUBDIR%/ \
+ ftp://apache.mirrors.rossfell.co.uk/mirrors/apache/dist/%SUBDIR%/ \
+ ftp://ftp.flirble.org/pub/web/apache/dist/%SUBDIR%/ \
+ ftp://ftp.gbnet.net/pub/apache/dist/%SUBDIR%/ \
+ ftp://ftp.plig.net/pub/apache/dist/%SUBDIR%/ \
+ ftp://mirrors.rmplc.co.uk/pub/apache/dist/%SUBDIR%/ \
+ ftp://apache.secsup.org/pub/apache/dist/%SUBDIR%/ \
+ ftp://ftp.apache.inetcosmos.org/pub/apache/dist/%SUBDIR%/ \
+ ftp://ftp.ccs.neu.edu/net/mirrors/Apache/dist/%SUBDIR%/ \
+ ftp://ftp.epix.net/pub/apache/%SUBDIR%/ \
+ ftp://ftp.rge.com/pub/infosystems/apache/%SUBDIR%/ \
+ ftp://ftp.tux.org/pub/net/apache/dist/%SUBDIR%/ \
+ ftp://ftp.saix.net/pub/apache/dist/%SUBDIR%/ \
+ http://nagoya.apache.org/dist/mirror/%SUBDIR%/
MASTER_SITE_APACHE_HTTPD+= \
- http://www.apache.org/dist/httpd/%SUBDIR%/ \
- ftp://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/httpd/%SUBDIR%/ \
- ftp://ftp.planetmirror.com/pub/apache/dist/httpd/%SUBDIR%/ \
- ftp://ftp.pop-mg.com.br/pub/apache/dist/httpd/%SUBDIR%/ \
- ftp://ftp.gin.cz/pub/mirrors/www.apache.org/dist/httpd/%SUBDIR%/ \
- ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.apache.org/dist/httpd/%SUBDIR%/ \
- ftp://ftp.apache.de/mirrors/dev.apache.org/dist/httpd/%SUBDIR%/ \
- ftp://ftp.cs.tu-berlin.de/pub/net/www/apache/%SUBDIR%/ \
- ftp://mir1.ovh.net/ftp.apache.org/dist/httpd/%SUBDIR%/ \
- ftp://ftp.forthnet.gr/pub/www/apache/dist/httpd/%SUBDIR%/ \
- ftp://sunsite.srce.hr/mirrors/ftp.apache.org/apache/dist/httpd/%SUBDIR%/ \
- ftp://xenia.sote.hu/pub/mirrors/www.apache.org/httpd/%SUBDIR%/ \
- ftp://ftp.esat.net/mirrors/ftp.apache.org/httpd/%SUBDIR%/ \
- ftp://ftp.heanet.ie/mirrors/www.apache.org/dist/httpd/%SUBDIR%/ \
- ftp://ftp.rhnet.is/pub/apache/httpd/%SUBDIR%/ \
- ftp://apache.theomnistore.com/mirror/apache/dist/httpd/%SUBDIR%/ \
- ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/httpd/&,} \
- ftp://ftp.sogang.ac.kr/www/apache/dist/httpd/%SUBDIR%/ \
- ftp://ftp.task.gda.pl/pub/www/apache/dist/httpd/%SUBDIR%/ \
- ftp://sunsite.icm.edu.pl/pub/www/apache/dist/httpd/%SUBDIR%/ \
- ftp://ftp.telepac.pt/pub/apache/dist/httpd/%SUBDIR%/ \
- ftp://ftp.kappa.ro/pub/mirrors/ftp.apache.org/dist/httpd/%SUBDIR%/ \
- ftp://apache.rinet.ru/pub/mirror/apache.org/dist/httpd/%SUBDIR%/ \
- ftp://ftp.chg.ru/pub/WWW/apache/dist/httpd/%SUBDIR%/ \
- ftp://ftp.sunet.se/pub/www/servers/apache/dist/httpd/%SUBDIR%/ \
- ftp://apache.mirrors.rossfell.co.uk/mirrors/apache/dist/httpd/%SUBDIR%/ \
- ftp://ftp.flirble.org/pub/web/apache/dist/httpd/%SUBDIR%/ \
- ftp://ftp.gbnet.net/pub/apache/dist/httpd/%SUBDIR%/ \
- ftp://ftp.plig.net/pub/apache/dist/httpd/%SUBDIR%/ \
- ftp://mirrors.rmplc.co.uk/pub/apache/dist/httpd/%SUBDIR%/ \
- ftp://apache.secsup.org/pub/apache/dist/httpd/%SUBDIR%/ \
- ftp://ftp.apache.inetcosmos.org/pub/apache/dist/httpd/%SUBDIR%/ \
- ftp://ftp.ccs.neu.edu/net/mirrors/Apache/dist/httpd/%SUBDIR%/ \
- ftp://ftp.epix.net/pub/apache/httpd/%SUBDIR%/ \
- ftp://ftp.rge.com/pub/infosystems/apache/httpd/%SUBDIR%/ \
- ftp://ftp.tux.org/pub/net/apache/dist/httpd/%SUBDIR%/ \
- ftp://ftp.saix.net/pub/apache/dist/httpd/%SUBDIR%/ \
- ${MASTER_SITE_APACHE:S,dist/%SUBDIR%,mirror/httpd/%SUBDIR%,}
+ ${MASTER_SITE_APACHE:S,%SUBDIR%,httpd/&,}
MASTER_SITE_APACHE_JAKARTA+= \
- http://jakarta.apache.org/builds/%SUBDIR%/ \
${MASTER_SITE_APACHE:S,%SUBDIR%,jakarta/&,}
MASTER_SITE_APACHE_XML+= \
- http://xml.apache.org/dist/%SUBDIR%/ \
${MASTER_SITE_APACHE:S,%SUBDIR%,xml/&,}
MASTER_SITE_COMP_SOURCES+= \
Index: textproc/xalan-c/Makefile
===================================================================
RCS file: /misc/ncvs/ports/textproc/xalan-c/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- textproc/xalan-c/Makefile 24 Aug 2003 23:39:17 -0000 1.2
+++ textproc/xalan-c/Makefile 5 Nov 2003 01:33:18 -0000
@@ -10,7 +10,7 @@
PORTVERSION= 1.6.0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_APACHE_XML}
-MASTER_SITE_SUBDIR= xalan-c
+MASTER_SITE_SUBDIR= xalan-c/source xalan-c/binaries
.if defined(DEBUG)
PKGNAMESUFFIX+= -debug
.endif
Index: textproc/xerces-c/Makefile
===================================================================
RCS file: /misc/ncvs/ports/textproc/xerces-c/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- textproc/xerces-c/Makefile 20 Feb 2003 19:11:26 -0000 1.8
+++ textproc/xerces-c/Makefile 5 Nov 2003 00:59:56 -0000
@@ -8,9 +8,9 @@
PORTNAME= xerces_c
PORTVERSION= 1.7.0
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_APACHE_XML} \
+MASTER_SITES= http://archive.apache.org/dist/xml/%SUBDIR%/ \
http://document-root.de/xerces-c-mirror/
-MASTER_SITE_SUBDIR= xerces-c/stable/archives/Xerces-C_${PORTVERSION:S/./_/g}
+MASTER_SITE_SUBDIR= xerces-c/Xerces-C_${PORTVERSION:S/./_/g}
DISTNAME= xerces-c-src${PORTVERSION:S/./_/g}
MAINTAINER= ports at FreeBSD.org
Index: textproc/xerces-c2/Makefile
===================================================================
RCS file: /misc/ncvs/ports/textproc/xerces-c2/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- textproc/xerces-c2/Makefile 17 Oct 2003 17:41:21 -0000 1.8
+++ textproc/xerces-c2/Makefile 5 Nov 2003 01:36:38 -0000
@@ -9,7 +9,7 @@
PORTVERSION= 2.3.0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_APACHE_XML}
-MASTER_SITE_SUBDIR= xerces-c/stable
+MASTER_SITE_SUBDIR= xerces-c/source
DISTNAME= xerces-c-src_${PORTVERSION:S/./_/g}
MAINTAINER= bzeeb+freebsdports at zabbadoz.net
Index: www/apache13-fp/Makefile
===================================================================
RCS file: /misc/ncvs/ports/www/apache13-fp/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- www/apache13-fp/Makefile 25 Oct 2003 20:47:37 -0000 1.43
+++ www/apache13-fp/Makefile 5 Nov 2003 01:45:55 -0000
@@ -12,6 +12,7 @@
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \
http://www.freebsd.org/gifs/:powerlogo \
http://www.microsoft.com/frontpage/images/:fplogo
+MASTER_SITE_SUBDIR=old
DISTNAME= ${PORTNAME}_${PORTVERSION}
DISTFILES= ${APACHE} powerlogo.gif:powerlogo createdwFP.gif:fplogo
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list