Index: head/gnu/lib/libreadline/readline/Makefile
===================================================================
--- head/gnu/lib/libreadline/readline/Makefile	(revision 291329)
+++ head/gnu/lib/libreadline/readline/Makefile	(revision 291330)
@@ -1,30 +1,29 @@
 # $FreeBSD$
 
 LIB=    readline
 INTERNALLIB=	yes
 NO_MAN=	yes
 
 TILDESRC= tilde.c
 SRCS=     readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \
 	  rltty.c complete.c bind.c isearch.c display.c signals.c \
 	  util.c kill.c undo.c macro.c input.c callback.c terminal.c \
 	  text.c nls.c misc.c compat.c xmalloc.c $(HISTSRC) $(TILDESRC)
 
 INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
 		   rlstdc.h rlconf.h rltypedefs.h
 
 CFLAGS+=	-I${.OBJDIR}/..
 SRCDIR=	${.CURDIR}/../../../../contrib/libreadline
 
-beforebuild: ${INSTALLED_HEADERS}
 CLEANFILES+= ${INSTALLED_HEADERS}
-DPSRCS+= ${INSTALLED_HEADERS}
+SRCS+= ${INSTALLED_HEADERS}
 
 .for _h in ${INSTALLED_HEADERS}
 ${_h}:	${SRCDIR}/${_h} .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 .endfor
 
 LIBADD=	ncursesw
 
 .include <bsd.lib.mk>
Index: head/lib/libc/tests/rpc/Makefile
===================================================================
--- head/lib/libc/tests/rpc/Makefile	(revision 291329)
+++ head/lib/libc/tests/rpc/Makefile	(revision 291330)
@@ -1,26 +1,26 @@
 # $FreeBSD$
 
 SRCS.xdr_test=		${RPCSRC:.x=_xdr.c} t_xdr.c ${RPCSRC:.x=.h}
 
 NETBSD_ATF_TESTS_C=	rpc_test
 NETBSD_ATF_TESTS_C+=	xdr_test
 
 RPCSRC=			h_testbits.x
 RPCGEN=			RPCGEN_CPP=${CPP:Q} rpcgen -L -C
 
 h_testbits.h: ${RPCSRC}
 	${RPCGEN} -h -o ${.TARGET} ${.ALLSRC}
 
 h_testbits_xdr.c: ${RPCSRC} h_testbits.h
 	${RPCGEN} ${.ALLSRC:M*.x}
 
 CLEANFILES+=	${RPCSRC:.x=.h} ${RPCSRC:.x=.c} h_testbits_xdr.c
 CFLAGS+=	-I${.OBJDIR}
-DPSRCS+=	h_testbits.h
+SRCS+=		h_testbits.h
 
 LDADD+=		-lrpcsvc -lutil
 DPADD+=		${LIBRPCSVC} ${LIBUTIL}
 
 .include "../Makefile.netbsd-tests"
 
 .include <bsd.test.mk>
Index: head/usr.bin/kdump/Makefile
===================================================================
--- head/usr.bin/kdump/Makefile	(revision 291329)
+++ head/usr.bin/kdump/Makefile	(revision 291330)
@@ -1,58 +1,57 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 .PATH: ${.CURDIR}/../ktrace
 
 PROG=		kdump
