From d7f5bced1944046f12f5f02ce09004e70686d00b Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Thu, 3 Jul 2008 20:53:15 +0000
Subject: [PATCH] Stop building bsdlabel(8) and fdisk(8) on ia64. Both tools
 are obsoleted by gpart(8). This avoids the following bugs in fdisk: - 
 initializing a disk without MBR bogusly emits the error: 	fdisk: invalid
 fdisk partition table found -  initializing a disk with or without MBR
 bogusly emits either: 	fdisk: Class not found    or 	fdisk: Geom not found:
 "XXX" -  the default geometry for non-ATA and non-SCSI disks is either   
 invalid or sub-optimizal.

---
 sbin/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sbin/Makefile b/sbin/Makefile
index eafc31f2d05..3d187cf3801 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -9,7 +9,7 @@ SUBDIR=	adjkerntz \
 	atacontrol \
 	${_atm} \
 	badsect \
-	bsdlabel \
+	${_bsdlabel} \
 	camcontrol \
 	ccdconfig \
 	clri \
@@ -113,6 +113,10 @@ _ping6=		ping6
 _rtsol=		rtsol
 .endif
 
+.if ${MACHINE_ARCH} != "ia64"
+_bsdlabel=	bsdlabel
+.endif
+
 .if ${MACHINE_ARCH} == "i386"
 .if ${MACHINE} == "i386"
 _fdisk=		fdisk
@@ -131,7 +135,6 @@ _fdisk=		fdisk
 .endif
 
 .if ${MACHINE_ARCH} == "ia64"
-_fdisk=		fdisk
 _mca=		mca
 .endif