From owner-freebsd-current@FreeBSD.ORG  Fri Jun  4 02:23:32 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D6F6616A4CE
	for <current@FreeBSD.org>; Fri,  4 Jun 2004 02:23:32 -0700 (PDT)
Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 72C1243D41
	for <current@FreeBSD.org>; Fri,  4 Jun 2004 02:23:31 -0700 (PDT)
	(envelope-from ru@ip.net.ua)
Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213])
	by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id i549T7EZ013799
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <current@FreeBSD.org>; Fri, 4 Jun 2004 12:29:09 +0300 (EEST)
	(envelope-from ru@ip.net.ua)
Received: (from ru@localhost)
	by heffalump.ip.net.ua (8.12.11/8.12.11) id i549NEBP012363
	for current@FreeBSD.org; Fri, 4 Jun 2004 12:23:14 +0300 (EEST)
	(envelope-from ru)
Date: Fri, 4 Jun 2004 12:23:13 +0300
From: Ruslan Ermilov <ru@FreeBSD.org>
To: current@FreeBSD.org
Message-ID: <20040604092313.GA12314@ip.net.ua>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="ZPt4rx8FFjLCG7dd"
Content-Disposition: inline
User-Agent: Mutt/1.5.6i
X-Virus-Scanned: by amavisd-new
X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp)
Subject: Can the disklabel(8) link go now?
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jun 2004 09:23:32 -0000


--ZPt4rx8FFjLCG7dd
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Gang,

I'd like to remove the old compatibility link from bsdlabel(8)
to disklabel(8).  I think the dust has settled enough to allow
this to be done now (and before 5.3-RELEASE):

%%%
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/sbin/bsdlabel/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile	11 Jan 2004 09:11:10 -0000	1.19
+++ Makefile	4 Jun 2004 09:20:31 -0000
@@ -8,17 +8,16 @@
 #MAN=3D	bsdlabel.5
 MAN+=3D	bsdlabel.8
=20
-.if ${MACHINE_ARCH} =3D=3D "i386" || ${MACHINE_ARCH} =3D=3D "alpha" || \
-    ${MACHINE_ARCH} =3D=3D "amd64"
-LINKS=3D	${BINDIR}/bsdlabel ${BINDIR}/disklabel
-MLINKS=3D	bsdlabel.8 disklabel.8
-.endif
-
 DPADD=3D	${LIBGEOM}
 LDADD=3D	-lgeom
=20
 .include <bsd.prog.mk>
=20
+afterinstall:
+.if exists(${DESTDIR}${BINDIR}/disklabel)
+	rm -f ${DESTDIR}${BINDIR}/disklabel
+.endif
+
 test: ${PROG}
 	sh ${.CURDIR}/runtest.sh
=20
%%%

What do you think?


Cheers,
--=20
Ruslan Ermilov
ru@FreeBSD.org
FreeBSD committer

--ZPt4rx8FFjLCG7dd
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)

iD8DBQFAwD+BqRfpzJluFF4RAiBFAJ90rZj4nCRvHk0TSgY8hdN+HYTOJwCgmXgN
VXbtnCLTxOd5peov/NkyhA8=
=SXw3
-----END PGP SIGNATURE-----

--ZPt4rx8FFjLCG7dd--