pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc If LIBNBCOMPAT_STYLE is set to "inplace", then build a...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e1cb63434d25
branches:  trunk
changeset: 479415:e1cb63434d25
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Aug 14 02:33:32 2004 +0000

description:
If LIBNBCOMPAT_STYLE is set to "inplace", then build and use a local
version of libnbcompat instead of requiring libnbcompat to be installed.
This simplifies testing of bootstrap packages without root privileges
on a system that has already been bootstrapped.

diffstat:

 archivers/pax/Makefile  |  11 +++++++++--
 pkgtools/mtree/Makefile |  11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diffs (54 lines):

diff -r 95375bb8d757 -r e1cb63434d25 archivers/pax/Makefile
--- a/archivers/pax/Makefile    Sat Aug 14 01:34:50 2004 +0000
+++ b/archivers/pax/Makefile    Sat Aug 14 02:33:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/07/03 02:50:32 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/08/14 02:33:32 jlam Exp $
 #
 
 DISTNAME=              pax-20040703
@@ -20,8 +20,15 @@
 NO_PACKAGE=             Deinstallation is not permitted
 PKG_PRESERVE=           # defined
 
+.include "../../mk/bsd.prefs.mk"
+
 do-extract:
        @${CP} -Rp ${FILESDIR} ${WRKSRC}
 
-.include "../../pkgtools/libnbcompat/buildlink3.mk"
+.if defined(LIBNBCOMPAT_STYLE) && (${LIBNBCOMPAT_STYLE} == "inplace")
+.  include "../../pkgtools/libnbcompat/inplace.mk"
+.else
+.  include "../../pkgtools/libnbcompat/buildlink3.mk"
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff -r 95375bb8d757 -r e1cb63434d25 pkgtools/mtree/Makefile
--- a/pkgtools/mtree/Makefile   Sat Aug 14 01:34:50 2004 +0000
+++ b/pkgtools/mtree/Makefile   Sat Aug 14 02:33:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/04/11 02:01:55 snj Exp $
+# $NetBSD: Makefile,v 1.11 2004/08/14 02:33:32 jlam Exp $
 #
 
 DISTNAME=              mtree-20031220
@@ -20,10 +20,17 @@
 NO_PACKAGE=             Deinstallation is not permitted
 PKG_PRESERVE=           # defined
 
+.include "../../mk/bsd.prefs.mk"
+
 do-extract:
        @${CP} -Rp ${FILESDIR} ${WRKSRC}
 
-.include "../../pkgtools/libnbcompat/buildlink3.mk"
+.if defined(LIBNBCOMPAT_STYLE) && (${LIBNBCOMPAT_STYLE} == "inplace")  
+.  include "../../pkgtools/libnbcompat/inplace.mk"
+.else
+.  include "../../pkgtools/libnbcompat/buildlink3.mk"
+.endif
+
 .include "../../mk/bsd.pkg.mk"
 
 PREFIX:=               ${PKG_TOOLS_BIN:C|/[^/]?bin$||}



Home | Main Index | Thread Index | Old Index