-SRCS=		kdump_subr.c kdump.c ioctl.c subr.c utrace.c
-DPSRCS=		kdump_subr.h
+SRCS=		kdump_subr.c kdump_subr.h kdump.c ioctl.c subr.c utrace.c
 CFLAGS+=	-I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I.
 
 .if ${MK_CASPER} != "no"
 LIBADD=	capsicum
 CFLAGS+=-DHAVE_LIBCAPSICUM
 .endif
 
 .if ${MK_PF} != "no"
 CFLAGS+=-DPF
 .endif
 
 NO_WERROR?=	YES
 
 CLEANFILES=	ioctl.c kdump_subr.c kdump_subr.h
 
 beforedepend: ioctl.c
 
 .if (${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386")
 beforedepend: linux_syscalls.c
 
 CLEANFILES+=	linux_syscalls.c
 kdump.o: linux_syscalls.c
 linux_syscalls.c:	linux_syscalls.conf
 	sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \
 	    ${.CURDIR}/../../sys/${MACHINE_ARCH}/linux/syscalls.master ${.CURDIR}/linux_syscalls.conf
 .endif
 .if (${MACHINE_ARCH} == "amd64")
 beforedepend: linux32_syscalls.c
 
 CLEANFILES+=	linux32_syscalls.c
 kdump.o: linux32_syscalls.c
 linux32_syscalls.c: linux32_syscalls.conf
 	sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \
 	    ${.CURDIR}/../../sys/${MACHINE_ARCH}/linux32/syscalls.master ${.CURDIR}/linux32_syscalls.conf
 .endif
 
 ioctl.c: mkioctls
 	env MACHINE=${MACHINE} CPP="${CPP}" \
 	    sh ${.CURDIR}/mkioctls print ${DESTDIR}${INCLUDEDIR} > ${.TARGET}
 
 kdump_subr.h: mksubr
 	sh ${.CURDIR}/mksubr ${DESTDIR}${INCLUDEDIR} | \
 	    sed -n 's/^\([a-z].*)\)$$/void \1;/p' >${.TARGET}
 
 kdump_subr.c: mksubr kdump_subr.h
 	sh ${.CURDIR}/mksubr ${DESTDIR}${INCLUDEDIR} >${.TARGET}
 
 .include <bsd.prog.mk>
Index: head/usr.bin/netstat/Makefile
===================================================================
--- head/usr.bin/netstat/Makefile	(revision 291329)
+++ head/usr.bin/netstat/Makefile	(revision 291330)
@@ -1,67 +1,66 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/12/93
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PROG=	netstat
 SRCS=	if.c inet.c main.c mbuf.c mroute.c netisr.c nl_symbols.c route.c \
 	unix.c mroute6.c ipsec.c bpf.c pfkey.c sctp.c \
-	flowtable.c
-DPSRCS=	nl_defs.h
+	flowtable.c nl_defs.h
 
 nl_symbols.c: nlist_symbols
 	awk '\
 	    BEGIN { \
 		print "#include <sys/param.h>"; \
 		print "#include <nlist.h>"; \
 		print "struct nlist nl[] = {"; \
 	    } \
 	    !/^\#/ { printf("\t{ .n_name = \"%s\" },\n", $$2); } \
 	    END { print "\t{ .n_name = NULL },\n};" } \
 	    ' < ${.ALLSRC} > ${.TARGET} || rm -f ${.TARGET}
 nl_defs.h: nlist_symbols
 	awk '\
 	    BEGIN { \
 		print "#include <nlist.h>"; \
 		print "extern struct nlist nl[];"; \
 		i = 0; \
 	    } \
 	    !/^\#/ { printf("\#define\tN%s\t%s\n", toupper($$2), i++); }' \
 	    < ${.ALLSRC} > ${.TARGET} || rm -f ${.TARGET}
 CLEANFILES+=	nl_symbols.c nl_defs.h
 CFLAGS+=	-I${.OBJDIR}
 
 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
 LIBADD=	kvm memstat xo util
 
 .if ${MK_NETGRAPH_SUPPORT} != "no"
 SRCS+=	netgraph.c
 LIBADD+=	netgraph
 CFLAGS+=-DNETGRAPH
 .endif
 
 .include <bsd.prog.mk>
Index: head/usr.bin/svn/svn/Makefile
===================================================================
--- head/usr.bin/svn/svn/Makefile	(revision 291329)
+++ head/usr.bin/svn/svn/Makefile	(revision 291330)
@@ -1,67 +1,67 @@
 # $FreeBSD$
 
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${SVNDIR}/svn
 
 PROG=	svn${SVNLITE}
 
 SRCS=	add-cmd.c auth-cmd.c blame-cmd.c cat-cmd.c changelist-cmd.c \
 	checkout-cmd.c cl-conflicts.c cleanup-cmd.c commit-cmd.c \
 	conflict-callbacks.c copy-cmd.c delete-cmd.c deprecated.c \
 	diff-cmd.c export-cmd.c file-merge.c help-cmd.c import-cmd.c \
 	info-cmd.c list-cmd.c lock-cmd.c log-cmd.c merge-cmd.c \
 	mergeinfo-cmd.c mkdir-cmd.c move-cmd.c notify.c patch-cmd.c \
 	propdel-cmd.c propedit-cmd.c propget-cmd.c proplist-cmd.c \
 	props.c propset-cmd.c relocate-cmd.c resolve-cmd.c \
 	resolved-cmd.c revert-cmd.c status-cmd.c similarity.c status.c \
 	svn.c switch-cmd.c unlock-cmd.c update-cmd.c upgrade-cmd.c util.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${.CURDIR}/../lib/libapr \
 	-I${APR}/include/arch/unix \
 	-I${APR}/include \
 	-I${.CURDIR}/../lib/libapr_util \
 	-I${APRU}/include/private \
 	-I${APRU}/include
 
 LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client \
 	-L${LIBSVN_WCDIR} -lsvn_wc \
 	-L${LIBSVN_RADIR} -lsvn_ra \
 	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
 	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
 	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
 	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_FSDIR} -lsvn_fs \
 	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
 	-L${LIBSVN_FS_XDIR} -lsvn_fs_x \
 	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
 	-L${LIBSVN_DIFFDIR} -lsvn_diff \
 	-L${LIBSVN_SUBRDIR} -lsvn_subr \
 	-L${LIBSERFDIR} -lserf \
 	-L${LIBAPR_UTILDIR} -lapr-util \
 	-L${LIBAPRDIR} -lapr
 LIBADD+=	bsdxml sqlite3 z magic crypto ssl pthread
 
 DPADD=	${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \
 	${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \
 	${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \
 	${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
 	${LIBAPR}
 
 CLEANFILES+=	svnlite.1
 .if(defined(ORGANIZATION) && !empty(ORGANIZATION))
-DPSRCS+=	freebsd-organization.h
+SRCS+=		freebsd-organization.h
 CLEANFILES+=	freebsd-organization.h
 CFLAGS+=	-I. -DHAS_ORGANIZATION_NAME
 freebsd-organization.h:
 	@echo "#define ORGANIZATION_NAME	\"$$(eval echo ${ORGANIZATION})\"" \
 	    > freebsd-organization.h
 .endif
 
 svnlite.1: svn.1
 	# Avoid the website
 	sed -E 's,(^| |B|`)svn,\1svnlite,g' ${SVNDIR}/svn/svn.1 > ${.OBJDIR}/svnlite.1
 
 .include <bsd.prog.mk>