Fixes MASTER_SITES, based on noticed by Zafer Aydogan via private mail.

23 files changed, 50 insertions, 47 deletions

diff --git a/www/zope25-AbracadabraObject/Makefile b/www/zope25-AbracadabraObject/Makefile
index 8b4457421ef..b830e71e07d 100644
--- a/www/zope25-AbracadabraObject/Makefile
+++ b/www/zope25-AbracadabraObject/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:31:04 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/08/04 09:28:31 obache Exp $
 
 DISTNAME=	AbracadabraObject-1.5.1
 PKGNAME=	zope25-AbracadabraObject-1.5.1
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/mjablonski/AbracadabraObject/
+MASTER_SITES=	http://www.zope.org/Members/mjablonski/AbracadabraObject/${PKGVERSION_NOREV}/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.zope.org/Members/mjablonski/AbracadabraObject
diff --git a/www/zope25-BTreeFolder/Makefile b/www/zope25-BTreeFolder/Makefile
index 3dec3043dca..f6a70e29b9f 100644
--- a/www/zope25-BTreeFolder/Makefile
+++ b/www/zope25-BTreeFolder/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:31:04 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/08/04 09:28:31 obache Exp $
 
 DISTNAME=	BTreeFolder-0.2
 PKGREVISION=	1
 PKGNAME=	zope25-BTreeFolder-0.2
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/hathawsh/BTreeFolder/
+MASTER_SITES=	http://www.zope.org/Members/hathawsh/BTreeFolder/${PKGVERSION_NOREV}/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.zope.org/Members/hathawsh/BTreeFolder
diff --git a/www/zope25-BackTalk/Makefile b/www/zope25-BackTalk/Makefile
index 5a70f22e6c0..aaeafe280da 100644
--- a/www/zope25-BackTalk/Makefile
+++ b/www/zope25-BackTalk/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2006/03/04 21:31:04 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2008/08/04 09:28:31 obache Exp $
 #
 
 DISTNAME=	BackTalk-0.3
 PKGNAME=	zope25-BackTalk-0.3
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=/backtalk/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=backtalk/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://backtalk.sourceforge.net/
diff --git a/www/zope25-CMFPlone/Makefile b/www/zope25-CMFPlone/Makefile
index 48c5861a7ad..d5597c791f1 100644
--- a/www/zope25-CMFPlone/Makefile
+++ b/www/zope25-CMFPlone/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2007/11/26 15:59:35 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2008/08/04 09:28:31 obache Exp $
 
 DISTNAME=	CMFPlone1.0.3
 PKGNAME=	zope25-CMFPlone-1.0.3
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=/plone/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=plone/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://plone.org/
diff --git a/www/zope25-Calendar/Makefile b/www/zope25-Calendar/Makefile
index 088dbb68d61..e480002c4f1 100644
--- a/www/zope25-Calendar/Makefile
+++ b/www/zope25-Calendar/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:31:04 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/08/04 09:28:31 obache Exp $
 
 DISTNAME=	Calendar-1.0.10
 PKGREVISION=	1
 PKGNAME=	zope25-Calendar-1.0.10
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/jdavid/Calendar/
+MASTER_SITES=	http://www.zope.org/Members/jdavid/Calendar/${PKGVERSION_NOREV}/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.zope.org/Members/jdavid/Calendar
diff --git a/www/zope25-DocumentLibrary/Makefile b/www/zope25-DocumentLibrary/Makefile
index 07068495bc5..13faa06d1e6 100644
--- a/www/zope25-DocumentLibrary/Makefile
+++ b/www/zope25-DocumentLibrary/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:31:05 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/08/04 09:28:31 obache Exp $
 
 DISTNAME=	DocumentLibrary-1.0rc1
 PKGREVISION=	1
 PKGNAME=	zope25-DocumentLibrary-1.0rc1
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/Kaivo/DocumentLibrary/
+MASTER_SITES=	http://www.zope.org/Members/Kaivo/DocumentLibrary/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/zope25-EasyImage/Makefile b/www/zope25-EasyImage/Makefile
index 6cfe6cc1f69..6b56432575f 100644
--- a/www/zope25-EasyImage/Makefile
+++ b/www/zope25-EasyImage/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2007/07/28 00:31:14 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2008/08/04 09:28:31 obache Exp $
 
 DISTNAME=	EasyImage15
 PKGREVISION=	4
 PKGNAME=	zope25-EasyImage-1.5
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/regebro/easyimage/
+MASTER_SITES=	http://www.zope.org/Members/regebro/easyimage/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.zip
 
 BUILDLINK_API_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.3
