diff options
| -rw-r--r-- | mk/apache.mk | 4 | ||||
| -rw-r--r-- | mk/bdb.buildlink3.mk | 6 | ||||
| -rw-r--r-- | mk/bsd.pkg.use.mk | 6 | ||||
| -rw-r--r-- | mk/compiler.mk | 6 | ||||
| -rw-r--r-- | mk/curses.buildlink3.mk | 4 | ||||
| -rw-r--r-- | mk/db1.builtin.mk | 4 | ||||
| -rw-r--r-- | mk/djbware.mk | 6 | ||||
| -rw-r--r-- | mk/dlopen.buildlink3.mk | 6 | ||||
| -rw-r--r-- | mk/fuse.buildlink3.mk | 4 |
9 files changed, 23 insertions, 23 deletions
diff --git a/mk/apache.mk b/mk/apache.mk index f8d18505f4b..4a7686704da 100644 --- a/mk/apache.mk +++ b/mk/apache.mk @@ -1,4 +1,4 @@ -# $NetBSD: apache.mk,v 1.23 2007/08/13 09:31:43 rillig Exp $ +# $NetBSD: apache.mk,v 1.24 2007/10/17 10:43:36 rillig Exp $ # # This file is meant to be included by packages that require an apache # web server. @@ -45,7 +45,7 @@ _USER_VARS.apache= PKG_APACHE_DEFAULT _PKG_VARS.apache= PKG_APACHE_ACCEPTED USE_APR _SYS_VARS.apache= PKG_APACHE APACHE_PKG_PREFIX -.include "../../mk/bsd.prefs.mk" +.include "bsd.fast.prefs.mk" PKG_APACHE_DEFAULT?= apache2 BUILD_DEFS+= PKG_APACHE_DEFAULT diff --git a/mk/bdb.buildlink3.mk b/mk/bdb.buildlink3.mk index aaf89d20576..6efd5a872f5 100644 --- a/mk/bdb.buildlink3.mk +++ b/mk/bdb.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bdb.buildlink3.mk,v 1.19 2007/01/14 15:00:54 rillig Exp $ +# $NetBSD: bdb.buildlink3.mk,v 1.20 2007/10/17 10:43:36 rillig Exp $ # # This Makefile fragment is meant to be included by packages that # require a Berkeley DB implementation. It abstracts finding the @@ -62,7 +62,7 @@ BDB_BUILDLINK3_MK:= ${BDB_BUILDLINK3_MK}+ -.include "../../mk/bsd.prefs.mk" +.include "bsd.fast.prefs.mk" .if !empty(BDB_BUILDLINK3_MK:M+) @@ -89,7 +89,7 @@ BDB_ACCEPTED?= ${_BDB_PKGS} # present, use it, and if not use DBD_DEFAULT. # CHECK_BUILTIN.db1:= yes -. include "../../mk/db1.builtin.mk" +. include "db1.builtin.mk" CHECK_BUILTIN.db1:= no . if defined(IS_BUILTIN.db1) && !empty(IS_BUILTIN.db1:M[yY][eE][sS]) BDB185_DEFAULT?= db1 diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index 17b18cbdc8e..5ad8c84a252 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.43 2007/07/02 14:54:09 joerg Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.44 2007/10/17 10:43:37 rillig Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -42,7 +42,7 @@ MAKE_FLAGS+= CC=${CC:Q} CXX=${CXX:Q} .endif .if defined(USE_X11BASE) && ${X11_TYPE} != "modular" -. include "../../mk/x11.buildlink3.mk" +. include "x11.buildlink3.mk" .endif .if ${PKG_INSTALLATION_TYPE} == "pkgviews" @@ -78,7 +78,7 @@ BUILD_DEFS+= KERBEROS USE_DIRS?= # empty .if !empty(USE_DIRS) && ${PKG_INSTALLATION_TYPE} == "overwrite" -. include "../../mk/dirs.mk" +. include "dirs.mk" .endif ### USE_LIBTOOL, PKG_[SH]LIBTOOL diff --git a/mk/compiler.mk b/mk/compiler.mk index d54ab396f34..16a7e53b051 100644 --- a/mk/compiler.mk +++ b/mk/compiler.mk @@ -1,4 +1,4 @@ -# $NetBSD: compiler.mk,v 1.63 2007/09/20 17:28:48 rillig Exp $ +# $NetBSD: compiler.mk,v 1.64 2007/10/17 10:43:37 rillig Exp $ # # This Makefile fragment implements handling for supported C/C++/Fortran # compilers. @@ -75,7 +75,7 @@ _USER_VARS.compiler= PKGSRC_COMPILER USE_PKGSRC_GCC ABI _PKG_VARS.compiler= USE_LANGUAGES GCC_REQD NOT_FOR_COMPILER ONLY_FOR_COMPILER _SYS_VARS.compiler= CC_VERSION -.include "../../mk/bsd.prefs.mk" +.include "bsd.fast.prefs.mk" # Since most packages need a C compiler, this is the default value. USE_LANGUAGES?= c @@ -135,7 +135,7 @@ _PKGSRC_COMPILER:= ${_COMPILER} ${_PKGSRC_COMPILER} _COMPILER_STRIP_VARS= # empty .for _compiler_ in ${_PKGSRC_COMPILER} -. include "../../mk/compiler/${_compiler_}.mk" +. include "compiler/${_compiler_}.mk" .endfor .undef _compiler_ diff --git a/mk/curses.buildlink3.mk b/mk/curses.buildlink3.mk index 9daa70acf30..effe14a80c6 100644 --- a/mk/curses.buildlink3.mk +++ b/mk/curses.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: curses.buildlink3.mk,v 1.3 2004/10/13 20:10:31 tv Exp $ +# $NetBSD: curses.buildlink3.mk,v 1.4 2007/10/17 10:43:37 rillig Exp $ # # This file should be included by Makefiles for packages that use curses. # If a system curses isn't available, then add a dependency on ncurses. @@ -13,7 +13,7 @@ # XXX this is ugly, but needed to get the BUILDLINK_TRANSFORM from builtin.mk; # on Interix, libncurses is static yet libcurses (also ncurses) is shared -. include "../../mk/bsd.prefs.mk" +. include "bsd.fast.prefs.mk" . if ${OPSYS} == "Interix" . include "../../devel/ncurses/buildlink3.mk" . endif diff --git a/mk/db1.builtin.mk b/mk/db1.builtin.mk index e077fd9633f..ec45d27efc9 100644 --- a/mk/db1.builtin.mk +++ b/mk/db1.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: db1.builtin.mk,v 1.17 2007/02/15 16:08:20 rillig Exp $ +# $NetBSD: db1.builtin.mk,v 1.18 2007/10/17 10:43:37 rillig Exp $ BUILTIN_PKG:= db1 @@ -11,7 +11,7 @@ BUILTIN_FIND_FILES.H_DB= /usr/include/db1/db.h /usr/include/db.h # BUILTIN_FIND_GREP.H_DB= ^\#define.*HASHVERSION.*2$$ -.include "../../mk/buildlink3/bsd.builtin.mk" +.include "buildlink3/bsd.builtin.mk" ### ### Determine if there is a built-in implementation of the package and diff --git a/mk/djbware.mk b/mk/djbware.mk index 4899457c8fd..239ffcfbaa7 100644 --- a/mk/djbware.mk +++ b/mk/djbware.mk @@ -1,4 +1,4 @@ -# $NetBSD: djbware.mk,v 1.19 2007/08/13 05:01:18 rillig Exp $ +# $NetBSD: djbware.mk,v 1.20 2007/10/17 10:43:37 rillig Exp $ # # Makefile fragment for packages with djb-style build machinery # @@ -84,7 +84,7 @@ do-build: PKG_SUPPORTED_OPTIONS+= djbware-errno-hack PKG_SUGGESTED_OPTIONS+= djbware-errno-hack -.include "../../mk/bsd.prefs.mk" +.include "bsd.fast.prefs.mk" .if exists(${PKGDIR}/options.mk) . include "${PKGDIR}/options.mk" @@ -92,7 +92,7 @@ PKG_SUGGESTED_OPTIONS+= djbware-errno-hack # Note: This expression is the same as ${PKGBASE}, but the latter is # not defined yet, so we cannot use it here. PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//} -.include "../../mk/bsd.options.mk" +.include "bsd.options.mk" .endif .if !empty(PKG_OPTIONS:Mdjbware-errno-hack) diff --git a/mk/dlopen.buildlink3.mk b/mk/dlopen.buildlink3.mk index 2874bceec2f..1c2542dd3d5 100644 --- a/mk/dlopen.buildlink3.mk +++ b/mk/dlopen.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: dlopen.buildlink3.mk,v 1.15 2007/06/04 08:10:32 rillig Exp $ +# $NetBSD: dlopen.buildlink3.mk,v 1.16 2007/10/17 10:43:38 rillig Exp $ # # This Makefile fragment is included by package Makefiles and # buildlink3.mk files for the packages that use dlopen(). @@ -19,11 +19,11 @@ DLOPEN_BUILDLINK3_MK:= ${DLOPEN_BUILDLINK3_MK}+ -.include "../../mk/bsd.prefs.mk" +.include "bsd.fast.prefs.mk" .if !empty(DLOPEN_BUILDLINK3_MK:M+) CHECK_BUILTIN.dl:= yes -.include "../../mk/dlopen.builtin.mk" +.include "dlopen.builtin.mk" CHECK_BUILTIN.dl:= no .endif # DLOPEN_BUILDLINK3_MK diff --git a/mk/fuse.buildlink3.mk b/mk/fuse.buildlink3.mk index b8396f5f29c..5aeef805370 100644 --- a/mk/fuse.buildlink3.mk +++ b/mk/fuse.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: fuse.buildlink3.mk,v 1.7 2007/03/06 00:03:40 xtraeme Exp $ +# $NetBSD: fuse.buildlink3.mk,v 1.8 2007/10/17 10:43:38 rillig Exp $ # # Makefile fragment for packages using the FUSE framework. # @@ -6,7 +6,7 @@ .if !defined(FUSE_BUILDLINK3_MK) FUSE_BUILDLINK3_MK= # defined -.include "../../mk/bsd.prefs.mk" +.include "bsd.fast.prefs.mk" . if ${OPSYS} == "Linux" |