summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2014-01-10 13:10:34 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2014-01-10 13:10:34 +0000
commit47844de6b261ac7a0a23733c8db8aa8d76e9cd02 (patch)
treef31e4cf4b2c63017f23d498d67700f11c644122a /Mk
parent108b7594d842d91b56ae9a020a65179de0e660e2 (diff)
downloadfreebsd-ports-47844de6b261ac7a0a23733c8db8aa8d76e9cd02.zip
backout 2 changes that should not have been committed with r339348
Diffstat (limited to 'Mk')
-rw-r--r--Mk/Uses/tcl.mk1
-rw-r--r--Mk/bsd.sites.mk9
2 files changed, 3 insertions, 7 deletions
diff --git a/Mk/Uses/tcl.mk b/Mk/Uses/tcl.mk
index 95f7c70c1729..4d0a376c7e8c 100644
--- a/Mk/Uses/tcl.mk
+++ b/Mk/Uses/tcl.mk
@@ -57,7 +57,6 @@
# Build-time / Run-time only dependencies can be specified with build or run.
#
-.if ${USES:Mtk} || ${USES:Mtk\:*}
.if !defined(_INCLUDE_USES_TCL_MK)
_INCLUDE_USES_TCL_MK= yes
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index fe1a5387d131..3b97e9917351 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -107,12 +107,9 @@ MASTER_SITE_APACHE_XML+= \
.endif
.if !defined(IGNORE_MASTER_SITE_BERLIOS)
-.for mirror in heanet sunet iweb switch freefr garr aarnet jaist master \
- nchc ncu internode waix hivelocity superb-dca3 ufpr tenet \
- netcologne ignum kent kaz
MASTER_SITE_BERLIOS+= \
- http://${mirror}.dl.sourceforge.net/project/%SUBDIR%/
-.endfor
+ http://download.berlios.de/%SUBDIR%/ \
+ http://download2.berlios.de/%SUBDIR%/
.endif
.if !defined(IGNORE_MASTER_SITE_CENKES)
@@ -1470,7 +1467,7 @@ MASTER_SITES_ABBREVS= CPAN:PERL_CPAN \
RF:RUBYFORGE
MASTER_SITES_SUBDIRS= \
APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \
- BERLIOS:${PORTNAME:L}.berlios \
+ BERLIOS:${PORTNAME:L} \
CENKES:myports \
CHEESESHOP:source/${DISTNAME:C/(.).*/\1/}/${DISTNAME:C/(.*)-[0-9].*/\1/} \
CSME:myports \