diff --git a/www/zope25-ExternalEditor/Makefile b/www/zope25-ExternalEditor/Makefile
index bc8685bffe9..11bfb2c4a3e 100644
--- a/www/zope25-ExternalEditor/Makefile
+++ b/www/zope25-ExternalEditor/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:31:05 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/08/04 09:28:31 obache Exp $
 
 DISTNAME=	ExternalEditor-0.7
 PKGNAME=	zope25-ExternalEditor-0.7
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/Caseman/ExternalEditor/
+MASTER_SITES=	http://www.zope.org/Members/Caseman/ExternalEditor/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/zope25-FileSystemSite/Makefile b/www/zope25-FileSystemSite/Makefile
index 94ca5185804..f677eb81add 100644
--- a/www/zope25-FileSystemSite/Makefile
+++ b/www/zope25-FileSystemSite/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:31:05 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/08/04 09:28:31 obache Exp $
 
 DISTNAME=	FileSystemSite-1.2
 PKGNAME=	zope25-FileSystemSite-1.2
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/k_vertigo/Products/FileSystemSite/
+MASTER_SITES=	http://www.zope.org/Members/k_vertigo/Products/FileSystemSite/default/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/zope25-Formulator/Makefile b/www/zope25-Formulator/Makefile
index a401776c72a..309cdb1b9de 100644
--- a/www/zope25-Formulator/Makefile
+++ b/www/zope25-Formulator/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:31:05 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2008/08/04 09:28:31 obache Exp $
 
 DISTNAME=	Formulator-1.4.2
 PKGNAME=	zope25-Formulator-1.4.2
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/faassen/Formulator/
+MASTER_SITES=	http://www.zope.org/Members/faassen/Formulator/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/zope25-Fortune/Makefile b/www/zope25-Fortune/Makefile
index aaee4d5a0d2..747056d7a93 100644
--- a/www/zope25-Fortune/Makefile
+++ b/www/zope25-Fortune/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:31:05 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/08/04 09:28:31 obache Exp $
 #
 
 DISTNAME=	Fortune-0.5.2
 PKGNAME=	zope25-Fortune-0.5.2
 PKGREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/lalo/Fortune/
+MASTER_SITES=	http://www.zope.org/Members/lalo/Fortune/${PKGVERSION_NOREV}/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.zope.org/Members/lalo/Fortune
diff --git a/www/zope25-JPicture/Makefile b/www/zope25-JPicture/Makefile
index 4e1dcf504c3..a9c749fa8f4 100644
--- a/www/zope25-JPicture/Makefile
+++ b/www/zope25-JPicture/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2006/10/04 22:04:11 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/08/04 09:28:31 obache Exp $
 
 DISTNAME=	JPicture-2_0
 PKGREVISION=	3
 PKGNAME=	zope25-JPicture-2.0
 CATEGORIES=	www
-MASTER_SITES=	http://www.dataflake.org/old_stuff/jpicture/jpicture_2.0
+MASTER_SITES=	http://www.dataflake.org/old_stuff/jpicture/jpicture_2.0/${DISTNAME}${EXTRACT_SUFX}/download?file=/
 EXTRACT_SUFX=	.tgz
 
 BUILDLINK_API_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.3
diff --git a/www/zope25-KnowledgeKit/Makefile b/www/zope25-KnowledgeKit/Makefile
index 4ad191fc713..bbc5d0b0d57 100644
--- a/www/zope25-KnowledgeKit/Makefile
+++ b/www/zope25-KnowledgeKit/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:31:05 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/08/04 09:28:31 obache Exp $
 #
 
 DISTNAME=	KnowledgeKit-1.6.7
 PKGNAME=	zope25-KnowledgeKit-1.6.7
 PKGREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/Bill/Products/KnowledgeKit/
+MASTER_SITES=	http://www.zope.org/Members/Bill/Products/KnowledgeKit/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/zope25-ParsedXML/Makefile b/www/zope25-ParsedXML/Makefile
index 94cf458af1b..4bb68a9986a 100644
--- a/www/zope25-ParsedXML/Makefile
+++ b/www/zope25-ParsedXML/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:31:05 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2008/08/04 09:28:31 obache Exp $
 
 DISTNAME=	ParsedXML-1.3.1
 PKGREVISION=	5
 PKGNAME=	zope25-ParsedXML-1.3.1
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/faassen/ParsedXML/
+MASTER_SITES=	http://www.zope.org/Members/faassen/ParsedXML/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/zope25-PropertyFolder/Makefile b/www/zope25-PropertyFolder/Makefile
index 8f875c68f1e..5509989a8c5 100644
--- a/www/zope25-PropertyFolder/Makefile
+++ b/www/zope25-PropertyFolder/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2007/11/22 10:04:45 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2008/08/04 09:28:31 obache Exp $
 
 DISTNAME=	PropertyFolder-1.3.3
 PKGNAME=	zope25-PropertyFolder-1.3.3
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/mjablonski/PropertyFolder/
+MASTER_SITES=	http://www.zope.org/Members/mjablonski/PropertyFolder/${PKGVERSION_NOREV}/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.zope.org/Members/mjablonski/PropertyFolder
diff --git a/www/zope25-PropertyObject/Makefile b/www/zope25-PropertyObject/Makefile
index cb3715819ec..5783944e21d 100644
--- a/www/zope25-PropertyObject/Makefile
+++ b/www/zope25-PropertyObject/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:31:05 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/08/04 09:28:31 obache Exp $
 
 DISTNAME=	PropertyObject-1.3.3
 PKGNAME=	zope25-PropertyObject-1.3.3
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/mjablonski/PropertyObject/
+MASTER_SITES=	http://www.zope.org/Members/mjablonski/PropertyObject/${PKGVERSION_NOREV}/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.zope.org/Members/mjablonski/PropertyObject
diff --git a/www/zope25-RDFSummary/Makefile b/www/zope25-RDFSummary/Makefile
index 1989af6dd6c..80b9c7752f8 100644
--- a/www/zope25-RDFSummary/Makefile
+++ b/www/zope25-RDFSummary/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:31:05 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/08/04 09:28:31 obache Exp $
 #
 
 DISTNAME=	RDFSummary-2.3
 PKGNAME=	zope25-RDFSummary-2.3
 PKGREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/EIONET/RDFSummary/
