From owner-svn-ports-head@FreeBSD.ORG  Mon Jul 29 08:32:17 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 575CB760;
 Mon, 29 Jul 2013 08:32:17 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
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 44CFD26E9;
 Mon, 29 Jul 2013 08:32:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6T8WHc5007575;
 Mon, 29 Jul 2013 08:32:17 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6T8WGJC007573;
 Mon, 29 Jul 2013 08:32:16 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201307290832.r6T8WGJC007573@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Mon, 29 Jul 2013 08:32:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r323875 - in head: . net net/ns2
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.14
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: Mon, 29 Jul 2013 08:32:17 -0000

Author: danfe
Date: Mon Jul 29 08:32:16 2013
New Revision: 323875
URL: http://svnweb.freebsd.org/changeset/ports/323875

Log:
  Remove net/ns2, which is practically identical copy of net/ns.

Deleted:
  head/net/ns2/
Modified:
  head/MOVED
  head/net/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Mon Jul 29 08:30:06 2013	(r323874)
+++ head/MOVED	Mon Jul 29 08:32:16 2013	(r323875)
@@ -4828,3 +4828,4 @@ x11-toolkits/qwt4||2013-07-26|Has expire
 x11-wm/bbconf||2013-07-26|Has expired: Depends on QT3
 x11-wm/kompmgr||2013-07-26|Has expired: Depends on QT3
 audio/artswrapper||2013-07-27|Depend on the expired audio/arts
+net/ns2|net/ns|2013-07-29|Duplicate ports merged

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Mon Jul 29 08:30:06 2013	(r323874)
+++ head/net/Makefile	Mon Jul 29 08:32:16 2013	(r323875)
@@ -441,7 +441,6 @@
     SUBDIR += nos-ttb
     SUBDIR += nph
     SUBDIR += ns
-    SUBDIR += ns2
     SUBDIR += nss-pam-ldapd
     SUBDIR += nss-pam-ldapd-sasl
     SUBDIR += nss_ldap