MFC r312452-r312512:

r312452-r312512: - Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones This simplifies pathing in make/displayed output - Use .CURDIR:H instead of .CURDIR to simplify pathing in output, etc
2017-02-10 07:32:40 +00:00 · 2017-02-10 07:32:40 +00:00 · 83c41faaa1
commit 83c41faaa1
parent 34968bca5e
84 changed files with 158 additions and 158 deletions
--- a/lib/csu/aarch64/Makefile
+++ b/lib/csu/aarch64/Makefile
@ -1,12 +1,12 @@
 # $FreeBSD$

-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common

 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR}/../common \
-		-I${.CURDIR}/../../libc/include
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/lib/libc/include

 FILES=		${OBJS}
 FILESMODE=	${LIBMODE}
--- a/lib/csu/amd64/Makefile
+++ b/lib/csu/amd64/Makefile
@ -1,12 +1,12 @@
 # $FreeBSD$

-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common

 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR}/../common \
-		-I${.CURDIR}/../../libc/include
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/lib/libc/include
 CFLAGS+=	-fno-omit-frame-pointer

 FILES=		${OBJS}
--- a/lib/csu/arm/Makefile
+++ b/lib/csu/arm/Makefile
@ -1,12 +1,12 @@
 # $FreeBSD$

-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common

 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR}/../common \
-		-I${.CURDIR}/../../libc/include
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/lib/libc/include
 STATIC_CFLAGS+=	-mlong-calls

 FILES=		${OBJS}
--- a/lib/csu/i386/Makefile
+++ b/lib/csu/i386/Makefile
@ -1,12 +1,12 @@
 # $FreeBSD$

-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common

 SRCS=		crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		gcrt1.o crt1.o Scrt1.o
-CFLAGS+=	-I${.CURDIR}/../common \
-		-I${.CURDIR}/../../libc/include
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/lib/libc/include

 FILES=		${OBJS}
 FILESMODE=	${LIBMODE}
--- a/lib/csu/mips/Makefile
+++ b/lib/csu/mips/Makefile
@ -1,12 +1,12 @@
 # $FreeBSD$

-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common

 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR}/../common \
-		-I${.CURDIR}/../../libc/include
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/lib/libc/include

 FILES=		${OBJS}
 FILESMODE=	${LIBMODE}
--- a/lib/csu/powerpc/Makefile
+++ b/lib/csu/powerpc/Makefile
@ -1,12 +1,12 @@
 # $FreeBSD$

-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common

 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR}/../common \
-		-I${.CURDIR}/../../libc/include
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/lib/libc/include

 FILES=		${OBJS}
 FILESMODE=	${LIBMODE}
--- a/lib/csu/powerpc64/Makefile
+++ b/lib/csu/powerpc64/Makefile
@ -1,12 +1,12 @@
 # $FreeBSD$

-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common

 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR}/../common \
-		-I${.CURDIR}/../../libc/include \
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/lib/libc/include \
 		-mlongcall

 # XXX: See the log for r232932 as to why the above -mlongcall is needed.  Since
--- a/lib/csu/riscv/Makefile
+++ b/lib/csu/riscv/Makefile
@ -1,12 +1,12 @@
 # $FreeBSD$

-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common

 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR}/../common \
-		-I${.CURDIR}/../../libc/include
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/lib/libc/include

 FILES=		${OBJS}
 FILESMODE=	${LIBMODE}
--- a/lib/csu/sparc64/Makefile
+++ b/lib/csu/sparc64/Makefile
@ -1,11 +1,12 @@
 # $FreeBSD$

-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common

 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR}/../common -I${.CURDIR}/../../libc/include
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/lib/libc/include

 FILES=		${OBJS}
 FILESMODE=	${LIBMODE}
--- a/lib/libalias/libalias/Makefile
+++ b/lib/libalias/libalias/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-.PATH: ${.CURDIR}/../../../sys/netinet/libalias
+.PATH: ${SRCTOP}/sys/netinet/libalias

 PACKAGE=lib${LIB}
 LIB=	alias
--- a/lib/libalias/modules/Makefile
+++ b/lib/libalias/modules/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-.include "${.CURDIR}/../../../sys/modules/libalias/modules/modules.inc"
+.include "${SRCTOP}/sys/modules/libalias/modules/modules.inc"

 SUBDIR=	${MODULES}

--- a/lib/libalias/modules/Makefile.inc
+++ b/lib/libalias/modules/Makefile.inc
@ -1,6 +1,6 @@
 # $FreeBSD$

-.PATH: ${.CURDIR}/../../../../sys/netinet/libalias
+.PATH: ${SRCTOP}/sys/netinet/libalias

 SHLIBDIR?= /lib
 LIB?=   alias_${NAME}
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@ -2,7 +2,7 @@
 .include <src.opts.mk>

 PACKAGE=lib${LIB}
-_LIBARCHIVEDIR=	${.CURDIR}/../../contrib/libarchive
+_LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive

 LIB=	archive

--- a/lib/libauditd/Makefile
+++ b/lib/libauditd/Makefile
@ -3,7 +3,7 @@
 #

 PACKAGE=lib${LIB}
-OPENBSMDIR=		${.CURDIR}/../../contrib/openbsm
+OPENBSMDIR=		${SRCTOP}/contrib/openbsm
 _LIBAUDITDDIR=		${OPENBSMDIR}/libauditd
 _LIBBSMDIR=		${OPENBSMDIR}/libbsm

