[Midnightbsd-cvs] mports: Mk/components: sync with working versions.

ctriv at midnightbsd.org ctriv at midnightbsd.org
Tue Oct 28 18:51:34 EDT 2008


Log Message:
-----------
sync with working versions.

Modified Files:
--------------
    mports/Mk/components:
        sites.mk (r1.1 -> r1.2)
    mports/Mk/extensions:
        perl.mk (r1.2 -> r1.3)

-------------- next part --------------
Index: sites.mk
===================================================================
RCS file: /home/cvs/mports/Mk/components/sites.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -L Mk/components/sites.mk -L Mk/components/sites.mk -u -r1.1 -r1.2
--- Mk/components/sites.mk
+++ Mk/components/sites.mk
@@ -1,4 +1,4 @@
-# bsd.sites.mk - Popular master sites.
+# sites.mk - Popular master sites.
 #
 # Sites_MAINTAINER=		ports at MidnightBSD.org
 #
@@ -62,6 +62,7 @@
 MASTER_SITE_APACHE+=	\
 	http://www.apache.org/dist/%SUBDIR%/ \
 	http://archive.apache.org/dist/%SUBDIR%/ \
+	http://mirror.facebook.com/apache/%SUBDIR%/ \
 	ftp://ftp.planetmirror.com/pub/apache/dist/%SUBDIR%/ \
 	ftp://ftp.pop-mg.com.br/data/apache/dist/%SUBDIR%/ \
 	ftp://ftp.gin.cz/pub/mirrors/www.apache.org/dist/%SUBDIR%/ \
@@ -663,6 +664,7 @@
 .if !defined(IGNORE_MASTER_SITE_KDE)
 MASTER_SITE_KDE+=	\
 	ftp://ftp.kde.org/pub/kde/%SUBDIR%/ \
+	http://mirror.facebook.com/kde/%SUBDIR%/ \
 	http://ftp.scarlet.be/pub/kde/%SUBDIR%/ \
 	http://mirrors.isc.org/pub/kde/%SUBDIR%/ \
 	ftp://ftp.gtlib.cc.gatech.edu/pub/kde/%SUBDIR%/ \
@@ -1015,6 +1017,7 @@
 
 .if !defined(IGNORE_MASTER_SITE_PERL_CPAN)
 MASTER_SITE_PERL_CPAN+=	\
+	http://mirror.facebook.com/cpan/modules/by-module/%SUBDIR%/ \
 	ftp://ftp.funet.fi/pub/languages/perl/CPAN/modules/by-module/%SUBDIR%/ \
 	ftp://ftp.cpan.org/pub/CPAN/modules/by-module/%SUBDIR%/ \
 	http://www.cpan.dk/modules/by-module/%SUBDIR%/ \
Index: perl.mk
===================================================================
RCS file: /home/cvs/mports/Mk/extensions/perl.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -L Mk/extensions/perl.mk -L Mk/extensions/perl.mk -u -r1.2 -r1.3
--- Mk/extensions/perl.mk
+++ Mk/extensions/perl.mk
@@ -3,10 +3,10 @@
 #
 # $MidnightBSD$
 #
-# bsd.perl.mk - perl specific make directives
+# perl.mk - perl specific make directives
 
 
-.if !defined(_POSTMKINCLUDED) && !defined(Perl_Pre_Include)
+.if !defined(_POSTMKINCLUDED) || !defined(Perl_Pre_Include)
 
 Perl_Pre_Include=			perl.mk
 Perl_Include_MAINTAINER=	ctriv at MidnightBSD.org
@@ -53,7 +53,7 @@
 PERL_PORT?=			perl${PERL_BRANCH}
 # use true_prefix so that PERL will be right in faked targets.
 # this is historical.
-PERL_PREFIX?=		${TRUE_PREFIX}
+PERL_PREFIX?=		${LOCALBASE}
 SITE_PERL_REL?=		lib/perl5/site_perl/${PERL_VER}
 SITE_PERL?=			${PERL_PREFIX}/${SITE_PERL_REL}
 PERL=				${PERL_PREFIX}/bin/perl
@@ -178,7 +178,7 @@
 .endif      # !defined(_POSTMKINCLUDED) && !defined(Perl_Pre_Include)
 .if defined(_POSTMKINCLUDED) && !defined(Perl_Post_Include)
 
-Perl_Post_Include=	perl.mk
+Perl_Post_Include=	bsd.perl.mk
 
 PLIST_SUB+=		PERL_VERSION=${PERL_VERSION} \
 				PERL_VER=${PERL_VER} \


More information about the Midnightbsd-cvs mailing list