8 files changed, 16 insertions, 24 deletions
diff --git a/devel/p5-Curses/Makefile b/devel/p5-Curses/Makefile
index 6f06b4ad0a2..422747bf76c 100644
--- a/devel/p5-Curses/Makefile
+++ b/devel/p5-Curses/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.3 1998/08/20 15:16:49 tsarna Exp $
+# $NetBSD: Makefile,v 1.4 1999/04/15 20:39:40 tron Exp $
 # FreeBSD Id: Makefile,v 1.8 1998/04/04 13:58:26 vanilla Exp
 #
 
 DISTNAME=	Curses-1.02
 PKGNAME=	p5-Curses-1.02
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Curses
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Curses/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/Curses/Curses.html
diff --git a/devel/p5-Data-Dumper/Makefile b/devel/p5-Data-Dumper/Makefile
index 2461276057c..f7edd7ec4f3 100644
--- a/devel/p5-Data-Dumper/Makefile
+++ b/devel/p5-Data-Dumper/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.8 1998/11/26 18:22:49 bad Exp $
+# $NetBSD: Makefile,v 1.9 1999/04/15 20:39:40 tron Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/06/24 18:43:11 jfitz Exp
 #
 
 DISTNAME=		Data-Dumper-2.10
 PKGNAME=		p5-Data-Dumper-2.10
 CATEGORIES=		devel perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Data
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Data/}
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/Data-Dumper/Dumper.html
diff --git a/devel/p5-Devel-DProf/Makefile b/devel/p5-Devel-DProf/Makefile
index ff18f37fe1c..258b3c1def6 100644
--- a/devel/p5-Devel-DProf/Makefile
+++ b/devel/p5-Devel-DProf/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/11/26 18:02:49 bad Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:41 tron Exp $
 #
 
 DISTNAME=		DProf-19970614
 PKGNAME=		p5-Devel-DProf-19970614
 CATEGORIES=		devel perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Devel
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Devel/}
 
 MAINTAINER=		bad@netbsd.org
 
diff --git a/devel/p5-Devel-SmallProf/Makefile b/devel/p5-Devel-SmallProf/Makefile
index 3dd497d6f34..9a26c6419f6 100644
--- a/devel/p5-Devel-SmallProf/Makefile
+++ b/devel/p5-Devel-SmallProf/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/11/26 18:16:05 bad Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:41 tron Exp $
 #
 
 DISTNAME=		Devel-SmallProf-0.5
 PKGNAME=		p5-Devel-SmallProf-0.5
 CATEGORIES=		devel perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Devel
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Devel/}
 
 MAINTAINER=		bad@netbsd.org
 
diff --git a/devel/p5-MLDBM/Makefile b/devel/p5-MLDBM/Makefile
index 792d7c9bedd..ecc7db2a817 100644
--- a/devel/p5-MLDBM/Makefile
+++ b/devel/p5-MLDBM/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/12/05 03:28:48 tv Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:41 tron Exp $
 #
 
 DISTNAME=		MLDBM-2.00
 PKGNAME=		p5-MLDBM-2.00
 CATEGORIES=		net perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MLDBM
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=MLDBM/}
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/MLDBM/MLDBM.html
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index 2c2b3151c1a..829437a7f8d 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.4 1998/11/19 15:40:45 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/04/15 20:39:41 tron Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/06/24 18:43:28 jfitz Exp
 #
 
 DISTNAME=	perlvision
 PKGNAME=	p5-PV-1.0
 CATEGORIES=	devel net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	PV
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:PV/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	packages@netbsd.org
diff --git a/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile
index 1eca7b1df05..fd3f0443290 100644
--- a/devel/p5-Time-HiRes/Makefile
+++ b/devel/p5-Time-HiRes/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/11/26 18:19:50 bad Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:41 tron Exp $
 #
 
 DISTNAME=		Time-HiRes-01.19
 PKGNAME=		p5-Time-HiRes-01.19
 CATEGORIES=		devel perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Time
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Time/}
 
 MAINTAINER=		bad@netbsd.org
 
diff --git a/devel/xxgdb/Makefile b/devel/xxgdb/Makefile
index 6ae45b6d35f..773b8082712 100644
--- a/devel/xxgdb/Makefile
+++ b/devel/xxgdb/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 1998/06/22 11:27:51 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/04/15 20:39:41 tron Exp $
 #
 
 DISTNAME=	xxgdb-1.12
 CATEGORIES=	devel x11
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	utilities
+MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
 
 MAINTAINER=	rh@trapdoor.vip.at