Index: head/usr.sbin/ntp/doc/Makefile
===================================================================
--- head/usr.sbin/ntp/doc/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/doc/Makefile	(revision 314472)
@@ -1,34 +1,33 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 SUBDIR=	drivers hints icons pic scripts
 
 FILESDIR=	${SHAREDIR}/doc/ntp
 
 .if ${MK_HTML} != "no"
 FILES=	access.html accopt.html assoc.html audio.html authentic.html \
 	authopt.html autokey.html bugs.html build.html clock.html \
 	clockopt.html cluster.html comdex.html config.html confopt.html \
 	copyright.html debug.html decode.html discipline.html discover.html \
 	extern.html filter.html hints.html history.html howto.html \
 	huffpuff.html index.html kern.html kernpps.html keygen.html leap.html \
 	miscopt.html monopt.html msyslog.html ntp-keygen.html ntp-wait.html \
 	ntp.conf.html ntp.keys.html ntp_conf.html ntpd.html ntpdate.html \
 	ntpdc.html ntpdsim.html ntpdsim_new.html ntpq.html ntpsnmpd.html \
 	ntptime.html ntptrace.html orphan.html parsedata.html \
 	parsenew.html poll.html pps.html prefer.html quick.html rate.html \
 	rdebug.html refclock.html release.html select.html sitemap.html \
 	sntp.html stats.html tickadj.html warp.html xleave.html
 .endif
 
 MAN=	ntp.conf.5 ntp.keys.5
 MAN+=	ntp-keygen.8 ntpd.8 ntpdate.8 ntpdc.8 ntpq.8 ntptime.8 sntp.8
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/html \
-	${.CURDIR}/../../../contrib/ntp/util \
-	${.CURDIR}/../../../contrib/ntp/util \
-	${.CURDIR}/../../../contrib/ntp/ntpd \
-	${.CURDIR}/../../../contrib/ntp/ntpsnmpd
+.PATH: ${SRCTOP}/contrib/ntp/html \
+	${SRCTOP}/contrib/ntp/util \
+	${SRCTOP}/contrib/ntp/ntpd \
+	${SRCTOP}/contrib/ntp/ntpsnmpd
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/ntp/doc/drivers/Makefile
===================================================================
--- head/usr.sbin/ntp/doc/drivers/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/doc/drivers/Makefile	(revision 314472)
@@ -1,21 +1,21 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 SUBDIR=		icons scripts
 FILESDIR=	${SHAREDIR}/doc/ntp/drivers
 
 .if ${MK_HTML} != "no"
 FILES=	driver1.html driver10.html driver11.html driver12.html driver16.html \
 	driver18.html driver19.html driver20.html driver22.html driver26.html \
 	driver27.html driver28.html driver29.html driver3.html driver30.html \
 	driver31.html driver32.html driver33.html driver34.html driver35.html \
 	driver36.html driver37.html driver38.html driver39.html driver4.html \
 	driver40.html driver42.html driver43.html driver44.html driver45.html \
 	driver46.html driver5.html driver6.html driver7.html driver8.html \
 	driver9.html mx4200data.html oncore-shmem.html tf582_4.html
 .endif
 
-.PATH: ${.CURDIR}/../../../../contrib/ntp/html/drivers
+.PATH: ${SRCTOP}/contrib/ntp/html/drivers
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/ntp/doc/drivers/icons/Makefile
===================================================================
--- head/usr.sbin/ntp/doc/drivers/icons/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/doc/drivers/icons/Makefile	(revision 314472)
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 FILESDIR=	${SHAREDIR}/doc/ntp/drivers/icons
 
 .if ${MK_HTML} != "no"
 FILES=	home.gif mail2.gif
 .endif
 
-.PATH: ${.CURDIR}/../../../../../contrib/ntp/html/drivers/icons
+.PATH: ${SRCTOP}/contrib/ntp/html/drivers/icons
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/ntp/doc/drivers/scripts/Makefile
===================================================================
--- head/usr.sbin/ntp/doc/drivers/scripts/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/doc/drivers/scripts/Makefile	(revision 314472)
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 FILESDIR=	${SHAREDIR}/doc/ntp/drivers/scripts
 
 .if ${MK_HTML} != "no"
 FILES=	footer.txt style.css
 .endif
 
