Can the disklabel(8) link go now?

[Ruslan Ermilov]

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
===================================================================
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=	bsdlabel.5
 MAN+=	bsdlabel.8
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "amd64"
-LINKS=	${BINDIR}/bsdlabel ${BINDIR}/disklabel
-MLINKS=	bsdlabel.8 disklabel.8
-.endif
-
 DPADD=	${LIBGEOM}
 LDADD=	-lgeom
 
 .include <bsd.prog.mk>
 
+afterinstall:
+.if exists(${DESTDIR}${BINDIR}/disklabel)
+	rm -f ${DESTDIR}${BINDIR}/disklabel
+.endif
+
 test: ${PROG}
 	sh ${.CURDIR}/runtest.sh
 
%%%

What do you think?


Cheers,
-- 
Ruslan Ermilov
ru at FreeBSD.org
FreeBSD committer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20040604/2228de79/attachment.bin