3 files changed, 45 insertions, 0 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 6ca784ef6cb6..6718286e7ddb 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -234,6 +234,8 @@ SUBDIR.${MK_NIS}+=	ypcat
 SUBDIR.${MK_NIS}+=	ypmatch
 SUBDIR.${MK_NIS}+=	ypwhich
 SUBDIR.${MK_OPENSSH}+=	ssh-copy-id
+SUBDIR.${MK_PKGCONF}+=	bomtool
+SUBDIR.${MK_PKGCONF}+=	pkgconf
 SUBDIR.${MK_QUOTAS}+=	quota
 SUBDIR.${MK_SENDMAIL}+=	vacation
 SUBDIR.${MK_SOUND}+=	beep
diff --git a/usr.bin/bomtool/Makefile b/usr.bin/bomtool/Makefile
new file mode 100644
index 000000000000..f9471f35801b
--- /dev/null
+++ b/usr.bin/bomtool/Makefile
@@ -0,0 +1,20 @@
+PACKAGE=	pkgconf
+
+PROG=		bomtool
+SRCS=		main.c
+SRCS+=		getopt_long.c
+
+LIBADD=		pkgconf
+
+PKGCONFDIR=	${SRCTOP}/contrib/pkgconf
+
+CFLAGS+=	-Wno-error=missing-variable-declarations
+CFLAGS+=	-Wno-error=incompatible-pointer-types-discards-qualifiers
+CFLAGS+=	-Wno-error=cast-qual
+CFLAGS+=	-I${SRCTOP}/lib/libpkgconf -I${PKGCONFDIR} -I${PKGCONFDIR}/cli
+
+.PATH:		${PKGCONFDIR}/cli/bomtool
+.PATH:		${PKGCONFDIR}/cli
+.PATH:		${PKGCONFDIR}/man
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/pkgconf/Makefile b/usr.bin/pkgconf/Makefile
new file mode 100644
index 000000000000..2155201ac883
--- /dev/null
+++ b/usr.bin/pkgconf/Makefile
@@ -0,0 +1,23 @@
+PACKAGE=	pkgconf
+
+PROG=		pkgconf
+SRCS=		main.c
+SRCS+=		getopt_long.c
+SRCS+=		renderer-msvc.c
+
+LIBADD=		pkgconf
+
+SYMLINKS=	pkgconf ${BINDIR}/pkg-config
+
+PKGCONFDIR=	${SRCTOP}/contrib/pkgconf
+
+CFLAGS+=	-Wno-error=missing-variable-declarations
+CFLAGS+=	-Wno-error=incompatible-pointer-types-discards-qualifiers
+CFLAGS+=	-Wno-error=cast-qual
+CFLAGS+=	-DSYSTEM_INCLUDEDIR=\"/usr/include\" -DSYSTEM_LIBDIR=\"/usr/lib\"
+CFLAGS+=	-I${SRCTOP}/lib/libpkgconf -I${PKGCONFDIR}
+
+.PATH:		${PKGCONFDIR}/cli
+.PATH:		${PKGCONFDIR}/man
+
+.include <bsd.prog.mk>