svn commit: r339349 - in head/Mk: . Uses

[Baptiste Daroussin]

Author: bapt
Date: Fri Jan 10 13:10:34 2014
New Revision: 339349
URL: http://svnweb.freebsd.org/changeset/ports/339349

Log:
  backout 2 changes that should not have been committed with r339348

Modified:
  head/Mk/Uses/tcl.mk
  head/Mk/bsd.sites.mk

Modified: head/Mk/Uses/tcl.mk
==============================================================================
--- head/Mk/Uses/tcl.mk	Fri Jan 10 13:07:05 2014	(r339348)
+++ head/Mk/Uses/tcl.mk	Fri Jan 10 13:10:34 2014	(r339349)
@@ -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
 

Modified: head/Mk/bsd.sites.mk
==============================================================================
--- head/Mk/bsd.sites.mk	Fri Jan 10 13:07:05 2014	(r339348)
+++ head/Mk/bsd.sites.mk	Fri Jan 10 13:10:34 2014	(r339349)
@@ -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 \