--- a/lib/libbegemot/Makefile
+++ b/lib/libbegemot/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/libbegemot
+LIBBEGEMOT_DIR=${SRCTOP}/contrib/libbegemot

 PACKAGE=lib${LIB}
 .PATH: ${LIBBEGEMOT_DIR}
--- a/lib/libblocksruntime/Makefile
+++ b/lib/libblocksruntime/Makefile
@ -6,7 +6,7 @@ SHLIB_MAJOR=0
 CFLAGS+=-I${.CURDIR}
 WARNS?=	2

-.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/BlocksRuntime
+.PATH: ${SRCTOP}/contrib/compiler-rt/lib/BlocksRuntime

 INCS=	Block.h Block_private.h
 SRCS=	data.c runtime.c
--- a/lib/libbluetooth/Makefile
+++ b/lib/libbluetooth/Makefile
@ -6,7 +6,7 @@ LIB=		bluetooth
 MAN=		bluetooth.3

 WARNS?=		2
-CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/../../sys
+CFLAGS+=	-I${.CURDIR} -I${SRCTOP}/sys

 SHLIB_MAJOR=	4

--- a/lib/libbsm/Makefile
+++ b/lib/libbsm/Makefile
@ -3,7 +3,7 @@
 #

 PACKAGE=	lib${LIB}
-OPENBSMDIR=		${.CURDIR}/../../contrib/openbsm
+OPENBSMDIR=		${SRCTOP}/contrib/openbsm
 _LIBBSMDIR=		${OPENBSMDIR}/libbsm

 LIB=		bsm
--- a/lib/libbsnmp/libbsnmp/Makefile
+++ b/lib/libbsnmp/libbsnmp/Makefile
@ -4,7 +4,7 @@

 .include <src.opts.mk>

-CONTRIB= ${.CURDIR}/../../../contrib/bsnmp/lib
+CONTRIB= ${SRCTOP}/contrib/bsnmp/lib
 .PATH: ${CONTRIB}

 LIB=	bsnmp
--- a/lib/libbz2/Makefile
+++ b/lib/libbz2/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PACKAGE=	lib${LIB}
-BZ2DIR=	${.CURDIR}/../../contrib/bzip2
+BZ2DIR=	${SRCTOP}/contrib/bzip2
 .PATH: ${BZ2DIR}

 LIB=		bz2
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@ -3,9 +3,9 @@
 .include <src.opts.mk>

 PACKAGE=	clibs
-_LIBCXXRTDIR=	${.CURDIR}/../../contrib/libcxxrt
-HDRDIR=		${.CURDIR}/../../contrib/libc++/include
-SRCDIR=		${.CURDIR}/../../contrib/libc++/src
+_LIBCXXRTDIR=	${SRCTOP}/contrib/libcxxrt
+HDRDIR=		${SRCTOP}/contrib/libc++/include
+SRCDIR=		${SRCTOP}/contrib/libc++/src
 CXXINCLUDEDIR=	${INCLUDEDIR}/c++/v${SHLIB_MAJOR}
 .if ${MACHINE_CPUARCH} == "arm"
 STATIC_CXXFLAGS+= -mlong-calls
--- a/lib/libc_nonshared/Makefile
+++ b/lib/libc_nonshared/Makefile
@ -6,7 +6,7 @@
 # bsd.lib.mk doesn't have an easy way to express that.
 MK_PROFILE?=no
 .include <src.opts.mk>
-NO_PIC=	
+NO_PIC=
 # -fpic on some platforms, -fPIC on others.
 CFLAGS+=${PICFLAG} -DPIC -fvisibility=hidden

@ -18,9 +18,9 @@ LIBC_NONSHARED_SRCS=
 SRCS=	__stub.c

 .if ${MK_ICONV} == "yes"
-.PATH: ${.CURDIR}/../libc/iconv
+.PATH: ${SRCTOP}/lib/libc/iconv
 .include "Makefile.iconv"
-CFLAGS+=-I${.CURDIR}/../libc/iconv
+CFLAGS+=-I${SRCTOP}/lib/libc/iconv
 .endif

 SRCS+=	${LIBC_NONSHARED_SRCS}
--- a/lib/libcam/Makefile
+++ b/lib/libcam/Makefile
@ -36,11 +36,10 @@ MLINKS+=	cam.3 cam_open_device.3 \
 		cam_cdbparse.3 csio_encode_visit.3 \
 		cam_cdbparse.3 buff_encode_visit.3

-.PATH:		${.CURDIR}/../../sys/cam/scsi ${.CURDIR}/../../sys/cam/ata \
-		${.CURDIR}/../../sys/cam
+.PATH:		${SRCTOP}/sys/cam/scsi ${SRCTOP}/sys/cam/ata \
+		${SRCTOP}/sys/cam

-SDIR=		${.CURDIR}/../../sys
-CFLAGS+=	-I${.CURDIR} -I${SDIR}
+CFLAGS+=	-I${.CURDIR} -I${SRCTOP}/sys

 SHLIB_MAJOR=	7