+MASTER_SITES=	http://www.zope.org/Members/EIONET/RDFSummary/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/zope25-Silva/Makefile b/www/zope25-Silva/Makefile
index d1888f802f0..9de44e9c40f 100644
--- a/www/zope25-Silva/Makefile
+++ b/www/zope25-Silva/Makefile
@@ -1,14 +1,17 @@
-# $NetBSD: Makefile,v 1.13 2007/07/28 00:23:13 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2008/08/04 09:28:31 obache Exp $
 
 DISTNAME=	Silva-0.9.2.2
 PKGNAME=	zope25-Silva-0.9.2.2
 PKGREVISION=	3
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/infrae/Silva/
+MASTER_SITES=	http://www.zope.org/Members/infrae/
 EXTRACT_SUFX=	.tgz
 SIVLAFILES=	Silva-0.9.2.2 SilvaMetadata-0.7 ProxyIndex-1.1 \
 		Annotations-0.4.1
-DISTFILES=	${SIVLAFILES:S/$/.tgz/g}
+DISTFILES=	${SIVLAFILES:=.tgz}
+.for d in ${DISTFILES}
+SITES.${d:T:S/=/--/}?= ${MASTER_SITES:=${d:S/-/\//:S/${EXTRACT_SUFX}//}/}
+.endfor
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.infrae.com/products/silva
diff --git a/www/zope25-TinyTablePlus/Makefile b/www/zope25-TinyTablePlus/Makefile
index 1eb3230a58b..1a2ae98ba17 100644
--- a/www/zope25-TinyTablePlus/Makefile
+++ b/www/zope25-TinyTablePlus/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:31:06 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/08/04 09:28:31 obache Exp $
 #
 
 DISTNAME=	TinyTablePlus-0.9
 PKGNAME=	zope25-TinyTablePlus-0.9
 PKGREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/hathawsh/TinyTablePlus/
+MASTER_SITES=	http://www.zope.org/Members/hathawsh/TinyTablePlus/default/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/zope25-XMLWidgets/Makefile b/www/zope25-XMLWidgets/Makefile
index 2542e4c4c32..c0a351cffd6 100644
--- a/www/zope25-XMLWidgets/Makefile
+++ b/www/zope25-XMLWidgets/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:31:06 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/08/04 09:28:31 obache Exp $
 
 DISTNAME=	XMLWidgets-0.8.5
 PKGNAME=	zope25-XMLWidgets-0.8.5
 PKGREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/faassen/XMLWidgets/
+MASTER_SITES=	http://www.zope.org/Members/faassen/XMLWidgets/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/zope25-ZNavigator/Makefile b/www/zope25-ZNavigator/Makefile
index 5021db03d6b..8ab3dd8783a 100644
--- a/www/zope25-ZNavigator/Makefile
+++ b/www/zope25-ZNavigator/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:31:06 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/08/04 09:28:31 obache Exp $
 #
 
 DISTNAME=	ZNavigator-2.02
 PKGNAME=	zope25-ZNavigator-2.02
 PKGREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/jonas/ZNavigator/
+MASTER_SITES=	http://www.zope.org/Members/jonas/ZNavigator/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/zope25-ZWeather/Makefile b/www/zope25-ZWeather/Makefile
index 6453119c1a1..d957a9830dd 100644
--- a/www/zope25-ZWeather/Makefile
+++ b/www/zope25-ZWeather/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:31:06 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/08/04 09:28:31 obache Exp $
 
 DISTNAME=	ZWeather-0_0_1
 PKGREVISION=	1
 PKGNAME=	zope25-ZWeather-0.0.1
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/TheJester/ZWeather/
+MASTER_SITES=	http://www.zope.org/Members/TheJester/ZWeather/default/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/zope25-ZWiki/Makefile b/www/zope25-ZWiki/Makefile
index 1293e634203..b1a0fab4ff4 100644
--- a/www/zope25-ZWiki/Makefile
+++ b/www/zope25-ZWiki/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:31:06 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/08/04 09:28:31 obache Exp $
 
 DISTNAME=	ZWiki-0.20.0
 PKGNAME=	zope25-ZWiki-0.20.0
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Members/simon/ZWiki/
+MASTER_SITES=	http://zwiki.org/repos/ZWiki/releases/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org