From owner-svn-src-head@FreeBSD.ORG  Sun Dec 30 14:35:01 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A7854B74;
 Sun, 30 Dec 2012 14:35:01 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 724678FC0A;
 Sun, 30 Dec 2012 14:35:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBUEZ1nq019604;
 Sun, 30 Dec 2012 14:35:01 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBUEZ02Z019596;
 Sun, 30 Dec 2012 14:35:00 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201212301435.qBUEZ02Z019596@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 30 Dec 2012 14:35:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244859 - in head/usr.sbin: . bsdinstall/partedit sade
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Dec 2012 14:35:01 -0000

Author: nwhitehorn
Date: Sun Dec 30 14:35:00 2012
New Revision: 244859
URL: http://svnweb.freebsd.org/changeset/base/244859

Log:
  Replace sade the extracted piece of sysinstall with sade the extracted
  piece of bsdinstall (although this time with a symlink instead of duplicated
  source code).
  
  Discussed on:	freebsd-geom
  MFC after:	3 months

Deleted:
  head/usr.sbin/sade/
Modified:
  head/usr.sbin/Makefile.amd64
  head/usr.sbin/Makefile.i386
  head/usr.sbin/Makefile.sparc64
  head/usr.sbin/bsdinstall/partedit/Makefile

Modified: head/usr.sbin/Makefile.amd64
==============================================================================
--- head/usr.sbin/Makefile.amd64	Sun Dec 30 14:33:16 2012	(r244858)
+++ head/usr.sbin/Makefile.amd64	Sun Dec 30 14:35:00 2012	(r244859)
@@ -23,7 +23,4 @@ SUBDIR+=	ndiscvt
 .endif
 SUBDIR+=	sicontrol
 SUBDIR+=	spkrtest
-.if ${MK_SYSINSTALL} != "no"
-SUBDIR+=	sade
-.endif
 SUBDIR+=	zzz

Modified: head/usr.sbin/Makefile.i386
==============================================================================
--- head/usr.sbin/Makefile.i386	Sun Dec 30 14:33:16 2012	(r244858)
+++ head/usr.sbin/Makefile.i386	Sun Dec 30 14:35:00 2012	(r244859)
@@ -17,9 +17,6 @@ SUBDIR+=	mptable
 SUBDIR+=	ndiscvt
 .endif
 SUBDIR+=	pnpinfo
-.if ${MK_SYSINSTALL} != "no"
-SUBDIR+=	sade
-.endif
 SUBDIR+=	sicontrol
 SUBDIR+=	spkrtest
 SUBDIR+=	zzz

Modified: head/usr.sbin/Makefile.sparc64
==============================================================================
--- head/usr.sbin/Makefile.sparc64	Sun Dec 30 14:33:16 2012	(r244858)
+++ head/usr.sbin/Makefile.sparc64	Sun Dec 30 14:35:00 2012	(r244859)
@@ -2,6 +2,3 @@
 
 SUBDIR+=	eeprom
 SUBDIR+=	ofwdump
-.if ${MK_SYSINSTALL} != "no"
-SUBDIR+=	sade
-.endif

Modified: head/usr.sbin/bsdinstall/partedit/Makefile
==============================================================================
--- head/usr.sbin/bsdinstall/partedit/Makefile	Sun Dec 30 14:33:16 2012	(r244858)
+++ head/usr.sbin/bsdinstall/partedit/Makefile	Sun Dec 30 14:35:00 2012	(r244859)
@@ -2,7 +2,7 @@
 
 BINDIR= /usr/libexec/bsdinstall
 PROG=	partedit
-LINKS= ${BINDIR}/partedit ${BINDIR}/autopart
+LINKS= ${BINDIR}/partedit ${BINDIR}/autopart ${BINDIR}/partedit /usr/sbin/sade
 LDADD=	-lgeom -lncursesw -lutil -ldialog -lm
 
 PARTEDIT_ARCH= ${MACHINE}