Index: head/usr.bin/bsdiff/bsdiff/Makefile =================================================================== --- head/usr.bin/bsdiff/bsdiff/Makefile (revision 315169) +++ head/usr.bin/bsdiff/bsdiff/Makefile (revision 315170) @@ -1,18 +1,18 @@ # $FreeBSD$ PROG= bsdiff # libdivsufsort configured with: # cmake -DCMAKE_BUILD_TYPE="Release" -DBUILD_DIVSUFSORT64=ON -.PATH: ${.CURDIR}/../../../contrib/libdivsufsort/lib +.PATH: ${SRCTOP}/contrib/libdivsufsort/lib CFLAGS+= -DHAVE_CONFIG_H=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE CFLAGS+= -D_LARGE_FILES -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS CFLAGS+= -D__STDC_LIMIT_MACROS -DBUILD_DIVSUFSORT64 -CFLAGS+= -I${.CURDIR}/../../../contrib/libdivsufsort/include -I${.CURDIR} +CFLAGS+= -I${SRCTOP}/contrib/libdivsufsort/include -I${.CURDIR} SRCS= divsufsort.c sssort.c trsort.c utils.c SRCS+= bsdiff.c LIBADD= bz2 .include Index: head/usr.bin/bzip2/Makefile =================================================================== --- head/usr.bin/bzip2/Makefile (revision 315169) +++ head/usr.bin/bzip2/Makefile (revision 315170) @@ -1,50 +1,50 @@ # $FreeBSD$ -BZ2DIR= ${.CURDIR}/../../contrib/bzip2 +BZ2DIR= ${SRCTOP}/contrib/bzip2 .PATH: ${BZ2DIR} PROG= bzip2 CFLAGS+= -D_FILE_OFFSET_BITS=64 WARNS?= 3 LIBADD= bz2 LINKS= ${BINDIR}/bzip2 ${BINDIR}/bunzip2 LINKS+= ${BINDIR}/bzip2 ${BINDIR}/bzcat MLINKS= bzip2.1 bunzip2.1 bzip2.1 bzcat.1 REFFILES= sample1.ref sample2.ref sample3.ref DREFFILES= sample1.bz2 sample2.bz2 sample3.bz2 TESTFILES= ${REFFILES} ${DREFFILES} CLEANFILES+= ${TESTFILES} \ sample1.rb2 sample2.rb2 sample3.rb2 \ sample1.tst sample2.tst sample3.tst .for f in ${REFFILES} ${f}: ${f}.gz.uu uudecode -p ${BZ2DIR}/${f}.gz.uu | gunzip > ${f} .endfor .for f in ${DREFFILES} ${f}: ${f}.uu uudecode ${BZ2DIR}/${f}.uu .endfor test: bzip2 ${TESTFILES} @cat ${BZ2DIR}/words1 ./bzip2 -1 < sample1.ref > sample1.rb2 ./bzip2 -2 < sample2.ref > sample2.rb2 ./bzip2 -3 < sample3.ref > sample3.rb2 ./bzip2 -d < sample1.bz2 > sample1.tst ./bzip2 -d < sample2.bz2 > sample2.tst ./bzip2 -ds < sample3.bz2 > sample3.tst cmp sample1.bz2 sample1.rb2 cmp sample2.bz2 sample2.rb2 cmp sample3.bz2 sample3.rb2 cmp sample1.tst sample1.ref cmp sample2.tst sample2.ref cmp sample3.tst sample3.ref @cat ${BZ2DIR}/words3 .include Index: head/usr.bin/bzip2recover/Makefile =================================================================== --- head/usr.bin/bzip2recover/Makefile (revision 315169) +++ head/usr.bin/bzip2recover/Makefile (revision 315170) @@ -1,11 +1,11 @@ # $FreeBSD$ -BZ2DIR= ${.CURDIR}/../../contrib/bzip2 +BZ2DIR= ${SRCTOP}/contrib/bzip2 .PATH: ${BZ2DIR} PROG= bzip2recover MAN= NO_WMISSING_VARIABLE_DECLARATIONS= .include Index: head/usr.bin/chkey/Makefile =================================================================== --- head/usr.bin/chkey/Makefile (revision 315169) +++ head/usr.bin/chkey/Makefile (revision 315170) @@ -1,15 +1,15 @@ # $FreeBSD$ .include -.PATH: ${.CURDIR}/../newkey +.PATH: ${SRCTOP}/usr.bin/newkey PROG= chkey SRCS= chkey.c generic.c update.c -CFLAGS+= -I${.CURDIR}/../newkey +CFLAGS+= -I${SRCTOP}/usr.bin/newkey .if ${MK_NIS} != "no" CFLAGS+= -DYP .endif LIBADD+= rpcsvc mp .include Index: head/usr.bin/chpass/Makefile =================================================================== --- head/usr.bin/chpass/Makefile (revision 315169) +++ head/usr.bin/chpass/Makefile (revision 315170) @@ -1,45 +1,45 @@ # @(#)Makefile 8.2 (Berkeley) 4/2/94 # $FreeBSD$ .include -.PATH: ${.CURDIR}/../../usr.sbin/pwd_mkdb ${.CURDIR}/../../lib/libc/gen +.PATH: ${SRCTOP}/usr.sbin/pwd_mkdb ${SRCTOP}/lib/libc/gen PROG= chpass SRCS= chpass.c edit.c field.c pw_scan.c table.c util.c BINOWN= root BINMODE=4555 PRECIOUSPROG= .if ${MK_NIS} != "no" CFLAGS+= -DYP .endif #Some people need this, uncomment to activate #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE -CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I. +CFLAGS+=-I${SRCTOP}/usr.sbin/pwd_mkdb -I${SRCTOP}/lib/libc/gen -I. LIBADD= crypt util .if ${MK_NIS} != "no" LIBADD+= ypclnt .endif SYMLINKS= chpass ${BINDIR}/chfn SYMLINKS+= chpass ${BINDIR}/chsh .if ${MK_NIS} != "no" SYMLINKS+= chpass ${BINDIR}/ypchfn SYMLINKS+= chpass ${BINDIR}/ypchpass SYMLINKS+= chpass ${BINDIR}/ypchsh .endif MLINKS= chpass.1 chfn.1 chpass.1 chsh.1 .if ${MK_NIS} != "no" MLINKS+= chpass.1 ypchpass.1 chpass.1 ypchfn.1 chpass.1 ypchsh.1 .endif beforeinstall: .for i in chpass chfn chsh ypchpass ypchfn ypchsh .if exists(${DESTDIR}${BINDIR}/$i) -chflags noschg ${DESTDIR}${BINDIR}/$i .endif .endfor .include Index: head/usr.bin/compile_et/Makefile =================================================================== --- head/usr.bin/compile_et/Makefile (revision 315169) +++ head/usr.bin/compile_et/Makefile (revision 315170) @@ -1,12 +1,12 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/com_err +.PATH: ${SRCTOP}/contrib/com_err PROG= compile_et SRCS= compile_et.c parse.y lex.l LIBADD= roken vers -CFLAGS+=-I. -I${.CURDIR}/../../contrib/com_err +CFLAGS+=-I. -I${SRCTOP}/contrib/com_err WARNS?= 0 .include Index: head/usr.bin/cpio/Makefile =================================================================== --- head/usr.bin/cpio/Makefile (revision 315169) +++ head/usr.bin/cpio/Makefile (revision 315170) @@ -1,39 +1,39 @@ # $FreeBSD$ .include -_LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive -_LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive +_LIBARCHIVECONFDIR= ${SRCTOP}/lib/libarchive PROG= bsdcpio BSDCPIO_VERSION_STRING= 3.3.1 .PATH: ${_LIBARCHIVEDIR}/cpio SRCS= cpio.c cmdline.c .PATH: ${_LIBARCHIVEDIR}/libarchive_fe SRCS+= err.c line_reader.c passphrase.c CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\" CFLAGS+= -DPLATFORM_CONFIG_H=\"${_LIBARCHIVECONFDIR}/config_freebsd.h\" CFLAGS+= -I${_LIBARCHIVEDIR}/cpio -I${_LIBARCHIVEDIR}/libarchive_fe .ifdef RELEASE_CRUNCH # FreeBSD's installer uses cpio in crunched binaries that are # statically linked, cannot use -lcrypto, and are size sensitive. CFLAGS+= -DSMALLER .endif LIBADD= archive .if ${MK_ICONV} != "no" CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const .endif SYMLINKS=bsdcpio ${BINDIR}/cpio MLINKS= bsdcpio.1 cpio.1 .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/usr.bin/ctlstat/Makefile =================================================================== --- head/usr.bin/ctlstat/Makefile (revision 315169) +++ head/usr.bin/ctlstat/Makefile (revision 315170) @@ -1,8 +1,8 @@ # $FreeBSD$ PROG= ctlstat MAN= ctlstat.8 -SDIR= ${.CURDIR}/../../sys +SDIR= ${SRCTOP}/sys CFLAGS+= -I${SDIR} .include Index: head/usr.bin/drill/Makefile =================================================================== --- head/usr.bin/drill/Makefile (revision 315169) +++ head/usr.bin/drill/Makefile (revision 315170) @@ -1,17 +1,17 @@ # $FreeBSD$ # Vendor sources and generated files -LDNSDIR= ${.CURDIR}/../../contrib/ldns +LDNSDIR= ${SRCTOP}/contrib/ldns .PATH: ${LDNSDIR}/drill PROG= drill SRCS= drill.c drill_util.c error.c root.c work.c \ chasetrace.c dnssec.c securetrace.c CFLAGS+= -I${LDNSDIR} NO_WERROR= true MAN= drill.1 LIBADD= ldns crypto .include Index: head/usr.bin/ee/Makefile =================================================================== --- head/usr.bin/ee/Makefile (revision 315169) +++ head/usr.bin/ee/Makefile (revision 315170) @@ -1,36 +1,36 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/ee +.PATH: ${SRCTOP}/contrib/ee CFLAGS+= -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \ -DHAS_SYS_WAIT PACKAGE=ee PROG= ee LINKS= ${BINDIR}/ee ${BINDIR}/ree ${BINDIR}/ee ${BINDIR}/edit MLINKS= ee.1 ree.1 ee.1 edit.1 LIBADD= ncursesw WARNS?= 2 NLS= C fr_FR.ISO8859-1 de_DE.ISO8859-1 pl_PL.ISO8859-2 \ uk_UA.KOI8-U pt_BR.ISO8859-1 ru_RU.KOI8-R hu_HU.ISO8859-2 NLSLINKS_C= en_US.ISO8859-1 en_US.ISO8859-15 NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \ fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \ fr_FR.ISO8859-15 NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \ de_CH.ISO8859-15 de_DE.ISO8859-15 NLSLINKS_pt_BR.ISO8859-1= pt_PT.ISO8859-1 NLSSRCFILES=ee.msg .for lang in ${NLS} . if exists(${.CURDIR}/nls/${lang}/ee.msg) NLSSRCDIR_${lang}= ${.CURDIR}/nls/${lang} . else -NLSSRCDIR_${lang}= ${.CURDIR}/../../contrib/ee +NLSSRCDIR_${lang}= ${SRCTOP}/contrib/ee . endif .endfor .include Index: head/usr.bin/elfcopy/Makefile =================================================================== --- head/usr.bin/elfcopy/Makefile (revision 315169) +++ head/usr.bin/elfcopy/Makefile (revision 315170) @@ -1,42 +1,42 @@ # $FreeBSD$ .include ELFTCDIR= ${SRCTOP}/contrib/elftoolchain ELFCOPYDIR= ${ELFTCDIR}/elfcopy .PATH: ${ELFCOPYDIR} PROG= objcopy objcopy.1: elfcopy.1 sed -e 's/\.Dt ELFCOPY 1/.Dt OBJCOPY 1/' \ -e 's/\.Nm elfcopy/.Nm objcopy/' < ${.ALLSRC} > ${.TARGET} CLEANFILES+= objcopy.1 SRCS= archive.c ascii.c binary.c main.c pe.c sections.c segments.c symbols.c WARNS?= 5 LIBADD= archive elftc elf pe CFLAGS+=-I${ELFTCDIR}/libelftc -I${ELFTCDIR}/libpe -I${ELFTCDIR}/common CFLAGS+=-DWITH_PE=1 MAN= ${PROG}.1 strip.1 LINKS= ${BINDIR}/${PROG} ${BINDIR}/strip # This same hack is in lib/libelf/Makefile and usr.bin/readelf/Makefile # We need to link against the correct version of these files. One -# solution is to include ../../sys in the include path. This causes +# solution is to include SRCTOP/sys in the include path. This causes # problems when a header file in sys depends on a file in another # part of the tree, e.g. a machine dependent header. # SRCS+= sys/elf_common.h CLEANDIRS= sys CFLAGS+= -I. sys/elf_common.h: ${SRCTOP}/sys/${.TARGET} .NOMETA mkdir -p ${.OBJDIR}/sys ln -sf ${.ALLSRC} ${.TARGET} .include Index: head/usr.bin/factor/Makefile =================================================================== --- head/usr.bin/factor/Makefile (revision 315169) +++ head/usr.bin/factor/Makefile (revision 315170) @@ -1,19 +1,19 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ .include PROG= factor SRCS= factor.c pr_tbl.c -CFLAGS+=-I${.CURDIR}/../primes +CFLAGS+=-I${SRCTOP}/usr.bin/primes .if ${MK_OPENSSL} != "no" CFLAGS+=-DHAVE_OPENSSL LIBADD+=crypto .endif MAN= factor.6 MLINKS+=factor.6 primes.6 -.PATH: ${.CURDIR}/../primes +.PATH: ${SRCTOP}/usr.bin/primes .include Index: head/usr.bin/file/Makefile =================================================================== --- head/usr.bin/file/Makefile (revision 315169) +++ head/usr.bin/file/Makefile (revision 315170) @@ -1,48 +1,48 @@ # $FreeBSD$ # Makefile for file(1) cmd. # Copyright (c) David E. O'Brien, 2000-2004, 2009 # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE. # # This software is not subject to any license of the American Telephone # and Telegraph Company or of the Regents of the University of California. # # Permission is granted to anyone to use this software for any purpose on # any computer system, and to alter it and redistribute it freely, subject # to the following restrictions: # # 1. The author is not responsible for the consequences of use of this # software, no matter how awful, even if they arise from flaws in it. # 2. The origin of this software must not be misrepresented, either by # explicit claim or by omission. Since few users ever read sources, # credits must appear in the documentation. # 3. Altered versions must be plainly marked as such, and must not be # misrepresented as being the original software. Since few users # ever read sources, credits must appear in the documentation. # 4. This notice may not be removed or altered. -SRCDIR= ${.CURDIR}/../../contrib/file +SRCDIR= ${SRCTOP}/contrib/file .PATH: ${SRCDIR}/src .PATH: ${SRCDIR}/doc PROG= file MAGICPATH?= /usr/share/misc CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H -CFLAGS+= -I${.CURDIR}/../../lib/libmagic +CFLAGS+= -I${SRCTOP}/lib/libmagic LIBADD= magic FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \ - ${.CURDIR}/../../lib/libmagic/config.h + ${SRCTOP}/lib/libmagic/config.h CLEANFILES+= ${MAN} .include .for mp in ${MAN} ${mp}: ${mp:C/[0-9]/man/} sed -e 's/__FSECTION__/5/g' -e 's/__CSECTION__/1/g' \ -e 's/__VERSION__/${FILEVER}/g' \ -e 's,__MAGIC__,${MAGICPATH}/magic,g' ${.ALLSRC} > ${.TARGET} .endfor Index: head/usr.bin/ftp/Makefile =================================================================== --- head/usr.bin/ftp/Makefile (revision 315169) +++ head/usr.bin/ftp/Makefile (revision 315170) @@ -1,32 +1,32 @@ # $FreeBSD$ # $NetBSD: Makefile,v 1.15 1997/10/18 15:31:20 lukem Exp $ # from: @(#)Makefile 8.2 (Berkeley) 4/3/94 .include # Uncomment the following to provide defaults for gate-ftp operation # #CFLAGS+=-DGATE_SERVER=\"ftp-gw.host\" # -DGATE_PORT=21 -TNFTP= ${.CURDIR}/../../contrib/tnftp +TNFTP= ${SRCTOP}/contrib/tnftp .PATH: ${TNFTP}/src PROG= ftp SRCS= cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c \ progressbar.c ruserpass.c util.c .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif CFLAGS+= -I${.CURDIR} -I${TNFTP} LIBADD= edit WARNS?= 2 LINKS= ${BINDIR}/ftp ${BINDIR}/pftp \ ${BINDIR}/ftp ${BINDIR}/gate-ftp MLINKS= ftp.1 pftp.1 \ ftp.1 gate-ftp.1 .include Index: head/usr.bin/host/Makefile =================================================================== --- head/usr.bin/host/Makefile (revision 315169) +++ head/usr.bin/host/Makefile (revision 315170) @@ -1,20 +1,20 @@ # $FreeBSD$ -LDNSDIR= ${.CURDIR}/../../contrib/ldns -LDNSHOSTDIR= ${.CURDIR}/../../contrib/ldns-host +LDNSDIR= ${SRCTOP}/contrib/ldns +LDNSHOSTDIR= ${SRCTOP}/contrib/ldns-host .PATH: ${LDNSHOSTDIR} PROG= host SRCS= ldns-host.c MAN= host.1 CLEANFILES+= host.1 host.1: ldns-host.1 sed -e 's/ldns-//gI' <${.ALLSRC} >${.TARGET} || \ (rm -rf ${.TARGET} ; false) CFLAGS+= -I${LDNSDIR} LIBADD= ldns .include Index: head/usr.bin/ipcrm/Makefile =================================================================== --- head/usr.bin/ipcrm/Makefile (revision 315169) +++ head/usr.bin/ipcrm/Makefile (revision 315170) @@ -1,11 +1,11 @@ # $FreeBSD$ PROG= ipcrm SRCS= ipcrm.c ipc.c LIBADD= kvm -CFLAGS+=-I${.CURDIR}/../ipcs -.PATH: ${.CURDIR}/../ipcs +CFLAGS+=-I${SRCTOP}/usr.bin/ipcs +.PATH: ${SRCTOP}/usr.bin/ipcs WARNS?= 0 .include Index: head/usr.bin/iscsictl/Makefile =================================================================== --- head/usr.bin/iscsictl/Makefile (revision 315169) +++ head/usr.bin/iscsictl/Makefile (revision 315170) @@ -1,19 +1,19 @@ # $FreeBSD$ PACKAGE= iscsi PROG= iscsictl SRCS= iscsictl.c periphs.c parse.y token.l y.tab.h CFLAGS+= -I${.CURDIR} -CFLAGS+= -I${.CURDIR}/../../sys/dev/iscsi +CFLAGS+= -I${SRCTOP}/sys/dev/iscsi MAN= iscsi.conf.5 iscsictl.8 LIBADD= xo YFLAGS+= -v LFLAGS+= -i CLEANFILES= y.tab.c y.tab.h y.output WARNS= 6 NO_WMISSING_VARIABLE_DECLARATIONS= .include Index: head/usr.bin/kdump/Makefile =================================================================== --- head/usr.bin/kdump/Makefile (revision 315169) +++ head/usr.bin/kdump/Makefile (revision 315170) @@ -1,22 +1,22 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ .include -.PATH: ${.CURDIR}/../ktrace +.PATH: ${SRCTOP}/usr.bin/ktrace PROG= kdump SRCS= kdump.c subr.c -CFLAGS+= -I${.CURDIR}/../ktrace #-I${.CURDIR}/../... +CFLAGS+= -I${SRCTOP}/usr.bin/ktrace LIBADD= sysdecode .if ${MK_CASPER} != "no" LIBADD+= casper LIBADD+= cap_grp LIBADD+= cap_pwd CFLAGS+=-DHAVE_LIBCASPER .endif #NO_WERROR?= YES .include Index: head/usr.bin/less/Makefile.common =================================================================== --- head/usr.bin/less/Makefile.common (revision 315169) +++ head/usr.bin/less/Makefile.common (revision 315170) @@ -1,12 +1,12 @@ # $FreeBSD$ -LSDIR= ${.CURDIR}/../../contrib/less +LSDIR= ${SRCTOP}/contrib/less .PATH: ${LSDIR} -CFLAGS+=-I${.CURDIR}/../less -I${LSDIR} +CFLAGS+=-I${SRCTOP}/usr.bin/less -I${LSDIR} WARNS?= 1 .SUFFIXES: .nro .1 .nro.1: cat ${.IMPSRC} > ${.TARGET} Index: head/usr.bin/lessecho/Makefile =================================================================== --- head/usr.bin/lessecho/Makefile (revision 315169) +++ head/usr.bin/lessecho/Makefile (revision 315170) @@ -1,8 +1,8 @@ # $FreeBSD$ PROG= lessecho SRCS= lessecho.c version.c CLEANFILES= lessecho.1 -.include "${.CURDIR}/../less/Makefile.common" +.include "${SRCTOP}/usr.bin/less/Makefile.common" .include Index: head/usr.bin/lesskey/Makefile =================================================================== --- head/usr.bin/lesskey/Makefile (revision 315169) +++ head/usr.bin/lesskey/Makefile (revision 315170) @@ -1,8 +1,8 @@ # $FreeBSD$ PROG= lesskey SRCS= lesskey.c version.c CLEANFILES= lesskey.1 -.include "${.CURDIR}/../less/Makefile.common" +.include "${SRCTOP}/usr.bin/less/Makefile.common" .include Index: head/usr.bin/lex/Makefile =================================================================== --- head/usr.bin/lex/Makefile (revision 315169) +++ head/usr.bin/lex/Makefile (revision 315170) @@ -1,64 +1,64 @@ # $FreeBSD$ # # By default, flex will be configured to generate 8-bit scanners only if the # -8 flag is given. If you want it to always generate 8-bit scanners, add # "-DDEFAULT_CSIZE=256" to CFLAGS. Note that doing so will double the size # of all uncompressed scanners. # # Bootstrapping of lex is handled automatically. # Also note that flex.skel no longer gets installed. # PROG= lex LINKS+= ${BINDIR}/lex ${BINDIR}/lex++ LINKS+= ${BINDIR}/lex ${BINDIR}/flex LINKS+= ${BINDIR}/lex ${BINDIR}/flex++ -FLEXDIR= ${.CURDIR}/../../contrib/flex +FLEXDIR= ${SRCTOP}/contrib/flex .PATH: ${FLEXDIR} SRCS= buf.c ccl.c dfa.c ecs.c filter.c gen.c main.c misc.c \ nfa.c options.c parse.y regex.c scan.c scanflags.c \ scanopt.c skel.c sym.c tables.c tables_shared.c \ tblcmp.c yylex.c LFLAGS+= -is CFLAGS+= -I. -I${.CURDIR} -I${FLEXDIR} -DHAVE_CONFIG_H INCS= FlexLexer.h INCSDIR= ${INCLUDEDIR} MLINKS+= lex.1 flex.1 MLINKS+= lex.1 flex++.1 MLINKS+= lex.1 lex++.1 WARNS?= 3 CLEANFILES= scan.c skel.c GENFILES= parse.c parse.h scan.c skel.c SUBDIR= lib FLEX_VERSION= `awk -f ${.CURDIR}/version.awk ${.CURDIR}/config.h` skel.c: config.h mkskel.sh flex.skl version.awk sed 's/m4_/m4postproc_/g; s/m4preproc_/m4_/g' \ ${FLEXDIR}/flex.skl | \ m4 -I${FLEXDIR} -P ${FLEX_VERSION} | \ sed 's/m4postproc_/m4_/g' | \ sh ${FLEXDIR}/mkskel.sh > ${.TARGET} bootstrap: ${GENFILES:S/^/init/g} .for _f in ${GENFILES} @diff -I '^#line ' -I '\$$FreeBS[D]: .*\$$' -q \ ${.CURDIR}/init${_f} ${_f} 2> /dev/null || { \ echo "Bootstrapping ${_f}" ; \ ${CP} ${.CURDIR}/init${_f} ${_f} ; \ } .endfor test: check check: ${PROG} ./${PROG} ${LFLAGS} -t ${COMPRESSION} ${FLEXDIR}/scan.l | \ diff -I '^#line ' -I '\$$FreeBS[D]: .*\$$' ${.CURDIR}/initscan.c - @echo "Check successful" .include Index: head/usr.bin/lex/lib/Makefile =================================================================== --- head/usr.bin/lex/lib/Makefile (revision 315169) +++ head/usr.bin/lex/lib/Makefile (revision 315170) @@ -1,22 +1,22 @@ # $FreeBSD$ .include -.PATH: ${.CURDIR}/../../../contrib/flex +.PATH: ${SRCTOP}/contrib/flex LIB= ln SRCS= libmain.c libyywrap.c NO_PIC= .if ${MK_INSTALLLIB} != "no" LINKS= ${LIBDIR}/libln.a ${LIBDIR}/libl.a LINKS+= ${LIBDIR}/libln.a ${LIBDIR}/libfl.a .endif .if ${MK_PROFILE} != "no" LINKS+= ${LIBDIR}/libln_p.a ${LIBDIR}/libl_p.a LINKS+= ${LIBDIR}/libln_p.a ${LIBDIR}/libfl_p.a .endif .include Index: head/usr.bin/locale/Makefile =================================================================== --- head/usr.bin/locale/Makefile (revision 315169) +++ head/usr.bin/locale/Makefile (revision 315170) @@ -1,6 +1,6 @@ # $FreeBSD$ PROG= locale -CFLAGS+= -I${.CURDIR}/../../lib/libc/locale +CFLAGS+= -I${SRCTOP}/lib/libc/locale .include Index: head/usr.bin/localedef/Makefile =================================================================== --- head/usr.bin/localedef/Makefile (revision 315169) +++ head/usr.bin/localedef/Makefile (revision 315170) @@ -1,26 +1,26 @@ # $FreeBSD$ PROG= localedef SRCS= charmap.c \ collate.c \ ctype.c \ localedef.c \ messages.c \ monetary.c \ numeric.c \ parser.y \ scanner.c \ time.c \ wide.c WARNS= 3 ${SRCS:M*.c}: parser.h parser.h: parser.y IGNORE_PRAGMA= yes CFLAGS+= -I. -I${.CURDIR} -CFLAGS+= -I${.CURDIR}/../../lib/libc/locale -CFLAGS+= -I${.CURDIR}/../../lib/libc/stdtime +CFLAGS+= -I${SRCTOP}/lib/libc/locale +CFLAGS+= -I${SRCTOP}/lib/libc/stdtime .include Index: head/usr.bin/lzmainfo/Makefile =================================================================== --- head/usr.bin/lzmainfo/Makefile (revision 315169) +++ head/usr.bin/lzmainfo/Makefile (revision 315170) @@ -1,21 +1,21 @@ # $FreeBSD$ PROG= lzmainfo -XZDIR= ${.CURDIR}/../../contrib/xz/src -LZMALIBDIR= ${.CURDIR}/../../lib/liblzma +XZDIR= ${SRCTOP}/contrib/xz/src +LZMALIBDIR= ${SRCTOP}/lib/liblzma .PATH: ${XZDIR}/lzmainfo SRCS+= lzmainfo.c .PATH: ${XZDIR}/common SRCS+= tuklib_progname.c \ tuklib_exit.c CFLAGS+= -DHAVE_CONFIG_H \ -I${LZMALIBDIR} \ -I${XZDIR}/common LIBADD= lzma .include Index: head/usr.bin/m4/Makefile =================================================================== --- head/usr.bin/m4/Makefile (revision 315169) +++ head/usr.bin/m4/Makefile (revision 315170) @@ -1,27 +1,27 @@ # $OpenBSD: Makefile,v 1.13 2014/05/12 19:11:19 espie Exp $ # $FreeBSD$ # -DEXTENDED # if you want the paste & spaste macros. .include PROG= m4 -CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/../../lib/libopenbsd +CFLAGS+=-DEXTENDED -I${.CURDIR} -I${SRCTOP}/lib/libopenbsd LIBADD= y l m openbsd NO_WMISSING_VARIABLE_DECLARATIONS= SRCS= eval.c expr.c look.c main.c misc.c gnum4.c trace.c parser.y tokenizer.l WARNS= 3 tokenizer.o: parser.h CLEANFILES+= parser.c parser.h tokenizer.o .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/usr.bin/mandoc/Makefile =================================================================== --- head/usr.bin/mandoc/Makefile (revision 315169) +++ head/usr.bin/mandoc/Makefile (revision 315170) @@ -1,95 +1,95 @@ # $FreeBSD$ .include -MDOCMLDIR= ${.CURDIR}/../../contrib/mdocml +MDOCMLDIR= ${SRCTOP}/contrib/mdocml .PATH: ${MDOCMLDIR} PROG= mandoc MAN= mandoc.1 eqn.7 mandoc_char.7 tbl.7 man.7 mdoc.7 # roff.7 MLINKS= mandoc.1 mdocml.1 .if ${MK_MAN_UTILS} != no MAN+= apropos.1 makewhatis.8 MLINKS+= apropos.1 whatis.1 LINKS= ${BINDIR}/mandoc ${BINDIR}/whatis \ ${BINDIR}/mandoc ${BINDIR}/makewhatis \ ${BINDIR}/mandoc ${BINDIR}/apropos .endif LIBMAN_SRCS= man.c \ man_hash.c \ man_macro.c \ man_validate.c LIBMDOC_SRCS= att.c \ lib.c \ mdoc.c \ mdoc_argv.c \ mdoc_hash.c \ mdoc_macro.c \ mdoc_state.c \ mdoc_validate.c \ st.c \ LIBROFF_SRCS= eqn.c \ roff.c \ tbl.c \ tbl_data.c \ tbl_layout.c \ tbl_opts.c \ LIB_SRCS= ${LIBMAN_SRCS} \ ${LIBMDOC_SRCS} \ ${LIBROFF_SRCS} \ chars.c \ mandoc.c \ mandoc_aux.c \ mandoc_ohash.c \ msec.c \ preconv.c \ read.c HTML_SRCS= eqn_html.c \ html.c \ man_html.c \ mdoc_html.c \ tbl_html.c MAN_SRCS= mdoc_man.c TERM_SRCS= eqn_term.c \ man_term.c \ mdoc_term.c \ term.c \ term_ascii.c \ term_ps.c \ tbl_term.c DBM_SRCS= dbm.c \ dbm_map.c \ mansearch.c DBA_SRCS= dba.c \ dba_array.c \ dba_read.c \ dba_write.c \ mandocdb.c SRCS= ${LIB_SRCS} \ ${HTML_SRCS} \ ${MAN_SRCS} \ ${TERM_SRCS} \ ${DBM_SRCS} \ ${DBA_SRCS} \ main.c \ manpath.c \ out.c \ tag.c \ tree.c WARNS?= 3 CFLAGS+= -DHAVE_CONFIG_H \ - -I${.CURDIR}/../../lib/libopenbsd/ + -I${SRCTOP}/lib/libopenbsd/ LIBADD= openbsd z .include Index: head/usr.bin/minigzip/Makefile =================================================================== --- head/usr.bin/minigzip/Makefile (revision 315169) +++ head/usr.bin/minigzip/Makefile (revision 315170) @@ -1,12 +1,12 @@ # $FreeBSD$ -SRCDIR= ${.CURDIR}/../../contrib/zlib/test +SRCDIR= ${SRCTOP}/contrib/zlib/test .PATH: ${SRCDIR} PROG= minigzip WARNS?= 5 CFLAGS+=-DUSE_MMAP LIBADD= z .include Index: head/usr.bin/mkcsmapper/Makefile =================================================================== --- head/usr.bin/mkcsmapper/Makefile (revision 315169) +++ head/usr.bin/mkcsmapper/Makefile (revision 315170) @@ -1,11 +1,11 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../lib/libc/iconv +.PATH: ${SRCTOP}/lib/libc/iconv PROG= mkcsmapper -LDFLAGS+= -L${.CURDIR}/../../lib/libc +LDFLAGS+= -L${SRCTOP}/lib/libc NO_WMISSING_VARIABLE_DECLARATIONS= .include "${.CURDIR}/Makefile.inc" .include Index: head/usr.bin/mkcsmapper/Makefile.inc =================================================================== --- head/usr.bin/mkcsmapper/Makefile.inc (revision 315169) +++ head/usr.bin/mkcsmapper/Makefile.inc (revision 315170) @@ -1,9 +1,9 @@ # $FreeBSD$ .include SRCS+= lex.l yacc.y -CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../mkcsmapper \ - -I${.CURDIR}/../../lib/libc/iconv \ - -I${.CURDIR}/../../lib/libiconv_modules/mapper_std +CFLAGS+= -I${.CURDIR} -I${SRCTOP}/usr.bin/mkcsmapper \ + -I${SRCTOP}/lib/libc/iconv \ + -I${SRCTOP}/lib/libiconv_modules/mapper_std CFLAGS.gcc+= --param max-inline-insns-single=64 Index: head/usr.bin/mkcsmapper_static/Makefile =================================================================== --- head/usr.bin/mkcsmapper_static/Makefile (revision 315169) +++ head/usr.bin/mkcsmapper_static/Makefile (revision 315170) @@ -1,17 +1,17 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../lib/libc/iconv ${.CURDIR}/../mkcsmapper +.PATH: ${SRCTOP}/lib/libc/iconv ${SRCTOP}/usr.bin/mkcsmapper PROG= mkcsmapper_static SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \ citrus_lookup_factory.c citrus_pivot_factory.c MAN= NO_SHARED= yes NO_WMISSING_VARIABLE_DECLARATIONS= build-tools: mkcsmapper_static -.include "${.CURDIR}/../mkcsmapper/Makefile.inc" +.include "${SRCTOP}/usr.bin/mkcsmapper/Makefile.inc" .include ${PROG}: ${BUILD_TOOLS_META} Index: head/usr.bin/mkesdb/Makefile =================================================================== --- head/usr.bin/mkesdb/Makefile (revision 315169) +++ head/usr.bin/mkesdb/Makefile (revision 315170) @@ -1,10 +1,10 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../lib/libc/iconv +.PATH: ${SRCTOP}/lib/libc/iconv PROG= mkesdb NO_WMISSING_VARIABLE_DECLARATIONS= .include "${.CURDIR}/Makefile.inc" .include Index: head/usr.bin/mkesdb_static/Makefile =================================================================== --- head/usr.bin/mkesdb_static/Makefile (revision 315169) +++ head/usr.bin/mkesdb_static/Makefile (revision 315170) @@ -1,17 +1,17 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../lib/libc/iconv ${.CURDIR}/../mkesdb +.PATH: ${SRCTOP}/lib/libc/iconv ${SRCTOP}/usr.bin/mkesdb PROG= mkesdb_static SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \ citrus_lookup_factory.c MAN= NO_SHARED= yes NO_WMISSING_VARIABLE_DECLARATIONS= build-tools: mkesdb_static -.include "${.CURDIR}/../mkesdb/Makefile.inc" +.include "${SRCTOP}/usr.bin/mkesdb/Makefile.inc" .include ${PROG}: ${BUILD_TOOLS_META} Index: head/usr.bin/mklocale/Makefile =================================================================== --- head/usr.bin/mklocale/Makefile (revision 315169) +++ head/usr.bin/mklocale/Makefile (revision 315170) @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 6/7/93 # $FreeBSD$ PROG= mklocale SRCS= yacc.y lex.l y.tab.h -CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../lib/libc/locale +CFLAGS+= -I. -I${.CURDIR} -I${SRCTOP}/lib/libc/locale NO_WMISSING_VARIABLE_DECLARATIONS= .include Index: head/usr.bin/nc/Makefile =================================================================== --- head/usr.bin/nc/Makefile (revision 315169) +++ head/usr.bin/nc/Makefile (revision 315170) @@ -1,13 +1,13 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/netcat +.PATH: ${SRCTOP}/contrib/netcat PROG= nc SRCS= netcat.c atomicio.c socks.c CFLAGS+=-DIPSEC LIBADD= ipsec WARNS?= 2 .include Index: head/usr.bin/opieinfo/Makefile =================================================================== --- head/usr.bin/opieinfo/Makefile (revision 315169) +++ head/usr.bin/opieinfo/Makefile (revision 315170) @@ -1,21 +1,21 @@ # $FreeBSD$ # -OPIE_DIST?= ${.CURDIR}/../../contrib/opie +OPIE_DIST?= ${SRCTOP}/contrib/opie PROG= opieinfo -CFLAGS+=-I${.CURDIR}/../../lib/libopie +CFLAGS+=-I${SRCTOP}/lib/libopie CFLAGS+=-I${OPIE_DIST} CFLAGS+=-DINSECURE_OVERRIDE WARNS?= 0 LIBADD= opie BINOWN= root BINMODE=4555 PRECIOUSPROG= .PATH: ${OPIE_DIST} .include Index: head/usr.bin/opiekey/Makefile =================================================================== --- head/usr.bin/opiekey/Makefile (revision 315169) +++ head/usr.bin/opiekey/Makefile (revision 315170) @@ -1,23 +1,23 @@ # $FreeBSD$ # -OPIE_DIST?= ${.CURDIR}/../../contrib/opie +OPIE_DIST?= ${SRCTOP}/contrib/opie PROG= opiekey -CFLAGS+=-I${.CURDIR}/../../lib/libopie +CFLAGS+=-I${SRCTOP}/lib/libopie CFLAGS+=-I${OPIE_DIST} CFLAGS+=-DINSECURE_OVERRIDE WARNS?= 0 LIBADD= opie LINKS= ${BINDIR}/opiekey ${BINDIR}/otp-md4 LINKS+= ${BINDIR}/opiekey ${BINDIR}/otp-md5 LINKS+= ${BINDIR}/opiekey ${BINDIR}/otp-sha1 MLINKS= opiekey.1 otp-md4.1 opiekey.1 otp-md5.1 opiekey.1 otp-sha1.1 .PATH: ${OPIE_DIST} .include Index: head/usr.bin/opiepasswd/Makefile =================================================================== --- head/usr.bin/opiepasswd/Makefile (revision 315169) +++ head/usr.bin/opiepasswd/Makefile (revision 315170) @@ -1,21 +1,21 @@ # $FreeBSD$ # -OPIE_DIST?= ${.CURDIR}/../../contrib/opie +OPIE_DIST?= ${SRCTOP}/contrib/opie PROG= opiepasswd -CFLAGS+=-I${.CURDIR}/../../lib/libopie +CFLAGS+=-I${SRCTOP}/lib/libopie CFLAGS+=-I${OPIE_DIST} CFLAGS+=-DINSECURE_OVERRIDE WARNS?= 0 LIBADD= opie BINOWN= root BINMODE=4555 PRECIOUSPROG= .PATH: ${OPIE_DIST} .include Index: head/usr.bin/pamtest/Makefile =================================================================== --- head/usr.bin/pamtest/Makefile (revision 315169) +++ head/usr.bin/pamtest/Makefile (revision 315170) @@ -1,11 +1,11 @@ # $FreeBSD$ -OPENPAM= ${.CURDIR}/../../contrib/openpam +OPENPAM= ${SRCTOP}/contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/bin/pamtest PROG= pamtest SRCS= pamtest.c LIBADD= pam .include Index: head/usr.bin/readelf/Makefile =================================================================== --- head/usr.bin/readelf/Makefile (revision 315169) +++ head/usr.bin/readelf/Makefile (revision 315170) @@ -1,28 +1,28 @@ # $FreeBSD$ ELFTCDIR= ${SRCTOP}/contrib/elftoolchain READELFDIR= ${ELFTCDIR}/readelf .PATH: ${READELFDIR} PROG= readelf SRCS= readelf.c LIBADD= dwarf elftc elf CFLAGS+=-I${ELFTCDIR}/libelftc -I${ELFTCDIR}/common # This same hack is in lib/libelf/Makefile and lib/libdwarf/Makefile # We need to link against the correct version of these files. One -# solution is to include ../../sys in the include path. This causes +# solution is to include SRCTOP/sys in the include path. This causes # problems when a header file in sys depends on a file in another # part of the tree, e.g. a machine dependent header. # SRCS+= sys/elf32.h sys/elf64.h sys/elf_common.h CLEANDIRS= sys CFLAGS+= -I. sys/elf32.h sys/elf64.h sys/elf_common.h: ${SRCTOP}/sys/${.TARGET} .NOMETA mkdir -p ${.OBJDIR}/sys ln -sf ${.ALLSRC} ${.TARGET} .include Index: head/usr.bin/rsh/Makefile =================================================================== --- head/usr.bin/rsh/Makefile (revision 315169) +++ head/usr.bin/rsh/Makefile (revision 315170) @@ -1,12 +1,12 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 # $FreeBSD$ PROG= rsh -CFLAGS+=-I${.CURDIR}/../../libexec/rlogind +CFLAGS+=-I${SRCTOP}/libexec/rlogind PACKAGE=rcmds BINOWN= root BINMODE=4555 .include Index: head/usr.bin/smbutil/Makefile =================================================================== --- head/usr.bin/smbutil/Makefile (revision 315169) +++ head/usr.bin/smbutil/Makefile (revision 315170) @@ -1,15 +1,15 @@ # $FreeBSD$ PROG= smbutil SRCS= smbutil.c dumptree.c login.c lookup.c view.c print.c LIBADD= smb -CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs +CONTRIBDIR= ${SRCTOP}/contrib/smbfs CFLAGS+= -I${CONTRIBDIR}/include WARNS?= 0 .PATH: ${CONTRIBDIR}/smbutil .include Index: head/usr.bin/svn/lib/Makefile.inc =================================================================== --- head/usr.bin/svn/lib/Makefile.inc (revision 315169) +++ head/usr.bin/svn/lib/Makefile.inc (revision 315170) @@ -1,17 +1,17 @@ # $FreeBSD$ .if !defined(SVNDIR) -SVNDIR= ${.CURDIR}/../../../../contrib/subversion/subversion -APRU= ${.CURDIR}/../../../../contrib/apr-util -APR= ${.CURDIR}/../../../../contrib/apr -SQLITE= ${.CURDIR}/../../../../contrib/sqlite3 -SERF= ${.CURDIR}/../../../../contrib/serf +SVNDIR= ${SRCTOP}/contrib/subversion/subversion +APRU= ${SRCTOP}/contrib/apr-util +APR= ${SRCTOP}/contrib/apr +SQLITE= ${SRCTOP}/contrib/sqlite3 +SERF= ${SRCTOP}/contrib/serf WARNS?= 0 # definitely not ready .if exists(${.CURDIR}/../../../Makefile.inc) .include "${.CURDIR}/../../../Makefile.inc" .endif .endif Index: head/usr.bin/tar/Makefile =================================================================== --- head/usr.bin/tar/Makefile (revision 315169) +++ head/usr.bin/tar/Makefile (revision 315170) @@ -1,40 +1,40 @@ # $FreeBSD$ .include -_LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive PROG= bsdtar BSDTAR_VERSION_STRING= 3.3.1 .PATH: ${_LIBARCHIVEDIR}/tar SRCS= bsdtar.c \ cmdline.c \ creation_set.c \ read.c \ subst.c \ util.c \ write.c .PATH: ${_LIBARCHIVEDIR}/libarchive_fe SRCS+= err.c \ line_reader.c \ passphrase.c LIBADD= archive .if ${MK_ICONV} != "no" CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const .endif CFLAGS+= -DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\" -CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/../../lib/libarchive/config_freebsd.h\" +CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\" CFLAGS+= -I${_LIBARCHIVEDIR}/tar -I${_LIBARCHIVEDIR}/libarchive CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive_fe SYMLINKS= bsdtar ${BINDIR}/tar MLINKS= bsdtar.1 tar.1 .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/usr.bin/telnet/Makefile =================================================================== --- head/usr.bin/telnet/Makefile (revision 315169) +++ head/usr.bin/telnet/Makefile (revision 315170) @@ -1,44 +1,44 @@ # $FreeBSD$ .include -TELNETDIR= ${.CURDIR}/../../contrib/telnet +TELNETDIR= ${SRCTOP}/contrib/telnet .PATH: ${TELNETDIR}/telnet PROG= telnet SRCS= commands.c main.c network.c ring.c sys_bsd.c \ telnet.c terminal.c utilities.c CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \ -I${TELNETDIR} -I${TELNETDIR}/libtelnet/ .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif WARNS?= 2 LIBADD= telnet ncursesw .if !defined(RELEASE_CRUNCH) CFLAGS+= -DIPSEC LIBADD+= ipsec .else .PATH: ${TELNETDIR}/libtelnet SRCS+= genget.c getent.c misc.c CFLAGS+= -DHAS_CGETENT .endif .if ${MK_OPENSSL} != "no" SRCS+= authenc.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DIPSEC LIBADD+= mp crypto ipsec pam .endif .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write LIBADD+= krb5 roken .endif .include Index: head/usr.bin/tftp/Makefile =================================================================== --- head/usr.bin/tftp/Makefile (revision 315169) +++ head/usr.bin/tftp/Makefile (revision 315170) @@ -1,13 +1,13 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../../libexec/tftpd +.PATH: ${SRCTOP}/libexec/tftpd PROG= tftp SRCS= main.c tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c SRCS+= tftp-utils.c tftp.c -CFLAGS+=-I${.CURDIR}/../../libexec/tftpd +CFLAGS+=-I${SRCTOP}/libexec/tftpd LIBADD= edit .include Index: head/usr.bin/top/Makefile =================================================================== --- head/usr.bin/top/Makefile (revision 315169) +++ head/usr.bin/top/Makefile (revision 315170) @@ -1,49 +1,49 @@ # $FreeBSD$ -TOPDIR= ${.CURDIR}/../../contrib/top +TOPDIR= ${SRCTOP}/contrib/top .PATH: ${TOPDIR} PROG= top SRCS= commands.c display.c machine.c screen.c top.c \ username.c utils.c version.c SRCS+= sigdesc.h top.local.h CFLAGS+= -DHAVE_GETOPT -DHAVE_STRERROR -DORDER CFLAGS+= -I${.CURDIR} -I${TOPDIR} -I. WARNS?= 0 # # The table size should be a prime number approximately twice as # large as the number of lines in /etc/passwd. The default number # is 20011; use /etc/make.conf to override this. # .if defined(TOP_TABLE_SIZE) CFLAGS+= -D"Table_size=${TOP_TABLE_SIZE}" .endif LIBADD= ncursesw m kvm jail CLEANFILES= sigdesc.h -SIGCONV_AWK= ${.CURDIR}/../../contrib/top/sigconv.awk +SIGCONV_AWK= ${SRCTOP}/contrib/top/sigconv.awk STAGED_INCLUDE_DIR?= ${DESTDIR}/usr/include SIGNAL_H= ${STAGED_INCLUDE_DIR}/sys/signal.h sigdesc.h: ${SIGCONV_AWK} ${SIGNAL_H} awk -f ${SIGCONV_AWK} < ${SIGNAL_H} > ${.TARGET} CLEANFILES+= top.local.h top.x .SUFFIXES: .xs .x .hs .h .xs.x .hs.h: @${ECHO} Making ${.TARGET} from ${.IMPSRC} @sed -e's,%LoadMax%,5.0,g' \ -e's,%TableSize%,20011,g' \ -e's,%NominalTopn%,18,g' \ -e's,%topn%,-1,g' \ -e's,%delay%,2,g' \ -e's,%random%,1,g' \ ${.IMPSRC} > ${.TARGET} CLEANFILES+= top.1 top.1: top.x top.local.1 cat ${.ALLSRC} > ${.TARGET} .include Index: head/usr.bin/truss/Makefile =================================================================== --- head/usr.bin/truss/Makefile (revision 315169) +++ head/usr.bin/truss/Makefile (revision 315170) @@ -1,43 +1,43 @@ # $FreeBSD$ #NO_WERROR= PROG= truss SRCS= main.c setup.c syscalls.c LIBADD= sysdecode -#CFLAGS+= -I${.CURDIR} -I. -I${.CURDIR}/../../sys -CFLAGS+= -I${.CURDIR}/../../sys +#CFLAGS+= -I${.CURDIR} -I. -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/sys ABIS+= freebsd # Each ABI is expected to have an ABI.c, MACHINE_ARCH-ABI.c or # MACHINE_CPUARCH-ABI.c file that will be used to map the syscall arguments. .if ${MACHINE_ARCH} == "aarch64" ABIS+= cloudabi64 .endif .if ${MACHINE_CPUARCH} == "i386" ABIS+= i386-linux .endif .if ${MACHINE_CPUARCH} == "amd64" ABIS+= amd64-linux ABIS+= amd64-linux32 ABIS+= freebsd32 ABIS+= cloudabi64 .endif .if ${MACHINE_ARCH} == "powerpc64" ABIS+= freebsd32 .endif .for abi in ${ABIS} # Find the right file to handle this ABI. abi_src= ABI_SRCS= ${abi}.c ${MACHINE_ARCH}-${abi}.c ${MACHINE_CPUARCH}-${abi}.c .for f in ${ABI_SRCS} .if exists(${.CURDIR}/${f}) && empty(abi_src) abi_src= ${f} .endif .endfor SRCS:= ${SRCS} ${abi_src} .endfor .include Index: head/usr.bin/unvis/Makefile =================================================================== --- head/usr.bin/unvis/Makefile (revision 315169) +++ head/usr.bin/unvis/Makefile (revision 315170) @@ -1,8 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= unvis -.PATH: ${.CURDIR}/../../contrib/unvis +.PATH: ${SRCTOP}/contrib/unvis .include Index: head/usr.bin/vacation/Makefile =================================================================== --- head/usr.bin/vacation/Makefile (revision 315169) +++ head/usr.bin/vacation/Makefile (revision 315170) @@ -1,28 +1,28 @@ # $FreeBSD$ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/vacation PROG= vacation SRCS= vacation.c CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+=-DNEWDB -DNOT_SENDMAIL CFLAGS+=-D_FFR_LISTDB -D_FFR_DEBUG WARNS?= 2 LIBADD= smdb smutil sm SRCS+= sm_os.h CLEANFILES+=sm_os.h # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} DPADD+=${SENDMAIL_DPADD} LDADD+=${SENDMAIL_LDADD} LDFLAGS+=${SENDMAIL_LDFLAGS} sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA ln -sf ${.ALLSRC} ${.TARGET} .include Index: head/usr.bin/vi/Makefile =================================================================== --- head/usr.bin/vi/Makefile (revision 315169) +++ head/usr.bin/vi/Makefile (revision 315170) @@ -1,77 +1,77 @@ # # $FreeBSD$ # .include PACKAGE= vi -SRCDIR= ${.CURDIR}/../../contrib/nvi +SRCDIR= ${SRCTOP}/contrib/nvi SUBDIR+= catalog WARNS?= 0 # some warn issues on 32 bit machines VI= nvi EX= nex VIEW= nview PROG= nvi CFLAGS+= -D__REGEX_PRIVATE LINKS= ${BINDIR}/${VI} ${BINDIR}/${EX} ${BINDIR}/${VI} ${BINDIR}/${VIEW} LINKS+= ${BINDIR}/${VI} ${BINDIR}/vi ${BINDIR}/${EX} ${BINDIR}/ex LINKS+= ${BINDIR}/${VI} ${BINDIR}/view MAN= ${SRCDIR}/docs/man/vi.1 MLINKS+=vi.1 ex.1 vi.1 view.1 MLINKS+=vi.1 nex.1 vi.1 nview.1 vi.1 nvi.1 .PATH: ${SRCDIR}/common .PATH: ${SRCDIR}/ex .PATH: ${SRCDIR}/cl .PATH: ${SRCDIR}/vi .PATH: ${SRCDIR}/regex CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRCDIR}/regex LIBADD= util ncursesw CFLAGS+= -DUSE_WIDECHAR .if ${MK_ICONV} == "yes" && !defined(RESCUE) && !defined(RELEASE_CRUNCH) CFLAGS+= -DUSE_ICONV .endif CLEANFILES+=${EX} # Vi curses sources SRCS+= cl_funcs.c cl_main.c cl_read.c cl_screen.c cl_term.c # General sources. SRCS+= conv.c cut.c delete.c encoding.c exf.c key.c line.c log.c main.c mark.c msg.c options.c \ options_f.c put.c recover.c screen.c search.c seq.c util.c # Ex source. SRCS+= ex.c ex_abbrev.c ex_append.c ex_args.c ex_argv.c ex_at.c ex_bang.c \ ex_cd.c ex_cmd.c ex_cscope.c ex_delete.c ex_display.c \ ex_edit.c ex_equal.c ex_file.c ex_filter.c ex_global.c \ ex_init.c ex_join.c ex_map.c ex_mark.c ex_mkexrc.c ex_move.c \ ex_open.c ex_preserve.c ex_print.c ex_put.c ex_quit.c \ ex_read.c ex_screen.c ex_script.c ex_set.c ex_shell.c \ ex_shift.c ex_source.c ex_stop.c ex_subst.c ex_tag.c \ ex_txt.c ex_undo.c ex_usage.c ex_util.c ex_version.c ex_visual.c \ ex_write.c ex_yank.c ex_z.c # Vi source. SRCS+= getc.c v_at.c v_ch.c v_cmd.c v_delete.c v_ex.c v_increment.c v_init.c \ v_itxt.c v_left.c v_mark.c v_match.c v_paragraph.c v_put.c v_redraw.c \ v_replace.c v_right.c v_screen.c v_scroll.c v_search.c v_section.c \ v_sentence.c v_status.c v_txt.c v_ulcase.c v_undo.c \ v_util.c v_word.c v_xchar.c v_yank.c v_z.c v_zexit.c vi.c # Vi screen source. SRCS+= vs_line.c vs_msg.c vs_refresh.c vs_relative.c vs_smap.c vs_split.c # Wide char regex SRCS+= regcomp.c regerror.c regexec.c regfree.c .include Index: head/usr.bin/vis/Makefile =================================================================== --- head/usr.bin/vis/Makefile (revision 315169) +++ head/usr.bin/vis/Makefile (revision 315170) @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= vis SRCS= vis.c foldit.c -.PATH: ${.CURDIR}/../../contrib/vis -CFLAGS+= -I${.CURDIR}/../../contrib/vis +.PATH: ${SRCTOP}/contrib/vis +CFLAGS+= -I${SRCTOP}/contrib/vis .include Index: head/usr.bin/w/Makefile =================================================================== --- head/usr.bin/w/Makefile (revision 315169) +++ head/usr.bin/w/Makefile (revision 315170) @@ -1,12 +1,12 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= w SRCS= fmt.c pr_time.c proc_compare.c w.c MAN= w.1 uptime.1 LIBADD= kvm sbuf xo util LINKS= ${BINDIR}/w ${BINDIR}/uptime -.PATH: ${.CURDIR}/../../bin/ps +.PATH: ${SRCTOP}/bin/ps .include Index: head/usr.bin/xinstall/Makefile =================================================================== --- head/usr.bin/xinstall/Makefile (revision 315169) +++ head/usr.bin/xinstall/Makefile (revision 315170) @@ -1,21 +1,21 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ .include PROG= xinstall PROGNAME= install SRCS= xinstall.c getid.c MAN= install.1 -.PATH: ${.CURDIR}/../../contrib/mtree -CFLAGS+= -I${.CURDIR}/../../contrib/mtree -CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd +.PATH: ${SRCTOP}/contrib/mtree +CFLAGS+= -I${SRCTOP}/contrib/mtree +CFLAGS+= -I${SRCTOP}/lib/libnetbsd LIBADD= md .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/usr.bin/xz/Makefile =================================================================== --- head/usr.bin/xz/Makefile (revision 315169) +++ head/usr.bin/xz/Makefile (revision 315170) @@ -1,48 +1,48 @@ # $FreeBSD$ PROG= xz LINKS= ${BINDIR}/xz ${BINDIR}/unxz LINKS+= ${BINDIR}/xz ${BINDIR}/lzma LINKS+= ${BINDIR}/xz ${BINDIR}/unlzma LINKS+= ${BINDIR}/xz ${BINDIR}/xzcat LINKS+= ${BINDIR}/xz ${BINDIR}/lzcat MLINKS= xz.1 unxz.1 xz.1 lzma.1 xz.1 unlzma.1 xz.1 xzcat.1 xz.1 lzcat.1 -XZDIR= ${.CURDIR}/../../contrib/xz/src -LZMALIBDIR= ${.CURDIR}/../../lib/liblzma +XZDIR= ${SRCTOP}/contrib/xz/src +LZMALIBDIR= ${SRCTOP}/lib/liblzma .PATH: ${XZDIR}/xz SRCS= args.c \ coder.c \ file_io.c \ hardware.c \ list.c \ main.c \ message.c \ mytime.c \ options.c \ signals.c \ suffix.c \ util.c .PATH: ${XZDIR}/common SRCS+= tuklib_open_stdxxx.c \ tuklib_progname.c \ tuklib_exit.c \ tuklib_cpucores.c \ tuklib_mbstr_width.c \ tuklib_mbstr_fw.c WARNS?= 3 CFLAGS+= -DHAVE_CONFIG_H \ -I${LZMALIBDIR} \ -I${XZDIR}/common LIBADD= lzma .include Index: head/usr.bin/xzdec/Makefile =================================================================== --- head/usr.bin/xzdec/Makefile (revision 315169) +++ head/usr.bin/xzdec/Makefile (revision 315170) @@ -1,27 +1,27 @@ # $FreeBSD$ PROG= xzdec LINKS= ${BINDIR}/xzdec ${BINDIR}/lzdec MLINKS= xzdec.1 lzmadec.1 -XZDIR= ${.CURDIR}/../../contrib/xz/src -LZMALIBDIR= ${.CURDIR}/../../lib/liblzma +XZDIR= ${SRCTOP}/contrib/xz/src +LZMALIBDIR= ${SRCTOP}/lib/liblzma .PATH: ${XZDIR}/xzdec SRCS= xzdec.c .PATH: ${XZDIR}/common SRCS+= tuklib_progname.c \ tuklib_exit.c CFLAGS+= -DHAVE_CONFIG_H \ -I${LZMALIBDIR} \ -I${XZDIR}/common LIBADD= lzma .include Index: head/usr.bin/yacc/Makefile =================================================================== --- head/usr.bin/yacc/Makefile (revision 315169) +++ head/usr.bin/yacc/Makefile (revision 315170) @@ -1,28 +1,28 @@ # @(#)Makefile 5.3 (Berkeley) 5/12/90 # $FreeBSD$ .include -BYACC_SRC= ${.CURDIR}/../../contrib/byacc +BYACC_SRC= ${SRCTOP}/contrib/byacc .PATH: ${BYACC_SRC} PROG= yacc SRCS= closure.c error.c graph.c lalr.c lr0.c main.c mkpar.c mstring.c output.c \ reader.c yaccpar.c symtab.c verbose.c warshall.c CFLAGS+= -DHAVE_FCNTL_H=1 \ -DHAVE_MKSTEMP=1 \ -DMAXTABLE=INT_MAX \ -DMIXEDCASE_FILENAMES=1 YYPATCH!= cat ${BYACC_SRC}/VERSION CFLAGS+= -DYYPATCH=${YYPATCH} LINKS= ${BINDIR}/yacc ${BINDIR}/byacc MLINKS= yacc.1 byacc.1 .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/usr.bin/ypwhich/Makefile =================================================================== --- head/usr.bin/ypwhich/Makefile (revision 315169) +++ head/usr.bin/ypwhich/Makefile (revision 315170) @@ -1,14 +1,14 @@ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 # $FreeBSD$ -YPSERV=${.CURDIR}/../../usr.sbin/ypserv/common +YPSERV=${SRCTOP}/usr.sbin/ypserv/common .PATH: ${YPSERV} PROG= ypwhich SRCS= yplib_host.c ypwhich.c CFLAGS+= -I${YPSERV} -I. WARNS?= 2 .include