Attachment 113444 Details for Bug 154994 – patch-Mk-bsd-sites-mk.diff.txt

[patch] patch-Mk-bsd-sites-mk.diff.txt

patch-Mk-bsd-sites-mk.diff.txt (text/plain), 5.36 KB, created by Andrej Zverev on 2011-02-24 08:30:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrej Zverev

Created: 2011-02-24 08:30:09 UTC

Size: 5.36 KB

patch

obsolete

>Index: ports/Mk/bsd.sites.mk
>===================================================================
>RCS file: /home/pcvs/ports/Mk/bsd.sites.mk,v
>retrieving revision 1.525
>diff -u -r1.525 bsd.sites.mk
>--- ports/Mk/bsd.sites.mk	18 Feb 2011 10:44:04 -0000	1.525
>+++ ports/Mk/bsd.sites.mk	24 Feb 2011 08:16:07 -0000
>@@ -913,21 +913,48 @@
> .endif
> 
> .if !defined(IGNORE_MASTER_SITE_PERL_CPAN)
>-MASTER_SITE_PERL_CPAN+=	\
>-	ftp://ftp.cpan.org/pub/CPAN/modules/by-module/%SUBDIR%/ \
>-	http://www.cpan.dk/modules/by-module/%SUBDIR%/ \
>-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,lang/perl/CPAN/modules/by-module/&,} \
>-	ftp://ftp.kddlabs.co.jp/lang/perl/CPAN/modules/by-module/%SUBDIR%/ \
>-	http://ftp.jaist.ac.jp/pub/CPAN/modules/by-module/%SUBDIR%/ \
>-	ftp://ftp.dti.ad.jp/pub/lang/CPAN/modules/by-module/%SUBDIR%/ \
>-	ftp://ftp.sunet.se/pub/lang/perl/CPAN/modules/by-module/%SUBDIR%/ \
>-	ftp://mirror.hiwaay.net/CPAN/modules/by-module/%SUBDIR%/ \
>-	ftp://ftp.mirrorservice.org/sites/ftp.funet.fi/pub/languages/perl/CPAN/modules/by-module/%SUBDIR%/ \
>-	http://at.cpan.org/modules/by-module/%SUBDIR%/ \
>-	ftp://ftp.auckland.ac.nz/pub/perl/CPAN/modules/by-module/%SUBDIR%/ \
>-	http://backpan.cpan.org/modules/by-module/%SUBDIR%/ \
>-	ftp://ftp.funet.fi/pub/languages/perl/CPAN/modules/by-module/%SUBDIR%/ \
>-	http://cpan.nctu.edu.tw/modules/by-module/%SUBDIR%/
>+
>+# Regulate the mode of obtain. By default using modules/by-module symlink and if 
>+# new method using authors/id/ in action.
>+_PERL_CPAN_SORT?= modules/by-module
>+
>+# Please add URI to MASTER_SITE_PERL_CPAN_BY instead of this one.
>+MASTER_SITE_PERL_CPAN?=
>+
>+# Actual list of MASTER SITES for CPAN
>+MASTER_SITE_PERL_CPAN_BY+= \
>+	ftp://ftp.cpan.org/pub/CPAN/%CPANSORT%/%SUBDIR%/ \
>+	http://www.cpan.dk/%CPANSORT%/%SUBDIR%/ \
>+	ftp://ftp.kddlabs.co.jp/lang/perl/CPAN/%CPANSORT%/%SUBDIR%/ \
>+	http://ftp.jaist.ac.jp/pub/CPAN/%CPANSORT%/%SUBDIR%/ \
>+	ftp://ftp.dti.ad.jp/pub/lang/CPAN/%CPANSORT%/%SUBDIR%/ \
>+	ftp://ftp.sunet.se/pub/lang/perl/CPAN/%CPANSORT%/%SUBDIR%/ \
>+	http://ring.nict.go.jp/archives/CPAN/%CPANSORT%/%SUBDIR%/ \
>+	ftp://mirror.hiwaay.net/CPAN/%CPANSORT%/%SUBDIR%/ \
>+	ftp://ftp.mirrorservice.org/sites/ftp.funet.fi/pub/languages/perl/CPAN/%CPANSORT%/%SUBDIR%/ \
>+	http://at.cpan.org/%CPANSORT%/%SUBDIR%/ \
>+	http://ring.riken.jp/archives/CPAN/%CPANSORT%/%SUBDIR%/ \
>+	ftp://ftp.auckland.ac.nz/pub/perl/CPAN/%CPANSORT%/%SUBDIR%/ \
>+	http://backpan.cpan.org/%CPANSORT%/%SUBDIR%/ \
>+	ftp://ftp.funet.fi/pub/languages/perl/CPAN/%CPANSORT%/%SUBDIR%/ \
>+	http://cpan.nctu.edu.tw/%CPANSORT%/%SUBDIR%/
>+
>+# Contain CPAN keyword otherwise empty
>+_PERL_CPAN_FLAG = ${MASTER_SITE_SUBDIR:C/(CPAN):.*$/\1/}
>+
>+# Convert author ID into L2 cache hierarchy.
>+# For example FLORA -> F/FL/FLORA, GRUBER -> G/GR/GRUBER
>+_PERL_CPAN_ID = ${MASTER_SITE_SUBDIR:C/^CPAN:(.)(.)(.*)$/\1\/\1\2\/\1\2\3/}
>+
>+# If found CPAN keyword inside MASTER_SITE_SUBDIR must use new logic.
>+# Also with new logic where no need in %SUBDIR%
>+.if !empty(_PERL_CPAN_ID) && ${_PERL_CPAN_FLAG:L} == "cpan"
>+    _PERL_CPAN_SORT= authors/id/${_PERL_CPAN_ID}
>+    MASTER_SITE_PERL_CPAN=${MASTER_SITE_PERL_CPAN_BY:S/%CPANSORT%/${_PERL_CPAN_SORT}/:S/%SUBDIR%//}
>+.else
>+    MASTER_SITE_PERL_CPAN=${MASTER_SITE_PERL_CPAN_BY:S/%CPANSORT%/${_PERL_CPAN_SORT}/}
>+.endif
>+
> .endif
> 
> #
>Index: ports/devel/p5-Class-Constant/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/devel/p5-Class-Constant/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- ports/devel/p5-Class-Constant/Makefile	28 Aug 2010 05:55:53 -0000	1.5
>+++ ports/devel/p5-Class-Constant/Makefile	24 Feb 2011 08:16:07 -0000
>@@ -9,6 +9,7 @@
> PORTVERSION=	0.06
> CATEGORIES=	devel perl5
> MASTER_SITES=	CPAN
>+MASTER_SITE_SUBDIR=	CPAN:ROBN
> PKGNAMEPREFIX=	p5-
> 
> MAINTAINER=	perl@FreeBSD.org
>Index: ports/devel/p5-Config-Model/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/devel/p5-Config-Model/Makefile,v
>retrieving revision 1.61
>diff -u -r1.61 Makefile
>--- ports/devel/p5-Config-Model/Makefile	22 Feb 2011 01:45:55 -0000	1.61
>+++ ports/devel/p5-Config-Model/Makefile	24 Feb 2011 08:16:07 -0000
>@@ -10,7 +10,7 @@
> PORTVERSION=	1.234
> CATEGORIES=	devel perl5
> MASTER_SITES=	CPAN
>-MASTER_SITE_SUBDIR=	../../authors/id/D/DD/DDUMONT
>+MASTER_SITE_SUBDIR=	CPAN:DDUMONT
> PKGNAMEPREFIX=	p5-
> 
> MAINTAINER=	perl@FreeBSD.org
>Index: ports/www/p5-Jemplate/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/p5-Jemplate/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- ports/www/p5-Jemplate/Makefile	28 Apr 2010 09:46:22 -0000	1.5
>+++ ports/www/p5-Jemplate/Makefile	24 Feb 2011 08:16:07 -0000
>@@ -9,7 +9,7 @@
> PORTVERSION=	0.261
> CATEGORIES=	www perl5
> MASTER_SITES=	CPAN
>-MASTER_SITE_SUBDIR=	../by-authors/id/R/RK/RKRIMEN
>+MASTER_SITE_SUBDIR=	CPAN:RKRIMEN
> PKGNAMEPREFIX=	p5-
> 
> MAINTAINER=	lth@FreeBSD.org
>Index: ports/www/p5-WWW-Search-Google/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/p5-WWW-Search-Google/Makefile,v
>retrieving revision 1.13
>diff -u -r1.13 Makefile
>--- ports/www/p5-WWW-Search-Google/Makefile	18 Apr 2008 02:24:08 -0000	1.13
>+++ ports/www/p5-WWW-Search-Google/Makefile	24 Feb 2011 08:16:07 -0000
>@@ -10,6 +10,7 @@
> PORTEPOCH=	1
> CATEGORIES=	www perl5
> MASTER_SITES=	CPAN
>+MASTER_SITE_SUBDIR=	CPAN:LBROCARD
> PKGNAMEPREFIX=	p5-
> 
> MAINTAINER=	perl@FreeBSD.org

Actions: View | Diff

Attachments on bug 154994: 113444