[pkgsrc/trunk]: pkgsrc/mk Back out CPAN_MODULE_DIR change. Due to the way ma...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/91141005f3e7
branches:  trunk
changeset: 486214:91141005f3e7
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Dec 25 03:43:33 2004 +0000

description:
Back out CPAN_MODULE_DIR change.  Due to the way make variables are
evaluated, this broke MASTER_SITES in many p5-* packages.

diffstat:

 mk/bsd.sites.mk |  15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diffs (30 lines):

diff -r 9cf5e233c978 -r 91141005f3e7 mk/bsd.sites.mk
--- a/mk/bsd.sites.mk   Sat Dec 25 03:30:58 2004 +0000
+++ b/mk/bsd.sites.mk   Sat Dec 25 03:43:33 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sites.mk,v 1.28 2004/12/25 03:22:37 jlam Exp $
+# $NetBSD: bsd.sites.mk,v 1.29 2004/12/25 03:43:33 jlam Exp $
 #
 # Default MASTER_SITES
 
@@ -48,14 +48,13 @@
        ftp://ftp.easynet.nl/mirror/GNUstep/ \
        http://ftp.easynet.nl/mirror/GNUstep/
 
-CPAN_MODULE_DIR?=      modules/by-module
 MASTER_SITE_PERL_CPAN+= \
-       ftp://cpan.pair.com/${CPAN_MODULE_PATH}/ \
-       ftp://mirrors.cloud9.net/mirrors/CPAN/${CPAN_MODULE_PATH}/ \
-       ftp://ftp.uvsq.fr/pub/perl/CPAN/${CPAN_MODULE_PATH}/ \
-       ftp://ftp.gmd.de/mirrors/CPAN/${CPAN_MODULE_PATH}/ \
-       ftp://ftp.tuwien.ac.at/pub/CPAN/${CPAN_MODULE_PATH}/ \
-       ftp://cpan.perl.org/CPAN/${CPAN_MODULE_PATH}/
+       ftp://cpan.pair.com/module/by-module/ \
+       ftp://mirrors.cloud9.net/mirrors/CPAN/module/by-module/ \
+       ftp://ftp.uvsq.fr/pub/perl/CPAN/module/by-module/ \
+       ftp://ftp.gmd.de/mirrors/CPAN/module/by-module/ \
+       ftp://ftp.tuwien.ac.at/pub/CPAN/module/by-module/ \
+       ftp://cpan.perl.org/CPAN/module/by-module/
 
 MASTER_SITE_R_CRAN+=    \
        http://cran.r-project.org/src/ \