-.PATH: ${.CURDIR}/../../../../../contrib/ntp/html/drivers/scripts
+.PATH: ${SRCTOP}/contrib/ntp/html/drivers/scripts
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/ntp/doc/hints/Makefile
===================================================================
--- head/usr.sbin/ntp/doc/hints/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/doc/hints/Makefile	(revision 314472)
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 FILESDIR=	${SHAREDIR}/doc/ntp/hints
 
 .if ${MK_HTML} != "no"
 FILES=	a-ux aix bsdi changes decosf1 decosf2 freebsd hpux linux mpeix \
 	notes-xntp-v3 parse refclocks rs6000 sco.html sgi \
 	solaris-dosynctodr.html solaris.html solaris.xtra.4023118 \
 	solaris.xtra.4095849 solaris.xtra.S99ntpd solaris.xtra.patchfreq \
 	sun4 svr4-dell svr4_package todo vxworks.html winnt.html
 .endif
 
-.PATH: ${.CURDIR}/../../../../contrib/ntp/html/hints
+.PATH: ${SRCTOP}/contrib/ntp/html/hints
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/ntp/doc/icons/Makefile
===================================================================
--- head/usr.sbin/ntp/doc/icons/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/doc/icons/Makefile	(revision 314472)
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 FILESDIR=	${SHAREDIR}/doc/ntp/icons
 
 .if ${MK_HTML} != "no"
 FILES=	home.gif mail2.gif sitemap.png
 .endif
 
-.PATH: ${.CURDIR}/../../../../contrib/ntp/html/icons
+.PATH: ${SRCTOP}/contrib/ntp/html/icons
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/ntp/doc/pic/Makefile
===================================================================
--- head/usr.sbin/ntp/doc/pic/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/doc/pic/Makefile	(revision 314472)
@@ -1,27 +1,27 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 FILESDIR=	${SHAREDIR}/doc/ntp/pic
 
 .if ${MK_HTML} != "no"
 FILES=	9400n.jpg alice11.gif alice13.gif alice15.gif alice23.gif \
 	alice31.gif alice32.gif alice35.gif alice38.gif alice44.gif \
 	alice47.gif alice51.gif alice61.gif barnstable.gif beaver.gif \
 	boom3.gif boom3a.gif boom4.gif broad.gif bustardfly.gif c51.jpg \
 	description.jpg discipline.gif dogsnake.gif driver29.gif \
 	driver43_1.gif driver43_2.jpg fg6021.gif fg6039.jpg fig_3_1.gif \
 	flatheads.gif flt1.gif flt2.gif flt3.gif flt4.gif flt5.gif flt6.gif \
 	flt7.gif flt8.gif flt9.gif freq1211.gif gadget.jpg gps167.jpg \
 	group.gif hornraba.gif igclock.gif neoclock4x.gif offset1211.gif \
 	oncore_evalbig.gif oncore_remoteant.jpg oncore_utplusbig.gif oz2.gif \
 	panda.gif pd_om006.gif pd_om011.gif peer.gif pogo.gif pogo1a.gif \
 	pogo3a.gif pogo4.gif pogo5.gif pogo6.gif pogo7.gif pogo8.gif \
 	pzf509.jpg pzf511.jpg rabbit.gif radio2.jpg sheepb.jpg stack1a.jpg \
 	stats.gif sx5.gif thunderbolt.jpg time1.gif tonea.gif tribeb.gif \
 	wingdorothy.gif
 .endif
 
-.PATH: ${.CURDIR}/../../../../contrib/ntp/html/pic
+.PATH: ${SRCTOP}/contrib/ntp/html/pic
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/ntp/doc/scripts/Makefile
===================================================================
--- head/usr.sbin/ntp/doc/scripts/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/doc/scripts/Makefile	(revision 314472)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 FILESDIR=	${SHAREDIR}/doc/ntp/scripts
 
 .if ${MK_HTML} != "no"
 FILES=	accopt.txt audio.txt authopt.txt clockopt.txt command.txt config.txt \
 	confopt.txt external.txt footer.txt hand.txt install.txt manual.txt \
 	misc.txt miscopt.txt monopt.txt refclock.txt special.txt style.css
 .endif
 
