this adds a MASTER_SITES_SAVANNAH to network.conf.template and makes
use of it in the ports fetched from savannah.
note that editors/beaver has a screwed up directory name which can't
be used with the := construct, so I just add an XXX.
this diff is against -current where I _just_ committed fixes to
editors/beaver and x11/xforms; you'll need to update them first to
apply it.
comments? ok?
Index: audio/normalize/Makefile
===================================================================
RCS file: /cvs/ports/audio/normalize/Makefile,v
retrieving revision 1.16
diff -u -N -p audio/normalize/Makefile
--- audio/normalize/Makefile 13 Nov 2007 20:05:00 -0000 1.16
+++ audio/normalize/Makefile 16 Feb 2009 14:19:21 -0000
@@ -6,7 +6,7 @@ DISTNAME= normalize-0.7.7
PKGNAME= ${DISTNAME}p0
CATEGORIES= audio
-MASTER_SITES= http://savannah.nongnu.org/download/normalize/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=normalize/}
HOMEPAGE= http://normalize.nongnu.org/
Index: audio/fluidsynth/Makefile
===================================================================
RCS file: /cvs/ports/audio/fluidsynth/Makefile,v
retrieving revision 1.3
diff -u -N -p audio/fluidsynth/Makefile
--- audio/fluidsynth/Makefile 26 Dec 2008 08:45:12 -0000 1.3
+++ audio/fluidsynth/Makefile 16 Feb 2009 14:15:07 -0000
@@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB = c m ncurses pthread readline samplerate sndio
-MASTER_SITES = http://download.savannah.gnu.org/releases/fluid/
+MASTER_SITES = ${MASTER_SITE_SAVANNAH:=fluid/}
DEV_FLAGS = -DDEVOSSAUDIO=\\\"/dev/audio\\\" \
-DDEVOSSMIDI=\\\"/dev/rmidi0\\\"
Index: audio/p5-gnupod/Makefile
===================================================================
RCS file: /cvs/ports/audio/p5-gnupod/Makefile,v
retrieving revision 1.3
diff -u -N -p audio/p5-gnupod/Makefile
--- audio/p5-gnupod/Makefile 29 Aug 2008 16:05:37 -0000 1.3
+++ audio/p5-gnupod/Makefile 16 Feb 2009 14:19:57 -0000
@@ -8,7 +8,7 @@ CATEGORIES = audio
HOMEPAGE = http://www.gnu.org/software/gnupod/
MASTER_SITES = http://blinkenlights.ch/gnupod-dist/stable/ \
- http://savannah.gnu.org/download/gnupod/
+ ${MASTER_SITE_SAVANNAH:=gnupod/}
MAINTAINER = James Turner <[email protected]>
Index: devel/avr/libc/Makefile
===================================================================
RCS file: /cvs/ports/devel/avr/libc/Makefile,v
retrieving revision 1.10
diff -u -N -p devel/avr/libc/Makefile
--- devel/avr/libc/Makefile 1 Oct 2008 04:56:57 -0000 1.10
+++ devel/avr/libc/Makefile 16 Feb 2009 14:20:15 -0000
@@ -12,7 +12,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= http://savannah.nongnu.org/download/avr-libc/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=avr-libc/}
EXTRACT_SUFX= .tar.bz2
Index: devel/uisp/Makefile
===================================================================
RCS file: /cvs/ports/devel/uisp/Makefile,v
retrieving revision 1.4
diff -u -N -p devel/uisp/Makefile
--- devel/uisp/Makefile 12 Oct 2008 08:29:39 -0000 1.4
+++ devel/uisp/Makefile 16 Feb 2009 14:21:09 -0000
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m stdc++
-MASTER_SITES= http://savannah.nongnu.org/download/uisp/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=uisp/}
CONFIGURE_STYLE= gnu
.if ${MACHINE_ARCH} == "i386"
Index: devel/avrdude/Makefile
===================================================================
RCS file: /cvs/ports/devel/avrdude/Makefile,v
retrieving revision 1.4
diff -u -N -p devel/avrdude/Makefile
--- devel/avrdude/Makefile 29 Aug 2008 03:58:43 -0000 1.4
+++ devel/avrdude/Makefile 16 Feb 2009 14:21:02 -0000
@@ -19,7 +19,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c ncurses readline termcap
-MASTER_SITES= http://savannah.nongnu.org/download/avrdude/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=avrdude/}
EXTRACT_ONLY= avrdude-${V}${EXTRACT_SUFX}
CONFIGURE_STYLE= gnu
Index: editors/beaver/Makefile
===================================================================
RCS file: /cvs/ports/editors/beaver/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- editors/beaver/Makefile 16 Feb 2009 14:57:58 -0000 1.13
+++ editors/beaver/Makefile 16 Feb 2009 14:58:30 -0000
@@ -1,4 +1,5 @@
# $OpenBSD: Makefile,v 1.13 2009/02/16 14:57:58 sthen Exp $
+
COMMENT= lightweight Gtk text editor with syntax highlighting
DISTNAME= beaver0_3_0_1
@@ -6,6 +7,8 @@ PKGNAME= beaver-0.3.0.1
CATEGORIES= editors
HOMEPAGE= http://www.nongnu.org/beaver/
+# XXX should use ${MASTER_SITES_SAVANNAH:=beaver/} but % in the
+# XXX directory name causes a problem
MASTER_SITES=
http://download.savannah.gnu.org/releases-noredirect/beaver/0.3.0.1%20-%202008.06.26/
EXTRACT_SUFX= .tgz
Index: editors/leafpad/Makefile
===================================================================
RCS file: /cvs/ports/editors/leafpad/Makefile,v
retrieving revision 1.20
diff -u -N -p editors/leafpad/Makefile
--- editors/leafpad/Makefile 3 Sep 2008 14:43:30 -0000 1.20
+++ editors/leafpad/Makefile 16 Feb 2009 14:21:36 -0000
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= http://savannah.nongnu.org/download/leafpad/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=leafpad/}
WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \
Index: games/crack-attack/Makefile
===================================================================
RCS file: /cvs/ports/games/crack-attack/Makefile,v
retrieving revision 1.3
diff -u -N -p games/crack-attack/Makefile
--- games/crack-attack/Makefile 15 Jun 2008 00:08:09 -0000 1.3
+++ games/crack-attack/Makefile 16 Feb 2009 14:21:47 -0000
@@ -22,7 +22,7 @@ WANTLIB= GL GLU ICE SM X11 Xau Xcursor Xdmcp Xext Xfix
glib-2.0 gmodule-2.0 glitz png pango-1.0 \
pangocairo-1.0 pangoft2-1.0 pixman-1
-MASTER_SITES= http://savannah.nongnu.org/download/crack-attack/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=crack-attack/}
MODULES= devel/gettext
Index: graphics/openexr/Makefile
===================================================================
RCS file: /cvs/ports/graphics/openexr/Makefile,v
retrieving revision 1.12
diff -u -N -p graphics/openexr/Makefile
--- graphics/openexr/Makefile 11 Apr 2008 20:38:13 -0000 1.12
+++ graphics/openexr/Makefile 16 Feb 2009 14:22:16 -0000
@@ -21,7 +21,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= http://download.savannah.nongnu.org/releases/openexr/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=openexr/}
MULTI_PACKAGES= -main -tools -doc
Index: graphics/ilmbase/Makefile
===================================================================
RCS file: /cvs/ports/graphics/ilmbase/Makefile,v
retrieving revision 1.4
diff -u -N -p graphics/ilmbase/Makefile
--- graphics/ilmbase/Makefile 11 Apr 2008 20:37:55 -0000 1.4
+++ graphics/ilmbase/Makefile 16 Feb 2009 14:21:56 -0000
@@ -20,7 +20,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= http://download.savannah.nongnu.org/releases/openexr/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=openexr/}
WANTLIB= m stdc++
Index: infrastructure/templates/network.conf.template
===================================================================
RCS file: /cvs/ports/infrastructure/templates/network.conf.template,v
retrieving revision 1.128
diff -u -N -p infrastructure/templates/network.conf.template
--- infrastructure/templates/network.conf.template 3 Feb 2009 22:17:36
-0000 1.128
+++ infrastructure/templates/network.conf.template 16 Feb 2009 14:11:48
-0000
@@ -181,6 +181,27 @@ MASTER_SITE_KDE+= \
ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/ \
ftp://ftp.chg.ru/pub/X11/kde/
+MASTER_SITE_SAVANNAH+= \
+ http://download.savannah.nongnu.org/releases/ \
+ http://download.savannah.nongnu.org/releases-noredirect/ \
+ http://ftp.cc.uoc.gr/mirrors/nongnu.org/ \
+ http://ftp.twaren.net/Unix/NonGNU/ \
+ http://mirror.csclub.uwaterloo.ca/nongnu/ \
+ http://mirror.dknss.com/nongnu/ \
+ http://mirror.publicns.net/pub/nongnu/ \
+ ftp://mirror.publicns.net/pub/nongnu/ \
+ ftp://mirrors.localhost.net.ar/pub/mirrors/savannah-nongnu/ \
+ http://mirrors.zerg.biz/nongnu/ \
+ http://nongnu.askapache.com/ \
+ http://nongnu.mirror.ironie.org/ \
+ http://piotrkosoft.net/pub/mirrors/savannah.gnu.org/ \
+ ftp://ftp.piotrkosoft.net/pub/mirrors/savannah.gnu.org/ \
+ http://savannah.c3sl.ufpr.br/ \
+ ftp://savannah.c3sl.ufpr.br/savannah-nongnu/ \
+ http://savannah.inetbridge.net/ \
+ http://savannah.releasenotes.org/ \
+ http://www.very-clever.com/download/nongnu/
+
MASTER_SITE_AFTERSTEP+= \
ftp://ftp.afterstep.org/ \
ftp://ftp.kddilabs.jp/X11/AfterStep/ \
Index: net/mldonkey/snapshot/Makefile
===================================================================
RCS file: /cvs/ports/net/mldonkey/snapshot/Makefile,v
retrieving revision 1.11
diff -u -N -p net/mldonkey/snapshot/Makefile
--- net/mldonkey/snapshot/Makefile 15 Sep 2007 22:36:55 -0000 1.11
+++ net/mldonkey/snapshot/Makefile 16 Feb 2009 14:23:33 -0000
@@ -19,7 +19,7 @@ MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
HOMEPAGE=http://savannah.nongnu.org/projects/mldonkey/
-MASTER_SITES=http://savannah.nongnu.org/download/mldonkey/
+MASTER_SITES=${MASTER_SITE_SAVANNAH:=mldonkey/}
DISTNAME=mldonkey-2.5.22
WRKDIST=${WRKDIR}/mldonkey-2.5.22
Index: net/nepim/Makefile
===================================================================
RCS file: /cvs/ports/net/nepim/Makefile,v
retrieving revision 1.7
diff -u -N -p net/nepim/Makefile
--- net/nepim/Makefile 26 Jan 2009 09:57:15 -0000 1.7
+++ net/nepim/Makefile 16 Feb 2009 14:23:39 -0000
@@ -15,7 +15,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c
-MASTER_SITES= http://download.savannah.gnu.org/releases/nepim/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=nepim/}
LIB_DEPENDS= oop.>=4::devel/liboop
Index: net/castget/Makefile
===================================================================
RCS file: /cvs/ports/net/castget/Makefile,v
retrieving revision 1.3
diff -u -N -p net/castget/Makefile
--- net/castget/Makefile 28 Dec 2007 13:15:21 -0000 1.3
+++ net/castget/Makefile 16 Feb 2009 14:22:38 -0000
@@ -8,7 +8,7 @@ CATEGORIES= net
HOMEPAGE= http://www.nongnu.org/castget
-MASTER_SITES= http://savannah.nongnu.org/download/castget/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=castget/}
MAINTAINER= Gleydson Soares <[email protected]>
Index: net/freetalk/Makefile
===================================================================
RCS file: /cvs/ports/net/freetalk/Makefile,v
retrieving revision 1.1.1.1
diff -u -N -p net/freetalk/Makefile
--- net/freetalk/Makefile 20 Jan 2009 08:11:34 -0000 1.1.1.1
+++ net/freetalk/Makefile 16 Feb 2009 14:23:24 -0000
@@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= c glib-2.0 idn m ncurses readline stdc++
-MASTER_SITES= http://savannah.gnu.org/download/freetalk/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=freetalk/}
MODULES= devel/gettext
LIB_DEPENDS= guile-ltdl,guile::lang/guile \
Index: mail/mail-notification/Makefile
===================================================================
RCS file: /cvs/ports/mail/mail-notification/Makefile,v
retrieving revision 1.25
diff -u -N -p mail/mail-notification/Makefile
--- mail/mail-notification/Makefile 21 Jan 2009 10:50:12 -0000 1.25
+++ mail/mail-notification/Makefile 16 Feb 2009 14:22:23 -0000
@@ -26,7 +26,7 @@ WANTLIB= ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xda
gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
pixman-1 png popt pthread ssl xml2 z
-MASTER_SITES= http://savannah.nongnu.org/download/mailnotify/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=mailnotify/}
MODULES= devel/gettext \
textproc/intltool
Index: mail/nmh/Makefile
===================================================================
RCS file: /cvs/ports/mail/nmh/Makefile,v
retrieving revision 1.25
diff -u -N -p mail/nmh/Makefile
--- mail/nmh/Makefile 6 Sep 2007 18:57:34 -0000 1.25
+++ mail/nmh/Makefile 16 Feb 2009 14:22:31 -0000
@@ -4,7 +4,7 @@ COMMENT= new MH mail handling program
DISTNAME= nmh-1.2
CATEGORIES= mail
-MASTER_SITES= http://download.savannah.nongnu.org/releases/nmh/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=nmh/}
HOMEPAGE= http://www.nongnu.org/nmh/
PERMIT_PACKAGE_CDROM= Yes
Index: sysutils/bubblemon/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/bubblemon/Makefile,v
retrieving revision 1.29
diff -u -N -p sysutils/bubblemon/Makefile
--- sysutils/bubblemon/Makefile 21 Jan 2009 10:50:12 -0000 1.29
+++ sysutils/bubblemon/Makefile 16 Feb 2009 14:23:46 -0000
@@ -8,7 +8,7 @@ CATEGORIES= sysutils x11/gnome
HOMEPAGE= http://www.d.kth.se/~d92-jwa/code/
-MASTER_SITES= http://savannah.nongnu.org/download/bubblemon/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=bubblemon/}
LIB_DEPENDS= panel-applet-2::x11/gnome/panel \
gtop-2.0.>=3.0::devel/libgtop2
Index: sysutils/tpb/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/tpb/Makefile,v
retrieving revision 1.12
diff -u -N -p sysutils/tpb/Makefile
--- sysutils/tpb/Makefile 28 Nov 2007 13:14:12 -0000 1.12
+++ sysutils/tpb/Makefile 16 Feb 2009 14:24:07 -0000
@@ -10,7 +10,7 @@ PKGNAME= ${DISTNAME}p2
CATEGORIES= sysutils
HOMEPAGE= http://www.nongnu.org/tpb/
-MASTER_SITES= http://savannah.nongnu.org/download/tpb/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=tpb/}
MAINTAINER= joshua stein <[email protected]>
Index: sysutils/rdiff-backup/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/rdiff-backup/Makefile,v
retrieving revision 1.3
diff -u -N -p sysutils/rdiff-backup/Makefile
--- sysutils/rdiff-backup/Makefile 8 Oct 2007 08:22:42 -0000 1.3
+++ sysutils/rdiff-backup/Makefile 16 Feb 2009 14:24:03 -0000
@@ -15,7 +15,7 @@ PERMIT_DISTFILES_FTP= Yes
LIB_DEPENDS+= rsync::net/librsync
-MASTER_SITES= http://savannah.nongnu.org/download/rdiff-backup/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=rdiff-backup/}
MODULES= lang/python
Index: sysutils/duplicity/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/duplicity/Makefile,v
retrieving revision 1.5
diff -u -N -p sysutils/duplicity/Makefile
--- sysutils/duplicity/Makefile 9 Feb 2009 00:28:33 -0000 1.5
+++ sysutils/duplicity/Makefile 16 Feb 2009 14:23:56 -0000
@@ -8,17 +8,7 @@ DISTNAME = duplicity-${MODPY_EGG_VERSION}
CATEGORIES = sysutils
HOMEPAGE = http://www.nongnu.org/duplicity/
-MASTER_SITES = http://savannah.nongnu.org/download/duplicity/ \
- http://download.savannah.gnu.org/releases/duplicity/ \
- http://nongnu.askapache.com/duplicity/ \
- http://nongnu.bigsearcher.com/duplicity/ \
- http://mirror.publicns.net/pub/nongnu/duplicity/ \
- http://nongnu.mirror.ironie.org/releases/duplicity/ \
- http://savannah.c3sl.ufpr.br/duplicity/ \
- http://savannah.releasenotes.org/duplicity/ \
- http://www.de-mirrors.de/nongnu/duplicity/ \
- http://ftp.cc.uoc.gr/mirrors/nongnu.org/duplicity/ \
- http://ftp.twaren.net/Unix/NonGNU/duplicity/
+MASTER_SITES = ${MASTER_SITE_SAVANNAH:=duplicity/}
MAINTAINER = Bruno Bigras <[email protected]>
Index: x11/ratpoison/Makefile
===================================================================
RCS file: /cvs/ports/x11/ratpoison/Makefile,v
retrieving revision 1.16
diff -u -N -p x11/ratpoison/Makefile
--- x11/ratpoison/Makefile 9 Feb 2009 18:36:49 -0000 1.16
+++ x11/ratpoison/Makefile 16 Feb 2009 14:24:24 -0000
@@ -15,7 +15,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext Xinerama Xtst c
-MASTER_SITES= http://savannah.nongnu.org/download/ratpoison/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=ratpoison/}
USE_X11= Yes
Index: x11/xforms/Makefile
===================================================================
RCS file: /cvs/ports/x11/xforms/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- x11/xforms/Makefile 16 Feb 2009 14:49:56 -0000 1.35
+++ x11/xforms/Makefile 16 Feb 2009 14:50:40 -0000
@@ -11,7 +11,7 @@ CATEGORIES= x11
HOMEPAGE= http://world.std.com/~xforms/
-MASTER_SITES= http://savannah.nongnu.org/download/xforms/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=xforms/}
# LGPL
PERMIT_PACKAGE_CDROM= Yes
Index: x11/gnustep/addresses/Makefile
===================================================================
RCS file: /cvs/ports/x11/gnustep/addresses/Makefile,v
retrieving revision 1.4
diff -u -N -p x11/gnustep/addresses/Makefile
--- x11/gnustep/addresses/Makefile 23 Jun 2008 11:00:46 -0000 1.4
+++ x11/gnustep/addresses/Makefile 16 Feb 2009 14:24:18 -0000
@@ -12,7 +12,7 @@ HOMEPAGE= http://gap.nongnu.org/addresses/index.html
WANTLIB= c m objc pthread
-MASTER_SITES= http://savannah.nongnu.org/download/gap/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=gap/}
WRKDIST= ${WRKDIR}/Addresses
Index: x11/freefont-ttf/Makefile
===================================================================
RCS file: /cvs/ports/x11/freefont-ttf/Makefile,v
retrieving revision 1.2
diff -u -N -p x11/freefont-ttf/Makefile
--- x11/freefont-ttf/Makefile 1 Feb 2009 11:13:34 -0000 1.2
+++ x11/freefont-ttf/Makefile 16 Feb 2009 14:24:14 -0000
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= http://download.savannah.gnu.org/releases/freefont/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=freefont/}
WRKDIST= ${WRKDIR}/freefont-$V
NO_BUILD= Yes