--- a/lib/libcom_err/Makefile
+++ b/lib/libcom_err/Makefile
@ -5,7 +5,7 @@ LIB=	com_err
 SRCS=	com_err.c error.c
 INCS=	${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h
 MAN=	com_err.3
-COM_ERRDIR=	${.CURDIR}/../../contrib/com_err
+COM_ERRDIR=	${SRCTOP}/contrib/com_err
 CFLAGS+=	-I${COM_ERRDIR}

 LDFLAGS=	-Wl,--no-undefined
--- a/lib/libcompat/Makefile
+++ b/lib/libcompat/Makefile
@ -3,7 +3,7 @@

 PACKAGE=lib${LIB}
 LIB=	compat
-CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${.CURDIR}/../libc/locale
+CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${SRCTOP}/lib/libc/locale
 NO_PIC=

 WARNS?=	0
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@ -10,7 +10,7 @@ SHLIBDIR?=	/lib
 SHLIB_MAJOR=	5
 LIB=		crypt

-.PATH:		${.CURDIR}/../libmd ${.CURDIR}/../../sys/crypto/sha2
+.PATH:		${SRCTOP}/lib/libmd ${SRCTOP}/sys/crypto/sha2
 SRCS=		crypt.c misc.c \
 		crypt-md5.c md5c.c \
 		crypt-nthash.c md4c.c \
@ -18,12 +18,12 @@ SRCS=		crypt.c misc.c \
 		crypt-sha512.c sha512c.c
 MAN=		crypt.3
 MLINKS=		crypt.3 crypt_get_format.3 crypt.3 crypt_set_format.3
-CFLAGS+=	-I${.CURDIR}/../libmd -I${.CURDIR}/../libutil \
-		-I${.CURDIR}/../../sys/crypto/sha2
+CFLAGS+=	-I${SRCTOP}/lib/libmd -I${SRCTOP}/lib/libutil \
+		-I${SRCTOP}/sys/crypto/sha2

 # Pull in the strong crypto, if it is present.
-.if exists(${.CURDIR}/../../secure/lib/libcrypt) && ${MK_CRYPT} != "no"
-.PATH:		${.CURDIR}/../../secure/lib/libcrypt
+.if exists(${SRCTOP}/secure/lib/libcrypt) && ${MK_CRYPT} != "no"
+.PATH:		${SRCTOP}/secure/lib/libcrypt
 SRCS+=		crypt-des.c crypt-blowfish.c blowfish.c
 CFLAGS+=	-I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH
 .endif
--- a/lib/libcxxrt/Makefile
+++ b/lib/libcxxrt/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PACKAGE=	clibs
-SRCDIR=		${.CURDIR}/../../contrib/libcxxrt
+SRCDIR=		${SRCTOP}/contrib/libcxxrt

 SHLIB_MAJOR=	1
 SHLIBDIR?=	/lib
--- a/lib/libdevdctl/tests/Makefile
+++ b/lib/libdevdctl/tests/Makefile
@ -2,7 +2,7 @@

 TESTSDIR= ${TESTSBASE}/lib/libdevdctl

-.PATH:	${.CURDIR}/..
+.PATH:	${.CURDIR:H}

 PLAIN_TESTS_CXX= libdevdctl_unittest

--- a/lib/libdwarf/Makefile
+++ b/lib/libdwarf/Makefile
@ -94,7 +94,7 @@ CLEANFILES=	${GENSRCS}
 CLEANDIRS=	sys
 CFLAGS+=	-I. -I${SRCDIR} -I${ELFTCDIR}/common -I${ELFTCDIR}/libelf

-sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET} .NOMETA
+sys/elf32.h sys/elf64.h sys/elf_common.h: ${SRCTOP}/sys/${.TARGET} .NOMETA
 	mkdir -p ${.OBJDIR}/sys
 	ln -sf ${.ALLSRC} ${.TARGET}

--- a/lib/libelf/Makefile
+++ b/lib/libelf/Makefile
@ -82,7 +82,7 @@ CLEANFILES=	${GENSRCS}
 CLEANDIRS=	sys
 CFLAGS+=	-I. -I${SRCDIR} -I${ELFTCDIR}/common

-sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET} .NOMETA
+sys/elf32.h sys/elf64.h sys/elf_common.h: ${SRCTOP}/sys/${.TARGET} .NOMETA
 	mkdir -p ${.OBJDIR}/sys
 	ln -sf ${.ALLSRC} ${.TARGET}

--- a/lib/libevent/Makefile
+++ b/lib/libevent/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PACKAGE=lib${LIB}
-.PATH:	${.CURDIR}/../../contrib/pf/libevent
+.PATH:	${SRCTOP}/contrib/pf/libevent

 .include <src.opts.mk>

--- a/lib/libexecinfo/Makefile
+++ b/lib/libexecinfo/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PACKAGE=lib${LIB}
-LIBEXECINFO=	${.CURDIR}/../../contrib/libexecinfo
+LIBEXECINFO=	${SRCTOP}/contrib/libexecinfo

 LIB=		execinfo
 SHLIB_MAJOR=	1
--- a/lib/libexpat/Makefile
+++ b/lib/libexpat/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PACKAGE=lib${LIB}
-EXPAT=		${.CURDIR}/../../contrib/expat
+EXPAT=		${SRCTOP}/contrib/expat

 LIB=		bsdxml
 SHLIBDIR?=	/lib
