CVS commit: pkgsrc/mk

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Jun 30 21:28:28 UTC 2019

Modified Files:
        pkgsrc/mk: oss.buildlink3.mk oss.builtin.mk pthread.buildlink3.mk
            pthread.builtin.mk

Log Message:
mk: use direct include paths

This saves a few system calls since the included files are searched first
in .PARSEDIR and only then in .CURDIR.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mk/oss.buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mk/oss.builtin.mk
cvs rdiff -u -r1.32 -r1.33 pkgsrc/mk/pthread.buildlink3.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mk/pthread.builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/oss.buildlink3.mk
diff -u pkgsrc/mk/oss.buildlink3.mk:1.12 pkgsrc/mk/oss.buildlink3.mk:1.13
--- pkgsrc/mk/oss.buildlink3.mk:1.12    Sun May 28 21:53:06 2017
+++ pkgsrc/mk/oss.buildlink3.mk Sun Jun 30 21:28:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: oss.buildlink3.mk,v 1.12 2017/05/28 21:53:06 maya Exp $
+# $NetBSD: oss.buildlink3.mk,v 1.13 2019/06/30 21:28:28 rillig Exp $
 #
 # This Makefile fragment is included by packages that require an Open Sound
 # System (OSS) implementation.  After inclusion of this file, the following
@@ -11,12 +11,12 @@
 #
 OSS_BUILDLINK3_MK:=    ${OSS_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "bsd.prefs.mk"
 
 .if !defined(_OSS_TYPE)
 _OSS_TYPE=             none
 CHECK_BUILTIN.oss:=    yes
-.  include "../../mk/oss.builtin.mk"
+.  include "oss.builtin.mk"
 CHECK_BUILTIN.oss:=    no
 .  if defined(IS_BUILTIN.oss) && !empty(IS_BUILTIN.oss:M[yY][eE][sS])
 _OSS_TYPE=             native

Index: pkgsrc/mk/oss.builtin.mk
diff -u pkgsrc/mk/oss.builtin.mk:1.5 pkgsrc/mk/oss.builtin.mk:1.6
--- pkgsrc/mk/oss.builtin.mk:1.5        Sun Sep 18 05:25:18 2016
+++ pkgsrc/mk/oss.builtin.mk    Sun Jun 30 21:28:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: oss.builtin.mk,v 1.5 2016/09/18 05:25:18 richard Exp $
+# $NetBSD: oss.builtin.mk,v 1.6 2019/06/30 21:28:28 rillig Exp $
 
 BUILTIN_PKG:=  oss
 
@@ -8,7 +8,7 @@ BUILTIN_FIND_HEADERS.H_SOUNDCARD=       soundc
                                        linux/soundcard.h       \
                                        sys/soundcard.h
 
-.include "../../mk/buildlink3/bsd.builtin.mk"
+.include "buildlink3/bsd.builtin.mk"
 
 ###
 ### Determine if there is a built-in implementation of the package and

Index: pkgsrc/mk/pthread.buildlink3.mk
diff -u pkgsrc/mk/pthread.buildlink3.mk:1.32 pkgsrc/mk/pthread.buildlink3.mk:1.33
--- pkgsrc/mk/pthread.buildlink3.mk:1.32        Mon Apr 11 04:22:34 2016
+++ pkgsrc/mk/pthread.buildlink3.mk     Sun Jun 30 21:28:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.buildlink3.mk,v 1.32 2016/04/11 04:22:34 dbj Exp $
+# $NetBSD: pthread.buildlink3.mk,v 1.33 2019/06/30 21:28:28 rillig Exp $
 #
 # The pthreads strategy for pkgsrc is to "bless" a particular pthread
 # package as the Official Pthread Replacement (OPR).  The following
@@ -79,12 +79,12 @@ _PKG_PTHREAD_BUILDLINK3_MK?=        ${_PKG_PTHR
 # can actually be used to replace a native pthreads.
 _PKG_PTHREAD_COMPAT_PATTERNS=  *-*-*
 
-.include "../../mk/bsd.fast.prefs.mk"
+.include "bsd.fast.prefs.mk"
 
 PTHREAD_OPTS?= # empty
 
 CHECK_BUILTIN.pthread:=  yes
-.include "../../mk/pthread.builtin.mk"
+.include "pthread.builtin.mk"
 CHECK_BUILTIN.pthread:=  no
 
 #

Index: pkgsrc/mk/pthread.builtin.mk
diff -u pkgsrc/mk/pthread.builtin.mk:1.15 pkgsrc/mk/pthread.builtin.mk:1.16
--- pkgsrc/mk/pthread.builtin.mk:1.15   Sat Nov 23 09:10:14 2013
+++ pkgsrc/mk/pthread.builtin.mk        Sun Jun 30 21:28:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.builtin.mk,v 1.15 2013/11/23 09:10:14 obache Exp $
+# $NetBSD: pthread.builtin.mk,v 1.16 2019/06/30 21:28:28 rillig Exp $
 
 BUILTIN_PKG:=  pthread
 
@@ -6,7 +6,7 @@ BUILTIN_FIND_LIBS:=             pthread c_r rt
 BUILTIN_FIND_HEADERS_VAR=      H_PTHREAD
 BUILTIN_FIND_HEADERS.H_PTHREAD=        pthread.h
 
-.include "../../mk/buildlink3/bsd.builtin.mk"
+.include "buildlink3/bsd.builtin.mk"
 
 ###
 ### Determine if there is a built-in implementation of the package and