Completely replace "MASTER_SITE_SUBDIR" and "PATCH_SITE_SUBDIR" with

variable substituition of "MASTER_SITES" and "PATCH_SITES".

6 files changed, 12 insertions, 18 deletions

diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index 7d2fb0fd75e..ea8c4170bcd 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 1998/12/04 17:25:13 tv Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:47 tron Exp $
 #
 
 DISTNAME=       	mod_perl-1.16
 PKGNAME=        	ap-perl-1.16
 CATEGORIES=		www perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Apache/}
 
 MAINTAINER=		tv@netbsd.org
 HOMEPAGE=		http://perl.apache.org/
diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index 6216314df33..99fc0248376 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 1998/12/05 03:50:46 tv Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:47 tron Exp $
 #
 
 DISTNAME=		Apache-ASP-0.05
 PKGNAME=		p5-Apache-ASP-0.05
 CATEGORIES=		www perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache/CHAMAS
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Apache/CHAMAS/}
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/Apache-ASP/ASP.html
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index 19b8aeb9245..3c4152956cb 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.2 1999/04/01 14:07:56 agc Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:47 tron Exp $
 #
 
 DISTNAME=       	CGI_Lite-1.62.pm
 PKGNAME=        	p5-CGI_Lite-1.62
 NO_WRKSUBDIR=		YES
 CATEGORIES=		www perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=CGI/}
 EXTRACT_SUFX=		.gz
 
 MAINTAINER=		bad@netbsd.org
diff --git a/www/p5-FCGI/Makefile b/www/p5-FCGI/Makefile
index 9ddec5a4369..aef9e83797e 100644
--- a/www/p5-FCGI/Makefile
+++ b/www/p5-FCGI/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1 1998/10/04 18:24:37 tv Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:48 tron Exp $
 #
 
 DISTNAME=       	FCGI-0.42
 PKGNAME=        	p5-FCGI-0.42
 CATEGORIES=		www perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	FCGI
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=FCGI/}
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.fastcgi.com/
diff --git a/www/p5-HTML-Parser/Makefile b/www/p5-HTML-Parser/Makefile
index c78ca48c61b..4d620e8e78d 100644
--- a/www/p5-HTML-Parser/Makefile
+++ b/www/p5-HTML-Parser/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/01/11 22:22:50 kim Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:48 tron Exp $
 #
 
 PKGNAME=        	p5-HTML-Parser-2.22
 DISTNAME!=       	echo ${PKGNAME} | sed -e 's/^p5-//'
 CATEGORIES=		www perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=HTML/}
 
 MAINTAINER=		packages@netbsd.org
 
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index 4fe6d140563..6a47af94b37 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.9 1999/01/13 02:56:11 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 1999/04/15 20:39:48 tron Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/09/14 04:00:11 jfitz Exp
 #
 
 PKGNAME=        	p5-libwww-5.36
 DISTNAME!=       	echo ${PKGNAME} | sed -e 's/^p5-//' -e 's/-/-perl-/'
 CATEGORIES=		www perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	URI
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=URI/}
 
 MAINTAINER=		packages@netbsd.org