--- a/lib/libgssapi/Makefile
+++ b/lib/libgssapi/Makefile
@ -3,7 +3,7 @@
 PACKAGE=lib${LIB}
 LIB=		gssapi
 SHLIB_MAJOR=	10
-VERSION_DEF=	${.CURDIR}/../libc/Versions.def
+VERSION_DEF=	${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map

 SRCS=
--- a/lib/libiconv_modules/Makefile.inc
+++ b/lib/libiconv_modules/Makefile.inc
@ -1,10 +1,10 @@
 # $FreeBSD$

-.PATH: ${.CURDIR}/../../libc/iconv
+.PATH: ${SRCTOP}/lib/libc/iconv

 SHLIB_MAJOR= 4
 WARNS?=	6
-CFLAGS+= -I${.CURDIR}/../../libc/iconv
+CFLAGS+= -I${SRCTOP}/lib/libc/iconv

 CFLAGS+=	-Dbool=_Bool

--- a/lib/libiconv_modules/mapper_parallel/Makefile
+++ b/lib/libiconv_modules/mapper_parallel/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-.PATH: ${.CURDIR}/../mapper_serial
+.PATH: ${.CURDIR:H}/mapper_serial

 SHLIB=	mapper_parallel
 SRCS+=	citrus_mapper_serial.c
--- a/lib/libkiconv/Makefile
+++ b/lib/libkiconv/Makefile
@ -17,7 +17,7 @@ MLINKS+=	kiconv.3 kiconv_add_xlat16_cspair.3 \
 		kiconv.3 kiconv_add_xlat16_cspairs.3 \
 		kiconv.3 kiconv_add_xlat16_table.3

-CFLAGS+=	-I${.CURDIR}/../../sys
+CFLAGS+=	-I${SRCTOP}/sys

 WARNS?=		1

--- a/lib/libldns/Makefile
+++ b/lib/libldns/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 # Vendor sources and generated files
-LDNSDIR = ${.CURDIR}/../../contrib/ldns
+LDNSDIR = ${SRCTOP}/contrib/ldns

 PACKAGE=lib${LIB}
 .PATH: ${LDNSDIR} ${LDNSDIR}/compat
--- a/lib/liblzma/Makefile
+++ b/lib/liblzma/Makefile
@ -2,9 +2,9 @@

 PACKAGE=lib${LIB}
 LIB=		lzma
-LZMADIR=	${.CURDIR}/../../contrib/xz/src/liblzma
+LZMADIR=	${SRCTOP}/contrib/xz/src/liblzma

-.PATH: ${LZMADIR}/../common
+.PATH: ${LZMADIR:H}/common
 SRCS+=	tuklib_physmem.c tuklib_cpucores.c

 .PATH: ${LZMADIR}/api/lzma
@ -145,7 +145,7 @@ CFLAGS+=	-DHAVE_CONFIG_H \
 		-I${LZMADIR}/lzma \
 		-I${LZMADIR}/delta \
 		-I${LZMADIR}/simple \
-		-I${LZMADIR}/../common
+		-I${LZMADIR:H}/common

 LIBADD+=	pthread

--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@ -2,7 +2,7 @@
 # Copyright (c) David E. O'Brien, 2000-2004, 2006, 2009

 PACKAGE=lib${LIB}
-CONTRDIR=	${.CURDIR}/../../contrib/file
+CONTRDIR=	${SRCTOP}/contrib/file
 .PATH: ${CONTRDIR}/src
 .PATH: ${CONTRDIR}/doc

--- a/lib/libmd/Makefile
+++ b/lib/libmd/Makefile
@ -78,11 +78,11 @@ CLEANFILES+=	md[245]hl.c md[245].ref md[245].3 mddriver \
 # in which case:
 #   * macros are used to rename symbols to libcrypt internal names
 #   * no weak aliases are generated
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys/crypto/sha2
-CFLAGS+= -I${.CURDIR}/../../sys/crypto/skein
+CFLAGS+= -I${.CURDIR} -I${SRCTOP}/sys/crypto/sha2
+CFLAGS+= -I${SRCTOP}/sys/crypto/skein
 CFLAGS+= -DWEAK_REFS
-.PATH: ${.CURDIR}/${MACHINE_ARCH} ${.CURDIR}/../../sys/crypto/sha2
-.PATH: ${.CURDIR}/../../sys/crypto/skein ${.CURDIR}/../../sys/crypto/skein/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/${MACHINE_ARCH} ${SRCTOP}/sys/crypto/sha2
+.PATH: ${SRCTOP}/sys/crypto/skein ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH}

 .if exists(${MACHINE_ARCH}/sha.S)
 SRCS+=	sha.S
--- a/lib/libmilter/Makefile
+++ b/lib/libmilter/Makefile
@ -3,7 +3,7 @@
 .include <src.opts.mk>

 PACKAGE=sendmail
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm

 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
--- a/lib/libmp/Makefile
+++ b/lib/libmp/Makefile
@ -10,9 +10,9 @@ MAN=		libmp.3
 INCS=		mp.h
 SRCS=		mpasbn.c

-CFLAGS+=	-I${.CURDIR}/../../crypto
+CFLAGS+=	-I${SRCTOP}/crypto

