Use the usual CPAN URL for fetching the distfile.

8 files changed, 16 insertions, 32 deletions

diff --git a/www/p5-Kwiki-Archive-Rcs/Makefile b/www/p5-Kwiki-Archive-Rcs/Makefile
index 96a5d0b9078..2bd377d0880 100644
--- a/www/p5-Kwiki-Archive-Rcs/Makefile
+++ b/www/p5-Kwiki-Archive-Rcs/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/26 21:46:37 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/26 23:21:42 jlam Exp $
 
 DISTNAME=      	Kwiki-Archive-Rcs-0.13
 PKGNAME=       	p5-${DISTNAME}
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/${MODULE_DIR}/${AUTHOR_DIR}/}
-MODULE_DIR=	module/by-module
-AUTHOR_DIR=	authors/id/I/IN/INGY
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Kwiki/}
 
 MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.kwiki.org/
diff --git a/www/p5-Kwiki-BreadCrumbs/Makefile b/www/p5-Kwiki-BreadCrumbs/Makefile
index 5cf851c9157..8aa06d44d20 100644
--- a/www/p5-Kwiki-BreadCrumbs/Makefile
+++ b/www/p5-Kwiki-BreadCrumbs/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/26 21:47:42 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/26 23:21:42 jlam Exp $
 
 DISTNAME=      	Kwiki-BreadCrumbs-0.11
 PKGNAME=       	p5-${DISTNAME}
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/${MODULE_DIR}/${AUTHOR_DIR}/}
-MODULE_DIR=	module/by-module
-AUTHOR_DIR=	authors/id/I/IN/INGY
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Kwiki/}
 
 MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.kwiki.org/
diff --git a/www/p5-Kwiki-Icons-Gnome/Makefile b/www/p5-Kwiki-Icons-Gnome/Makefile
index 8923d20c9b3..c98d3dbb1bd 100644
--- a/www/p5-Kwiki-Icons-Gnome/Makefile
+++ b/www/p5-Kwiki-Icons-Gnome/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/26 22:34:33 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/26 23:21:42 jlam Exp $
 
 DISTNAME=      	Kwiki-Icons-Gnome-0.14
 PKGNAME=       	p5-${DISTNAME}
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/${MODULE_DIR}/${AUTHOR_DIR}/}
-MODULE_DIR=	module/by-module
-AUTHOR_DIR=	authors/id/I/IA/IAN
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Kwiki/}
 
 MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.kwiki.org/
diff --git a/www/p5-Kwiki-RecentChanges/Makefile b/www/p5-Kwiki-RecentChanges/Makefile
index 2c9225108ce..552b7fb40a8 100644
--- a/www/p5-Kwiki-RecentChanges/Makefile
+++ b/www/p5-Kwiki-RecentChanges/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/26 21:48:34 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/26 23:21:42 jlam Exp $
 
 DISTNAME=      	Kwiki-RecentChanges-0.12
 PKGNAME=       	p5-${DISTNAME}
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/${MODULE_DIR}/${AUTHOR_DIR}/}
-MODULE_DIR=	module/by-module
-AUTHOR_DIR=	authors/id/I/IN/INGY
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Kwiki/}
 
 MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.kwiki.org/
diff --git a/www/p5-Kwiki-Revisions/Makefile b/www/p5-Kwiki-Revisions/Makefile
index c85ec8f60dd..9c0f7daa605 100644
--- a/www/p5-Kwiki-Revisions/Makefile
+++ b/www/p5-Kwiki-Revisions/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/26 21:49:17 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/26 23:21:43 jlam Exp $
 
 DISTNAME=      	Kwiki-Revisions-0.13
 PKGNAME=       	p5-${DISTNAME}
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/${MODULE_DIR}/${AUTHOR_DIR}/}
-MODULE_DIR=	module/by-module
-AUTHOR_DIR=	authors/id/I/IN/INGY
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Kwiki/}
 
 MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.kwiki.org/
diff --git a/www/p5-Kwiki-Search/Makefile b/www/p5-Kwiki-Search/Makefile
index 6d2dd713699..57468f22a5b 100644
--- a/www/p5-Kwiki-Search/Makefile
+++ b/www/p5-Kwiki-Search/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/26 21:50:26 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/26 23:21:43 jlam Exp $
 
 DISTNAME=      	Kwiki-Search-0.12
 PKGNAME=       	p5-${DISTNAME}
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/${MODULE_DIR}/${AUTHOR_DIR}/}
-MODULE_DIR=	module/by-module
-AUTHOR_DIR=	authors/id/I/IN/INGY
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Kwiki/}
 
 MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.kwiki.org/
diff --git a/www/p5-Kwiki-UserName/Makefile b/www/p5-Kwiki-UserName/Makefile
index fb3969971d6..da5282613a9 100644
--- a/www/p5-Kwiki-UserName/Makefile
+++ b/www/p5-Kwiki-UserName/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/26 21:51:18 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/26 23:21:43 jlam Exp $
 
 DISTNAME=      	Kwiki-UserName-0.13
 PKGNAME=       	p5-${DISTNAME}
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/${MODULE_DIR}/${AUTHOR_DIR}/}
-MODULE_DIR=	module/by-module
-AUTHOR_DIR=	authors/id/I/IN/INGY
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Kwiki/}
 
 MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.kwiki.org/
diff --git a/www/p5-Kwiki-UserPreferences/Makefile b/www/p5-Kwiki-UserPreferences/Makefile
index 5e6fadd5050..72c3581b0b3 100644
--- a/www/p5-Kwiki-UserPreferences/Makefile
+++ b/www/p5-Kwiki-UserPreferences/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/26 21:51:59 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/26 23:21:43 jlam Exp $
 
 DISTNAME=      	Kwiki-UserPreferences-0.12
 PKGNAME=       	p5-${DISTNAME}
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/${MODULE_DIR}/${AUTHOR_DIR}/}
-MODULE_DIR=	module/by-module
-AUTHOR_DIR=	authors/id/I/IN/INGY
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Kwiki/}
 
 MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.kwiki.org/