summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/bsd.prefs.mk12
-rw-r--r--mk/build/bsd.build.mk6
-rw-r--r--mk/checksum/bsd.checksum.mk4
-rw-r--r--mk/configure/bsd.configure.mk4
-rw-r--r--mk/configure/configure.mk18
-rw-r--r--mk/depends/bsd.depends.mk4
-rw-r--r--mk/flavor/bsd.flavor-vars.mk4
-rw-r--r--mk/install/bsd.install.mk4
-rw-r--r--mk/package/bsd.package.mk4
-rw-r--r--mk/patch/bsd.patch.mk4
-rw-r--r--mk/tools/bsd.tools.mk36
-rw-r--r--mk/tools/replace.mk4
12 files changed, 52 insertions, 52 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 97be2d825c7..ffdce034438 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.273 2007/10/17 10:37:43 rillig Exp $
+# $NetBSD: bsd.prefs.mk,v 1.274 2008/01/04 01:46:24 rillig Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@@ -616,21 +616,21 @@ PREPEND_PATH+= ${X11BASE}/bin
PREPEND_PATH+= ${LOCALBASE}/bin
# Wrapper framework definitions
-.include "${PKGSRCDIR}/mk/wrapper/wrapper-defs.mk"
+.include "wrapper/wrapper-defs.mk"
# Binary emulator framework definitions
.if defined(EMUL_PLATFORMS) && !empty(EMUL_PLATFORMS)
-. include "${PKGSRCDIR}/mk/emulator/emulator-vars.mk"
+. include "emulator/emulator-vars.mk"
.endif
# System features framework
-.include "${PKGSRCDIR}/mk/features/features-vars.mk"
+.include "features/features-vars.mk"
# Package system flavor definitions
-.include "${PKGSRCDIR}/mk/flavor/bsd.flavor-vars.mk"
+.include "flavor/bsd.flavor-vars.mk"
# Make variable definitions cache
-.include "${PKGSRCDIR}/mk/bsd.makevars.mk"
+.include "bsd.makevars.mk"
# If MAKECONF is defined, then pass it down to all recursive make
# processes invoked by pkgsrc.
diff --git a/mk/build/bsd.build.mk b/mk/build/bsd.build.mk
index 6e3d2ccc97f..c45c4689844 100644
--- a/mk/build/bsd.build.mk
+++ b/mk/build/bsd.build.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.build.mk,v 1.9 2007/02/06 20:48:07 rillig Exp $
+# $NetBSD: bsd.build.mk,v 1.10 2008/01/04 01:46:26 rillig Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to building sources for a package.
@@ -30,7 +30,7 @@ _COOKIE.test= ${WRKDIR}/.test_done
###
.PHONY: build
.if !defined(NO_BUILD)
-. include "${PKGSRCDIR}/mk/build/build.mk"
+. include "build.mk"
.elif !target(build)
. if exists(${_COOKIE.build})
build:
@@ -42,7 +42,7 @@ build: barrier
. endif
.endif
-.include "${PKGSRCDIR}/mk/build/test.mk"
+.include "test.mk"
######################################################################
### build-cookie (PRIVATE)
diff --git a/mk/checksum/bsd.checksum.mk b/mk/checksum/bsd.checksum.mk
index 3bb22223fb1..a3e5e718d3a 100644
--- a/mk/checksum/bsd.checksum.mk
+++ b/mk/checksum/bsd.checksum.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.checksum.mk,v 1.7 2007/08/31 16:30:11 jlam Exp $
+# $NetBSD: bsd.checksum.mk,v 1.8 2008/01/04 01:46:26 rillig Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and defines the
# relevant variables and targets for the "checksum" phase.
@@ -47,5 +47,5 @@ mps: makepatchsum
checksum checksum-phase makesum makepatchsum mps mdi makedistinfo distinfo:
@${DO_NADA}
.else
-. include "${PKGSRCDIR}/mk/checksum/checksum.mk"
+. include "checksum.mk"
.endif
diff --git a/mk/configure/bsd.configure.mk b/mk/configure/bsd.configure.mk
index 0a6f6604dbc..0f34cd38f87 100644
--- a/mk/configure/bsd.configure.mk
+++ b/mk/configure/bsd.configure.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.configure.mk,v 1.10 2007/03/07 01:27:28 rillig Exp $
+# $NetBSD: bsd.configure.mk,v 1.11 2008/01/04 01:46:26 rillig Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to configuring packages for building.
@@ -21,7 +21,7 @@ _COOKIE.configure= ${WRKDIR}/.configure_done
###
.PHONY: configure
.if !defined(NO_CONFIGURE)
-. include "${PKGSRCDIR}/mk/configure/configure.mk"
+. include "configure.mk"
.elif !target(configure)
. if exists(${_COOKIE.configure})
configure:
diff --git a/mk/configure/configure.mk b/mk/configure/configure.mk
index 67d3b442ee1..71115545107 100644
--- a/mk/configure/configure.mk
+++ b/mk/configure/configure.mk
@@ -1,4 +1,4 @@
-# $NetBSD: configure.mk,v 1.21 2007/12/12 01:00:40 markd Exp $
+# $NetBSD: configure.mk,v 1.22 2008/01/04 01:46:26 rillig Exp $
#
# = Package-settable variables =
#
@@ -61,26 +61,26 @@ CMAKE_ARG_PATH?= .
_BUILD_DEFS+= CONFIGURE_ENV CONFIGURE_ARGS CMAKE_ARGS
.if defined(GNU_CONFIGURE)
-. include "${PKGSRCDIR}/mk/configure/gnu-configure.mk"
+. include "gnu-configure.mk"
.endif
.if defined(OVERRIDE_GNU_CONFIG_SCRIPTS)
-. include "${PKGSRCDIR}/mk/configure/config-override.mk"
+. include "config-override.mk"
.endif
.if defined(INSTALL_SH_OVERRIDE) && empty(INSTALL_SH_OVERRIDE:M[Nn][Oo])
-. include "${PKGSRCDIR}/mk/configure/install-sh-override.mk"
+. include "install-sh-override.mk"
.endif
.if defined(USE_LIBTOOL)
-. include "${PKGSRCDIR}/mk/configure/libtool-override.mk"
+. include "libtool-override.mk"
.endif
.if defined(PKGCONFIG_OVERRIDE)
-. include "${PKGSRCDIR}/mk/configure/pkg-config-override.mk"
+. include "pkg-config-override.mk"
.endif
-.include "${PKGSRCDIR}/mk/configure/replace-interpreter.mk"
+.include "replace-interpreter.mk"
.if defined(USE_PKGLOCALEDIR)
-. include "${PKGSRCDIR}/mk/configure/replace-localedir.mk"
+. include "replace-localedir.mk"
.endif
.if defined(USE_CMAKE)
-. include "${PKGSRCDIR}/mk/configure/cmake.mk"
+. include "cmake.mk"
.endif
######################################################################
diff --git a/mk/depends/bsd.depends.mk b/mk/depends/bsd.depends.mk
index e481e74b976..b08eaa376e1 100644
--- a/mk/depends/bsd.depends.mk
+++ b/mk/depends/bsd.depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.depends.mk,v 1.14 2007/05/22 16:17:15 joerg Exp $
+# $NetBSD: bsd.depends.mk,v 1.15 2008/01/04 01:46:27 rillig Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to dependencies.
@@ -45,7 +45,7 @@ DEPENDS_TARGET= reinstall
###
.PHONY: depends
.if ${SKIP_DEPENDS:M[Nn][Oo]} != ""
-. include "${PKGSRCDIR}/mk/depends/depends.mk"
+. include "depends.mk"
.elif !target(depends)
. if exists(${_COOKIE.depends})
depends:
diff --git a/mk/flavor/bsd.flavor-vars.mk b/mk/flavor/bsd.flavor-vars.mk
index 9e0cf2eb8cb..890ed4702e8 100644
--- a/mk/flavor/bsd.flavor-vars.mk
+++ b/mk/flavor/bsd.flavor-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.flavor-vars.mk,v 1.1 2006/06/03 23:11:42 jlam Exp $
+# $NetBSD: bsd.flavor-vars.mk,v 1.2 2008/01/04 01:46:27 rillig Exp $
#
# This Makefile fragment is included by bsd.prefs.mk and defines some
# variables which must be defined earlier than where bsd.flavor.mk
@@ -8,4 +8,4 @@
# Default to the pkgsrc-package flavor.
PKG_FLAVOR?= pkg
-.sinclude "${PKGSRCDIR}/mk/flavor/${PKG_FLAVOR}/flavor-vars.mk"
+.sinclude "${PKG_FLAVOR}/flavor-vars.mk"
diff --git a/mk/install/bsd.install.mk b/mk/install/bsd.install.mk
index abe95ce90b6..7c92902d76d 100644
--- a/mk/install/bsd.install.mk
+++ b/mk/install/bsd.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.install.mk,v 1.11 2007/11/03 09:12:46 rillig Exp $
+# $NetBSD: bsd.install.mk,v 1.12 2008/01/04 01:46:27 rillig Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to installing packages.
@@ -21,7 +21,7 @@ _COOKIE.install= ${WRKDIR}/.install_done
###
.PHONY: install
.if !defined(NO_INSTALL)
-. include "${PKGSRCDIR}/mk/install/install.mk"
+. include "install.mk"
.elif !target(install)
. if exists(${_COOKIE.install})
install:
diff --git a/mk/package/bsd.package.mk b/mk/package/bsd.package.mk
index 4cf693056ca..8cf93f1e49b 100644
--- a/mk/package/bsd.package.mk
+++ b/mk/package/bsd.package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.package.mk,v 1.9 2006/10/09 11:44:07 joerg Exp $
+# $NetBSD: bsd.package.mk,v 1.10 2008/01/04 01:46:27 rillig Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to binary packages.
@@ -16,7 +16,7 @@ _COOKIE.package= ${WRKDIR}/.package_done
###
.PHONY: package
.if !defined(NO_PACKAGE)
-. include "${PKGSRCDIR}/mk/package/package.mk"
+. include "package.mk"
.elif !target(package)
. if exists(${_COOKIE.package})
package:
diff --git a/mk/patch/bsd.patch.mk b/mk/patch/bsd.patch.mk
index ee47e320363..509623f52f2 100644
--- a/mk/patch/bsd.patch.mk
+++ b/mk/patch/bsd.patch.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.patch.mk,v 1.1 2006/06/06 04:48:19 jlam Exp $
+# $NetBSD: bsd.patch.mk,v 1.2 2008/01/04 01:46:27 rillig Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and defines the
# relevant variables and targets for the "patch" phase.
@@ -12,4 +12,4 @@
# pre-patch, do-patch, post-patch
#
-.include "${PKGSRCDIR}/mk/patch/patch.mk"
+.include "patch.mk"
diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk
index 0891bae49e9..eaae98cd9e9 100644
--- a/mk/tools/bsd.tools.mk
+++ b/mk/tools/bsd.tools.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.48 2007/12/18 10:18:40 markd Exp $
+# $NetBSD: bsd.tools.mk,v 1.49 2008/01/04 01:46:27 rillig Exp $
#
# Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -146,23 +146,23 @@ post-tools:
@${DO_NADA}
.endif
-.include "${PKGSRCDIR}/mk/tools/digest.mk"
-.include "${PKGSRCDIR}/mk/tools/automake.mk"
-.include "${PKGSRCDIR}/mk/tools/autoconf.mk"
-.include "${PKGSRCDIR}/mk/tools/texinfo.mk"
-.include "${PKGSRCDIR}/mk/tools/gettext.mk"
-.include "${PKGSRCDIR}/mk/tools/intltool.mk"
-.include "${PKGSRCDIR}/mk/tools/ldconfig.mk"
-.include "${PKGSRCDIR}/mk/tools/rpcgen.mk"
-.include "${PKGSRCDIR}/mk/tools/strip.mk"
-.include "${PKGSRCDIR}/mk/tools/cmake.mk"
-.include "${PKGSRCDIR}/mk/tools/imake.mk"
-.include "${PKGSRCDIR}/mk/tools/replace.mk"
-.include "${PKGSRCDIR}/mk/tools/perl.mk"
-.include "${PKGSRCDIR}/mk/tools/pkg-config.mk"
-.include "${PKGSRCDIR}/mk/tools/make.mk"
-
-.include "${PKGSRCDIR}/mk/tools/create.mk"
+.include "digest.mk"
+.include "automake.mk"
+.include "autoconf.mk"
+.include "texinfo.mk"
+.include "gettext.mk"
+.include "intltool.mk"
+.include "ldconfig.mk"
+.include "rpcgen.mk"
+.include "strip.mk"
+.include "cmake.mk"
+.include "imake.mk"
+.include "replace.mk"
+.include "perl.mk"
+.include "pkg-config.mk"
+.include "make.mk"
+
+.include "create.mk"
_VARGROUPS+= tools
_USER_VARS.tools= TOOLS_SHELL
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index f4f9e15a55e..ef150704416 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.203 2007/12/18 10:18:49 markd Exp $
+# $NetBSD: replace.mk,v 1.204 2008/01/04 01:46:27 rillig Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1182,7 +1182,7 @@ TOOLS_PATH.xmkmf= ${TOOLS_PREFIX.xpkgwedge}/bin/pkgxmkmf
# Compute the locations of the pkgsrc-supplied tools.
FIND_PREFIX:= ${TOOLS_FIND_PREFIX}
-.include "${PKGSRCDIR}/mk/find-prefix.mk"
+.include "../find-prefix.mk"
######################################################################
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 15:40:14 +0000