-VERSION_DEF=	${.CURDIR}/../libc/Versions.def
+VERSION_DEF=	${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map

 .if ${MK_TESTS} != "no"
--- a/lib/libngatm/Makefile
+++ b/lib/libngatm/Makefile
@ -8,8 +8,8 @@ SHLIB_MAJOR= 4
 MAN=	libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3

 # source of the library lives in contrib
-SDIR=	${.CURDIR}/../../sys
-CTRB=	${.CURDIR}/../../contrib/ngatm
+SDIR=	${SRCTOP}/sys
+CTRB=	${SRCTOP}/contrib/ngatm
 LIBBASE= ${SDIR}/contrib/ngatm

 CFLAGS+= -I${LIBBASE} -I${.OBJDIR} -I${CTRB}/libngatm
--- a/lib/libnv/Makefile
+++ b/lib/libnv/Makefile
@ -8,8 +8,8 @@ SHLIBDIR?= /lib
 LIB=	nv
 SHLIB_MAJOR= 0

-.PATH: ${.CURDIR}/../../sys/contrib/libnv ${.CURDIR}/../../sys/sys
-CFLAGS+=-I${.CURDIR}/../../sys -I${.CURDIR}
+.PATH: ${SRCTOP}/sys/contrib/libnv ${SRCTOP}/sys/sys
+CFLAGS+=-I${SRCTOP}/sys -I${.CURDIR}

 SRCS=	dnvlist.c
 SRCS+=	msgio.c
--- a/lib/libopie/Makefile
+++ b/lib/libopie/Makefile
@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 PACKAGE=lib${LIB}
-OPIE_DIST?=	${.CURDIR}/../../contrib/opie
+OPIE_DIST?=	${SRCTOP}/contrib/opie
 DIST_DIR=	${OPIE_DIST}/${.CURDIR:T}
 SHLIB_MAJOR=    8

--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@ -36,7 +36,7 @@
 # $FreeBSD$

 PACKAGE=lib${LIB}
-OPENPAM=	${.CURDIR}/../../../contrib/openpam
+OPENPAM=	${SRCTOP}/contrib/openpam
 .PATH: ${OPENPAM}/include ${OPENPAM}/lib/libpam ${OPENPAM}/doc/man

 # static_libpam will build libpam.a
--- a/lib/libpam/modules/Makefile.inc
+++ b/lib/libpam/modules/Makefile.inc
@ -1,11 +1,11 @@
 # $FreeBSD$

-PAMDIR=		${.CURDIR}/../../../../contrib/openpam
+PAMDIR=		${SRCTOP}/contrib/openpam

 MK_INSTALLLIB=	no
 MK_PROFILE=	no

-CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
+CFLAGS+= -I${PAMDIR}/include -I${SRCTOP}/lib/libpam

 SHLIB_NAME?=	${LIB}.so.${SHLIB_MAJOR}
 LIBADD+=	pam
--- a/lib/libpam/modules/pam_passwdqc/Makefile
+++ b/lib/libpam/modules/pam_passwdqc/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-SRCDIR=	${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc
+SRCDIR=	${SRCTOP}/contrib/pam_modules/pam_passwdqc
 .PATH: ${SRCDIR}

 LIB=	pam_passwdqc
--- a/lib/libpam/modules/pam_ssh/Makefile
+++ b/lib/libpam/modules/pam_ssh/Makefile
@ -1,7 +1,7 @@
 # PAM module for SSH
 # $FreeBSD$

-SSHDIR=	${.CURDIR}/../../../../crypto/openssh
+SSHDIR=	${SRCTOP}/crypto/openssh

 LIB=	pam_ssh
 MAN=	pam_ssh.8
--- a/lib/libpam/static_libpam/Makefile
+++ b/lib/libpam/static_libpam/Makefile
@ -35,7 +35,7 @@
 #
 # $FreeBSD$

-.PATH: ${.CURDIR}/../libpam
+.PATH: ${SRCTOP}/lib/libpam

 # Only build the static library.
 LIB=	pam
@ -66,4 +66,4 @@ CLEANFILES+=	openpam_static.o \
 openpam_static_modules.o: openpam_static.o ${STATIC_MODULES}
 	${LD} -o ${.TARGET} -r --whole-archive ${.ALLSRC}

-.include "${.CURDIR}/../libpam/Makefile"
+.include "${.CURDIR:H}/libpam/Makefile"
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@ -114,7 +114,7 @@ SHLIB_MAJOR=	8
 #
 # Magic to grab sources out of src/contrib
 #
-PCAP_DISTDIR?=${.CURDIR}/../../contrib/libpcap
+PCAP_DISTDIR?=${SRCTOP}/contrib/libpcap
 CFLAGS+=-I${PCAP_DISTDIR}
 .PATH:	${PCAP_DISTDIR}
 .PATH:	${PCAP_DISTDIR}/bpf/net
--- a/lib/libpe/Makefile
+++ b/lib/libpe/Makefile
@ -3,7 +3,7 @@

 INTERNALLIB=

-ELFTCDIR=	${.CURDIR}/../../contrib/elftoolchain
+ELFTCDIR=	${SRCTOP}/contrib/elftoolchain

 .PATH:	${ELFTCDIR}/libpe

--- a/lib/libproc/Makefile
+++ b/lib/libproc/Makefile
@ -29,9 +29,9 @@ LIBADD+=	elf rtld_db util
 .if ${MK_CDDL} != "no"
 LIBADD+=	ctf
 IGNORE_PRAGMA=	YES
-CFLAGS+=	-I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libctf/common \
-		-I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common \
-		-I${.CURDIR}/../../sys/cddl/compat/opensolaris
+CFLAGS+=	-I${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common \
+		-I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common \
+		-I${SRCTOP}/sys/cddl/compat/opensolaris
 .else
 CFLAGS+=	-DNO_CTF
 .endif
--- a/lib/libprocstat/zfs/Makefile
+++ b/lib/libprocstat/zfs/Makefile
@ -1,21 +1,21 @@
 # $FreeBSD$

-.PATH: ${.CURDIR}/..
+.PATH: ${.CURDIR:H}

 SRCS=	zfs.c
 OBJS=	zfs.o
 WARNS?=	1

-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/..
+CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR:H}
 CFLAGS+= -DNEED_SOLARIS_BOOLEAN

 all: ${OBJS}
--- a/lib/librpcsec_gss/Makefile
+++ b/lib/librpcsec_gss/Makefile
@ -8,11 +8,11 @@ SRCS+=	rpcsec_gss.c rpcsec_gss_prot.c rpcsec_gss_conf.c rpcsec_gss_misc.c \

 LIBADD=	gssapi

-VERSION_DEF=	${.CURDIR}/../libc/Versions.def
+VERSION_DEF=	${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map

-CFLAGS+= -I${.CURDIR}/../../include
-CFLAGS+= -I${.CURDIR}/../../libc_rpc
+CFLAGS+= -I${SRCTOP}/include
+CFLAGS+= -I${SRCTOP}/lib/libc_rpc
 MK_PROFILE=	no

 MAN=	rpcsec_gss.3
--- a/lib/librpcsvc/Makefile
+++ b/lib/librpcsvc/Makefile
@ -3,7 +3,7 @@

 .include <src.opts.mk>

-.PATH: ${.CURDIR}/../../include/rpcsvc
+.PATH: ${SRCTOP}/include/rpcsvc

 PACKAGE=lib${LIB}
 LIB=    rpcsvc
--- a/lib/librt/Makefile
+++ b/lib/librt/Makefile
@ -5,7 +5,7 @@
 PACKAGE=lib${LIB}
 LIB=rt
 SHLIB_MAJOR= 1
-CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}
+CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR}
 .ifndef NO_THREAD_STACK_UNWIND
 CFLAGS+=-fexceptions
 .endif
@ -18,7 +18,7 @@ SRCS+= aio.c mq.c sigev_thread.c timer.c

 PRECIOUSLIB=

-VERSION_DEF=${.CURDIR}/../libc/Versions.def
+VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS=${.CURDIR}/Symbol.map

 .if ${MK_TESTS} != "no"
--- a/lib/libsbuf/Makefile
+++ b/lib/libsbuf/Makefile
@ -10,6 +10,6 @@ SHLIB_MAJOR	= 6
 SYMBOL_MAPS=    ${.CURDIR}/Symbol.map
 VERSION_DEF=	${.CURDIR}/Version.def

-.PATH:	${.CURDIR}/../../sys/kern
+.PATH:	${SRCTOP}/sys/kern

 .include <bsd.lib.mk>
--- a/lib/libsm/Makefile
+++ b/lib/libsm/Makefile
@ -3,7 +3,7 @@
 .include <src.opts.mk>

 PACKAGE=sendmail
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsm

 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
--- a/lib/libsmb/Makefile
+++ b/lib/libsmb/Makefile
@ -3,7 +3,7 @@
 .include <src.opts.mk>

 PACKAGE=lib${LIB}
-CONTRIBDIR=	${.CURDIR}/../../contrib/smbfs
+CONTRIBDIR=	${SRCTOP}/contrib/smbfs
 .PATH: ${CONTRIBDIR}/lib/smb

 LIB=	smb
--- a/lib/libsmdb/Makefile
+++ b/lib/libsmdb/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PACKAGE=lib${LIB}
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsmdb

 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
--- a/lib/libsmutil/Makefile
+++ b/lib/libsmutil/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PACKAGE=lib${LIB}
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsmutil

 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
--- a/lib/libsqlite3/Makefile
+++ b/lib/libsqlite3/Makefile
@ -8,7 +8,7 @@ LIBADD+=	pthread

 SRCS=	sqlite3.c

-SQLITE=	${.CURDIR}/../../contrib/sqlite3
+SQLITE=	${SRCTOP}/contrib/sqlite3
 .PATH:	${SQLITE}

 WARNS=	3
--- a/lib/libstdthreads/Makefile
+++ b/lib/libstdthreads/Makefile
@ -35,7 +35,7 @@ MLINKS=	thrd_create.3 call_once.3 \

 LIBADD=	pthread

-VERSION_DEF= ${.CURDIR}/../libc/Versions.def
+VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS= ${.CURDIR}/Symbol.map

 .include <bsd.lib.mk>
--- a/lib/libsysdecode/Makefile
+++ b/lib/libsysdecode/Makefile
@ -9,8 +9,8 @@ SRCS=	errno.c flags.c ioctl.c signal.c syscallnames.c utrace.c
 INCS=	sysdecode.h

 CFLAGS+= -I${.OBJDIR}
-CFLAGS+= -I${.CURDIR}/../../sys
-CFLAGS+= -I${.CURDIR}/../../libexec/rtld-elf
+CFLAGS+= -I${SRCTOP}/sys
+CFLAGS+= -I${SRCTOP}/libexec/rtld-elf

 MAN=	sysdecode.3 \
 	sysdecode_abi_to_freebsd_errno.3 \
--- a/lib/libtelnet/Makefile
+++ b/lib/libtelnet/Makefile
@ -4,7 +4,7 @@
 .include <src.opts.mk>

 PACKAGE=lib${LIB}
-TELNETDIR=	${.CURDIR}/../../contrib/telnet
+TELNETDIR=	${SRCTOP}/contrib/telnet
 .PATH:		${TELNETDIR}/libtelnet

 LIB=		telnet
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@ -18,13 +18,13 @@ LIB=thr
 SHLIB_MAJOR= 3
 WARNS?=	3
 CFLAGS+=-DPTHREAD_KERNEL
-CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
-	-I${.CURDIR}/../../include
+CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR}/thread \
+	-I${SRCTOP}/include
 CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include
 CFLAGS+=-I${.CURDIR}/sys
-CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf
-CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_CPUARCH}
-CFLAGS+=-I${.CURDIR}/../libthread_db
+CFLAGS+=-I${SRCTOP}/libexec/rtld-elf
+CFLAGS+=-I${SRCTOP}/libexec/rtld-elf/${MACHINE_CPUARCH}
+CFLAGS+=-I${SRCTOP}/lib/libthread_db
 CFLAGS+=-Winline

 .ifndef NO_THREAD_UNWIND_STACK
@ -34,7 +34,7 @@ CFLAGS+=-D_PTHREAD_FORCED_UNWIND

 LDFLAGS+=-Wl,-znodelete

-VERSION_DEF=${.CURDIR}/../libc/Versions.def
+VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS=${.CURDIR}/pthread.map

 MAN=	libthr.3
--- a/lib/libthr/support/Makefile.inc
+++ b/lib/libthr/support/Makefile.inc
@ -1,15 +1,15 @@
 # $FreeBSD$

-.PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string
+.PATH: ${.CURDIR}/support ${SRCTOP}/lib/libc/gen ${SRCTOP}/lib/libc/string

 # libc must search machine_arch, then machine_cpuarch, but libthr has all its
 # code implemented in machine_cpuarch.  Cope.
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/sys)
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys
-CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_ARCH}
+.if exists(${SRCTOP}/lib/libc/${MACHINE_ARCH}/sys)
+.PATH: ${SRCTOP}/lib/libc/${MACHINE_ARCH}/sys
+CFLAGS+= -I${SRCTOP}/lib/libc/${MACHINE_ARCH}
 .else
