Use in-tree libbsdxml instead of ports based libexpat.

Sponsored by:	DARPA & NAI Labs.

6 files changed, 11 insertions, 13 deletions

diff --git a/tools/regression/geom/ConfCmp/ConfCmp.c b/tools/regression/geom/ConfCmp/ConfCmp.c
index 227c5dea8663..858b9e9dc6c8 100644
--- a/tools/regression/geom/ConfCmp/ConfCmp.c
+++ b/tools/regression/geom/ConfCmp/ConfCmp.c
@@ -46,7 +46,7 @@
 #include <sys/queue.h>
 #include <sys/sbuf.h>
 #include <err.h>
-#include "expat.h"
+#include <bsdxml.h>
 
 struct node {
 	LIST_HEAD(, node)	children;
diff --git a/tools/regression/geom/ConfCmp/Makefile b/tools/regression/geom/ConfCmp/Makefile
index 528588e0de69..5966b4b4f857 100644
--- a/tools/regression/geom/ConfCmp/Makefile
+++ b/tools/regression/geom/ConfCmp/Makefile
@@ -3,16 +3,16 @@
 PROG=	ConfCmp
 SRCS+=	ConfCmp.c
 SRCS+=	subr_sbuf.c
-VPATH+= /sys/kern
+
+.PATH:	../../../../sys/kern
+
 NOOBJ=	youbet
 WARNS=	5
 CFLAGS+=	 -g -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -static
 # Uncomment for ElectricFence
 #LDADD += -lefence -L/usr/local/lib
 
-# Stuff for XML
-LDADD += -L/usr/local/lib -lexpat
-CFLAGS += -I/usr/local/include/xml
+LDADD += -lbsdxml
 
 NOMAN=	yeah
 CLEANFILES	+= _*
diff --git a/tools/regression/geom/GLib/Makefile b/tools/regression/geom/GLib/Makefile
index cfa8d041f0c1..93b9812006ee 100644
--- a/tools/regression/geom/GLib/Makefile
+++ b/tools/regression/geom/GLib/Makefile
@@ -2,7 +2,7 @@
 
 LIB=	G
 SRCS=   geom.c geom_aes.c geom_bsd.c geom_simdev.c geom_dump.c \
-	geom_event.c geom_gpt.c \
+	geom_event.c \
 	geom_io.c \
 	geom_kernsim.c geom_mbr.c geom_simdisk.c geom_enc.c \
 	geom_simdisk_xml.c geom_slice.c geom_subr.c subr_sbuf.c \
@@ -11,15 +11,14 @@ SRCS=   geom.c geom_aes.c geom_bsd.c geom_simdev.c geom_dump.c \
 
 CFLAGS +=	-g -static -W -Wall
 CFLAGS +=	-Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
-CFLAGS +=	-I/usr/local/include/xml -I/usr/src/sys -I..
+CFLAGS +=	-I/usr/src/sys -I..
 CFLAGS +=	-DKERNELSIM
 NOPIC =		static
 NOPROFILE =	bingo
 NOOBJ =		youbet
 WARNS =		2
-LDADD +=r	-L/usr/local/lib -lexpat
 
-VPATH+=	/sys/geom:..:/sys/kern
+.PATH:	/sys/geom .. /sys/kern
 
 .include <bsd.lib.mk>
 
diff --git a/tools/regression/geom/Test/Makefile.inc b/tools/regression/geom/Test/Makefile.inc
index c53257e06584..99f344b75c87 100644
--- a/tools/regression/geom/Test/Makefile.inc
+++ b/tools/regression/geom/Test/Makefile.inc
@@ -6,8 +6,8 @@ NOOBJ =		youbet
 CFLAGS +=	-g -W -Wall -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS +=	-Wpointer-arith -static -I/usr/src/sys -I../..
 CFLAGS +=	-DKERNELSIM -pthread
-LDADD +=	-L../../GLib -lG
-LDADD +=	-L/usr/local/lib -lexpat
+LDADD +=	-L../../GLib -lG 
+LDADD +=	-lbsdxml
 DPADD +=	../../GLib/libG.a
 CLEANFILES +=	_* *.core
 WARNS=		2
diff --git a/tools/regression/geom/Test/T014/Makefile b/tools/regression/geom/Test/T014/Makefile
index e94463675a2f..18fd955e4cf0 100644
--- a/tools/regression/geom/Test/T014/Makefile
+++ b/tools/regression/geom/Test/T014/Makefile
@@ -1,3 +1,2 @@
 # $FreeBSD$
-.include "../Makefile.inc"
 .include <bsd.prog.mk>
diff --git a/tools/regression/geom/geom_simdisk_xml.c b/tools/regression/geom/geom_simdisk_xml.c
index ec7b806211a3..818b9d289fa4 100644
--- a/tools/regression/geom/geom_simdisk_xml.c
+++ b/tools/regression/geom/geom_simdisk_xml.c
@@ -46,7 +46,7 @@
 #include <geom/geom.h>
 #include <string.h>
 #include <ctype.h>
-#include "expat.h"
+#include <bsdxml.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <sys/queue.h>