For the pkgtools versions of mtree and pax, always use libnbcompat

"in-place", and for the normal versions of mtree and pax, always use
libnbcompat as a normal build dependency.

6 files changed, 10 insertions, 18 deletions

diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile
index f3c502c9e28..7bef5336c51 100644
--- a/archivers/pax/Makefile
+++ b/archivers/pax/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2006/07/14 19:45:12 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2006/07/14 20:11:10 jlam Exp $
 
 .include "Makefile.common"
 
 CATEGORIES=	archivers
 
+.include "../../pkgtools/libnbcompat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/pax/Makefile.common b/archivers/pax/Makefile.common
index 18af5f723b8..3d68ec85c8e 100644
--- a/archivers/pax/Makefile.common
+++ b/archivers/pax/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2006/07/14 19:45:12 jlam Exp $
+# $NetBSD: Makefile.common,v 1.3 2006/07/14 20:11:10 jlam Exp $
 #
 # This Makefile fragment is included by:
 #
@@ -24,11 +24,5 @@ PKGDIR=			${.CURDIR}/../../archivers/pax
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(LIBNBCOMPAT_STYLE) && (${LIBNBCOMPAT_STYLE} == "inplace")
-.  include "../../pkgtools/libnbcompat/inplace.mk"
-.else
-.  include "../../pkgtools/libnbcompat/buildlink3.mk"
-.endif
-
 do-extract:
 	${CP} -R ${FILESDIR} ${WRKSRC}
diff --git a/pkgtools/mtree/Makefile b/pkgtools/mtree/Makefile
index bd5df09d2a7..2a9939ee02a 100644
--- a/pkgtools/mtree/Makefile
+++ b/pkgtools/mtree/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/07/14 19:54:47 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/07/14 20:11:10 jlam Exp $
 #
 # This version of mtree installs into ${PKG_TOOLS_BIN}.
 #
@@ -19,6 +19,7 @@ PKG_TOOLS_PREFIX=	${PKG_TOOLS_BIN:C|/[^/]?bin$||}
 PKGMANDIR=		share/man
 .endif
 
+.include "../../pkgtools/libnbcompat/inplace.mk"
 .include "../../mk/bsd.pkg.mk"
 
 PREFIX:=	${PKG_TOOLS_PREFIX}
diff --git a/pkgtools/mtree/Makefile.common b/pkgtools/mtree/Makefile.common
index 88c5f693abb..7248ac5362e 100644
--- a/pkgtools/mtree/Makefile.common
+++ b/pkgtools/mtree/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2006/07/14 19:54:47 jlam Exp $#
+# $NetBSD: Makefile.common,v 1.2 2006/07/14 20:11:10 jlam Exp $#
 #
 # This Makefile fragment is included by:
 #
@@ -24,11 +24,5 @@ PKGDIR=			${.CURDIR}/../../pkgtools/mtree
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(LIBNBCOMPAT_STYLE) && (${LIBNBCOMPAT_STYLE} == "inplace")
-.  include "../../pkgtools/libnbcompat/inplace.mk"
-.else
-.  include "../../pkgtools/libnbcompat/buildlink3.mk"
-.endif
-
 do-extract:
 	@${CP} -R ${FILESDIR} ${WRKSRC}
diff --git a/pkgtools/pax/Makefile b/pkgtools/pax/Makefile
index 22c77ff9e89..3d780b96921 100644
--- a/pkgtools/pax/Makefile
+++ b/pkgtools/pax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/07/14 19:45:12 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/07/14 20:11:10 jlam Exp $
 #
 # This version of pax installs into ${PKG_TOOLS_BIN}.
 #
@@ -19,6 +19,7 @@ PKG_TOOLS_PREFIX=	${PKG_TOOLS_BIN:C|/[^/]?bin$||}
 PKGMANDIR=		share/man
 .endif
 
+.include "../../pkgtools/libnbcompat/inplace.mk"
 .include "../../mk/bsd.pkg.mk"
 
 PREFIX:=	${PKG_TOOLS_PREFIX}
diff --git a/sysutils/mtree/Makefile b/sysutils/mtree/Makefile
index c6f48ef9ce1..beee5474e30 100644
--- a/sysutils/mtree/Makefile
+++ b/sysutils/mtree/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2006/07/14 19:54:47 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2006/07/14 20:11:10 jlam Exp $
 
 .include "../../pkgtools/mtree/Makefile.common"
 
 CATEGORIES=	sysutils
 
+.include "../../pkgtools/libnbcompat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"