-.PATH: ${.CURDIR}/../libc/${MACHINE_CPUARCH}/sys
-CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_CPUARCH}
+.PATH: ${SRCTOP}/lib/libc/${MACHINE_CPUARCH}/sys
+CFLAGS+= -I${SRCTOP}/lib/libc/${MACHINE_CPUARCH}
 .endif

 SYSCALLS= thr_new
--- a/lib/libthread_db/Makefile
+++ b/lib/libthread_db/Makefile
@ -15,7 +15,7 @@ CFLAGS+=-I. -I${.CURDIR}
 SYM_MAPS+=${.CURDIR}/Symbol.map

 SYMBOL_MAPS=${SYM_MAPS}
-VERSION_DEF=${.CURDIR}/../libc/Versions.def
+VERSION_DEF=${SRCTOP}/lib/libc/Versions.def

 # Unfortunately, clang gives an incorrect warning about alignment in
 # arch/i386/libpthread_md.c, so turn that off for now.
--- a/lib/libufs/Makefile
+++ b/lib/libufs/Makefile
@ -18,7 +18,7 @@ MLINKS+= ufs_disk_close.3 ufs_disk_fillout.3
 MLINKS+= ufs_disk_close.3 ufs_disk_fillout_blank.3
 MLINKS+= ufs_disk_close.3 ufs_disk_write.3

-.PATH:  ${.CURDIR}/../../sys/ufs/ffs
+.PATH:  ${SRCTOP}/sys/ufs/ffs

 WARNS?=	2

--- a/lib/libulog/Makefile
+++ b/lib/libulog/Makefile
@ -22,7 +22,7 @@ MLINKS+=ulog_login.3 ulog_login_pseudo.3 \

 LIBADD=	md

-VERSION_DEF= ${.CURDIR}/../libc/Versions.def
+VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS= ${.CURDIR}/Symbol.map

 .if ${MK_INSTALLLIB} != "no"
--- a/lib/libunbound/Makefile
+++ b/lib/libunbound/Makefile
@ -2,8 +2,8 @@

 PACKAGE=lib${LIB}
 # Vendor sources and generated files
-LDNSDIR= ${.CURDIR}/../../contrib/ldns
-UNBOUNDDIR= ${.CURDIR}/../../contrib/unbound
+LDNSDIR= ${SRCTOP}/contrib/ldns
+UNBOUNDDIR= ${SRCTOP}/contrib/unbound

 # Hold my beer and watch this
 .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/cachedb ${UNBOUNDDIR}/dns64 ${UNBOUNDDIR}/iterator ${UNBOUNDDIR}/sldns ${UNBOUNDDIR}/libunbound ${UNBOUNDDIR}/services ${UNBOUNDDIR}/services/cache ${UNBOUNDDIR}/util ${UNBOUNDDIR}/util/data ${UNBOUNDDIR}/util/storage ${UNBOUNDDIR}/validator 
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@ -25,7 +25,7 @@ CFLAGS+= -DLIBC_SCCS
 CFLAGS+= -DINET6
 .endif

