Index: head/usr.bin/Makefile =================================================================== --- head/usr.bin/Makefile (revision 275041) +++ head/usr.bin/Makefile (revision 275042) @@ -1,393 +1,392 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 # $FreeBSD$ .include # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend # XXX Use GNU versions: diff ld patch # Moved to secure: bdes # SUBDIR= alias \ apply \ asa \ awk \ banner \ basename \ brandelf \ bsdiff \ bzip2 \ bzip2recover \ cap_mkdb \ chat \ chpass \ cksum \ ${_clang} \ cmp \ col \ colldef \ colrm \ column \ comm \ compress \ cpuset \ csplit \ ctlstat \ cut \ demandoc \ dirname \ dpv \ du \ ee \ elf2aout \ elfdump \ enigma \ env \ expand \ false \ fetch \ file \ find \ finger \ fmt \ fold \ fstat \ fsync \ ftp \ gcore \ gencat \ getconf \ getent \ getopt \ grep \ gzip \ head \ hexdump \ ${_iconv} \ id \ ipcrm \ ipcs \ iscsictl \ join \ jot \ ${_kdump} \ keylogin \ keylogout \ killall \ ktrace \ ktrdump \ lam \ lastcomm \ ldd \ leave \ less \ lessecho \ lesskey \ limits \ locale \ lock \ lockf \ logger \ login \ logins \ logname \ look \ lorder \ lsvfs \ lzmainfo \ m4 \ ${_makewhatis} \ ${_man} \ mandoc \ mesg \ minigzip \ ministat \ ${_mkcsmapper} \ mkdep \ ${_mkesdb} \ mkfifo \ mkimg \ mklocale \ mktemp \ mkulzma \ mkuzip \ mt \ ncal \ netstat \ newgrp \ nfsstat \ nice \ nl \ nohup \ opieinfo \ opiekey \ opiepasswd \ pagesize \ passwd \ paste \ patch \ pathchk \ perror \ pr \ preconv \ printenv \ printf \ procstat \ - protect \ rctl \ renice \ rev \ revoke \ rpcinfo \ rs \ rup \ rusers \ rwall \ script \ sed \ send-pr \ seq \ shar \ showmount \ sockstat \ soeliminate \ sort \ split \ stat \ stdbuf \ su \ systat \ tabs \ tail \ talk \ tar \ tcopy \ tee \ ${_tests} \ tftp \ time \ timeout \ tip \ top \ touch \ tput \ tr \ true \ truncate \ ${_truss} \ tset \ tsort \ tty \ uname \ unexpand \ uniq \ unzip \ units \ unvis \ uudecode \ uuencode \ vis \ vmstat \ w \ wall \ wc \ what \ whereis \ which \ whois \ write \ xargs \ xinstall \ ${_xlint} \ xo \ ${_xstr} \ xz \ xzdec \ ${_yacc} \ yes \ ${_ypcat} \ ${_ypmatch} \ ${_ypwhich} # NB: keep these sorted by MK_* knobs .if ${MK_AT} != "no" SUBDIR+= at .endif .if ${MK_ATM} != "no" SUBDIR+= atm .endif .if ${MK_BLUETOOTH} != "no" SUBDIR+= bluetooth .endif .if ${MK_BSD_CPIO} != "no" SUBDIR+= cpio .endif .if ${MK_CALENDAR} != "no" SUBDIR+= calendar .endif .if ${MK_CLANG} != "no" _clang= clang .endif .if ${MK_FMAKE} != "no" SUBDIR+= make .endif .if ${MK_GPL_DTC} != "yes" SUBDIR+= dtc .endif .if ${MK_GROFF} != "no" SUBDIR+= vgrind .endif .if ${MK_HESIOD} != "no" SUBDIR+= hesinfo .endif .if ${MK_ICONV} != "no" _iconv= iconv _mkcsmapper= mkcsmapper _mkesdb= mkesdb .endif .if ${MK_KDUMP} != "no" SUBDIR+= kdump SUBDIR+= truss .endif .if ${MK_KERBEROS_SUPPORT} != "no" SUBDIR+= compile_et .endif .if ${MK_LDNS_UTILS} != "no" SUBDIR+= drill SUBDIR+= host .endif .if ${MK_LOCATE} != "no" SUBDIR+= locate .endif # XXX msgs? .if ${MK_MAIL} != "no" SUBDIR+= biff SUBDIR+= from SUBDIR+= mail SUBDIR+= msgs .endif .if ${MK_MAKE} != "no" SUBDIR+= bmake .endif .if ${MK_MAN_UTILS} != "no" SUBDIR+= catman _makewhatis= makewhatis _man= man .endif .if ${MK_NETCAT} != "no" SUBDIR+= nc .endif .if ${MK_NIS} != "no" SUBDIR+= ypcat SUBDIR+= ypmatch SUBDIR+= ypwhich .endif .if ${MK_OPENSSH} != "no" SUBDIR+= ssh-copy-id .endif .if ${MK_OPENSSL} != "no" SUBDIR+= bc SUBDIR+= chkey SUBDIR+= dc SUBDIR+= newkey .endif .if ${MK_QUOTAS} != "no" SUBDIR+= quota .endif .if ${MK_RCMDS} != "no" SUBDIR+= rlogin SUBDIR+= rsh SUBDIR+= ruptime SUBDIR+= rwho .endif .if ${MK_SENDMAIL} != "no" SUBDIR+= vacation .endif .if ${MK_TELNET} != "no" SUBDIR+= telnet .endif .if ${MK_TESTS} != "no" _tests= tests .endif .if ${MK_TEXTPROC} != "no" SUBDIR+= checknr SUBDIR+= colcrt SUBDIR+= ul .endif .if ${MK_TOOLCHAIN} != "no" SUBDIR+= ar SUBDIR+= c89 SUBDIR+= c99 SUBDIR+= ctags SUBDIR+= file2c SUBDIR+= gprof SUBDIR+= indent SUBDIR+= lex SUBDIR+= mkstr SUBDIR+= rpcgen SUBDIR+= unifdef SUBDIR+= xlint SUBDIR+= xstr SUBDIR+= yacc .endif .if ${MK_VI} != "no" SUBDIR+= vi .endif .if ${MK_VT} != "no" SUBDIR+= vtfontcvt .endif .if ${MK_USB} != "no" SUBDIR+= usbhidaction SUBDIR+= usbhidctl .endif .if ${MK_UTMPX} != "no" SUBDIR+= last SUBDIR+= users SUBDIR+= who .endif .if ${MK_SVN} == "yes" || ${MK_SVNLITE} == "yes" SUBDIR+= svn .endif .include SUBDIR:= ${SUBDIR:O} SUBDIR_PARALLEL= .include Index: head/usr.bin/apply/Makefile =================================================================== --- head/usr.bin/apply/Makefile (revision 275041) +++ head/usr.bin/apply/Makefile (revision 275042) @@ -1,14 +1,14 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ .include PROG= apply -DPADD= ${LIBSBUF} -LDADD= -lsbuf + +LIBADD= sbuf .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/usr.bin/ar/Makefile =================================================================== --- head/usr.bin/ar/Makefile (revision 275041) +++ head/usr.bin/ar/Makefile (revision 275042) @@ -1,21 +1,20 @@ # $FreeBSD$ .include PROG= ar SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h -DPADD= ${LIBARCHIVE} ${LIBELF} ${LIBZ} -LDADD= -larchive -lelf -lz +LIBADD= archive elf NO_WMISSING_VARIABLE_DECLARATIONS= CFLAGS+=-I. -I${.CURDIR} .if ${MK_SHARED_TOOLCHAIN} == "no" NO_SHARED?= yes .endif LINKS= ${BINDIR}/ar ${BINDIR}/ranlib MLINKS= ar.1 ranlib.1 .include Index: head/usr.bin/atm/sscop/Makefile =================================================================== --- head/usr.bin/atm/sscop/Makefile (revision 275041) +++ head/usr.bin/atm/sscop/Makefile (revision 275042) @@ -1,14 +1,13 @@ # $FreeBSD$ CONTRIB= ${.CURDIR}/../../../contrib/ngatm/sscop .PATH: ${CONTRIB} PROG= sscop SRCS= common.c sscop_main.c CFLAGS+= -I${CONTRIB} -DUSE_LIBBEGEMOT -DPADD= ${LIBBEGEMOT} ${LIBNETGRAPH} ${LIBNGATM} -LDADD= -lbegemot -lnetgraph -lngatm +LIBADD= begemot ngatm .include Index: head/usr.bin/awk/Makefile =================================================================== --- head/usr.bin/awk/Makefile (revision 275041) +++ head/usr.bin/awk/Makefile (revision 275042) @@ -1,30 +1,29 @@ # $FreeBSD$ AWKSRC= ${.CURDIR}/../../contrib/one-true-awk .PATH: ${AWKSRC} PROG= awk SRCS= awkgram.y b.c lex.c lib.c main.c parse.c proctab.c run.c tran.c ytab.h CFLAGS+= -DHAS_ISBLANK -I. -I${AWKSRC} -DFOPEN_MAX=64 WARNS?= 1 -DPADD= ${LIBM} -LDADD= -lm +LIBADD= m LINKS= ${BINDIR}/awk ${BINDIR}/nawk MLINKS= awk.1 nawk.1 CLEANFILES= maketab proctab.c ytab.h ytab.h: awkgram.h ln -sf ${.ALLSRC} ${.TARGET} proctab.c: maketab ./maketab > proctab.c build-tools: maketab maketab: ytab.h ${AWKSRC}/maketab.c .include Index: head/usr.bin/bc/Makefile =================================================================== --- head/usr.bin/bc/Makefile (revision 275041) +++ head/usr.bin/bc/Makefile (revision 275042) @@ -1,16 +1,15 @@ # $FreeBSD$ # $OpenBSD: Makefile,v 1.7 2013/09/19 16:12:00 otto Exp $ PROG= bc SRCS= bc.y scan.l tty.c CFLAGS+= -I. -I${.CURDIR} -DPADD+= ${LIBEDIT} ${LIBNCURSESW} -LDADD+= -ledit -lncursesw +LIBADD= edit NO_WMISSING_VARIABLE_DECLARATIONS= FILES+= bc.library FILESDIR=${SHAREDIR}/misc .include Index: head/usr.bin/bluetooth/bthost/Makefile =================================================================== --- head/usr.bin/bluetooth/bthost/Makefile (revision 275041) +++ head/usr.bin/bluetooth/bthost/Makefile (revision 275042) @@ -1,9 +1,8 @@ # $Id: Makefile,v 1.4 2003/08/14 20:07:13 max Exp $ # $FreeBSD$ PROG= bthost -DPADD= ${LIBBLUETOOTH} -LDADD= -lbluetooth +LIBADD= bluetooth .include Index: head/usr.bin/bluetooth/btsockstat/Makefile =================================================================== --- head/usr.bin/bluetooth/btsockstat/Makefile (revision 275041) +++ head/usr.bin/bluetooth/btsockstat/Makefile (revision 275042) @@ -1,12 +1,11 @@ # $Id: Makefile,v 1.7 2003/08/14 20:07:14 max Exp $ # $FreeBSD$ PROG= btsockstat WARNS?= 2 BINGRP= kmem BINMODE= 2555 -DPADD= ${LIBBLUETOOTH} ${LIBKVM} -LDADD= -lbluetooth -lkvm +LIBADD= bluetooth kvm .include Index: head/usr.bin/bluetooth/rfcomm_sppd/Makefile =================================================================== --- head/usr.bin/bluetooth/rfcomm_sppd/Makefile (revision 275041) +++ head/usr.bin/bluetooth/rfcomm_sppd/Makefile (revision 275042) @@ -1,11 +1,10 @@ # $Id: Makefile,v 1.7 2003/09/07 18:15:55 max Exp $ # $FreeBSD$ PROG= rfcomm_sppd SRCS= rfcomm_sppd.c rfcomm_sdp.c WARNS?= 2 -DPADD= ${LIBBLUETOOTH} ${LIBSDP} -LDADD= -lbluetooth -lsdp -lutil +LIBADD= bluetooth sdp util .include Index: head/usr.bin/bsdiff/bsdiff/Makefile =================================================================== --- head/usr.bin/bsdiff/bsdiff/Makefile (revision 275041) +++ head/usr.bin/bsdiff/bsdiff/Makefile (revision 275042) @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= bsdiff -DPADD= ${LIBBZ2} -LDADD= -lbz2 +LIBADD= bz2 .include Index: head/usr.bin/bsdiff/bspatch/Makefile =================================================================== --- head/usr.bin/bsdiff/bspatch/Makefile (revision 275041) +++ head/usr.bin/bsdiff/bspatch/Makefile (revision 275042) @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= bspatch -DPADD= ${LIBBZ2} -LDADD= -lbz2 +LIBADD= bz2 .include Index: head/usr.bin/bzip2/Makefile =================================================================== --- head/usr.bin/bzip2/Makefile (revision 275041) +++ head/usr.bin/bzip2/Makefile (revision 275042) @@ -1,51 +1,50 @@ # $FreeBSD$ BZ2DIR= ${.CURDIR}/../../contrib/bzip2 .PATH: ${BZ2DIR} PROG= bzip2 CFLAGS+= -D_FILE_OFFSET_BITS=64 WARNS?= 3 -DPADD= ${LIBBZ2} -LDADD= -lbz2 +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/calendar/Makefile =================================================================== --- head/usr.bin/calendar/Makefile (revision 275041) +++ head/usr.bin/calendar/Makefile (revision 275042) @@ -1,39 +1,38 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ .include PROG= calendar SRCS= calendar.c locale.c events.c dates.c parsedata.c io.c day.c \ ostern.c paskha.c pom.c sunpos.c calcpp.c -DPADD= ${LIBM} -LDADD= -lm +LIBADD= m INTER= de_AT.ISO_8859-15 de_DE.ISO8859-1 fr_FR.ISO8859-1 \ hr_HR.ISO8859-2 hu_HU.ISO8859-2 pt_BR.ISO8859-1 \ pt_BR.UTF-8 ru_RU.KOI8-R ru_RU.UTF-8 uk_UA.KOI8-U DE_LINKS= de_DE.ISO8859-15 FR_LINKS= fr_FR.ISO8859-15 TEXTMODE?= 444 beforeinstall: ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \ ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar .for lang in ${INTER} ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \ ${.CURDIR}/calendars/${lang}/calendar.* \ ${DESTDIR}${SHAREDIR}/calendar/${lang} .endfor .for link in ${DE_LINKS} rm -rf ${DESTDIR}${SHAREDIR}/calendar/${link} ln -s de_DE.ISO8859-1 ${DESTDIR}${SHAREDIR}/calendar/${link} .endfor .for link in ${FR_LINKS} rm -rf ${DESTDIR}${SHAREDIR}/calendar/${link} ln -s fr_FR.ISO8859-1 ${DESTDIR}${SHAREDIR}/calendar/${link} .endfor .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/usr.bin/chkey/Makefile =================================================================== --- head/usr.bin/chkey/Makefile (revision 275041) +++ head/usr.bin/chkey/Makefile (revision 275042) @@ -1,16 +1,15 @@ # $FreeBSD$ .include .PATH: ${.CURDIR}/../newkey PROG= chkey SRCS= chkey.c generic.c update.c CFLAGS+= -I${.CURDIR}/../newkey .if ${MK_NIS} != "no" CFLAGS+= -DYP .endif -DPADD= ${LIBRPCSVC} ${LIBMP} ${LIBCRYPTO} -LDADD= -lrpcsvc -lmp -lcrypto +LIBADD+= rpcsvc mp .include Index: head/usr.bin/chpass/Makefile =================================================================== --- head/usr.bin/chpass/Makefile (revision 275041) +++ head/usr.bin/chpass/Makefile (revision 275042) @@ -1,51 +1,49 @@ # @(#)Makefile 8.2 (Berkeley) 4/2/94 # $FreeBSD$ .include .PATH: ${.CURDIR}/../../usr.sbin/pwd_mkdb ${.CURDIR}/../../lib/libc/gen PROG= chpass SRCS= chpass.c edit.c field.c pw_scan.c table.c util.c BINOWN= root BINMODE=4555 .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. -DPADD= ${LIBCRYPT} ${LIBUTIL} -LDADD= -lcrypt -lutil +LIBADD= crypt util .if ${MK_NIS} != "no" -DPADD+= ${LIBYPCLNT} -LDADD+= -lypclnt +LIBADD+= ypclnt .endif LINKS= ${BINDIR}/chpass ${BINDIR}/chfn LINKS+= ${BINDIR}/chpass ${BINDIR}/chsh .if ${MK_NIS} != "no" LINKS+= ${BINDIR}/chpass ${BINDIR}/ypchpass LINKS+= ${BINDIR}/chpass ${BINDIR}/ypchfn LINKS+= ${BINDIR}/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 .if !defined(NO_FSCHG) afterinstall: -chflags schg ${DESTDIR}${BINDIR}/chpass .endif .include Index: head/usr.bin/colldef/Makefile =================================================================== --- head/usr.bin/colldef/Makefile (revision 275041) +++ head/usr.bin/colldef/Makefile (revision 275042) @@ -1,13 +1,12 @@ # $FreeBSD$ PROG= colldef SRCS= parse.y scan.l y.tab.h LFLAGS= -8 -i CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../lib/libc/locale CFLAGS+=-DCOLLATE_DEBUG -DYY_NO_UNPUT -DYY_NO_INPUT -LDADD= -ll -DPADD= ${LIBL} +LIBADD= l WARNS?= 2 .include Index: head/usr.bin/compile_et/Makefile =================================================================== --- head/usr.bin/compile_et/Makefile (revision 275041) +++ head/usr.bin/compile_et/Makefile (revision 275042) @@ -1,15 +1,12 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../contrib/com_err -LIBVERS= ${.OBJDIR}/../../kerberos5/lib/libvers/libvers.a - PROG= compile_et SRCS= compile_et.c parse.y lex.l -LDADD= -lroken ${LIBVERS} -DPADD= ${LIBROKEN} ${LIBVERS} +LIBADD= roken vers CFLAGS+=-I. -I${.CURDIR}/../../contrib/com_err WARNS?= 0 .include Index: head/usr.bin/cpio/Makefile =================================================================== --- head/usr.bin/cpio/Makefile (revision 275041) +++ head/usr.bin/cpio/Makefile (revision 275042) @@ -1,51 +1,43 @@ # $FreeBSD$ .include LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive PROG= bsdcpio BSDCPIO_VERSION_STRING= 3.1.2 .PATH: ${LIBARCHIVEDIR}/cpio SRCS= cpio.c cmdline.c .PATH: ${LIBARCHIVEDIR}/libarchive_fe SRCS+= err.c line_reader.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 -DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBLZMA} ${LIBBSDXML} -LDADD= -larchive -lz -lbz2 -llzma -lbsdxml -.if ${MK_OPENSSL} != "no" -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto -.else -DPADD+= ${LIBMD} -LDADD+= -lmd -.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 .PHONY: check test clean-test check test: $(PROG) bsdcpio.1.gz cd ${.CURDIR}/test && make obj && make test clean-test: cd ${.CURDIR}/test && make clean .include Index: head/usr.bin/cpio/test/Makefile =================================================================== --- head/usr.bin/cpio/test/Makefile (revision 275041) +++ head/usr.bin/cpio/test/Makefile (revision 275042) @@ -1,98 +1,97 @@ # $FreeBSD$ LIBARCHIVEDIR= ${.CURDIR}/../../../contrib/libarchive .PATH: ${LIBARCHIVEDIR}/cpio CPIO_SRCS= cmdline.c .PATH: ${LIBARCHIVEDIR}/libarchive_fe CPIO_SRCS+= err.c .PATH: ${LIBARCHIVEDIR}/cpio/test TESTS= \ test_0.c \ test_basic.c \ test_cmdline.c \ test_extract_cpio_Z.c \ test_extract_cpio_bz2.c \ test_extract_cpio_grz.c \ test_extract_cpio_gz.c \ test_extract_cpio_lrz.c \ test_extract_cpio_lz.c \ test_extract_cpio_lzma.c \ test_extract_cpio_lzo.c \ test_extract_cpio_xz.c \ test_format_newc.c \ test_gcpio_compat.c \ test_option_0.c \ test_option_B_upper.c \ test_option_C_upper.c \ test_option_J_upper.c \ test_option_L_upper.c \ test_option_Z_upper.c \ test_option_a.c \ test_option_b64encode.c \ test_option_c.c \ test_option_d.c \ test_option_f.c \ test_option_grzip.c \ test_option_help.c \ test_option_l.c \ test_option_lrzip.c \ test_option_lzma.c \ test_option_lzop.c \ test_option_m.c \ test_option_t.c \ test_option_u.c \ test_option_uuencode.c \ test_option_version.c \ test_option_xz.c \ test_option_y.c \ test_option_z.c \ test_owner_parse.c \ test_passthrough_dotdot.c \ test_passthrough_reverse.c # Build the test program SRCS= list.h \ ${CPIO_SRCS} \ ${TESTS} \ main.c .PATH: ${LIBARCHIVEDIR}/test_utils SRCS+= test_utils.c CLEANFILES+= list.h bsdcpio_test MAN= PROG=bsdcpio_test -DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/../../../lib/libarchive/config_freebsd.h\" CFLAGS+= -I${.CURDIR}/../../../lib/libarchive -I${.OBJDIR} -LDADD= -larchive -lz -lbz2 -llzma +LIBADD= archive #CFLAGS+= -static -g -O2 -Wall CFLAGS+= -g -O2 -Wall CFLAGS+= -I${.OBJDIR} CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe CFLAGS+= -I${LIBARCHIVEDIR}/test_utils # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC check test: bsdcpio_test ${.OBJDIR}/bsdcpio_test -p ${.OBJDIR}/../bsdcpio \ -r ${LIBARCHIVEDIR}/cpio/test ${.OBJDIR}/list.h list.h: ${TESTS} Makefile (cd ${LIBARCHIVEDIR}/cpio/test; cat ${TESTS}) | \ grep DEFINE_TEST > ${.OBJDIR}/list.h clean: rm -f ${CLEANFILES} rm -f *~ -chmod -R +w /tmp/bsdcpio_test.* rm -rf /tmp/bsdcpio_test.* .include Index: head/usr.bin/dc/Makefile =================================================================== --- head/usr.bin/dc/Makefile (revision 275041) +++ head/usr.bin/dc/Makefile (revision 275042) @@ -1,9 +1,8 @@ # $FreeBSD$ # $OpenBSD: Makefile,v 1.2 2006/11/26 11:31:09 deraadt Exp $ PROG= dc SRCS= dc.c bcode.c inout.c mem.c stack.c -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +LIBADD= crypto .include Index: head/usr.bin/dpv/Makefile =================================================================== --- head/usr.bin/dpv/Makefile (revision 275041) +++ head/usr.bin/dpv/Makefile (revision 275042) @@ -1,12 +1,11 @@ # $FreeBSD$ PROG= dpv CFLAGS+= -I${.CURDIR} -DPADD= ${LIBDPV} ${LIBDIALOG} ${LIBFIGPAR} ${LIBNCURSESW} ${LIBUTIL} ${LIBM} -LDADD= -ldpv -ldialog -lfigpar -lncursesw -lutil -lm +LIBADD= dpv dialog WARNS?= 6 .include Index: head/usr.bin/drill/Makefile =================================================================== --- head/usr.bin/drill/Makefile (revision 275041) +++ head/usr.bin/drill/Makefile (revision 275042) @@ -1,19 +1,17 @@ # $FreeBSD$ # Vendor sources and generated files LDNSDIR= ${.CURDIR}/../../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 -DPADD+= ${LIBLDNS} ${LIBCRYPTO} -LDADD+= ${LDLDNS} -lcrypto -USEPRIVATELIB= ldns +LIBADD= ldns crypto .include Index: head/usr.bin/du/Makefile =================================================================== --- head/usr.bin/du/Makefile (revision 275041) +++ head/usr.bin/du/Makefile (revision 275042) @@ -1,8 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= du -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: head/usr.bin/ee/Makefile =================================================================== --- head/usr.bin/ee/Makefile (revision 275041) +++ head/usr.bin/ee/Makefile (revision 275042) @@ -1,36 +1,35 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../contrib/ee CFLAGS+= -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \ -DHAS_SYS_WAIT PROG= ee LINKS= ${BINDIR}/ee ${BINDIR}/ree ${BINDIR}/ee ${BINDIR}/edit MLINKS= ee.1 ree.1 ee.1 edit.1 -DPADD= ${LIBNCURSESW} -LDADD= -lncursesw +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 . endif .endfor .include Index: head/usr.bin/enigma/Makefile =================================================================== --- head/usr.bin/enigma/Makefile (revision 275041) +++ head/usr.bin/enigma/Makefile (revision 275042) @@ -1,11 +1,10 @@ # $FreeBSD$ PROG= enigma LINKS= ${BINDIR}/enigma ${BINDIR}/crypt MLINKS= enigma.1 crypt.1 -DPADD= ${LIBCRYPT} -LDADD= -lcrypt +LIBADD= crypt .include Index: head/usr.bin/fetch/Makefile =================================================================== --- head/usr.bin/fetch/Makefile (revision 275041) +++ head/usr.bin/fetch/Makefile (revision 275042) @@ -1,15 +1,7 @@ # $FreeBSD$ -.include - PROG= fetch CSTD?= c99 -.if ${MK_OPENSSL} != "no" -DPADD= ${LIBFETCH} ${LIBSSL} ${LIBCRYPTO} -LDADD= -lfetch -lssl -lcrypto -.else -DPADD= ${LIBFETCH} ${LIBMD} -LDADD= -lfetch -lmd -.endif +LIBADD= fetch .include Index: head/usr.bin/file/Makefile =================================================================== --- head/usr.bin/file/Makefile (revision 275041) +++ head/usr.bin/file/Makefile (revision 275042) @@ -1,49 +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 .PATH: ${SRCDIR}/src .PATH: ${SRCDIR}/doc PROG= file MAGICPATH?= /usr/share/misc CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR}/../../lib/libmagic -DPADD= ${LIBMAGIC} ${LIBZ} -LDADD= -lmagic -lz +LIBADD= magic FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \ ${.CURDIR}/../../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/fstat/Makefile =================================================================== --- head/usr.bin/fstat/Makefile (revision 275041) +++ head/usr.bin/fstat/Makefile (revision 275042) @@ -1,12 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= fstat SRCS= fstat.c fuser.c main.c LINKS= ${BINDIR}/fstat ${BINDIR}/fuser -DPADD= ${LIBKVM} ${LIBUTIL} ${LIBPROCSTAT} -LDADD= -lkvm -lutil -lprocstat +LIBADD= procstat MAN1= fuser.1 fstat.1 .include Index: head/usr.bin/ftp/Makefile =================================================================== --- head/usr.bin/ftp/Makefile (revision 275041) +++ head/usr.bin/ftp/Makefile (revision 275042) @@ -1,33 +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 .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} -LDADD= -ledit -ltermcapw -DPADD= ${LIBEDIT} ${LIBTERMCAPW} +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/gcore/Makefile =================================================================== --- head/usr.bin/gcore/Makefile (revision 275041) +++ head/usr.bin/gcore/Makefile (revision 275042) @@ -1,15 +1,14 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= gcore SRCS= elfcore.c gcore.c -DPADD= ${LIBSBUF} ${LIBUTIL} -LDADD= -lsbuf -lutil +LIBADD= sbuf util .if ${MACHINE_ARCH} == "amd64" SRCS+= elf32core.c .endif WARNS?= 1 .include Index: head/usr.bin/grep/Makefile =================================================================== --- head/usr.bin/grep/Makefile (revision 275041) +++ head/usr.bin/grep/Makefile (revision 275042) @@ -1,92 +1,88 @@ # $NetBSD: Makefile,v 1.4 2011/02/16 01:31:33 joerg Exp $ # $FreeBSD$ # $OpenBSD: Makefile,v 1.6 2003/06/25 15:00:04 millert Exp $ .include .if ${MK_BSD_GREP} == "yes" PROG= grep .else PROG= bsdgrep CLEANFILES+= bsdgrep.1 bsdgrep.1: grep.1 cp -f ${.ALLSRC} ${.TARGET} .endif SRCS= file.c grep.c queue.c util.c # Extra files ported backported form some regex improvements .PATH: ${.CURDIR}/regex SRCS+= fastmatch.c hashtable.c tre-compile.c tre-fastmatch.c xmalloc.c CFLAGS+=-I${.CURDIR}/regex .if ${MK_BSD_GREP} == "yes" LINKS= ${BINDIR}/grep ${BINDIR}/egrep \ ${BINDIR}/grep ${BINDIR}/fgrep \ ${BINDIR}/grep ${BINDIR}/zgrep \ ${BINDIR}/grep ${BINDIR}/zegrep \ ${BINDIR}/grep ${BINDIR}/zfgrep MLINKS= grep.1 egrep.1 \ grep.1 fgrep.1 \ grep.1 zgrep.1 \ grep.1 zegrep.1 \ grep.1 zfgrep.1 \ grep.1 xzgrep.1 \ grep.1 xzegrep.1 \ grep.1 xzfgrep.1 \ grep.1 lzgrep.1 \ grep.1 lzegrep.1 \ grep.1 lzfgrep.1 .endif -LDADD= -lz -DPADD= ${LIBZ} +LIBADD= z .if ${MK_LZMA_SUPPORT} != "no" -LDADD+= -llzma -DPADD+= ${LIBLZMA} +LIBADD+= lzma LINKS+= ${BINDIR}/${PROG} ${BINDIR}/xzgrep \ ${BINDIR}/${PROG} ${BINDIR}/xzegrep \ ${BINDIR}/${PROG} ${BINDIR}/xzfgrep \ ${BINDIR}/${PROG} ${BINDIR}/lzgrep \ ${BINDIR}/${PROG} ${BINDIR}/lzegrep \ ${BINDIR}/${PROG} ${BINDIR}/lzfgrep .else CFLAGS+= -DWITHOUT_LZMA .endif .if ${MK_BZIP2_SUPPORT} != "no" -LDADD+= -lbz2 -DPADD+= ${LIBBZ2} +LIBADD+= bz2 .if ${MK_BSD_GREP} == "yes" LINKS+= ${BINDIR}/grep ${BINDIR}/bzgrep \ ${BINDIR}/grep ${BINDIR}/bzegrep \ ${BINDIR}/grep ${BINDIR}/bzfgrep MLINKS+= grep.1 bzgrep.1 \ grep.1 bzegrep.1 \ grep.1 bzfgrep.1 .endif .else CFLAGS+= -DWITHOUT_BZIP2 .endif .if ${MK_GNU_GREP_COMPAT} != "no" CFLAGS+= -I${DESTDIR}/usr/include/gnu -LDADD+= -lgnuregex -DPADD+= ${LIBGNUREGEX} +LIBADD+= gnuregex .endif .if ${MK_NLS} != "no" .include "${.CURDIR}/nls/Makefile.inc" .else CFLAGS+= -DWITHOUT_NLS .endif .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/usr.bin/gzip/Makefile =================================================================== --- head/usr.bin/gzip/Makefile (revision 275041) +++ head/usr.bin/gzip/Makefile (revision 275042) @@ -1,36 +1,34 @@ # $NetBSD: Makefile,v 1.18 2013/11/13 11:12:24 pettai Exp $ # $FreeBSD$ .include PROG= gzip MAN= gzip.1 gzexe.1 zdiff.1 zforce.1 zmore.1 znew.1 -DPADD= ${LIBZ} ${LIBLZMA} -LDADD= -lz -llzma +LIBADD= z lzma .if ${MK_BZIP2_SUPPORT} != "no" -DPADD+= ${LIBBZ2} -LDADD+= -lbz2 +LIBADD+= bz2 .else CFLAGS+= -DNO_BZIP2_SUPPORT .endif SCRIPTS= gzexe zdiff zforce zmore znew MLINKS+= gzip.1 gunzip.1 \ gzip.1 gzcat.1 \ gzip.1 zcat.1 \ zdiff.1 zcmp.1 \ zmore.1 zless.1 LINKS+= ${BINDIR}/gzip ${BINDIR}/gunzip \ ${BINDIR}/gzip ${BINDIR}/gzcat \ ${BINDIR}/gzip ${BINDIR}/zcat \ ${BINDIR}/zdiff ${BINDIR}/zcmp .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/usr.bin/host/Makefile =================================================================== --- head/usr.bin/host/Makefile (revision 275041) +++ head/usr.bin/host/Makefile (revision 275042) @@ -1,22 +1,20 @@ # $FreeBSD$ LDNSDIR= ${.CURDIR}/../../contrib/ldns LDNSHOSTDIR= ${.CURDIR}/../../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} -DPADD+= ${LIBLDNS} ${LIBCRYPTO} -LDADD+= ${LDLDNS} -lcrypto -USEPRIVATELIB= ldns +LIBADD= ldns .include Index: head/usr.bin/ipcrm/Makefile =================================================================== --- head/usr.bin/ipcrm/Makefile (revision 275041) +++ head/usr.bin/ipcrm/Makefile (revision 275042) @@ -1,12 +1,11 @@ # $FreeBSD$ PROG= ipcrm SRCS= ipcrm.c ipc.c -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm CFLAGS+=-I${.CURDIR}/../ipcs .PATH: ${.CURDIR}/../ipcs WARNS?= 0 .include Index: head/usr.bin/ipcs/Makefile =================================================================== --- head/usr.bin/ipcs/Makefile (revision 275041) +++ head/usr.bin/ipcs/Makefile (revision 275042) @@ -1,10 +1,9 @@ # $FreeBSD$ PROG= ipcs SRCS= ipcs.c ipc.c -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm WARNS?= 1 .include Index: head/usr.bin/iscsictl/Makefile =================================================================== --- head/usr.bin/iscsictl/Makefile (revision 275041) +++ head/usr.bin/iscsictl/Makefile (revision 275042) @@ -1,19 +1,18 @@ # $FreeBSD$ PROG= iscsictl SRCS= iscsictl.c periphs.c parse.y token.l y.tab.h CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../../sys/dev/iscsi MAN= iscsictl.8 -DPADD= ${LIBCAM} ${LIBUTIL} -LDADD= -lcam -lutil +LIBADD= cam util 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 275041) +++ head/usr.bin/kdump/Makefile (revision 275042) @@ -1,52 +1,51 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ .include .if (${MACHINE_ARCH} == "amd64") SFX= 32 .endif .PATH: ${.CURDIR}/../ktrace PROG= kdump SRCS= kdump_subr.c kdump.c ioctl.c subr.c -DPSRCS= kdump_subr.h +DPSRCS= kdump_subr.h CFLAGS+= -I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I. .if ${MK_CASPER} != "no" -DPADD+= ${LIBCAPSICUM} ${LIBNV} -LDADD+= -lcapsicum -lnv +LIBADD= capsicum CFLAGS+=-DHAVE_LIBCAPSICUM .endif .if ${MK_PF} != "no" CFLAGS+=-DPF .endif .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" SRCS+= linux_syscalls.c .endif NO_WERROR?= YES CLEANFILES= ioctl.c kdump_subr.c kdump_subr.h linux_syscalls.c ioctl.c: mkioctls env MACHINE=${MACHINE} CPP="${CPP}" \ sh ${.CURDIR}/mkioctls print ${DESTDIR}/usr/include > ${.TARGET} kdump_subr.h: mksubr sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \ sed -n 's/^\([a-z].*)\)$$/void \1;/p' >${.TARGET} kdump_subr.c: mksubr kdump_subr.h sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include >${.TARGET} linux_syscalls.c: /bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \ ${.CURDIR}/../../sys/${MACHINE_ARCH}/linux${SFX}/syscalls.master ${.CURDIR}/linux_syscalls.conf echo "int nlinux_syscalls = sizeof(linux_syscallnames) / sizeof(linux_syscallnames[0]);" \ >> linux_syscalls.c .include Index: head/usr.bin/keylogin/Makefile =================================================================== --- head/usr.bin/keylogin/Makefile (revision 275041) +++ head/usr.bin/keylogin/Makefile (revision 275042) @@ -1,10 +1,9 @@ # $FreeBSD$ PROG= keylogin -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc WARNS?= 0 .include Index: head/usr.bin/killall/Makefile =================================================================== --- head/usr.bin/killall/Makefile (revision 275041) +++ head/usr.bin/killall/Makefile (revision 275042) @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= killall -DPADD= ${LIBJAIL} -LDADD= -ljail +LIBADD= jail .include Index: head/usr.bin/ktrdump/Makefile =================================================================== --- head/usr.bin/ktrdump/Makefile (revision 275041) +++ head/usr.bin/ktrdump/Makefile (revision 275042) @@ -1,10 +1,9 @@ # $FreeBSD$ PROG= ktrdump -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm MAN= ktrdump.8 WARNS?= 2 .include Index: head/usr.bin/less/Makefile =================================================================== --- head/usr.bin/less/Makefile (revision 275041) +++ head/usr.bin/less/Makefile (revision 275042) @@ -1,21 +1,20 @@ # $FreeBSD$ PROG= less SRCS= main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c cvt.c \ decode.c edit.c filename.c forwback.c help.c ifile.c input.c \ jump.c line.c linenum.c lsystem.c mark.c optfunc.c option.c \ opttbl.c os.c output.c pattern.c position.c prompt.c search.c \ signal.c tags.c ttyin.c version.c SCRIPTS=lesspipe.sh zless.sh SCRIPTSNAME_lesspipe.sh=lesspipe.sh -DPADD= ${LIBTERMCAPW} -LDADD= -ltermcapw +LIBADD= ncursesw LINKS= ${BINDIR}/less ${BINDIR}/more \ ${BINDIR}/zless ${BINDIR}/bzless \ ${BINDIR}/zless ${BINDIR}/xzless \ ${BINDIR}/zless ${BINDIR}/lzless MLINKS= less.1 more.1 CLEANFILES= less.1 .include "Makefile.common" .include Index: head/usr.bin/limits/Makefile =================================================================== --- head/usr.bin/limits/Makefile (revision 275041) +++ head/usr.bin/limits/Makefile (revision 275042) @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= limits -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: head/usr.bin/lock/Makefile =================================================================== --- head/usr.bin/lock/Makefile (revision 275041) +++ head/usr.bin/lock/Makefile (revision 275042) @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= lock BINOWN= root BINMODE=4555 -DPADD= ${LIBCRYPT} -LDADD= -lcrypt + +LIBADD= crypt .include Index: head/usr.bin/login/Makefile =================================================================== --- head/usr.bin/login/Makefile (revision 275041) +++ head/usr.bin/login/Makefile (revision 275042) @@ -1,27 +1,25 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 # $FreeBSD$ .include PROG= login SRCS= login.c login_fbtab.c CFLAGS+=-DLOGALL -DPADD= ${LIBUTIL} ${LIBPAM} -LDADD= -lutil ${MINUSLPAM} +LIBADD= util pam WARNS?= 5 .if ${MK_AUDIT} != "no" SRCS+= login_audit.c CFLAGS+= -DUSE_BSM_AUDIT -DPADD+= ${LIBBSM} -LDADD+= -lbsm +LIBADD+= bsm .endif .if ${MK_SETUID_LOGIN} != "no" BINOWN= root BINMODE=4555 PRECIOUSPROG= .endif .include Index: head/usr.bin/lzmainfo/Makefile =================================================================== --- head/usr.bin/lzmainfo/Makefile (revision 275041) +++ head/usr.bin/lzmainfo/Makefile (revision 275042) @@ -1,22 +1,21 @@ # $FreeBSD$ PROG= lzmainfo XZDIR= ${.CURDIR}/../../contrib/xz/src LZMALIBDIR= ${.CURDIR}/../../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 -DPADD= ${LIBLZMA} -LDADD= -llzma +LIBADD= lzma .include Index: head/usr.bin/m4/Makefile =================================================================== --- head/usr.bin/m4/Makefile (revision 275041) +++ head/usr.bin/m4/Makefile (revision 275042) @@ -1,28 +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/libohash -DPADD= ${LIBY} ${LIBL} ${LIBM} ${LIBOHASH} -LDADD= -ly -ll -lm ${LDOHASH} +LIBADD= y l m ohash 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/makewhatis/Makefile =================================================================== --- head/usr.bin/makewhatis/Makefile (revision 275041) +++ head/usr.bin/makewhatis/Makefile (revision 275042) @@ -1,12 +1,11 @@ # $FreeBSD$ PROG= makewhatis -DPADD= ${LIBZ} -LDADD= -lz +LIBADD= z SCRIPTS= makewhatis.local.sh MAN= makewhatis.1 makewhatis.local.8 SCRIPTSDIR= /usr/libexec LINKS= ${SCRIPTSDIR}/makewhatis.local ${SCRIPTSDIR}/catman.local MLINKS= makewhatis.local.8 catman.local.8 .include Index: head/usr.bin/minigzip/Makefile =================================================================== --- head/usr.bin/minigzip/Makefile (revision 275041) +++ head/usr.bin/minigzip/Makefile (revision 275042) @@ -1,13 +1,12 @@ # $FreeBSD$ SRCDIR= ${.CURDIR}/../../lib/libz/test .PATH: ${SRCDIR} PROG= minigzip WARNS?= 5 CFLAGS+=-DUSE_MMAP -DPADD= ${LIBZ} -LDADD= -lz +LIBADD= z .include Index: head/usr.bin/ministat/Makefile =================================================================== --- head/usr.bin/ministat/Makefile (revision 275041) +++ head/usr.bin/ministat/Makefile (revision 275042) @@ -1,14 +1,14 @@ # $FreeBSD$ PROG= ministat -DPADD= ${LIBM} -LDADD= -lm +LIBADD= m + .include test: ${PROG} - ./${PROG} < ${.CURDIR}/chameleon - ./${PROG} ${.CURDIR}/chameleon + ./${PROG} < ${.CURDIR}/chameleon + ./${PROG} ${.CURDIR}/chameleon ./${PROG} ${.CURDIR}/iguana ${.CURDIR}/chameleon ./${PROG} -c 80 ${.CURDIR}/iguana ${.CURDIR}/chameleon ./${PROG} -s -c 80 ${.CURDIR}/chameleon ${.CURDIR}/iguana ./${PROG} -s -c 80 ${.CURDIR}/chameleon ${.CURDIR}/iguana ${.CURDIR}/iguana Index: head/usr.bin/mkimg/Makefile =================================================================== --- head/usr.bin/mkimg/Makefile (revision 275041) +++ head/usr.bin/mkimg/Makefile (revision 275042) @@ -1,43 +1,42 @@ # $FreeBSD$ .include PROG= mkimg SRCS= format.c image.c mkimg.c scheme.c MAN= mkimg.1 MKIMG_VERSION=20141003 mkimg.o: Makefile CFLAGS+=-DMKIMG_VERSION=${MKIMG_VERSION} CFLAGS+=-DSPARSE_WRITE # List of formats to support SRCS+= \ qcow.c \ raw.c \ vhd.c \ vmdk.c # List of schemes to support SRCS+= \ apm.c \ bsd.c \ ebr.c \ gpt.c \ mbr.c \ pc98.c \ vtoc8.c BINDIR?=/usr/bin -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util WARNS?= 6 .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/usr.bin/mkulzma/Makefile =================================================================== --- head/usr.bin/mkulzma/Makefile (revision 275041) +++ head/usr.bin/mkulzma/Makefile (revision 275042) @@ -1,8 +1,8 @@ # $FreeBSD$ PROG= mkulzma MAN= mkulzma.8 -DPADD= ${LIBLZMA} -LDADD= -llzma + +LIBADD= lzma .include Index: head/usr.bin/mkuzip/Makefile =================================================================== --- head/usr.bin/mkuzip/Makefile (revision 275041) +++ head/usr.bin/mkuzip/Makefile (revision 275042) @@ -1,10 +1,8 @@ # $FreeBSD$ PROG= mkuzip MAN= mkuzip.8 -DPADD= ${LIBZ} -LDADD= -lz - +LIBADD= z .include Index: head/usr.bin/msgs/Makefile =================================================================== --- head/usr.bin/msgs/Makefile (revision 275041) +++ head/usr.bin/msgs/Makefile (revision 275042) @@ -1,8 +1,8 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= msgs -DPADD= ${LIBTERMCAPW} -LDADD= -ltermcapw + +LIBADD= ncursesw .include Index: head/usr.bin/nc/Makefile =================================================================== --- head/usr.bin/nc/Makefile (revision 275041) +++ head/usr.bin/nc/Makefile (revision 275042) @@ -1,14 +1,13 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../contrib/netcat PROG= nc SRCS= netcat.c atomicio.c socks.c CFLAGS+=-DIPSEC -LDADD= -lipsec -DPADD= ${LIBIPSEC} +LIBADD= ipsec WARNS?= 2 .include Index: head/usr.bin/ncal/Makefile =================================================================== --- head/usr.bin/ncal/Makefile (revision 275041) +++ head/usr.bin/ncal/Makefile (revision 275042) @@ -1,17 +1,16 @@ # $FreeBSD$ .include PROG= ncal -DPADD= ${LIBCALENDAR} ${LIBTERMCAPW} -LDADD= -lcalendar -ltermcapw +LIBADD= calendar ncursesw LINKS= ${BINDIR}/ncal ${BINDIR}/cal MLINKS= ncal.1 cal.1 .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/usr.bin/netstat/Makefile =================================================================== --- head/usr.bin/netstat/Makefile (revision 275041) +++ head/usr.bin/netstat/Makefile (revision 275042) @@ -1,46 +1,44 @@ # @(#)Makefile 8.1 (Berkeley) 6/12/93 # $FreeBSD$ .include PROG= netstat SRCS= if.c inet.c main.c mbuf.c mroute.c netisr.c route.c \ unix.c mroute6.c ipsec.c bpf.c pfkey.c sctp.c \ flowtable.c WARNS?= 3 CFLAGS+=-fno-strict-aliasing CFLAGS+=-DIPSEC CFLAGS+=-DSCTP .if ${MK_INET_SUPPORT} != "no" CFLAGS+=-DINET .endif .if ${MK_INET6_SUPPORT} != "no" SRCS+= inet6.c CFLAGS+=-DINET6 .endif .if ${MK_OFED} != "no" CFLAGS+=-DSDP .endif .if ${MK_PF} != "no" CFLAGS+=-DPF .endif BINGRP= kmem BINMODE=2555 -DPADD= ${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL} -LDADD= -lkvm -lmemstat -lutil +LIBADD= kvm memstat util .if ${MK_NETGRAPH_SUPPORT} != "no" SRCS+= netgraph.c -DPADD+= ${LIBNETGRAPH} -LDADD+= -lnetgraph +LIBADD+= netgraph CFLAGS+=-DNETGRAPH .endif .include Index: head/usr.bin/newgrp/Makefile =================================================================== --- head/usr.bin/newgrp/Makefile (revision 275041) +++ head/usr.bin/newgrp/Makefile (revision 275042) @@ -1,12 +1,12 @@ # $FreeBSD$ PROG= newgrp -DPADD= ${LIBCRYPT} ${LIBUTIL} -LDADD= -lcrypt -lutil + +LIBADD= crypt util .if defined(ENABLE_SUID_NEWGRP) BINMODE= 4555 PRECIOUSPROG= .endif .include Index: head/usr.bin/newkey/Makefile =================================================================== --- head/usr.bin/newkey/Makefile (revision 275041) +++ head/usr.bin/newkey/Makefile (revision 275042) @@ -1,14 +1,13 @@ # $FreeBSD$ .include PROG= newkey SRCS= newkey.c generic.c update.c .if ${MK_NIS} != "no" CFLAGS+= -DYP .endif MAN= newkey.8 -DPADD= ${LIBRPCSVC} ${LIBMP} ${LIBCRYPTO} -LDADD= -lrpcsvc -lmp -lcrypto +LIBADD= rpcsvc mp .include Index: head/usr.bin/nfsstat/Makefile =================================================================== --- head/usr.bin/nfsstat/Makefile (revision 275041) +++ head/usr.bin/nfsstat/Makefile (revision 275042) @@ -1,11 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= nfsstat CFLAGS+=-DNFS -DPADD= ${LIBKVM} -LDADD= -lkvm + +LIBADD= kvm WARNS?= 3 .include Index: head/usr.bin/opieinfo/Makefile =================================================================== --- head/usr.bin/opieinfo/Makefile (revision 275041) +++ head/usr.bin/opieinfo/Makefile (revision 275042) @@ -1,22 +1,21 @@ # $FreeBSD$ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie PROG= opieinfo CFLAGS+=-I${.CURDIR}/../../lib/libopie CFLAGS+=-I${OPIE_DIST} CFLAGS+=-DINSECURE_OVERRIDE WARNS?= 0 -DPADD= ${LIBOPIE} ${LIBMD} -LDADD= -lopie -lmd +LIBADD= opie BINOWN= root BINMODE=4555 PRECIOUSPROG= .PATH: ${OPIE_DIST} .include Index: head/usr.bin/opiekey/Makefile =================================================================== --- head/usr.bin/opiekey/Makefile (revision 275041) +++ head/usr.bin/opiekey/Makefile (revision 275042) @@ -1,24 +1,23 @@ # $FreeBSD$ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie PROG= opiekey CFLAGS+=-I${.CURDIR}/../../lib/libopie CFLAGS+=-I${OPIE_DIST} CFLAGS+=-DINSECURE_OVERRIDE WARNS?= 0 -DPADD= ${LIBOPIE} ${LIBMD} -LDADD= -lopie -lmd +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 275041) +++ head/usr.bin/opiepasswd/Makefile (revision 275042) @@ -1,22 +1,21 @@ # $FreeBSD$ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie PROG= opiepasswd CFLAGS+=-I${.CURDIR}/../../lib/libopie CFLAGS+=-I${OPIE_DIST} CFLAGS+=-DINSECURE_OVERRIDE WARNS?= 0 -DPADD= ${LIBOPIE} ${LIBMD} -LDADD= -lopie -lmd +LIBADD= opie BINOWN= root BINMODE=4555 PRECIOUSPROG= .PATH: ${OPIE_DIST} .include Index: head/usr.bin/pamtest/Makefile =================================================================== --- head/usr.bin/pamtest/Makefile (revision 275041) +++ head/usr.bin/pamtest/Makefile (revision 275042) @@ -1,11 +1,11 @@ # $FreeBSD$ OPENPAM= ${.CURDIR}/../../contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/bin/pamtest PROG= pamtest SRCS= pamtest.c -DPADD= ${LIBPAM} -LDADD= ${MINUSLPAM} + +LIBADD= pam .include Index: head/usr.bin/passwd/Makefile =================================================================== --- head/usr.bin/passwd/Makefile (revision 275041) +++ head/usr.bin/passwd/Makefile (revision 275042) @@ -1,27 +1,26 @@ # From: @(#)Makefile 8.3 (Berkeley) 4/2/94 # $FreeBSD$ .include PROG = passwd BINOWN = root BINMODE = 4555 -DPADD = ${LIBPAM} -LDADD = ${MINUSLPAM} +LIBADD = pam .if ${MK_NIS} != "no" LINKS = ${BINDIR}/passwd ${BINDIR}/yppasswd MLINKS = passwd.1 yppasswd.1 .endif beforeinstall: .for i in passwd yppasswd [ ! -e ${DESTDIR}${BINDIR}/$i ] || \ chflags noschg ${DESTDIR}${BINDIR}/$i || true .endfor .if !defined(NO_FSCHG) afterinstall: -chflags schg ${DESTDIR}${BINDIR}/passwd .endif .include Index: head/usr.bin/procstat/Makefile =================================================================== --- head/usr.bin/procstat/Makefile (revision 275041) +++ head/usr.bin/procstat/Makefile (revision 275042) @@ -1,22 +1,21 @@ # $FreeBSD$ PROG= procstat MAN= procstat.1 SRCS= procstat.c \ procstat_args.c \ procstat_auxv.c \ procstat_basic.c \ procstat_bin.c \ procstat_cred.c \ procstat_files.c \ procstat_kstack.c \ procstat_rlimit.c \ procstat_rusage.c \ procstat_sigs.c \ procstat_threads.c \ procstat_vm.c -LDADD+= -lutil -lprocstat -lkvm -DPADD+= ${LIBUTIL} ${LIBPROCSTAT} ${LIBKVM} +LIBADD+= util procstat .include Index: head/usr.bin/quota/Makefile =================================================================== --- head/usr.bin/quota/Makefile (revision 275041) +++ head/usr.bin/quota/Makefile (revision 275042) @@ -1,11 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= quota BINOWN= root BINMODE=4555 -DPADD= ${LIBRPCSVC} ${LIBUTIL} -LDADD= -lrpcsvc -lutil +LIBADD= rpcsvc util .include Index: head/usr.bin/rctl/Makefile =================================================================== --- head/usr.bin/rctl/Makefile (revision 275041) +++ head/usr.bin/rctl/Makefile (revision 275042) @@ -1,9 +1,8 @@ # $FreeBSD$ PROG= rctl MAN= rctl.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: head/usr.bin/rup/Makefile =================================================================== --- head/usr.bin/rup/Makefile (revision 275041) +++ head/usr.bin/rup/Makefile (revision 275042) @@ -1,10 +1,9 @@ # $FreeBSD$ PROG= rup WARNS?= 1 -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc .include Index: head/usr.bin/rusers/Makefile =================================================================== --- head/usr.bin/rusers/Makefile (revision 275041) +++ head/usr.bin/rusers/Makefile (revision 275042) @@ -1,8 +1,7 @@ # $FreeBSD$ PROG = rusers -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc .include Index: head/usr.bin/script/Makefile =================================================================== --- head/usr.bin/script/Makefile (revision 275041) +++ head/usr.bin/script/Makefile (revision 275042) @@ -1,8 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= script -LDADD= -lutil -DPADD= ${LIBUTIL} + +LIBADD= util .include Index: head/usr.bin/seq/Makefile =================================================================== --- head/usr.bin/seq/Makefile (revision 275041) +++ head/usr.bin/seq/Makefile (revision 275042) @@ -1,8 +1,8 @@ # $NetBSD: Makefile,v 1.3 2009/04/14 22:15:26 lukem Exp $ # $FreeBSD$ PROG= seq -DPADD= ${LIBM} -LDADD= -lm + +LIBADD= m .include Index: head/usr.bin/smbutil/Makefile =================================================================== --- head/usr.bin/smbutil/Makefile (revision 275041) +++ head/usr.bin/smbutil/Makefile (revision 275042) @@ -1,16 +1,15 @@ # $FreeBSD$ PROG= smbutil SRCS= smbutil.c dumptree.c login.c lookup.c view.c print.c -DPADD= ${LIBSMB} ${LIBKICONV} -LDADD= -lsmb -lkiconv +LIBADD= smb kiconv CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs CFLAGS+= -I${CONTRIBDIR}/include WARNS?= 0 .PATH: ${CONTRIBDIR}/smbutil .include Index: head/usr.bin/sort/Makefile =================================================================== --- head/usr.bin/sort/Makefile (revision 275041) +++ head/usr.bin/sort/Makefile (revision 275042) @@ -1,37 +1,35 @@ # $FreeBSD$ .include PROG= sort SRCS= bwstring.c coll.c file.c mem.c radixsort.c sort.c vsort.c sort.1: sort.1.in /usr/bin/sed ${MAN_SUB} ${.ALLSRC} >${.TARGET} CLEANFILES+= sort.1 .if ${MK_SORT_THREADS} != "no" CFLAGS+= -DSORT_THREADS -LDADD= -lpthread -lmd -DPADD= ${LIBPTHREAD} ${LIBMD} +LIBADD= pthread md MAN_SUB+= -e 's|%%THREADS%%||g' .else -LDADD= -lmd -DPADD= ${LIBMD} +LIBADD= md MAN_SUB+= -e 's|%%THREADS%%|\.\\"|g' .endif .if ${MK_NLS} != "no" NLS+= hu_HU.ISO8859-2 NLSSRCFILES= ${NLS:S@$@.msg@} MAN_SUB+= -e 's|%%NLS%%||g' .for lang in ${NLS} NLSSRCDIR_${lang}= ${.CURDIR}/nls .endfor .else CFLAGS+= -DWITHOUT_NLS MAN_SUB+= -e 's|%%NLS%%|\.\\"|g' .endif .include Index: head/usr.bin/split/Makefile =================================================================== --- head/usr.bin/split/Makefile (revision 275041) +++ head/usr.bin/split/Makefile (revision 275042) @@ -1,8 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= split -LDADD= -lutil -DPADD= ${LIBUTIL} + +LIBADD= util .include Index: head/usr.bin/su/Makefile =================================================================== --- head/usr.bin/su/Makefile (revision 275041) +++ head/usr.bin/su/Makefile (revision 275042) @@ -1,23 +1,21 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 # $FreeBSD$ .include PROG= su WARNS?= 5 -DPADD= ${LIBUTIL} ${LIBPAM} -LDADD= -lutil ${MINUSLPAM} +LIBADD= util pam .if ${MK_AUDIT} != "no" CFLAGS+= -DUSE_BSM_AUDIT -DPADD+= ${LIBBSM} -LDADD+= -lbsm +LIBADD+= bsm .endif BINOWN= root BINMODE=4555 PRECIOUSPROG= .include Index: head/usr.bin/systat/Makefile =================================================================== --- head/usr.bin/systat/Makefile (revision 275041) +++ head/usr.bin/systat/Makefile (revision 275042) @@ -1,22 +1,21 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ .include PROG= systat SRCS= cmds.c cmdtab.c devs.c fetch.c iostat.c keyboard.c main.c \ netcmds.c netstat.c pigs.c swap.c icmp.c \ mode.c ip.c tcp.c \ vmstat.c convtbl.c ifcmds.c ifstat.c .if ${MK_INET6_SUPPORT} != "no" SRCS+= icmp6.c ip6.c CFLAGS+= -DINET6 .endif WARNS?= 0 -DPADD= ${LIBNCURSESW} ${LIBM} ${LIBDEVSTAT} ${LIBKVM} -LDADD= -lncursesw -lm -ldevstat -lkvm +LIBADD= ncursesw m devstat kvm .include Index: head/usr.bin/tabs/Makefile =================================================================== --- head/usr.bin/tabs/Makefile (revision 275041) +++ head/usr.bin/tabs/Makefile (revision 275042) @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= tabs -DPADD= ${LIBTERMCAPW} -LDADD= -ltermcapw + +LIBADD= ncursesw .include Index: head/usr.bin/talk/Makefile =================================================================== --- head/usr.bin/talk/Makefile (revision 275041) +++ head/usr.bin/talk/Makefile (revision 275042) @@ -1,10 +1,10 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= talk SRCS= ctl.c ctl_transact.c display.c get_addrs.c get_iface.c get_names.c \ init_disp.c invite.c io.c look_up.c msgs.c talk.c -DPADD= ${LIBNCURSESW} -LDADD= -lncursesw + +LIBADD= ncursesw .include Index: head/usr.bin/tar/Makefile =================================================================== --- head/usr.bin/tar/Makefile (revision 275041) +++ head/usr.bin/tar/Makefile (revision 275042) @@ -1,51 +1,43 @@ # $FreeBSD$ .include LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive PROG= bsdtar BSDTAR_VERSION_STRING= 3.1.2 .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 -DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBBSDXML} -LDADD= -larchive -lbz2 -lz -llzma -lbsdxml -.if ${MK_OPENSSL} != "no" -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto -.else -DPADD+= ${LIBMD} -LDADD+= -lmd -.endif +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+= -I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/libarchive CFLAGS+= -I${LIBARCHIVEDIR}/libarchive_fe SYMLINKS= bsdtar ${BINDIR}/tar MLINKS= bsdtar.1 tar.1 DEBUG_FLAGS=-g .PHONY: check test clean-test check test: $(PROG) bsdtar.1.gz cd ${.CURDIR}/test && make obj && make test clean-test: cd ${.CURDIR}/test && make clean .include Index: head/usr.bin/telnet/Makefile =================================================================== --- head/usr.bin/telnet/Makefile (revision 275041) +++ head/usr.bin/telnet/Makefile (revision 275042) @@ -1,50 +1,44 @@ # $FreeBSD$ .include TELNETDIR= ${.CURDIR}/../../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 -LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a +LIBADD= telnet ncursesw -DPADD= ${LIBTERMCAPW} ${LIBTELNET} -LDADD= -ltermcapw ${LIBTELNET} - .if !defined(RELEASE_CRUNCH) CFLAGS+= -DIPSEC -DPADD+= ${LIBIPSEC} -LDADD+= -lipsec +LIBADD+= ipsec .else .PATH: ${TELNETDIR}/libtelnet SRCS+= genget.c getent.c misc.c CFLAGS+= -DHAS_CGETENT .endif .if ${MK_OPENSSL} != "no" -SRCS+= authenc.c +SRCS+= authenc.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DIPSEC -DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM} -LDADD+= -lmp -lcrypto -lcrypt -lipsec ${MINUSLPAM} +LIBADD+= mp crypto ipsec pam .endif .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write -DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} -LDADD+= -lkrb5 -lhx509 -lasn1 -lcom_err -lroken +LIBADD+= krb5 roken .endif .include Index: head/usr.bin/tftp/Makefile =================================================================== --- head/usr.bin/tftp/Makefile (revision 275041) +++ head/usr.bin/tftp/Makefile (revision 275042) @@ -1,13 +1,13 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ .PATH: ${.CURDIR}/../../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 -DPADD= ${LIBEDIT} ${LIBTERMCAPW} -LDADD= -ledit -ltermcapw + +LIBADD= edit .include Index: head/usr.bin/top/Makefile =================================================================== --- head/usr.bin/top/Makefile (revision 275041) +++ head/usr.bin/top/Makefile (revision 275042) @@ -1,49 +1,48 @@ # $FreeBSD$ TOPDIR= ${.CURDIR}/../../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 -DPADD= ${LIBTERMCAP} ${LIBM} ${LIBKVM} ${LIBJAIL} -LDADD= -ltermcap -lm -lkvm -ljail +LIBADD= ncursesw m kvm jail CLEANFILES= sigdesc.h SIGCONV_AWK= ${.CURDIR}/../../contrib/top/sigconv.awk SIGNAL_H= ${DESTDIR}/usr/include/sys/signal.h sigdesc.h: ${SIGCONV_AWK} ${SIGNAL_H} awk -f ${SIGCONV_AWK} < ${SIGNAL_H} > ${.TARGET} CLEANFILES+= top.local.h top.x .SUFFIXES: .X .x .H .h .X.x .H.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/tput/Makefile =================================================================== --- head/usr.bin/tput/Makefile (revision 275041) +++ head/usr.bin/tput/Makefile (revision 275042) @@ -1,10 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= tput -DPADD= ${LIBTERMCAPW} -LDADD= -ltermcapw +LIBADD= ncursesw SCRIPTS=clear.sh MLINKS= tput.1 clear.1 .include Index: head/usr.bin/truncate/Makefile =================================================================== --- head/usr.bin/truncate/Makefile (revision 275041) +++ head/usr.bin/truncate/Makefile (revision 275042) @@ -1,13 +1,12 @@ # $FreeBSD$ .include -PROG= truncate -DPADD= ${LIBUTIL} -LDADD= -lutil +PROG= truncate +LIBADD= util .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/usr.bin/tset/Makefile =================================================================== --- head/usr.bin/tset/Makefile (revision 275041) +++ head/usr.bin/tset/Makefile (revision 275042) @@ -1,12 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/9/93 # $FreeBSD$ PROG= tset SRCS= map.c misc.c set.c term.c tset.c wrterm.c -DPADD= ${LIBTERMCAPW} -LDADD= -ltermcapw +LIBADD= ncursesw LINKS= ${BINDIR}/tset ${BINDIR}/reset MLINKS= tset.1 reset.1 .include Index: head/usr.bin/ul/Makefile =================================================================== --- head/usr.bin/ul/Makefile (revision 275041) +++ head/usr.bin/ul/Makefile (revision 275042) @@ -1,9 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= ul -DPADD= ${LIBTERMCAPW} -LDADD= -ltermcapw +LIBADD= ncursesw .include Index: head/usr.bin/units/Makefile =================================================================== --- head/usr.bin/units/Makefile (revision 275041) +++ head/usr.bin/units/Makefile (revision 275042) @@ -1,16 +1,15 @@ # $FreeBSD$ .include PROG= units FILES= units.lib FILESDIR= ${SHAREDIR}/misc -LDADD+=-ledit -ltermcapw -DPADD+=${LIBEDIT} ${LIBTERMCAPW} +LIBADD= edit .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/usr.bin/unzip/Makefile =================================================================== --- head/usr.bin/unzip/Makefile (revision 275041) +++ head/usr.bin/unzip/Makefile (revision 275042) @@ -1,8 +1,7 @@ # $FreeBSD$ PROG = unzip CSTD = c99 -DPADD = ${LIBARCHIVE} ${LIBZ} -LDADD = -larchive -lz +LIBADD= archive .include Index: head/usr.bin/usbhidaction/Makefile =================================================================== --- head/usr.bin/usbhidaction/Makefile (revision 275041) +++ head/usr.bin/usbhidaction/Makefile (revision 275042) @@ -1,9 +1,8 @@ # $FreeBSD$ # $NetBSD: Makefile,v 1.4 2002/02/02 16:54:26 veego Exp $ PROG= usbhidaction -LDADD= -lusbhid -DPADD= ${LIBUSBHID} +LIBADD= usbhid .include Index: head/usr.bin/usbhidctl/Makefile =================================================================== --- head/usr.bin/usbhidctl/Makefile (revision 275041) +++ head/usr.bin/usbhidctl/Makefile (revision 275042) @@ -1,9 +1,9 @@ # $NetBSD: Makefile,v 1.4 1999/05/11 21:02:25 augustss Exp $ # $FreeBSD$ PROG= usbhidctl SRCS= usbhid.c -DPADD= ${LIBUSBHID} -LDADD= -lusbhid + +LIBADD= usbhid .include Index: head/usr.bin/vacation/Makefile =================================================================== --- head/usr.bin/vacation/Makefile (revision 275041) +++ head/usr.bin/vacation/Makefile (revision 275042) @@ -1,38 +1,28 @@ # $FreeBSD$ SENDMAIL_DIR=${.CURDIR}/../../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 -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a - -LIBSMDBDIR= ${.OBJDIR}/../../lib/libsmdb -LIBSMDB= ${LIBSMDBDIR}/libsmdb.a - -LIBSMUTILDIR= ${.OBJDIR}/../../lib/libsmutil -LIBSMUTIL= ${LIBSMUTILDIR}/libsmutil.a - -DPADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} -LDADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} +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: ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h .include Index: head/usr.bin/vi/Makefile =================================================================== --- head/usr.bin/vi/Makefile (revision 275041) +++ head/usr.bin/vi/Makefile (revision 275042) @@ -1,80 +1,76 @@ # # $FreeBSD$ # .include SRCDIR= ${.CURDIR}/../../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/USD.doc/vi.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 -DPADD= ${LIBUTIL} -LDADD= -lutil - +LIBADD= util ncursesw CFLAGS+= -DUSE_WIDECHAR -DPADD+= ${LIBNCURSESW} -LDADD+= -lncursesw .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/vmstat/Makefile =================================================================== --- head/usr.bin/vmstat/Makefile (revision 275041) +++ head/usr.bin/vmstat/Makefile (revision 275042) @@ -1,11 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= vmstat MAN= vmstat.8 -DPADD= ${LIBDEVSTAT} ${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL} -LDADD= -ldevstat -lkvm -lmemstat -lutil +LIBADD= devstat kvm memstat util WARNS?= 1 .include Index: head/usr.bin/w/Makefile =================================================================== --- head/usr.bin/w/Makefile (revision 275041) +++ head/usr.bin/w/Makefile (revision 275042) @@ -1,15 +1,14 @@ # @(#)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 -DPADD= ${LIBKVM} ${LIBUTIL} ${LIBXO} -LDADD= -lkvm -lutil -lxo +LIBADD= kvm util xo #BINGRP= kmem #BINMODE=2555 LINKS= ${BINDIR}/w ${BINDIR}/uptime .PATH: ${.CURDIR}/../../bin/ps .include Index: head/usr.bin/wc/Makefile =================================================================== --- head/usr.bin/wc/Makefile (revision 275041) +++ head/usr.bin/wc/Makefile (revision 275042) @@ -1,8 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= wc -DPADD= ${LIBXO} -LDADD= -lxo +LIBADD= xo .include Index: head/usr.bin/xinstall/Makefile =================================================================== --- head/usr.bin/xinstall/Makefile (revision 275041) +++ head/usr.bin/xinstall/Makefile (revision 275042) @@ -1,18 +1,17 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= xinstall PROGNAME= install SRCS= xinstall.c getid.c MAN= install.1 .PATH: ${.CURDIR}/../../contrib/mtree .PATH: ${.CURDIR}/../../lib/libmd CFLAGS+= -I${.CURDIR}/../../contrib/mtree CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd CFLAGS+= -I${.CURDIR}/../../lib/libmd -DPADD+= ${LIBMD} -LDADD+= -lmd +LIBADD= md .include Index: head/usr.bin/xlint/lint1/Makefile =================================================================== --- head/usr.bin/xlint/lint1/Makefile (revision 275041) +++ head/usr.bin/xlint/lint1/Makefile (revision 275042) @@ -1,22 +1,21 @@ # $NetBSD: Makefile,v 1.3 1995/07/04 01:53:05 cgd Exp $ # $FreeBSD$ PROG= lint1 SRCS= cgram.y scan.l mem1.c mem.c err.c main1.c decl.c tree.c func.c \ init.c emit.c emit1.c inittyp.c MAN= lint.7 CLEANFILES= lint.7 -LDADD= -ll -lm -DPADD= ${LIBL} ${LIBM} +LIBADD= l m CFLAGS+= -I. -I${.CURDIR} LINTFLAGS=-aehpz BINDIR= /usr/libexec .PATH: ${.CURDIR}/../common lint.7: makeman sh ${.CURDIR}/makeman ${DESTDIR}${BINDIR}/${PROG} -m >${.TARGET} .include Index: head/usr.bin/xo/Makefile =================================================================== --- head/usr.bin/xo/Makefile (revision 275041) +++ head/usr.bin/xo/Makefile (revision 275042) @@ -1,16 +1,15 @@ # $FreeBSD$ LIBXO= ${.CURDIR:H:H}/contrib/libxo .PATH: ${LIBXO}/xo PROG= xo MAN= xo.1 # XXX For xoversion.h CFLAGS+=-I${LIBXO}/libxo -DPADD= ${LIBXO} -LDADD= -lxo +LIBADD= xo .include Index: head/usr.bin/xz/Makefile =================================================================== --- head/usr.bin/xz/Makefile (revision 275041) +++ head/usr.bin/xz/Makefile (revision 275042) @@ -1,48 +1,47 @@ # $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 .PATH: ${XZDIR}/xz SRCS= args.c \ coder.c \ file_io.c \ hardware.c \ list.c \ main.c \ message.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 -DPADD= ${LIBLZMA} -LDADD= -llzma +LIBADD= lzma .include Index: head/usr.bin/xzdec/Makefile =================================================================== --- head/usr.bin/xzdec/Makefile (revision 275041) +++ head/usr.bin/xzdec/Makefile (revision 275042) @@ -1,28 +1,27 @@ # $FreeBSD$ PROG= xzdec LINKS= ${BINDIR}/xzdec ${BINDIR}/lzdec MLINKS= xzdec.1 lzmadec.1 XZDIR= ${.CURDIR}/../../contrib/xz/src LZMALIBDIR= ${.CURDIR}/../../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 -DPADD= ${LIBLZMA} -LDADD= -llzma +LIBADD= lzma .include