cvs commit: src/sbin/disklabel Makefile disklabel.5 disklabel.8 disklabel.c pathnames.h

[Ruslan Ermilov]

On Wed, Jan 28, 2004 at 11:29:16AM -0800, David E. O'Brien wrote:
> obrien      2004/01/28 11:29:16 PST
> 
>   FreeBSD src repository
> 
>   Removed files:
>     sbin/disklabel       Makefile disklabel.5 disklabel.8 
>                          disklabel.c pathnames.h 
>   Log:
>   This has been disconnected from the build since May 2003.  GC it, as
>   bsdlabel and sunlabel are what we use now.
>   
>   Revision  Changes    Path
>   1.11      +0 -12     src/sbin/disklabel/Makefile (dead)
>   1.17      +0 -525    src/sbin/disklabel/disklabel.5 (dead)
>   1.54      +0 -976    src/sbin/disklabel/disklabel.8 (dead)
>   1.82      +0 -1581   src/sbin/disklabel/disklabel.c (dead)
>   1.5       +0 -40     src/sbin/disklabel/pathnames.h (dead)
> 
*Sigh*  I have only today reminded Poul-Henning about it.  ;)

I've also suggested (for some time now) to commit the attached
patch, but he told me to wait until after 5.2 is settled.


Cheers,
-- 
Ruslan Ermilov
FreeBSD committer
ru at FreeBSD.org
-------------- next part --------------
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	20 Jan 2004 07:19:37 -0000
@@ -7,17 +7,15 @@
 SRCS=	bsdlabel.c geom_bsd_enc.c
 #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
-------------- 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/cvs-src/attachments/20040128/4511514e/attachment-0001.bin