Index: stable/11/usr.sbin/fstyp/Makefile =================================================================== --- stable/11/usr.sbin/fstyp/Makefile (revision 319190) +++ stable/11/usr.sbin/fstyp/Makefile (revision 319191) @@ -1,44 +1,44 @@ # $FreeBSD$ .include PROG= fstyp SRCS= cd9660.c exfat.c ext2fs.c fstyp.c geli.c msdosfs.c ntfs.c ufs.c .if ${MK_ZFS} != "no" SRCS += zfs.c .endif MAN= fstyp.8 WARNS?= 2 .if ${MK_TESTS} != "no" SUBDIR+= tests .endif CFLAGS+=-I${SRCTOP}/sys .if ${MK_ZFS} != "no" IGNORE_PRAGMA= YES CFLAGS+= -DNEED_SOLARIS_BOOLEAN -DHAVE_ZFS -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/libnvpair -CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libzpool/common -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${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/libnvpair +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +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 .endif LIBADD= geom md .if ${MK_ZFS} != "no" LIBADD+=nvpair zfs .endif .include Index: stable/11/usr.sbin/ntp/doc/Makefile =================================================================== --- stable/11/usr.sbin/ntp/doc/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/doc/Makefile (revision 319191) @@ -1,34 +1,33 @@ # $FreeBSD$ .include 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 Index: stable/11/usr.sbin/ntp/doc/drivers/Makefile =================================================================== --- stable/11/usr.sbin/ntp/doc/drivers/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/doc/drivers/Makefile (revision 319191) @@ -1,21 +1,21 @@ # $FreeBSD$ .include 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 Index: stable/11/usr.sbin/ntp/doc/drivers/icons/Makefile =================================================================== --- stable/11/usr.sbin/ntp/doc/drivers/icons/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/doc/drivers/icons/Makefile (revision 319191) @@ -1,13 +1,13 @@ # $FreeBSD$ .include 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 Index: stable/11/usr.sbin/ntp/doc/drivers/scripts/Makefile =================================================================== --- stable/11/usr.sbin/ntp/doc/drivers/scripts/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/doc/drivers/scripts/Makefile (revision 319191) @@ -1,13 +1,13 @@ # $FreeBSD$ .include 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 Index: stable/11/usr.sbin/ntp/doc/hints/Makefile =================================================================== --- stable/11/usr.sbin/ntp/doc/hints/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/doc/hints/Makefile (revision 319191) @@ -1,17 +1,17 @@ # $FreeBSD$ .include 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 Index: stable/11/usr.sbin/ntp/doc/icons/Makefile =================================================================== --- stable/11/usr.sbin/ntp/doc/icons/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/doc/icons/Makefile (revision 319191) @@ -1,13 +1,13 @@ # $FreeBSD$ .include 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 Index: stable/11/usr.sbin/ntp/doc/pic/Makefile =================================================================== --- stable/11/usr.sbin/ntp/doc/pic/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/doc/pic/Makefile (revision 319191) @@ -1,27 +1,27 @@ # $FreeBSD$ .include 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 Index: stable/11/usr.sbin/ntp/doc/scripts/Makefile =================================================================== --- stable/11/usr.sbin/ntp/doc/scripts/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/doc/scripts/Makefile (revision 319191) @@ -1,15 +1,15 @@ # $FreeBSD$ .include 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 Index: stable/11/usr.sbin/ntp/libntp/Makefile =================================================================== --- stable/11/usr.sbin/ntp/libntp/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/libntp/Makefile (revision 319191) @@ -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}/../ \ +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${SRCTOP}/lib/libc/${MACHINE_ARCH} \ + -I${SRCTOP}/lib/libedit/edit \ + -I${.CURDIR:H} \ -I${.CURDIR}/ CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H CLEANFILES+= .version version.c version.c: - sh -e ${.CURDIR}/../scripts/mkver ntpd + sh -e ${.CURDIR:H}/scripts/mkver ntpd .include Index: stable/11/usr.sbin/ntp/libntpevent/Makefile =================================================================== --- stable/11/usr.sbin/ntp/libntpevent/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/libntpevent/Makefile (revision 319191) @@ -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 Index: stable/11/usr.sbin/ntp/libopts/Makefile =================================================================== --- stable/11/usr.sbin/ntp/libopts/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/libopts/Makefile (revision 319191) @@ -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 Index: stable/11/usr.sbin/ntp/libparse/Makefile =================================================================== --- stable/11/usr.sbin/ntp/libparse/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/libparse/Makefile (revision 319191) @@ -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 Index: stable/11/usr.sbin/ntp/ntp-keygen/Makefile =================================================================== --- stable/11/usr.sbin/ntp/ntp-keygen/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/ntp-keygen/Makefile (revision 319191) @@ -1,29 +1,29 @@ # $FreeBSD$ MAN= .include -.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 Index: stable/11/usr.sbin/ntp/ntpd/Makefile =================================================================== --- stable/11/usr.sbin/ntp/ntpd/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/ntpd/Makefile (revision 319191) @@ -1,52 +1,52 @@ # $FreeBSD$ MAN= .include -.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 Index: stable/11/usr.sbin/ntp/ntpdate/Makefile =================================================================== --- stable/11/usr.sbin/ntp/ntpdate/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/ntpdate/Makefile (revision 319191) @@ -1,30 +1,30 @@ # $FreeBSD$ .include -.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 +version.c: + sh -e ${.CURDIR:H}/scripts/mkver ntpdate .include Index: stable/11/usr.sbin/ntp/ntpdc/Makefile =================================================================== --- stable/11/usr.sbin/ntp/ntpdc/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/ntpdc/Makefile (revision 319191) @@ -1,36 +1,35 @@ # $FreeBSD$ MAN= .include -.include -.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 + sh -e ${.CURDIR:H}/scripts/mkver ntpdc .include Index: stable/11/usr.sbin/ntp/ntpq/Makefile =================================================================== --- stable/11/usr.sbin/ntp/ntpq/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/ntpq/Makefile (revision 319191) @@ -1,40 +1,39 @@ # $FreeBSD$ MAN= .include -.include -.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 + sh -e ${.CURDIR:H}/scripts/mkver ntpq .include Index: stable/11/usr.sbin/ntp/ntptime/Makefile =================================================================== --- stable/11/usr.sbin/ntp/ntptime/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/ntptime/Makefile (revision 319191) @@ -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 Index: stable/11/usr.sbin/ntp/sntp/Makefile =================================================================== --- stable/11/usr.sbin/ntp/sntp/Makefile (revision 319190) +++ stable/11/usr.sbin/ntp/sntp/Makefile (revision 319191) @@ -1,31 +1,31 @@ # $FreeBSD$ .include -.PATH: ${.CURDIR}/../../../contrib/ntp/sntp +.PATH: ${SRCTOP}/contrib/ntp/sntp PROG= sntp MAN= 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 Index: stable/11/usr.sbin/rpc.yppasswdd/Makefile =================================================================== --- stable/11/usr.sbin/rpc.yppasswdd/Makefile (revision 319190) +++ stable/11/usr.sbin/rpc.yppasswdd/Makefile (revision 319191) @@ -1,61 +1,61 @@ # $FreeBSD$ RPCDIR= ${DESTDIR}/usr/include/rpcsvc -.PATH: ${.CURDIR}/../../usr.sbin/ypserv ${.CURDIR}/../../usr.bin/chpass \ - ${.CURDIR}/../../libexec/ypxfr ${RPCDIR} +.PATH: ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/usr.bin/chpass \ + ${SRCTOP}/libexec/ypxfr ${RPCDIR} PROG= rpc.yppasswdd SCRIPTS=yppwupdate SCRIPTSDIR= ${LIBEXECDIR} MAN= rpc.yppasswdd.8 SRCS= util.c yp_access.c yp_dblookup.c yp_dbwrite.c \ yp_error.c yppasswdd_main.c yppasswdd_server.c ypxfr_misc.c ${GENSRCS} GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_private.h yppasswd_private_svc.c \ yppasswd_private_xdr.c yppasswd_svc.c WARNS?= 5 CFLAGS+= -fno-strict-aliasing -CFLAGS+= -I${.CURDIR}/../../usr.sbin/vipw \ - -I${.CURDIR}/../../usr.sbin/ypserv \ - -I${.CURDIR}/../../libexec/ypxfr \ +CFLAGS+= -I${SRCTOP}/usr.sbin/vipw \ + -I${SRCTOP}/usr.sbin/ypserv \ + -I${SRCTOP}/libexec/ypxfr \ -I${.CURDIR} -I. LIBADD= rpcsvc crypt util CLEANFILES= ${GENSRCS} RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that # yppasswdd_main.c can see it. yppasswd_svc.c: yppasswd.x rm -f ${.TARGET} ${RPCGEN} -m ${RPCDIR}/yppasswd.x | \ sed s/"static int _rpcsvcstate"/"int _rpcsvcstate"/g > ${.TARGET} yppasswd.h: yppasswd.x rm -f ${.TARGET} ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/yppasswd.x yp.h: yp.x rm -f ${.TARGET} ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/yp.x yp_clnt.c: yp.x rm -f ${.TARGET} ${RPCGEN} -DYPSERV_ONLY -l -o ${.TARGET} ${RPCDIR}/yp.x yppasswd_private.h: yppasswd_private.x rm -f ${.TARGET} ${RPCGEN} -h -o ${.TARGET} ${.CURDIR}/yppasswd_private.x yppasswd_private_xdr.c: yppasswd_private.x rm -f ${.TARGET} ${RPCGEN} -c -o ${.TARGET} ${.CURDIR}/yppasswd_private.x yppasswd_private_svc.c: yppasswd_private.x rm -f ${.TARGET} ${RPCGEN} -m ${.CURDIR}/yppasswd_private.x | \ sed s/"static int _rpcsvcstate = _IDLE"/"extern int _rpcsvcstate"/g > ${.TARGET} .include Index: stable/11/usr.sbin/rpc.ypupdated/Makefile =================================================================== --- stable/11/usr.sbin/rpc.ypupdated/Makefile (revision 319190) +++ stable/11/usr.sbin/rpc.ypupdated/Makefile (revision 319191) @@ -1,33 +1,33 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../ypserv ${.CURDIR}/../../libexec/ypxfr +.PATH: ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr PROG= rpc.ypupdated MAN= SRCS= ypupdate_prot_svc.c ypupdate_prot.h ypupdated_main.c \ yp_error.c update.c ypupdated_server.c \ yp_dblookup.c yp_dbwrite.c yp_dbdelete.c yp_dbupdate.c #CFLAGS+= -DYP -CFLAGS+= -I${.CURDIR}/../ypserv -I. -I${.CURDIR}/../../libexec/ypxfr +CFLAGS+= -I${SRCTOP}/usr.sbin/ypserv -I. -I${SRCTOP}/libexec/ypxfr WARNS?= 1 LIBADD= rpcsvc CLEANFILES= ypupdate_prot_svc.c ypupdate_prot.h RPCDIR= ${DESTDIR}/usr/include/rpcsvc RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that # ypupdated_main.c can see it. ypupdate_prot_svc.c: ${RPCDIR}/ypupdate_prot.x rm -f ${.TARGET} - ${RPCGEN} -m ${RPCDIR}/ypupdate_prot.x | \ + ${RPCGEN} -m ${.ALLSRC} | \ sed s/"static int _rpcsvcstate"/"int _rpcsvcstate"/g > ${.TARGET} ypupdate_prot.h: ${RPCDIR}/ypupdate_prot.x - ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/ypupdate_prot.x + ${RPCGEN} -h -o ${.TARGET} ${.ALLSRC} .include Index: stable/11/usr.sbin/rpc.ypxfrd/Makefile =================================================================== --- stable/11/usr.sbin/rpc.ypxfrd/Makefile (revision 319190) +++ stable/11/usr.sbin/rpc.ypxfrd/Makefile (revision 319191) @@ -1,36 +1,36 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../usr.sbin/ypserv +.PATH: ${SRCTOP}/usr.sbin/ypserv PROG= rpc.ypxfrd MAN= rpc.ypxfrd.8 SRCS= ypxfrd_svc.c ypxfrd.h ypxfrd_server.c yp_error.c \ yp_access.c ypxfrd_main.c CFLAGS+= -I. -DXFRBLOCKSIZE=65535 WARNS?= 2 LIBADD= rpcsvc CLEANFILES= ypxfrd_svc.c ypxfrd.h -RPCDIR= ${.CURDIR}/../../include/rpcsvc +RPCDIR= ${SRCTOP}/include/rpcsvc RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that # ypxfrd_main.c can see it. ypxfrd_svc.c: ${RPCDIR}/ypxfrd.x rm -f ${.TARGET} - ${RPCGEN} -m ${RPCDIR}/ypxfrd.x | \ + ${RPCGEN} -m ${.ALLSRC} | \ sed s/"static int _rpcsvcstate"/"int _rpcsvcstate"/g > ${.TARGET} # ypxfrd_xdr.c: ${RPCDIR}/ypxfrd.x # rm -f ${.TARGET} # ${RPCGEN} -c -o ${.TARGET} ${RPCDIR}/ypxfrd.x ypxfrd.h: ${RPCDIR}/ypxfrd.x rm -f ${.TARGET} - ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/ypxfrd.x + ${RPCGEN} -h -o ${.TARGET} ${.ALLSRC} .include Index: stable/11/usr.sbin/tcpdchk/Makefile =================================================================== --- stable/11/usr.sbin/tcpdchk/Makefile (revision 319190) +++ stable/11/usr.sbin/tcpdchk/Makefile (revision 319191) @@ -1,22 +1,22 @@ # $FreeBSD$ .include -.PATH: ${.CURDIR}/../../contrib/tcp_wrappers +.PATH: ${SRCTOP}/contrib/tcp_wrappers PROG= tcpdchk MAN= tcpdchk.8 SRCS= tcpdchk.c fakelog.c inetcf.c scaffold.c CFLAGS+=-DREAL_DAEMON_DIR=\"${LIBEXECDIR}\" \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 -DPROCESS_OPTIONS \ -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 .endif WARNS?= 0 LIBADD= wrap .include Index: stable/11/usr.sbin/tcpdmatch/Makefile =================================================================== --- stable/11/usr.sbin/tcpdmatch/Makefile (revision 319190) +++ stable/11/usr.sbin/tcpdmatch/Makefile (revision 319191) @@ -1,21 +1,21 @@ # $FreeBSD$ .include -.PATH: ${.CURDIR}/../../contrib/tcp_wrappers +.PATH: ${SRCTOP}/contrib/tcp_wrappers PROG= tcpdmatch MAN= tcpdmatch.8 SRCS= tcpdmatch.c fakelog.c inetcf.c scaffold.c CFLAGS+=-DREAL_DAEMON_DIR=\"${LIBEXECDIR}\" \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 .endif WARNS?= 0 LIBADD= wrap .include Index: stable/11/usr.sbin/traceroute/Makefile =================================================================== --- stable/11/usr.sbin/traceroute/Makefile (revision 319190) +++ stable/11/usr.sbin/traceroute/Makefile (revision 319191) @@ -1,41 +1,41 @@ # $FreeBSD$ -TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute +TRACEROUTE_DISTDIR?= ${SRCTOP}/contrib/traceroute .PATH: ${TRACEROUTE_DISTDIR} PROG= traceroute MAN= traceroute.8 SRCS= as.c version.c traceroute.c ifaddrlist.c findsaddr-udp.c BINOWN= root BINMODE=4555 CLEANFILES= version.c CFLAGS+= -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKIO_H=1 \ -DHAVE_NET_ROUTE_H=1 -DHAVE_NET_IF_DL_H=1 \ -DHAVE_STRERROR=1 -DHAVE_USLEEP=1 \ -DHAVE_SYS_SYSCTL_H=1 -DBYTESWAP_IP_HDR=1 \ -DHAVE_SETLINEBUF=1 -DHAVE_RAW_OPTIONS=1 \ -DHAVE_SOCKADDR_SA_LEN=1 -DHAVE_ICMP_NEXTMTU=1 .if !defined(TRACEROUTE_NO_IPSEC) CFLAGS+= -DIPSEC .endif # RTT Jitter on the internet these days means printing 3 decimal places on # > 1000ms times is plain useless. Uncomment this to enable variable precision # reporting, ie: print a variable precision from 0.001ms through 1000ms # CFLAGS+= -DSANE_PRECISION .if !defined(TRACEROUTE_NO_IPSEC) LIBADD+= ipsec .endif CFLAGS+= -I${TRACEROUTE_DISTDIR} WARNS?= 3 version.c: ${TRACEROUTE_DISTDIR}/VERSION @rm -f ${.TARGET} head -1 ${TRACEROUTE_DISTDIR}/VERSION | \ sed -e 's/.*/char version[] = "&";/' \ > ${.TARGET} .include Index: stable/11/usr.sbin/traceroute6/Makefile =================================================================== --- stable/11/usr.sbin/traceroute6/Makefile (revision 319190) +++ stable/11/usr.sbin/traceroute6/Makefile (revision 319191) @@ -1,32 +1,32 @@ # Copyright (c) 1996 WIDE Project. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modifications, are permitted provided that the above copyright notice # and this paragraph are duplicated in all such forms and that any # documentation, advertising materials, and other materials related to # such distribution and use acknowledge that the software was developed # by the WIDE Project, Japan. The name of the Project may not be used to # endorse or promote products derived from this software without # specific prior written permission. THIS SOFTWARE IS PROVIDED ``AS IS'' # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # A PARTICULAR PURPOSE. # $FreeBSD$ -TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute +TRACEROUTE_DISTDIR?= ${SRCTOP}/contrib/traceroute .PATH: ${TRACEROUTE_DISTDIR} PROG= traceroute6 MAN= traceroute6.8 SRCS= as.c traceroute6.c BINOWN= root BINMODE= 4555 CFLAGS+= -DIPSEC -DUSE_RFC2292BIS -DHAVE_POLL CFLAGS+= -I${.CURDIR} -I${TRACEROUTE_DISTDIR} -I. WARNS?= 3 LIBADD= ipsec .include Index: stable/11/usr.sbin/uathload/Makefile =================================================================== --- stable/11/usr.sbin/uathload/Makefile (revision 319190) +++ stable/11/usr.sbin/uathload/Makefile (revision 319191) @@ -1,16 +1,16 @@ # $FreeBSD$ PROG= uathload MAN= uathload.8 SRCS= uathload.c FILES= ar5523.bin FILESDIR= ${SHAREDIR}/firmware FILESMODE= 444 CLEANFILES= ar5523.bin -ar5523.bin: ${.CURDIR}/../../sys/contrib/dev/uath/ar5523.bin.uu - uudecode -p ${.CURDIR}/../../sys/contrib/dev/uath/ar5523.bin.uu > ${.TARGET} +ar5523.bin: ${SRCTOP}/sys/contrib/dev/uath/ar5523.bin.uu + uudecode -p ${.ALLSRC} > ${.TARGET} .include Index: stable/11/usr.sbin/unbound/anchor/Makefile =================================================================== --- stable/11/usr.sbin/unbound/anchor/Makefile (revision 319190) +++ stable/11/usr.sbin/unbound/anchor/Makefile (revision 319191) @@ -1,16 +1,16 @@ # $FreeBSD$ # Vendor sources and generated files -LDNSDIR= ${.CURDIR}/../../../contrib/ldns -UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound -EXPATDIR= ${.CURDIR}/../../../contrib/expat +LDNSDIR= ${SRCTOP}/contrib/ldns +UNBOUNDDIR= ${SRCTOP}/contrib/unbound +EXPATDIR= ${SRCTOP}/contrib/expat .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/doc PROG= unbound-anchor SRCS= unbound-anchor.c CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${EXPATDIR}/lib LIBADD= unbound bsdxml ssl crypto pthread MAN= unbound-anchor.8 .include Index: stable/11/usr.sbin/unbound/checkconf/Makefile =================================================================== --- stable/11/usr.sbin/unbound/checkconf/Makefile (revision 319190) +++ stable/11/usr.sbin/unbound/checkconf/Makefile (revision 319191) @@ -1,15 +1,15 @@ # $FreeBSD$ # Vendor sources and generated files -LDNSDIR= ${.CURDIR}/../../../contrib/ldns -UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound +LDNSDIR= ${SRCTOP}/contrib/ldns +UNBOUNDDIR= ${SRCTOP}/contrib/unbound .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc PROG= unbound-checkconf SRCS= ub_event.c unbound-checkconf.c worker_cb.c CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} LIBADD= unbound pthread MAN= unbound-checkconf.8 .include Index: stable/11/usr.sbin/unbound/control/Makefile =================================================================== --- stable/11/usr.sbin/unbound/control/Makefile (revision 319190) +++ stable/11/usr.sbin/unbound/control/Makefile (revision 319191) @@ -1,15 +1,15 @@ # $FreeBSD$ # Vendor sources and generated files -LDNSDIR= ${.CURDIR}/../../../contrib/ldns -UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound +LDNSDIR= ${SRCTOP}/contrib/ldns +UNBOUNDDIR= ${SRCTOP}/contrib/unbound .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc PROG= unbound-control SRCS= ub_event.c unbound-control.c worker_cb.c CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} LIBADD= unbound crypto ssl pthread MAN= unbound-control.8 .include Index: stable/11/usr.sbin/unbound/daemon/Makefile =================================================================== --- stable/11/usr.sbin/unbound/daemon/Makefile (revision 319190) +++ stable/11/usr.sbin/unbound/daemon/Makefile (revision 319191) @@ -1,16 +1,16 @@ # $FreeBSD$ # Vendor sources and generated files -LDNSDIR= ${.CURDIR}/../../../contrib/ldns -UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound +LDNSDIR= ${SRCTOP}/contrib/ldns +UNBOUNDDIR= ${SRCTOP}/contrib/unbound .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/daemon ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc PROG= unbound SRCS= acl_list.c cachedump.c daemon.c remote.c stats.c ub_event.c \ unbound.c worker.c CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} LIBADD= unbound util ssl crypto pthread MAN= unbound.8 unbound.conf.5 .include Index: stable/11/usr.sbin/yp_mkdb/Makefile =================================================================== --- stable/11/usr.sbin/yp_mkdb/Makefile (revision 319190) +++ stable/11/usr.sbin/yp_mkdb/Makefile (revision 319191) @@ -1,14 +1,14 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../libexec/ypxfr ${.CURDIR}/../ypserv +.PATH: ${SRCTOP}/libexec/ypxfr ${SRCTOP}/usr.sbin/ypserv PROG= yp_mkdb MAN= yp_mkdb.8 SRCS= yp_mkdb.c yp_dblookup.c yp_dbwrite.c CFLAGS+= -Dyp_error=warnx -CFLAGS+= -I${.CURDIR}/../../libexec/ypxfr -I${.CURDIR}/../../usr.sbin/ypserv +CFLAGS+= -I${SRCTOP}/libexec/ypxfr -I${SRCTOP}/usr.sbin/ypserv WARNS?= 1 .include Index: stable/11/usr.sbin/ypldap/Makefile =================================================================== --- stable/11/usr.sbin/ypldap/Makefile (revision 319190) +++ stable/11/usr.sbin/ypldap/Makefile (revision 319191) @@ -1,20 +1,20 @@ # $OpenBSD: Makefile,v 1.8 2015/09/09 15:33:18 deraadt Exp $ # $FreeBSD$ PROG= ypldap SRCS= parse.y ypldap.c log.c \ ldapclient.c entries.c yp.c \ aldap.c ber.c \ ypldap_dns.c MAN= ypldap.8 ypldap.conf.5 LIBADD= openbsd event util rpcsvc CFLAGS+=-I${.CURDIR} -CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent -CFLAGS+=-I${.CURDIR}/../../lib/libopenbsd +CFLAGS+=-I${SRCTOP}/contrib/pf/libevent +CFLAGS+=-I${SRCTOP}/lib/libopenbsd WARNS= 2 .include Index: stable/11/usr.sbin/yppush/Makefile =================================================================== --- stable/11/usr.sbin/yppush/Makefile (revision 319190) +++ stable/11/usr.sbin/yppush/Makefile (revision 319191) @@ -1,30 +1,29 @@ # $FreeBSD$ -RPCDIR= ${.CURDIR}/../../include/rpcsvc -.PATH: ${RPCDIR} ${.CURDIR}/../../usr.sbin/ypserv \ - ${.CURDIR}/../../libexec/ypxfr +RPCDIR= ${SRCTOP}/include/rpcsvc +.PATH: ${RPCDIR} ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr PROG= yppush MAN= yppush.8 SRCS= ypxfr_getmap.c yp_dblookup.c yp_error.c ypxfr_misc.c yppush_main.c \ ${GENSRCS} GENSRCS=yp.h yp_clnt.c yppush_svc.c -CFLAGS+= -I. -I${.CURDIR}/../../libexec/ypxfr +CFLAGS+= -I. -I${SRCTOP}/libexec/ypxfr WARNS?= 2 RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C CLEANFILES= ${GENSRCS} yppush_svc.c: yp.x ${RPCGEN} -DYPPUSH_ONLY -m -o ${.TARGET} ${RPCDIR}/yp.x yp_clnt.c: yp.x ${RPCGEN} -DYPSERV_ONLY -l -o ${.TARGET} ${RPCDIR}/yp.x yp.h: yp.x ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/yp.x .include Index: stable/11/usr.sbin/ypserv/Makefile =================================================================== --- stable/11/usr.sbin/ypserv/Makefile (revision 319190) +++ stable/11/usr.sbin/ypserv/Makefile (revision 319191) @@ -1,50 +1,49 @@ # $FreeBSD$ .include -RPCDIR= ${.CURDIR}/../../include/rpcsvc -.PATH: ${RPCDIR} \ - ${.CURDIR}/common +RPCDIR= ${SRCTOP}/include/rpcsvc +.PATH: ${RPCDIR} ${.CURDIR}/common PROG= ypserv MAN= ypserv.8 ypinit.8 SRCS= yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \ ypxfr_clnt.c yp.h yp_main.c yp_error.c yp_access.c yp_svc_udp.c \ yplib_host.c CFLAGS+= -DDB_CACHE -I. WARNS?= 0 .if ${MK_TCP_WRAPPERS} != "no" CFLAGS+= -DTCP_WRAPPER LIBADD+= wrap .endif CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that # yp_main.c can see it. yp_svc.c: yp.x rm -f ${.TARGET} ${RPCGEN} -DYPSERV_ONLY -m ${RPCDIR}/yp.x | \ sed s/"static int _rpcsvcstate"/"int _rpcsvcstate"/g > ${.TARGET} ypxfr_clnt.c: yp.x ${RPCGEN} -DYPPUSH_ONLY -l -o ${.TARGET} ${RPCDIR}/yp.x yp.h: yp.x ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/yp.x FILES= Makefile.yp FILESNAME= Makefile.dist FILESDIR= /var/yp SCRIPTS= ypinit.sh .if !exists(${DESTDIR}${FILESDIR}/Makefile) SYMLINKS= ${FILESNAME} ${FILESDIR}/Makefile .endif .include Index: stable/11/usr.sbin/zic/Makefile.inc =================================================================== --- stable/11/usr.sbin/zic/Makefile.inc (revision 319190) +++ stable/11/usr.sbin/zic/Makefile.inc (revision 319191) @@ -1,3 +1,3 @@ # $FreeBSD$ -.include "${.CURDIR}/../../Makefile.inc" +.include "${SRCTOP}/usr.sbin/Makefile.inc" Index: stable/11/usr.sbin/zic/zdump/Makefile =================================================================== --- stable/11/usr.sbin/zic/zdump/Makefile (revision 319190) +++ stable/11/usr.sbin/zic/zdump/Makefile (revision 319191) @@ -1,15 +1,15 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/tzcode/zic +.PATH: ${SRCTOP}/contrib/tzcode/zic PROG= zdump MAN= zdump.8 SRCS= zdump.c ialloc.c scheck.c CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"${SHAREDIR}/zoneinfo\" -Demkdir=mkdir -CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime +CFLAGS+= -I${.CURDIR:H} -I${SRCTOP}/contrib/tzcode/stdtime WARNS?= 2 .include Index: stable/11/usr.sbin/zic/zic/Makefile =================================================================== --- stable/11/usr.sbin/zic/zic/Makefile (revision 319190) +++ stable/11/usr.sbin/zic/zic/Makefile (revision 319191) @@ -1,16 +1,16 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/tzcode/zic +.PATH: ${SRCTOP}/contrib/tzcode/zic PROG= zic MAN= zic.8 SRCS= zic.c ialloc.c scheck.c CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"${SHAREDIR}/zoneinfo\" -Demkdir=mkdir CFLAGS+= -DHAVE_STRERROR -DHAVE_UNISTD_H -CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime +CFLAGS+= -I${.CURDIR:H} -I${SRCTOP}/contrib/tzcode/stdtime WARNS?= 2 .include Index: stable/11/usr.sbin/zonectl/Makefile =================================================================== --- stable/11/usr.sbin/zonectl/Makefile (revision 319190) +++ stable/11/usr.sbin/zonectl/Makefile (revision 319191) @@ -1,10 +1,10 @@ # $FreeBSD$ PROG= zonectl SRCS= zonectl.c -SDIR= ${.CURDIR}/../../sys +SDIR= ${SRCTOP}/sys LIBADD= cam sbuf util MAN= zonectl.8 CFLAGS+=-g -O0 .include Index: stable/11 =================================================================== --- stable/11 (revision 319190) +++ stable/11 (revision 319191) Property changes on: stable/11 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r314451-314453,314456-314462,314464,314466,314468,314470,314472,314478