From owner-svn-ports-head@FreeBSD.ORG  Fri Jan 10 13:10:35 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AA168420;
 Fri, 10 Jan 2014 13:10:35 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 965721A1F;
 Fri, 10 Jan 2014 13:10:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0ADAZfo007615;
 Fri, 10 Jan 2014 13:10:35 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0ADAZgH007612;
 Fri, 10 Jan 2014 13:10:35 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401101310.s0ADAZgH007612@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 10 Jan 2014 13:10:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339349 - in head/Mk: . Uses
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jan 2014 13:10:35 -0000

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 \