-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libc/gen/
+CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libc/gen/

 MAN+=	expand_number.3 flopen.3 fparseln.3 hexdump.3 \
 	humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \
--- a/lib/libypclnt/Makefile
+++ b/lib/libypclnt/Makefile
@ -24,9 +24,9 @@ GENSRCS=yp.h \
 	yppasswd_private_xdr.c

 RPCGEN=	RPCGEN_CPP=${CPP:Q} rpcgen -C
-RPCSRC=	${.CURDIR}/../../include/rpcsvc/yp.x
-RPCSRC_PW=	${.CURDIR}/../../include/rpcsvc/yppasswd.x
-RPCSRC_PRIV=	${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x
+RPCSRC=	${SRCTOP}/include/rpcsvc/yp.x
+RPCSRC_PW=	${SRCTOP}/include/rpcsvc/yppasswd.x
+RPCSRC_PRIV=	${SRCTOP}/usr.sbin/rpc.yppasswdd/yppasswd_private.x

 yp.h: ${RPCSRC}
 	${RPCGEN} -h -o ${.TARGET} ${RPCSRC}
--- a/lib/ncurses/config.mk
+++ b/lib/ncurses/config.mk
@ -2,25 +2,25 @@

 # This Makefile is shared by libncurses, libform, libmenu, libpanel.

-NCURSES_DIR=	${.CURDIR}/../../../contrib/ncurses
+NCURSES_DIR=	${SRCTOP}/contrib/ncurses

 .if defined(ENABLE_WIDEC)
 LIB_SUFFIX=	w
 CFLAGS+=	-D_XOPEN_SOURCE_EXTENDED -DENABLE_WIDEC
-NCURSES_CFG_H=	${.CURDIR}/../ncurses/ncurses_cfg.h
+NCURSES_CFG_H=	${.CURDIR:H}/ncurses/ncurses_cfg.h
 .else
 LIB_SUFFIX=
 NCURSES_CFG_H=	${.CURDIR}/ncurses_cfg.h
 .endif

 CFLAGS+=	-I.
-.if exists(${.OBJDIR}/../ncurses${LIB_SUFFIX})
-CFLAGS+=	-I${.OBJDIR}/../ncurses${LIB_SUFFIX}
+.if exists(${.OBJDIR:H}/ncurses${LIB_SUFFIX})
+CFLAGS+=	-I${.OBJDIR:H}/ncurses${LIB_SUFFIX}
 .endif
-CFLAGS+=	-I${.CURDIR}/../ncurses${LIB_SUFFIX}
+CFLAGS+=	-I${.CURDIR:H}/ncurses${LIB_SUFFIX}

 # for ${NCURSES_CFG_H}
-CFLAGS+=	-I${.CURDIR}/../ncurses
+CFLAGS+=	-I${.CURDIR:H}/ncurses

 CFLAGS+=	-I${NCURSES_DIR}/include
 CFLAGS+=	-I${NCURSES_DIR}/ncurses
--- a/lib/ncurses/form/Makefile
+++ b/lib/ncurses/form/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"

 SRCDIR=	${NCURSES_DIR}/form

--- a/lib/ncurses/formw/Makefile
+++ b/lib/ncurses/formw/Makefile
@ -2,4 +2,4 @@

 ENABLE_WIDEC=

-.include "${.CURDIR}/../form/Makefile"
+.include "${.CURDIR:H}/form/Makefile"
--- a/lib/ncurses/menu/Makefile
+++ b/lib/ncurses/menu/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"

 SRCDIR=	${NCURSES_DIR}/menu

--- a/lib/ncurses/menuw/Makefile
+++ b/lib/ncurses/menuw/Makefile
@ -2,4 +2,4 @@

 ENABLE_WIDEC=

-.include "${.CURDIR}/../menu/Makefile"
+.include "${.CURDIR:H}/menu/Makefile"
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@ -10,7 +10,7 @@ MK_MAN=no

 .include <src.opts.mk>

-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"

 LIB=		ncurses${LIB_SUFFIX}
 SHLIB_MAJOR=	8
--- a/lib/ncurses/ncursesw/Makefile
+++ b/lib/ncurses/ncursesw/Makefile
@ -2,6 +2,6 @@

 ENABLE_WIDEC=

-.PATH: ${.CURDIR}/../ncurses
+.PATH: ${.CURDIR:H}/ncurses

-.include "${.CURDIR}/../ncurses/Makefile"
+.include "${.CURDIR:H}/ncurses/Makefile"
--- a/lib/ncurses/panel/Makefile
+++ b/lib/ncurses/panel/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"

 SRCDIR=	${NCURSES_DIR}/panel

--- a/lib/ncurses/panelw/Makefile
+++ b/lib/ncurses/panelw/Makefile
@ -2,4 +2,4 @@

 ENABLE_WIDEC=

-.include "${.CURDIR}/../panel/Makefile"
+.include "${.CURDIR:H}/panel/Makefile"