[pkgsrc/trunk]: pkgsrc For the pkgtools versions of mtree and pax, always use...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8aabdccb9b63
branches:  trunk
changeset: 516132:8aabdccb9b63
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jul 14 20:11:10 2006 +0000

description:
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.

diffstat:

 archivers/pax/Makefile         |  3 ++-
 archivers/pax/Makefile.common  |  8 +-------
 pkgtools/mtree/Makefile        |  3 ++-
 pkgtools/mtree/Makefile.common |  8 +-------
 pkgtools/pax/Makefile          |  3 ++-
 sysutils/mtree/Makefile        |  3 ++-
 6 files changed, 10 insertions(+), 18 deletions(-)

diffs (102 lines):

diff -r a7896cf00cdd -r 8aabdccb9b63 archivers/pax/Makefile
--- a/archivers/pax/Makefile    Fri Jul 14 19:56:36 2006 +0000
+++ b/archivers/pax/Makefile    Fri Jul 14 20:11:10 2006 +0000
@@ -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 -r a7896cf00cdd -r 8aabdccb9b63 archivers/pax/Makefile.common
--- a/archivers/pax/Makefile.common     Fri Jul 14 19:56:36 2006 +0000
+++ b/archivers/pax/Makefile.common     Fri Jul 14 20:11:10 2006 +0000
@@ -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 @@
 
 .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 -r a7896cf00cdd -r 8aabdccb9b63 pkgtools/mtree/Makefile
--- a/pkgtools/mtree/Makefile   Fri Jul 14 19:56:36 2006 +0000
+++ b/pkgtools/mtree/Makefile   Fri Jul 14 20:11:10 2006 +0000
@@ -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 @@
 PKGMANDIR=             share/man
 .endif
 
+.include "../../pkgtools/libnbcompat/inplace.mk"
 .include "../../mk/bsd.pkg.mk"
 
 PREFIX:=       ${PKG_TOOLS_PREFIX}
diff -r a7896cf00cdd -r 8aabdccb9b63 pkgtools/mtree/Makefile.common
--- a/pkgtools/mtree/Makefile.common    Fri Jul 14 19:56:36 2006 +0000
+++ b/pkgtools/mtree/Makefile.common    Fri Jul 14 20:11:10 2006 +0000
@@ -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 @@
 
 .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 -r a7896cf00cdd -r 8aabdccb9b63 pkgtools/pax/Makefile
--- a/pkgtools/pax/Makefile     Fri Jul 14 19:56:36 2006 +0000
+++ b/pkgtools/pax/Makefile     Fri Jul 14 20:11:10 2006 +0000
@@ -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 @@
 PKGMANDIR=             share/man
 .endif
 
+.include "../../pkgtools/libnbcompat/inplace.mk"
 .include "../../mk/bsd.pkg.mk"
 
 PREFIX:=       ${PKG_TOOLS_PREFIX}
diff -r a7896cf00cdd -r 8aabdccb9b63 sysutils/mtree/Makefile
--- a/sysutils/mtree/Makefile   Fri Jul 14 19:56:36 2006 +0000
+++ b/sysutils/mtree/Makefile   Fri Jul 14 20:11:10 2006 +0000
@@ -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"