-.PATH: ${.CURDIR}/../../../../contrib/ntp/html/scripts
+.PATH: ${SRCTOP}/contrib/ntp/html/scripts
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/ntp/libntp/Makefile
===================================================================
--- head/usr.sbin/ntp/libntp/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/libntp/Makefile	(revision 314472)
@@ -1,93 +1,93 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/libntp \
-	${.CURDIR}/../../../contrib/ntp/lib/isc \
-	${.CURDIR}/../../../contrib/ntp/lib/isc/nls \
-	${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads \
-	${.CURDIR}/../../../contrib/ntp/lib/isc/unix \
+.PATH: ${SRCTOP}/contrib/ntp/libntp \
+	${SRCTOP}/contrib/ntp/lib/isc \
+	${SRCTOP}/contrib/ntp/lib/isc/nls \
+	${SRCTOP}/contrib/ntp/lib/isc/pthreads \
+	${SRCTOP}/contrib/ntp/lib/isc/unix \
 
 LIB= ntp
 INTERNALLIB=
 
 NTP_SRCS= systime.c	a_md5encrypt.c	adjtime.c	atoint.c \
 	atolfp.c	atouint.c	audio.c	authkeys.c \
 	authreadkeys.c	authusekey.c	bsd_strerror.c	buftvtots.c \
 	caljulian.c	caltontp.c	calyearstart.c	clocktime.c \
 	clocktypes.c	decodenetnum.c	dofptoa.c	dolfptoa.c \
 	emalloc.c	findconfig.c	getopt.c	hextoint.c \
 	hextolfp.c	humandate.c	icom.c		iosignal.c \
 	is_ip_address.c \
 	lib_strbuf.c	\
 	libssl_compat.c \
 	machines.c	mktime.c	modetoa.c \
 	mstolfp.c	msyslog.c	netof.c		ntp_calendar.c \
 	ntp_crypto_rnd.c		ntp_intres.c	ntp_libopts.c \
 	ntp_lineedit.c	ntp_random.c	ntp_rfc2553.c	ntp_worker.c \
 	numtoa.c	numtohost.c	octtoint.c	prettydate.c \
 	recvbuff.c	refidsmear.c	\
 	refnumtoa.c	snprintf.c	socket.c \
 	socktoa.c	socktohost.c	ssl_init.c	statestr.c \
 	strdup.c	strl_obsd.c	syssignal.c	timetoa.c \
 	timevalops.c	uglydate.c	vint64ops.c	work_fork.c \
 	work_thread.c	ymd2yd.c
 
 ISC_PTHREADS_SRCS= condition.c \
 	thread.c \
 	mutex.c
 
 ISC_UNIX_SRCS= dir.c \
 	errno2result.c \
 	file.c \
 	interfaceiter.c \
 	net.c \
 	stdio.c \
 	stdtime.c \
 	strerror.c \
 	time.c \
 	tsmemcmp.c
 
 ISC_NLS_SRCS= msgcat.c
 
 ISC_SRCS= assertions.c \
 	buffer.c \
 	backtrace-emptytbl.c \
 	backtrace.c \
 	error.c \
 	event.c \
 	inet_ntop.c \
 	inet_pton.c \
 	lib.c \
 	log.c \
 	md5.c \
 	netaddr.c \
 	netscope.c \
 	ondestroy.c \
 	random.c \
 	result.c \
 	task.c \
 	sha1.c \
 	sockaddr.c \
 	${ISC_NLS_SRCS} \
 	${ISC_PTHREADS_SRCS} \
 	${ISC_UNIX_SRCS}
 
 SRCS=	${NTP_SRCS} ${ISC_SRCS} version.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
 	-I${.CURDIR}/../../../contrib/ntp/lib/isc/include \
 	-I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
 	-I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
 	-I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
 	-I${.CURDIR}/../../../lib/libc/${MACHINE_ARCH} \
 	-I${.CURDIR}/../../../lib/libedit/edit \
 	-I${.CURDIR}/../ \
 	-I${.CURDIR}/
 
 CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H
 
 CLEANFILES+= .version version.c
 
 version.c:
 	sh -e ${.CURDIR}/../scripts/mkver ntpd
 
 .include <bsd.lib.mk>
Index: head/usr.sbin/ntp/libntpevent/Makefile
===================================================================
--- head/usr.sbin/ntp/libntpevent/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/libntpevent/Makefile	(revision 314472)
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../../contrib/ntp/sntp/libevent
+.PATH: ${SRCTOP}/contrib/ntp/sntp/libevent
 
 LIB= ntpevent
 INTERNALLIB=
 
 SRCS=	buffer.c bufferevent.c bufferevent_filter.c bufferevent_openssl.c \
 	bufferevent_pair.c epoll.c evdns.c event.c event_tagging.c \
 	evmap.c evport.c evrpc.c evthread.c evthread_pthread.c evutil.c \
 	evutil_rand.c evutil_time.c http.c kqueue.c listener.c log.c poll.c \
 	select.c signal.c strlcpy.c
 
 .if ${MACHINE_ARCH} == "i386"
 NTP_ATOMIC=x86_32
 .elif ${MACHINE_ARCH} == "amd64"
 NTP_ATOMIC=x86_64
 .elif ${MACHINE_ARCH} == "ia64"
 NTP_ATOMIC=ia64
 .elif ${MACHINE_ARCH} == "powerpc64"
 NTP_ATOMIC=powerpc
 .elif ${MACHINE_ARCH} == "sparc64"
 NTP_ATOMIC=sparc64
 .else
 NTP_ATOMIC=noatomic
 .endif
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-	-I${.CURDIR}/../../../contrib/ntp/sntp/libevent/include \
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+	-I${SRCTOP}/contrib/ntp/sntp/libevent/include \
 	-I${.CURDIR}/
 
 CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H
 
 .include <bsd.lib.mk>
Index: head/usr.sbin/ntp/libopts/Makefile
===================================================================
--- head/usr.sbin/ntp/libopts/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/libopts/Makefile	(revision 314472)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/sntp/libopts 
+.PATH: ${SRCTOP}/contrib/ntp/sntp/libopts
 
 LIB=	opts
 INTERNALLIB=
 
 SRCS=	libopts.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-	-I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
-	-I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+	-I${SRCTOP}/contrib/ntp/sntp/libopts \
+	-I${.CURDIR:H}
 
 .include <bsd.lib.mk>
Index: head/usr.sbin/ntp/libparse/Makefile
===================================================================
--- head/usr.sbin/ntp/libparse/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/libparse/Makefile	(revision 314472)
@@ -1,19 +1,19 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/libparse
+.PATH: ${SRCTOP}/contrib/ntp/libparse
 
 LIB=	parse
 INTERNALLIB=
 
 SRCS=	binio.c	clk_computime.c	clk_dcf7000.c	clk_hopf6021.c \
 	clk_meinberg.c	clk_rawdcf.c	clk_rcc8000.c	clk_schmid.c \
 	clk_sel240x.c	clk_trimtaip.c	clk_trimtsip.c	clk_varitext.c \
 	clk_wharton.c	data_mbg.c	gpstolfp.c	ieee754io.c \
 	info_trimble.c	mfp_mul.c	parse.c	parse_conf.c \
 	trim_info.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/include -I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/include -I${.CURDIR:H}
 
 .include <bsd.lib.mk>
Index: head/usr.sbin/ntp/ntp-keygen/Makefile
===================================================================
--- head/usr.sbin/ntp/ntp-keygen/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/ntp-keygen/Makefile	(revision 314472)
@@ -1,29 +1,29 @@
 # $FreeBSD$
 
 MAN=
 
 .include <src.opts.mk>
 
-.PATH:	${.CURDIR}/../../../contrib/ntp/util \
-	${.CURDIR}/../../../contrib/ntp/ntpd
+.PATH:	${SRCTOP}/contrib/ntp/util \
+	${SRCTOP}/contrib/ntp/ntpd
 
 PROG=	ntp-keygen
 SRCS=	ntp-keygen.c ntp-keygen-opts.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-	-I${.CURDIR}/../../../contrib/ntp/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/${NTP_ATOMIC}/include \
-	-I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
-	-I${.CURDIR}/../../../lib/libc/${MACHINE_ARCH} \
-	-I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+	-I${SRCTOP}/contrib/ntp/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/${NTP_ATOMIC}/include \
+	-I${SRCTOP}/contrib/ntp/sntp/libopts \
+	-I${.CURDIR}/lib/libc/${MACHINE_ARCH} \
+	-I${.CURDIR:H}
 
 LIBADD+=	ntp opts pthread
 
 .if ${MK_OPENSSL} != "no"
 LIBADD+=	crypto
 .endif
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/ntp/ntpd/Makefile
===================================================================
--- head/usr.sbin/ntp/ntpd/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/ntpd/Makefile	(revision 314472)
@@ -1,52 +1,52 @@
 # $FreeBSD$
 
 MAN=
 
 .include <src.opts.mk>
 
-.PATH:	${.CURDIR}/../../../contrib/ntp/ntpd \
+.PATH:	${SRCTOP}/contrib/ntp/ntpd \
 	${.OBJDIR}
 
 PROG=	ntpd
 
 SRCS=	cmd_args.c ntp_config.c ntp_control.c ntp_crypto.c ntp_filegen.c \
 	ntp_io.c ntp_leapsec.c ntp_loopfilter.c ntp_monitor.c ntp_parser.c \
 	ntp_peer.c ntp_proto.c ntp_refclock.c ntp_request.c ntp_restrict.c \
 	ntp_scanner.c ntp_signd.c ntp_timer.c ntp_util.c ntpd-opts.c ntpd.c \
 	rc_cmdlength.c \
 	refclock_acts.c refclock_arbiter.c refclock_arc.c refclock_as2201.c \
 	refclock_atom.c refclock_bancomm.c refclock_chronolog.c \
 	refclock_chu.c refclock_conf.c refclock_datum.c refclock_dumbclock.c \
 	refclock_fg.c refclock_gpsdjson.c refclock_gpsvme.c refclock_heath.c \
 	refclock_hopfpci.c refclock_hopfser.c refclock_hpgps.c \
 	refclock_irig.c refclock_jjy.c refclock_jupiter.c refclock_leitch.c \
 	refclock_local.c refclock_nmea.c refclock_neoclock4x.c \
 	refclock_oncore.c refclock_palisade.c \
 	refclock_parse.c refclock_pcf.c refclock_pst.c refclock_ripencc.c \
 	refclock_shm.c refclock_tpro.c refclock_true.c refclock_tsyncpci.c \
 	refclock_tt560.c refclock_ulink.c refclock_wwv.c refclock_wwvb.c \
 	refclock_zyfer.c version.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/ntpd \
-	-I${.CURDIR}/../../../contrib/ntp/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
-	-I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
-	-I${.CURDIR}/../ \
+CFLAGS+= -I${SRCTOP}/contrib/ntp/ntpd \
+	-I${SRCTOP}/contrib/ntp/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+	-I${SRCTOP}/contrib/ntp/sntp/libopts \
+	-I${.CURDIR:H} \
 	-I${.CURDIR}
 
 LIBADD=	parse ntp m opts pthread
 
 .if ${MK_OPENSSL} != "no"
 LIBADD+=	crypto
 .else
 LIBADD+=	md
 .endif
 
 CLEANFILES+= .version version.c
 
-version.c: 
-	sh -e ${.CURDIR}/../scripts/mkver ntpd
+version.c:
+	sh -e ${.CURDIR:H}/scripts/mkver ntpd
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/ntp/ntpdate/Makefile
===================================================================
--- head/usr.sbin/ntp/ntpdate/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/ntpdate/Makefile	(revision 314472)
@@ -1,30 +1,30 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate
+.PATH: ${SRCTOP}/contrib/ntp/ntpdate
 
 PROG=	ntpdate
 MAN=
 SRCS=	ntpdate.c version.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/include/ \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include/ \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
-	-I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/include/ \
+	-I${SRCTOP}/contrib/ntp/lib/isc/unix/include/ \
+	-I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+	-I${.CURDIR:H}
 
 LIBADD=	ntp m pthread
 
 .if ${MK_OPENSSL} != "no"
 LIBADD+=	crypto
 .else
 LIBADD+=	md
 .endif
 
 CLEANFILES+= .version version.c
 
 version.c: 
 	sh -e ${.CURDIR}/../scripts/mkver ntpdate
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/ntp/ntpdc/Makefile
===================================================================
--- head/usr.sbin/ntp/ntpdc/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/ntpdc/Makefile	(revision 314472)
@@ -1,36 +1,35 @@
 # $FreeBSD$
 
 MAN=
 
 .include <src.opts.mk>
-.include <bsd.own.mk>
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/ntpdc
+.PATH: ${SRCTOP}/contrib/ntp/ntpdc
 
 PROG=	ntpdc
 SRCS= 	ntpdc.c ntpdc_ops.c ntpdc-opts.c version.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
-	-I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
-	-I${.CURDIR}/../../../lib/libc/${MACHINE_ARCH} \
-	-I${.CURDIR}/../ -I${.CURDIR}
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+	-I${SRCTOP}/contrib/ntp/sntp/libopts \
+	-I${.CURDIR}/lib/libc/${MACHINE_ARCH} \
+	-I${.CURDIR:H} -I${.CURDIR}
 
 LIBADD=	edit ntp m opts pthread
 CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
 		-I${DESTDIR}/${INCLUDEDIR}/edit
 
 .if ${MK_OPENSSL} != "no"
 LIBADD+=	crypto
 .else
 LIBADD+=	md
 .endif
 
 CLEANFILES+= .version version.c
 
 version.c:
 	sh -e ${.CURDIR}/../scripts/mkver ntpdc
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/ntp/ntpq/Makefile
===================================================================
--- head/usr.sbin/ntp/ntpq/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/ntpq/Makefile	(revision 314472)
@@ -1,40 +1,39 @@
 # $FreeBSD$
 
 MAN=
 
 .include <src.opts.mk>
-.include <bsd.own.mk>
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/ntpq
+.PATH: ${SRCTOP}/contrib/ntp/ntpq
 
 BINDIR=	/usr/bin
 
 PROG=	ntpq
 SRCS= 	ntpq.c ntpq-opts.c ntpq-subs.c version.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-	-I${.CURDIR}/../../../contrib/ntp/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/${NTP_ATOMIC}/include \
-	-I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
-	-I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+	-I${SRCTOP}/contrib/ntp/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/${NTP_ATOMIC}/include \
+	-I${SRCTOP}/contrib/ntp/sntp/libopts \
+	-I${.CURDIR:H}
 
 LIBADD+=	edit ntp opts m pthread
 
 .if ${MK_OPENSSL} != "no"
 LIBADD+=	crypto
 .else
 LIBADD+=	md
 .endif
 
 CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
 		-I${DESTDIR}/${INCLUDEDIR}/edit
 
 CLEANFILES+= .version version.c
 
 version.c:
 	sh -e ${.CURDIR}/../scripts/mkver ntpq
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/ntp/ntptime/Makefile
===================================================================
--- head/usr.sbin/ntp/ntptime/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/ntptime/Makefile	(revision 314472)
@@ -1,16 +1,16 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/util
+.PATH: ${SRCTOP}/contrib/ntp/util
 
 PROG=	ntptime
 MAN=
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/include/ \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include/ \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
-	-I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/include/ \
+	-I${SRCTOP}/contrib/ntp/lib/isc/unix/include/ \
+	-I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+	-I${.CURDIR:H}
 
 LIBADD=	ntp pthread
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/ntp/sntp/Makefile
===================================================================
--- head/usr.sbin/ntp/sntp/Makefile	(revision 314471)
+++ head/usr.sbin/ntp/sntp/Makefile	(revision 314472)
@@ -1,31 +1,31 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
-.PATH:	${.CURDIR}/../../../contrib/ntp/sntp
+.PATH:	${SRCTOP}/contrib/ntp/sntp
 
 PROG=	sntp
 MK_MAN=	no
 SRCS= 	crypto.c kod_management.c log.c main.c networking.c \
 	sntp-opts.c sntp.c utilities.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-	-I${.CURDIR}/../../../contrib/ntp/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
-	-I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
-	-I${.CURDIR}/../../../contrib/ntp/sntp \
-	-I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
-	-I${.CURDIR}/../../../contrib/ntp/sntp/libevent/include \
-	-I${.CURDIR}/../libntpevent \
-	-I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+	-I${SRCTOP}/contrib/ntp/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+	-I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+	-I${SRCTOP}/contrib/ntp/sntp \
+	-I${SRCTOP}/contrib/ntp/sntp/libopts \
+	-I${SRCTOP}/contrib/ntp/sntp/libevent/include \
+	-I${.CURDIR:H}/libntpevent \
+	-I${.CURDIR:H}
 
 LIBADD=	m opts ntp ntpevent pthread
 
 .if ${MK_OPENSSL} != "no"
 LIBADD+=	crypto
 .else
 LIBADD+=	md
 .endif
 
 .include <bsd.prog.mk>